Merge pull request #22 from evasiba-ericsson/master

update Spring version and Event version

Author: vasile-baluta

.gitignore

@@ -1,3 +1,4 @@
 .idea/*
 build
 .gradle/*
+/bin/

build.gradle

@@ -22,15 +22,22 @@ allprojects {
 
 jar {
     baseName = 'eiffel-remrem-semantics'
-    version =  '0.1.3'
+    // If this version is updated please update it in Event.java 
+    // com.ericsson.eiffel.remrem.semantics.events
+    version =  '0.1.4'
+    manifest {
+        attributes('Semantics-Version': version)
+    }
 }
 
 shadowJar {
     baseName = 'eiffel-remrem-semantics'
-    version =  '0.1.3'
+    version =  '0.1.4'
     classifier = ''
 }
 
+apply plugin: 'eclipse'
+
 task wrapper(type: Wrapper) {
     gradleVersion = '2.12'
     distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
@@ -59,11 +66,12 @@ install.dependsOn shadowJar
 //}
 
 dependencies {
-    compile 'org.springframework:spring-context:4.2.5.RELEASE'
+    compile 'org.springframework:spring-context:4.3.3.RELEASE'
     compile 'com.github.Ericsson:eiffel-remrem-shared:0.1.4'
     compile 'com.github.fge:json-schema-validator:2.2.6'
     compile 'org.slf4j:slf4j-api:1.7.18'
     compile group: 'com.google.code.gson', name: 'gson', version: '1.7.2'
     compile group: 'org.projectlombok', name: 'lombok', version: '1.16.8'
+    compile 'org.mockito:mockito-core:2.1.0'
     testCompile 'junit:junit:4.12'
 }

src/main/java/com/ericsson/eiffel/remrem/semantics/events/Event.java

@@ -5,20 +5,40 @@
 
 import com.ericsson.eiffel.remrem.semantics.models.Meta;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.UUID;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
 
 
 public abstract class Event {
     public Meta meta;
-    public static String  version = "0.1.0";
+    public static String  version = "0.1.4";
 
     public void generateMeta(String msgType, JsonObject msgNodes) {
         meta = new Gson().fromJson(msgNodes.get("meta"), Meta.class);
         meta.setType(msgType);
         meta.setTime(System.currentTimeMillis());
+        // TO DO unit tests are not working
+//        String version = getCurrentVersion();
         meta.setVersion(version);
         meta.setId(UUID.randomUUID().toString());
     }
 
-}
-
+    public String getCurrentVersion() {
+    	InputStream manifestStream = Thread.currentThread()
+    			.getContextClassLoader()
+    			.getResourceAsStream("/META-INF/MANIFEST.MF");
+    	try {
+    		Manifest manifest = new Manifest(manifestStream);
+    		Attributes attributes = manifest.getMainAttributes();
+    		return attributes.getValue("Semantics-Version");
+    	}
+    	catch(IOException ex) {
+    		
+    	}
+    	
+    	return null;
+    }
+}

src/test/java/com/ericsson/eiffel/remrem/semantics/ServiceTest.java

@@ -1,22 +1,44 @@
 package com.ericsson.eiffel.remrem.semantics;
 
+import com.ericsson.eiffel.remrem.semantics.events.Event;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import org.mockito.MockitoAnnotations;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
 
 public class ServiceTest {
 
     private String ACTIVITY_FINISHED = "eiffelactivityfinished";
     private String ARTIFACT_PUBLISHED = "eiffelartifactpublished";
 
     JsonParser parser = new JsonParser();
+    
+    @InjectMocks
     SemanticsService service = new SemanticsService();
 
+    
+    private Event event;
+        
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        event = mock(Event.class);
+        when(event.getCurrentVersion()).thenReturn("0.1.0");
+    }
+    
     private void testGenerateMsg(String msgType, String fileName) {
 
         try {