Improved the aggregator definition DTO conversion

This commit is contained in:
Lennart Hensler committed 2015-10-14 20:11:08 +02:00
1 parent f25b318a85
commit 37a110e39d
6 files changed
+39 -71

No files matched your search

@@ -23,6 +23,10 @@ public class AggregationProcessorDefinitionDTO implements Serializable, Comparab
this.aggregatedTypeName = aggregatedTypeName;
this.displayName = displayName;
}
public String getMessageKey() {
return messageKey;
}
public String getExtractedTypeName() {
return extractedTypeName;
@@ -3,6 +3,7 @@ package com.sap.sse.datamining.impl.components.management;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
import java.util.Collection;
import java.util.Date;
@@ -128,6 +129,14 @@ public class TestAggregationProcessorManagement {
assertThat(server.getAggregationProcessorDefinitionForDTO(competitorAggregatorDefinitionDTO), nullValue());
assertThat(server.getAggregationProcessorDefinitionForDTO(null), nullValue());
AggregationProcessorDefinitionDTO aggregatorDTO = new AggregationProcessorDefinitionDTO("Not relevant", "Impossible Class", "Impossible Class", "Not relevant");
try {
server.getAggregationProcessorDefinitionForDTO(aggregatorDTO);
fail("An IllegalArgumentException is expected.");
} catch (IllegalArgumentException e) {
// Exception is expected
}
}
}
@@ -7,6 +7,6 @@ public interface AggregationProcessorDefinitionProvider {
public <ExtractedType> AggregationProcessorDefinition<ExtractedType, ?> get(Class<ExtractedType> extractedType, String aggregationNameMessageKey);
public <ExtractedType> Iterable<AggregationProcessorDefinition<? super ExtractedType, ?>> getByExtractedType(Class<ExtractedType> extractedType);
public <ExtractedType, ResultType> AggregationProcessorDefinition<ExtractedType, ResultType> getForDTO(AggregationProcessorDefinitionDTO aggregatorDefinitionDTO);
public <ExtractedType, ResultType> AggregationProcessorDefinition<ExtractedType, ResultType> getForDTO(AggregationProcessorDefinitionDTO aggregatorDefinitionDTO, ClassLoader classLoader);
}
@@ -326,7 +326,7 @@ public class DataMiningServerImpl implements ModifiableDataMiningServer {
@Override
public <ExtractedType, ResultType> AggregationProcessorDefinition<ExtractedType, ResultType> getAggregationProcessorDefinitionForDTO(AggregationProcessorDefinitionDTO aggregatorDefinitionDTO) {
return aggregationProcessorDefinitionRegistry.getForDTO(aggregatorDefinitionDTO);
return aggregationProcessorDefinitionRegistry.getForDTO(aggregatorDefinitionDTO, getJoinedClassLoader());
}
@Override
@@ -9,26 +9,21 @@ import java.util.logging.Logger;
import com.sap.sse.datamining.components.AggregationProcessorDefinition;
import com.sap.sse.datamining.components.management.AggregationProcessorDefinitionRegistry;
import com.sap.sse.datamining.factories.DataMiningDTOFactory;
import com.sap.sse.datamining.shared.impl.dto.AggregationProcessorDefinitionDTO;
import com.sap.sse.datamining.util.Classes;
public class AggregationProcessorDefinitionManager implements AggregationProcessorDefinitionRegistry {
private final Logger logger = Logger.getLogger(this.getClass().getName());
private final DataMiningDTOFactory dtoFactory;
private final Map<Class<?>, Map<String, AggregationProcessorDefinition<?, ?>>> definitionsMappedByExtractedTypeAndMessageKey;
public AggregationProcessorDefinitionManager() {
dtoFactory = new DataMiningDTOFactory();
definitionsMappedByExtractedTypeAndMessageKey = new HashMap<>();
}
@SuppressWarnings("unchecked")
@Override
public <ExtractedType> AggregationProcessorDefinition<ExtractedType, ?> get(Class<ExtractedType> extractedType,
String aggregationNameMessageKey) {
public <ExtractedType> AggregationProcessorDefinition<ExtractedType, ?> get(Class<ExtractedType> extractedType, String aggregationNameMessageKey) {
if (definitionsMappedByExtractedTypeAndMessageKey.containsKey(extractedType)) {
return (AggregationProcessorDefinition<ExtractedType, ?>) definitionsMappedByExtractedTypeAndMessageKey.get(extractedType).get(aggregationNameMessageKey);
}
@@ -36,8 +31,7 @@ public class AggregationProcessorDefinitionManager implements AggregationProcess
}
@Override
public <ExtractedType> Iterable<AggregationProcessorDefinition<? super ExtractedType, ?>> getByExtractedType(
Class<ExtractedType> extractedType) {
public <ExtractedType> Iterable<AggregationProcessorDefinition<? super ExtractedType, ?>> getByExtractedType(Class<ExtractedType> extractedType) {
Collection<AggregationProcessorDefinition<? super ExtractedType, ?>> definitions = new HashSet<>();
Class<?> cleanExtractedType = Classes.primitiveToWrapperType(extractedType);
Collection<Class<?>> typesToGet = Classes.getSupertypesOf(cleanExtractedType);
@@ -60,54 +54,23 @@ public class AggregationProcessorDefinitionManager implements AggregationProcess
return definitions;
}
@Override
public <ExtractedType, ResultType> AggregationProcessorDefinition<ExtractedType, ResultType> getForDTO(AggregationProcessorDefinitionDTO aggregatorDefinitionDTO) {
if (aggregatorDefinitionDTO == null) {
return null;
}
Collection<AggregationProcessorDefinition<ExtractedType, ResultType>> definitionsMatchingDTO = getDefinitionsForDTO(aggregatorDefinitionDTO);
if (definitionsMatchingDTO.size() > 1) {
logThatMoreThanOneDefinitionMatchedDTO(aggregatorDefinitionDTO, definitionsMatchingDTO);
}
AggregationProcessorDefinition<ExtractedType, ResultType> aggregatorDefinition = getDefinitionToReturn(definitionsMatchingDTO);
if (aggregatorDefinition == null) {
logger.log(Level.WARNING, "No aggregator definition found for the DTO: " + aggregatorDefinitionDTO);
}
return aggregatorDefinition;
}
@SuppressWarnings("unchecked")
private <ExtractedType, ResultType> Collection<AggregationProcessorDefinition<ExtractedType, ResultType>> getDefinitionsForDTO(AggregationProcessorDefinitionDTO aggregatorDefinitionDTO) {
Collection<AggregationProcessorDefinition<ExtractedType, ResultType>> definitionsDTO = new HashSet<>();
for (AggregationProcessorDefinition<?, ?> definition : getAllDefinitions()) {
AggregationProcessorDefinitionDTO definitionDTO = dtoFactory.createAggregationProcessorDefinitionDTO(definition);
if (aggregatorDefinitionDTO.equals(definitionDTO)) {
definitionsDTO.add((AggregationProcessorDefinition<ExtractedType, ResultType>) definition);
@Override
public <ExtractedType, ResultType> AggregationProcessorDefinition<ExtractedType, ResultType> getForDTO(AggregationProcessorDefinitionDTO aggregatorDefinitionDTO,
ClassLoader classLoader) {
AggregationProcessorDefinition<ExtractedType, ResultType> aggregatorDefinition = null;
if (aggregatorDefinitionDTO != null) {
try {
Class<ExtractedType> extractedType = (Class<ExtractedType>) Class.forName(aggregatorDefinitionDTO.getExtractedTypeName(), true, classLoader);
aggregatorDefinition = (AggregationProcessorDefinition<ExtractedType, ResultType>) get(extractedType, aggregatorDefinitionDTO.getMessageKey());
} catch (ClassNotFoundException e) {
throw new IllegalArgumentException("Couldn't get classes for the aggregator definition DTO " + aggregatorDefinitionDTO, e);
}
if (aggregatorDefinition == null) {
logger.log(Level.WARNING, "No aggregator definition found for the DTO: " + aggregatorDefinitionDTO);
}
}
return definitionsDTO;
}
private Collection<AggregationProcessorDefinition<?, ?>> getAllDefinitions() {
Collection<AggregationProcessorDefinition<?, ?>> allDefinitions = new HashSet<>();
for (Map<String, AggregationProcessorDefinition<?, ?>> map : definitionsMappedByExtractedTypeAndMessageKey.values()) {
allDefinitions.addAll(map.values());
}
return allDefinitions;
}
private <ExtractedType, ResultType> void logThatMoreThanOneDefinitionMatchedDTO(AggregationProcessorDefinitionDTO aggregatorDefinitionDTO,
Collection<AggregationProcessorDefinition<ExtractedType, ResultType>> definitionsMatchingDTO) {
logger.log(Level.INFO, "More than on registered aggregator definition matched the DTO '" + aggregatorDefinitionDTO + "'");
for (AggregationProcessorDefinition<ExtractedType, ResultType> definition : definitionsMatchingDTO) {
logger.log(Level.FINER, "The definition '" + definition + "' matched the DTO '" + aggregatorDefinitionDTO + "'");
}
}
private <ExtractedType, ResultType> AggregationProcessorDefinition<ExtractedType, ResultType> getDefinitionToReturn(Collection<AggregationProcessorDefinition<ExtractedType, ResultType>> definitionsMatchingDTO) {
return definitionsMatchingDTO.isEmpty() ? null : definitionsMatchingDTO.iterator().next();
return aggregatorDefinition;
}
@Override
@@ -134,12 +134,9 @@ public class DataRetrieverChainDefinitionManager implements DataRetrieverChainDe
DataRetrieverChainDefinition<DataSourceType, DataType> chainDefinition = null;
if (retrieverChainDTO != null) {
try {
Class<DataSourceType> dataSourceType = (Class<DataSourceType>) Class.forName(
retrieverChainDTO.getDataSourceTypeName(), true, classLoader);
Class<DataType> retrievedDataType = (Class<DataType>) Class.forName(
retrieverChainDTO.getRetrievedDataTypeName(), true, classLoader);
Set<DataRetrieverChainDefinition<DataSourceType, DataType>> chainDefinitions = getInternalFor(
dataSourceType, retrievedDataType);
Class<DataSourceType> dataSourceType = (Class<DataSourceType>) Class.forName(retrieverChainDTO.getDataSourceTypeName(), true, classLoader);
Class<DataType> retrievedDataType = (Class<DataType>) Class.forName(retrieverChainDTO.getRetrievedDataTypeName(), true, classLoader);
Set<DataRetrieverChainDefinition<DataSourceType, DataType>> chainDefinitions = getInternalFor(dataSourceType, retrievedDataType);
if (!chainDefinitions.isEmpty()) {
Set<DataRetrieverChainDefinition<DataSourceType, DataType>> matchingChainDefinitions = new HashSet<>();
@@ -148,18 +145,15 @@ public class DataRetrieverChainDefinitionManager implements DataRetrieverChainDe
if (retrieverLevels.size() == retrieverChainDTO.getLevelAmount()) {
boolean matches = true;
for (DataRetrieverLevel<?, ?> retrieverLevel : retrieverLevels) {
DataRetrieverLevelDTO retrieverLevelDTO = retrieverChainDTO
.getRetrieverLevel(retrieverLevel.getLevel());
Class<?> retrieverType = Class.forName(retrieverLevelDTO.getRetrieverTypeName(), true,
classLoader);
DataRetrieverLevelDTO retrieverLevelDTO = retrieverChainDTO.getRetrieverLevel(retrieverLevel.getLevel());
Class<?> retrieverType = Class.forName(retrieverLevelDTO.getRetrieverTypeName(), true, classLoader);
if (!retrieverLevel.getRetrieverType().isAssignableFrom(retrieverType)) {
matches = false;
break;
}
}
if (matches) {
matchingChainDefinitions
.add((DataRetrieverChainDefinition<DataSourceType, DataType>) chain);
matchingChainDefinitions.add((DataRetrieverChainDefinition<DataSourceType, DataType>) chain);
}
}
}
@@ -167,13 +161,11 @@ public class DataRetrieverChainDefinitionManager implements DataRetrieverChainDe
if (matchingChainDefinitions.size() == 1) {
chainDefinition = matchingChainDefinitions.iterator().next();
} else if (matchingChainDefinitions.size() > 1) {
throw new MultipleDataMiningComponentsFoundForDTOException(retrieverChainDTO,
matchingChainDefinitions);
throw new MultipleDataMiningComponentsFoundForDTOException(retrieverChainDTO, matchingChainDefinitions);
}
}
} catch (ClassNotFoundException e) {
throw new IllegalArgumentException("Couldn't get classes for the retriever chain DTO "
+ retrieverChainDTO, e);
throw new IllegalArgumentException("Couldn't get classes for the retriever chain DTO " + retrieverChainDTO, e);
}
if (chainDefinition == null) {
logger.log(Level.WARNING, "No retriever chain definition found for the DTO: " + retrieverChainDTO);