Skip to content
This repository was archived by the owner on Sep 1, 2024. It is now read-only.

Commit 5031198

Browse files
dariol83dariol83
committed
Archive external ID filtering implemented
1 parent 3e1918d commit 5031198

23 files changed

Lines changed: 154 additions & 146 deletions

‎eu.dariolucia.reatmetric.api/src/main/java/eu/dariolucia/reatmetric/api/activity/ActivityOccurrenceDataFilter.java‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
import eu.dariolucia.reatmetric.api.model.SystemEntityType;
1515

1616
import java.io.Serializable;
17+
import java.util.Collections;
18+
import java.util.LinkedHashSet;
1719
import java.util.List;
20+
import java.util.Set;
1821

1922
/**
2023
*
@@ -29,40 +32,40 @@ public final class ActivityOccurrenceDataFilter extends AbstractDataItemFilter<A
2932

3033
private final SystemEntityPath parentPath;
3134

32-
private final List<String> routeList;
35+
private final Set<String> routeList;
3336

34-
private final List<String> sourceList;
37+
private final Set<String> sourceList;
3538

36-
private final List<String> typeList;
39+
private final Set<String> typeList;
3740

38-
private final List<ActivityOccurrenceState> stateList;
41+
private final Set<ActivityOccurrenceState> stateList;
3942

40-
private final List<Integer> externalIdList;
43+
private final Set<Integer> externalIdList;
4144

4245
public ActivityOccurrenceDataFilter(SystemEntityPath parentPath, List<String> routeList, List<String> typeList, List<ActivityOccurrenceState> stateList, List<String> sourceList, List<Integer> externalIdList) {
4346
this.parentPath = parentPath;
4447
if(routeList != null) {
45-
this.routeList = List.copyOf(routeList);
48+
this.routeList = Collections.unmodifiableSet(new LinkedHashSet<>(routeList));
4649
} else {
4750
this.routeList = null;
4851
}
4952
if(sourceList != null) {
50-
this.sourceList = List.copyOf(sourceList);
53+
this.sourceList = Collections.unmodifiableSet(new LinkedHashSet<>(sourceList));
5154
} else {
5255
this.sourceList = null;
5356
}
5457
if(typeList != null) {
55-
this.typeList = List.copyOf(typeList);
58+
this.typeList = Collections.unmodifiableSet(new LinkedHashSet<>(typeList));
5659
} else {
5760
this.typeList = null;
5861
}
5962
if(stateList != null) {
60-
this.stateList = List.copyOf(stateList);
63+
this.stateList = Collections.unmodifiableSet(new LinkedHashSet<>(stateList));
6164
} else {
6265
this.stateList = null;
6366
}
6467
if(externalIdList != null) {
65-
this.externalIdList = List.copyOf(externalIdList);
68+
this.externalIdList = Collections.unmodifiableSet(new LinkedHashSet<>(externalIdList));
6669
} else {
6770
this.externalIdList = null;
6871
}
@@ -72,23 +75,23 @@ public SystemEntityPath getParentPath() {
7275
return parentPath;
7376
}
7477

75-
public List<ActivityOccurrenceState> getStateList() {
78+
public Set<ActivityOccurrenceState> getStateList() {
7679
return stateList;
7780
}
7881

79-
public List<String> getRouteList() {
82+
public Set<String> getRouteList() {
8083
return routeList;
8184
}
8285

83-
public List<String> getTypeList() {
86+
public Set<String> getTypeList() {
8487
return typeList;
8588
}
8689

87-
public List<String> getSourceList() {
90+
public Set<String> getSourceList() {
8891
return sourceList;
8992
}
9093

91-
public List<Integer> getExternalIdList() {
94+
public Set<Integer> getExternalIdList() {
9295
return externalIdList;
9396
}
9497

‎eu.dariolucia.reatmetric.api/src/main/java/eu/dariolucia/reatmetric/api/alarms/AlarmParameterDataFilter.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import eu.dariolucia.reatmetric.api.model.SystemEntityType;
1414

1515
import java.io.Serializable;
16-
import java.util.List;
16+
import java.util.*;
1717

1818
/**
1919
*
@@ -28,26 +28,26 @@ public final class AlarmParameterDataFilter extends AbstractDataItemFilter<Alarm
2828

2929
private final SystemEntityPath parentPath;
3030

31-
private final List<SystemEntityPath> parameterPathList;
31+
private final Set<SystemEntityPath> parameterPathList;
3232

33-
private final List<AlarmState> alarmStateList;
33+
private final Set<AlarmState> alarmStateList;
3434

35-
private final List<Integer> externalIdList;
35+
private final Set<Integer> externalIdList;
3636

37-
public AlarmParameterDataFilter(SystemEntityPath parentPath, List<SystemEntityPath> pathList, List<AlarmState> alarmStateList, List<Integer> externalIdList) {
37+
public AlarmParameterDataFilter(SystemEntityPath parentPath, Collection<SystemEntityPath> pathList, Collection<AlarmState> alarmStateList, Collection<Integer> externalIdList) {
3838
this.parentPath = parentPath;
3939
if(pathList != null) {
40-
this.parameterPathList = List.copyOf(pathList);
40+
this.parameterPathList = Collections.unmodifiableSet(new LinkedHashSet<>(pathList));
4141
} else {
4242
this.parameterPathList = null;
4343
}
4444
if(alarmStateList != null) {
45-
this.alarmStateList = List.copyOf(alarmStateList);
45+
this.alarmStateList = Collections.unmodifiableSet(new LinkedHashSet<>(alarmStateList));
4646
} else {
4747
this.alarmStateList = null;
4848
}
4949
if(externalIdList != null) {
50-
this.externalIdList = List.copyOf(externalIdList);
50+
this.externalIdList = Collections.unmodifiableSet(new LinkedHashSet<>(externalIdList));
5151
} else {
5252
this.externalIdList = null;
5353
}
@@ -57,15 +57,15 @@ public SystemEntityPath getParentPath() {
5757
return parentPath;
5858
}
5959

60-
public List<SystemEntityPath> getParameterPathList() {
60+
public Set<SystemEntityPath> getParameterPathList() {
6161
return parameterPathList;
6262
}
6363

64-
public List<AlarmState> getAlarmStateList() {
64+
public Set<AlarmState> getAlarmStateList() {
6565
return alarmStateList;
6666
}
6767

68-
public List<Integer> getExternalIdList() {
68+
public Set<Integer> getExternalIdList() {
6969
return externalIdList;
7070
}
7171

‎eu.dariolucia.reatmetric.api/src/main/java/eu/dariolucia/reatmetric/api/events/EventDataFilter.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import eu.dariolucia.reatmetric.api.model.SystemEntityType;
1616

1717
import java.io.Serializable;
18-
import java.util.List;
18+
import java.util.*;
1919

2020
/**
2121
*
@@ -30,47 +30,47 @@ public final class EventDataFilter extends AbstractDataItemFilter<EventData> imp
3030

3131
private final SystemEntityPath parentPath;
3232

33-
private final List<SystemEntityPath> eventPathList;
33+
private final Set<SystemEntityPath> eventPathList;
3434

35-
private final List<String> routeList;
35+
private final Set<String> routeList;
3636

37-
private final List<String> typeList;
37+
private final Set<String> typeList;
3838

39-
private final List<String> sourceList;
39+
private final Set<String> sourceList;
4040

41-
private final List<Severity> severityList;
41+
private final Set<Severity> severityList;
4242

43-
private final List<Integer> externalIdList;
43+
private final Set<Integer> externalIdList;
4444

45-
public EventDataFilter(SystemEntityPath parentPath, List<SystemEntityPath> eventPathList, List<String> routeList, List<String> typeList, List<String> sourceList, List<Severity> severityList, List<Integer> externalIdList) {
45+
public EventDataFilter(SystemEntityPath parentPath, Collection<SystemEntityPath> eventPathList, Collection<String> routeList, Collection<String> typeList, Collection<String> sourceList, Collection<Severity> severityList, Collection<Integer> externalIdList) {
4646
this.parentPath = parentPath;
4747
if(eventPathList != null) {
48-
this.eventPathList = List.copyOf(eventPathList);
48+
this.eventPathList = Collections.unmodifiableSet(new LinkedHashSet<>(eventPathList));
4949
} else {
5050
this.eventPathList = null;
5151
}
5252
if(routeList != null) {
53-
this.routeList = List.copyOf(routeList);
53+
this.routeList = Collections.unmodifiableSet(new LinkedHashSet<>(routeList));
5454
} else {
5555
this.routeList = null;
5656
}
5757
if(typeList != null) {
58-
this.typeList = List.copyOf(typeList);
58+
this.typeList = Collections.unmodifiableSet(new LinkedHashSet<>(typeList));
5959
} else {
6060
this.typeList = null;
6161
}
6262
if(sourceList != null) {
63-
this.sourceList = List.copyOf(sourceList);
63+
this.sourceList = Collections.unmodifiableSet(new LinkedHashSet<>(sourceList));
6464
} else {
6565
this.sourceList = null;
6666
}
6767
if(severityList != null) {
68-
this.severityList = List.copyOf(severityList);
68+
this.severityList = Collections.unmodifiableSet(new LinkedHashSet<>(severityList));
6969
} else {
7070
this.severityList = null;
7171
}
7272
if(externalIdList != null) {
73-
this.externalIdList = List.copyOf(externalIdList);
73+
this.externalIdList = Collections.unmodifiableSet(new LinkedHashSet<>(externalIdList));
7474
} else {
7575
this.externalIdList = null;
7676
}
@@ -80,27 +80,27 @@ public SystemEntityPath getParentPath() {
8080
return parentPath;
8181
}
8282

83-
public List<SystemEntityPath> getEventPathList() {
83+
public Set<SystemEntityPath> getEventPathList() {
8484
return eventPathList;
8585
}
8686

87-
public List<String> getSourceList() {
87+
public Set<String> getSourceList() {
8888
return sourceList;
8989
}
9090

91-
public List<Severity> getSeverityList() {
91+
public Set<Severity> getSeverityList() {
9292
return severityList;
9393
}
9494

95-
public List<String> getRouteList() {
95+
public Set<String> getRouteList() {
9696
return routeList;
9797
}
9898

99-
public List<String> getTypeList() {
99+
public Set<String> getTypeList() {
100100
return typeList;
101101
}
102102

103-
public List<Integer> getExternalIdList() {
103+
public Set<Integer> getExternalIdList() {
104104
return externalIdList;
105105
}
106106

‎eu.dariolucia.reatmetric.api/src/main/java/eu/dariolucia/reatmetric/api/messages/OperationalMessageFilter.java‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,9 @@
1010

1111
import eu.dariolucia.reatmetric.api.common.AbstractDataItemFilter;
1212
import eu.dariolucia.reatmetric.api.model.SystemEntity;
13-
import eu.dariolucia.reatmetric.api.model.SystemEntityPath;
1413

1514
import java.io.Serializable;
16-
import java.util.ArrayList;
17-
import java.util.List;
18-
import java.util.Objects;
15+
import java.util.*;
1916

2017
/**
2118
*
@@ -30,26 +27,26 @@ public final class OperationalMessageFilter extends AbstractDataItemFilter<Opera
3027

3128
private final String messageTextContains;
3229

33-
private final List<String> idList;
30+
private final Set<String> idList;
3431

35-
private final List<String> sourceList;
32+
private final Set<String> sourceList;
3633

37-
private final List<Severity> severityList;
34+
private final Set<Severity> severityList;
3835

39-
public OperationalMessageFilter(String messageTextContains, List<String> idList, List<String> sourceList, List<Severity> severityList) {
36+
public OperationalMessageFilter(String messageTextContains, Collection<String> idList, Collection<String> sourceList, Collection<Severity> severityList) {
4037
this.messageTextContains = messageTextContains;
4138
if(idList != null) {
42-
this.idList = List.copyOf(idList);
39+
this.idList = Collections.unmodifiableSet(new LinkedHashSet<>(idList));
4340
} else {
4441
this.idList = null;
4542
}
4643
if(sourceList != null) {
47-
this.sourceList = List.copyOf(sourceList);
44+
this.sourceList = Collections.unmodifiableSet(new LinkedHashSet<>(sourceList));
4845
} else {
4946
this.sourceList = null;
5047
}
5148
if(severityList != null) {
52-
this.severityList = List.copyOf(severityList);
49+
this.severityList = Collections.unmodifiableSet(new LinkedHashSet<>(severityList));
5350
} else {
5451
this.severityList = null;
5552
}
@@ -59,15 +56,15 @@ public String getMessageTextContains() {
5956
return messageTextContains;
6057
}
6158

62-
public List<String> getSourceList() {
59+
public Set<String> getSourceList() {
6360
return sourceList;
6461
}
6562

66-
public List<String> getIdList() {
63+
public Set<String> getIdList() {
6764
return idList;
6865
}
6966

70-
public List<Severity> getSeverityList() {
67+
public Set<Severity> getSeverityList() {
7168
return severityList;
7269
}
7370

0 commit comments

Comments
 (0)