prepare okHttpPlugin for BuildCache

Author: larsgrefer

github-plugin/src/main/java/io/freefair/gradle/plugins/github/GithubBasePlugin.java

@@ -2,9 +2,9 @@
 
 import io.freefair.gradle.plugins.github.internal.GitUtils;
 import io.freefair.gradle.plugins.github.internal.GithubClient;
-import io.freefair.gradle.plugins.okhttp.OkHttpPlugin;
 import io.freefair.gradle.util.GitUtil;
 import lombok.Getter;
+import okhttp3.OkHttpClient;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 
@@ -41,9 +41,7 @@ public void apply(Project project) {
         githubExtension.getUsername().convention(project.provider(() -> GitUtils.findGithubUsername(project)));
         githubExtension.getToken().convention(project.provider(() -> GitUtils.findGithubToken(project)));
 
-        OkHttpPlugin okHttpPlugin = project.getPlugins().apply(OkHttpPlugin.class);
-
-        githubClient = new GithubClient(githubExtension, okHttpPlugin.getOkHttpClient());
+        githubClient = new GithubClient(githubExtension, new OkHttpClient.Builder().build());
     }
 
     private boolean isTravis() {

maven-plugin/src/main/java/io/freefair/gradle/plugins/maven/javadoc/JavadocLinksPlugin.java

@@ -19,13 +19,12 @@
 public class JavadocLinksPlugin implements Plugin<Project> {
 
     private Project project;
-    private OkHttpPlugin okHttpPlugin;
 
     @Override
     public void apply(Project project) {
         this.project = project;
 
-        okHttpPlugin = project.getPlugins().apply(OkHttpPlugin.class);
+        project.getPlugins().apply(OkHttpPlugin.class);
 
         project.getPlugins().withType(AggregateJavadocPlugin.class, ajp -> {
 
@@ -50,7 +49,7 @@ public void apply(Project project) {
 
     public void addLinks(TaskProvider<Javadoc> javadocTaskProvider, Configuration classpath) {
 
-        TaskProvider<ResolveJavadocLinks> resolveJavadocLinks = project.getTasks().register("resolveJavadocLinks", ResolveJavadocLinks.class, okHttpPlugin.getOkHttpClient());
+        TaskProvider<ResolveJavadocLinks> resolveJavadocLinks = project.getTasks().register("resolveJavadocLinks", ResolveJavadocLinks.class);
 
         resolveJavadocLinks.configure(rjd -> {
             rjd.getJavadocTool().convention(javadocTaskProvider.get().getJavadocTool());

maven-plugin/src/main/java/io/freefair/gradle/plugins/maven/javadoc/ResolveJavadocLinks.java

@@ -1,13 +1,12 @@
 package io.freefair.gradle.plugins.maven.javadoc;
 
+import io.freefair.gradle.plugins.okhttp.tasks.OkHttpTask;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import org.gradle.api.DefaultTask;
 import org.gradle.api.NonNullApi;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.component.ComponentArtifactIdentifier;
-import org.gradle.api.artifacts.component.ComponentIdentifier;
 import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
 import org.gradle.api.artifacts.result.ResolvedArtifactResult;
 import org.gradle.api.file.RegularFileProperty;
@@ -34,7 +33,7 @@
  */
 @NonNullApi
 @CacheableTask
-public abstract class ResolveJavadocLinks extends DefaultTask {
+public abstract class ResolveJavadocLinks extends OkHttpTask {
 
     @OutputFile
     public abstract RegularFileProperty getOutputFile();
@@ -45,13 +44,10 @@ public abstract class ResolveJavadocLinks extends DefaultTask {
     @Input
     public abstract ListProperty<ComponentArtifactIdentifier> getArtifactIds();
 
-    private final OkHttpClient okHttpClient;
-
     private final List<JavadocLinkProvider> javadocLinkProviders;
 
     @Inject
-    public ResolveJavadocLinks(OkHttpClient okHttpClient) {
-        this.okHttpClient = okHttpClient;
+    public ResolveJavadocLinks() {
 
         this.javadocLinkProviders = new ArrayList<>();
         for (JavadocLinkProvider javadocLinkProvider : ServiceLoader.load(JavadocLinkProvider.class, this.getClass().getClassLoader())) {
@@ -140,7 +136,7 @@ private boolean checkLink(String link) {
                     .get()
                     .build();
 
-            try (Response response = okHttpClient.newCall(request).execute()) {
+            try (Response response = getOkHttpClient().newCall(request).execute()) {
                 if (response.isSuccessful()) {
                     return true;
                 }

okhttp-plugin/src/main/java/io/freefair/gradle/plugins/okhttp/OkHttpCacheExtension.java

@@ -8,6 +8,7 @@
 import javax.inject.Inject;
 
 @Data
+@Deprecated
 public class OkHttpCacheExtension {
 
     private final DirectoryProperty directory;

okhttp-plugin/src/main/java/io/freefair/gradle/plugins/okhttp/OkHttpCachePlugin.java

@@ -12,6 +12,7 @@
 /**
  * @author Lars Grefer
  */
+@Deprecated
 public class OkHttpCachePlugin implements Plugin<Project> {
 
     @Getter

okhttp-plugin/src/main/java/io/freefair/gradle/plugins/okhttp/OkHttpPlugin.java

@@ -1,56 +1,28 @@
 package io.freefair.gradle.plugins.okhttp;
 
-import io.freefair.gradle.plugins.okhttp.internal.CacheControlInterceptor;
-import okhttp3.CacheControl;
-import okhttp3.OkHttpClient;
+import io.freefair.gradle.plugins.okhttp.tasks.OkHttpTask;
 import okhttp3.logging.HttpLoggingInterceptor;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 
-import javax.annotation.Nullable;
-
 /**
  * @author Lars Grefer
  */
 public class OkHttpPlugin implements Plugin<Project> {
 
-    @Nullable
-    private OkHttpClient okHttpClient;
-    private OkHttpCachePlugin okHttpCachePlugin;
     private Project project;
     private OkHttpExtension okHttpExtension;
 
     @Override
     public void apply(Project project) {
         this.project = project;
 
-        okHttpCachePlugin = project.getRootProject().getPlugins().apply(OkHttpCachePlugin.class);
-
         okHttpExtension = project.getExtensions().create("okHttp", OkHttpExtension.class);
         okHttpExtension.getLoggingLevel().convention(project.provider(this::getLevel));
 
-    }
-
-    public OkHttpClient getOkHttpClient() {
-        if (okHttpClient == null) {
-
-            OkHttpClient.Builder builder = new OkHttpClient.Builder()
-                    .cache(okHttpCachePlugin.getCache());
-
-            if (project.getGradle().getStartParameter().isOffline()) {
-                builder = builder.addInterceptor(new CacheControlInterceptor(CacheControl.FORCE_CACHE));
-            }
-            else if (project.getGradle().getStartParameter().isRefreshDependencies()) {
-                builder = builder.addInterceptor(new CacheControlInterceptor(CacheControl.FORCE_NETWORK));
-            }
-
-            HttpLoggingInterceptor loggingInterceptor = new HttpLoggingInterceptor(project.getLogger()::info);
-            loggingInterceptor.level(okHttpExtension.getLoggingLevel().get());
-            builder = builder.addInterceptor(loggingInterceptor);
-
-            okHttpClient = builder.build();
-        }
-        return okHttpClient;
+        project.getTasks().withType(OkHttpTask.class).configureEach(okHttpTask -> {
+            okHttpTask.getLoggingLevel().convention(okHttpExtension.getLoggingLevel());
+        });
     }
 
     private HttpLoggingInterceptor.Level getLevel() {

okhttp-plugin/src/main/java/io/freefair/gradle/plugins/okhttp/tasks/OkHttpRequestTask.java

@@ -1,14 +1,16 @@
 package io.freefair.gradle.plugins.okhttp.tasks;
 
-import io.freefair.gradle.plugins.okhttp.OkHttpPlugin;
+import io.freefair.gradle.plugins.okhttp.internal.CacheControlInterceptor;
 import io.freefair.gradle.plugins.okhttp.internal.ProgressInterceptor;
 import io.freefair.gradle.plugins.okhttp.internal.ProgressListener;
 import lombok.RequiredArgsConstructor;
 import okhttp3.*;
+import okhttp3.logging.HttpLoggingInterceptor;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.GradleException;
 import org.gradle.api.provider.MapProperty;
 import org.gradle.api.provider.Property;
+import org.gradle.api.tasks.Console;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.TaskAction;
@@ -22,7 +24,7 @@
 /**
  * @author Lars Grefer
  */
-public abstract class OkHttpRequestTask extends DefaultTask {
+public abstract class OkHttpRequestTask extends OkHttpTask {
 
     @Inject
     protected abstract ProgressLoggerFactory getProgressLoggerFactory();
@@ -66,19 +68,6 @@ public void executeRequest() throws IOException {
 
     }
 
-    private OkHttpClient getOkHttpClient() {
-        OkHttpPlugin plugin = getProject().getPlugins().findPlugin(OkHttpPlugin.class);
-
-        OkHttpClient client;
-        if (plugin != null) {
-            client = plugin.getOkHttpClient();
-        }
-        else {
-            client = new OkHttpClient();
-        }
-        return client;
-    }
-
     public Request.Builder buildRequest(Request.Builder builder) {
 
         getHeaders().get().forEach(builder::header);
@@ -120,7 +109,7 @@ public void readUpdate(long bytesRead, long contentLength) {
 
         @Override
         public void writeUpdate(long bytesWritten, long contentLength) {
-            if(uploadStart == 0) {
+            if (uploadStart == 0) {
                 uploadStart = System.nanoTime();
             }
             update("Upload", bytesWritten, contentLength, uploadStart);

okhttp-plugin/src/main/java/io/freefair/gradle/plugins/okhttp/tasks/OkHttpTask.java

@@ -0,0 +1,50 @@
+package io.freefair.gradle.plugins.okhttp.tasks;
+
+import io.freefair.gradle.plugins.okhttp.internal.CacheControlInterceptor;
+import okhttp3.Cache;
+import okhttp3.CacheControl;
+import okhttp3.OkHttpClient;
+import okhttp3.logging.HttpLoggingInterceptor;
+import org.gradle.api.DefaultTask;
+import org.gradle.api.provider.Property;
+import org.gradle.api.tasks.Console;
+import org.gradle.api.tasks.Internal;
+
+public abstract class OkHttpTask extends DefaultTask {
+
+    @Console
+    public abstract Property<HttpLoggingInterceptor.Level> getLoggingLevel();
+
+    @Internal
+    private OkHttpClient okHttpClient;
+
+    protected OkHttpClient getOkHttpClient() {
+        if(okHttpClient == null) {
+            okHttpClient = buildOkHttpClient();
+        }
+
+        return okHttpClient;
+    }
+
+    protected OkHttpClient buildOkHttpClient() {
+        OkHttpClient.Builder builder = new OkHttpClient.Builder();
+
+        builder = builder.cache(new Cache(getTemporaryDir(), 10 * 1024 * 1024));
+
+        if (getProject().getGradle().getStartParameter().isOffline()) {
+            builder = builder.addInterceptor(new CacheControlInterceptor(CacheControl.FORCE_CACHE));
+        }
+        else if (getProject().getGradle().getStartParameter().isRefreshDependencies()) {
+            builder = builder.addInterceptor(new CacheControlInterceptor(CacheControl.FORCE_NETWORK));
+        }
+
+        if (getLoggingLevel().isPresent()) {
+            HttpLoggingInterceptor loggingInterceptor = new HttpLoggingInterceptor(s -> getLogger().lifecycle(s));
+            loggingInterceptor.level(getLoggingLevel().get());
+            builder = builder.addInterceptor(loggingInterceptor);
+        }
+
+        return builder.build();
+
+    }
+}