From a36249f6dd80cc39c24ac1dbdd9c7b205d337b3f Mon Sep 17 00:00:00 2001 From: Kai Zimmermann Date: Tue, 4 Oct 2016 12:56:58 +0200 Subject: [PATCH] Fix DMF api break (#306) Fixed upper to lowever case change that was introduced with the new property based JSon generator. Could be considered an API break. Signed-off-by: kaizimmerm --- .../eclipse/hawkbit/simulator/DeviceSimulatorUpdater.java | 8 ++++---- .../hawkbit/api/PropertyBasedArtifactUrlHandler.java | 2 +- .../hawkbit/api/PropertyBasedArtifactUrlHandlerTest.java | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/DeviceSimulatorUpdater.java b/examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/DeviceSimulatorUpdater.java index e73244247..a0b607b83 100644 --- a/examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/DeviceSimulatorUpdater.java +++ b/examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/DeviceSimulatorUpdater.java @@ -205,11 +205,11 @@ public class DeviceSimulatorUpdater { private static void handleArtifacts(final String targetToken, final List status, final Artifact artifact) { - if (artifact.getUrls().containsKey("https")) { - status.add(downloadUrl(artifact.getUrls().get("https"), targetToken, artifact.getHashes().getSha1(), + if (artifact.getUrls().containsKey("HTTPS")) { + status.add(downloadUrl(artifact.getUrls().get("HTTPS"), targetToken, artifact.getHashes().getSha1(), artifact.getSize())); - } else if (artifact.getUrls().containsKey("http")) { - status.add(downloadUrl(artifact.getUrls().get("http"), targetToken, artifact.getHashes().getSha1(), + } else if (artifact.getUrls().containsKey("HTTP")) { + status.add(downloadUrl(artifact.getUrls().get("HTTP"), targetToken, artifact.getHashes().getSha1(), artifact.getSize())); } } diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandler.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandler.java index 229438477..cb495d7fb 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandler.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandler.java @@ -72,7 +72,7 @@ public class PropertyBasedArtifactUrlHandler implements ArtifactUrlHandler { return urlHandlerProperties.getProtocols().entrySet().stream() .filter(entry -> entry.getValue().getSupports().contains(api)) .filter(entry -> entry.getValue().isEnabled()) - .map(entry -> new ArtifactUrl(entry.getValue().getProtocol(), entry.getValue().getRel(), + .map(entry -> new ArtifactUrl(entry.getValue().getProtocol().toUpperCase(), entry.getValue().getRel(), generateUrl(entry.getValue(), placeholder))) .collect(Collectors.toList()); diff --git a/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandlerTest.java b/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandlerTest.java index 3d7fc18af..0a865a9ad 100644 --- a/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandlerTest.java +++ b/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandlerTest.java @@ -70,8 +70,8 @@ public class PropertyBasedArtifactUrlHandlerTest { properties.getProtocols().put("download-http", new UrlProtocol()); final List ddiUrls = urlHandlerUnderTest.getUrls(placeholder, ApiType.DDI); - assertEquals( - Lists.newArrayList(new ArtifactUrl("http", "download-http", HTTP_LOCALHOST + TENANT + "/controller/v1/" + assertEquals(Lists.newArrayList( + new ArtifactUrl("http".toUpperCase(), "download-http", HTTP_LOCALHOST + TENANT + "/controller/v1/" + CONTROLLER_ID + "/softwaremodules/" + SOFTWAREMODULEID + "/artifacts/" + FILENAME)), ddiUrls); @@ -96,7 +96,7 @@ public class PropertyBasedArtifactUrlHandlerTest { assertThat(urls).isEmpty(); urls = urlHandlerUnderTest.getUrls(placeholder, ApiType.DMF); - assertEquals(Lists.newArrayList(new ArtifactUrl(TEST_PROTO, TEST_REL, + assertEquals(Lists.newArrayList(new ArtifactUrl(TEST_PROTO.toUpperCase(), TEST_REL, "coap://127.0.0.1:5683/fw/" + TENANT + "/" + CONTROLLER_ID + "/sha1/" + SHA1HASH)), urls); } @@ -117,7 +117,7 @@ public class PropertyBasedArtifactUrlHandlerTest { assertThat(urls).isEmpty(); urls = urlHandlerUnderTest.getUrls(placeholder, ApiType.DMF); - assertEquals(Lists.newArrayList(new ArtifactUrl(TEST_PROTO, TEST_REL, + assertEquals(Lists.newArrayList(new ArtifactUrl(TEST_PROTO.toUpperCase(), TEST_REL, TEST_PROTO + "://127.0.0.1:5683/fws/" + TENANT + "/" + TARGETID_BASE62 + "/" + ARTIFACTID_BASE62)), urls); }