eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-22 20:13:52 +00:00
Code Activity

Adjusted the data class names

Browse Source
This commit is contained in:
Lennart Hensler committed 2014-05-03 12:48:56 +02:00
1 parent bf1386908d
commit c79e9a82fd
39 files changed
+93 -219
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/QueryDefinition.java → java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/QueryDefinitionDeprecated.java
+1 -1
View File
@@ -7,7 +7,7 @@ import java.util.Map;
import com.sap.sse.datamining.shared.components.AggregatorType;
import com.sap.sse.datamining.shared.components.GrouperType;
public interface QueryDefinition extends Serializable {
public interface QueryDefinitionDeprecated extends Serializable {
public String getLocaleInfoName();
java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/impl/SimpleQueryDefinition.java
+2 -2
View File
@@ -8,12 +8,12 @@ import java.util.Map;
import com.sap.sailing.datamining.shared.DataTypes;
import com.sap.sailing.datamining.shared.DimensionIdentifier;
import com.sap.sailing.datamining.shared.QueryDefinition;
import com.sap.sailing.datamining.shared.QueryDefinitionDeprecated;
import com.sap.sailing.datamining.shared.StatisticType;
import com.sap.sse.datamining.shared.components.AggregatorType;
import com.sap.sse.datamining.shared.components.GrouperType;
public class SimpleQueryDefinition implements QueryDefinition {
public class SimpleQueryDefinition implements QueryDefinitionDeprecated {
private static final long serialVersionUID = 8408302866342877839L;
private String localeInfoName;
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/GPSFixWithContext.java
-52
View File
@@ -1,52 +0,0 @@
package com.sap.sailing.datamining.data;
import com.sap.sailing.datamining.WindStrengthCluster;
import com.sap.sailing.domain.common.LegType;
import com.sap.sailing.domain.tracking.GPSFixMoving;
import com.sap.sse.datamining.shared.annotations.Dimension;
public interface GPSFixWithContext extends GPSFixMoving {
@Dimension(messageKey="regatta")
public String getRegattaName();
@Dimension(messageKey="race")
public String getRaceName();
@Dimension(messageKey="legNumber")
public int getLegNumber();
@Dimension(messageKey="course")
public String getCourseAreaName();
@Dimension(messageKey="fleet")
public String getFleetName();
@Dimension(messageKey="boatClass")
public String getBoatClassName();
/**
* The year of the start of the race.
*/
@Dimension(messageKey="year")
public Integer getYear();
/**
* The leg type of the leg, which contains this gps fix. Can be <code>null</code> if there's no wind in the race.
*/
@Dimension(messageKey="legType")
public LegType getLegType();
@Dimension(messageKey="competitor")
public String getCompetitorName();
@Dimension(messageKey="sailID")
public String getCompetitorSailID();
@Dimension(messageKey="nationality")
public String getCompetitorNationality();
@Dimension(messageKey="windStrength")
public WindStrengthCluster getWindStrength();
}
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/LeaderboardGroupWithContext.java
-10
View File
@@ -1,10 +0,0 @@
package com.sap.sailing.datamining.data;
import com.sap.sse.datamining.shared.annotations.Dimension;
public interface LeaderboardGroupWithContext {
@Dimension(messageKey="leaderboardGroup")
public String getLeaderboardGroupName();
}
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/TrackedLegOfCompetitorWithContext.java
-54
View File
@@ -1,54 +0,0 @@
package com.sap.sailing.datamining.data;
import com.sap.sailing.datamining.WindStrengthCluster;
import com.sap.sailing.domain.common.Distance;
import com.sap.sailing.domain.common.LegType;
import com.sap.sse.datamining.shared.Unit;
import com.sap.sse.datamining.shared.annotations.Dimension;
import com.sap.sse.datamining.shared.annotations.SideEffectFreeValue;
public interface TrackedLegOfCompetitorWithContext {
@Dimension(messageKey="regatta")
public String getRegattaName();
@Dimension(messageKey="race")
public String getRaceName();
@Dimension(messageKey="legNumber")
public int getLegNumber();
@Dimension(messageKey="course")
public String getCourseAreaName();
@Dimension(messageKey="fleet")
public String getFleetName();
@Dimension(messageKey="boatClass")
public String getBoatClassName();
/**
* The year of the start of the race.
*/
@Dimension(messageKey="year")
public Integer getYear();
@Dimension(messageKey="legType")
public LegType getLegType();
@Dimension(messageKey="competitor")
public String getCompetitorName();
@Dimension(messageKey="sailID")
public String getCompetitorSailID();
@Dimension(messageKey="nationality")
public String getCompetitorNationality();
@Dimension(messageKey="windStrength")
public WindStrengthCluster getWindStrength();
@SideEffectFreeValue(messageKey="distanceTraveled", resultUnit=Unit.Meters)
public Distance getDistanceTraveled();
}
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/DataMiningFactory.java
+3 -3
View File
@@ -2,7 +2,7 @@ package com.sap.sailing.datamining.factories;
import java.util.Locale;
import com.sap.sailing.datamining.shared.QueryDefinition;
import com.sap.sailing.datamining.shared.QueryDefinitionDeprecated;
import com.sap.sailing.server.RacingEventService;
import com.sap.sse.datamining.Query;
import com.sap.sse.datamining.components.ParallelAggregator;
@@ -23,7 +23,7 @@ public final class DataMiningFactory {
}
public static <DataType, AggregatedType extends Number> Query<AggregatedType> createQuery(
QueryDefinition queryDefinition, RacingEventService racingService) {
QueryDefinitionDeprecated queryDefinition, RacingEventService racingService) {
Locale locale = DataMiningStringMessages.Util.getLocaleFrom(queryDefinition.getLocaleInfoName());
ParallelDataRetriever<DataType> retriever = DataRetrieverFactory.createDataRetriever(
@@ -44,7 +44,7 @@ public final class DataMiningFactory {
retriever, filter, grouper, extractor, aggregator);
}
private static <DataType> ParallelFilter<DataType> createFilter(QueryDefinition queryDefinition) {
private static <DataType> ParallelFilter<DataType> createFilter(QueryDefinitionDeprecated queryDefinition) {
if (queryDefinition.getSelection().isEmpty()) {
return FilterFactory.createNonFilteringFilter();
}
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/factories/GrouperFactory.java
+3 -3
View File
@@ -9,7 +9,7 @@ import com.sap.sailing.datamining.dimensions.DimensionManager;
import com.sap.sailing.datamining.dimensions.DimensionManagerProvider;
import com.sap.sailing.datamining.shared.DataTypes;
import com.sap.sailing.datamining.shared.DimensionIdentifier;
import com.sap.sailing.datamining.shared.QueryDefinition;
import com.sap.sailing.datamining.shared.QueryDefinitionDeprecated;
import com.sap.sse.datamining.components.ParallelGrouper;
import com.sap.sse.datamining.data.deprecated.Dimension;
import com.sap.sse.datamining.impl.components.deprecated.PartitioningParallelGrouper;
@@ -21,12 +21,12 @@ public final class GrouperFactory {
private GrouperFactory() { }
public static <DataType> ParallelGrouper<DataType> createGrouper(QueryDefinition queryDefinition, ThreadPoolExecutor executor) {
public static <DataType> ParallelGrouper<DataType> createGrouper(QueryDefinitionDeprecated queryDefinition, ThreadPoolExecutor executor) {
WorkerBuilder<GroupingWorker<DataType>> workerBuilder = createGroupingWorkerBuilder(queryDefinition);
return new PartitioningParallelGrouper<DataType>(workerBuilder, executor);
}
private static <DataType> WorkerBuilder<GroupingWorker<DataType>> createGroupingWorkerBuilder(QueryDefinition queryDefinition) {
private static <DataType> WorkerBuilder<GroupingWorker<DataType>> createGroupingWorkerBuilder(QueryDefinitionDeprecated queryDefinition) {
switch (queryDefinition.getGrouperType()) {
case Dimensions:
return createMultiDimensionalGroupingWorkerBuilder(queryDefinition.getDataType(), queryDefinition.getDimensionsToGroupBy());
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/GPSFixRetrievalProcessor.java
+2 -2
View File
@@ -6,7 +6,7 @@ import java.util.concurrent.ExecutorService;
import com.sap.sailing.datamining.data.HasGPSFixContext;
import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext;
import com.sap.sailing.datamining.impl.data.HasGPSFixContextImpl;
import com.sap.sailing.datamining.impl.data.GPSFixWithContext;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.tracking.GPSFixMoving;
import com.sap.sailing.domain.tracking.GPSFixTrack;
@@ -29,7 +29,7 @@ public class GPSFixRetrievalProcessor extends AbstractSimpleRetrievalProcessor<H
TrackedLegOfCompetitor trackedLegOfCompetitor = element.getTrackedLegOfCompetitor();
if (trackedLegOfCompetitor.getStartTime() != null && trackedLegOfCompetitor.getFinishTime() != null) {
for (GPSFixMoving gpsFix : competitorTrack.getFixes(trackedLegOfCompetitor.getStartTime(), true, trackedLegOfCompetitor.getFinishTime(), true)) {
HasGPSFixContext gpsFixWithContext = new HasGPSFixContextImpl(element, gpsFix);
HasGPSFixContext gpsFixWithContext = new GPSFixWithContext(element, gpsFix);
gpsFixesWithContext.add(gpsFixWithContext);
}
}
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/LeaderboardGroupRetrievalProcessor.java
+2 -7
View File
@@ -6,21 +6,16 @@ import java.util.concurrent.ExecutorService;
import com.sap.sailing.domain.leaderboard.LeaderboardGroup;
import com.sap.sailing.server.RacingEventService;
import com.sap.sse.datamining.components.Processor;
import com.sap.sse.datamining.impl.components.AbstractRetrievalProcessor;
import com.sap.sse.datamining.impl.components.AbstractSimpleRetrievalProcessor;
public class LeaderboardGroupRetrievalProcessor extends
AbstractRetrievalProcessor<RacingEventService, LeaderboardGroup, LeaderboardGroup> {
AbstractSimpleRetrievalProcessor<RacingEventService, LeaderboardGroup> {
public LeaderboardGroupRetrievalProcessor(ExecutorService executor,
Collection<Processor<LeaderboardGroup>> resultReceivers) {
super(executor, resultReceivers);
}
@Override
protected LeaderboardGroup convertWorkingToResultType(LeaderboardGroup partialElement) {
return partialElement;
}
@Override
protected Iterable<LeaderboardGroup> retrieveData(RacingEventService element) {
return element.getLeaderboardGroups().values();
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/TrackedLegFilteringRetrievalProcessor.java
+2 -2
View File
@@ -6,7 +6,7 @@ import java.util.concurrent.ExecutorService;
import com.sap.sailing.datamining.data.HasTrackedLegContext;
import com.sap.sailing.datamining.data.HasTrackedRaceContext;
import com.sap.sailing.datamining.impl.data.HasTrackedLegContextImpl;
import com.sap.sailing.datamining.impl.data.TrackedLegWithContext;
import com.sap.sailing.domain.tracking.TrackedLeg;
import com.sap.sse.datamining.components.FilterCriteria;
import com.sap.sse.datamining.components.Processor;
@@ -25,7 +25,7 @@ public class TrackedLegFilteringRetrievalProcessor extends
Collection<HasTrackedLegContext> trackedLegsWithContext = new ArrayList<>();
int legNumber = 1;
for (TrackedLeg trackedLeg : element.getTrackedRace().getTrackedLegs()) {
HasTrackedLegContext trackedLegWithContext = new HasTrackedLegContextImpl(element, trackedLeg, legNumber);
HasTrackedLegContext trackedLegWithContext = new TrackedLegWithContext(element, trackedLeg, legNumber);
trackedLegsWithContext.add(trackedLegWithContext);
legNumber++;
}
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/TrackedLegOfCompetitorFilteringRetrievalProcessor.java
+2 -2
View File
@@ -6,7 +6,7 @@ import java.util.concurrent.ExecutorService;
import com.sap.sailing.datamining.data.HasTrackedLegContext;
import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext;
import com.sap.sailing.datamining.impl.data.HasTrackedLegOfCompetitorContextImpl;
import com.sap.sailing.datamining.impl.data.TrackedLegOfCompetitorWithContext;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sse.datamining.components.FilterCriteria;
import com.sap.sse.datamining.components.Processor;
@@ -25,7 +25,7 @@ public class TrackedLegOfCompetitorFilteringRetrievalProcessor extends
protected Iterable<HasTrackedLegOfCompetitorContext> retrieveData(HasTrackedLegContext element) {
Collection<HasTrackedLegOfCompetitorContext> trackedLegOfCompetitorsWithContext = new ArrayList<>();
for (Competitor competitor : element.getRace().getCompetitors()) {
HasTrackedLegOfCompetitorContext trackedLegOfCompetitorWithContext = new HasTrackedLegOfCompetitorContextImpl(element, element.getTrackedLeg().getTrackedLeg(competitor));
HasTrackedLegOfCompetitorContext trackedLegOfCompetitorWithContext = new TrackedLegOfCompetitorWithContext(element, element.getTrackedLeg().getTrackedLeg(competitor));
trackedLegOfCompetitorsWithContext.add(trackedLegOfCompetitorWithContext);
}
return trackedLegOfCompetitorsWithContext;
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/TrackedRaceFilteringRetrievalProcessor.java
+2 -2
View File
@@ -5,7 +5,7 @@ import java.util.Collection;
import java.util.concurrent.ExecutorService;
import com.sap.sailing.datamining.data.HasTrackedRaceContext;
import com.sap.sailing.datamining.impl.data.HasTrackedRaceContextImpl;
import com.sap.sailing.datamining.impl.data.TrackedRaceWithContext;
import com.sap.sailing.domain.base.Event;
import com.sap.sailing.domain.base.Fleet;
import com.sap.sailing.domain.base.RaceColumn;
@@ -33,7 +33,7 @@ public class TrackedRaceFilteringRetrievalProcessor extends
if (trackedRace != null) {
Regatta regatta = trackedRace.getTrackedRegatta().getRegatta();
Event event = regatta.getEvent();
HasTrackedRaceContext trackedRaceWithContext = new HasTrackedRaceContextImpl(event, regatta, fleet, trackedRace);
HasTrackedRaceContext trackedRaceWithContext = new TrackedRaceWithContext(event, regatta, fleet, trackedRace);
trackedRacesWithContext.add(trackedRaceWithContext);
}
}
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/deprecated/AbstractLeaderboardGroupDataRetrievalWorker.java
+4 -4
View File
@@ -5,8 +5,8 @@ import java.util.Collection;
import com.sap.sailing.datamining.data.HasTrackedLegContext;
import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext;
import com.sap.sailing.datamining.impl.data.HasTrackedLegContextImpl;
import com.sap.sailing.datamining.impl.data.HasTrackedLegOfCompetitorContextImpl;
import com.sap.sailing.datamining.impl.data.TrackedLegWithContext;
import com.sap.sailing.datamining.impl.data.TrackedLegOfCompetitorWithContext;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.base.CourseArea;
import com.sap.sailing.domain.base.Fleet;
@@ -48,7 +48,7 @@ public abstract class AbstractLeaderboardGroupDataRetrievalWorker<DataType>
for (Leg leg : trackedRace.getRace().getCourse().getLegs()) {
TrackedLeg trackedLeg = trackedRace.getTrackedLeg(leg);
if (trackedLeg != null) {
HasTrackedLegContext dataContext = new HasTrackedLegContextImpl(group, leaderboard,
HasTrackedLegContext dataContext = new TrackedLegWithContext(group, leaderboard,
courseArea, fleet, trackedRace, trackedLeg, legNumber);
data.add(new Pair<TrackedLeg, HasTrackedLegContext>(trackedLeg, dataContext));
legNumber++;
@@ -70,7 +70,7 @@ public abstract class AbstractLeaderboardGroupDataRetrievalWorker<DataType>
HasTrackedLegContext trackedLegContext = baseDataEntry.getB();
for (Competitor competitor : trackedLegContext.getRace().getCompetitors()) {
TrackedLegOfCompetitor trackedLegOfCompetitor = trackedLeg.getTrackedLeg(competitor);
HasTrackedLegOfCompetitorContext dataContext = new HasTrackedLegOfCompetitorContextImpl(trackedLegContext,
HasTrackedLegOfCompetitorContext dataContext = new TrackedLegOfCompetitorWithContext(trackedLegContext,
competitor);
data.add(new Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext>(trackedLegOfCompetitor,
dataContext));
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/deprecated/GPSFixLeaderboardGroupDataRetrievalWorker.java
+2 -2
View File
@@ -7,7 +7,7 @@ import java.util.List;
import com.sap.sailing.datamining.data.HasGPSFixContext;
import com.sap.sailing.datamining.data.GPSFixWithContext;
import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext;
import com.sap.sailing.datamining.impl.data.HasGPSFixContextImpl;
import com.sap.sailing.datamining.impl.data.GPSFixWithContext;
import com.sap.sailing.datamining.impl.gps_fix.GPSFixWithContextImpl;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.common.impl.Util.Pair;
@@ -22,7 +22,7 @@ public class GPSFixLeaderboardGroupDataRetrievalWorker extends AbstractLeaderboa
Collection<GPSFixWithContext> data = new ArrayList<GPSFixWithContext>();
Collection<Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext>> baseData = retrieveDataTillTrackedLegOfCompetitor(getGroup());
for (Pair<TrackedLegOfCompetitor, HasTrackedLegOfCompetitorContext> baseDataEntry : baseData) {
HasGPSFixContext context = new HasGPSFixContextImpl(baseDataEntry.getB());
HasGPSFixContext context = new GPSFixWithContext(baseDataEntry.getB());
data.addAll(retrieveDataFor(context));
}
return data;
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/DataMiningClassesWithFunctionsService.java
+8 -4
View File
@@ -3,8 +3,10 @@ package com.sap.sailing.datamining.impl.data;
import java.util.HashSet;
import java.util.Set;
import com.sap.sailing.datamining.data.GPSFixWithContext;
import com.sap.sailing.datamining.data.TrackedLegOfCompetitorWithContext;
import com.sap.sailing.datamining.data.HasGPSFixContext;
import com.sap.sailing.datamining.data.HasTrackedLegContext;
import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext;
import com.sap.sailing.datamining.data.HasTrackedRaceContext;
import com.sap.sse.datamining.functions.ClassesWithFunctionsService;
public class DataMiningClassesWithFunctionsService implements ClassesWithFunctionsService {
@@ -12,8 +14,10 @@ public class DataMiningClassesWithFunctionsService implements ClassesWithFunctio
@Override
public Set<Class<?>> getInternalClassesWithMarkedMethods() {
Set<Class<?>> internalClasses = new HashSet<>();
internalClasses.add(GPSFixWithContext.class);
internalClasses.add(TrackedLegOfCompetitorWithContext.class);
internalClasses.add(HasTrackedRaceContext.class);
internalClasses.add(HasTrackedLegContext.class);
internalClasses.add(HasTrackedLegOfCompetitorContext.class);
internalClasses.add(HasGPSFixContext.class);
return internalClasses;
}
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/HasGPSFixContextImpl.java → java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/GPSFixWithContext.java
+3 -3
View File
@@ -10,16 +10,16 @@ import com.sap.sailing.domain.tracking.TrackedLeg;
import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor;
import com.sap.sailing.domain.tracking.TrackedRace;
public class HasGPSFixContextImpl extends HasTrackedLegOfCompetitorContextImpl implements HasGPSFixContext {
public class GPSFixWithContext extends TrackedLegOfCompetitorWithContext implements HasGPSFixContext {
private final GPSFixMoving gpsFix;
public HasGPSFixContextImpl(HasTrackedLegOfCompetitorContext legContext, GPSFixMoving gpsFix) {
public GPSFixWithContext(HasTrackedLegOfCompetitorContext legContext, GPSFixMoving gpsFix) {
this(legContext.getEvent(), legContext.getRegatta(), legContext.getFleet(), legContext.getTrackedRace(),
legContext.getTrackedLeg(), legContext.getLegNumber(), legContext.getTrackedLegOfCompetitor(), gpsFix);
}
public HasGPSFixContextImpl(Event event, Regatta regatta, Fleet fleet, TrackedRace trackedRace,
public GPSFixWithContext(Event event, Regatta regatta, Fleet fleet, TrackedRace trackedRace,
TrackedLeg trackedLeg, int legNumber, TrackedLegOfCompetitor trackedLegOfCompetitor, GPSFixMoving gpsFix) {
super(event, regatta, fleet, trackedRace, trackedLeg, legNumber, trackedLegOfCompetitor);
this.gpsFix = gpsFix;
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/HasTrackedLegOfCompetitorContextImpl.java → java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedLegOfCompetitorWithContext.java
+3 -3
View File
@@ -10,18 +10,18 @@ import com.sap.sailing.domain.tracking.TrackedLeg;
import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor;
import com.sap.sailing.domain.tracking.TrackedRace;
public class HasTrackedLegOfCompetitorContextImpl extends HasTrackedLegContextImpl implements HasTrackedLegOfCompetitorContext {
public class TrackedLegOfCompetitorWithContext extends TrackedLegWithContext implements HasTrackedLegOfCompetitorContext {
private final TrackedLegOfCompetitor trackedLegOfCompetitor;
private final Competitor competitor;
public HasTrackedLegOfCompetitorContextImpl(HasTrackedLegContext trackedLegContext, TrackedLegOfCompetitor trackedLegOfCompetitor) {
public TrackedLegOfCompetitorWithContext(HasTrackedLegContext trackedLegContext, TrackedLegOfCompetitor trackedLegOfCompetitor) {
this(trackedLegContext.getEvent(), trackedLegContext.getRegatta(), trackedLegContext.getFleet(),
trackedLegContext.getTrackedRace(), trackedLegContext.getTrackedLeg(),
trackedLegContext.getLegNumber(), trackedLegOfCompetitor);
}
public HasTrackedLegOfCompetitorContextImpl(Event event, Regatta regatta, Fleet fleet, TrackedRace trackedRace,
public TrackedLegOfCompetitorWithContext(Event event, Regatta regatta, Fleet fleet, TrackedRace trackedRace,
TrackedLeg trackedLeg, int legNumber, TrackedLegOfCompetitor trackedLegOfCompetitor) {
super(event, regatta, fleet, trackedRace, trackedLeg, legNumber);
this.trackedLegOfCompetitor = trackedLegOfCompetitor;
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/HasTrackedLegContextImpl.java → java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedLegWithContext.java
+3 -3
View File
@@ -13,19 +13,19 @@ import com.sap.sailing.domain.tracking.TrackedLeg;
import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor;
import com.sap.sailing.domain.tracking.TrackedRace;
public class HasTrackedLegContextImpl extends HasTrackedRaceContextImpl implements HasTrackedLegContext {
public class TrackedLegWithContext extends TrackedRaceWithContext implements HasTrackedLegContext {
private final TrackedLeg trackedLeg;
private final int legNumber;
private LegType legType;
private boolean legTypeHasBeenInitialized;
public HasTrackedLegContextImpl(HasTrackedRaceContext trackedRaceContext, TrackedLeg trackedLeg, int legNumber) {
public TrackedLegWithContext(HasTrackedRaceContext trackedRaceContext, TrackedLeg trackedLeg, int legNumber) {
this(trackedRaceContext.getEvent(), trackedRaceContext.getRegatta(), trackedRaceContext.getFleet(),
trackedRaceContext.getTrackedRace(), trackedLeg, legNumber);
}
public HasTrackedLegContextImpl(Event event, Regatta regatta, Fleet fleet, TrackedRace trackedRace, TrackedLeg trackedLeg, int legNumber) {
public TrackedLegWithContext(Event event, Regatta regatta, Fleet fleet, TrackedRace trackedRace, TrackedLeg trackedLeg, int legNumber) {
super(event, regatta, fleet, trackedRace);
this.trackedLeg = trackedLeg;
this.legNumber = legNumber;
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/HasTrackedRaceContextImpl.java → java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedRaceWithContext.java
+2 -2
View File
@@ -12,7 +12,7 @@ import com.sap.sailing.domain.base.Regatta;
import com.sap.sailing.domain.common.TimePoint;
import com.sap.sailing.domain.tracking.TrackedRace;
public class HasTrackedRaceContextImpl implements HasTrackedRaceContext {
public class TrackedRaceWithContext implements HasTrackedRaceContext {
private final Event event;
private final Regatta regatta;
@@ -21,7 +21,7 @@ public class HasTrackedRaceContextImpl implements HasTrackedRaceContext {
private Integer year;
private boolean yearHasBeenInitialized;
public HasTrackedRaceContextImpl(Event event, Regatta regatta, Fleet fleet, TrackedRace trackedRace) {
public TrackedRaceWithContext(Event event, Regatta regatta, Fleet fleet, TrackedRace trackedRace) {
this.event = event;
this.regatta = regatta;
this.fleet = fleet;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/client/DataMiningService.java
+2 -2
View File
@@ -4,7 +4,7 @@ import java.util.Collection;
import com.google.gwt.user.client.rpc.RemoteService;
import com.sap.sailing.datamining.shared.DataTypes;
import com.sap.sailing.datamining.shared.QueryDefinition;
import com.sap.sailing.datamining.shared.QueryDefinitionDeprecated;
import com.sap.sse.datamining.shared.DataMiningSerializationDummy;
import com.sap.sse.datamining.shared.QueryResult;
import com.sap.sse.datamining.shared.dto.FunctionDTO;
@@ -13,7 +13,7 @@ public interface DataMiningService extends RemoteService {
Collection<FunctionDTO> getDimensionsFor(DataTypes dataType);
<ResultType extends Number> QueryResult<ResultType> runQuery(QueryDefinition queryDefinition) throws Exception;
<ResultType extends Number> QueryResult<ResultType> runQuery(QueryDefinitionDeprecated queryDefinition) throws Exception;
DataMiningSerializationDummy pseudoMethodSoThatSomeDataMiningClassesAreAddedToTheGWTSerializationPolicy();
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/client/DataMiningServiceAsync.java
+2 -2
View File
@@ -4,7 +4,7 @@ import java.util.Collection;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.sap.sailing.datamining.shared.DataTypes;
import com.sap.sailing.datamining.shared.QueryDefinition;
import com.sap.sailing.datamining.shared.QueryDefinitionDeprecated;
import com.sap.sse.datamining.shared.DataMiningSerializationDummy;
import com.sap.sse.datamining.shared.QueryResult;
import com.sap.sse.datamining.shared.dto.FunctionDTO;
@@ -13,7 +13,7 @@ public interface DataMiningServiceAsync {
void getDimensionsFor(DataTypes dataType, AsyncCallback<Collection<FunctionDTO>> callback);
<ResultType extends Number> void runQuery(QueryDefinition queryDefinition, AsyncCallback<QueryResult<ResultType>> callback);
<ResultType extends Number> void runQuery(QueryDefinitionDeprecated queryDefinition, AsyncCallback<QueryResult<ResultType>> callback);
/**
* This method does nothing, but is needed to ensure, that GenericGroupKey&ltString&gt in the GWT serialization policy.<br />
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/client/GroupingProvider.java
+2 -2
View File
@@ -3,7 +3,7 @@ package com.sap.sailing.gwt.ui.datamining.client;
import java.util.Collection;
import com.sap.sailing.datamining.shared.DimensionIdentifier;
import com.sap.sailing.datamining.shared.QueryDefinition;
import com.sap.sailing.datamining.shared.QueryDefinitionDeprecated;
import com.sap.sailing.gwt.ui.client.shared.components.Component;
import com.sap.sse.datamining.shared.components.GrouperType;
@@ -14,7 +14,7 @@ public interface GroupingProvider extends Component<Object> {
public Collection<DimensionIdentifier> getDimensionsToGroupBy();
public String getCustomGrouperScriptText();
public void applyQueryDefinition(QueryDefinition queryDefinition);
public void applyQueryDefinition(QueryDefinitionDeprecated queryDefinition);
public void addGroupingChangedListener(GroupingChangedListener listener);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/client/QueryDefinitionChangedListener.java
+2 -2
View File
@@ -1,9 +1,9 @@
package com.sap.sailing.gwt.ui.datamining.client;
import com.sap.sailing.datamining.shared.QueryDefinition;
import com.sap.sailing.datamining.shared.QueryDefinitionDeprecated;
public interface QueryDefinitionChangedListener {
void queryDefinitionChanged(QueryDefinition newQueryDefinition);
void queryDefinitionChanged(QueryDefinitionDeprecated newQueryDefinition);
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/client/QueryDefinitionProvider.java
+4 -4
View File
@@ -1,13 +1,13 @@
package com.sap.sailing.gwt.ui.datamining.client;
import com.sap.sailing.datamining.shared.QueryDefinition;
import com.sap.sailing.datamining.shared.QueryDefinitionDeprecated;
import com.sap.sailing.gwt.ui.client.shared.components.Component;
public interface QueryDefinitionProvider extends Component<Object> {
public Iterable<String> validateQueryDefinition(QueryDefinition queryDefinition);
public QueryDefinition getQueryDefinition();
public void applyQueryDefinition(QueryDefinition queryDefinition);
public Iterable<String> validateQueryDefinition(QueryDefinitionDeprecated queryDefinition);
public QueryDefinitionDeprecated getQueryDefinition();
public void applyQueryDefinition(QueryDefinitionDeprecated queryDefinition);
public void addQueryDefinitionChangedListener(QueryDefinitionChangedListener listener);
public void removeQueryDefinitionChangedListener(QueryDefinitionChangedListener listener);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/client/QueryRunner.java
+2 -2
View File
@@ -1,11 +1,11 @@
package com.sap.sailing.gwt.ui.datamining.client;
import com.sap.sailing.datamining.shared.QueryDefinition;
import com.sap.sailing.datamining.shared.QueryDefinitionDeprecated;
import com.sap.sailing.gwt.ui.client.shared.components.Component;
import com.sap.sailing.gwt.ui.datamining.client.settings.QueryRunnerSettings;
public interface QueryRunner extends QueryDefinitionChangedListener, Component<QueryRunnerSettings> {
public void run(QueryDefinition queryDefinition);
public void run(QueryDefinitionDeprecated queryDefinition);
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/client/SelectionProvider.java
+2 -2
View File
@@ -4,7 +4,7 @@ import java.util.Collection;
import java.util.Map;
import com.sap.sailing.datamining.shared.DimensionIdentifier;
import com.sap.sailing.datamining.shared.QueryDefinition;
import com.sap.sailing.datamining.shared.QueryDefinitionDeprecated;
import com.sap.sailing.gwt.ui.client.shared.components.Component;
public interface SelectionProvider<SettingsType> extends Component<SettingsType> {
@@ -13,7 +13,7 @@ public interface SelectionProvider<SettingsType> extends Component<SettingsType>
public Map<DimensionIdentifier, Collection<?>> getSelection();
public void applySelection(QueryDefinition queryDefinition);
public void applySelection(QueryDefinitionDeprecated queryDefinition);
public void clearSelection();
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/client/StatisticProvider.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.sap.sailing.gwt.ui.datamining.client;
import com.sap.sailing.datamining.shared.DataTypes;
import com.sap.sailing.datamining.shared.QueryDefinition;
import com.sap.sailing.datamining.shared.QueryDefinitionDeprecated;
import com.sap.sailing.datamining.shared.StatisticType;
import com.sap.sailing.gwt.ui.client.shared.components.Component;
import com.sap.sailing.gwt.ui.datamining.client.selection.SimpleStatistic;
@@ -16,6 +16,6 @@ public interface StatisticProvider extends Component<Object> {
public void addStatisticChangedListener(StatisticChangedListener listener);
public void applyQueryDefinition(QueryDefinition queryDefinition);
public void applyQueryDefinition(QueryDefinitionDeprecated queryDefinition);
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/client/execution/SimpleQueryRunner.java
+3 -3
View File
@@ -5,7 +5,7 @@ import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.Widget;
import com.sap.sailing.datamining.shared.QueryDefinition;
import com.sap.sailing.datamining.shared.QueryDefinitionDeprecated;
import com.sap.sailing.gwt.ui.client.ErrorReporter;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.client.shared.components.SettingsDialogComponent;
@@ -54,7 +54,7 @@ public class SimpleQueryRunner implements QueryRunner {
}
@Override
public void run(QueryDefinition queryDefinition) {
public void run(QueryDefinitionDeprecated queryDefinition) {
Iterable<String> errorMessages = queryDefinitionProvider.validateQueryDefinition(queryDefinition);
if (errorMessages == null || !errorMessages.iterator().hasNext()) {
// queryStatusLabel.setText(" | " + stringMessages.running());
@@ -89,7 +89,7 @@ public class SimpleQueryRunner implements QueryRunner {
}
@Override
public void queryDefinitionChanged(QueryDefinition newQueryDefinition) {
public void queryDefinitionChanged(QueryDefinitionDeprecated newQueryDefinition) {
run(newQueryDefinition);
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/client/selection/AbstractQueryDefinitionProvider.java
+5 -5
View File
@@ -6,7 +6,7 @@ import java.util.HashSet;
import java.util.Set;
import com.sap.sailing.datamining.shared.DimensionIdentifier;
import com.sap.sailing.datamining.shared.QueryDefinition;
import com.sap.sailing.datamining.shared.QueryDefinitionDeprecated;
import com.sap.sailing.gwt.ui.client.ErrorReporter;
import com.sap.sailing.gwt.ui.client.SailingServiceAsync;
import com.sap.sailing.gwt.ui.client.StringMessages;
@@ -34,7 +34,7 @@ public abstract class AbstractQueryDefinitionProvider implements QueryDefinition
}
@Override
public Iterable<String> validateQueryDefinition(QueryDefinition queryDefinition) {
public Iterable<String> validateQueryDefinition(QueryDefinitionDeprecated queryDefinition) {
Collection<String> errorMessages = new ArrayList<String>();
if (queryDefinition != null) {
@@ -51,7 +51,7 @@ public abstract class AbstractQueryDefinitionProvider implements QueryDefinition
return errorMessages;
}
private String validateGrouper(QueryDefinition queryDefinition) {
private String validateGrouper(QueryDefinitionDeprecated queryDefinition) {
GrouperType grouper = queryDefinition.getGrouperType();
if (grouper == null) {
return stringMessages.noGrouperSelectedError();
@@ -72,7 +72,7 @@ public abstract class AbstractQueryDefinitionProvider implements QueryDefinition
return null;
}
private String validateStatisticAndAggregator(QueryDefinition queryDefinition) {
private String validateStatisticAndAggregator(QueryDefinitionDeprecated queryDefinition) {
return queryDefinition.getStatisticType() == null || queryDefinition.getAggregatorType() == null ? stringMessages.noStatisticSelectedError() : null;
}
@@ -92,7 +92,7 @@ public abstract class AbstractQueryDefinitionProvider implements QueryDefinition
protected void notifyQueryDefinitionChanged() {
if (!blockChangeNotification) {
QueryDefinition queryDefinition = getQueryDefinition();
QueryDefinitionDeprecated queryDefinition = getQueryDefinition();
for (QueryDefinitionChangedListener listener : listeners) {
listener.queryDefinitionChanged(queryDefinition);
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/client/selection/ComplexStatisticProvider.java
+2 -2
View File
@@ -11,7 +11,7 @@ import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.ValueListBox;
import com.google.gwt.user.client.ui.Widget;
import com.sap.sailing.datamining.shared.DataTypes;
import com.sap.sailing.datamining.shared.QueryDefinition;
import com.sap.sailing.datamining.shared.QueryDefinitionDeprecated;
import com.sap.sailing.datamining.shared.StatisticType;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.client.shared.components.SettingsDialogComponent;
@@ -108,7 +108,7 @@ public class ComplexStatisticProvider implements StatisticProvider {
}
@Override
public void applyQueryDefinition(QueryDefinition queryDefinition) {
public void applyQueryDefinition(QueryDefinitionDeprecated queryDefinition) {
applyStatistic(statisticsManager.getStatistic(queryDefinition.getDataType()));
aggregatorListBox.setValue(queryDefinition.getAggregatorType(), false);
dataTypeListBox.setValue(queryDefinition.getDataType(), false);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/client/selection/GroupBySelectionPanel.java
+3 -3
View File
@@ -15,7 +15,7 @@ import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.ValueListBox;
import com.google.gwt.user.client.ui.Widget;
import com.sap.sailing.datamining.shared.DimensionIdentifier;
import com.sap.sailing.datamining.shared.QueryDefinition;
import com.sap.sailing.datamining.shared.QueryDefinitionDeprecated;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sse.datamining.shared.components.GrouperType;
@@ -42,7 +42,7 @@ public abstract class GroupBySelectionPanel extends FlowPanel {
dimensionsToGroupByBoxes.add(dimensionToGroupByBox);
}
public void apply(QueryDefinition queryDefinition) {
public void apply(QueryDefinitionDeprecated queryDefinition) {
grouperTypeListBox.setValue(queryDefinition.getGrouperType(), true);
switch (queryDefinition.getGrouperType()) {
@@ -54,7 +54,7 @@ public abstract class GroupBySelectionPanel extends FlowPanel {
}
}
private void applyDimensionsToGroupBy(QueryDefinition queryDefinition) {
private void applyDimensionsToGroupBy(QueryDefinitionDeprecated queryDefinition) {
int index = 0;
for (DimensionIdentifier dimension : queryDefinition.getDimensionsToGroupBy()) {
dimensionsToGroupByBoxes.get(index).setValue(dimension, true);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/client/selection/QueryDefinitionProviderWithControls.java
+3 -3
View File
@@ -12,7 +12,7 @@ import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.RequiresResize;
import com.google.gwt.user.client.ui.Widget;
import com.sap.sailing.datamining.shared.DimensionIdentifier;
import com.sap.sailing.datamining.shared.QueryDefinition;
import com.sap.sailing.datamining.shared.QueryDefinitionDeprecated;
import com.sap.sailing.datamining.shared.impl.SimpleQueryDefinition;
import com.sap.sailing.gwt.ui.client.ErrorReporter;
import com.sap.sailing.gwt.ui.client.SailingServiceAsync;
@@ -65,7 +65,7 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition
}
@Override
public QueryDefinition getQueryDefinition() {
public QueryDefinitionDeprecated getQueryDefinition() {
SimpleQueryDefinition queryDTO = new SimpleQueryDefinition(LocaleInfo.getCurrentLocale().getLocaleName(), groupBySelectionPanel.getGrouperType(),
statisticProvider.getStatisticType(), statisticProvider.getAggregatorType(),
statisticProvider.getDataType());
@@ -87,7 +87,7 @@ public class QueryDefinitionProviderWithControls extends AbstractQueryDefinition
}
@Override
public void applyQueryDefinition(QueryDefinition queryDefinition) {
public void applyQueryDefinition(QueryDefinitionDeprecated queryDefinition) {
setBlockChangeNotification(true);
selectionProvider.applySelection(queryDefinition);
groupBySelectionPanel.applyQueryDefinition(queryDefinition);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/client/selection/RefreshingSelectionTablesPanel.java
+2 -2
View File
@@ -23,7 +23,7 @@ import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.view.client.SelectionChangeEvent;
import com.google.gwt.view.client.SelectionChangeEvent.Handler;
import com.sap.sailing.datamining.shared.DimensionIdentifier;
import com.sap.sailing.datamining.shared.QueryDefinition;
import com.sap.sailing.datamining.shared.QueryDefinitionDeprecated;
import com.sap.sailing.domain.common.LegType;
import com.sap.sailing.domain.common.TrackedRaceStatusEnum;
import com.sap.sailing.domain.common.dto.BoatClassDTO;
@@ -139,7 +139,7 @@ public class RefreshingSelectionTablesPanel implements SelectionProvider<Refresh
}
@Override
public void applySelection(QueryDefinition queryDefinition) {
public void applySelection(QueryDefinitionDeprecated queryDefinition) {
for (Entry<DimensionIdentifier, Iterable<?>> selectionEntry : queryDefinition.getSelection().entrySet()) {
SelectionTable<?, ?> selectionTable = tablesMappedByDimension.get(selectionEntry.getKey());
selectionTable.setSelection((Iterable<?>) selectionEntry.getValue());
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/client/selection/RestrictedGroupingProvider.java
+2 -2
View File
@@ -16,7 +16,7 @@ import com.google.gwt.user.client.ui.ValueListBox;
import com.google.gwt.user.client.ui.Widget;
import com.sap.sailing.datamining.shared.DimensionIdentifier;
import com.sap.sailing.datamining.shared.DimensionIdentifier.OrdinalComparator;
import com.sap.sailing.datamining.shared.QueryDefinition;
import com.sap.sailing.datamining.shared.QueryDefinitionDeprecated;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.client.shared.components.SettingsDialogComponent;
import com.sap.sailing.gwt.ui.client.shared.components.SimpleValueListBox;
@@ -105,7 +105,7 @@ public class RestrictedGroupingProvider implements GroupingProvider {
}
@Override
public void applyQueryDefinition(QueryDefinition queryDefinition) {
public void applyQueryDefinition(QueryDefinitionDeprecated queryDefinition) {
if (queryDefinition.getGrouperType() == GrouperType.Dimensions) {
int index = 0;
for (DimensionIdentifier dimension : queryDefinition.getDimensionsToGroupBy()) {
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DataMiningServiceImpl.java
+6 -6
View File
@@ -7,11 +7,11 @@ import org.osgi.framework.BundleContext;
import org.osgi.util.tracker.ServiceTracker;
import com.google.gwt.user.server.rpc.RemoteServiceServlet;
import com.sap.sailing.datamining.data.GPSFixWithContext;
import com.sap.sailing.datamining.data.TrackedLegOfCompetitorWithContext;
import com.sap.sailing.datamining.data.HasGPSFixContext;
import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext;
import com.sap.sailing.datamining.factories.DataMiningFactory;
import com.sap.sailing.datamining.shared.DataTypes;
import com.sap.sailing.datamining.shared.QueryDefinition;
import com.sap.sailing.datamining.shared.QueryDefinitionDeprecated;
import com.sap.sailing.gwt.ui.datamining.client.DataMiningService;
import com.sap.sailing.server.RacingEventService;
import com.sap.sse.datamining.DataMiningServer;
@@ -70,9 +70,9 @@ public class DataMiningServiceImpl extends RemoteServiceServlet implements DataM
private Class<?> getBaseClassFor(DataTypes dataType) {
switch (dataType) {
case GPSFix:
return GPSFixWithContext.class;
return HasGPSFixContext.class;
case TrackedLegOfCompetitor:
return TrackedLegOfCompetitorWithContext.class;
return HasTrackedLegOfCompetitorContext.class;
}
throw new IllegalArgumentException("No base class for data type " + dataType);
}
@@ -86,7 +86,7 @@ public class DataMiningServiceImpl extends RemoteServiceServlet implements DataM
}
@Override
public <ResultType extends Number> QueryResult<ResultType> runQuery(QueryDefinition queryDefinition) throws Exception {
public <ResultType extends Number> QueryResult<ResultType> runQuery(QueryDefinitionDeprecated queryDefinition) throws Exception {
Query<ResultType> query = DataMiningFactory.createQuery(queryDefinition, getRacingEventService());
return query.run();
}
java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestProcessorQuery.java
+2 -6
View File
@@ -26,7 +26,7 @@ import com.sap.sse.datamining.components.Processor;
import com.sap.sse.datamining.factories.FunctionFactory;
import com.sap.sse.datamining.functions.Function;
import com.sap.sse.datamining.i18n.DataMiningStringMessages;
import com.sap.sse.datamining.impl.components.AbstractFilteringRetrievalProcessor;
import com.sap.sse.datamining.impl.components.AbstractSimpleFilteringRetrievalProcessor;
import com.sap.sse.datamining.impl.components.AbstractSimpleParallelProcessor;
import com.sap.sse.datamining.impl.components.GroupedDataEntry;
import com.sap.sse.datamining.impl.components.ParallelGroupedElementsValueExtractionProcessor;
@@ -122,15 +122,11 @@ public class TestProcessorQuery {
return element.getValue() >= 10;
}
};
Processor<Iterable<Number>> filteringRetrievalProcessor = new AbstractFilteringRetrievalProcessor<Iterable<Number>, Number, Number>(ConcurrencyTestsUtil.getExecutor(), Arrays.asList(lengthGrouper), retrievalFilterCriteria) {
Processor<Iterable<Number>> filteringRetrievalProcessor = new AbstractSimpleFilteringRetrievalProcessor<Iterable<Number>, Number>(ConcurrencyTestsUtil.getExecutor(), Arrays.asList(lengthGrouper), retrievalFilterCriteria) {
@Override
protected Iterable<Number> retrieveData(Iterable<Number> element) {
return element;
}
@Override
protected Number contextifyElement(Number partialElement) {
return partialElement;
}
};
query.setFirstProcessor(filteringRetrievalProcessor);
java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestAbstractFilteringRetrievalProcessor.java
+1 -5
View File
@@ -77,15 +77,11 @@ public class TestAbstractFilteringRetrievalProcessor {
return element >= 0;
}
};
filteringRetrievalProcessor = new AbstractFilteringRetrievalProcessor<Iterable<Integer>, Integer, Integer>(ConcurrencyTestsUtil.getExecutor(), Arrays.asList(resultReceiver), filterCriteria) {
filteringRetrievalProcessor = new AbstractSimpleFilteringRetrievalProcessor<Iterable<Integer>, Integer>(ConcurrencyTestsUtil.getExecutor(), Arrays.asList(resultReceiver), filterCriteria) {
@Override
protected Iterable<Integer> retrieveData(Iterable<Integer> element) {
return element;
}
@Override
protected Integer contextifyElement(Integer partialElement) {
return partialElement;
}
};
}
java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/components/TestFilteringProcessors.java
-1
View File
@@ -14,7 +14,6 @@ import org.junit.Test;
import com.sap.sse.datamining.AdditionalResultDataBuilder;
import com.sap.sse.datamining.components.FilterCriteria;
import com.sap.sse.datamining.components.NonFilteringProcessor;
import com.sap.sse.datamining.components.Processor;
import com.sap.sse.datamining.test.util.ConcurrencyTestsUtil;
java/com.sap.sse.datamining/src/com/sap/sse/datamining/components/NonFilteringProcessor.java → java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/components/NonFilteringProcessor.java
+2 -2
View File
@@ -1,9 +1,9 @@
package com.sap.sse.datamining.components;
package com.sap.sse.datamining.impl.components;
import java.util.Collection;
import com.sap.sse.datamining.AdditionalResultDataBuilder;
import com.sap.sse.datamining.impl.components.AbstractProcessor;
import com.sap.sse.datamining.components.Processor;
public class NonFilteringProcessor<InputType> extends AbstractProcessor<InputType, InputType> {