From 87fc1d31d8b4f54ad21424792098dbe14aeb0153 Mon Sep 17 00:00:00 2001 From: DongGeon0908 Date: Wed, 17 Jul 2024 17:24:15 +0900 Subject: [PATCH 1/2] v1.0.3-SNAPSHOT --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 69a81be..4577872 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version='1.0.2-SNAPSHOT' +version='1.0.3-SNAPSHOT' From e23d7d012aed84adbfba41e44055b2a20c743d61 Mon Sep 17 00:00:00 2001 From: DongGeon0908 Date: Wed, 17 Jul 2024 17:35:59 +0900 Subject: [PATCH 2/2] fix: remove origin url --- .../controller/rest/ShortenerRestController.java | 4 ++-- .../shortener/dto/response/OriginUrlResponse.java | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/urlshortener/shortener/controller/rest/ShortenerRestController.java b/src/main/java/com/urlshortener/shortener/controller/rest/ShortenerRestController.java index 68bbac6..3d45053 100644 --- a/src/main/java/com/urlshortener/shortener/controller/rest/ShortenerRestController.java +++ b/src/main/java/com/urlshortener/shortener/controller/rest/ShortenerRestController.java @@ -62,10 +62,10 @@ public void getOriginUrl( HttpServletResponse response ) throws IOException { log.debug("shortCode = {}", shortCode); - var originUrl = shortenerService.getOriginUrl(shortCode); + var originUrl = shortenerService.getOriginUrl(shortCode).getOriginUrl(); log.debug("originUrl = {}", originUrl); - response.sendRedirect(originUrl.getOriginUrlWithHttp()); + response.sendRedirect(originUrl); } /** diff --git a/src/main/java/com/urlshortener/shortener/dto/response/OriginUrlResponse.java b/src/main/java/com/urlshortener/shortener/dto/response/OriginUrlResponse.java index 4074ddf..e95b4d9 100644 --- a/src/main/java/com/urlshortener/shortener/dto/response/OriginUrlResponse.java +++ b/src/main/java/com/urlshortener/shortener/dto/response/OriginUrlResponse.java @@ -12,12 +12,4 @@ public class OriginUrlResponse { public static OriginUrlResponse from(ShortUrlModel shortUrl) { return new OriginUrlResponse(shortUrl.getOriginalUrl()); } - - public String getOriginUrlWithHttp() { - if (!originUrl.startsWith("http://") && !originUrl.startsWith("https://")) { - return "http://" + originUrl; - } else { - return originUrl; - } - } }