Skip to content

Commit 6d83ce9

Browse files
author
Łukasz Paczos
committed
fetching raw directions response instead of rebuilding it
1 parent e761e5b commit 6d83ce9

4 files changed

Lines changed: 32 additions & 34 deletions

File tree

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
@AutoValue
3030
public abstract class RouteOptions extends DirectionsJsonObject {
3131

32+
private static final String UTF_8 = "UTF-8";
33+
3234
/**
3335
* Build a new instance of {@link RouteOptions} and sets default values for:
3436
* <ul>
@@ -705,8 +707,8 @@ public static RouteOptions fromUrl(@NonNull URL url) {
705707
int idx = query.indexOf("=");
706708
try {
707709
optionsJson.addProperty(
708-
URLDecoder.decode(query.substring(0, idx), "UTF-8"),
709-
URLDecoder.decode(query.substring(idx + 1), "UTF-8")
710+
URLDecoder.decode(query.substring(0, idx), UTF_8),
711+
URLDecoder.decode(query.substring(idx + 1), UTF_8)
710712
);
711713
} catch (UnsupportedEncodingException ex) {
712714
throw new RuntimeException(ex);

‎services-directions-models/src/test/java/com/mapbox/api/directions/v5/utils/FormatUtilsTest.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import static com.mapbox.api.directions.v5.DirectionsCriteria.APPROACH_CURB;
44
import static com.mapbox.api.directions.v5.DirectionsCriteria.APPROACH_UNRESTRICTED;
5+
import static org.junit.Assert.assertEquals;
56
import com.mapbox.api.directions.v5.models.Bearing;
67
import com.mapbox.geojson.Point;
78
import java.util.ArrayList;
@@ -21,7 +22,7 @@ public void join_1() {
2122

2223
String actual = FormatUtils.join(";", input);
2324

24-
Assert.assertEquals(expected, actual);
25+
assertEquals(expected, actual);
2526
}
2627

2728
@Test
@@ -34,7 +35,7 @@ public void join_2() {
3435

3536
String actual = FormatUtils.join(",", input);
3637

37-
Assert.assertEquals(expected, actual);
38+
assertEquals(expected, actual);
3839
}
3940

4041
@Test
@@ -51,7 +52,7 @@ public void join_3() {
5152

5253
String actual = FormatUtils.join(";", input);
5354

54-
Assert.assertEquals(expected, actual);
55+
assertEquals(expected, actual);
5556
}
5657

5758
@Test
@@ -68,7 +69,7 @@ public void join_4() {
6869

6970
String actual = FormatUtils.join(";", names);
7071

71-
Assert.assertEquals(expected, actual);
72+
assertEquals(expected, actual);
7273
}
7374

7475
@Test
@@ -90,7 +91,7 @@ public void formatRadiuses() {
9091

9192
String actual = FormatUtils.formatRadiuses(names);
9293

93-
Assert.assertEquals(expected, actual);
94+
assertEquals(expected, actual);
9495
}
9596

9697
@Test
@@ -103,7 +104,7 @@ public void formatRadiuses_withNull() {
103104

104105
String actual = FormatUtils.formatRadiuses(names);
105106

106-
Assert.assertEquals(expected, actual);
107+
assertEquals(expected, actual);
107108
}
108109

109110
@Test
@@ -119,7 +120,7 @@ public void formatBearings() {
119120

120121
String actual = FormatUtils.formatBearings(bearings);
121122

122-
Assert.assertEquals(expected, actual);
123+
assertEquals(expected, actual);
123124
}
124125

125126
@Test
@@ -135,6 +136,6 @@ public void formatPointsList() {
135136

136137
String actual = FormatUtils.formatPointsList(targets);
137138

138-
Assert.assertEquals(expected, actual);
139+
assertEquals(expected, actual);
139140
}
140141
}

‎services-directions-models/src/test/java/com/mapbox/api/directions/v5/utils/ParseUtilsTest.java‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.mapbox.api.directions.v5.utils;
22

3+
import static org.junit.Assert.assertEquals;
34
import com.mapbox.api.directions.v5.DirectionsCriteria;
45
import com.mapbox.api.directions.v5.models.Bearing;
56
import com.mapbox.geojson.Point;
@@ -27,7 +28,7 @@ public void parseToIntegers() {
2728

2829
List<Integer> actual = ParseUtils.parseToIntegers(input);
2930

30-
Assert.assertEquals(expected, actual);
31+
assertEquals(expected, actual);
3132
}
3233

3334
@Test
@@ -39,7 +40,7 @@ public void parseToStrings_1() {
3940

4041
List<String> actual = ParseUtils.parseToStrings(input);
4142

42-
Assert.assertEquals(expected, actual);
43+
assertEquals(expected, actual);
4344
}
4445

4546
@Test
@@ -58,7 +59,7 @@ public void parseToStrings_2() {
5859

5960
List<String> actual = ParseUtils.parseToStrings(input);
6061

61-
Assert.assertEquals(expected, actual);
62+
assertEquals(expected, actual);
6263
}
6364

6465
@Test
@@ -70,7 +71,7 @@ public void parseToStrings_3() {
7071

7172
List<String> actual = ParseUtils.parseToStrings(input, ",");
7273

73-
Assert.assertEquals(expected, actual);
74+
assertEquals(expected, actual);
7475
}
7576

7677
@Test
@@ -83,7 +84,7 @@ public void parseToStrings_nullAtFirst() {
8384

8485
List<String> actual = ParseUtils.parseToStrings(input);
8586

86-
Assert.assertEquals(expected, actual);
87+
assertEquals(expected, actual);
8788
}
8889

8990
@Test
@@ -97,7 +98,7 @@ public void parseToStrings_nullAtLast() {
9798

9899
List<String> actual = ParseUtils.parseToStrings(input);
99100

100-
Assert.assertEquals(expected, actual);
101+
assertEquals(expected, actual);
101102
}
102103

103104
@Test
@@ -110,7 +111,7 @@ public void parseToStrings_nulls() {
110111

111112
List<String> actual = ParseUtils.parseToStrings(input);
112113

113-
Assert.assertEquals(expected, actual);
114+
assertEquals(expected, actual);
114115
}
115116

116117
@Test
@@ -123,7 +124,7 @@ public void testParseToStrings() {
123124

124125
List<String> actual = ParseUtils.parseToStrings(input, ",");
125126

126-
Assert.assertEquals(expected, actual);
127+
assertEquals(expected, actual);
127128
}
128129

129130
@Test
@@ -140,7 +141,7 @@ public void parseToPoints() {
140141

141142
List<Point> actual = ParseUtils.parseToPoints(input);
142143

143-
Assert.assertEquals(expected, actual);
144+
assertEquals(expected, actual);
144145
}
145146

146147
@Test
@@ -156,7 +157,7 @@ public void parseToDoubles() {
156157

157158
List<Double> actual = ParseUtils.parseToDoubles(input);
158159

159-
Assert.assertEquals(expected, actual);
160+
assertEquals(expected, actual);
160161
}
161162

162163
@Test
@@ -170,7 +171,7 @@ public void parseToListOfListOfDoubles() {
170171

171172
List<Bearing> actual = ParseUtils.parseBearings(input);
172173

173-
Assert.assertEquals(expected, actual);
174+
assertEquals(expected, actual);
174175
}
175176

176177
@Test
@@ -191,7 +192,7 @@ public void parseToBooleans() {
191192

192193
List<Boolean> actual = ParseUtils.parseToBooleans(input);
193194

194-
Assert.assertEquals(expected, actual);
195+
assertEquals(expected, actual);
195196
}
196197

197198
@Test
@@ -202,7 +203,7 @@ public void parseToBooleans_empty() {
202203

203204
List<Boolean> actual = ParseUtils.parseToBooleans(input);
204205

205-
Assert.assertEquals(expected, actual);
206+
assertEquals(expected, actual);
206207
}
207208

208209
@Test

‎services-directions/src/main/java/com/mapbox/api/directions/v5/DirectionsResponseFactory.java‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,19 @@ Response<DirectionsResponse> generate(Response<DirectionsResponse> response) {
2424
response
2525
.body()
2626
.toBuilder()
27-
.routes(generateRouteOptions(response))
27+
.routes(updateRoutesWithRequestData(response))
2828
.build(),
29-
new okhttp3.Response.Builder()
30-
.code(200)
31-
.message("OK")
32-
.protocol(response.raw().protocol())
33-
.headers(response.headers())
34-
.request(response.raw().request())
35-
.build());
29+
response.raw()
30+
);
3631
}
3732
}
3833

3934
private boolean isNotSuccessful(Response<DirectionsResponse> response) {
4035
return !response.isSuccessful()
41-
|| response.body() == null
42-
|| response.body().routes().isEmpty();
36+
|| response.body() == null;
4337
}
4438

45-
private List<DirectionsRoute> generateRouteOptions(Response<DirectionsResponse> response) {
39+
private List<DirectionsRoute> updateRoutesWithRequestData(Response<DirectionsResponse> response) {
4640
List<DirectionsRoute> routes = response.body().routes();
4741
List<DirectionsRoute> modifiedRoutes = new ArrayList<>();
4842
for (DirectionsRoute route : routes) {

0 commit comments

Comments
 (0)