From c47d9860b5b5386988c0b596d732e4b14fb78809 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Fri, 25 Sep 2015 16:31:16 +0200 Subject: [PATCH] removed Unit concept from data mining --- .../data/HasRaceOfCompetitorContext.java | 3 +-- .../HasTrackedLegOfCompetitorContext.java | 3 +-- .../com/sap/sailing/domain/common/Speed.java | 3 +-- .../datamining/presentation/ResultsChart.java | 3 +-- .../META-INF/MANIFEST.MF | 3 +-- .../sse/datamining/annotations/Statistic.java | 7 ----- .../sse/datamining/annotations/data/Unit.java | 14 ---------- .../shared/AdditionalResultData.java | 5 ---- .../datamining/shared/QueryResultBase.java | 3 --- .../SSEDataMiningSerializationDummy.java | 4 --- .../shared/impl/AdditionalResultDataImpl.java | 27 +++++-------------- .../shared/impl/NullAdditionalResultData.java | 11 -------- .../shared/impl/QueryResultBaseImpl.java | 11 -------- .../datamining/impl/TestStatisticQuery.java | 4 +-- .../impl/functions/TestCompoundFunction.java | 2 -- .../test/data/impl/DataTypeInterface.java | 3 +-- .../sse/datamining/test/domain/Test_Leg.java | 3 +-- .../AdditionalResultDataBuilder.java | 7 +++-- .../sse/datamining/functions/Function.java | 3 --- .../OverwritingResultDataBuilder.java | 21 +-------------- ...lGroupedDataCountAggregationProcessor.java | 2 -- .../AdditionalMethodWrappingFunctionData.java | 9 +------ .../ConcatenatingCompoundFunction.java | 9 ------- .../functions/MethodWrappingFunction.java | 27 ++++--------------- 24 files changed, 24 insertions(+), 163 deletions(-) delete mode 100644 java/com.sap.sse.datamining.annotations/src/com/sap/sse/datamining/annotations/data/Unit.java diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasRaceOfCompetitorContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasRaceOfCompetitorContext.java index 43e7c6b54f0..b73d7fab06f 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasRaceOfCompetitorContext.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasRaceOfCompetitorContext.java @@ -5,7 +5,6 @@ import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.Speed; import com.sap.sse.datamining.annotations.Connector; import com.sap.sse.datamining.annotations.Statistic; -import com.sap.sse.datamining.annotations.data.Unit; public interface HasRaceOfCompetitorContext { @@ -15,7 +14,7 @@ public interface HasRaceOfCompetitorContext { @Connector(messageKey="Competitor") public Competitor getCompetitor(); - @Statistic(messageKey="DistanceAtStart", resultUnit=Unit.None, resultDecimals=2, ordinal=0) + @Statistic(messageKey="DistanceAtStart", resultDecimals=2, ordinal=0) public Distance getDistanceToStartLineAtStart(); @Statistic(messageKey="DistanceToStarboardSideAtStart", resultDecimals=2, ordinal=1) diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasTrackedLegOfCompetitorContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasTrackedLegOfCompetitorContext.java index b72588dd537..c863c6bb2f7 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasTrackedLegOfCompetitorContext.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasTrackedLegOfCompetitorContext.java @@ -5,7 +5,6 @@ import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; import com.sap.sse.datamining.annotations.Connector; import com.sap.sse.datamining.annotations.Statistic; -import com.sap.sse.datamining.annotations.data.Unit; public interface HasTrackedLegOfCompetitorContext { @@ -17,7 +16,7 @@ public interface HasTrackedLegOfCompetitorContext { @Connector(messageKey="Competitor") public Competitor getCompetitor(); - @Statistic(messageKey="DistanceTraveled", resultUnit=Unit.None, resultDecimals=0, ordinal=0) + @Statistic(messageKey="DistanceTraveled", resultDecimals=0, ordinal=0) public Distance getDistanceTraveled(); @Statistic(messageKey="RankGainsOrLosses", resultDecimals=2, ordinal=1) diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Speed.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Speed.java index 528d4462725..50ab82ccfd3 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Speed.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Speed.java @@ -5,7 +5,6 @@ import java.io.Serializable; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; import com.sap.sse.datamining.annotations.Statistic; -import com.sap.sse.datamining.annotations.data.Unit; /** * A speed, convertible in various units of measure. Can be negative. @@ -63,7 +62,7 @@ public interface Speed extends Comparable, Serializable { } }; - @Statistic(messageKey="", resultDecimals=2, resultUnit=Unit.Knots) + @Statistic(messageKey="", resultDecimals=2) double getKnots(); double getMetersPerSecond(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ResultsChart.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ResultsChart.java index d9512c56a31..71a02206cbc 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ResultsChart.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ResultsChart.java @@ -186,8 +186,7 @@ public class ResultsChart extends AbstractResultsPresenterWithDataProviders @@ -45,11 +43,6 @@ public @interface Statistic { */ public int ordinal() default Integer.MAX_VALUE; - /** - * The {@link Unit} of the methods return value. The default value is {@link Unit#None}. - */ - public Unit resultUnit() default Unit.None; - /** * The number of decimals of the methods return value. The default value is 0. */ diff --git a/java/com.sap.sse.datamining.annotations/src/com/sap/sse/datamining/annotations/data/Unit.java b/java/com.sap.sse.datamining.annotations/src/com/sap/sse/datamining/annotations/data/Unit.java deleted file mode 100644 index 6375389dca2..00000000000 --- a/java/com.sap.sse.datamining.annotations/src/com/sap/sse/datamining/annotations/data/Unit.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.sap.sse.datamining.annotations.data; - -/** - * Enum for the different Units of key figures.
- * Every member needs a message key in StringMessages*.properties of {@link com.sap.sse.datamining}. - * - * @author Lennart Hensler (D054527) - * - */ -public enum Unit { - - None, Knots, Meters - -} diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/AdditionalResultData.java b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/AdditionalResultData.java index 2e6f297ec4b..49b7118b2c4 100644 --- a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/AdditionalResultData.java +++ b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/AdditionalResultData.java @@ -2,8 +2,6 @@ package com.sap.sse.datamining.shared; import java.io.Serializable; -import com.sap.sse.datamining.annotations.data.Unit; - public interface AdditionalResultData extends Serializable { public int getRetrievedDataAmount(); @@ -12,9 +10,6 @@ public interface AdditionalResultData extends Serializable { public String getResultSignifier(); - public Unit getUnit(); - public String getUnitSignifier(); - public int getValueDecimals(); } diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/QueryResultBase.java b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/QueryResultBase.java index b4f5793cfbf..0c35f7821f5 100644 --- a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/QueryResultBase.java +++ b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/QueryResultBase.java @@ -3,7 +3,6 @@ package com.sap.sse.datamining.shared; import java.io.Serializable; import java.util.Map; -import com.sap.sse.datamining.annotations.data.Unit; import com.sap.sse.datamining.shared.data.QueryResultState; public interface QueryResultBase extends Serializable { @@ -18,8 +17,6 @@ public interface QueryResultBase extends Serializable { */ public String getResultSignifier(); - public Unit getUnit(); - public String getUnitSignifier(); public int getValueDecimals(); public boolean isEmpty(); diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/SSEDataMiningSerializationDummy.java b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/SSEDataMiningSerializationDummy.java index 90830456318..c0ffaa2cd0b 100644 --- a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/SSEDataMiningSerializationDummy.java +++ b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/SSEDataMiningSerializationDummy.java @@ -1,8 +1,5 @@ package com.sap.sse.datamining.shared; -import java.io.Serializable; - -import com.sap.sse.datamining.annotations.data.Unit; import com.sap.sse.datamining.shared.impl.GenericGroupKey; import com.sap.sse.datamining.shared.impl.dto.ClusterDTO; @@ -13,7 +10,6 @@ public final class SSEDataMiningSerializationDummy implements SerializationDummy private GenericGroupKey groupKey; private ClusterDTO cluster; private Number n; - private Unit unit; private SSEDataMiningSerializationDummy() { } diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/AdditionalResultDataImpl.java b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/AdditionalResultDataImpl.java index 9feeb2ffc71..cb6ca138233 100644 --- a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/AdditionalResultDataImpl.java +++ b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/AdditionalResultDataImpl.java @@ -1,6 +1,5 @@ package com.sap.sse.datamining.shared.impl; -import com.sap.sse.datamining.annotations.data.Unit; import com.sap.sse.datamining.shared.AdditionalResultData; public class AdditionalResultDataImpl implements AdditionalResultData { @@ -8,8 +7,6 @@ public class AdditionalResultDataImpl implements AdditionalResultData { private int retrievedDataAmount; private String resultSignifier; - private Unit unit; - private String unitSignifier; private int valueDecimals; private long calculationTimeInNanos; @@ -19,14 +16,12 @@ public class AdditionalResultDataImpl implements AdditionalResultData { @Deprecated AdditionalResultDataImpl() { } - public AdditionalResultDataImpl(int retrievedDataAmount, String resultSignifier, Unit unit, String unitSignifier, - int valueDecimals, long calculationTimeInNanos) { - this.retrievedDataAmount = retrievedDataAmount; - this.resultSignifier = resultSignifier; - this.unit = unit; - this.unitSignifier = unitSignifier; - this.valueDecimals = valueDecimals; - this.calculationTimeInNanos = calculationTimeInNanos; + public AdditionalResultDataImpl(int retrievedDataAmount, String resultSignifier, int valueDecimals, + long calculationTimeInNanos) { + this.retrievedDataAmount = retrievedDataAmount; + this.resultSignifier = resultSignifier; + this.valueDecimals = valueDecimals; + this.calculationTimeInNanos = calculationTimeInNanos; } @Override @@ -44,16 +39,6 @@ public class AdditionalResultDataImpl implements AdditionalResultData { return resultSignifier; } - @Override - public Unit getUnit() { - return unit; - } - - @Override - public String getUnitSignifier() { - return unitSignifier; - } - @Override public int getValueDecimals() { return valueDecimals; diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/NullAdditionalResultData.java b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/NullAdditionalResultData.java index a06ca208427..34315bcd52b 100644 --- a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/NullAdditionalResultData.java +++ b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/NullAdditionalResultData.java @@ -1,6 +1,5 @@ package com.sap.sse.datamining.shared.impl; -import com.sap.sse.datamining.annotations.data.Unit; import com.sap.sse.datamining.shared.AdditionalResultData; /** @@ -34,16 +33,6 @@ public class NullAdditionalResultData implements AdditionalResultData { return ""; } - @Override - public Unit getUnit() { - return Unit.None; - } - - @Override - public String getUnitSignifier() { - return ""; - } - @Override public int getValueDecimals() { return 0; diff --git a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/QueryResultBaseImpl.java b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/QueryResultBaseImpl.java index 1046e82efab..25e9e8c9708 100644 --- a/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/QueryResultBaseImpl.java +++ b/java/com.sap.sse.datamining.shared/src/com/sap/sse/datamining/shared/impl/QueryResultBaseImpl.java @@ -3,7 +3,6 @@ package com.sap.sse.datamining.shared.impl; import java.util.HashMap; import java.util.Map; -import com.sap.sse.datamining.annotations.data.Unit; import com.sap.sse.datamining.shared.AdditionalResultData; import com.sap.sse.datamining.shared.GroupKey; import com.sap.sse.datamining.shared.QueryResultBase; @@ -63,16 +62,6 @@ public abstract class QueryResultBaseImpl implements QueryResultBase return additionalData.getResultSignifier(); } - @Override - public Unit getUnit() { - return additionalData.getUnit(); - } - - @Override - public String getUnitSignifier() { - return additionalData.getUnitSignifier(); - } - @Override public int getValueDecimals() { return additionalData.getValueDecimals(); 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/TestStatisticQuery.java index c3df732c6da..ff637110dc6 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/TestStatisticQuery.java @@ -19,7 +19,6 @@ 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.annotations.data.Unit; import com.sap.sse.datamining.components.AggregationProcessorDefinition; import com.sap.sse.datamining.components.DataRetrieverChainDefinition; import com.sap.sse.datamining.components.Processor; @@ -141,7 +140,7 @@ public class TestStatisticQuery { results.put(new GenericGroupKey(3), 3.0); results.put(new GenericGroupKey(4), 10.0); - QueryResultImpl result = new QueryResultImpl<>(QueryResultState.NORMAL, java.lang.Number.class, results, new AdditionalResultDataImpl(dataSource.size() - 2, "Cross Sum (Sum)", Unit.None, "", 0, 0)); + QueryResultImpl result = new QueryResultImpl<>(QueryResultState.NORMAL, java.lang.Number.class, results, new AdditionalResultDataImpl(dataSource.size() - 2, "Cross Sum (Sum)", 0, 0)); return result; } @@ -150,7 +149,6 @@ public class TestStatisticQuery { assertThat("Result values aren't correct.", result.getResults(), is(expectedResult.getResults())); assertThat("Retrieved data amount isn't correct.", result.getRetrievedDataAmount(), is(expectedResult.getRetrievedDataAmount())); assertThat("Result signifier isn't correct.", result.getResultSignifier(), is(expectedResult.getResultSignifier())); - assertThat("Unit isn't correct.", result.getUnit(), is(expectedResult.getUnit())); assertThat("Value decimals aren't correct.", result.getValueDecimals(), is(expectedResult.getValueDecimals())); } diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestCompoundFunction.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestCompoundFunction.java index 550c9b54802..f142cc3a33e 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestCompoundFunction.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/functions/TestCompoundFunction.java @@ -10,7 +10,6 @@ import java.util.Locale; import org.junit.Before; import org.junit.Test; -import com.sap.sse.datamining.annotations.data.Unit; import com.sap.sse.datamining.functions.Function; import com.sap.sse.datamining.test.data.impl.ContainerElement; import com.sap.sse.datamining.test.data.impl.ContainerElementImpl; @@ -52,7 +51,6 @@ public class TestCompoundFunction { compoundFunction.getDeclaringType().equals(MarkedContainer.class), is(true)); assertThat(compoundFunction.getSimpleName(), is("getContainerElement -> getName")); assertThat(compoundFunction.getLocalizedName(Locale.ENGLISH, TestsUtil.getTestStringMessages()), is("Name")); - assertThat(compoundFunction.getResultUnit(), is(Unit.None)); assertThat(compoundFunction.getResultDecimals(), is(0)); } diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/data/impl/DataTypeInterface.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/data/impl/DataTypeInterface.java index adec72e76d6..81f79f07eb3 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/data/impl/DataTypeInterface.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/data/impl/DataTypeInterface.java @@ -1,11 +1,10 @@ package com.sap.sse.datamining.test.data.impl; import com.sap.sse.datamining.annotations.Statistic; -import com.sap.sse.datamining.annotations.data.Unit; public interface DataTypeInterface { - @Statistic(messageKey="speedInKnots", resultUnit=Unit.Knots, resultDecimals=2) + @Statistic(messageKey="speedInKnots", resultDecimals=2) public int getSpeedInKnots(); } diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/domain/Test_Leg.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/domain/Test_Leg.java index 356ce3f802e..554388be2c2 100644 --- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/domain/Test_Leg.java +++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/test/domain/Test_Leg.java @@ -1,11 +1,10 @@ package com.sap.sse.datamining.test.domain; import com.sap.sse.datamining.annotations.Statistic; -import com.sap.sse.datamining.annotations.data.Unit; public interface Test_Leg { - @Statistic(messageKey="DistanceTraveled", resultUnit=Unit.Meters, resultDecimals=0) + @Statistic(messageKey="DistanceTraveled", resultDecimals=0) public double getDistanceTraveled(); } diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/AdditionalResultDataBuilder.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/AdditionalResultDataBuilder.java index c3a94e54fe2..6a18852bf22 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/AdditionalResultDataBuilder.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/AdditionalResultDataBuilder.java @@ -2,7 +2,6 @@ package com.sap.sse.datamining.components; import java.util.Locale; -import com.sap.sse.datamining.annotations.data.Unit; import com.sap.sse.datamining.functions.Function; import com.sap.sse.datamining.shared.AdditionalResultData; import com.sap.sse.i18n.ResourceBundleStringMessages; @@ -20,12 +19,12 @@ public interface AdditionalResultDataBuilder { public int getRetrievedDataAmount(); /** - * Sets the used {@link Function} for the statistic extraction. Also sets the {@linkplain Unit result unit} and the amount of - * decimals to the values of the Function ({@link Function#getResultUnit()} and {@link Function#getResultDecimals()}). + * Sets the used {@link Function} for the statistic extraction. Also sets the amount of decimals to the values of + * the Function ({@link Function#getResultDecimals()}). + * * @param extractionFunction */ public void setExtractionFunction(Function extractionFunction); - public void setResultUnit(Unit resultUnit); public void setResultDecimals(int resultDecimals); public void setAggregationNameMessageKey(String aggregationNameMessageKey); diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/functions/Function.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/functions/Function.java index b45bcb7b2a3..cc78829b24c 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/functions/Function.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/functions/Function.java @@ -3,7 +3,6 @@ package com.sap.sse.datamining.functions; import java.lang.reflect.InvocationTargetException; import java.util.Locale; -import com.sap.sse.datamining.annotations.data.Unit; import com.sap.sse.i18n.ResourceBundleStringMessages; public interface Function { @@ -44,8 +43,6 @@ public interface Function { */ public ReturnType tryToInvoke(Object instance, ParameterProvider parameterProvider); - public Unit getResultUnit(); - public int getResultDecimals(); public int getOrdinal(); 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 f311a681a81..39d35382caf 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,6 @@ package com.sap.sse.datamining.impl.components; import java.util.Locale; -import com.sap.sse.datamining.annotations.data.Unit; import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.functions.Function; import com.sap.sse.datamining.shared.AdditionalResultData; @@ -21,7 +20,6 @@ public class OverwritingResultDataBuilder implements AdditionalResultDataBuilder private int retrievedDataAmount; private Function extractionFunction; private String aggregationNameMessageKey; - private Unit resultUnit; private int resultDecimals; /** @@ -29,16 +27,13 @@ public class OverwritingResultDataBuilder implements AdditionalResultDataBuilder */ public OverwritingResultDataBuilder() { retrievedDataAmount = 0; - resultUnit = Unit.None; resultDecimals = 0; } @Override public AdditionalResultData build(long calculationTimeInNanos, ResourceBundleStringMessages stringMessages, Locale locale) { - String unitSignifier = buildUnitSignifier(stringMessages, locale); String resultSignifier = buildResultSignifier(stringMessages, locale); - return new AdditionalResultDataImpl(retrievedDataAmount, resultSignifier, resultUnit, unitSignifier, - resultDecimals, calculationTimeInNanos); + return new AdditionalResultDataImpl(retrievedDataAmount, resultSignifier, resultDecimals, calculationTimeInNanos); } private String buildResultSignifier(ResourceBundleStringMessages stringMessages, Locale locale) { @@ -51,14 +46,6 @@ public class OverwritingResultDataBuilder implements AdditionalResultDataBuilder return stringMessages.get(locale, "ResultSignifier", extractedStatisticName, aggregationName); } - private String buildUnitSignifier(ResourceBundleStringMessages stringMessages, Locale locale) { - if (resultUnit == null || resultUnit == Unit.None) { - return ""; - } - - return stringMessages.get(locale, resultUnit.toString()); - } - @Override public void setRetrievedDataAmount(int retrievedDataAmount) { this.retrievedDataAmount = retrievedDataAmount; @@ -72,15 +59,9 @@ public class OverwritingResultDataBuilder implements AdditionalResultDataBuilder @Override public void setExtractionFunction(Function extractionFunction) { this.extractionFunction = extractionFunction; - setResultUnit(extractionFunction.getResultUnit()); setResultDecimals(extractionFunction.getResultDecimals()); } - @Override - public void setResultUnit(Unit resultUnit) { - this.resultUnit = resultUnit; - } - @Override public void setResultDecimals(int resultDecimals) { this.resultDecimals = resultDecimals; 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 3e5643eae30..c4ad6f79347 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,6 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.ExecutorService; -import com.sap.sse.datamining.annotations.data.Unit; import com.sap.sse.datamining.components.AdditionalResultDataBuilder; import com.sap.sse.datamining.components.AggregationProcessorDefinition; import com.sap.sse.datamining.components.Processor; @@ -49,7 +48,6 @@ public class ParallelGroupedDataCountAggregationProcessor @Override protected void setAdditionalData(AdditionalResultDataBuilder additionalDataBuilder) { super.setAdditionalData(additionalDataBuilder); - additionalDataBuilder.setResultUnit(Unit.None); additionalDataBuilder.setResultDecimals(0); } diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/AdditionalMethodWrappingFunctionData.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/AdditionalMethodWrappingFunctionData.java index 86886bdbbd9..88a77a10e0d 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/AdditionalMethodWrappingFunctionData.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/AdditionalMethodWrappingFunctionData.java @@ -1,17 +1,14 @@ package com.sap.sse.datamining.impl.functions; -import com.sap.sse.datamining.annotations.data.Unit; public class AdditionalMethodWrappingFunctionData { private final String messageKey; - private final Unit resultUnit; private final int resultDecimals; private final int ordinal; - public AdditionalMethodWrappingFunctionData(String messageKey, Unit resultUnit, int resultValueDecimals, int ordinal) { + public AdditionalMethodWrappingFunctionData(String messageKey, int resultValueDecimals, int ordinal) { this.messageKey = messageKey; - this.resultUnit = resultUnit; this.resultDecimals = resultValueDecimals; this.ordinal = ordinal; } @@ -20,10 +17,6 @@ public class AdditionalMethodWrappingFunctionData { return messageKey; } - public Unit getResultUnit() { - return resultUnit; - } - public int getResultDecimals() { return resultDecimals; } diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/ConcatenatingCompoundFunction.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/ConcatenatingCompoundFunction.java index 70d1edbd00e..118d4bbb4d3 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/ConcatenatingCompoundFunction.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/ConcatenatingCompoundFunction.java @@ -5,7 +5,6 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; -import com.sap.sse.datamining.annotations.data.Unit; import com.sap.sse.datamining.functions.Function; import com.sap.sse.datamining.functions.ParameterProvider; import com.sap.sse.i18n.ResourceBundleStringMessages; @@ -170,14 +169,6 @@ public class ConcatenatingCompoundFunction extends AbstractFunction< return typedResult; } - /** - * @return the {@link Unit result Unit} of the last function. - */ - @Override - public Unit getResultUnit() { - return getLastFunction().getResultUnit(); - } - /** * @return the result decimals of the last function. */ diff --git a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/MethodWrappingFunction.java b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/MethodWrappingFunction.java index 8c679155e0c..99d71d71de0 100644 --- a/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/MethodWrappingFunction.java +++ b/java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/functions/MethodWrappingFunction.java @@ -9,7 +9,6 @@ import java.util.logging.Level; import com.sap.sse.datamining.annotations.Connector; import com.sap.sse.datamining.annotations.Dimension; import com.sap.sse.datamining.annotations.Statistic; -import com.sap.sse.datamining.annotations.data.Unit; import com.sap.sse.datamining.functions.ParameterProvider; import com.sap.sse.i18n.ResourceBundleStringMessages; @@ -44,21 +43,21 @@ public class MethodWrappingFunction extends AbstractFunction extends AbstractFunction extends AbstractFunction