updating spring-boot version

build.gradle

@@ -105,7 +105,7 @@ configure(srcSubprojects) {
 
     dependencyManagement {
         imports {
-            mavenBom 'org.springframework.cloud:spring-cloud-starter-parent:Brixton.SR7'
+            mavenBom 'org.springframework.cloud:spring-cloud-starter-parent:Camden.SR1'
         }
 
         dependencies {

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

@@ -13,7 +13,10 @@ dependencies {
 
     compile "org.codehaus.groovy:groovy-all"
     compile 'com.fasterxml.jackson.core:jackson-databind'
-    compile "org.springframework.boot:spring-boot-starter-web"
+    compile("org.springframework.boot:spring-boot-starter-web") {
+        exclude module: "spring-boot-starter-tomcat"
+    }
+    compile "org.springframework.boot:spring-boot-starter-jetty"
     compile "org.aspectj:aspectjrt"
     compile "io.dropwizard.metrics:metrics-core:$metricsVersion"
     compile "io.dropwizard.metrics:metrics-jvm:$metricsVersion"
@@ -40,4 +43,5 @@ dependencies {
     testCompile 'org.codehaus.gpars:gpars:1.2.1'
     testCompile 'org.mockito:mockito-core:1.10.19'
     testCompile 'com.jayway.awaitility:awaitility-groovy'
+    testCompile 'org.springframework.boot:spring-boot-test'
 }

micro-infra-spring-base/src/main/java/com/ofg/infrastructure/hystrix/HystrixServletConfiguration.java

@@ -2,7 +2,7 @@
 
 import com.netflix.hystrix.contrib.metrics.eventstream.HystrixMetricsStreamServlet;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.embedded.ServletRegistrationBean;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;

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

@@ -2,13 +2,12 @@ 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.SpringBootContextLoader
 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)
+@ContextConfiguration(classes = [ServiceDiscoveryStubbingApplicationConfiguration], loader = SpringBootContextLoader)
 abstract class MicroserviceMvcWiremockSpec extends MvcWiremockIntegrationSpec {
 
     @Autowired TraceFilter traceFilter

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

@@ -3,7 +3,7 @@ package com.ofg.infrastructure.discovery
 import com.ofg.infrastructure.base.BaseConfiguration
 import com.ofg.infrastructure.base.MicroserviceMvcWiremockSpec
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.SpringApplicationContextLoader
+import org.springframework.boot.test.context.SpringBootContextLoader
 import org.springframework.cloud.zookeeper.discovery.dependency.StubsConfiguration
 import org.springframework.cloud.zookeeper.discovery.dependency.ZookeeperDependencies
 import org.springframework.test.context.ActiveProfiles
@@ -12,7 +12,7 @@ import org.springframework.test.context.TestPropertySource
 
 import static com.ofg.config.BasicProfiles.SPRING_CLOUD
 
-@ContextConfiguration(classes = [BaseConfiguration, ZookeeperDependencyStubsConfigurationFix], loader = SpringApplicationContextLoader)
+@ContextConfiguration(classes = [BaseConfiguration, ZookeeperDependencyStubsConfigurationFix], loader = SpringBootContextLoader)
 @TestPropertySource(properties = [
         'spring.application.name: io/company/department/my-service',
         'spring.cloud.zookeeper.dependencies.some-service.path: io/company/department/some-service',

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

@@ -5,18 +5,19 @@ 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.SpringBootContextLoader
 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.content
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
 
-@ContextConfiguration(classes = [BaseConfiguration, HealthCheckConfiguration, ServiceDiscoveryStubbingApplicationConfiguration], loader = SpringApplicationContextLoader)
+@ContextConfiguration(classes = [BaseConfiguration, HealthCheckConfiguration, ServiceDiscoveryStubbingApplicationConfiguration], loader = SpringBootContextLoader)
 class MicroserviceConfigurationControllerSpec extends MvcCorrelationIdSettingIntegrationSpec {
 
     @Shared @ClassRule
@@ -29,7 +30,7 @@ class MicroserviceConfigurationControllerSpec extends MvcCorrelationIdSettingInt
         expect:
             mockMvc.perform(get('/microservice.json'))
                     .andExpect(status().isOk())
-                    .andExpect(content().contentType(MediaType.APPLICATION_JSON))
+                    .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
                     .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.boot.test.context.SpringBootContextLoader
 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)
+        CollaboratorsConfiguration, ServiceRestClientConfiguration], loader = SpringBootContextLoader)
 class PingClientTest extends MvcWiremockIntegrationSpec {
 
     @Autowired

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

@@ -5,7 +5,7 @@ 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.SpringBootContextLoader
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Import
 import org.springframework.http.HttpMethod
@@ -18,7 +18,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)
+@ContextConfiguration(classes = TestConfig, loader = SpringBootContextLoader)
 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 {
 
@@ -17,13 +16,13 @@ class TracingPropertiesEnablerSpec extends Specification {
         expect:
             propValue == Boolean.valueOf(context.environment.getProperty(TracingPropertiesEnabler.SPRING_ZIPKIN_ENABLED))
         where:
-            profile                   | appEnv     || propValue
-            BasicProfiles.DEVELOPMENT | 'sth'      || false
-            BasicProfiles.DEVELOPMENT | 'test'      || false
-            BasicProfiles.PRODUCTION  | 'sth'      || true
-            BasicProfiles.PRODUCTION  | 'test'     || false
-            BasicProfiles.PRODUCTION  | 'test-01'  || false
-            BasicProfiles.PRODUCTION  | 'STAGE-09' || false
-            BasicProfiles.PRODUCTION  | 'stage-09' || false
+            profile                   | appEnv     | propValue
+            BasicProfiles.DEVELOPMENT | 'sth'      | false
+            BasicProfiles.DEVELOPMENT | 'test'     | false
+            BasicProfiles.PRODUCTION  | 'sth'      | true
+            BasicProfiles.PRODUCTION  | 'test'     | false
+            BasicProfiles.PRODUCTION  | 'test-01'  | false
+            BasicProfiles.PRODUCTION  | 'STAGE-09' | false
+            BasicProfiles.PRODUCTION  | 'stage-09' | false
     }
 }

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

@@ -10,7 +10,7 @@ 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.SpringBootContextLoader
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Import
 import org.springframework.http.MediaType
@@ -23,19 +23,22 @@ 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
 
-import static com.github.tomakehurst.wiremock.client.WireMock.*
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse
+import static com.github.tomakehurst.wiremock.client.WireMock.get
+import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor
+import static com.github.tomakehurst.wiremock.client.WireMock.matching
+import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching
 import static com.ofg.infrastructure.correlationid.CorrelationIdHolder.CORRELATION_ID_HEADER
 import static java.util.concurrent.TimeUnit.SECONDS
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.asyncDispatch
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print
 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)
+@ContextConfiguration(classes = [BaseConfiguration, CorrelationIdAspectSpecConfiguration], loader = SpringBootContextLoader)
 class CorrelationIdAspectSpec extends MicroserviceMvcWiremockSpec {
 
     @Shared @ClassRule

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

@@ -4,7 +4,7 @@ import com.ofg.infrastructure.base.BaseConfiguration
 import com.ofg.infrastructure.base.MicroserviceMvcWiremockSpec
 import groovy.transform.CompileStatic
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.SpringApplicationContextLoader
+import org.springframework.boot.test.context.SpringBootContextLoader
 import org.springframework.cloud.sleuth.Span
 import org.springframework.cloud.sleuth.trace.SpanContextHolder
 import org.springframework.context.annotation.Bean
@@ -16,7 +16,7 @@ import spock.util.concurrent.PollingConditions
 
 import java.util.concurrent.atomic.AtomicReference
 
-@ContextConfiguration(classes = [BaseConfiguration, CorrelationIdAsyncSpecConfiguration], loader = SpringApplicationContextLoader)
+@ContextConfiguration(classes = [BaseConfiguration, CorrelationIdAsyncSpecConfiguration], loader = SpringBootContextLoader)
 class CorrelationIdAsyncSpec extends MicroserviceMvcWiremockSpec {
 
     @Autowired AsyncClass asyncClass

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

@@ -1,9 +1,10 @@
 package com.ofg.infrastructure.web.correlationid
+
 import com.ofg.infrastructure.base.BaseConfiguration
 import com.ofg.infrastructure.base.ConfigurationWithoutServiceDiscovery
 import com.ofg.infrastructure.base.MvcCorrelationIdSettingIntegrationSpec
 import org.slf4j.MDC
-import org.springframework.boot.test.SpringApplicationContextLoader
+import org.springframework.boot.test.context.SpringBootContextLoader
 import org.springframework.http.MediaType
 import org.springframework.test.context.ContextConfiguration
 import org.springframework.test.web.servlet.MvcResult
@@ -13,7 +14,7 @@ import spock.lang.Ignore
 import static com.ofg.infrastructure.correlationid.CorrelationIdHolder.CORRELATION_ID_HEADER
 import static com.ofg.infrastructure.correlationid.CorrelationIdHolder.OLD_CORRELATION_ID_HEADER
 
-@ContextConfiguration(classes = [BaseConfiguration, ConfigurationWithoutServiceDiscovery], loader = SpringApplicationContextLoader)
+@ContextConfiguration(classes = [BaseConfiguration, ConfigurationWithoutServiceDiscovery], loader = SpringBootContextLoader)
 class CorrelationIdFilterSpec extends MvcCorrelationIdSettingIntegrationSpec {
 
     private Random random = new Random();

micro-infra-spring-base/src/test/groovy/com/ofg/infrastructure/web/exception/CustomControllerAdviceMvcSpec.groovy

@@ -1,8 +1,9 @@
 package com.ofg.infrastructure.web.exception
+
 import com.ofg.infrastructure.base.BaseConfiguration
 import com.ofg.infrastructure.base.ConfigurationWithoutServiceDiscovery
 import com.ofg.infrastructure.base.MvcCorrelationIdSettingIntegrationSpec
-import org.springframework.boot.test.SpringApplicationContextLoader
+import org.springframework.boot.test.context.SpringBootContextLoader
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.test.context.ContextConfiguration
@@ -12,7 +13,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
 
-@ContextConfiguration(classes = [Config, BaseConfiguration, ConfigurationWithoutServiceDiscovery], loader = SpringApplicationContextLoader)
+@ContextConfiguration(classes = [Config, BaseConfiguration, ConfigurationWithoutServiceDiscovery], loader = SpringBootContextLoader)
 class CustomControllerAdviceMvcSpec extends MvcCorrelationIdSettingIntegrationSpec {
 
     def "should apply custom logic when application uses its own @ControllerAdvice"() {

micro-infra-spring-base/src/test/groovy/com/ofg/infrastructure/web/exception/ExceptionHandlingMvcSpec.groovy

@@ -3,7 +3,7 @@ package com.ofg.infrastructure.web.exception
 import com.ofg.infrastructure.base.BaseConfiguration
 import com.ofg.infrastructure.base.ConfigurationWithoutServiceDiscovery
 import com.ofg.infrastructure.base.MvcCorrelationIdSettingIntegrationSpec
-import org.springframework.boot.test.SpringApplicationContextLoader
+import org.springframework.boot.test.context.SpringBootContextLoader
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Import
@@ -16,7 +16,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
 
-@ContextConfiguration(classes = TestConfig, loader = SpringApplicationContextLoader)
+@ContextConfiguration(classes = TestConfig, loader = SpringBootContextLoader)
 class ExceptionHandlingMvcSpec extends MvcCorrelationIdSettingIntegrationSpec {
 
     def "should return bad request error for invalid field"() {

micro-infra-spring-base/src/test/groovy/com/ofg/infrastructure/web/logging/FeignCallObfuscatingLoggerSpec.groovy

@@ -16,7 +16,7 @@ import feign.Response
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.context.properties.EnableConfigurationProperties
-import org.springframework.boot.test.SpringApplicationContextLoader
+import org.springframework.boot.test.context.SpringBootContextLoader
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.MediaType
 import org.springframework.test.context.ContextConfiguration
@@ -28,7 +28,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.get
 import static com.github.tomakehurst.wiremock.client.WireMock.post
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching
 
-@ContextConfiguration(classes = [RequestLoggingSpecConfiguration, BaseConfiguration], loader = SpringApplicationContextLoader)
+@ContextConfiguration(classes = [RequestLoggingSpecConfiguration, BaseConfiguration], loader = SpringBootContextLoader)
 class FeignCallObfuscatingLoggerSpec extends MicroserviceMvcWiremockSpec {
 
     private static final String JSON_REQ_RESOURCE_NAME = 'requestLogging/message_req.json'

micro-infra-spring-base/src/test/groovy/com/ofg/infrastructure/web/logging/RequestLoggingClientInterceptorSpec.groovy

@@ -11,7 +11,7 @@ import com.ofg.infrastructure.web.resttemplate.custom.ResponseException
 import com.ofg.infrastructure.web.resttemplate.fluent.ServiceRestClient
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.SpringApplicationContextLoader
+import org.springframework.boot.test.context.SpringBootContextLoader
 import org.springframework.context.annotation.Configuration
 import org.springframework.http.MediaType
 import org.springframework.test.context.ContextConfiguration
@@ -23,7 +23,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.get
 import static com.github.tomakehurst.wiremock.client.WireMock.post
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching
 
-@ContextConfiguration(classes = [RequestLoggingSpecConfiguration, BaseConfiguration], loader = SpringApplicationContextLoader)
+@ContextConfiguration(classes = [RequestLoggingSpecConfiguration, BaseConfiguration], loader = SpringBootContextLoader)
 class RequestLoggingClientInterceptorSpec extends MicroserviceMvcWiremockSpec {
 
     @Autowired private ServiceRestClient serviceRestClient