Jdk11 compatibility and Gradle 5 #132
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
matthieun
commented
Mar 7, 2019
matthieun
commented
Mar 7, 2019
| * {@link FlaggedRelation} feature | ||
| * @return geometry as {@link JsonElement} | ||
| */ | ||
| private static JsonElement getFlaggedRelationGeometryFromFeature( |
There was a problem hiding this comment.
This is ordering only
matthieun
commented
Mar 8, 2019
| { | ||
| final JsonObject feature = atlasItem.asGeoJsonGeometry(); | ||
| final JsonObject properties = feature.getAsJsonObject("properties"); |
There was a problem hiding this comment.
This would return null and fail some tests after osmlab/atlas#369
| { | ||
| feature = locationItem.asGeoJsonGeometry(); | ||
| properties = feature.getAsJsonObject("properties"); |
There was a problem hiding this comment.
This would return null and fail some tests after osmlab/atlas#369
| @@ -62,9 +44,10 @@ public FlaggedRelation(final Relation relation) | |||
| public JsonObject asGeoJsonFeature(final String flagIdentifier) | |||
| { | |||
| final JsonObject feature = this.relation.asGeoJsonGeometry(); | |||
| final JsonObject featureProperties = feature.getAsJsonObject("properties"); | |||
There was a problem hiding this comment.
This would return null and fail some tests after osmlab/atlas#369
matthieun
commented
Mar 8, 2019
src/main/java/org/openstreetmap/atlas/checks/validation/tag/AbbreviatedNameCheck.java
Outdated
Show resolved
Hide resolved
mgcuthbert
previously approved these changes
Mar 8, 2019
config/checkstyle/checkstyle.xml
Outdated
| @@ -131,7 +131,9 @@ | |||
|
|
|||
| <!-- Miscellaneous other checks. --> | |||
| <module name="ArrayTypeStyle" /> | |||
| <module name="AvoidEscapedUnicodeCharacters"/> | |||
| <module name="AvoidEscapedUnicodeCharacters"> | |||
| <property name="allowEscapesForControlCharacters" value="true"/> | |||
There was a problem hiding this comment.
Oh nice I like this addition.
jklamer
previously approved these changes
Mar 8, 2019
|
@mgcuthbert Sonar is complaining about this deprecated method: |
yiqingj
previously approved these changes
Mar 8, 2019
yiqingj
approved these changes
Mar 8, 2019
seancoulter
pushed a commit
to seancoulter/atlas-checks
that referenced
this pull request
Dec 12, 2019
* update atlas & atlas-generator dependencies version * continue to use atlas 5.1.13
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
This enables the project to be built using OpenJDK 11. Followup of osmlab/atlas#366
This also enables gradle 5.2.1
11.0.2+9importOrder([ x, y, z])becomesimportOrder x, y, zUpgraded to latest guava (temporarily, until JDK11 Followup atlas#374 is merged and released). This solves issues with the classpath scanning utilities that stopped working in jdk11.runGenerator.execute()is invalid. Replaced byrun.finalizedBy(runGenerator)at the end.Potential Impact:
The impact should be confined to this repository.
Unit Test Approach:
Ran unit tests and integration tests.
Test Results:
Tests pass