diff --git a/.gitignore b/.gitignore index 98b0ce5f..dea5b19f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ .settings/ target/ phase4-dumps/ +ph/ #Ignore out of scope project modules .idea/ diff --git a/README.md b/README.md index ffc37de3..cd7e3273 100644 --- a/README.md +++ b/README.md @@ -263,6 +263,8 @@ Once you have deployed the `war` file, there are several **checks to ensure that # News and Noteworthy +* v0.2.4 - 2022-08-19 + * Fixed a Spring problem with the `/service/ial` APIs when run in a Docker container (same name of resolved method) * v0.2.3 - 2022-08-18 * The `/service/ial` queries no longer require the `application/xml` Content Type * Updated the Iteration 1 code bindings to avoid conflicting paths (de4a-iem 0.1.13) diff --git a/build-release-docker.cmd b/build-and-push-docker-release.cmd similarity index 95% rename from build-release-docker.cmd rename to build-and-push-docker-release.cmd index a1152023..dd5ea4dd 100644 --- a/build-release-docker.cmd +++ b/build-and-push-docker-release.cmd @@ -1,7 +1,7 @@ @echo off :: The version to release -set VER=0.2.3 +set VER=0.2.4 cd de4a-connector docker build --pull -t de4a/connector:%VER% . diff --git a/build-and-push-docker.cmd b/compile-build-and-push-docker-snapshot.cmd similarity index 100% rename from build-and-push-docker.cmd rename to compile-build-and-push-docker-snapshot.cmd diff --git a/build-and-run-docker.cmd b/compile-build-and-run-docker-snapshot.cmd similarity index 100% rename from build-and-run-docker.cmd rename to compile-build-and-run-docker-snapshot.cmd diff --git a/de4a-connector/src/main/java/eu/de4a/connector/api/controller/ServiceController.java b/de4a-connector/src/main/java/eu/de4a/connector/api/controller/ServiceController.java index ecef83c9..513f28d6 100644 --- a/de4a-connector/src/main/java/eu/de4a/connector/api/controller/ServiceController.java +++ b/de4a-connector/src/main/java/eu/de4a/connector/api/controller/ServiceController.java @@ -38,7 +38,7 @@ public class ServiceController private ServiceUtils serviceUtils; @GetMapping (value = "/ial/{cot}", produces = MediaType.APPLICATION_XML_VALUE) - public ResponseEntity lookupRoutingInformation (@Valid @PathVariable @NotNull final String cot) + public ResponseEntity callIalCot (@Valid @PathVariable @NotNull final String cot) { if (LOGGER.isInfoEnabled ()) LOGGER.info ("Request to API '/service/ial/" + cot + "' received"); @@ -64,8 +64,8 @@ public class ServiceController } @GetMapping (value = "/ial/{cot}/{atu}", produces = MediaType.APPLICATION_XML_VALUE) - public ResponseEntity lookupRoutingInformation (@Valid @PathVariable @NotNull final String cot, - @Valid @PathVariable @NotNull final String atu) + public ResponseEntity callIalCotAtu (@Valid @PathVariable @NotNull final String cot, + @Valid @PathVariable @NotNull final String atu) { if (LOGGER.isInfoEnabled ()) LOGGER.info ("Request to API '/service/ial/" + cot + "/" + atu + "' received");