Enable Eureka

Author: Brian Vullo

applications/allocations-server/src/main/java/io/pivotal/pal/tracker/allocations/App.java

@@ -1,29 +1,28 @@
 package io.pivotal.pal.tracker.allocations;
 
+import java.util.TimeZone;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.web.client.RestOperations;
 
-import java.util.TimeZone;
-
-
+@EnableEurekaClient
 @SpringBootApplication
 @ComponentScan({"io.pivotal.pal.tracker.allocations", "io.pivotal.pal.tracker.restsupport"})
 public class App {
 
-    public static void main(String[] args) {
-        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
-        SpringApplication.run(App.class, args);
-    }
+  public static void main(String[] args) {
+    TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+    SpringApplication.run(App.class, args);
+  }
 
-    @Bean
-    ProjectClient projectClient(
-        RestOperations restOperations,
-        @Value("${registration.server.endpoint}") String registrationEndpoint
-    ) {
-        return new ProjectClient(restOperations, registrationEndpoint);
-    }
+  @Bean
+  ProjectClient projectClient(
+      RestOperations restOperations,
+      @Value("${registration.server.endpoint}") String registrationEndpoint) {
+    return new ProjectClient(restOperations, registrationEndpoint);
+  }
 }

applications/allocations-server/src/main/resources/application.properties

@@ -3,4 +3,6 @@ spring.application.name=allocations-server
 server.port=8081
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_allocations_dev?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
-registration.server.endpoint=http://localhost:8083
+registration.server.endpoint=http://registration-server
+security.basic.enabled=false
+management.security.enabled=false

applications/allocations-server/src/test/resources/application.properties

@@ -3,4 +3,6 @@ spring.application.name=allocations-server
 server.port=8181
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_allocations_test?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
-registration.server.endpoint=http://localhost:8883
+registration.server.endpoint=http://registration-server
+security.basic.enabled=false
+management.security.enabled=false

applications/backlog-server/src/main/java/io/pivotal/pal/tracker/backlog/App.java

@@ -1,29 +1,28 @@
 package io.pivotal.pal.tracker.backlog;
 
+import java.util.TimeZone;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.web.client.RestOperations;
 
-import java.util.TimeZone;
-
-
+@EnableEurekaClient
 @SpringBootApplication
 @ComponentScan({"io.pivotal.pal.tracker.backlog", "io.pivotal.pal.tracker.restsupport"})
 public class App {
 
-    public static void main(String[] args) {
-        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
-        SpringApplication.run(App.class, args);
-    }
+  public static void main(String[] args) {
+    TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+    SpringApplication.run(App.class, args);
+  }
 
-    @Bean
-    ProjectClient projectClient(
-        RestOperations restOperations,
-        @Value("${registration.server.endpoint}") String registrationEndpoint
-    ) {
-        return new ProjectClient(restOperations, registrationEndpoint);
-    }
+  @Bean
+  ProjectClient projectClient(
+      RestOperations restOperations,
+      @Value("${registration.server.endpoint}") String registrationEndpoint) {
+    return new ProjectClient(restOperations, registrationEndpoint);
+  }
 }

applications/backlog-server/src/main/resources/application.properties

@@ -3,4 +3,7 @@ spring.application.name=backlog-server
 server.port=8082
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_backlog_dev?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
-registration.server.endpoint=http://localhost:8083
+registration.server.endpoint=http://registration-server
+
+security.basic.enabled=false
+management.security.enabled=false

applications/backlog-server/src/test/resources/application.properties

@@ -3,4 +3,6 @@ spring.application.name=backlog-server
 server.port=8181
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_backlog_test?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
-registration.server.endpoint=http://localhost:8883
+registration.server.endpoint=http://registration-server
+security.basic.enabled=false
+management.security.enabled=false

applications/registration-server/src/main/java/io/pivotal/pal/tracker/registration/App.java

@@ -1,22 +1,22 @@
 package io.pivotal.pal.tracker.registration;
 
+import java.util.TimeZone;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.context.annotation.ComponentScan;
 
-import java.util.TimeZone;
-
-
+@EnableEurekaClient
 @SpringBootApplication
 @ComponentScan({
-    "io.pivotal.pal.tracker.accounts",
-    "io.pivotal.pal.tracker.restsupport",
-    "io.pivotal.pal.tracker.projects",
-    "io.pivotal.pal.tracker.users"
+  "io.pivotal.pal.tracker.accounts",
+  "io.pivotal.pal.tracker.restsupport",
+  "io.pivotal.pal.tracker.projects",
+  "io.pivotal.pal.tracker.users"
 })
 public class App {
-    public static void main(String[] args) {
-        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
-        SpringApplication.run(App.class, args);
-    }
+  public static void main(String[] args) {
+    TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+    SpringApplication.run(App.class, args);
+  }
 }

applications/registration-server/src/main/resources/application.properties

@@ -3,4 +3,7 @@ spring.application.name=registration-server
 server.port=8083
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_registration_dev?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
-registration.server.endpoint=http://localhost:8083
+registration.server.endpoint=http://registration-server
+
+security.basic.enabled=false
+management.security.enabled=false

applications/registration-server/src/test/resources/application.properties

@@ -3,4 +3,6 @@ spring.application.name=registration-server
 server.port=8181
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_registration_test?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
-registration.server.endpoint=http://localhost:8883
+registration.server.endpoint=http://registration-server
+security.basic.enabled=false
+management.security.enabled=false

applications/server.gradle

@@ -1,4 +1,11 @@
 apply plugin: "org.springframework.boot"
+apply plugin: "io.spring.dependency-management"
+
+dependencyManagement {
+    imports {
+        mavenBom "io.pivotal.spring.cloud:spring-cloud-services-dependencies:$springCloudServicesVersion"
+    }
+}
 
 dependencies {
     compile project(":components:rest-support")
@@ -8,6 +15,8 @@ dependencies {
     compile "com.zaxxer:HikariCP:2.3.7"
     compile "mysql:mysql-connector-java:$mysqlVersion"
     compile "ch.qos.logback:logback-classic:1.1.11"
+    compile "org.springframework.boot:spring-boot-starter-actuator"
+    compile "io.pivotal.spring.cloud:spring-cloud-services-starter-service-registry"
 
     testCompile project(":components:test-support")
 }

applications/timesheets-server/src/main/java/io/pivotal/pal/tracker/timesheets/App.java

@@ -1,29 +1,28 @@
 package io.pivotal.pal.tracker.timesheets;
 
+import java.util.TimeZone;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.web.client.RestOperations;
 
-import java.util.TimeZone;
-
-
+@EnableEurekaClient
 @SpringBootApplication
 @ComponentScan({"io.pivotal.pal.tracker.timesheets", "io.pivotal.pal.tracker.restsupport"})
 public class App {
 
-    public static void main(String[] args) {
-        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
-        SpringApplication.run(App.class, args);
-    }
+  public static void main(String[] args) {
+    TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+    SpringApplication.run(App.class, args);
+  }
 
-    @Bean
-    ProjectClient projectClient(
-        RestOperations restOperations,
-        @Value("${registration.server.endpoint}") String registrationEndpoint
-    ) {
-        return new ProjectClient(restOperations, registrationEndpoint);
-    }
+  @Bean
+  ProjectClient projectClient(
+      RestOperations restOperations,
+      @Value("${registration.server.endpoint}") String registrationEndpoint) {
+    return new ProjectClient(restOperations, registrationEndpoint);
+  }
 }

applications/timesheets-server/src/main/resources/application.properties

@@ -3,4 +3,7 @@ spring.application.name=timesheets-server
 server.port=8084
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_timesheets_dev?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
-registration.server.endpoint=http://localhost:8083
+registration.server.endpoint=http://registration-server
+
+security.basic.enabled=false
+management.security.enabled=false

applications/timesheets-server/src/test/resources/application.properties

@@ -3,4 +3,6 @@ spring.application.name=timesheets-server
 server.port=8181
 spring.datasource.username=tracker
 spring.datasource.url=jdbc:mysql://localhost:3306/tracker_timesheets_test?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
-registration.server.endpoint=http://localhost:8883
+registration.server.endpoint=http://registration-server
+security.basic.enabled=false
+management.security.enabled=false

build.gradle

@@ -2,6 +2,8 @@ import io.pivotal.pal.tracker.gradlebuild.DependenciesGraphPlugin
 
 buildscript {
     ext {
+        springCloudDependenciesVersion = "Edgware.RELEASE"
+        springCloudServicesVersion = "1.6.4.RELEASE"
         springBootVersion = "1.5.7.RELEASE"
         springVersion = "4.3.8.RELEASE"
         mysqlVersion = "6.0.6"

components/rest-support/build.gradle

@@ -1,3 +1,4 @@
 dependencies {
     compile "org.springframework:spring-web:$springVersion"
+    compile "org.springframework.cloud:spring-cloud-commons:1.3.3.RELEASE"
 }

components/rest-support/src/main/java/io/pivotal/pal/tracker/restsupport/RestConfig.java

@@ -2,24 +2,25 @@
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.client.RestOperations;
 import org.springframework.web.client.RestTemplate;
 
-
 @Configuration
 public class RestConfig {
 
-    @Bean
-    public RestOperations restOperations() {
-        return new RestTemplate();
-    }
+  @LoadBalanced
+  @Bean
+  public RestOperations restOperations() {
+    return new RestTemplate();
+  }
 
-    @Bean
-    public ObjectMapper objectMapper() {
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        return mapper;
-    }
+  @Bean
+  public ObjectMapper objectMapper() {
+    ObjectMapper mapper = new ObjectMapper();
+    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    return mapper;
+  }
 }