Skip to content

Commit

Permalink
Refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
vitalca committed May 30, 2016
1 parent 200ee69 commit 060b58f
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
6 changes: 2 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand All @@ -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
Expand All @@ -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')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.google.gson.JsonParser;

import com.ericsson.eiffel.remrem.generate.App;
import com.jayway.restassured.RestAssured;

import org.apache.http.HttpStatus;
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/com/ericsson/eiffel/remrem/generate/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@
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);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
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;
Expand Down

0 comments on commit 060b58f

Please sign in to comment.