diff --git a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/util/OpenFunctionManager.java b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/util/OpenFunctionManager.java index 137c69bfb3c..9c7195101cc 100644 --- a/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/util/OpenFunctionManager.java +++ b/java/com.sap.sailing.datamining.test/src/com/sap/sailing/datamining/test/util/OpenFunctionManager.java @@ -3,7 +3,7 @@ package com.sap.sailing.datamining.test.util; import java.util.Collection; import com.sap.sse.datamining.functions.Function; -import com.sap.sse.datamining.impl.functions.FunctionManager; +import com.sap.sse.datamining.impl.components.management.FunctionManager; public class OpenFunctionManager extends FunctionManager { diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/data/Test_HasContextWithDeadConnectorEnd.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/data/Test_HasContextWithDeadConnectorEnd.java index 45f02a623c3..c2f830539b9 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/data/Test_HasContextWithDeadConnectorEnd.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/data/Test_HasContextWithDeadConnectorEnd.java @@ -1,6 +1,6 @@ package com.sap.sse.datamining.test.data; -import com.sap.sse.datamining.functions.FunctionRegistry; +import com.sap.sse.datamining.components.management.FunctionRegistry; import com.sap.sse.datamining.shared.annotations.Connector; import com.sap.sse.datamining.shared.annotations.Dimension; import com.sap.sse.datamining.shared.annotations.Statistic; diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/OpenFunctionManager.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/OpenFunctionManager.java index 1f0070ce588..c113711a9e0 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/OpenFunctionManager.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/util/OpenFunctionManager.java @@ -3,7 +3,7 @@ package com.sap.sse.datamining.test.util; import java.util.Collection; import com.sap.sse.datamining.functions.Function; -import com.sap.sse.datamining.impl.functions.FunctionManager; +import com.sap.sse.datamining.impl.components.management.FunctionManager; public class OpenFunctionManager extends FunctionManager { 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 4e866596ee9..2c807e3f07e 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 @@ -4,13 +4,13 @@ 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.components.management.DataSourceProviderRegistry; +import com.sap.sse.datamining.components.management.FunctionRegistry; import com.sap.sse.datamining.factories.DataMiningDTOFactory; -import com.sap.sse.datamining.functions.FunctionRegistry; import com.sap.sse.datamining.impl.DataMiningServerImpl; import com.sap.sse.datamining.impl.components.management.AggregationProcessorDefinitionManager; import com.sap.sse.datamining.impl.components.management.DataRetrieverChainDefinitionManager; import com.sap.sse.datamining.impl.components.management.DataSourceProviderManager; -import com.sap.sse.datamining.impl.functions.FunctionManager; +import com.sap.sse.datamining.impl.components.management.FunctionManager; import com.sap.sse.i18n.ResourceBundleStringMessages; import com.sap.sse.i18n.impl.CompoundResourceBundleStringMessages; import com.sap.sse.i18n.impl.ResourceBundleStringMessagesImpl; 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 ea14094408f..439d85ba50b 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 @@ -12,9 +12,9 @@ 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.components.management.FunctionProvider; import com.sap.sse.datamining.data.QueryResult; import com.sap.sse.datamining.functions.Function; -import com.sap.sse.datamining.functions.FunctionProvider; import com.sap.sse.datamining.impl.components.DataRetrieverLevel; import com.sap.sse.datamining.shared.DataMiningSession; import com.sap.sse.datamining.shared.dto.StatisticQueryDefinitionDTO; 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 96332d58006..5a84d420c00 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 @@ -4,7 +4,7 @@ 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.datamining.components.management.FunctionRegistry; import com.sap.sse.i18n.ResourceBundleStringMessages; public interface ModifiableDataMiningServer extends DataMiningServer { 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/components/management/FunctionProvider.java similarity index 91% rename from java/com.sap.sse.datamining/src/com/sap/sse/datamining/functions/FunctionProvider.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/management/FunctionProvider.java index aa413a2542d..456591f6b4a 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/components/management/FunctionProvider.java @@ -1,9 +1,10 @@ -package com.sap.sse.datamining.functions; +package com.sap.sse.datamining.components.management; import java.util.Collection; import java.util.Map; import com.sap.sse.datamining.components.DataRetrieverChainDefinition; +import com.sap.sse.datamining.functions.Function; import com.sap.sse.datamining.impl.components.DataRetrieverLevel; import com.sap.sse.datamining.shared.impl.dto.FunctionDTO; diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/functions/FunctionRegistry.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/management/FunctionRegistry.java similarity index 85% rename from java/com.sap.sse.datamining/src/com/sap/sse/datamining/functions/FunctionRegistry.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/management/FunctionRegistry.java index 3648a0a907a..668404ca759 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/functions/FunctionRegistry.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/management/FunctionRegistry.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.functions; +package com.sap.sse.datamining.components.management; public interface FunctionRegistry extends 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 7a80fcf7160..04b269b1d2d 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 @@ -21,7 +21,7 @@ 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.components.management.DataSourceProviderRegistry; -import com.sap.sse.datamining.functions.FunctionRegistry; +import com.sap.sse.datamining.components.management.FunctionRegistry; import com.sap.sse.datamining.impl.components.aggregators.ParallelGroupedDataCountAggregationProcessor; import com.sap.sse.datamining.impl.components.aggregators.ParallelGroupedNumberDataAverageAggregationProcessor; import com.sap.sse.datamining.impl.components.aggregators.ParallelGroupedNumberDataMaxAggregationProcessor; @@ -31,7 +31,7 @@ import com.sap.sse.datamining.impl.components.aggregators.ParallelGroupedNumberD import com.sap.sse.datamining.impl.components.management.AggregationProcessorDefinitionManager; import com.sap.sse.datamining.impl.components.management.DataRetrieverChainDefinitionManager; import com.sap.sse.datamining.impl.components.management.DataSourceProviderManager; -import com.sap.sse.datamining.impl.functions.FunctionManager; +import com.sap.sse.datamining.impl.components.management.FunctionManager; import com.sap.sse.i18n.impl.ResourceBundleStringMessagesImpl; public class DataMiningFrameworkActivator implements BundleActivator { 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 2d2c3e67fa9..bedf3fb7751 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 @@ -22,11 +22,11 @@ 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.components.management.DataSourceProviderRegistry; +import com.sap.sse.datamining.components.management.FunctionProvider; +import com.sap.sse.datamining.components.management.FunctionRegistry; import com.sap.sse.datamining.data.QueryResult; 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.DataRetrieverLevel; import com.sap.sse.datamining.impl.components.management.StrategyPerQueryTypeManager; import com.sap.sse.datamining.shared.DataMiningSession; 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/components/management/FunctionManager.java similarity index 98% rename from java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/FunctionManager.java rename to java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/management/FunctionManager.java index e882292f97f..fbc9fbd2565 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/components/management/FunctionManager.java @@ -1,4 +1,4 @@ -package com.sap.sse.datamining.impl.functions; +package com.sap.sse.datamining.impl.components.management; import java.lang.reflect.Method; import java.util.ArrayList; @@ -15,12 +15,14 @@ import java.util.logging.Logger; import com.sap.sse.common.Util; import com.sap.sse.datamining.components.DataRetrieverChainDefinition; import com.sap.sse.datamining.components.FilterCriterion; +import com.sap.sse.datamining.components.management.FunctionProvider; +import com.sap.sse.datamining.components.management.FunctionRegistry; import com.sap.sse.datamining.factories.DataMiningDTOFactory; 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.components.DataRetrieverLevel; +import com.sap.sse.datamining.impl.functions.ConcatenatingCompoundFunction; +import com.sap.sse.datamining.impl.functions.MethodWrappingFunction; 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;