diff --git a/.project b/.project index 1fcbdde..6465fb7 100644 --- a/.project +++ b/.project @@ -6,17 +6,17 @@ - org.eclipse.wst.common.project.facet.core.builder + org.eclipse.jdt.core.javabuilder - org.eclipse.jdt.core.javabuilder + org.eclipse.buildship.core.gradleprojectbuilder - org.eclipse.buildship.core.gradleprojectbuilder + org.eclipse.wst.common.project.facet.core.builder diff --git a/bin/main/klib/trackr/GetRest.class b/bin/main/klib/trackr/GetRest.class index 872df7d..4c1cb52 100644 Binary files a/bin/main/klib/trackr/GetRest.class and b/bin/main/klib/trackr/GetRest.class differ diff --git a/bin/main/klib/trackr/Leg.class b/bin/main/klib/trackr/Leg.class new file mode 100644 index 0000000..de98a3f Binary files /dev/null and b/bin/main/klib/trackr/Leg.class differ diff --git a/bin/main/klib/trackr/Maneuver.class b/bin/main/klib/trackr/Maneuver.class new file mode 100644 index 0000000..6e1e0fb Binary files /dev/null and b/bin/main/klib/trackr/Maneuver.class differ diff --git a/bin/main/klib/trackr/Position.class b/bin/main/klib/trackr/Position.class new file mode 100644 index 0000000..d882b4e Binary files /dev/null and b/bin/main/klib/trackr/Position.class differ diff --git a/bin/main/klib/trackr/Response.class b/bin/main/klib/trackr/Response.class index 1c46fbe..14710a3 100644 Binary files a/bin/main/klib/trackr/Response.class and b/bin/main/klib/trackr/Response.class differ diff --git a/bin/main/klib/trackr/Response_.class b/bin/main/klib/trackr/Response_.class new file mode 100644 index 0000000..0a27d9c Binary files /dev/null and b/bin/main/klib/trackr/Response_.class differ diff --git a/bin/main/klib/trackr/Route.class b/bin/main/klib/trackr/Route.class index c6e9ae5..4a43766 100644 Binary files a/bin/main/klib/trackr/Route.class and b/bin/main/klib/trackr/Route.class differ diff --git a/bin/main/klib/trackr/Waypoint.class b/bin/main/klib/trackr/Waypoint.class deleted file mode 100644 index 2b0f739..0000000 Binary files a/bin/main/klib/trackr/Waypoint.class and /dev/null differ diff --git a/src/main/java/klib/trackr/GetRest.java b/src/main/java/klib/trackr/GetRest.java index d7bc4b9..6ff67a9 100644 --- a/src/main/java/klib/trackr/GetRest.java +++ b/src/main/java/klib/trackr/GetRest.java @@ -13,11 +13,13 @@ public class GetRest { private static final Logger log = LoggerFactory.getLogger(GetRest.class); + private static String start = "48.9621219,9.0710486"; + private static String end = "48.7389943,9.1017945"; public static void main(String args[]) { SpringApplication.run(GetRest.class); } - + @Bean public RestTemplate restTemplate(RestTemplateBuilder builder) { return builder.build(); @@ -27,12 +29,10 @@ public RestTemplate restTemplate(RestTemplateBuilder builder) { public CommandLineRunner run(RestTemplate restTemplate) throws Exception { return args -> { Response response = restTemplate.getForObject( - "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); - log.info(response.toString()); + "https://route.api.here.com/routing/7.2/calculateroute.json?app_id=xjipTEag66SG6fNwgEQm&app_code=0eiHle7fs2IZsXChP2sWKQ&waypoint0=geo!" + + start + "&waypoint1=geo!" + end + "&mode=fastest;car;traffic:disabled", + Response.class); + response.getResponse().getRoute().get(0).getLeg().get(0).getManeuver().forEach(u -> log.info(u.toString())); }; } -} -/* -https://gturnquist-quoters.cfapps.io/api/random -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 -*/ \ No newline at end of file +} \ No newline at end of file diff --git a/src/main/java/klib/trackr/Leg.java b/src/main/java/klib/trackr/Leg.java new file mode 100644 index 0000000..7c0313d --- /dev/null +++ b/src/main/java/klib/trackr/Leg.java @@ -0,0 +1,72 @@ +package klib.trackr; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ "start", "end", "length", "travelTime", "maneuver" }) +public class Leg { + + @JsonProperty("length") + private Integer length; + @JsonProperty("travelTime") + private Integer travelTime; + @JsonProperty("maneuver") + private List maneuver = null; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + + @JsonProperty("length") + public Integer getLength() { + return length; + } + + @JsonProperty("length") + public void setLength(Integer length) { + this.length = length; + } + + @JsonProperty("travelTime") + public Integer getTravelTime() { + return travelTime; + } + + @JsonProperty("travelTime") + public void setTravelTime(Integer travelTime) { + this.travelTime = travelTime; + } + + @JsonProperty("maneuver") + public List getManeuver() { + return maneuver; + } + + @JsonProperty("maneuver") + public void setManeuver(List maneuver) { + this.maneuver = maneuver; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + @Override + public String toString() { + return maneuver.toString(); + } +} diff --git a/src/main/java/klib/trackr/Maneuver.java b/src/main/java/klib/trackr/Maneuver.java new file mode 100644 index 0000000..a2ea884 --- /dev/null +++ b/src/main/java/klib/trackr/Maneuver.java @@ -0,0 +1,106 @@ +package klib.trackr; + +import java.util.HashMap; +import java.util.Map; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ "position", "instruction", "travelTime", "length", "id", "_type" }) +public class Maneuver { + + @JsonProperty("position") + private Position position; + @JsonProperty("instruction") + private String instruction; + @JsonProperty("travelTime") + private Integer travelTime; + @JsonProperty("length") + private Integer length; + @JsonProperty("id") + private String id; + @JsonProperty("_type") + private String type; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + @JsonProperty("position") + public Position getPosition() { + return position; + } + + @JsonProperty("position") + public void setPosition(Position position) { + this.position = position; + } + + @JsonProperty("instruction") + public String getInstruction() { + return instruction; + } + + @JsonProperty("instruction") + public void setInstruction(String instruction) { + this.instruction = instruction; + } + + @JsonProperty("travelTime") + public Integer getTravelTime() { + return travelTime; + } + + @JsonProperty("travelTime") + public void setTravelTime(Integer travelTime) { + this.travelTime = travelTime; + } + + @JsonProperty("length") + public Integer getLength() { + return length; + } + + @JsonProperty("length") + public void setLength(Integer length) { + this.length = length; + } + + @JsonProperty("id") + public String getId() { + return id; + } + + @JsonProperty("id") + public void setId(String id) { + this.id = id; + } + + @JsonProperty("_type") + public String getType() { + return type; + } + + @JsonProperty("_type") + public void setType(String type) { + this.type = type; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + @Override + public String toString() { + return id.toString() + " " + length.toString(); + } +} diff --git a/src/main/java/klib/trackr/Position.java b/src/main/java/klib/trackr/Position.java new file mode 100644 index 0000000..263c330 --- /dev/null +++ b/src/main/java/klib/trackr/Position.java @@ -0,0 +1,54 @@ +package klib.trackr; + +import java.util.HashMap; +import java.util.Map; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ "latitude", "longitude" }) +public class Position { + + @JsonProperty("latitude") + private Double latitude; + @JsonProperty("longitude") + private Double longitude; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + @JsonProperty("latitude") + public Double getLatitude() { + return latitude; + } + + @JsonProperty("latitude") + public void setLatitude(Double latitude) { + this.latitude = latitude; + } + + @JsonProperty("longitude") + public Double getLongitude() { + return longitude; + } + + @JsonProperty("longitude") + public void setLongitude(Double longitude) { + this.longitude = longitude; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + +} diff --git a/src/main/java/klib/trackr/Response.java b/src/main/java/klib/trackr/Response.java index d1a0209..53c8b5f 100644 --- a/src/main/java/klib/trackr/Response.java +++ b/src/main/java/klib/trackr/Response.java @@ -1,28 +1,46 @@ package klib.trackr; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import java.util.HashMap; +import java.util.Map; -@JsonIgnoreProperties(ignoreUnknown = true) +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ "response" }) public class Response { - - private Route route; + @JsonProperty("response") + private Response_ response; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + @JsonProperty("response") + public Response_ getResponse() { + return response; + } - public Response() { - } + @JsonProperty("response") + public void setResponse(Response_ response) { + this.response = response; + } - public Route getRoute() { - return route; - } + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } - public void setRoute(Route route) { - this.route = route; - } + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } - @Override - public String toString() { - return "Response:{" + - route + - '}'; - } + @Override + public String toString() { + return response.toString(); + } } diff --git a/src/main/java/klib/trackr/Response_.java b/src/main/java/klib/trackr/Response_.java new file mode 100644 index 0000000..357ba8b --- /dev/null +++ b/src/main/java/klib/trackr/Response_.java @@ -0,0 +1,59 @@ +package klib.trackr; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ "metaInfo", "route", "language" }) +public class Response_ { + + @JsonProperty("route") + private List route = null; + @JsonProperty("language") + private String language; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + @JsonProperty("route") + public List getRoute() { + return route; + } + + @JsonProperty("route") + public void setRoute(List route) { + this.route = route; + } + + @JsonProperty("language") + public String getLanguage() { + return language; + } + + @JsonProperty("language") + public void setLanguage(String language) { + this.language = language; + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + @Override + public String toString() { + return route.toString(); + } +} diff --git a/src/main/java/klib/trackr/Route.java b/src/main/java/klib/trackr/Route.java index e8b3b2b..999846c 100644 --- a/src/main/java/klib/trackr/Route.java +++ b/src/main/java/klib/trackr/Route.java @@ -1,27 +1,48 @@ package klib.trackr; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -@JsonIgnoreProperties(ignoreUnknown = true) +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ "waypoint", "mode", "leg", "summary" }) public class Route { - private Waypoint waypoint; + @JsonProperty("leg") + private List leg = null; + @JsonIgnore + private Map additionalProperties = new HashMap(); + + + @JsonProperty("leg") + public List getLeg() { + return leg; + } - public Route() { - } + @JsonProperty("leg") + public void setLeg(List leg) { + this.leg = leg; + } - public Waypoint getValue() { - return waypoint; - } + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } - public void setWaypoint(Waypoint waypoint) { - this.waypoint = waypoint; - } + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } - @Override - public String toString() { - return "Route{" + - "waypoint='" + waypoint + - '}'; - } + @Override + public String toString() { + return leg.toString(); + } } diff --git a/src/main/java/klib/trackr/Waypoint.java b/src/main/java/klib/trackr/Waypoint.java deleted file mode 100644 index 749fba7..0000000 --- a/src/main/java/klib/trackr/Waypoint.java +++ /dev/null @@ -1,37 +0,0 @@ -package klib.trackr; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -@JsonIgnoreProperties(ignoreUnknown = true) -public class Waypoint { - - //private Long linkId; - private String type; - - public Waypoint() { - } - - // public Long getlinkId() { - // return this.linkId; - // } - - public String getRoute() { - return this.type; - } - -// public void setlinkId(Long linkId) { -// this.linkId = linkId; -// } - - public void setRoute(String type) { - this.type = type; - } - - @Override - public String toString() { - return "Waypoint{" + - "id=leer" + '\'' + - ", type='" + type + - '}'; - } -} \ No newline at end of file