diff --git a/build.gradle b/build.gradle index 3b305a712..7ab537490 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ plugins { id 'signing' id 'checkstyle' id 'jacoco' - id "com.diffplug.gradle.spotless" version "3.27.0" + id "com.diffplug.spotless" version "6.18.0" id 'org.sonarqube' version '2.8' // id "io.codearte.nexus-staging" version "0.12.0" id 'com.github.johnrengelman.shadow' version '5.0.0' diff --git a/src/main/java/org/openstreetmap/atlas/checks/distributed/IntegrityCheckSparkJob.java b/src/main/java/org/openstreetmap/atlas/checks/distributed/IntegrityCheckSparkJob.java index f98b61c40..4bac95401 100644 --- a/src/main/java/org/openstreetmap/atlas/checks/distributed/IntegrityCheckSparkJob.java +++ b/src/main/java/org/openstreetmap/atlas/checks/distributed/IntegrityCheckSparkJob.java @@ -292,7 +292,7 @@ public void start(final CommandMap commandMap) EventService.get(country) .register(new CheckFlagTippecanoeProcessor(fileHelper, tippecanoeOutput.getTemporaryPath()) - .withCompression(compressOutput)); + .withCompression(compressOutput)); } else { diff --git a/src/main/java/org/openstreetmap/atlas/checks/distributed/ShardedIntegrityChecksSparkJob.java b/src/main/java/org/openstreetmap/atlas/checks/distributed/ShardedIntegrityChecksSparkJob.java index 99d7a18f5..b063f0a7a 100644 --- a/src/main/java/org/openstreetmap/atlas/checks/distributed/ShardedIntegrityChecksSparkJob.java +++ b/src/main/java/org/openstreetmap/atlas/checks/distributed/ShardedIntegrityChecksSparkJob.java @@ -366,8 +366,8 @@ private FlatMapFunction produce final DynamicAtlasPolicy policy = new DynamicAtlasPolicy(fetcher, sharding.getValue(), Collections.singleton(task.getShard()), task.getShard().bounds().expand(shardDistanceExpansion)) - .withDeferredLoading(true).withAggressivelyExploreRelations(true) - .withExtendIndefinitely(false); + .withDeferredLoading(true).withAggressivelyExploreRelations(true) + .withExtendIndefinitely(false); atlas = new DynamicAtlas(policy); ((DynamicAtlas) atlas).preemptiveLoad(); } diff --git a/src/main/java/org/openstreetmap/atlas/checks/validation/areas/AreasWithHighwayTagCheck.java b/src/main/java/org/openstreetmap/atlas/checks/validation/areas/AreasWithHighwayTagCheck.java index 6ecb05442..9af866125 100644 --- a/src/main/java/org/openstreetmap/atlas/checks/validation/areas/AreasWithHighwayTagCheck.java +++ b/src/main/java/org/openstreetmap/atlas/checks/validation/areas/AreasWithHighwayTagCheck.java @@ -86,11 +86,10 @@ protected Optional flag(final AtlasObject object) .map(toFlag -> FeatureChange.add( (AtlasEntity) ((CompleteEntity) CompleteEntity .shallowFrom((AtlasEntity) toFlag)) - .withTags(toFlag.getTags()) - .withReplacedTag(HighwayTag.KEY, - HighwayTag.KEY, - HighwayTag.PEDESTRIAN - .getTagValue()), + .withTags(toFlag.getTags()).withReplacedTag( + HighwayTag.KEY, HighwayTag.KEY, + HighwayTag.PEDESTRIAN + .getTagValue()), object.getAtlas())) .collect(Collectors.toSet())); } @@ -104,8 +103,8 @@ protected Optional flag(final AtlasObject object) .map(toFlag -> FeatureChange.add( (AtlasEntity) ((CompleteEntity) CompleteEntity .shallowFrom((AtlasEntity) toFlag)) - .withTags(toFlag.getTags()) - .withRemovedTag(AreaTag.KEY), + .withTags(toFlag.getTags()) + .withRemovedTag(AreaTag.KEY), object.getAtlas())) .collect(Collectors.toSet())); }); diff --git a/src/main/java/org/openstreetmap/atlas/checks/validation/intersections/LevelCrossingOnRailwayCheck.java b/src/main/java/org/openstreetmap/atlas/checks/validation/intersections/LevelCrossingOnRailwayCheck.java index 84b946ac4..01a430fbe 100644 --- a/src/main/java/org/openstreetmap/atlas/checks/validation/intersections/LevelCrossingOnRailwayCheck.java +++ b/src/main/java/org/openstreetmap/atlas/checks/validation/intersections/LevelCrossingOnRailwayCheck.java @@ -230,17 +230,14 @@ private Optional flagIncorrectlyTagged(final AtlasObject object) .addFixSuggestion(FeatureChange.add( (AtlasEntity) ((CompleteEntity) CompleteEntity .from((AtlasEntity) object)) - .withTags(object.getTags()) - .withReplacedTag(RailwayTag.KEY, - RailwayTag.KEY, - RailwayTag.CROSSING.name() - .toLowerCase().intern()) - .withAddedTag(BicycleTag.KEY, - BicycleTag.YES.toString() - .toLowerCase()) - .withAddedTag(FootTag.KEY, - FootTag.NO.toString() - .toLowerCase()), + .withTags(object.getTags()) + .withReplacedTag(RailwayTag.KEY, RailwayTag.KEY, + RailwayTag.CROSSING.name().toLowerCase() + .intern()) + .withAddedTag(BicycleTag.KEY, + BicycleTag.YES.toString().toLowerCase()) + .withAddedTag(FootTag.KEY, + FootTag.NO.toString().toLowerCase()), object.getAtlas()))); case NODE_PED_ONLY_HIGHWAY: return Optional.of(this @@ -249,14 +246,15 @@ private Optional flagIncorrectlyTagged(final AtlasObject object) NODE_INVALID_LC_TAG_PED_ONLY_HIGHWAY_INDEX, object.getOsmIdentifier(), this.railwayTagKey, this.railwayTagValue)) - .addFixSuggestion(FeatureChange.add( - (AtlasEntity) ((CompleteEntity) CompleteEntity - .from((AtlasEntity) object)) + .addFixSuggestion( + FeatureChange.add( + (AtlasEntity) ((CompleteEntity) CompleteEntity + .from((AtlasEntity) object)) .withTags(object.getTags()).withReplacedTag( RailwayTag.KEY, RailwayTag.KEY, RailwayTag.CROSSING.name() .toLowerCase().intern()), - object.getAtlas()))); + object.getAtlas()))); case NODE_NO_RAILWAY: instructIndex = NODE_INVALID_LC_TAG_NO_RAILWAY_INDEX; break; @@ -283,13 +281,14 @@ private Optional flagIncorrectlyTagged(final AtlasObject object) .createFlag(object, this.getLocalizedInstruction(NODE_CROSSING_MISSING_LC_TAG_INDEX, object.getOsmIdentifier(), this.railwayTagKey)) - .addFixSuggestion(FeatureChange.add( - (AtlasEntity) ((CompleteEntity) CompleteEntity - .from((AtlasEntity) object)).withTags(object.getTags()) - .withReplacedTag(RailwayTag.KEY, - this.railwayTagKey, + .addFixSuggestion( + FeatureChange.add( + (AtlasEntity) ((CompleteEntity) CompleteEntity + .from((AtlasEntity) object)) + .withTags(object.getTags()).withReplacedTag( + RailwayTag.KEY, this.railwayTagKey, this.railwayTagValue), - object.getAtlas()))); + object.getAtlas()))); } return Optional.of(this .createFlag(object, @@ -297,8 +296,8 @@ private Optional flagIncorrectlyTagged(final AtlasObject object) object.getOsmIdentifier(), this.railwayTagKey)) .addFixSuggestion(FeatureChange.add( (AtlasEntity) ((CompleteEntity) CompleteEntity - .from((AtlasEntity) object)).withAddedTag( - this.railwayTagKey, this.railwayTagValue), + .from((AtlasEntity) object)) + .withAddedTag(this.railwayTagKey, this.railwayTagValue), object.getAtlas()))); } diff --git a/src/main/java/org/openstreetmap/atlas/checks/validation/linear/edges/MalformedRoundaboutCheck.java b/src/main/java/org/openstreetmap/atlas/checks/validation/linear/edges/MalformedRoundaboutCheck.java index a78d8073c..244a367ee 100644 --- a/src/main/java/org/openstreetmap/atlas/checks/validation/linear/edges/MalformedRoundaboutCheck.java +++ b/src/main/java/org/openstreetmap/atlas/checks/validation/linear/edges/MalformedRoundaboutCheck.java @@ -140,16 +140,18 @@ protected Optional flag(final AtlasObject object) roundaboutEdgeSet.forEach( roundaboutEdge -> this.markAsFlagged(roundaboutEdge.getIdentifier())); - return Optional.of(this - .createFlag(new OsmWayWalker((Edge) object).collectEdges(), + return Optional + .of(this.createFlag(new OsmWayWalker((Edge) object).collectEdges(), this.getLocalizedInstruction(1, object.getOsmIdentifier())) - .addFixSuggestion( - FeatureChange.add( - (AtlasEntity) ((CompleteEntity) CompleteEntity - .from((AtlasEntity) object)).withGeometry( - CommonMethods.buildOriginalOsmWayGeometry( - (Edge) object).reversed()), - object.getAtlas()))); + .addFixSuggestion( + FeatureChange.add( + (AtlasEntity) ((CompleteEntity) CompleteEntity + .from((AtlasEntity) object)) + .withGeometry(CommonMethods + .buildOriginalOsmWayGeometry( + (Edge) object) + .reversed()), + object.getAtlas()))); } else { diff --git a/src/main/java/org/openstreetmap/atlas/checks/validation/linear/edges/SingleSegmentMotorwayCheck.java b/src/main/java/org/openstreetmap/atlas/checks/validation/linear/edges/SingleSegmentMotorwayCheck.java index 09ede37b4..8b7e53f37 100644 --- a/src/main/java/org/openstreetmap/atlas/checks/validation/linear/edges/SingleSegmentMotorwayCheck.java +++ b/src/main/java/org/openstreetmap/atlas/checks/validation/linear/edges/SingleSegmentMotorwayCheck.java @@ -84,7 +84,7 @@ protected Optional flag(final AtlasObject object) return fixSuggestion.map(suggestion -> flag.addFixSuggestion(FeatureChange.add( (AtlasEntity) ((CompleteEntity) CompleteEntity .shallowFrom((AtlasEntity) object)).withTags(object.getTags()) - .withReplacedTag(HighwayTag.KEY, HighwayTag.KEY, suggestion), + .withReplacedTag(HighwayTag.KEY, HighwayTag.KEY, suggestion), object.getAtlas()))).or(() -> Optional.of(flag)); } return Optional.empty(); diff --git a/src/main/java/org/openstreetmap/atlas/checks/validation/tag/AbbreviatedAddressStreetCheck.java b/src/main/java/org/openstreetmap/atlas/checks/validation/tag/AbbreviatedAddressStreetCheck.java index d9957e680..9ee4b5a6b 100644 --- a/src/main/java/org/openstreetmap/atlas/checks/validation/tag/AbbreviatedAddressStreetCheck.java +++ b/src/main/java/org/openstreetmap/atlas/checks/validation/tag/AbbreviatedAddressStreetCheck.java @@ -88,13 +88,10 @@ protected Optional flag(final AtlasObject object) .addFixSuggestion(FeatureChange.add( (AtlasEntity) ((CompleteEntity) CompleteEntity .from((AtlasEntity) object)) - .withTags(object.getTags()) - .withReplacedTag(AddressStreetTag.KEY, - AddressStreetTag.KEY, - this.updateStreetAddress( - splitStreetName, - roadTypeIndex, - listEntry.getKey())), + .withTags(object.getTags()).withReplacedTag( + AddressStreetTag.KEY, AddressStreetTag.KEY, + this.updateStreetAddress(splitStreetName, + roadTypeIndex, listEntry.getKey())), object.getAtlas()))); } } diff --git a/src/main/java/org/openstreetmap/atlas/checks/validation/tag/RoadNameGapCheck.java b/src/main/java/org/openstreetmap/atlas/checks/validation/tag/RoadNameGapCheck.java index 84e47d8fd..26a16d2dd 100644 --- a/src/main/java/org/openstreetmap/atlas/checks/validation/tag/RoadNameGapCheck.java +++ b/src/main/java/org/openstreetmap/atlas/checks/validation/tag/RoadNameGapCheck.java @@ -129,15 +129,13 @@ protected Optional flag(final AtlasObject object) final String nameSuggestion = matchingInAndOutEdgeNames.iterator().next(); if (edge.getName().isEmpty()) { - return Optional - .of(this.createFlag(object, - this.getLocalizedInstruction(0, edge.getOsmIdentifier())) - .addFixSuggestion( - FeatureChange.add( - (AtlasEntity) ((CompleteEntity) CompleteEntity - .from((AtlasEntity) object)).withAddedTag( - NameTag.KEY, nameSuggestion), - object.getAtlas()))); + return Optional.of(this + .createFlag(object, this.getLocalizedInstruction(0, edge.getOsmIdentifier())) + .addFixSuggestion(FeatureChange.add( + (AtlasEntity) ((CompleteEntity) CompleteEntity + .from((AtlasEntity) object)) + .withAddedTag(NameTag.KEY, nameSuggestion), + object.getAtlas()))); } final Optional edgeName = edge.getName(); diff --git a/src/main/java/org/openstreetmap/atlas/checks/validation/tag/RoadNameSpellingConsistencyCheck.java b/src/main/java/org/openstreetmap/atlas/checks/validation/tag/RoadNameSpellingConsistencyCheck.java index da6e1c6ae..78d0f21fc 100644 --- a/src/main/java/org/openstreetmap/atlas/checks/validation/tag/RoadNameSpellingConsistencyCheck.java +++ b/src/main/java/org/openstreetmap/atlas/checks/validation/tag/RoadNameSpellingConsistencyCheck.java @@ -77,10 +77,9 @@ protected Optional flag(final AtlasObject object) // that are slightly different than edge final Set inconsistentEdgeSet = new RoadNameSpellingConsistencyCheckWalker(edge, this.maximumSearchDistance).collectEdges().stream() - .filter(incomingEdge -> !this.isFlagged(incomingEdge.getIdentifier())) - .filter(RoadNameSpellingConsistencyCheckWalker - .isEdgeWithInconsistentSpelling(edge)) - .collect(Collectors.toSet()); + .filter(incomingEdge -> !this.isFlagged(incomingEdge.getIdentifier())) + .filter(RoadNameSpellingConsistencyCheckWalker.isEdgeWithInconsistentSpelling(edge)) + .collect(Collectors.toSet()); // If the Walker found any inconsistent NameTag spellings if (!inconsistentEdgeSet.isEmpty()) diff --git a/src/test/java/org/openstreetmap/atlas/checks/commands/AtlasChecksGeoJSONDiffSubCommandTest.java b/src/test/java/org/openstreetmap/atlas/checks/commands/AtlasChecksGeoJSONDiffSubCommandTest.java index f9eabb663..0d5655087 100644 --- a/src/test/java/org/openstreetmap/atlas/checks/commands/AtlasChecksGeoJSONDiffSubCommandTest.java +++ b/src/test/java/org/openstreetmap/atlas/checks/commands/AtlasChecksGeoJSONDiffSubCommandTest.java @@ -187,7 +187,7 @@ private void generateLogFiles(final File sourceDirectory, final File targetDirec final CheckFlagGeoJsonProcessor sourceProcessor = new CheckFlagGeoJsonProcessor( new SparkFileHelper(FILE_SYSTEM_CONFIG), sourceDirectory.getAbsolutePathString()) - .withBatchSizeOverride(2).withCompression(compression); + .withBatchSizeOverride(2).withCompression(compression); sourceProcessor.process(this.setup.getConstantCheckFlagEvent()); sourceProcessor.process(this.setup.getSubtractionCheckFlagEvent()); sourceProcessor.process(this.setup.getPreChangeCheckFlagEvent()); @@ -195,7 +195,7 @@ private void generateLogFiles(final File sourceDirectory, final File targetDirec final CheckFlagGeoJsonProcessor targetProcessor = new CheckFlagGeoJsonProcessor( new SparkFileHelper(FILE_SYSTEM_CONFIG), targetDirectory.getAbsolutePathString()) - .withBatchSizeOverride(2).withCompression(compression); + .withBatchSizeOverride(2).withCompression(compression); targetProcessor.process(this.setup.getConstantCheckFlagEvent()); targetProcessor.process(this.setup.getAdditionCheckFlagEvent()); targetProcessor.process(this.setup.getPostChangeCheckFlagEvent()); diff --git a/src/test/java/org/openstreetmap/atlas/checks/commands/AtlasChecksLogDiffSubCommandTest.java b/src/test/java/org/openstreetmap/atlas/checks/commands/AtlasChecksLogDiffSubCommandTest.java index 28bb12424..82a9c77fa 100644 --- a/src/test/java/org/openstreetmap/atlas/checks/commands/AtlasChecksLogDiffSubCommandTest.java +++ b/src/test/java/org/openstreetmap/atlas/checks/commands/AtlasChecksLogDiffSubCommandTest.java @@ -189,7 +189,7 @@ private void generateLogFiles(final File sourceDirectory, final File targetDirec // Create first source log file final FileProcessor sourceProcessor = new CheckFlagFileProcessor( new SparkFileHelper(FILE_SYSTEM_CONFIG), sourceDirectory.getAbsolutePathString()) - .withCompression(compression); + .withCompression(compression); sourceProcessor.process(this.setup.getConstantCheckFlagEvent()); sourceProcessor.process(this.setup.getSubtractionCheckFlagEvent()); sourceProcessor.process(new ShutdownEvent()); @@ -197,14 +197,14 @@ private void generateLogFiles(final File sourceDirectory, final File targetDirec // Create second source log file final FileProcessor sourceProcessor2 = new CheckFlagFileProcessor( new SparkFileHelper(FILE_SYSTEM_CONFIG), sourceDirectory.getAbsolutePathString()) - .withCompression(compression); + .withCompression(compression); sourceProcessor2.process(this.setup.getPreChangeCheckFlagEvent()); sourceProcessor2.process(new ShutdownEvent()); // Create first target log file final FileProcessor targetProcessor = new CheckFlagFileProcessor( new SparkFileHelper(FILE_SYSTEM_CONFIG), targetDirectory.getAbsolutePathString()) - .withCompression(compression); + .withCompression(compression); targetProcessor.process(this.setup.getConstantCheckFlagEvent()); targetProcessor.process(this.setup.getAdditionCheckFlagEvent()); targetProcessor.process(new ShutdownEvent()); @@ -212,7 +212,7 @@ private void generateLogFiles(final File sourceDirectory, final File targetDirec // Create second target log file final FileProcessor targetProcessor2 = new CheckFlagFileProcessor( new SparkFileHelper(FILE_SYSTEM_CONFIG), targetDirectory.getAbsolutePathString()) - .withCompression(compression); + .withCompression(compression); targetProcessor2.process(this.setup.getPostChangeCheckFlagEvent()); targetProcessor2.process(new ShutdownEvent()); } diff --git a/src/test/java/org/openstreetmap/atlas/checks/commands/FlagStatisticsSubCommandTest.java b/src/test/java/org/openstreetmap/atlas/checks/commands/FlagStatisticsSubCommandTest.java index f4c68e85c..af8d28ea1 100644 --- a/src/test/java/org/openstreetmap/atlas/checks/commands/FlagStatisticsSubCommandTest.java +++ b/src/test/java/org/openstreetmap/atlas/checks/commands/FlagStatisticsSubCommandTest.java @@ -68,19 +68,19 @@ public void getCountsTest() throws IOException final String expectedTextInput = "Check,ABC,XYZ,TotalCheck1,6,8,14Check2,2,,2Check3,,2,2Total,8,10,18"; final String actualTextInput = new BufferedReader( new FileReader(outputFolder.getAbsolutePathString() + "/runSummary.csv")).lines() - .collect(Collectors.joining()); + .collect(Collectors.joining()); Assert.assertEquals(expectedTextInput, actualTextInput); final String expectedTextTotals = "Check,Input(sum)Check1,14Check2,2Check3,2"; final String actualTextTotals = new BufferedReader( new FileReader(outputFolder.getAbsolutePathString() + "/checkSummary.csv")).lines() - .collect(Collectors.joining()); + .collect(Collectors.joining()); Assert.assertEquals(expectedTextTotals, actualTextTotals); final String expectedTextCounts = "Country,Check,InputABC,Check1,6ABC,Check2,2ABC,Check3,XYZ,Check1,8XYZ,Check2,XYZ,Check3,2"; final String actualTextCounts = new BufferedReader( new FileReader(outputFolder.getAbsolutePathString() + "/checkByCountry.csv")) - .lines().collect(Collectors.joining()); + .lines().collect(Collectors.joining()); Assert.assertEquals(expectedTextCounts, actualTextCounts); outputFolder.deleteRecursively(); @@ -101,24 +101,24 @@ public void getDiffTest() throws IOException final String expectedTextInput = "Check,ABC,XYZ,TotalCheck1,6,8,14Check2,2,,2Check3,,2,2Total,8,10,18"; final String actualTextInput = new BufferedReader( new FileReader(outputFolder.getAbsolutePathString() + "/runSummary.csv")).lines() - .collect(Collectors.joining()); + .collect(Collectors.joining()); Assert.assertEquals(expectedTextInput, actualTextInput); final String expectedTextDifference = "Check,ABC,XYZ,TotalCheck1,0,4,4Check2,-2,,-2Check3,,0,0Total,-2,4,2"; final String actualTextDifference = new BufferedReader( new FileReader(outputFolder.getAbsolutePathString() + "/runSummaryDifference.csv")) - .lines().collect(Collectors.joining()); + .lines().collect(Collectors.joining()); final String expectedTextTotals = "Check,Reference(sum),Input(sum),Difference(sum)Check1,10,14,4Check2,4,2,-2Check3,2,2,0"; final String actualTextTotals = new BufferedReader( new FileReader(outputFolder.getAbsolutePathString() + "/checkSummary.csv")).lines() - .collect(Collectors.joining()); + .collect(Collectors.joining()); Assert.assertEquals(expectedTextTotals, actualTextTotals); final String expectedTextCounts = "Country,Check,Reference,Input,DifferenceABC,Check1,6,6,0ABC,Check2,4,2,-2ABC,Check3,,,XYZ,Check1,4,8,4XYZ,Check2,,,XYZ,Check3,2,2,0"; final String actualTextCounts = new BufferedReader( new FileReader(outputFolder.getAbsolutePathString() + "/checkByCountry.csv")) - .lines().collect(Collectors.joining()); + .lines().collect(Collectors.joining()); Assert.assertEquals(expectedTextCounts, actualTextCounts); Assert.assertEquals(expectedTextDifference, actualTextDifference); @@ -140,7 +140,7 @@ private void generateLogFilesForCountry(final File directory, final String count { final FileProcessor fileProcessor = new CheckFlagFileProcessor( new SparkFileHelper(FILE_SYSTEM_CONFIG), countryFolderPath) - .withCompression(compression); + .withCompression(compression); checkFlagCounts.forEach((check, flagCount) -> { for (int count = 0; count < flagCount; count++) diff --git a/src/test/java/org/openstreetmap/atlas/checks/distributed/ShardedIntegrityChecksSparkJobTest.java b/src/test/java/org/openstreetmap/atlas/checks/distributed/ShardedIntegrityChecksSparkJobTest.java index 9e543f2d2..d9372a310 100644 --- a/src/test/java/org/openstreetmap/atlas/checks/distributed/ShardedIntegrityChecksSparkJobTest.java +++ b/src/test/java/org/openstreetmap/atlas/checks/distributed/ShardedIntegrityChecksSparkJobTest.java @@ -52,7 +52,7 @@ public void countFlagsTest() throws FileNotFoundException, IOException { Assert.assertEquals(2, new BufferedReader( new InputStreamReader(new FileInputStream(file.getAbsolutePathString()))) - .lines().count()); + .lines().count()); } } diff --git a/src/test/java/org/openstreetmap/atlas/checks/event/CheckFlagGeoJsonProcessorTest.java b/src/test/java/org/openstreetmap/atlas/checks/event/CheckFlagGeoJsonProcessorTest.java index bd952ec0d..63e57ff7f 100644 --- a/src/test/java/org/openstreetmap/atlas/checks/event/CheckFlagGeoJsonProcessorTest.java +++ b/src/test/java/org/openstreetmap/atlas/checks/event/CheckFlagGeoJsonProcessorTest.java @@ -69,7 +69,7 @@ private void processCompleteAndValidate(final int eventCount) final File tempDirectory = Files.createTempDir(); final CheckFlagGeoJsonProcessor processor = new CheckFlagGeoJsonProcessor( new SparkFileHelper(FILE_SYSTEM_CONFIG), tempDirectory.getAbsolutePath()) - .withBatchSizeOverride(25); + .withBatchSizeOverride(25); for (int index = 0; index < eventCount; index++) { processor.process(this.setup.getCheckFlagEvent()); diff --git a/src/test/java/org/openstreetmap/atlas/checks/validation/tag/ImproperAndUnknownRoadNameCheckTest.java b/src/test/java/org/openstreetmap/atlas/checks/validation/tag/ImproperAndUnknownRoadNameCheckTest.java index f64718b1a..f62a67576 100644 --- a/src/test/java/org/openstreetmap/atlas/checks/validation/tag/ImproperAndUnknownRoadNameCheckTest.java +++ b/src/test/java/org/openstreetmap/atlas/checks/validation/tag/ImproperAndUnknownRoadNameCheckTest.java @@ -34,7 +34,7 @@ public void testConfigInvalid() for (final CheckFlag flag : new ImproperAndUnknownRoadNameCheck( ConfigurationResolver.inlineConfiguration( "{\"ImproperAndUnknownRoadNameCheck\": {\"names.improper\":[\"ConfigTest\"]}}")) - .flags(this.setup.configAtlas())) + .flags(this.setup.configAtlas())) { flagCount++; } @@ -59,7 +59,7 @@ public void testInvalidEdgeIdentifier() int flagCount = 0; for (final CheckFlag flag : new ImproperAndUnknownRoadNameCheck( ConfigurationResolver.emptyConfiguration()) - .flags(this.setup.inValidEdgeIdentifier())) + .flags(this.setup.inValidEdgeIdentifier())) { flagCount++; }