update to camden

activity-tracker-root/activity-tracker-boot-starter/src/test/java/io/fourfinance/activity_tracker/autoconfigure/ActivityTrackerAutoConfigurationDisabledTest.java

@@ -2,26 +2,23 @@
 
 import static org.assertj.core.api.BDDAssertions.then;
 
+import io.fourfinance.activity_tracker.testapp.TestApplication;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.ConfigFileApplicationContextInitializer;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import io.fourfinance.activity_tracker.testapp.TestApplication;
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(value = TestApplication.class, initializers = ConfigFileApplicationContextInitializer.class)
-@IntegrationTest("com.ofg.infra.microservice.track-activity.enabled = false")
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = TestApplication.class,
+        value = "com.ofg.infra.microservice.track-activity.enabled = false")
 public class ActivityTrackerAutoConfigurationDisabledTest {
 
     @Autowired
     ApplicationContext context;
-    
-    @Test 
+
+    @Test
     public void shouldNotLoadUserActivityTrackingBeans() throws Exception {
         //when
         boolean trackUserActivityAspectPresent = context.containsBean("trackUserActivityAspect");

activity-tracker-root/activity-tracker-boot-starter/src/test/java/io/fourfinance/activity_tracker/autoconfigure/ActivityTrackerAutoConfigurationEnabledTest.java

@@ -2,23 +2,22 @@
 
 import static org.assertj.core.api.BDDAssertions.then;
 
+import io.fourfinance.activity_tracker.testapp.TestApplication;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.ConfigFileApplicationContextInitializer;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.ConfigFileApplicationContextInitializer;
 import org.springframework.context.ApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import io.fourfinance.activity_tracker.testapp.TestApplication;
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(value = TestApplication.class, initializers = ConfigFileApplicationContextInitializer.class)
+@ContextConfiguration(classes = TestApplication.class, initializers = ConfigFileApplicationContextInitializer.class)
 public class ActivityTrackerAutoConfigurationEnabledTest {
 
     @Autowired
     ApplicationContext context;
-    
+
     @Test
     public void shouldLoadUserActivityTrackingBeans() throws Exception {
         //when

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" } //for sonarqube plugin
     }
     dependencies {
-        classpath "org.springframework.boot:spring-boot-gradle-plugin:1.3.8.RELEASE"
+        classpath "org.springframework.boot:spring-boot-gradle-plugin:1.4.5.RELEASE"
         classpath 'com.toomuchcoding:uptodate-gradle-plugin:+'
         classpath "com.ofg:micro-common-release:0.1.18"
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:+"
@@ -53,35 +53,12 @@ apply from: "${rootProject.buildDir}/release/gradle/release.gradle"
 //NOTE: All release and publishing modifications (including further scmVersion closure) should be put AFTER the apply of publish.gradle and/or release.gradle
 //      (to be not overridden by the default values applied in those files)
 
-
 allprojects {
     repositories {
         mavenLocal()
         mavenCentral()
         jcenter()
     }
-
-    configurations {
-        all {
-            resolutionStrategy {
-                exclude group: 'log4j', module: 'log4j'
-                force 'org.apache.httpcomponents:httpclient:4.5.2'
-                force 'org.jboss.logging:jboss-logging:3.3.0.Final'
-
-                eachDependency { DependencyResolveDetails details ->
-                    if (details.requested.group == 'org.slf4j') { details.useVersion '1.7.21' }
-                    if (details.requested.group == 'com.fasterxml.jackson.core') { details.useVersion '2.6.7' }
-
-                    // To prevent an accidental usage of groovy-all.jar and groovy.jar in different versions
-                    // all modularized Groovy jars are replaced with groovy-all.jar by default.
-                    if (details.requested.group == 'org.codehaus.groovy' && details.requested.name != "groovy-all") {
-                        details.useTarget("org.codehaus.groovy:groovy-all:${details.requested.version}")
-                    }
-                    if (details.requested.group == 'org.aspectj') { details.useVersion '1.8.9' }
-                }
-            }
-        }
-    }
 }
 
 task addHashFile << {
@@ -105,7 +82,7 @@ configure(srcSubprojects) {
 
     dependencyManagement {
         imports {
-            mavenBom 'org.springframework.cloud:spring-cloud-starter-parent:Brixton.SR7'
+            mavenBom 'org.springframework.cloud:spring-cloud-starter-parent:Camden.SR6'
         }
 
         dependencies {
@@ -122,11 +99,11 @@ configure(srcSubprojects) {
             dependency "ch.qos.logback:logback-core:1.1.7"
             dependency "ch.qos.logback:logback-classic:1.1.7"
             dependency "com.jayway.restassured:rest-assured:2.9.0"
-            dependency "com.github.tomakehurst:wiremock:2.1.6"
+            dependency "com.github.tomakehurst:wiremock:2.1.7"
             dependency "cglib:cglib-nodep:3.2.5"
             dependency "org.objenesis:objenesis:2.5.1"
 
-            dependencySet(group:'org.spockframework', version: '1.0-groovy-2.4') {
+            dependencySet(group:'org.spockframework', version: '1.1-groovy-2.4-rc-4') {
                 entry "spock-core"
                 entry "spock-spring"
             }

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#Wed Mar 22 17:42:55 CET 2017
+#Fri Mar 31 18:58:36 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

micro-deps/build.gradle

@@ -64,6 +64,9 @@ project(':micro-deps-root:micro-deps-spring-config') {
         compile 'org.springframework.cloud:spring-cloud-starter-zookeeper-discovery'
         compile 'org.springframework.cloud:spring-cloud-starter-sleuth'
         compile 'io.reactivex:rxjava'
+        compile 'org.eclipse.jetty:jetty-server'
+        compile 'org.eclipse.jetty:jetty-servlet'
+        compile 'org.eclipse.jetty:jetty-servlets'
 
         testCompile 'org.codehaus.groovy:groovy-all'
         testCompile "org.spockframework:spock-core"

micro-deps/micro-deps-jax-rs-jersey/src/test/java/com/ofg/infrastructure/jerseys/JerseyTest.java

@@ -1,5 +1,7 @@
 package com.ofg.infrastructure.jerseys;
 
+import static org.junit.Assert.assertEquals;
+
 import com.ofg.infrastructure.discovery.ServiceResolver;
 import com.ofg.infrastructure.discovery.util.MicroDepsService;
 import com.ofg.infrastructure.jaxrs.JaxRsApi;
@@ -13,18 +15,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.boot.test.TestRestTemplate;
-import org.springframework.boot.test.WebIntegrationTest;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import static org.junit.Assert.assertEquals;
-
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration({JerseyApplication.class})
-@WebIntegrationTest(randomPort = true)
+@SpringBootTest(classes = JerseyApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class JerseyTest {
     private static final String CONFIG = "{\"ctx\": {\"this\": \"com/ofg/infrastructure/jaxrs\"}}";
     private static final Logger log = LoggerFactory.getLogger(JerseyTest.class);
@@ -47,7 +45,7 @@ public void restTemplate() {
     @Test
     public void jersey() throws Exception {
         TestingServer server = new TestingServer();
-        MicroDepsService service = new MicroDepsService(server.getConnectString(), "ctx",  "localhost", port, CONFIG).start();
+        MicroDepsService service = new MicroDepsService(server.getConnectString(), "ctx", "localhost", port, CONFIG).start();
         ServiceResolver sr = service.getServiceResolver();
         JaxRsServiceResolver subj = new JerseyServiceResolver(sr, new ClientConfig());
         JaxRsApi resource = subj.getLocator(JaxRsApi.class).get();

micro-deps/micro-deps-spring-test-config/src/main/groovy/com/ofg/infrastructure/base/MvcIntegrationSpec.groovy

@@ -12,7 +12,6 @@ import org.springframework.web.context.WebApplicationContext
 import spock.lang.Specification
 
 import static com.ofg.config.BasicProfiles.TEST
-
 /**
  * Base for specifications that use Spring's {@link MockMvc}. Provides also {@link WebApplicationContext}, 
  * {@link ApplicationContext}. The latter you can use to specify what

micro-deps/micro-deps-spring-test-config/src/main/groovy/com/ofg/infrastructure/base/dsl/WireMockHttpRequestMapper.groovy

@@ -5,7 +5,7 @@ import com.github.tomakehurst.wiremock.client.WireMock
 import groovy.transform.CompileStatic
 
 /**
- * A class that contains static helper methods that map HTTP methods with given path 
+ * A class that contains static helper methods that map HTTP methods with given path
  */
 @CompileStatic
 class WireMockHttpRequestMapper {
@@ -33,5 +33,5 @@ class WireMockHttpRequestMapper {
     static RemoteMappingBuilder wireMockHead(String path) {
         return WireMock.head(WireMock.urlEqualTo(path))
     }
-    
+
 }

micro-infra-camel/src/main/java/com/ofg/infrastructure/camel/CorrelationIdInterceptor.java

@@ -65,8 +65,12 @@ private Span getCorrelationId(Exchange exchange) {
             log.debug("No spanId has been set in request inbound message. Creating new one.");
             spanId = idGenerator.nextLong();
         }
-        return builder().spanId(spanId).traceId(firstNonNull(oldTraceId, traceId))
-                .name(notSampledName).parent(parentId).processId(processID).build();
+        Span.SpanBuilder spanBuilder = builder().spanId(spanId).traceId(firstNonNull(oldTraceId, traceId))
+                .name(notSampledName).processId(processID);
+        if (parentId != null) {
+            spanBuilder.parent(parentId);
+        }
+        return spanBuilder.build();
     }
 
     private Long firstNonNull(Long first, Long second) {

micro-infra-spring-base/build.gradle

@@ -30,8 +30,10 @@ dependencies {
 
     testCompile "org.spockframework:spock-core"
     testRuntime "org.spockframework:spock-spring"
+    testCompile "org.springframework.boot:spring-boot-starter-jetty"
     testCompile 'info.solidsoft.spock:spock-global-unroll'
-    testCompile "org.springframework:spring-test"
+    testCompile 'org.springframework.boot:spring-boot-starter-test'
+
     testCompile 'org.hamcrest:hamcrest-library:1.3'
     testCompile 'org.hibernate:hibernate-validator:5.1.3.Final'
     testCompile 'com.jayway.jsonpath:json-path-assert:2.0.0'

micro-infra-spring-base/src/test/groovy/com/ofg/infrastructure/base/MicroserviceMvcWiremockSpec.groovy

@@ -2,13 +2,11 @@ package com.ofg.infrastructure.base
 
 import com.ofg.infrastructure.web.correlationid.HeadersSettingFilter
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.SpringApplicationContextLoader
-import org.springframework.cloud.sleuth.Tracer
+import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.cloud.sleuth.instrument.web.TraceFilter
-import org.springframework.test.context.ContextConfiguration
 import org.springframework.test.web.servlet.setup.ConfigurableMockMvcBuilder
 
-@ContextConfiguration(classes = [ServiceDiscoveryStubbingApplicationConfiguration], loader = SpringApplicationContextLoader)
+@SpringBootTest(classes = [ServiceDiscoveryStubbingApplicationConfiguration])
 abstract class MicroserviceMvcWiremockSpec extends MvcWiremockIntegrationSpec {
 
     @Autowired TraceFilter traceFilter

micro-infra-spring-base/src/test/groovy/com/ofg/infrastructure/healthcheck/MicroserviceConfigurationControllerSpec.groovy

@@ -5,18 +5,16 @@ import com.ofg.infrastructure.base.MvcCorrelationIdSettingIntegrationSpec
 import com.ofg.infrastructure.base.ServiceDiscoveryStubbingApplicationConfiguration
 import org.junit.ClassRule
 import org.junit.contrib.java.lang.system.ProvideSystemProperty
-import org.springframework.boot.test.SpringApplicationContextLoader
+import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.http.MediaType
-import org.springframework.test.context.ContextConfiguration
 import spock.lang.Shared
 
-import static org.hamcrest.Matchers.*
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content
+import static org.hamcrest.Matchers.equalTo
+import static org.hamcrest.Matchers.is
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*
 
-@ContextConfiguration(classes = [BaseConfiguration, HealthCheckConfiguration, ServiceDiscoveryStubbingApplicationConfiguration], loader = SpringApplicationContextLoader)
+@SpringBootTest(classes = [BaseConfiguration, HealthCheckConfiguration, ServiceDiscoveryStubbingApplicationConfiguration])
 class MicroserviceConfigurationControllerSpec extends MvcCorrelationIdSettingIntegrationSpec {
 
     @Shared @ClassRule
@@ -29,7 +27,7 @@ class MicroserviceConfigurationControllerSpec extends MvcCorrelationIdSettingInt
         expect:
             mockMvc.perform(get('/microservice.json'))
                     .andExpect(status().isOk())
-                    .andExpect(content().contentType(MediaType.APPLICATION_JSON))
+                    .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON))
                     .andExpect(jsonPath('$.pl.this', is(equalTo('foo/bar/registration'))))
                     .andExpect(jsonPath('$.pl.dependencies.confirmation.path', is(equalTo('foo/bar/security/confirmation'))))
                     .andExpect(jsonPath('$.pl.dependencies.foo-bar.path', is(equalTo('com/ofg/foo/bar'))))

micro-infra-spring-base/src/test/groovy/com/ofg/infrastructure/healthcheck/PingClientTest.groovy

@@ -7,15 +7,14 @@ import com.ofg.infrastructure.discovery.ServiceResolverConfiguration
 import com.ofg.infrastructure.discovery.web.MockServerConfiguration
 import com.ofg.infrastructure.web.resttemplate.fluent.ServiceRestClientConfiguration
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.SpringApplicationContextLoader
-import org.springframework.test.context.ContextConfiguration
-import spock.lang.Unroll
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse
 import static com.ofg.infrastructure.base.dsl.WireMockHttpRequestMapper.wireMockGet
 
-@ContextConfiguration(classes = [BaseConfiguration, MockServerConfiguration, ServiceResolverConfiguration,
-        CollaboratorsConfiguration, ServiceRestClientConfiguration], loader = SpringApplicationContextLoader)
+import org.springframework.boot.test.context.SpringBootTest
+
+@SpringBootTest(classes = [BaseConfiguration, MockServerConfiguration, ServiceResolverConfiguration,
+        CollaboratorsConfiguration, ServiceRestClientConfiguration])
 class PingClientTest extends MvcWiremockIntegrationSpec {
 
     @Autowired

micro-infra-spring-base/src/test/groovy/com/ofg/infrastructure/healthcheck/PingControllerMvcSpec.groovy

@@ -5,11 +5,10 @@ import com.ofg.infrastructure.base.MvcCorrelationIdSettingIntegrationSpec
 import com.ofg.infrastructure.base.ServiceDiscoveryStubbingApplicationConfiguration
 import org.junit.ClassRule
 import org.junit.contrib.java.lang.system.ProvideSystemProperty
-import org.springframework.boot.test.SpringApplicationContextLoader
+import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Import
 import org.springframework.http.HttpMethod
-import org.springframework.test.context.ContextConfiguration
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder
 import spock.lang.Shared
 
@@ -18,7 +17,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
 
-@ContextConfiguration(classes = TestConfig, loader = SpringApplicationContextLoader)
+@SpringBootTest(classes = TestConfig)
 class PingControllerMvcSpec extends MvcCorrelationIdSettingIntegrationSpec {
 
     @Shared @ClassRule

micro-infra-spring-base/src/test/groovy/com/ofg/infrastructure/tracing/TracingPropertiesEnablerSpec.groovy

@@ -1,11 +1,10 @@
 package com.ofg.infrastructure.tracing
 
 import com.ofg.config.BasicProfiles
-import org.springframework.boot.test.EnvironmentTestUtils
+import org.springframework.boot.test.util.EnvironmentTestUtils
 import org.springframework.context.ConfigurableApplicationContext
 import org.springframework.context.annotation.AnnotationConfigApplicationContext
 import spock.lang.Specification
-import spock.lang.Unroll
 
 class TracingPropertiesEnablerSpec extends Specification {
 

micro-infra-spring-base/src/test/groovy/com/ofg/infrastructure/web/correlationid/CorrelationIdAspectSpec.groovy

@@ -2,28 +2,28 @@ package com.ofg.infrastructure.web.correlationid
 
 import com.ofg.infrastructure.base.BaseConfiguration
 import com.ofg.infrastructure.base.MicroserviceMvcWiremockSpec
+import com.ofg.infrastructure.discovery.ServiceResolverConfiguration
 import com.ofg.infrastructure.discovery.web.HttpMockServer
+import com.ofg.infrastructure.web.resttemplate.fluent.EnableServiceRestClient
 import com.ofg.infrastructure.web.resttemplate.fluent.ServiceRestClient
 import groovy.transform.CompileStatic
 import groovy.transform.PackageScope
 import groovy.transform.TypeChecked
 import org.junit.ClassRule
 import org.junit.contrib.java.lang.system.ProvideSystemProperty
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.SpringApplicationContextLoader
+import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Import
 import org.springframework.http.MediaType
 import org.springframework.scheduling.annotation.EnableAsync
-import org.springframework.test.context.ContextConfiguration
 import org.springframework.test.web.servlet.MvcResult
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RequestMethod
 import org.springframework.web.bind.annotation.RestController
 import org.springframework.web.context.request.async.WebAsyncTask
 import spock.lang.Shared
-import spock.lang.Unroll
 
 import java.util.concurrent.Callable
 
@@ -35,7 +35,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.request
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
 
-@ContextConfiguration(classes = [BaseConfiguration, CorrelationIdAspectSpecConfiguration], loader = SpringApplicationContextLoader)
+@SpringBootTest(classes = [BaseConfiguration, CorrelationIdAspectSpecConfiguration])
 class CorrelationIdAspectSpec extends MicroserviceMvcWiremockSpec {
 
     @Shared @ClassRule
@@ -72,8 +72,9 @@ class CorrelationIdAspectSpec extends MicroserviceMvcWiremockSpec {
 
     @CompileStatic
     @Configuration
-    @Import(AspectTestingController)
+    @Import([AspectTestingController, ServiceResolverConfiguration])
     @EnableAsync
+    @EnableServiceRestClient
     static class CorrelationIdAspectSpecConfiguration {
     }