Skip to content

Commit 977adad

Browse files
authored
 roundtrip of unrecognised JSON properties (#1394)
1 parent d9d5af3 commit 977adad

61 files changed

Lines changed: 178 additions & 62 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
Mapbox welcomes participation and contributions from everyone.
44

55
### main
6+
- Added roundtrip of unrecognized JSON properties [#1394](https://github.com/mapbox/mapbox-java/pull/1394)
67

78
### v6.4.1 - April 22, 2022
89
- Added correct escaping for `<white space>&<white space>` pattern in query parameters for `RouteOptions#toUrl`. [#1410](https://github.com/mapbox/mapbox-java/pull/1410).

gradle/dependencies.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ext {
22

33
version = [
44
autoValue : '1.7',
5-
autoValueGson : '0.8.0',
5+
autoValueGson : '0.0.1',
66
junit : '4.12',
77
annotation : '1.0.0',
88
gson : '2.8.6',
@@ -31,7 +31,8 @@ ext {
3131

3232
dependenciesList = [
3333
autoValue : "com.google.auto.value:auto-value:${version.autoValue}",
34-
autoValueGson : "com.ryanharter.auto.value:auto-value-gson:${version.autoValueGson}",
34+
autoValueGson : "com.mapbox.mapboxsdk:auto-value-gson:${version.autoValueGson}",
35+
autoValueGsonRuntime: "com.mapbox.mapboxsdk:auto-value-gson-runtime:${version.autoValueGson}",
3536
junit : "junit:junit:${version.junit}",
3637
supportAnnotation : "androidx.annotation:annotation:${version.annotation}",
3738
gson : "com.google.code.gson:gson:${version.gson}",

services-directions-models/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ dependencies {
99
// AutoValue
1010
compileOnly dependenciesList.autoValue
1111
compileOnly dependenciesList.autoValueGson
12+
implementation dependenciesList.autoValueGsonRuntime
1213
annotationProcessor(dependenciesList.autoValueGson)
1314

1415
// Test Dependencies

services-directions-models/src/main/java/com/mapbox/api/directions/v5/DirectionsAdapterFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.mapbox.api.directions.v5;
22

33
import com.google.gson.TypeAdapterFactory;
4-
import com.ryanharter.auto.value.gson.GsonTypeAdapterFactory;
4+
import com.mapbox.auto.value.gson.GsonTypeAdapterFactory;
55

66
/**
77
* Required so that AutoValue can generate specific type adapters when needed inside the direction

services-directions-models/src/main/java/com/mapbox/api/directions/v5/models/Admin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public static Admin fromJson(String json) {
7575
* This builder can be used to set the values describing the {@link Admin}.
7676
*/
7777
@AutoValue.Builder
78-
public abstract static class Builder {
78+
public abstract static class Builder extends DirectionsJsonObject.Builder<Builder> {
7979

8080
/**
8181
* The 2 character ISO 3166-1 alpha-2 code that applies to a country boundary.

services-directions-models/src/main/java/com/mapbox/api/directions/v5/models/BannerComponents.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ public int compareTo(BannerComponents bannerComponents) {
345345
* @since 3.0.0
346346
*/
347347
@AutoValue.Builder
348-
public abstract static class Builder {
348+
public abstract static class Builder extends DirectionsJsonObject.Builder<Builder> {
349349

350350
/**
351351
* A snippet of the full {@link BannerText#text()} which can be used for visually altering parts

services-directions-models/src/main/java/com/mapbox/api/directions/v5/models/BannerInstructions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public static BannerInstructions fromJson(String json) {
124124
* @since 3.0.0
125125
*/
126126
@AutoValue.Builder
127-
public abstract static class Builder {
127+
public abstract static class Builder extends DirectionsJsonObject.Builder<Builder> {
128128

129129
/**
130130
* Distance in meters from the beginning of the step at which the visual instruction should be

services-directions-models/src/main/java/com/mapbox/api/directions/v5/models/BannerText.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public static BannerText fromJson(String json) {
138138
* @since 3.0.0
139139
*/
140140
@AutoValue.Builder
141-
public abstract static class Builder {
141+
public abstract static class Builder extends DirectionsJsonObject.Builder<Builder> {
142142

143143
/**
144144
* Plain text with all the {@link BannerComponents} text combined.

services-directions-models/src/main/java/com/mapbox/api/directions/v5/models/BannerView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public static BannerView fromJson(String json) {
115115
* @since 5.0.0
116116
*/
117117
@AutoValue.Builder
118-
public abstract static class Builder {
118+
public abstract static class Builder extends DirectionsJsonObject.Builder<Builder> {
119119

120120
/**
121121
* Plain text with all the {@link BannerComponents} text combined.

services-directions-models/src/main/java/com/mapbox/api/directions/v5/models/Bearing.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* and a {@link #degrees()} which is the range of degrees by which the angle can deviate.
99
*/
1010
@AutoValue
11-
public abstract class Bearing {
11+
public abstract class Bearing extends DirectionsJsonObject {
1212

1313
/**
1414
* Build a new instance of this builder.
@@ -54,7 +54,7 @@ public static Bearing.Builder builder() {
5454
* This builder can be used to set the values describing the {@link Bearing}.
5555
*/
5656
@AutoValue.Builder
57-
public abstract static class Builder {
57+
public abstract static class Builder extends DirectionsJsonObject.Builder<Builder> {
5858

5959
/**
6060
* Clockwise value from true north between 0 and 360.

0 commit comments

Comments
 (0)