From 3a1b9a3af6d26c0f917de5ab68f0c584a3911822 Mon Sep 17 00:00:00 2001 From: verboomp Date: Tue, 3 Feb 2026 14:21:24 +0100 Subject: [PATCH] fix url for https --- .../fotodocumentation/rest/vo/PictureValue.java | 6 +++--- .../rest/CustomerPictureResourceTest.java | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/hartmann-foto-documentation-app/src/main/java/marketing/heyday/hartmann/fotodocumentation/rest/vo/PictureValue.java b/hartmann-foto-documentation-app/src/main/java/marketing/heyday/hartmann/fotodocumentation/rest/vo/PictureValue.java index 2d380a9..a6feb94 100644 --- a/hartmann-foto-documentation-app/src/main/java/marketing/heyday/hartmann/fotodocumentation/rest/vo/PictureValue.java +++ b/hartmann-foto-documentation-app/src/main/java/marketing/heyday/hartmann/fotodocumentation/rest/vo/PictureValue.java @@ -29,9 +29,9 @@ public record PictureValue(Long id, String comment, String category, Date pictur LOG.error("baseUrl " + baseUrl); String sizeUrl = baseUrl; - if(baseUrl.startsWith("http://)") && !baseUrl.startsWith("http://localhost")){ + if(baseUrl.startsWith("http://") && !baseUrl.startsWith("http://localhost")){ LOG.error("starts with http:// "); - sizeUrl = "https://" + baseUrl.substring(8); + sizeUrl = "https://" + baseUrl.substring(7); LOG.error("new baseUrl " + sizeUrl); } @@ -42,4 +42,4 @@ public record PictureValue(Long id, String comment, String category, Date pictur String thumbnailSizeUrl = sizeUrl + "3"; return new PictureValue(picture.getPictureId(), picture.getComment(), picture.getCategory(), picture.getPictureDate(), picture.getUsername(), picture.getEvaluation(), imageUrl, normalSizeUrl, thumbnailSizeUrl); } -} \ No newline at end of file +} diff --git a/hartmann-foto-documentation-docker/src/test/java/marketing/heyday/hartmann/fotodocumentation/rest/CustomerPictureResourceTest.java b/hartmann-foto-documentation-docker/src/test/java/marketing/heyday/hartmann/fotodocumentation/rest/CustomerPictureResourceTest.java index beaaca7..c799334 100644 --- a/hartmann-foto-documentation-docker/src/test/java/marketing/heyday/hartmann/fotodocumentation/rest/CustomerPictureResourceTest.java +++ b/hartmann-foto-documentation-docker/src/test/java/marketing/heyday/hartmann/fotodocumentation/rest/CustomerPictureResourceTest.java @@ -124,7 +124,18 @@ public class CustomerPictureResourceTest extends AbstractRestTest { } public static void main(String[] args) throws IOException { - + String baseUrl = "http://hartmann-cue.heydevelop.de/api/"; + //String baseUrl = "http://localhost:8080/api/"; + + String sizeUrl = baseUrl; + System.out.println(); + if(baseUrl.startsWith("http://") && !baseUrl.startsWith("http://localhost")){ + System.out.println("starts with http:// "); + sizeUrl = "https://" + baseUrl.substring(7); + System.out.println("new baseUrl " + sizeUrl); + } + +/* var test = new CustomerPictureResourceTest(); test.deploymentURL = "http://localhost:8080/"; @@ -132,6 +143,6 @@ public class CustomerPictureResourceTest extends AbstractRestTest { test.username = "adm"; test.password = "x1t0e7Pb49"; - test.doTest(); + test.doTest();*/ } }