[DMAAP-CLIENT] First sonar issues review part2

[dmaap/messagerouter/dmaapclient.git] / src / main / java / org / onap / dmaap / mr / client / impl / MRClientVersionInfo.java

diff --git a/src/main/java/org/onap/dmaap/mr/client/impl/MRClientVersionInfo.java b/src/main/java/org/onap/dmaap/mr/client/impl/MRClientVersionInfo.java
index 6a13910..0507eee 100644 (file)
--- a/src/main/java/org/onap/dmaap/mr/client/impl/MRClientVersionInfo.java
+++ b/src/main/java/org/onap/dmaap/mr/client/impl/MRClientVersionInfo.java
@@ -4,11 +4,13 @@
  *  ================================================================================
  *  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
  *  ================================================================================
+ *  Modifications Copyright © 2021 Orange.
+ *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
  *  You may obtain a copy of the License at
  *        http://www.apache.org/licenses/LICENSE-2.0
- *  
+ *
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,37 +19,37 @@
  *  ============LICENSE_END=========================================================
  *
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *  
+ *
  *******************************************************************************/
+
 package org.onap.dmaap.mr.client.impl;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class MRClientVersionInfo
-{
-       private static final Logger logger = LoggerFactory.getLogger(MRClientVersionInfo.class);
-       public static String getVersion ()
-       {
-               return version;
-       }
+public class MRClientVersionInfo {
+    private static final Logger logger = LoggerFactory.getLogger(MRClientVersionInfo.class);
+
+    public static String getVersion() {
+        return VERSION;
+    }
+
+    private static final Properties PROPS = new Properties();
+    private static final String VERSION;
 
-       private static final Properties props = new Properties();
-       private static final String version;
-       static {
-               String use = null;
-               try (InputStream is = MRClientVersionInfo.class.getResourceAsStream("/MRClientVersion.properties" )) {
-                       if (is != null) {
-                               props.load(is);
-                               use = props.getProperty ( "MRClientVersion", null );
-                       }
-               } catch ( IOException e ) {
-                       logger.error("exception: ", e);
-               }
-               version = use;
-       }
+    static {
+        String use = null;
+        try (InputStream is = MRClientVersionInfo.class.getResourceAsStream("/MRClientVersion.properties")) {
+            if (is != null) {
+                PROPS.load(is);
+                use = PROPS.getProperty("MRClientVersion", null);
+            }
+        } catch (IOException e) {
+            logger.error("exception: ", e);
+        }
+        VERSION = use;
+    }
 }