Use JavaContainerBuilder in plugins (#1572)

GoogleContainerTools · Mar 27, 2019 · d69aec5 · d69aec5
1 parent ce3732a
commit d69aec5
Show file tree

Hide file tree

Showing 29 changed files with 1,230 additions and 1,622 deletions.
diff --git a/jib-core/src/main/java/com/google/cloud/tools/jib/api/JibContainerBuilder.java b/jib-core/src/main/java/com/google/cloud/tools/jib/api/JibContainerBuilder.java
@@ -525,7 +525,7 @@ JibContainer containerize(
    * @throws IOException if an I/O exception occurs
    */
   @VisibleForTesting
-  BuildConfiguration toBuildConfiguration(
+  public BuildConfiguration toBuildConfiguration(
       Containerizer containerizer, ExecutorService executorService)
       throws CacheDirectoryCreationException, IOException {
     buildConfigurationBuilder

diff --git a/jib-core/src/main/java/com/google/cloud/tools/jib/frontend/JavaLayerConfigurations.java b/jib-core/src/main/java/com/google/cloud/tools/jib/frontend/JavaLayerConfigurations.java
@@ -56,7 +56,7 @@ public enum LayerType {
     }
 
     @VisibleForTesting
-    String getName() {
+    public String getName() {
       return name;
     }
   }

diff --git a/jib-core/src/main/java/com/google/cloud/tools/jib/frontend/MainClassFinder.java b/jib-core/src/main/java/com/google/cloud/tools/jib/frontend/MainClassFinder.java
@@ -146,8 +146,8 @@ public MethodVisitor visitMethod(
    * @param files the files to check
    * @param eventDispatcher used for dispatching log events.
    */
-  public MainClassFinder(ImmutableList<Path> files, EventDispatcher eventDispatcher) {
-    this.files = files;
+  public MainClassFinder(List<Path> files, EventDispatcher eventDispatcher) {
+    this.files = ImmutableList.copyOf(files);
     this.eventDispatcher = eventDispatcher;
   }
 

diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/BuildDockerTask.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/BuildDockerTask.java
@@ -111,12 +111,7 @@ public void buildDocker()
           PluginConfigurationProcessor.getAppRootChecked(
               gradleRawConfiguration, TaskCommon.isWarProject(getProject()));
       GradleProjectProperties projectProperties =
-          GradleProjectProperties.getForProject(
-              getProject(),
-              getLogger(),
-              jibExtension.getExtraDirectory().getPath(),
-              jibExtension.getExtraDirectory().getPermissions(),
-              appRoot);
+          GradleProjectProperties.getForProject(getProject(), getLogger(), appRoot);
 
       GradleHelpfulSuggestionsBuilder gradleHelpfulSuggestionsBuilder =
           new GradleHelpfulSuggestionsBuilder(HELPFUL_SUGGESTIONS_PREFIX, jibExtension);

diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/BuildImageTask.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/BuildImageTask.java
@@ -88,12 +88,7 @@ public void buildImage()
           PluginConfigurationProcessor.getAppRootChecked(
               gradleRawConfiguration, TaskCommon.isWarProject(getProject()));
       GradleProjectProperties projectProperties =
-          GradleProjectProperties.getForProject(
-              getProject(),
-              getLogger(),
-              jibExtension.getExtraDirectory().getPath(),
-              jibExtension.getExtraDirectory().getPermissions(),
-              appRoot);
+          GradleProjectProperties.getForProject(getProject(), getLogger(), appRoot);
 
       if (Strings.isNullOrEmpty(jibExtension.getTo().getImage())) {
         throw new GradleException(

diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/BuildTarTask.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/BuildTarTask.java
@@ -110,13 +110,7 @@ public void buildTar()
           PluginConfigurationProcessor.getAppRootChecked(
               gradleRawConfiguration, TaskCommon.isWarProject(getProject()));
       GradleProjectProperties projectProperties =
-          GradleProjectProperties.getForProject(
-              getProject(),
-              getLogger(),
-              jibExtension.getExtraDirectory().getPath(),
-              jibExtension.getExtraDirectory().getPermissions(),
-              appRoot);
-
+          GradleProjectProperties.getForProject(getProject(), getLogger(), appRoot);
       GradleHelpfulSuggestionsBuilder gradleHelpfulSuggestionsBuilder =
           new GradleHelpfulSuggestionsBuilder(HELPFUL_SUGGESTIONS_PREFIX, jibExtension);
 

diff --git a/...dle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/GradleLayerConfigurations.java b/...dle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/GradleLayerConfigurations.java