Merge pull request #66 from mgcuthbert/dev

Michael Cuthbert · web-flow · commit 160cf6696681 · 2021-06-07T13:58:39.000-07:00
Fixing issues introduced from a breaking API change in the MapRoulette code.
diff --git a/src/main/java/org/maproulette/client/model/Challenge.java b/src/main/java/org/maproulette/client/model/Challenge.java
@@ -66,6 +66,8 @@ public class Challenge implements IMapRouletteObject, Serializable
     private Integer defaultBasemap;
     private String defaultBasemapId;
     private String customBasemap;
+    @Builder.Default
+    private boolean changesetUrl = false;
 
     public static Challenge fromJson(final String json) throws MapRouletteException
     {
diff --git a/src/test/java/org/maproulette/client/model/ChallengeTest.java b/src/test/java/org/maproulette/client/model/ChallengeTest.java
@@ -36,6 +36,7 @@ public void challengeBuilderDefaultTest()
         Assertions.assertNull(challenge.getDefaultBasemap());
         Assertions.assertNull(challenge.getDefaultBasemapId());
         Assertions.assertNull(challenge.getCustomBasemap());
+        Assertions.assertFalse(challenge.isChangesetUrl());
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,8 @@ public class Challenge implements IMapRouletteObject, Serializable`
`66`	`66`	`private Integer defaultBasemap;`
`67`	`67`	`private String defaultBasemapId;`
`68`	`68`	`private String customBasemap;`
	`69`	`+ @Builder.Default`
	`70`	`+ private boolean changesetUrl = false;`
`69`	`71`
`70`	`72`	`public static Challenge fromJson(final String json) throws MapRouletteException`
`71`	`73`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ public void challengeBuilderDefaultTest()`
`36`	`36`	`Assertions.assertNull(challenge.getDefaultBasemap());`
`37`	`37`	`Assertions.assertNull(challenge.getDefaultBasemapId());`
`38`	`38`	`Assertions.assertNull(challenge.getCustomBasemap());`
	`39`	`+ Assertions.assertFalse(challenge.isChangesetUrl());`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`@Test`