Update project- and package structure

autoconfigure/build.gradle

@@ -37,6 +37,7 @@ dependencies {
     api 'org.springframework.boot:spring-boot-autoconfigure'
     implementation 'org.slf4j:slf4j-api'
 
+    optional project(':okhttp-spring-client')
     optional 'org.springframework:spring-web'
     optional 'org.springframework.boot:spring-boot-starter-actuator'
 

autoconfigure/src/main/java/io/freefair/spring/okhttp/NotReactiveWebApplicationCondition.java → autoconfigure/src/main/java/io/freefair/spring/okhttp/autoconfigure/NotReactiveWebApplicationCondition.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.freefair.spring.okhttp;
+package io.freefair.spring.okhttp.autoconfigure;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.condition.NoneNestedConditions;

autoconfigure/src/main/java/io/freefair/spring/okhttp/OkHttp3AutoConfiguration.java → autoconfigure/src/main/java/io/freefair/spring/okhttp/autoconfigure/OkHttp3AutoConfiguration.java

@@ -1,5 +1,8 @@
-package io.freefair.spring.okhttp;
+package io.freefair.spring.okhttp.autoconfigure;
 
+import io.freefair.spring.okhttp.ApplicationInterceptor;
+import io.freefair.spring.okhttp.NetworkInterceptor;
+import io.freefair.spring.okhttp.OkHttp3Configurer;
 import okhttp3.*;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;

autoconfigure/src/main/java/io/freefair/spring/okhttp/OkHttpProperties.java → autoconfigure/src/main/java/io/freefair/spring/okhttp/autoconfigure/OkHttpProperties.java

@@ -1,4 +1,4 @@
-package io.freefair.spring.okhttp;
+package io.freefair.spring.okhttp.autoconfigure;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

autoconfigure/src/main/java/io/freefair/spring/okhttp/OkHttpRestClientAutoConfiguration.java → autoconfigure/src/main/java/io/freefair/spring/okhttp/autoconfigure/OkHttpRestClientAutoConfiguration.java

@@ -1,4 +1,4 @@
-package io.freefair.spring.okhttp;
+package io.freefair.spring.okhttp.autoconfigure;
 
 import io.freefair.spring.okhttp.client.OkHttpClientRequestFactory;
 import okhttp3.OkHttpClient;
@@ -15,7 +15,7 @@
  * @see RestClientAutoConfiguration
  */
 @AutoConfiguration
-@ConditionalOnClass({RestClientCustomizer.class, RestClient.class})
+@ConditionalOnClass({RestClientCustomizer.class, RestClient.class, OkHttpClientRequestFactory.class})
 @Conditional(NotReactiveWebApplicationCondition.class)
 public class OkHttpRestClientAutoConfiguration {
 

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

@@ -1,4 +1,4 @@
-package io.freefair.spring.okhttp;
+package io.freefair.spring.okhttp.autoconfigure;
 
 import io.freefair.spring.okhttp.client.OkHttpClientRequestFactory;
 import lombok.AllArgsConstructor;
@@ -32,7 +32,7 @@
  * @see RestTemplateAutoConfiguration
  */
 @AutoConfiguration(before = RestTemplateAutoConfiguration.class, after = HttpMessageConvertersAutoConfiguration.class)
-@ConditionalOnClass({RestTemplateCustomizer.class, RestTemplate.class})
+@ConditionalOnClass({RestTemplateCustomizer.class, RestTemplate.class, OkHttpClientRequestFactory.class})
 @Conditional(NotReactiveWebApplicationCondition.class)
 public class OkHttpRestTemplateAutoConfiguration {
 

autoconfigure/src/main/java/io/freefair/spring/okhttp/logging/OkHttp3LoggingInterceptorAutoConfiguration.java → autoconfigure/src/main/java/io/freefair/spring/okhttp/autoconfigure/logging/OkHttp3LoggingInterceptorAutoConfiguration.java

@@ -1,7 +1,7 @@
-package io.freefair.spring.okhttp.logging;
+package io.freefair.spring.okhttp.autoconfigure.logging;
 
 import io.freefair.spring.okhttp.ApplicationInterceptor;
-import io.freefair.spring.okhttp.OkHttp3AutoConfiguration;
+import io.freefair.spring.okhttp.autoconfigure.OkHttp3AutoConfiguration;
 import okhttp3.logging.HttpLoggingInterceptor;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;

autoconfigure/src/main/java/io/freefair/spring/okhttp/logging/OkHttp3LoggingInterceptorProperties.java → autoconfigure/src/main/java/io/freefair/spring/okhttp/autoconfigure/logging/OkHttp3LoggingInterceptorProperties.java

@@ -1,4 +1,4 @@
-package io.freefair.spring.okhttp.logging;
+package io.freefair.spring.okhttp.autoconfigure.logging;
 
 import lombok.Data;
 import okhttp3.logging.HttpLoggingInterceptor;

autoconfigure/src/main/java/io/freefair/spring/okhttp/metrics/OkHttpMetricsAutoConfiguration.java → autoconfigure/src/main/java/io/freefair/spring/okhttp/autoconfigure/metrics/OkHttpMetricsAutoConfiguration.java

@@ -1,6 +1,6 @@
-package io.freefair.spring.okhttp.metrics;
+package io.freefair.spring.okhttp.autoconfigure.metrics;
 
-import io.freefair.spring.okhttp.OkHttpProperties;
+import io.freefair.spring.okhttp.autoconfigure.OkHttpProperties;
 import io.micrometer.core.instrument.binder.okhttp3.OkHttpConnectionPoolMetrics;
 import io.micrometer.core.instrument.binder.okhttp3.OkHttpMetricsEventListener;
 import io.micrometer.core.instrument.MeterRegistry;

autoconfigure/src/main/java/io/freefair/spring/okhttp/metrics/OkHttpMetricsProperties.java → autoconfigure/src/main/java/io/freefair/spring/okhttp/autoconfigure/metrics/OkHttpMetricsProperties.java

@@ -1,4 +1,4 @@
-package io.freefair.spring.okhttp.metrics;
+package io.freefair.spring.okhttp.autoconfigure.metrics;
 
 import io.micrometer.core.instrument.binder.okhttp3.OkHttpConnectionPoolMetrics;
 import io.micrometer.core.instrument.binder.okhttp3.OkHttpMetricsEventListener;

autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,5 +1,5 @@
-io.freefair.spring.okhttp.OkHttp3AutoConfiguration
-io.freefair.spring.okhttp.OkHttpRestClientAutoConfiguration
-io.freefair.spring.okhttp.OkHttpRestTemplateAutoConfiguration
-io.freefair.spring.okhttp.metrics.OkHttpMetricsAutoConfiguration
-io.freefair.spring.okhttp.logging.OkHttp3LoggingInterceptorAutoConfiguration
+io.freefair.spring.okhttp.autoconfigure.OkHttp3AutoConfiguration
+io.freefair.spring.okhttp.autoconfigure.OkHttpRestClientAutoConfiguration
+io.freefair.spring.okhttp.autoconfigure.OkHttpRestTemplateAutoConfiguration
+io.freefair.spring.okhttp.autoconfigure.metrics.OkHttpMetricsAutoConfiguration
+io.freefair.spring.okhttp.autoconfigure.logging.OkHttp3LoggingInterceptorAutoConfiguration

autoconfigure/src/test/java/io/freefair/spring/okhttp/DurationPropertiesIT.java

@@ -1,5 +1,6 @@
 package io.freefair.spring.okhttp;
 
+import io.freefair.spring.okhttp.autoconfigure.OkHttpProperties;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringBootConfiguration;

autoconfigure/src/test/java/io/freefair/spring/okhttp/OkHttp3AutoConfigurationTest.java

@@ -1,5 +1,6 @@
 package io.freefair.spring.okhttp;
 
+import io.freefair.spring.okhttp.autoconfigure.OkHttp3AutoConfiguration;
 import okhttp3.Cache;
 import okhttp3.Dns;
 import okhttp3.OkHttpClient;

autoconfigure/src/test/java/io/freefair/spring/okhttp/logging/OkHttp3LoggingInterceptorAutoConfigurationTest.java

@@ -1,5 +1,6 @@
 package io.freefair.spring.okhttp.logging;
 
+import io.freefair.spring.okhttp.autoconfigure.logging.OkHttp3LoggingInterceptorAutoConfiguration;
 import okhttp3.logging.HttpLoggingInterceptor;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

autoconfigure/src/test/java/io/freefair/spring/okhttp/metrics/OkHttpMetricsAutoConfigurationTest.java

@@ -1,5 +1,6 @@
 package io.freefair.spring.okhttp.metrics;
 
+import io.freefair.spring.okhttp.autoconfigure.metrics.OkHttpMetricsAutoConfiguration;
 import io.micrometer.core.instrument.MeterRegistry;
 import okhttp3.EventListener;
 import org.junit.jupiter.api.BeforeEach;

okhttp-spring-client/build.gradle

@@ -0,0 +1,15 @@
+plugins {
+    id 'java-library'
+    id "io.freefair.lombok"
+    id "io.freefair.javadoc-links"
+    id "io.freefair.maven-publish-java"
+}
+
+description = "OkHttp Spring Client"
+
+dependencies {
+    implementation platform(project(":dependencies"))
+
+    api "com.squareup.okhttp3:okhttp"
+    api "org.springframework:spring-web"
+}

settings.gradle

@@ -40,6 +40,8 @@ dependencyResolutionManagement {
     }
 }
 
+include 'okhttp-spring-client'
+
 include 'dependencies'
 include 'autoconfigure'
 include 'starters:okhttp'

starters/okhttp4/build.gradle

@@ -5,7 +5,9 @@ description = "OkHttp 4 Spring Boot Starter"
 
 dependencies {
     api platform(project(":dependencies"))
+
     api 'org.springframework.boot:spring-boot-starter'
     api project(':autoconfigure')
+    api project(':okhttp-spring-client')
     api 'com.squareup.okhttp3:okhttp'
 }

starters/okhttp5/build.gradle

@@ -6,7 +6,9 @@ description = "OkHttp 5 Spring Boot Starter"
 dependencies {
     api platform(project(":dependencies"))
     api platform('com.squareup.okhttp3:okhttp-bom:5.0.0-alpha.11')
+
     api 'org.springframework.boot:spring-boot-starter'
     api project(':autoconfigure')
+    api project(':okhttp-spring-client')
     api 'com.squareup.okhttp3:okhttp'
 }