extract the loadProperties function

Author: koi2000

hugegraph-commons/hugegraph-common/src/main/java/org/apache/hugegraph/util/VersionUtil.java

@@ -104,60 +104,44 @@ public static String getImplementationVersion(String manifestPath) {
                        .getValue(Attributes.Name.IMPLEMENTATION_VERSION);
     }
 
-    /**
-     * Get version from properties
-     * @return      The common version
-     */
-    public static String getVersionFromProperties() {
-        final Properties PROPS = new Properties();
+    public static Properties loadProperties() {
+        final Properties props = new Properties();
 
         try (InputStream is =
                      VersionUtil.class.getResourceAsStream("/version.properties")) {
-            PROPS.load(is);
+                        props.load(is);
         } catch (IOException e) {
             throw new RuntimeException("Could not load version.properties", e);
         }
-        return PROPS.getProperty("Version");
+        return props;
+    }
+
+    /**
+     * Get version from properties
+     * @return      The common version
+     */
+    public static String getVersionFromProperties() {
+        Properties props = loadProperties();
+        return props.getProperty("Version");
     }
 
     /**
      * Get api version from properties
      * @return      The api version
      */
     public static String getApiVersionFromProperties() {
-        final Properties PROPS = new Properties();
-
-        try (InputStream is =
-                     VersionUtil.class.getResourceAsStream("/version.properties")) {
-            PROPS.load(is);
-        } catch (IOException e) {
-            throw new RuntimeException("Could not load version.properties", e);
-        }
-        return PROPS.getProperty("ApiVersion");
+        Properties props = loadProperties();
+        return props.getProperty("ApiVersion");
     }
 
     public static String getApiCheckBeginVersionFromProperties() {
-        final Properties PROPS = new Properties();
-
-        try (InputStream is =
-                     VersionUtil.class.getResourceAsStream("/version.properties")) {
-            PROPS.load(is);
-        } catch (IOException e) {
-            throw new RuntimeException("Could not load version.properties", e);
-        }
-        return PROPS.getProperty("ApiCheckBeginVersion");
+        Properties props = loadProperties();
+        return props.getProperty("ApiCheckBeginVersion");
     }
 
     public static String getApiCheckEndVersionFromProperties() {
-        final Properties PROPS = new Properties();
-
-        try (InputStream is =
-                     VersionUtil.class.getResourceAsStream("/version.properties")) {
-            PROPS.load(is);
-        } catch (IOException e) {
-            throw new RuntimeException("Could not load version.properties", e);
-        }
-        return PROPS.getProperty("ApiCheckEndVersion");
+        Properties props = loadProperties();
+        return props.getProperty("ApiCheckEndVersion");
     }
 
     /**

hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/server/ApplicationConfig.java

@@ -28,7 +28,6 @@
 import org.apache.tinkerpop.gremlin.server.util.MetricManager;
 import org.glassfish.hk2.api.Factory;
 import org.glassfish.hk2.api.MultiException;
-import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
 import org.glassfish.jersey.process.internal.RequestScoped;
 import org.glassfish.jersey.server.ResourceConfig;

hugegraph-server/hugegraph-dist/src/assembly/travis/start-pd.sh

@@ -19,7 +19,7 @@ set -ev
 
 HOME_DIR=$(pwd)
 source $HOME_DIR/hugegraph-commons/hugegraph-common/src/main/resources/version.properties
-PD_DIR=$HOME_DIR/hugegraph-pd/apache-hugegraph-pd-incubating-${version}
+PD_DIR=$HOME_DIR/hugegraph-pd/apache-hugegraph-pd-incubating-${Version}
 
 pushd $PD_DIR
 . bin/start-hugegraph-pd.sh

hugegraph-server/hugegraph-dist/src/assembly/travis/start-store.sh

@@ -19,7 +19,7 @@ set -ev
 
 HOME_DIR=$(pwd)
 source $HOME_DIR/hugegraph-commons/hugegraph-common/src/main/resources/version.properties
-STORE_DIR=$HOME_DIR/hugegraph-store/apache-hugegraph-store-incubating-${version}
+STORE_DIR=$HOME_DIR/hugegraph-store/apache-hugegraph-store-incubating-${Version}
 
 pushd $STORE_DIR
 . bin/start-hugegraph-store.sh