Skip to content

Commit bc610bc

Browse files
swltrmartingr
authored andcommitted
Update Spotless' Eclipse formatter to 4.38
This also fixes formatting in some places that the formatter previously didn't recognize. Merged-by: Martin Grzenia <martin.grzenia@iml.fraunhofer.de>
1 parent 6a8d4b3 commit bc610bc

File tree

5 files changed

+29
-17
lines changed

5 files changed

+29
-17
lines changed

gradle/java-project.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,6 @@ spotless {
8282
importOrder()
8383

8484
// Use the Eclipse JDT formatter
85-
eclipse('4.26').configFile("${rootDir}/config/eclipse-formatter-preferences.xml")
85+
eclipse('4.38').configFile("${rootDir}/config/eclipse-formatter-preferences.xml")
8686
}
8787
}

opentcs-kernel/src/test/java/org/opentcs/kernel/vehicles/transformers/VehicleDataTransformerRegistryTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ void provideAcceptableFactoryForVehicle() {
7171
@Test
7272
void fallBackToDefaultFactoryForUnacceptableSelectedFactory() {
7373
when(dummyFactory.providesTransformersFor(vehicle)).thenReturn(false);
74-
assertThat(vehicleDataTransformerRegistry.findFactoryFor(vehicle).getClass(),
75-
is(DefaultVehicleDataTransformerFactory.class));
74+
assertThat(
75+
vehicleDataTransformerRegistry.findFactoryFor(vehicle).getClass(),
76+
is(DefaultVehicleDataTransformerFactory.class)
77+
);
7678
}
7779
}

opentcs-plantoverview-panel-loadgenerator/src/test/java/org/opentcs/guing/plugins/panels/loadgenerator/batchcreator/RandomOrderBatchCreatorTest.java

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,12 @@ void givenUnsuitableTypeWithoutLinkThenCreateNoOrders() {
5959
.thenReturn(Set.of(unsuitableLocType));
6060
when(transportOrderService.fetch(Location.class))
6161
.thenReturn(Set.of(unsuitableLoc));
62-
RandomOrderBatchCreator batchCreator = new RandomOrderBatchCreator(transportOrderService,
63-
dispatcherService,
64-
10,
65-
3);
62+
RandomOrderBatchCreator batchCreator = new RandomOrderBatchCreator(
63+
transportOrderService,
64+
dispatcherService,
65+
10,
66+
3
67+
);
6668

6769
Set<TransportOrder> result = batchCreator.createOrderBatch();
6870

@@ -77,10 +79,12 @@ void givenSuitableTypeWithoutLinkThenCreateNoOrders() {
7779
.thenReturn(Set.of(suitableLocType));
7880
when(transportOrderService.fetch(Location.class))
7981
.thenReturn(Set.of(suitableLoc));
80-
RandomOrderBatchCreator batchCreator = new RandomOrderBatchCreator(transportOrderService,
81-
dispatcherService,
82-
10,
83-
3);
82+
RandomOrderBatchCreator batchCreator = new RandomOrderBatchCreator(
83+
transportOrderService,
84+
dispatcherService,
85+
10,
86+
3
87+
);
8488

8589
Set<TransportOrder> result = batchCreator.createOrderBatch();
8690

opentcs-strategies-default/src/test/java/org/opentcs/strategies/basic/dispatching/TransportOrderAssignmentCheckerTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,9 @@ void acceptValidOrderAndVehicle() {
183183
when(objectService.fetch(Vehicle.class, vehicle.getReference()))
184184
.thenReturn(Optional.of(vehicle));
185185

186-
assertThat(checker.checkTransportOrderAssignment(transportOrder),
187-
is(TransportOrderAssignmentVeto.NO_VETO));
186+
assertThat(
187+
checker.checkTransportOrderAssignment(transportOrder),
188+
is(TransportOrderAssignmentVeto.NO_VETO)
189+
);
188190
}
189191
}

opentcs-strategies-default/src/test/java/org/opentcs/strategies/basic/routing/edgeevaluator/EdgeEvaluatorExplicitPropertiesTest.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,10 @@ void useConfiguredDefaultValue() {
6060
when(configuration.defaultValue()).thenReturn("123.456");
6161

6262
Edge edge = new Edge(
63-
new Path("pathName", new Point("srcPoint").getReference(),
64-
new Point("dstPoint").getReference()),
63+
new Path(
64+
"pathName", new Point("srcPoint").getReference(),
65+
new Point("dstPoint").getReference()
66+
),
6567
false
6668
);
6769
Vehicle vehicle = new Vehicle("someVehicle");
@@ -79,8 +81,10 @@ void handleInvalidDefaultValue() {
7981
when(configuration.defaultValue()).thenReturn("some invalid value");
8082

8183
Edge edge = new Edge(
82-
new Path("pathName", new Point("srcPoint").getReference(),
83-
new Point("dstPoint").getReference()),
84+
new Path(
85+
"pathName", new Point("srcPoint").getReference(),
86+
new Point("dstPoint").getReference()
87+
),
8488
false
8589
);
8690
Vehicle vehicle = new Vehicle("someVehicle");

0 commit comments

Comments
 (0)