X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Fservice%2FCldsInfoProvider.java;h=6bebde92172e038e5523e20ab2c6121cb0e517a2;hb=f744247f2b725152d4959eb6fe4cb59d9d7223d7;hp=66890aa1f74876f7b708c9c86fb9619b5e089ba5;hpb=e536d7a9eb3b794d6a037b663747b5971dbd8c8a;p=clamp.git

diff --git a/src/main/java/org/onap/clamp/clds/service/CldsInfoProvider.java b/src/main/java/org/onap/clamp/clds/service/CldsInfoProvider.java
index 66890aa1..6bebde92 100644
--- a/src/main/java/org/onap/clamp/clds/service/CldsInfoProvider.java
+++ b/src/main/java/org/onap/clamp/clds/service/CldsInfoProvider.java
@@ -24,30 +24,22 @@
 
 package org.onap.clamp.clds.service;
 
-import static org.onap.clamp.clds.service.CldsService.RESOURCE_NAME;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import java.io.InputStream;
-import java.util.Properties;
 import org.onap.clamp.clds.model.CldsInfo;
-import org.onap.clamp.clds.util.ResourceFileUtil;
+import org.onap.clamp.clds.util.ClampVersioning;
 
 class CldsInfoProvider {
 
-    private static final String CLDS_VERSION = "clds.version";
-    private final CldsService cldsService;
-    private final EELFLogger logger = EELFManager.getInstance().getLogger(CldsInfoProvider.class);
 
+    private final CldsService cldsService;
 
-    CldsInfoProvider(CldsService cldsService) {
+    public CldsInfoProvider(CldsService cldsService) {
         this.cldsService = cldsService;
     }
 
-    CldsInfo getCldsInfo(){
+    public CldsInfo getCldsInfo() {
         CldsInfo cldsInfo = new CldsInfo();
         cldsInfo.setUserName(cldsService.getUserName());
-        cldsInfo.setCldsVersion(getCldsVersionFromProps());
+        cldsInfo.setCldsVersion(ClampVersioning.getCldsVersionFromProps());
 
         cldsInfo.setPermissionReadCl(cldsService.isAuthorizedNoException(cldsService.permissionReadCl));
         cldsInfo.setPermissionUpdateCl(cldsService.isAuthorizedNoException(cldsService.permissionUpdateCl));
@@ -55,16 +47,4 @@ class CldsInfoProvider {
         cldsInfo.setPermissionUpdateTemplate(cldsService.isAuthorizedNoException(cldsService.permissionUpdateTemplate));
         return cldsInfo;
     }
-
-    private String getCldsVersionFromProps() {
-        String cldsVersion = "";
-        Properties props = new Properties();
-        try (InputStream resourceStream = ResourceFileUtil.getResourceAsStream(RESOURCE_NAME)) {
-            props.load(resourceStream);
-            cldsVersion = props.getProperty(CLDS_VERSION);
-        } catch (Exception ex) {
-            logger.error("Exception caught during the clds.version reading", ex);
-        }
-        return cldsVersion;
-    }
 }