update to spring-boot 2.0.0.M1

Author: larsgrefer

autoconfigure/build.gradle

@@ -1,20 +1,22 @@
-plugins {
-    id "java"
-    id "maven"
-    id "findbugs"
-    id "checkstyle"
-    id "org.springframework.boot" version "1.5.4.RELEASE"
-    id "io.freefair.maven-jars" version "0.10.1"
-    id "io.freefair.javadoc-links" version "0.10.1"
-}
+apply plugin: 'java'
+apply plugin: 'maven'
+apply plugin: 'findbugs'
+apply plugin: 'checkstyle'
+apply plugin: 'io.freefair.maven-jars'
+apply plugin: 'io.freefair.javadoc-links'
+apply plugin: 'io.spring.dependency-management'
 
 archivesBaseName = "okhttp-spring-boot-autoconfigure"
 
 javadoc.options.linkSource true
 
-bootRepackage.enabled = false
+dependencyManagement {
+    imports {
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:2.0.0.M1'
+    }
+}
 
-checkstyle.toolVersion = "7.6"
+checkstyle.toolVersion = "7.8.1"
 
 compileJava.dependsOn(processResources)
 

autoconfigure/src/main/java/io/freefair/spring/okhttp/OkHttp2AutoConfiguration.java

@@ -5,15 +5,12 @@
 import com.squareup.okhttp.Interceptor;
 import com.squareup.okhttp.OkHttpClient;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.http.client.OkHttpClientHttpRequestFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -107,20 +104,4 @@ public OkHttpClient okHttp2Client() throws IOException {
 
         return okHttpClient;
     }
-
-    /**
-     * @author Lars Grefer
-     */
-    @Configuration
-    @ConditionalOnClass(OkHttpClientHttpRequestFactory.class)
-    @AutoConfigureBefore(OkHttpRestTemplateAutoConfiguration.class)
-    @AutoConfigureAfter(OkHttp2AutoConfiguration.class)
-    public static class RequestFactoryAutoConfiguration {
-
-        @Bean
-        @ConditionalOnMissingBean(OkHttpClientHttpRequestFactory.class)
-        public OkHttpClientHttpRequestFactory okHttpClientHttpRequestFactory(OkHttpClient okHttpClient) {
-            return new OkHttpClientHttpRequestFactory(okHttpClient);
-        }
-    }
 }

autoconfigure/src/main/java/io/freefair/spring/okhttp/OkHttpRestTemplateAutoConfiguration.java

@@ -3,45 +3,27 @@
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.web.WebClientAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration;
 import org.springframework.boot.web.client.RestTemplateCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.client.OkHttp3ClientHttpRequestFactory;
-import org.springframework.http.client.OkHttpClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
 
 /**
  * @author Lars Grefer
  */
 @Configuration
 @ConditionalOnClass({RestTemplateCustomizer.class, RestTemplate.class})
-@AutoConfigureBefore(WebClientAutoConfiguration.RestTemplateConfiguration.class)
+@AutoConfigureBefore(RestTemplateAutoConfiguration.class)
 public class OkHttpRestTemplateAutoConfiguration {
 
     @Bean
     @Order(2)
     @ConditionalOnBean(OkHttp3ClientHttpRequestFactory.class)
-    public RestTemplateCustomizer okhttp3RestTemplateCustomizer(final OkHttp3ClientHttpRequestFactory requestFactory) {
-        return new RestTemplateCustomizer() {
-            @Override
-            public void customize(RestTemplate restTemplate) {
-                restTemplate.setRequestFactory(requestFactory);
-            }
-        };
-    }
-
-    @Bean
-    @Order(3)
-    @ConditionalOnBean(OkHttpClientHttpRequestFactory.class)
-    public RestTemplateCustomizer okHttp2RestTemplateCustomizer(final OkHttpClientHttpRequestFactory requestFactory) {
-        return new RestTemplateCustomizer() {
-            @Override
-            public void customize(RestTemplate restTemplate) {
-                restTemplate.setRequestFactory(requestFactory);
-            }
-        };
+    public RestTemplateCustomizer okhttp3RestTemplateCustomizer(OkHttp3ClientHttpRequestFactory requestFactory) {
+        return restTemplate -> restTemplate.setRequestFactory(requestFactory);
     }
 
 }

build.gradle

@@ -1,12 +1,28 @@
+buildscript {
+    repositories {
+        jcenter()
+        maven { url 'https://plugins.gradle.org/m2/' }
+        maven { url 'http://repo.spring.io/snapshot' }
+        maven { url 'http://repo.spring.io/milestone' }
+    }
+
+    dependencies {
+        classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.0.0.M1'
+        classpath "io.freefair.gradle:gradle-plugins:0.10.1"
+    }
+}
+
 allprojects {
     repositories {
         jcenter()
+        maven { url 'http://repo.spring.io/snapshot' }
+        maven { url 'http://repo.spring.io/milestone' }
     }
 
     group = "io.freefair.okhttp-spring-boot"
 
     pluginManager.withPlugin("java") {
-        sourceCompatibility = 1.7
-        targetCompatibility = 1.7
+        sourceCompatibility = 1.8
+        targetCompatibility = 1.8
     }
 }

starters/okhttp/build.gradle

@@ -1,8 +1,6 @@
-plugins {
-    id "java"
-    id "maven"
-    id "io.freefair.maven-jars" version "0.10.1"
-}
+apply plugin: "java"
+apply plugin: "maven"
+apply plugin: "io.freefair.maven-jars"
 
 dependencies {
     compile project(':starters:okhttp3')

starters/okhttp2/build.gradle

@@ -1,8 +1,6 @@
-plugins {
-    id "java"
-    id "maven"
-    id "io.freefair.maven-jars" version "0.10.1"
-}
+apply plugin: "java"
+apply plugin: "maven"
+apply plugin: "io.freefair.maven-jars"
 
 dependencies {
     compile project(':autoconfigure')

starters/okhttp3/build.gradle

@@ -1,8 +1,6 @@
-plugins {
-    id "java"
-    id "maven"
-    id "io.freefair.maven-jars" version "0.10.1"
-}
+apply plugin: "java"
+apply plugin: "maven"
+apply plugin: "io.freefair.maven-jars"
 
 dependencies {
     compile project(':autoconfigure')