diff --git a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/util/NullProcessor.java b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/util/NullProcessor.java index 1b11cebb872..be899d0ae91 100644 --- a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/util/NullProcessor.java +++ b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/util/NullProcessor.java @@ -1,6 +1,6 @@ package com.sap.sailing.datamining.test.util; -import com.sap.sse.datamining.AdditionalResultDataBuilder; +import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.impl.components.AbstractProcessor; public class NullProcessor extends AbstractProcessor { diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/Activator.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/Activator.java index e846a86664b..437e90c68e6 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/Activator.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/Activator.java @@ -13,10 +13,10 @@ import com.sap.sailing.datamining.data.HasTrackedLegContext; import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext; import com.sap.sailing.datamining.data.HasTrackedRaceContext; import com.sap.sailing.domain.common.Speed; -import com.sap.sse.datamining.AggregationProcessorDefinition; import com.sap.sse.datamining.DataMiningBundleService; -import com.sap.sse.datamining.DataRetrieverChainDefinition; import com.sap.sse.datamining.DataSourceProvider; +import com.sap.sse.datamining.components.AggregationProcessorDefinition; +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; import com.sap.sse.datamining.data.ClusterGroup; import com.sap.sse.datamining.impl.AbstractDataMiningActivator; import com.sap.sse.i18n.ResourceBundleStringMessages; diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/SailingDataRetrievalChainDefinitions.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/SailingDataRetrievalChainDefinitions.java index 001cdb7b032..4a186ebe38a 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/SailingDataRetrievalChainDefinitions.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/SailingDataRetrievalChainDefinitions.java @@ -20,8 +20,8 @@ import com.sap.sailing.datamining.impl.components.TrackedLegRetrievalProcessor; import com.sap.sailing.datamining.impl.components.TrackedRaceRetrievalProcessor; import com.sap.sailing.datamining.impl.data.LeaderboardGroupWithContext; import com.sap.sailing.server.RacingEventService; -import com.sap.sse.datamining.DataRetrieverChainDefinition; -import com.sap.sse.datamining.impl.SimpleDataRetrieverChainDefinition; +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; +import com.sap.sse.datamining.impl.components.SimpleDataRetrieverChainDefinition; public class SailingDataRetrievalChainDefinitions { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DataMiningServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DataMiningServiceImpl.java index 36369d98c4f..ac9c0c1dc1e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DataMiningServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DataMiningServiceImpl.java @@ -17,12 +17,12 @@ import com.sap.sailing.datamining.shared.SailingDataMiningSerializationDummy; import com.sap.sailing.gwt.ui.datamining.DataMiningService; import com.sap.sailing.server.RacingEventService; import com.sap.sse.datamining.DataMiningServer; -import com.sap.sse.datamining.DataRetrieverChainDefinition; import com.sap.sse.datamining.Query; import com.sap.sse.datamining.StatisticQueryDefinition; +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; import com.sap.sse.datamining.factories.FunctionDTOFactory; import com.sap.sse.datamining.functions.Function; -import com.sap.sse.datamining.impl.DataRetrieverTypeWithInformation; +import com.sap.sse.datamining.impl.components.DataRetrieverTypeWithInformation; import com.sap.sse.datamining.shared.DataMiningSession; import com.sap.sse.datamining.shared.QueryResult; import com.sap.sse.datamining.shared.SSEDataMiningSerializationDummy; diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/AbstractEnrichingProcessor.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/AbstractEnrichingProcessor.java index a372e19c7eb..0f0068ac13c 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/AbstractEnrichingProcessor.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/AbstractEnrichingProcessor.java @@ -3,7 +3,7 @@ package com.sap.sailing.polars.mining; import java.util.Collection; import java.util.concurrent.ExecutorService; -import com.sap.sse.datamining.AdditionalResultDataBuilder; +import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.components.ProcessorInstruction; import com.sap.sse.datamining.impl.components.AbstractParallelProcessor; diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/CubicRegressionPerCourseProcessor.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/CubicRegressionPerCourseProcessor.java index c462f523d7f..45f6024359b 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/CubicRegressionPerCourseProcessor.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/CubicRegressionPerCourseProcessor.java @@ -14,7 +14,7 @@ import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException; -import com.sap.sse.datamining.AdditionalResultDataBuilder; +import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.factories.GroupKeyFactory; import com.sap.sse.datamining.impl.components.GroupedDataEntry; diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessorImpl.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessorImpl.java index d389c4833de..3497de8741c 100755 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessorImpl.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/MovingAverageProcessorImpl.java @@ -25,7 +25,7 @@ import com.sap.sailing.domain.tracking.WindWithConfidence; import com.sap.sailing.polars.regression.MovingAverageBoatSpeedEstimator; import com.sap.sse.common.TimePoint; import com.sap.sse.common.Util.Pair; -import com.sap.sse.datamining.AdditionalResultDataBuilder; +import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.data.Cluster; import com.sap.sse.datamining.data.ClusterGroup; import com.sap.sse.datamining.factories.GroupKeyFactory; diff --git a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/SpeedRegressionPerAngleClusterProcessor.java b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/SpeedRegressionPerAngleClusterProcessor.java index 0b8267c03e9..275d6f6634f 100644 --- a/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/SpeedRegressionPerAngleClusterProcessor.java +++ b/java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/SpeedRegressionPerAngleClusterProcessor.java @@ -16,7 +16,7 @@ import com.sap.sailing.domain.common.impl.KnotSpeedImpl; import com.sap.sailing.domain.polars.NotEnoughDataHasBeenAddedException; import com.sap.sailing.polars.regression.IncrementalLeastSquares; import com.sap.sailing.polars.regression.impl.IncrementalAnyOrderLeastSquaresImpl; -import com.sap.sse.datamining.AdditionalResultDataBuilder; +import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.data.Cluster; import com.sap.sse.datamining.data.ClusterGroup; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestDataRetrieverChainCreation.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestDataRetrieverChainCreation.java index 16050d89c75..926127a0ad1 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestDataRetrieverChainCreation.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestDataRetrieverChainCreation.java @@ -10,10 +10,12 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import com.sap.sse.datamining.DataRetrieverChainBuilder; -import com.sap.sse.datamining.DataRetrieverChainDefinition; +import com.sap.sse.datamining.components.DataRetrieverChainBuilder; +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; import com.sap.sse.datamining.components.FilterCriterion; import com.sap.sse.datamining.components.Processor; +import com.sap.sse.datamining.impl.components.DataRetrieverTypeWithInformation; +import com.sap.sse.datamining.impl.components.SimpleDataRetrieverChainDefinition; import com.sap.sse.datamining.impl.criterias.AbstractFilterCriterion; import com.sap.sse.datamining.test.functions.registry.test_classes.Test_Regatta; import com.sap.sse.datamining.test.functions.registry.test_contexts.Test_HasLegOfCompetitorContext; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestDataRetrieverChainDefinitionRegistry.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestDataRetrieverChainDefinitionRegistry.java index b25ff05f770..3e4077799c2 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestDataRetrieverChainDefinitionRegistry.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestDataRetrieverChainDefinitionRegistry.java @@ -10,9 +10,10 @@ import java.util.HashSet; import org.junit.Before; import org.junit.Test; -import com.sap.sse.datamining.DataRetrieverChainDefinition; import com.sap.sse.datamining.ModifiableDataMiningServer; +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; import com.sap.sse.datamining.components.Processor; +import com.sap.sse.datamining.impl.components.SimpleDataRetrieverChainDefinition; import com.sap.sse.datamining.test.functions.registry.test_classes.Test_Regatta; import com.sap.sse.datamining.test.functions.registry.test_contexts.Test_HasLegOfCompetitorContext; import com.sap.sse.datamining.test.functions.registry.test_contexts.Test_HasRaceContext; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestDimensionsValuesQuery.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestDimensionsValuesQuery.java index d91318f50db..522ee2f2b45 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestDimensionsValuesQuery.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestDimensionsValuesQuery.java @@ -14,11 +14,12 @@ import java.util.concurrent.ExecutionException; import org.junit.Before; import org.junit.Test; -import com.sap.sse.datamining.DataRetrieverChainDefinition; import com.sap.sse.datamining.ModifiableDataMiningServer; import com.sap.sse.datamining.Query; +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.functions.Function; +import com.sap.sse.datamining.impl.components.SimpleDataRetrieverChainDefinition; import com.sap.sse.datamining.shared.GroupKey; import com.sap.sse.datamining.shared.QueryResult; import com.sap.sse.datamining.shared.impl.GenericGroupKey; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestProcessorQuery.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestProcessorQuery.java index 543fa2057e7..dd13914bbc6 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestProcessorQuery.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestProcessorQuery.java @@ -20,9 +20,9 @@ import java.util.logging.Logger; import org.junit.Test; import com.sap.sse.datamining.AdditionalQueryData; -import com.sap.sse.datamining.AdditionalResultDataBuilder; import com.sap.sse.datamining.Query; import com.sap.sse.datamining.QueryState; +import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.components.ProcessorInstruction; import com.sap.sse.datamining.functions.Function; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAbstractParallelProcessorFinishing.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAbstractParallelProcessorFinishing.java index 44232f55bbf..686d2645408 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAbstractParallelProcessorFinishing.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAbstractParallelProcessorFinishing.java @@ -10,7 +10,7 @@ import java.util.HashSet; import org.junit.Before; import org.junit.Test; -import com.sap.sse.datamining.AdditionalResultDataBuilder; +import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.components.ProcessorInstruction; import com.sap.sse.datamining.test.util.ConcurrencyTestsUtil; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAbstractParallelProcessorWithManySimpleInstructions.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAbstractParallelProcessorWithManySimpleInstructions.java index c140bdbdb35..90d99ebac39 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAbstractParallelProcessorWithManySimpleInstructions.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAbstractParallelProcessorWithManySimpleInstructions.java @@ -9,7 +9,7 @@ import java.util.Collection; import org.junit.Before; import org.junit.Test; -import com.sap.sse.datamining.AdditionalResultDataBuilder; +import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.components.ProcessorInstruction; import com.sap.sse.datamining.test.util.ConcurrencyTestsUtil; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestStatisticQuery.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestStatisticQuery.java similarity index 96% rename from java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestStatisticQuery.java rename to java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestStatisticQuery.java index 2a72e9368e8..957baf5fee1 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestStatisticQuery.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestStatisticQuery.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.impl; +package com.sap.sse.datamining.impl.components; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; @@ -15,13 +15,15 @@ import java.util.concurrent.ExecutorService; import org.junit.Test; -import com.sap.sse.datamining.DataRetrieverChainDefinition; import com.sap.sse.datamining.ModifiableDataMiningServer; import com.sap.sse.datamining.Query; import com.sap.sse.datamining.QueryState; import com.sap.sse.datamining.StatisticQueryDefinition; +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.factories.FunctionFactory; +import com.sap.sse.datamining.impl.AbstractDataSourceProvider; +import com.sap.sse.datamining.impl.ModifiableStatisticQueryDefinition; import com.sap.sse.datamining.impl.components.AbstractRetrievalProcessor; import com.sap.sse.datamining.shared.GroupKey; import com.sap.sse.datamining.shared.QueryResult; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestFunctionManagerAsFunctionProvider.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestFunctionManagerAsFunctionProvider.java index 9b7b980dad9..7a122c778bd 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestFunctionManagerAsFunctionProvider.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestFunctionManagerAsFunctionProvider.java @@ -13,11 +13,11 @@ import java.util.Locale; import org.junit.Before; import org.junit.Test; -import com.sap.sse.datamining.DataRetrieverChainDefinition; import com.sap.sse.datamining.ModifiableDataMiningServer; +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.functions.Function; -import com.sap.sse.datamining.impl.SimpleDataRetrieverChainDefinition; +import com.sap.sse.datamining.impl.components.SimpleDataRetrieverChainDefinition; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; import com.sap.sse.datamining.test.functions.registry.test_classes.Test_Named; import com.sap.sse.datamining.test.functions.registry.test_classes.Test_Regatta; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestFunctionManagerAsFunctionRegistry.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestFunctionManagerAsFunctionRegistry.java index d50a1bb498f..26d4a178892 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestFunctionManagerAsFunctionRegistry.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestFunctionManagerAsFunctionRegistry.java @@ -12,13 +12,13 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.sap.sse.datamining.AggregationProcessorDefinitionRegistry; -import com.sap.sse.datamining.DataRetrieverChainDefinitionRegistry; import com.sap.sse.datamining.ModifiableDataMiningServer; +import com.sap.sse.datamining.components.management.AggregationProcessorDefinitionRegistry; +import com.sap.sse.datamining.components.management.DataRetrieverChainDefinitionRegistry; import com.sap.sse.datamining.functions.Function; -import com.sap.sse.datamining.impl.AggregationProcessorDefinitionManager; import com.sap.sse.datamining.impl.DataMiningServerImpl; -import com.sap.sse.datamining.impl.SimpleDataRetrieverChainDefinitionManager; +import com.sap.sse.datamining.impl.components.management.AggregationProcessorDefinitionManager; +import com.sap.sse.datamining.impl.components.management.SimpleDataRetrieverChainDefinitionManager; import com.sap.sse.datamining.test.functions.registry.test_contexts.Test_HasContextWithDeadConnectorEnd; import com.sap.sse.datamining.test.functions.registry.test_contexts.Test_HasLegOfCompetitorContext; import com.sap.sse.datamining.test.functions.registry.test_contexts.Test_HasRaceContext; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/TestsUtil.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/TestsUtil.java index 3bf00b4948e..a893133ccf7 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/TestsUtil.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/TestsUtil.java @@ -1,11 +1,11 @@ package com.sap.sse.datamining.test.util; -import com.sap.sse.datamining.AggregationProcessorDefinitionRegistry; -import com.sap.sse.datamining.DataRetrieverChainDefinitionRegistry; import com.sap.sse.datamining.ModifiableDataMiningServer; -import com.sap.sse.datamining.impl.AggregationProcessorDefinitionManager; +import com.sap.sse.datamining.components.management.AggregationProcessorDefinitionRegistry; +import com.sap.sse.datamining.components.management.DataRetrieverChainDefinitionRegistry; import com.sap.sse.datamining.impl.DataMiningServerImpl; -import com.sap.sse.datamining.impl.SimpleDataRetrieverChainDefinitionManager; +import com.sap.sse.datamining.impl.components.management.AggregationProcessorDefinitionManager; +import com.sap.sse.datamining.impl.components.management.SimpleDataRetrieverChainDefinitionManager; import com.sap.sse.datamining.impl.functions.FunctionManager; import com.sap.sse.i18n.ResourceBundleStringMessages; import com.sap.sse.i18n.impl.CompoundResourceBundleStringMessages; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/components/BlockingProcessor.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/components/BlockingProcessor.java index 56fe35c6717..390880631e3 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/components/BlockingProcessor.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/components/BlockingProcessor.java @@ -3,7 +3,7 @@ package com.sap.sse.datamining.test.util.components; import java.util.Collection; import java.util.concurrent.ExecutorService; -import com.sap.sse.datamining.AdditionalResultDataBuilder; +import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.components.ProcessorInstruction; import com.sap.sse.datamining.impl.components.AbstractParallelProcessor; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/components/NullProcessor.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/components/NullProcessor.java index 13528c53649..dbece9847af 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/components/NullProcessor.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/components/NullProcessor.java @@ -1,6 +1,6 @@ package com.sap.sse.datamining.test.util.components; -import com.sap.sse.datamining.AdditionalResultDataBuilder; +import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.impl.components.AbstractProcessor; public class NullProcessor extends AbstractProcessor { diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/components/SingleDataRetrieverChainDefinition.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/components/SingleDataRetrieverChainDefinition.java index 2f9823af476..71392407ab4 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/components/SingleDataRetrieverChainDefinition.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/components/SingleDataRetrieverChainDefinition.java @@ -1,7 +1,7 @@ package com.sap.sse.datamining.test.util.components; import com.sap.sse.datamining.components.Processor; -import com.sap.sse.datamining.impl.SimpleDataRetrieverChainDefinition; +import com.sap.sse.datamining.impl.components.SimpleDataRetrieverChainDefinition; public class SingleDataRetrieverChainDefinition extends SimpleDataRetrieverChainDefinition { diff --git a/java/com.sap.sse.datamining/META-INF/MANIFEST.MF b/java/com.sap.sse.datamining/META-INF/MANIFEST.MF index a1611e0d896..eb4951d9831 100644 --- a/java/com.sap.sse.datamining/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.datamining/META-INF/MANIFEST.MF @@ -8,12 +8,14 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.osgi.framework;version="1.7.0" Export-Package: com.sap.sse.datamining, com.sap.sse.datamining.components, + com.sap.sse.datamining.components.management, com.sap.sse.datamining.data, com.sap.sse.datamining.factories, com.sap.sse.datamining.functions, com.sap.sse.datamining.impl, com.sap.sse.datamining.impl.components, com.sap.sse.datamining.impl.components.aggregators, + com.sap.sse.datamining.impl.components.management, com.sap.sse.datamining.impl.criterias, com.sap.sse.datamining.impl.data, com.sap.sse.datamining.impl.functions, diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataMiningBundleService.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataMiningBundleService.java index f428b302655..8f0ea3b2104 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataMiningBundleService.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataMiningBundleService.java @@ -1,5 +1,7 @@ package com.sap.sse.datamining; +import com.sap.sse.datamining.components.AggregationProcessorDefinition; +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; import com.sap.sse.datamining.shared.annotations.Dimension; import com.sap.sse.datamining.shared.annotations.Statistic; import com.sap.sse.i18n.ResourceBundleStringMessages; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataMiningServer.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataMiningServer.java index 47e3bee5555..df886c76272 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataMiningServer.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataMiningServer.java @@ -8,6 +8,10 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.ExecutorService; +import com.sap.sse.datamining.components.AggregationProcessorDefinition; +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; +import com.sap.sse.datamining.components.management.AggregationProcessorDefinitionProvider; +import com.sap.sse.datamining.components.management.DataRetrieverChainDefinitionProvider; import com.sap.sse.datamining.functions.Function; import com.sap.sse.datamining.functions.FunctionProvider; import com.sap.sse.datamining.shared.DataMiningSession; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/ModifiableDataMiningServer.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/ModifiableDataMiningServer.java index ea3f05751e8..6388ed65300 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/ModifiableDataMiningServer.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/ModifiableDataMiningServer.java @@ -1,5 +1,9 @@ package com.sap.sse.datamining; +import com.sap.sse.datamining.components.AggregationProcessorDefinition; +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; +import com.sap.sse.datamining.components.management.AggregationProcessorDefinitionRegistry; +import com.sap.sse.datamining.components.management.DataRetrieverChainDefinitionRegistry; import com.sap.sse.datamining.functions.FunctionRegistry; import com.sap.sse.i18n.ResourceBundleStringMessages; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/StatisticQueryDefinition.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/StatisticQueryDefinition.java index 183e327fe23..7685cad96fd 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/StatisticQueryDefinition.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/StatisticQueryDefinition.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; import com.sap.sse.datamining.functions.Function; import com.sap.sse.datamining.shared.components.AggregatorType; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/AdditionalResultDataBuilder.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/AdditionalResultDataBuilder.java similarity index 96% rename from java/com.sap.sse.datamining/src/com/sap/sse/datamining/AdditionalResultDataBuilder.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/AdditionalResultDataBuilder.java index 67b1934f15f..0e80a67f054 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/AdditionalResultDataBuilder.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/AdditionalResultDataBuilder.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining; +package com.sap.sse.datamining.components; import java.util.Locale; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/AggregationProcessorDefinition.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/AggregationProcessorDefinition.java similarity index 92% rename from java/com.sap.sse.datamining/src/com/sap/sse/datamining/AggregationProcessorDefinition.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/AggregationProcessorDefinition.java index 0f550c0638b..1430fa6e97d 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/AggregationProcessorDefinition.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/AggregationProcessorDefinition.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining; +package com.sap.sse.datamining.components; import com.sap.sse.datamining.impl.components.aggregators.AbstractParallelGroupedDataStoringAggregationProcessor; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataRetrieverChainBuilder.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/DataRetrieverChainBuilder.java similarity index 94% rename from java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataRetrieverChainBuilder.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/DataRetrieverChainBuilder.java index df59abc6f4e..5b2244ddd91 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataRetrieverChainBuilder.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/DataRetrieverChainBuilder.java @@ -1,7 +1,5 @@ -package com.sap.sse.datamining; +package com.sap.sse.datamining.components; -import com.sap.sse.datamining.components.FilterCriterion; -import com.sap.sse.datamining.components.Processor; /** * Used to construct a chain of retriever processors step by step. Allows to set the filter and result diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataRetrieverChainDefinition.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/DataRetrieverChainDefinition.java similarity index 97% rename from java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataRetrieverChainDefinition.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/DataRetrieverChainDefinition.java index c37ca804925..ec2424adc2a 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataRetrieverChainDefinition.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/DataRetrieverChainDefinition.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining; +package com.sap.sse.datamining.components; import java.util.Collection; import java.util.List; @@ -6,9 +6,8 @@ import java.util.Locale; import java.util.UUID; import java.util.concurrent.ExecutorService; -import com.sap.sse.datamining.components.Processor; -import com.sap.sse.datamining.impl.DataRetrieverTypeWithInformation; import com.sap.sse.datamining.impl.components.AbstractRetrievalProcessor; +import com.sap.sse.datamining.impl.components.DataRetrieverTypeWithInformation; import com.sap.sse.i18n.ResourceBundleStringMessages; /** diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/Processor.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/Processor.java index 1f10fe0ed35..71cda34c0b1 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/Processor.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/Processor.java @@ -1,6 +1,5 @@ package com.sap.sse.datamining.components; -import com.sap.sse.datamining.AdditionalResultDataBuilder; public interface Processor { diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/AggregationProcessorDefinitionProvider.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/management/AggregationProcessorDefinitionProvider.java similarity index 60% rename from java/com.sap.sse.datamining/src/com/sap/sse/datamining/AggregationProcessorDefinitionProvider.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/management/AggregationProcessorDefinitionProvider.java index 7105b106464..b52a768488e 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/AggregationProcessorDefinitionProvider.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/management/AggregationProcessorDefinitionProvider.java @@ -1,4 +1,6 @@ -package com.sap.sse.datamining; +package com.sap.sse.datamining.components.management; + +import com.sap.sse.datamining.components.AggregationProcessorDefinition; public interface AggregationProcessorDefinitionProvider { diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/AggregationProcessorDefinitionRegistry.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/management/AggregationProcessorDefinitionRegistry.java similarity index 70% rename from java/com.sap.sse.datamining/src/com/sap/sse/datamining/AggregationProcessorDefinitionRegistry.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/management/AggregationProcessorDefinitionRegistry.java index 887031d2a36..9aa610ff8db 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/AggregationProcessorDefinitionRegistry.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/management/AggregationProcessorDefinitionRegistry.java @@ -1,4 +1,6 @@ -package com.sap.sse.datamining; +package com.sap.sse.datamining.components.management; + +import com.sap.sse.datamining.components.AggregationProcessorDefinition; public interface AggregationProcessorDefinitionRegistry extends AggregationProcessorDefinitionProvider { diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataMiningQueryManager.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/management/DataMiningQueryManager.java similarity index 68% rename from java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataMiningQueryManager.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/management/DataMiningQueryManager.java index 1131dca26ae..68ffedc07b5 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataMiningQueryManager.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/management/DataMiningQueryManager.java @@ -1,6 +1,7 @@ -package com.sap.sse.datamining; +package com.sap.sse.datamining.components.management; -import com.sap.sse.datamining.impl.NullDataMiningQueryManager; +import com.sap.sse.datamining.Query; +import com.sap.sse.datamining.impl.components.management.NullDataMiningQueryManager; import com.sap.sse.datamining.shared.DataMiningSession; import com.sap.sse.datamining.shared.QueryResult; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataRetrieverChainDefinitionProvider.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/management/DataRetrieverChainDefinitionProvider.java similarity index 84% rename from java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataRetrieverChainDefinitionProvider.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/management/DataRetrieverChainDefinitionProvider.java index eeec25d6d1f..e710853f141 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataRetrieverChainDefinitionProvider.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/management/DataRetrieverChainDefinitionProvider.java @@ -1,8 +1,10 @@ -package com.sap.sse.datamining; +package com.sap.sse.datamining.components.management; import java.util.Collection; import java.util.UUID; +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; + public interface DataRetrieverChainDefinitionProvider { public Collection> getBySourceType( diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataRetrieverChainDefinitionRegistry.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/management/DataRetrieverChainDefinitionRegistry.java similarity index 70% rename from java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataRetrieverChainDefinitionRegistry.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/management/DataRetrieverChainDefinitionRegistry.java index 6ed775aea2f..4832bcd5ced 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/DataRetrieverChainDefinitionRegistry.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/management/DataRetrieverChainDefinitionRegistry.java @@ -1,4 +1,6 @@ -package com.sap.sse.datamining; +package com.sap.sse.datamining.components.management; + +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; public interface DataRetrieverChainDefinitionRegistry extends DataRetrieverChainDefinitionProvider { diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/factories/QueryFactory.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/factories/QueryFactory.java index 4465d2b293c..f3d8e44e801 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/factories/QueryFactory.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/factories/QueryFactory.java @@ -10,10 +10,10 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ExecutorService; -import com.sap.sse.datamining.DataRetrieverChainBuilder; -import com.sap.sse.datamining.DataRetrieverChainDefinition; import com.sap.sse.datamining.Query; import com.sap.sse.datamining.StatisticQueryDefinition; +import com.sap.sse.datamining.components.DataRetrieverChainBuilder; +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; import com.sap.sse.datamining.components.FilterCriterion; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.functions.Function; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/functions/FunctionProvider.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/functions/FunctionProvider.java index f63235875e3..8ee0b245680 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/functions/FunctionProvider.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/functions/FunctionProvider.java @@ -2,7 +2,7 @@ package com.sap.sse.datamining.functions; import java.util.Collection; -import com.sap.sse.datamining.DataRetrieverChainDefinition; +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; public interface FunctionProvider { diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/DataMiningFrameworkActivator.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/DataMiningFrameworkActivator.java index b4d81324512..be94094edca 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/DataMiningFrameworkActivator.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/DataMiningFrameworkActivator.java @@ -12,14 +12,16 @@ import org.osgi.framework.ServiceRegistration; import org.osgi.util.tracker.ServiceTracker; import org.osgi.util.tracker.ServiceTrackerCustomizer; -import com.sap.sse.datamining.AggregationProcessorDefinition; -import com.sap.sse.datamining.AggregationProcessorDefinitionRegistry; import com.sap.sse.datamining.DataMiningBundleService; import com.sap.sse.datamining.DataMiningServer; -import com.sap.sse.datamining.DataRetrieverChainDefinition; -import com.sap.sse.datamining.DataRetrieverChainDefinitionRegistry; import com.sap.sse.datamining.DataSourceProvider; import com.sap.sse.datamining.ModifiableDataMiningServer; +import com.sap.sse.datamining.components.AggregationProcessorDefinition; +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; +import com.sap.sse.datamining.components.management.AggregationProcessorDefinitionRegistry; +import com.sap.sse.datamining.components.management.DataRetrieverChainDefinitionRegistry; +import com.sap.sse.datamining.impl.components.management.AggregationProcessorDefinitionManager; +import com.sap.sse.datamining.impl.components.management.SimpleDataRetrieverChainDefinitionManager; import com.sap.sse.datamining.impl.functions.FunctionManager; import com.sap.sse.i18n.impl.ResourceBundleStringMessagesImpl; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/DataMiningServerImpl.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/DataMiningServerImpl.java index 9fd583170e0..141ed8af43f 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/DataMiningServerImpl.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/DataMiningServerImpl.java @@ -11,21 +11,22 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.ExecutorService; -import com.sap.sse.datamining.AggregationProcessorDefinition; -import com.sap.sse.datamining.AggregationProcessorDefinitionProvider; -import com.sap.sse.datamining.AggregationProcessorDefinitionRegistry; -import com.sap.sse.datamining.DataMiningQueryManager; -import com.sap.sse.datamining.DataRetrieverChainDefinition; -import com.sap.sse.datamining.DataRetrieverChainDefinitionProvider; -import com.sap.sse.datamining.DataRetrieverChainDefinitionRegistry; import com.sap.sse.datamining.DataSourceProvider; import com.sap.sse.datamining.ModifiableDataMiningServer; import com.sap.sse.datamining.Query; import com.sap.sse.datamining.StatisticQueryDefinition; +import com.sap.sse.datamining.components.AggregationProcessorDefinition; +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; +import com.sap.sse.datamining.components.management.AggregationProcessorDefinitionProvider; +import com.sap.sse.datamining.components.management.AggregationProcessorDefinitionRegistry; +import com.sap.sse.datamining.components.management.DataMiningQueryManager; +import com.sap.sse.datamining.components.management.DataRetrieverChainDefinitionProvider; +import com.sap.sse.datamining.components.management.DataRetrieverChainDefinitionRegistry; import com.sap.sse.datamining.factories.QueryFactory; import com.sap.sse.datamining.functions.Function; import com.sap.sse.datamining.functions.FunctionProvider; import com.sap.sse.datamining.functions.FunctionRegistry; +import com.sap.sse.datamining.impl.components.management.StrategyPerQueryTypeManager; import com.sap.sse.datamining.shared.DataMiningSession; import com.sap.sse.datamining.shared.QueryResult; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/ModifiableStatisticQueryDefinition.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/ModifiableStatisticQueryDefinition.java index fc67f26d843..fe2c5bfe83d 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/ModifiableStatisticQueryDefinition.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/ModifiableStatisticQueryDefinition.java @@ -7,8 +7,8 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import com.sap.sse.datamining.DataRetrieverChainDefinition; import com.sap.sse.datamining.StatisticQueryDefinition; +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; import com.sap.sse.datamining.functions.Function; import com.sap.sse.datamining.shared.components.AggregatorType; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/ProcessorQuery.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/ProcessorQuery.java index 978ee6c2e2f..496d4c38127 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/ProcessorQuery.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/ProcessorQuery.java @@ -15,9 +15,9 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.sap.sse.datamining.AdditionalQueryData; -import com.sap.sse.datamining.AdditionalResultDataBuilder; import com.sap.sse.datamining.Query; import com.sap.sse.datamining.QueryState; +import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.impl.components.OverwritingResultDataBuilder; import com.sap.sse.datamining.shared.AdditionalResultData; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/AbstractParallelMultiDimensionalNestingGroupingProcessor.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/AbstractParallelMultiDimensionalNestingGroupingProcessor.java index 9d1a600576a..db8d00840e8 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/AbstractParallelMultiDimensionalNestingGroupingProcessor.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/AbstractParallelMultiDimensionalNestingGroupingProcessor.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.concurrent.ExecutorService; -import com.sap.sse.datamining.AdditionalResultDataBuilder; +import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.components.ProcessorInstruction; import com.sap.sse.datamining.functions.Function; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/AbstractParallelProcessor.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/AbstractParallelProcessor.java index 4625981a659..30c1a6b3f40 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/AbstractParallelProcessor.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/AbstractParallelProcessor.java @@ -9,7 +9,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; -import com.sap.sse.datamining.AdditionalResultDataBuilder; +import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.components.ProcessorInstruction; import com.sap.sse.datamining.components.ProcessorInstructionHandler; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/AbstractRetrievalProcessor.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/AbstractRetrievalProcessor.java index d97de9573d1..9cfad19b9b0 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/AbstractRetrievalProcessor.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/AbstractRetrievalProcessor.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.concurrent.ExecutorService; import java.util.concurrent.atomic.AtomicInteger; -import com.sap.sse.datamining.AdditionalResultDataBuilder; +import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.components.ProcessorInstruction; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/DataRetrieverTypeWithInformation.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/DataRetrieverTypeWithInformation.java similarity index 98% rename from java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/DataRetrieverTypeWithInformation.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/DataRetrieverTypeWithInformation.java index a6ec6485aa7..ee318cc5fd6 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/DataRetrieverTypeWithInformation.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/DataRetrieverTypeWithInformation.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.impl; +package com.sap.sse.datamining.impl.components; import com.sap.sse.datamining.components.Processor; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/OverwritingResultDataBuilder.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/OverwritingResultDataBuilder.java index f5a5cb3ffb5..9529d85cb40 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/OverwritingResultDataBuilder.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/OverwritingResultDataBuilder.java @@ -2,7 +2,7 @@ package com.sap.sse.datamining.impl.components; import java.util.Locale; -import com.sap.sse.datamining.AdditionalResultDataBuilder; +import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.functions.Function; import com.sap.sse.datamining.shared.AdditionalResultData; import com.sap.sse.datamining.shared.data.Unit; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/ParallelFilteringProcessor.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/ParallelFilteringProcessor.java index 4f2381711c9..2d4e02aa46a 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/ParallelFilteringProcessor.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/ParallelFilteringProcessor.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.concurrent.ExecutorService; import java.util.concurrent.atomic.AtomicInteger; -import com.sap.sse.datamining.AdditionalResultDataBuilder; +import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.components.FilterCriterion; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.components.ProcessorInstruction; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/ParallelGroupedElementsValueExtractionProcessor.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/ParallelGroupedElementsValueExtractionProcessor.java index 80f1eda1903..f26c992383e 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/ParallelGroupedElementsValueExtractionProcessor.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/ParallelGroupedElementsValueExtractionProcessor.java @@ -3,7 +3,7 @@ package com.sap.sse.datamining.impl.components; import java.util.Collection; import java.util.concurrent.ExecutorService; -import com.sap.sse.datamining.AdditionalResultDataBuilder; +import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.components.ProcessorInstruction; import com.sap.sse.datamining.functions.Function; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/SimpleDataRetrieverChainBuilder.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/SimpleDataRetrieverChainBuilder.java similarity index 97% rename from java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/SimpleDataRetrieverChainBuilder.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/SimpleDataRetrieverChainBuilder.java index b9f5350fd41..613365cdd23 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/SimpleDataRetrieverChainBuilder.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/SimpleDataRetrieverChainBuilder.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.impl; +package com.sap.sse.datamining.impl.components; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -10,11 +10,10 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ExecutorService; -import com.sap.sse.datamining.DataRetrieverChainBuilder; -import com.sap.sse.datamining.DataRetrieverChainDefinition; +import com.sap.sse.datamining.components.DataRetrieverChainBuilder; +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; import com.sap.sse.datamining.components.FilterCriterion; import com.sap.sse.datamining.components.Processor; -import com.sap.sse.datamining.impl.components.ParallelFilteringProcessor; public class SimpleDataRetrieverChainBuilder implements DataRetrieverChainBuilder { diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/SimpleDataRetrieverChainDefinition.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/SimpleDataRetrieverChainDefinition.java similarity index 97% rename from java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/SimpleDataRetrieverChainDefinition.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/SimpleDataRetrieverChainDefinition.java index d7b80cad129..880ec07ba12 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/SimpleDataRetrieverChainDefinition.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/SimpleDataRetrieverChainDefinition.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.impl; +package com.sap.sse.datamining.impl.components; import java.util.ArrayList; import java.util.Collection; @@ -7,8 +7,8 @@ import java.util.Locale; import java.util.UUID; import java.util.concurrent.ExecutorService; -import com.sap.sse.datamining.DataRetrieverChainBuilder; -import com.sap.sse.datamining.DataRetrieverChainDefinition; +import com.sap.sse.datamining.components.DataRetrieverChainBuilder; +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; import com.sap.sse.datamining.components.Processor; import com.sap.sse.i18n.ResourceBundleStringMessages; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/aggregators/AbstractParallelStoringAggregationProcessor.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/aggregators/AbstractParallelStoringAggregationProcessor.java index 3ddd1cdd16b..1cde8e1bc04 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/aggregators/AbstractParallelStoringAggregationProcessor.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/aggregators/AbstractParallelStoringAggregationProcessor.java @@ -5,7 +5,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import com.sap.sse.datamining.AdditionalResultDataBuilder; +import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.impl.components.AbstractParallelProcessor; import com.sap.sse.datamining.impl.components.AbstractProcessorInstruction; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/aggregators/ParallelGroupedDataCountAggregationProcessor.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/aggregators/ParallelGroupedDataCountAggregationProcessor.java index ec33d695670..c8ee6275e41 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/aggregators/ParallelGroupedDataCountAggregationProcessor.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/aggregators/ParallelGroupedDataCountAggregationProcessor.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.ExecutorService; -import com.sap.sse.datamining.AdditionalResultDataBuilder; +import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.components.Processor; import com.sap.sse.datamining.impl.components.GroupedDataEntry; import com.sap.sse.datamining.shared.GroupKey; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/AggregationProcessorDefinitionManager.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/AggregationProcessorDefinitionManager.java similarity index 74% rename from java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/AggregationProcessorDefinitionManager.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/AggregationProcessorDefinitionManager.java index fce801cb023..02a6788a308 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/AggregationProcessorDefinitionManager.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/AggregationProcessorDefinitionManager.java @@ -1,7 +1,7 @@ -package com.sap.sse.datamining.impl; +package com.sap.sse.datamining.impl.components.management; -import com.sap.sse.datamining.AggregationProcessorDefinition; -import com.sap.sse.datamining.AggregationProcessorDefinitionRegistry; +import com.sap.sse.datamining.components.AggregationProcessorDefinition; +import com.sap.sse.datamining.components.management.AggregationProcessorDefinitionRegistry; public class AggregationProcessorDefinitionManager implements AggregationProcessorDefinitionRegistry { diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/NullDataMiningQueryManager.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/NullDataMiningQueryManager.java similarity index 74% rename from java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/NullDataMiningQueryManager.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/NullDataMiningQueryManager.java index 9f3de5c7446..0a589667a05 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/NullDataMiningQueryManager.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/NullDataMiningQueryManager.java @@ -1,7 +1,7 @@ -package com.sap.sse.datamining.impl; +package com.sap.sse.datamining.impl.components.management; -import com.sap.sse.datamining.DataMiningQueryManager; import com.sap.sse.datamining.Query; +import com.sap.sse.datamining.components.management.DataMiningQueryManager; import com.sap.sse.datamining.shared.DataMiningSession; import com.sap.sse.datamining.shared.QueryResult; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/SimpleDataRetrieverChainDefinitionManager.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/SimpleDataRetrieverChainDefinitionManager.java similarity index 96% rename from java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/SimpleDataRetrieverChainDefinitionManager.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/SimpleDataRetrieverChainDefinitionManager.java index 4d9f451f537..18fb2665c1d 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/SimpleDataRetrieverChainDefinitionManager.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/SimpleDataRetrieverChainDefinitionManager.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.impl; +package com.sap.sse.datamining.impl.components.management; import java.util.Collection; import java.util.HashMap; @@ -7,8 +7,8 @@ import java.util.Map; import java.util.Objects; import java.util.UUID; -import com.sap.sse.datamining.DataRetrieverChainDefinition; -import com.sap.sse.datamining.DataRetrieverChainDefinitionRegistry; +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; +import com.sap.sse.datamining.components.management.DataRetrieverChainDefinitionRegistry; public class SimpleDataRetrieverChainDefinitionManager implements DataRetrieverChainDefinitionRegistry { diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/SingleQueryPerDimensionManager.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/SingleQueryPerDimensionManager.java similarity index 89% rename from java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/SingleQueryPerDimensionManager.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/SingleQueryPerDimensionManager.java index bf4f96154be..6120ef662a2 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/SingleQueryPerDimensionManager.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/SingleQueryPerDimensionManager.java @@ -1,13 +1,14 @@ -package com.sap.sse.datamining.impl; +package com.sap.sse.datamining.impl.components.management; import java.util.Collection; import java.util.HashSet; -import com.sap.sse.datamining.DataMiningQueryManager; import com.sap.sse.datamining.Query; import com.sap.sse.datamining.Query.QueryType; +import com.sap.sse.datamining.components.management.DataMiningQueryManager; import com.sap.sse.datamining.functions.Function; -import com.sap.sse.datamining.impl.SingleQueryPerDimensionManager.Key; +import com.sap.sse.datamining.impl.AdditionalDimensionValuesQueryData; +import com.sap.sse.datamining.impl.components.management.SingleQueryPerDimensionManager.Key; import com.sap.sse.datamining.shared.DataMiningSession; public class SingleQueryPerDimensionManager extends SingleQueryPerKeyManager { diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/SingleQueryPerKeyManager.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/SingleQueryPerKeyManager.java similarity index 95% rename from java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/SingleQueryPerKeyManager.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/SingleQueryPerKeyManager.java index e5adbf5afbc..173b2e9085f 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/SingleQueryPerKeyManager.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/SingleQueryPerKeyManager.java @@ -1,11 +1,11 @@ -package com.sap.sse.datamining.impl; +package com.sap.sse.datamining.impl.components.management; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import com.sap.sse.datamining.DataMiningQueryManager; import com.sap.sse.datamining.Query; import com.sap.sse.datamining.QueryState; +import com.sap.sse.datamining.components.management.DataMiningQueryManager; import com.sap.sse.datamining.shared.DataMiningSession; import com.sap.sse.datamining.shared.QueryResult; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/SingleQueryPerSessionManager.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/SingleQueryPerSessionManager.java similarity index 89% rename from java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/SingleQueryPerSessionManager.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/SingleQueryPerSessionManager.java index 5008fdf2139..ebf450b7f81 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/SingleQueryPerSessionManager.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/SingleQueryPerSessionManager.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.impl; +package com.sap.sse.datamining.impl.components.management; import java.util.Collection; import java.util.HashSet; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/StrategyPerQueryTypeManager.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/StrategyPerQueryTypeManager.java similarity index 88% rename from java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/StrategyPerQueryTypeManager.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/StrategyPerQueryTypeManager.java index 402334304a2..8be84d77838 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/StrategyPerQueryTypeManager.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/StrategyPerQueryTypeManager.java @@ -1,11 +1,11 @@ -package com.sap.sse.datamining.impl; +package com.sap.sse.datamining.impl.components.management; import java.util.HashMap; import java.util.Map; -import com.sap.sse.datamining.DataMiningQueryManager; import com.sap.sse.datamining.Query; import com.sap.sse.datamining.Query.QueryType; +import com.sap.sse.datamining.components.management.DataMiningQueryManager; import com.sap.sse.datamining.shared.DataMiningSession; import com.sap.sse.datamining.shared.QueryResult; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/FunctionManager.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/FunctionManager.java index 187751229f5..ddc9d606f77 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/FunctionManager.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/FunctionManager.java @@ -13,14 +13,14 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import com.sap.sse.datamining.DataRetrieverChainDefinition; +import com.sap.sse.datamining.components.DataRetrieverChainDefinition; import com.sap.sse.datamining.components.FilterCriterion; import com.sap.sse.datamining.factories.FunctionDTOFactory; import com.sap.sse.datamining.factories.FunctionFactory; import com.sap.sse.datamining.functions.Function; import com.sap.sse.datamining.functions.FunctionProvider; import com.sap.sse.datamining.functions.FunctionRegistry; -import com.sap.sse.datamining.impl.DataRetrieverTypeWithInformation; +import com.sap.sse.datamining.impl.components.DataRetrieverTypeWithInformation; import com.sap.sse.datamining.impl.functions.criterias.FunctionMatchesDTOFilterCriterion; import com.sap.sse.datamining.impl.functions.criterias.MethodIsValidConnectorFilterCriterion; import com.sap.sse.datamining.impl.functions.criterias.MethodIsValidDimensionFilterCriterion;