Merge pull request #11 from vitalca/master

Refactoring + using last updated libraries

README.md

@@ -1,7 +1,7 @@
-# eiffel-remrem-message
-[![Build Status](https://travis-ci.org/Ericsson/eiffel-remrem-message.svg?branch=master)](https://travis-ci.org/Ericsson/eiffel-remrem-message)
-[![Coverage Status](https://coveralls.io/repos/github/Ericsson/eiffel-remrem-message/badge.svg?branch=master)](https://coveralls.io/github/Ericsson/eiffel-remrem-message?branch=master)
-[![](https://jitpack.io/v/Ericsson/eiffel-remrem-message.svg)](https://jitpack.io/#Ericsson/eiffel-remrem-message)
+# eiffel-remrem-generate
+[![Build Status](https://travis-ci.org/Ericsson/eiffel-remrem-generate.svg?branch=master)](https://travis-ci.org/Ericsson/eiffel-remrem-generate)
+[![Coverage Status](https://coveralls.io/repos/github/Ericsson/eiffel-remrem-generate/badge.svg?branch=master)](https://coveralls.io/github/Ericsson/eiffel-remrem-generate?branch=master)
+[![](https://jitpack.io/v/Ericsson/eiffel-remrem-generate.svg)](https://jitpack.io/#Ericsson/eiffel-remrem-generate)
 
 ## Compatibility
 - JDK8

build.gradle

@@ -19,7 +19,7 @@ plugins{
 apply plugin: 'war'
 
 war {
-    baseName = 'remrem-message'
+    baseName = 'remrem-generate'
     version =  '0.5.0'
 }
 
@@ -88,7 +88,6 @@ repositories {
 }
 
 dependencies {
-    compile 'org.slf4j:slf4j-api:1.7.18'
     compile("org.springframework.boot:spring-boot-starter-web:$sprintBootVersion") {
         exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
     }
@@ -106,8 +105,8 @@ dependencies {
     // end::actuator[]
 
     //Injectable Message Library and its Implementation
-    compile 'com.github.Ericsson:eiffel-remrem-shared:0.1.2'
-    compile 'com.github.Ericsson:eiffel-remrem-semantics:0.1.1'
+    compile 'com.github.Ericsson:eiffel-remrem-shared:0.1.4'
+    compile 'com.github.Ericsson:eiffel-remrem-semantics:0.1.2'
 
     //compileOnly is supported in gradle 2.12 but it might be required
     // in cucumber folder
@@ -133,7 +132,6 @@ dependencies {
 
     // In order to get embedded app container to work
     integrationTestCompile group: 'com.jayway.restassured', name: 'rest-assured', version: '2.9.0'
-    integrationTestCompile 'org.slf4j:slf4j-api:1.7.18'
 
     // Will be used to package contents of third party libs
     runtime fileTree(dir: 'libs', include: '*.jar')

settings.gradle

@@ -1,2 +1,2 @@
-rootProject.name = 'message'
+rootProject.name = 'generate'
 

src/integration-test/java/com/ericsson/eiffel/remrem/message/EiffelSemanticsController.java → src/integration-test/java/com/ericsson/eiffel/remrem/generate/EiffelSemanticsController.java

@@ -1,7 +1,9 @@
-package com.ericsson.eiffel.remrem.message;
+package com.ericsson.eiffel.remrem.generate;
 
 import com.google.gson.JsonParser;
+
 import com.jayway.restassured.RestAssured;
+
 import org.apache.http.HttpStatus;
 import org.hamcrest.Matchers;
 import org.junit.Before;

src/main/java/com/ericsson/eiffel/remrem/message/App.java → src/main/java/com/ericsson/eiffel/remrem/generate/App.java

@@ -1,14 +1,17 @@
-package com.ericsson.eiffel.remrem.message;
+package com.ericsson.eiffel.remrem.generate;
 
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.web.SpringBootServletInitializer;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.ComponentScan;
 
 import java.util.Arrays;
 
-@SpringBootApplication public class App extends SpringBootServletInitializer {
+@SpringBootApplication
+@ComponentScan("com.ericsson.eiffel.remrem")
+public class App extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
         ApplicationContext ctx = SpringApplication.run(App.class, args);

src/main/java/com/ericsson/eiffel/remrem/message/config/GsonHttpMessageConverterConfig.java → src/main/java/com/ericsson/eiffel/remrem/generate/config/GsonHttpMessageConverterConfig.java

@@ -1,4 +1,4 @@
-package com.ericsson.eiffel.remrem.message.config;
+package com.ericsson.eiffel.remrem.generate.config;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;

src/main/java/com/ericsson/eiffel/remrem/message/config/SpringfoxJsonToGsonAdapter.java → src/main/java/com/ericsson/eiffel/remrem/generate/config/SpringfoxJsonToGsonAdapter.java

@@ -1,4 +1,4 @@
-package com.ericsson.eiffel.remrem.message.config;
+package com.ericsson.eiffel.remrem.generate.config;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;

src/main/java/com/ericsson/eiffel/remrem/message/config/SwaggerConfig.java → src/main/java/com/ericsson/eiffel/remrem/generate/config/SwaggerConfig.java

@@ -1,4 +1,4 @@
-package com.ericsson.eiffel.remrem.message.config;
+package com.ericsson.eiffel.remrem.generate.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -15,7 +15,7 @@ public class SwaggerConfig {
     public Docket api() {
         return new Docket(DocumentationType.SWAGGER_2)
             .select()
-            .apis(RequestHandlerSelectors.basePackage("com.ericsson.eiffel.remrem.message"))
+            .apis(RequestHandlerSelectors.basePackage("com.ericsson.eiffel.remrem.generate"))
             .paths(PathSelectors.any())
             .build();
     }

src/main/java/com/ericsson/eiffel/remrem/message/controller/Eiffel3Controller.java → src/main/java/com/ericsson/eiffel/remrem/generate/controller/Eiffel3Controller.java

@@ -1,9 +1,11 @@
-package com.ericsson.eiffel.remrem.message.controller;
+package com.ericsson.eiffel.remrem.generate.controller;
 
-import com.ericsson.eiffel.remrem.message.services.MsgService;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+
+import com.ericsson.eiffel.remrem.shared.MsgService;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Profile;

src/main/java/com/ericsson/eiffel/remrem/message/controller/EiffelSemanticsController.java → src/main/java/com/ericsson/eiffel/remrem/generate/controller/EiffelSemanticsController.java

@@ -1,9 +1,11 @@
-package com.ericsson.eiffel.remrem.message.controller;
+package com.ericsson.eiffel.remrem.generate.controller;
 
-import com.ericsson.eiffel.remrem.message.services.MsgService;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+
+import com.ericsson.eiffel.remrem.shared.MsgService;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.RequestBody;