Make checkstyle happy

dmvk · Mar 10, 2021 · cfa1dd3 · cfa1dd3
1 parent f5dbf19
commit cfa1dd3
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 11 deletions.
diff --git a/...cache/src/main/java/org/gradle/caching/local/internal/DefaultBuildCacheTempFileStore.java b/...cache/src/main/java/org/gradle/caching/local/internal/DefaultBuildCacheTempFileStore.java
@@ -17,14 +17,11 @@
 package org.gradle.caching.local.internal;
 
 import org.gradle.api.Action;
-import org.gradle.api.UncheckedIOException;
-import org.gradle.api.internal.file.temp.TempFiles;
 import org.gradle.api.internal.file.temp.TemporaryFileProvider;
 import org.gradle.caching.BuildCacheKey;
 import org.gradle.util.GFileUtils;
 
 import java.io.File;
-import java.io.IOException;
 
 public class DefaultBuildCacheTempFileStore implements BuildCacheTempFileStore {
 
@@ -39,7 +36,7 @@ public void withTempFile(BuildCacheKey key, Action<? super File> action) {
         String hashCode = key.getHashCode();
         File tempFile = null;
         try {
-            tempFile = temporaryFileProvider.createTemporaryFile(hashCode + "-", PARTIAL_FILE_SUFFIX)
+            tempFile = temporaryFileProvider.createTemporaryFile(hashCode + "-", PARTIAL_FILE_SUFFIX);
             action.execute(tempFile);
         } finally {
             GFileUtils.deleteQuietly(tempFile);

diff --git a/...e/src/main/java/org/gradle/api/internal/changedetection/state/FileTimeStampInspector.java b/...e/src/main/java/org/gradle/api/internal/changedetection/state/FileTimeStampInspector.java
@@ -18,7 +18,6 @@
 
 import org.gradle.api.UncheckedIOException;
 import org.gradle.api.internal.file.temp.DefaultTemporaryFileProvider;
-import org.gradle.api.internal.file.temp.TempFiles;
 import org.gradle.api.internal.file.temp.TemporaryFileProvider;
 
 import java.io.File;

diff --git a/.../core/src/main/java/org/gradle/caching/internal/services/BuildCacheControllerFactory.java b/.../core/src/main/java/org/gradle/caching/internal/services/BuildCacheControllerFactory.java
@@ -43,7 +43,6 @@
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nullable;
-import java.io.File;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;

diff --git a/.../src/main/java/org/gradle/api/internal/file/temp/GradleUserHomeTemporaryFileProvider.java b/.../src/main/java/org/gradle/api/internal/file/temp/GradleUserHomeTemporaryFileProvider.java
@@ -19,7 +19,6 @@
 import org.gradle.initialization.GradleUserHomeDirProvider;
 import org.gradle.internal.Factory;
 import org.gradle.internal.FileUtils;
-import org.gradle.internal.service.scopes.Scope;
 import org.gradle.internal.service.scopes.Scopes;
 import org.gradle.internal.service.scopes.ServiceScope;
 

diff --git a/subprojects/file-temp/src/main/java/org/gradle/api/internal/file/temp/TempFiles.java b/subprojects/file-temp/src/main/java/org/gradle/api/internal/file/temp/TempFiles.java
@@ -36,7 +36,6 @@ private TempFiles() {
      */
     @CheckReturnValue
     static File createTempFile(String prefix, String suffix, File directory) throws IOException {
-        //noinspection ConstantConditions
         if (directory == null) {
             throw new NullPointerException("The `directory` argument must not be null as this will default to the system temporary directory");
         }

diff --git a/...lin-dsl/src/integTest/kotlin/org/gradle/kotlin/dsl/fixtures/GradleApiExtensionsFixture.kt b/...lin-dsl/src/integTest/kotlin/org/gradle/kotlin/dsl/fixtures/GradleApiExtensionsFixture.kt
@@ -39,7 +39,6 @@ val testInstallationGradleApiExtensionsJars =
 private
 fun testInstallationGradleApiExtensionsJarFor(testInstallation: File, tmpDir: File) =
     testInstallationGradleApiExtensionsJars.getOrPut(testInstallation) {
-        val fixturesDir = File("build/tmp/fixtures").also { it.mkdirs() }
         File(tmpDir, "gradle-api-extensions-fixture.jar").also { jar ->
             generateTestInstallationGradleApiExtensionsJarTo(jar, testInstallation)
             jar.deleteOnExit()

diff --git a/subprojects/scala/src/main/java/org/gradle/api/tasks/scala/ScalaDoc.java b/subprojects/scala/src/main/java/org/gradle/api/tasks/scala/ScalaDoc.java
@@ -32,15 +32,13 @@
 import org.gradle.api.tasks.SourceTask;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.api.tasks.scala.internal.GenerateScaladoc;
-import org.gradle.api.internal.file.temp.TempFiles;
 import org.gradle.util.GUtil;
 import org.gradle.workers.WorkQueue;
 import org.gradle.workers.WorkerExecutor;
 
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 import java.io.File;
-import java.io.IOException;
 import java.util.List;
 
 /**