Skip to content

Commit c4bd819

Browse files
A7exSchinA7exSchin
authored
Merge pull request #1 from TheECanyon/develop
Develop
2 parents e8c98d6 + e459886 commit c4bd819

17 files changed

+376
-83
lines changed

‎.project

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
</projects>
77
<buildSpec>
88
<buildCommand>
9-
<name>org.eclipse.wst.common.project.facet.core.builder</name>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
1010
<arguments>
1111
</arguments>
1212
</buildCommand>
1313
<buildCommand>
14-
<name>org.eclipse.jdt.core.javabuilder</name>
14+
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
1515
<arguments>
1616
</arguments>
1717
</buildCommand>
1818
<buildCommand>
19-
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
19+
<name>org.eclipse.wst.common.project.facet.core.builder</name>
2020
<arguments>
2121
</arguments>
2222
</buildCommand>

‎bin/main/klib/trackr/GetRest.class

911 Bytes
Binary file not shown.

‎bin/main/klib/trackr/Leg.class

2.69 KB
Binary file not shown.

‎bin/main/klib/trackr/Maneuver.class

3.48 KB
Binary file not shown.

‎bin/main/klib/trackr/Position.class

2.07 KB
Binary file not shown.

‎bin/main/klib/trackr/Response.class

1.01 KB
Binary file not shown.

‎bin/main/klib/trackr/Response_.class

2.39 KB
Binary file not shown.

‎bin/main/klib/trackr/Route.class

1.16 KB
Binary file not shown.

‎bin/main/klib/trackr/Waypoint.class

-945 Bytes
Binary file not shown.

‎src/main/java/klib/trackr/GetRest.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@
1313
public class GetRest {
1414

1515
private static final Logger log = LoggerFactory.getLogger(GetRest.class);
16+
private static String start = "48.9621219,9.0710486";
17+
private static String end = "48.7389943,9.1017945";
1618

1719
public static void main(String args[]) {
1820
SpringApplication.run(GetRest.class);
1921
}
20-
22+
2123
@Bean
2224
public RestTemplate restTemplate(RestTemplateBuilder builder) {
2325
return builder.build();
@@ -27,12 +29,10 @@ public RestTemplate restTemplate(RestTemplateBuilder builder) {
2729
public CommandLineRunner run(RestTemplate restTemplate) throws Exception {
2830
return args -> {
2931
Response response = restTemplate.getForObject(
30-
"https://route.api.here.com/routing/7.2/calculateroute.json?app_id=xjipTEag66SG6fNwgEQm&app_code=0eiHle7fs2IZsXChP2sWKQ&waypoint0=geo!52.5,13.4&waypoint1=geo!52.5,13.45&mode=fastest;car;traffic:disabled", Response.class);
31-
log.info(response.toString());
32+
"https://route.api.here.com/routing/7.2/calculateroute.json?app_id=xjipTEag66SG6fNwgEQm&app_code=0eiHle7fs2IZsXChP2sWKQ&waypoint0=geo!"
33+
+ start + "&waypoint1=geo!" + end + "&mode=fastest;car;traffic:disabled",
34+
Response.class);
35+
response.getResponse().getRoute().get(0).getLeg().get(0).getManeuver().forEach(u -> log.info(u.toString()));
3236
};
3337
}
34-
}
35-
/*
36-
https://gturnquist-quoters.cfapps.io/api/random
37-
https://route.api.here.com/routing/7.2/calculateroute.json?app_id=xjipTEag66SG6fNwgEQm&app_code=0eiHle7fs2IZsXChP2sWKQ&waypoint0=geo!52.5,13.4&waypoint1=geo!52.5,13.45&mode=fastest;car;traffic:disabled
38-
*/
38+
}

‎src/main/java/klib/trackr/Leg.java

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
package klib.trackr;
2+
3+
import java.util.HashMap;
4+
import java.util.List;
5+
import java.util.Map;
6+
7+
import com.fasterxml.jackson.annotation.JsonAnyGetter;
8+
import com.fasterxml.jackson.annotation.JsonAnySetter;
9+
import com.fasterxml.jackson.annotation.JsonIgnore;
10+
import com.fasterxml.jackson.annotation.JsonInclude;
11+
import com.fasterxml.jackson.annotation.JsonProperty;
12+
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
13+
14+
@JsonInclude(JsonInclude.Include.NON_NULL)
15+
@JsonPropertyOrder({ "start", "end", "length", "travelTime", "maneuver" })
16+
public class Leg {
17+
18+
@JsonProperty("length")
19+
private Integer length;
20+
@JsonProperty("travelTime")
21+
private Integer travelTime;
22+
@JsonProperty("maneuver")
23+
private List<Maneuver> maneuver = null;
24+
@JsonIgnore
25+
private Map<String, Object> additionalProperties = new HashMap<String, Object>();
26+
27+
28+
@JsonProperty("length")
29+
public Integer getLength() {
30+
return length;
31+
}
32+
33+
@JsonProperty("length")
34+
public void setLength(Integer length) {
35+
this.length = length;
36+
}
37+
38+
@JsonProperty("travelTime")
39+
public Integer getTravelTime() {
40+
return travelTime;
41+
}
42+
43+
@JsonProperty("travelTime")
44+
public void setTravelTime(Integer travelTime) {
45+
this.travelTime = travelTime;
46+
}
47+
48+
@JsonProperty("maneuver")
49+
public List<Maneuver> getManeuver() {
50+
return maneuver;
51+
}
52+
53+
@JsonProperty("maneuver")
54+
public void setManeuver(List<Maneuver> maneuver) {
55+
this.maneuver = maneuver;
56+
}
57+
58+
@JsonAnyGetter
59+
public Map<String, Object> getAdditionalProperties() {
60+
return this.additionalProperties;
61+
}
62+
63+
@JsonAnySetter
64+
public void setAdditionalProperty(String name, Object value) {
65+
this.additionalProperties.put(name, value);
66+
}
67+
68+
@Override
69+
public String toString() {
70+
return maneuver.toString();
71+
}
72+
}

‎src/main/java/klib/trackr/Maneuver.java

+106
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
package klib.trackr;
2+
3+
import java.util.HashMap;
4+
import java.util.Map;
5+
6+
import com.fasterxml.jackson.annotation.JsonAnyGetter;
7+
import com.fasterxml.jackson.annotation.JsonAnySetter;
8+
import com.fasterxml.jackson.annotation.JsonIgnore;
9+
import com.fasterxml.jackson.annotation.JsonInclude;
10+
import com.fasterxml.jackson.annotation.JsonProperty;
11+
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
12+
13+
@JsonInclude(JsonInclude.Include.NON_NULL)
14+
@JsonPropertyOrder({ "position", "instruction", "travelTime", "length", "id", "_type" })
15+
public class Maneuver {
16+
17+
@JsonProperty("position")
18+
private Position position;
19+
@JsonProperty("instruction")
20+
private String instruction;
21+
@JsonProperty("travelTime")
22+
private Integer travelTime;
23+
@JsonProperty("length")
24+
private Integer length;
25+
@JsonProperty("id")
26+
private String id;
27+
@JsonProperty("_type")
28+
private String type;
29+
@JsonIgnore
30+
private Map<String, Object> additionalProperties = new HashMap<String, Object>();
31+
32+
@JsonProperty("position")
33+
public Position getPosition() {
34+
return position;
35+
}
36+
37+
@JsonProperty("position")
38+
public void setPosition(Position position) {
39+
this.position = position;
40+
}
41+
42+
@JsonProperty("instruction")
43+
public String getInstruction() {
44+
return instruction;
45+
}
46+
47+
@JsonProperty("instruction")
48+
public void setInstruction(String instruction) {
49+
this.instruction = instruction;
50+
}
51+
52+
@JsonProperty("travelTime")
53+
public Integer getTravelTime() {
54+
return travelTime;
55+
}
56+
57+
@JsonProperty("travelTime")
58+
public void setTravelTime(Integer travelTime) {
59+
this.travelTime = travelTime;
60+
}
61+
62+
@JsonProperty("length")
63+
public Integer getLength() {
64+
return length;
65+
}
66+
67+
@JsonProperty("length")
68+
public void setLength(Integer length) {
69+
this.length = length;
70+
}
71+
72+
@JsonProperty("id")
73+
public String getId() {
74+
return id;
75+
}
76+
77+
@JsonProperty("id")
78+
public void setId(String id) {
79+
this.id = id;
80+
}
81+
82+
@JsonProperty("_type")
83+
public String getType() {
84+
return type;
85+
}
86+
87+
@JsonProperty("_type")
88+
public void setType(String type) {
89+
this.type = type;
90+
}
91+
92+
@JsonAnyGetter
93+
public Map<String, Object> getAdditionalProperties() {
94+
return this.additionalProperties;
95+
}
96+
97+
@JsonAnySetter
98+
public void setAdditionalProperty(String name, Object value) {
99+
this.additionalProperties.put(name, value);
100+
}
101+
102+
@Override
103+
public String toString() {
104+
return id.toString() + " " + length.toString();
105+
}
106+
}

‎src/main/java/klib/trackr/Position.java

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
package klib.trackr;
2+
3+
import java.util.HashMap;
4+
import java.util.Map;
5+
6+
import com.fasterxml.jackson.annotation.JsonAnyGetter;
7+
import com.fasterxml.jackson.annotation.JsonAnySetter;
8+
import com.fasterxml.jackson.annotation.JsonIgnore;
9+
import com.fasterxml.jackson.annotation.JsonInclude;
10+
import com.fasterxml.jackson.annotation.JsonProperty;
11+
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
12+
13+
@JsonInclude(JsonInclude.Include.NON_NULL)
14+
@JsonPropertyOrder({ "latitude", "longitude" })
15+
public class Position {
16+
17+
@JsonProperty("latitude")
18+
private Double latitude;
19+
@JsonProperty("longitude")
20+
private Double longitude;
21+
@JsonIgnore
22+
private Map<String, Object> additionalProperties = new HashMap<String, Object>();
23+
24+
@JsonProperty("latitude")
25+
public Double getLatitude() {
26+
return latitude;
27+
}
28+
29+
@JsonProperty("latitude")
30+
public void setLatitude(Double latitude) {
31+
this.latitude = latitude;
32+
}
33+
34+
@JsonProperty("longitude")
35+
public Double getLongitude() {
36+
return longitude;
37+
}
38+
39+
@JsonProperty("longitude")
40+
public void setLongitude(Double longitude) {
41+
this.longitude = longitude;
42+
}
43+
44+
@JsonAnyGetter
45+
public Map<String, Object> getAdditionalProperties() {
46+
return this.additionalProperties;
47+
}
48+
49+
@JsonAnySetter
50+
public void setAdditionalProperty(String name, Object value) {
51+
this.additionalProperties.put(name, value);
52+
}
53+
54+
}

‎src/main/java/klib/trackr/Response.java

+36-18
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,46 @@
11
package klib.trackr;
22

3-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
3+
import java.util.HashMap;
4+
import java.util.Map;
45

5-
@JsonIgnoreProperties(ignoreUnknown = true)
6+
import com.fasterxml.jackson.annotation.JsonAnyGetter;
7+
import com.fasterxml.jackson.annotation.JsonAnySetter;
8+
import com.fasterxml.jackson.annotation.JsonIgnore;
9+
import com.fasterxml.jackson.annotation.JsonInclude;
10+
import com.fasterxml.jackson.annotation.JsonProperty;
11+
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
12+
13+
@JsonInclude(JsonInclude.Include.NON_NULL)
14+
@JsonPropertyOrder({ "response" })
615
public class Response {
7-
816

9-
private Route route;
17+
@JsonProperty("response")
18+
private Response_ response;
19+
@JsonIgnore
20+
private Map<String, Object> additionalProperties = new HashMap<String, Object>();
21+
22+
@JsonProperty("response")
23+
public Response_ getResponse() {
24+
return response;
25+
}
1026

11-
public Response() {
12-
}
27+
@JsonProperty("response")
28+
public void setResponse(Response_ response) {
29+
this.response = response;
30+
}
1331

14-
public Route getRoute() {
15-
return route;
16-
}
32+
@JsonAnyGetter
33+
public Map<String, Object> getAdditionalProperties() {
34+
return this.additionalProperties;
35+
}
1736

18-
public void setRoute(Route route) {
19-
this.route = route;
20-
}
37+
@JsonAnySetter
38+
public void setAdditionalProperty(String name, Object value) {
39+
this.additionalProperties.put(name, value);
40+
}
2141

22-
@Override
23-
public String toString() {
24-
return "Response:{" +
25-
route +
26-
'}';
27-
}
42+
@Override
43+
public String toString() {
44+
return response.toString();
45+
}
2846
}

0 commit comments

Comments
 (0)