Merge pull request #9 from danielyinanc/master

Gradle Wrapper

Author: danielyinanc

.gitignore

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

build.gradle

@@ -50,8 +50,7 @@ install.dependsOn shadowJar
 // In this section you declare the dependencies for your production and test code
 dependencies {
     compile 'org.springframework:spring-context:4.2.5.RELEASE'
-    compile group: 'com.ericsson.duraci', name: 'messaging', version:'35.0.3'
-    compile 'com.github.Ericsson:eiffel-remrem-shared:0.1.1'
+    compile 'com.github.Ericsson:eiffel-remrem-shared:0.1.2'
     compile group: 'com.google.code.gson', name: 'gson', version: '1.7.2'
     compile group: 'org.projectlombok', name: 'lombok', version: '1.16.8'
     testCompile 'junit:junit:4.12'

gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,6 @@
+#Tue May 24 14:35:48 CDT 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -5,13 +5,12 @@
 import com.ericsson.eiffel.remrem.message.services.events.Event;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
 import java.util.Map;
 
-@Service("eiffel-semantics") @Slf4j
+@Service("eiffel-semantics")
 public class SemanticsService implements MsgService{
 
     private Gson gson = new Gson();
@@ -24,12 +23,16 @@ public SemanticsService() {
     }
 
     @Override
-    public String generateMsg(String msgType, JsonObject msgNodes, JsonObject eventNodes){
+    public String generateMsg(String msgType, JsonObject bodyJson){
 
         Class<? extends Event> eventType = eventTypes.get(msgType);
         if(eventType == null) {
             return "Invalid Message Type";
         }
+
+        JsonObject msgNodes = bodyJson.get("msgParams").getAsJsonObject();
+        JsonObject eventNodes = bodyJson.get("eventParams").getAsJsonObject();
+
         Event event = gson.fromJson(eventNodes, eventType);
         event.generateMeta(msgType, msgNodes);
 

src/main/java/com/ericsson/eiffel/remrem/message/services/SemanticsService.java

@@ -27,12 +27,12 @@ private void testGenerateMsg(String msgType, String fileName) {
             JsonObject input = parser.parse(new FileReader(file)).getAsJsonObject();
             System.out.println(input);
 
-            JsonObject msgNodes = input.get("meta").getAsJsonObject();
+/*            JsonObject msgNodes = input.get("meta").getAsJsonObject();
             JsonObject eventNodes = new JsonObject();
             eventNodes.add("data", input.get("data"));
             eventNodes.add("links", input.get("links"));
-
-            String msg = service.generateMsg(msgType,msgNodes,eventNodes);
+            JsonObject*/
+            String msg = service.generateMsg(msgType,input);
             System.out.println(msg);
 
             Assert.assertTrue(msg.contains("data"));

src/test/java/com/ericsson/eiffel/remrem/message/services/ServiceTest.java

@@ -1,28 +1,31 @@
-{
+{"msgParams": {
   "meta": {
     "type": "EiffelActivityFinishedEvent",
     "version": "1.0",
     "time": 1234567890,
     "domainId": "example.domain",
     "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0"
-  },
-  "data": {
-    "outcome": {
-      "verdict": "TIMEOUT",
-      "description": "Compilation timed out."
-    },
-    "persistentLogs": [
-      {
-        "name": "firstLog",
-        "uri": "http://myHost.com/firstLog"
+  }
+},
+  "eventParams": {
+    "data": {
+      "outcome": {
+        "verdict": "TIMEOUT",
+        "description": "Compilation timed out."
       },
-      {
-        "name": "otherLog",
-        "uri": "isbn:0-486-27557-4"
-      }
-    ]
-  },
-  "links": {
-    "activityExecution": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee1"
+      "persistentLogs": [
+        {
+          "name": "firstLog",
+          "uri": "http://myHost.com/firstLog"
+        },
+        {
+          "name": "otherLog",
+          "uri": "isbn:0-486-27557-4"
+        }
+      ]
+    },
+    "links": {
+      "activityExecution": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee1"
+    }
   }
-}
+}

src/test/resources/ActivityFinished.json

@@ -1,25 +1,28 @@
-{
+{"msgParams": {
   "meta": {
     "type": "EiffelArtifactPublishedEvent",
     "version": "1.0",
     "time": 1234567890,
     "domainId": "example.domain",
     "id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee0"
-  },
-  "data": {
-    "locations": [
-      {
-        "type": "ARTIFACTORY",
-        "uri": "https://one.place"
-      },
-      {
-        "type": "PLAIN",
-        "uri": "http://another.com"
-      }
-    ]
-  },
-  "links": {
-    "context": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee1",
-    "artifact": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee2"
   }
-}
+},
+  "eventParams": {
+    "data": {
+      "locations": [
+        {
+          "type": "ARTIFACTORY",
+          "uri": "https://one.place"
+        },
+        {
+          "type": "PLAIN",
+          "uri": "http://another.com"
+        }
+      ]
+    },
+    "links": {
+      "context": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee1",
+      "artifact": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeee2"
+    }
+  }
+}