From 746eff14b8017e7b32be2277d2e01f3e9d24c41e Mon Sep 17 00:00:00 2001 From: Rohit Date: Sat, 22 Jun 2024 20:22:27 +0530 Subject: [PATCH] enhancement/assets-url --- .../com/bloggios/blog/constants/EnvironmentConstants.java | 3 +-- .../processor/implementation/CoverImageLinkProcessor.java | 7 +------ .../implementation/UploadImagesLinkProcessor.java | 7 +------ src/main/resources/application.yml | 3 +-- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/bloggios/blog/constants/EnvironmentConstants.java b/src/main/java/com/bloggios/blog/constants/EnvironmentConstants.java index e737b7a..8a53e13 100644 --- a/src/main/java/com/bloggios/blog/constants/EnvironmentConstants.java +++ b/src/main/java/com/bloggios/blog/constants/EnvironmentConstants.java @@ -46,8 +46,7 @@ public class EnvironmentConstants { public static final String CHAPTER_ES_INDEX_GET_PROPERTY = "#{@environment.getProperty('elasticsearch.indices.chapter')}"; public static final String BLOG_ES_INDEX_GET_PROPERTY = "#{@environment.getProperty('elasticsearch.indices.blog')}"; public static final String APPLICATION_PROFILE = "application.profile"; - public static final String DEVSANDBOX_ASSETS = "application.environment.devsandbox-assets"; - public static final String PRODUCTION_ASSETS = "application.environment.production-assets"; + public static final String ASSETS = "application.environment.assets"; public static final String BLOG_IMAGES_PATH = "blog-files.blog-images"; public static final String COVER_IMAGES_PATH = "blog-files.cover-images"; public static final String LIKE_ES_INDEX_GET_PROPERTY = "#{@environment.getProperty('elasticsearch.indices.like')}"; diff --git a/src/main/java/com/bloggios/blog/processor/implementation/CoverImageLinkProcessor.java b/src/main/java/com/bloggios/blog/processor/implementation/CoverImageLinkProcessor.java index 2aa196a..d248629 100644 --- a/src/main/java/com/bloggios/blog/processor/implementation/CoverImageLinkProcessor.java +++ b/src/main/java/com/bloggios/blog/processor/implementation/CoverImageLinkProcessor.java @@ -55,12 +55,7 @@ public String process(ChapterRequest chapterRequest) { private String generateLink(String imageName) { String profile = environment.getProperty(EnvironmentConstants.APPLICATION_PROFILE); assert profile != null; - String url; - if (profile.equalsIgnoreCase(ServiceConstants.DEVSANDBOX)) { - url = environment.getProperty(EnvironmentConstants.DEVSANDBOX_ASSETS); - } else { - url = environment.getProperty(EnvironmentConstants.PRODUCTION_ASSETS); - } + String url = environment.getProperty(EnvironmentConstants.ASSETS); assert url != null; return url + "/" + diff --git a/src/main/java/com/bloggios/blog/processor/implementation/UploadImagesLinkProcessor.java b/src/main/java/com/bloggios/blog/processor/implementation/UploadImagesLinkProcessor.java index 42f0fa5..a4e97f5 100644 --- a/src/main/java/com/bloggios/blog/processor/implementation/UploadImagesLinkProcessor.java +++ b/src/main/java/com/bloggios/blog/processor/implementation/UploadImagesLinkProcessor.java @@ -113,12 +113,7 @@ public List apply(UploadImagePayloadRecord uploadImagePayloadR private String generateLink(String imageName, String uploadFor) { String profile = environment.getProperty(EnvironmentConstants.APPLICATION_PROFILE); assert profile != null; - String url; - if (profile.equalsIgnoreCase(ServiceConstants.DEVSANDBOX)) { - url = environment.getProperty(EnvironmentConstants.DEVSANDBOX_ASSETS); - } else { - url = environment.getProperty(EnvironmentConstants.PRODUCTION_ASSETS); - } + String url = environment.getProperty(EnvironmentConstants.ASSETS); assert url != null; return url + "/" + diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 4b36fc0..424d0f5 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -42,8 +42,7 @@ application: profile: ${ACTIVE_PROFILE} base-path: ${BASE_PATH} environment: - devsandbox-assets: https://assets.bloggios.cloud/blog-provider - production-assets: https://assets.bloggios.com/blog-provider + assets: https://assets.bloggios.in/blog-provider elasticsearch: server: ${ES_SERVER:localhost}