From bfcf68ab1d15fd91c1254e6d8b2aec30c8a6d02e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20G=C3=B6tz?= Date: Fri, 7 Apr 2017 22:40:44 +0200 Subject: [PATCH 1/2] Version updates and updated .gitignore to exclude eclipse files --- .gitignore | 3 ++ code/auth-service/pom.xml | 4 +- .../com/example/AuthServiceApplication.java | 40 +++++++++++++++++++ code/config-service/pom.xml | 4 +- code/dataflow-service/pom.xml | 8 ++-- code/eureka-service/pom.xml | 4 +- code/hystrix-dashboard/pom.xml | 4 +- .../HystrixDashboardApplicationTests.java | 5 ++- code/reservation-client/pom.xml | 4 +- code/reservation-service/pom.xml | 4 +- code/zipkin-service/pom.xml | 4 +- 11 files changed, 64 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 5d9c5e8..b7b47ca 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ target .idea *.DS_Store +.classpath +.project +.settings diff --git a/code/auth-service/pom.xml b/code/auth-service/pom.xml index 646053c..b357265 100644 --- a/code/auth-service/pom.xml +++ b/code/auth-service/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.4.RELEASE + 1.5.2.RELEASE @@ -72,7 +72,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR5 + Camden.SR6 pom import diff --git a/code/auth-service/src/main/java/com/example/AuthServiceApplication.java b/code/auth-service/src/main/java/com/example/AuthServiceApplication.java index 996b122..0af6c48 100644 --- a/code/auth-service/src/main/java/com/example/AuthServiceApplication.java +++ b/code/auth-service/src/main/java/com/example/AuthServiceApplication.java @@ -49,6 +49,46 @@ public Account(String u, String p) { this.username = u; this.password = p; } + + public Long getId () { + return id; + } + + + public void setId ( Long id ) { + this.id = id; + } + + + public String getUsername () { + return username; + } + + + public void setUsername ( String username ) { + this.username = username; + } + + + public String getPassword () { + return password; + } + + + public void setPassword ( String password ) { + this.password = password; + } + + + public boolean isActive () { + return active; + } + + + public void setActive ( boolean active ) { + this.active = active; + } + } interface AccountRepository extends JpaRepository { diff --git a/code/config-service/pom.xml b/code/config-service/pom.xml index d470514..63c5f6f 100644 --- a/code/config-service/pom.xml +++ b/code/config-service/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.4.RELEASE + 1.5.2.RELEASE @@ -42,7 +42,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR5 + Camden.SR6 pom import diff --git a/code/dataflow-service/pom.xml b/code/dataflow-service/pom.xml index 892bfd7..bbd9f73 100644 --- a/code/dataflow-service/pom.xml +++ b/code/dataflow-service/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.4.RELEASE + 1.5.2.RELEASE @@ -50,21 +50,21 @@ org.springframework.cloud spring-cloud-dataflow-dependencies - 1.2.0.M1 + 1.2.0.M3 pom import org.springframework.cloud spring-cloud-task-dependencies - 1.2.0.BUILD-SNAPSHOT + 1.2.0.M2 pom import org.springframework.cloud spring-cloud-dependencies - Camden.SR5 + Camden.SR6 pom import diff --git a/code/eureka-service/pom.xml b/code/eureka-service/pom.xml index 2a9283c..30df761 100644 --- a/code/eureka-service/pom.xml +++ b/code/eureka-service/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.4.RELEASE + 1.5.2.RELEASE @@ -46,7 +46,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR5 + Camden.SR6 pom import diff --git a/code/hystrix-dashboard/pom.xml b/code/hystrix-dashboard/pom.xml index b40721e..6dff772 100644 --- a/code/hystrix-dashboard/pom.xml +++ b/code/hystrix-dashboard/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.4.RELEASE + 1.5.2.RELEASE @@ -49,7 +49,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR5 + Camden.SR6 pom import diff --git a/code/hystrix-dashboard/src/test/java/com/example/HystrixDashboardApplicationTests.java b/code/hystrix-dashboard/src/test/java/com/example/HystrixDashboardApplicationTests.java index a0e92c8..c23abe0 100644 --- a/code/hystrix-dashboard/src/test/java/com/example/HystrixDashboardApplicationTests.java +++ b/code/hystrix-dashboard/src/test/java/com/example/HystrixDashboardApplicationTests.java @@ -2,11 +2,12 @@ import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = HystrixDashboardApplication.class) +@SpringBootTest public class HystrixDashboardApplicationTests { @Test diff --git a/code/reservation-client/pom.xml b/code/reservation-client/pom.xml index c93e3e9..a4f2949 100644 --- a/code/reservation-client/pom.xml +++ b/code/reservation-client/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.4.RELEASE + 1.5.2.RELEASE @@ -78,7 +78,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR5 + Camden.SR6 pom import diff --git a/code/reservation-service/pom.xml b/code/reservation-service/pom.xml index 68f90b3..8f70e76 100644 --- a/code/reservation-service/pom.xml +++ b/code/reservation-service/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.4.RELEASE + 1.5.2.RELEASE @@ -79,7 +79,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR5 + Camden.SR6 pom import diff --git a/code/zipkin-service/pom.xml b/code/zipkin-service/pom.xml index 0775173..3cf56ab 100644 --- a/code/zipkin-service/pom.xml +++ b/code/zipkin-service/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.4.RELEASE + 1.5.2.RELEASE @@ -55,7 +55,7 @@ org.springframework.cloud spring-cloud-dependencies - Camden.SR5 + Camden.SR6 pom import From e1bcf39ba63b2c47a2998186f4815bc9f3bcd362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20G=C3=B6tz?= Date: Fri, 7 Apr 2017 22:58:17 +0200 Subject: [PATCH 2/2] Lombok was missing :( --- .../com/example/AuthServiceApplication.java | 40 ------------------- 1 file changed, 40 deletions(-) diff --git a/code/auth-service/src/main/java/com/example/AuthServiceApplication.java b/code/auth-service/src/main/java/com/example/AuthServiceApplication.java index 0af6c48..996b122 100644 --- a/code/auth-service/src/main/java/com/example/AuthServiceApplication.java +++ b/code/auth-service/src/main/java/com/example/AuthServiceApplication.java @@ -49,46 +49,6 @@ public Account(String u, String p) { this.username = u; this.password = p; } - - public Long getId () { - return id; - } - - - public void setId ( Long id ) { - this.id = id; - } - - - public String getUsername () { - return username; - } - - - public void setUsername ( String username ) { - this.username = username; - } - - - public String getPassword () { - return password; - } - - - public void setPassword ( String password ) { - this.password = password; - } - - - public boolean isActive () { - return active; - } - - - public void setActive ( boolean active ) { - this.active = active; - } - } interface AccountRepository extends JpaRepository {