Primary version fetched from pom not application.properties

Improvements:
* Now fetches version and application name from pom.xml
* New default-application.properties contains properties that should not be changed after release.
* build.version property in application.properties may be set but should be empty by default, will render an extra version after the primary version within ()

Author: Anders Breid

pom.xml

@@ -292,6 +292,22 @@
 
     </dependencies>
     <build>
+        <resources>
+	        <resource>
+	            <directory>src/main/resources</directory>
+	            <filtering>true</filtering>
+	            <includes>
+	                <include>**/default-application.properties</include>
+	            </includes>
+	        </resource>
+	        <resource>
+	            <directory>src/main/resources</directory>
+	            <filtering>false</filtering>
+	            <excludes>
+	                <exclude>**/default-application.properties</exclude>
+	            </excludes>
+	        </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

src/main/java/com/ericsson/ei/controller/model/ParseInstanceInfoEI.java

@@ -24,27 +24,35 @@
 import com.ericsson.ei.subscriptionhandler.SubscriptionHandler;
 import com.ericsson.ei.waitlist.WaitListStorageHandler;
 import lombok.Getter;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
 import java.util.List;
+import java.util.Properties;
+
+import javax.annotation.PostConstruct;
 
 /**
  * Parsing all classes which contains value annotation in eiffel-intelligence plugin.
  * Needed for generate Json file with information about backend instance.
  */
 @Component
 public class ParseInstanceInfoEI {
-
     @Getter
-    @Value("${spring.application.name}")
-    private String applicationName;
+    @Value("${build.version:#{null}}")
+    private String applicationPropertiesVersion;
 
     @Getter
-    @Value("${build.version}")
     private String version;
 
+    @Getter
+    private String applicationName;
+
     @Getter
     @Value("${rules.path}")
     private String rulesPath;
@@ -97,7 +105,12 @@ public class ParseInstanceInfoEI {
     @Autowired
     private ERQueryService erUrl;
 
-    public ParseInstanceInfoEI(){
+    @PostConstruct
+    public void init() throws IOException {
+        Properties properties = new Properties();
+        properties.load(ParseInstanceInfoEI.class.getResourceAsStream("/default-application.properties"));
+        version = properties.getProperty("version");
+        applicationName = properties.getProperty("artifactId");
     }
 
     @Component

src/main/resources/application.properties

@@ -1,7 +1,9 @@
 spring.application.name=eiffel-intelligence
 #${project.artifactId}
 
-build.version=@project.version@
+# An extra optional version tag, version will be added after github release version 
+# Example if build.version=1.2.3-internal becomes Version 0.0.18 (1.2.3-internal)
+build.version=
 
 # port where Eiffel Intelligence will run
 server.port: 8090

src/main/resources/default-application.properties

@@ -0,0 +1,2 @@
+artifactId=@project.artifactId@
+version=@project.version@

src/test/java/com/ericsson/ei/rules/test/TestRulesRestAPI.java

@@ -142,8 +142,13 @@ public void testAggregationRestApi() throws Exception {
         }
     }
 
+    /**
+     * TestRulePageEnabled should always be false when pushed to Github.
+     *
+     * @throws Exception
+     */
     @Test
-    public void testGetTestRulePageEnabledAPI_setPropertyDefult() throws Exception {
+    public void testGetTestRulePageEnabledAPI_ensurePropertyFalse() throws Exception {
         String responseBody = new JSONObject().put("status", false).toString();
         mockMvc.perform(MockMvcRequestBuilders.get("/rules/rule-check/testRulePageEnabled")
                 .accept(MediaType.APPLICATION_JSON_VALUE)).andExpect(status().isOk())