Skip to content

Commit a449450

Browse files
authored
Bump minimal Java version to 11 (#150)
* initial refactoring * more aggressive cleanups at the cost of checkerframework failing * typo
1 parent 43611f5 commit a449450

File tree

25 files changed

+52
-116
lines changed

25 files changed

+52
-116
lines changed

algorithms/active/aaar/src/main/java/de/learnlib/algorithm/aaar/abstraction/AbstractAbstractionTree.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public Collection<Node> getNodes() {
171171

172172
@Override
173173
public VisualizationHelper<Node, Node> getVisualizationHelper() {
174-
return new DefaultVisualizationHelper<Node, Node>() {
174+
return new DefaultVisualizationHelper<>() {
175175

176176
@Override
177177
public boolean getNodeProperties(Node node, Map<String, String> properties) {

algorithms/active/adt/src/main/java/de/learnlib/algorithm/adt/ads/DefensiveADS.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ private Optional<ADTNode<S, I, O>> compute() {
115115
final Map<S, S> initialMapping = new ReflexiveMapView<>(states);
116116
Optional<ADTNode<S, I, O>> interMediateResult = compute(initialMapping);
117117

118-
while (!interMediateResult.isPresent()) {
118+
while (interMediateResult.isEmpty()) {
119119

120120
// we encountered open transitions that can be closed
121121
if (refinementStates != null && refinementInput != null) {
@@ -234,7 +234,7 @@ private Optional<ADTNode<S, I, O>> compute(Map<S, S> mapping) {
234234
succ = Optional.of(new ADTLeafNode<>(null, s));
235235
}
236236

237-
if (!succ.isPresent()) {
237+
if (succ.isEmpty()) {
238238
cache.add(currentNodeAsBitSet);
239239
continue oneSymbolFuture;
240240
}

algorithms/active/adt/src/main/java/de/learnlib/algorithm/adt/adt/ADTNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ default Collection<ADTNode<S, I, O>> getNodes() {
5555

5656
@Override
5757
default VisualizationHelper<ADTNode<S, I, O>, ADTNode<S, I, O>> getVisualizationHelper() {
58-
return new VisualizationHelper<ADTNode<S, I, O>, ADTNode<S, I, O>>() {
58+
return new VisualizationHelper<>() {
5959

6060
@Override
6161
public boolean getNodeProperties(ADTNode<S, I, O> node, Map<String, String> properties) {

algorithms/active/adt/src/main/java/de/learnlib/algorithm/adt/config/model/extender/DefaultExtender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public <I, O> ExtensionResult<ADTState<I, O>, I, O> computeExtension(ADTHypothes
115115
currentSet,
116116
partialTransitionAnalyzer);
117117

118-
if (!potentialExtension.isPresent()) {
118+
if (potentialExtension.isEmpty()) {
119119
return ExtensionResult.empty();
120120
}
121121

algorithms/active/adt/src/main/java/module-info.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@
5050
exports de.learnlib.algorithm.adt.api;
5151
exports de.learnlib.algorithm.adt.automaton;
5252
exports de.learnlib.algorithm.adt.config;
53+
exports de.learnlib.algorithm.adt.config.model;
54+
exports de.learnlib.algorithm.adt.config.model.calculator;
55+
exports de.learnlib.algorithm.adt.config.model.extender;
56+
exports de.learnlib.algorithm.adt.config.model.replacer;
5357
exports de.learnlib.algorithm.adt.learner;
5458
exports de.learnlib.algorithm.adt.model;
5559
exports de.learnlib.algorithm.adt.util;

algorithms/active/lsharp/src/main/java/de/learnlib/algorithm/lsharp/ads/ArenaNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
public class ArenaNode<T, P> {
2222

2323
public final @Nullable Pair<P, Integer> parent;
24-
public T value;
24+
public final T value;
2525

2626
public ArenaNode(@Nullable Pair<P, Integer> parent, T value) {
2727
this.parent = parent;

algorithms/active/lstar/src/main/java/de/learnlib/algorithm/lstar/ce/ObservationTableCEXHandlers.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
public final class ObservationTableCEXHandlers {
3535

3636
public static final ObservationTableCEXHandler<@Nullable Object, @Nullable Object> CLASSIC_LSTAR =
37-
new ObservationTableCEXHandler<@Nullable Object, @Nullable Object>() {
37+
new ObservationTableCEXHandler<>() {
3838

3939
@Override
4040
public <RI, RD> List<List<Row<RI>>> handleCounterexample(DefaultQuery<RI, RD> ceQuery,
@@ -57,7 +57,7 @@ public String toString() {
5757
};
5858

5959
public static final ObservationTableCEXHandler<@Nullable Object, @Nullable Object> SUFFIX1BY1 =
60-
new ObservationTableCEXHandler<@Nullable Object, @Nullable Object>() {
60+
new ObservationTableCEXHandler<>() {
6161

6262
@Override
6363
public <RI, RD> List<List<Row<RI>>> handleCounterexample(DefaultQuery<RI, RD> ceQuery,
@@ -107,7 +107,7 @@ private ObservationTableCEXHandlers() {
107107
}
108108

109109
public static <I, D> ObservationTableCEXHandler<I, D> fromGlobalSuffixFinder(GlobalSuffixFinder<I, D> globalFinder) {
110-
return new ObservationTableCEXHandler<I, D>() {
110+
return new ObservationTableCEXHandler<>() {
111111

112112
@Override
113113
public <RI extends I, RD extends D> List<List<Row<RI>>> handleCounterexample(DefaultQuery<RI, RD> ceQuery,
@@ -142,7 +142,7 @@ public static <I, D> ObservationTableCEXHandler<I, D> fromLocalSuffixFinder(Loca
142142

143143
public static <I, D> ObservationTableCEXHandler<I, D> fromLocalSuffixFinder(LocalSuffixFinder<I, D> localFinder,
144144
boolean allSuffixes) {
145-
return new ObservationTableCEXHandler<I, D>() {
145+
return new ObservationTableCEXHandler<>() {
146146

147147
@Override
148148
public <RI extends I, RD extends D> List<List<Row<RI>>> handleCounterexample(DefaultQuery<RI, RD> ceQuery,

algorithms/active/lstar/src/main/java/de/learnlib/algorithm/lstar/closing/ClosingStrategies.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public final class ClosingStrategies {
4141
* Closing strategy that selects the first row from each equivalence class as representative.
4242
*/
4343
public static final ClosingStrategy<@Nullable Object, @Nullable Object> CLOSE_FIRST =
44-
new ClosingStrategy<@Nullable Object, @Nullable Object>() {
44+
new ClosingStrategy<>() {
4545

4646
@Override
4747
public <RI, RD> List<Row<RI>> selectClosingRows(List<List<Row<RI>>> unclosedClasses,
@@ -65,7 +65,7 @@ public String toString() {
6565
* has minimal length in the respective class) as representative.
6666
*/
6767
public static final ClosingStrategy<@Nullable Object, @Nullable Object> CLOSE_SHORTEST =
68-
new ClosingStrategy<@Nullable Object, @Nullable Object>() {
68+
new ClosingStrategy<>() {
6969

7070
@Override
7171
public <RI, RD> List<Row<RI>> selectClosingRows(List<List<Row<RI>>> unclosedClasses,
@@ -100,7 +100,7 @@ public String toString() {
100100
* representative.
101101
*/
102102
public static final ClosingStrategy<@Nullable Object, @Nullable Object> CLOSE_LEX_MIN =
103-
new ClosingStrategy<@Nullable Object, @Nullable Object>() {
103+
new ClosingStrategy<>() {
104104

105105
@Override
106106
public <RI, RD> List<Row<RI>> selectClosingRows(List<List<Row<RI>>> unclosedClasses,

algorithms/active/observation-pack/src/main/java/de/learnlib/algorithm/observationpack/dfa/OPLearnerDFA.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public DFA<?, I> getHypothesisModel() {
6969

7070
@Override
7171
protected Query<I, Boolean> spQuery(HState<I, Boolean, Boolean, Void> state) {
72-
return new AbstractQuery<I, Boolean>(state.getAccessSequence(), Word.epsilon()) {
72+
return new AbstractQuery<>(state.getAccessSequence(), Word.epsilon()) {
7373

7474
@Override
7575
public void answer(Boolean val) {

algorithms/active/observation-pack/src/main/java/de/learnlib/algorithm/observationpack/hypothesis/OPLearnerHypothesis.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ public HState<I, O, SP, TP> getNode(int id) {
204204

205205
@Override
206206
public VisualizationHelper<HState<I, O, SP, TP>, HTransition<I, O, SP, TP>> getVisualizationHelper() {
207-
return new DefaultVisualizationHelper<HState<I, O, SP, TP>, HTransition<I, O, SP, TP>>() {
207+
return new DefaultVisualizationHelper<>() {
208208

209209
@Override
210210
protected Collection<HState<I, O, SP, TP>> initialNodes() {

0 commit comments

Comments
 (0)