Improve formatting.

3 files changed, 11 insertions, 6 deletions

diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java
index 9dccda289b2..48827212baa 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/mojo/GenerateOsgiManifestMojo.java
@@ -41,6 +41,8 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static com.yahoo.container.plugin.bundle.AnalyzeBundle.publicPackagesAggregated;
+import static com.yahoo.container.plugin.osgi.ExportPackages.exportsByPackageName;
+import static com.yahoo.container.plugin.osgi.ImportPackages.calculateImports;
 import static com.yahoo.container.plugin.util.Files.allDescendantFiles;
 import static com.yahoo.container.plugin.util.IO.withFileOutputStream;
 import static com.yahoo.container.plugin.util.JarFiles.withInputStream;
@@ -114,8 +116,9 @@ public class GenerateOsgiManifestMojo extends AbstractMojo {
                         .map(e -> "(" + e.getPackageNames().toString() + ", " + e.version().orElse("")).collect(Collectors.joining(", ")));
             }
 
-            Map<String, Import> calculatedImports = ImportPackages.calculateImports(includedPackages.referencedPackages(),
-                    includedPackages.definedPackages(), ExportPackages.exportsByPackageName(publicPackagesFromProvidedJars.exports));
+            Map<String, Import> calculatedImports = calculateImports(includedPackages.referencedPackages(),
+                                                                     includedPackages.definedPackages(),
+                                                                     exportsByPackageName(publicPackagesFromProvidedJars.exports));
 
             Map<String, Optional<String>> manualImports = emptyToNone(importPackage).map(GenerateOsgiManifestMojo::getManualImports)
                     .orElseGet(HashMap::new);
diff --git a/bundle-plugin/src/main/java/com/yahoo/container/plugin/osgi/ImportPackages.java b/bundle-plugin/src/main/java/com/yahoo/container/plugin/osgi/ImportPackages.java
index b58248ec4a6..a3031cb7ad7 100644
--- a/bundle-plugin/src/main/java/com/yahoo/container/plugin/osgi/ImportPackages.java
+++ b/bundle-plugin/src/main/java/com/yahoo/container/plugin/osgi/ImportPackages.java
@@ -74,8 +74,9 @@ public class ImportPackages {
         }
     }
 
-    public static Map<String, Import> calculateImports(Set<String> referencedPackages, Set<String> implementedPackages,
-            Map<String, ExportPackages.Export> exportedPackages) {
+    public static Map<String, Import> calculateImports(Set<String> referencedPackages,
+                                                       Set<String> implementedPackages,
+                                                       Map<String, ExportPackages.Export> exportedPackages) {
         Map<String, Import> ret = new HashMap<>();
         for (String undefinedPackage : Sets.difference(referencedPackages, implementedPackages)) {
             ExportPackages.Export export = exportedPackages.get(undefinedPackage);
diff --git a/bundle-plugin/src/test/java/com/yahoo/container/plugin/osgi/ImportPackageTest.java b/bundle-plugin/src/test/java/com/yahoo/container/plugin/osgi/ImportPackageTest.java
index 23960323a31..b76151c790e 100644
--- a/bundle-plugin/src/test/java/com/yahoo/container/plugin/osgi/ImportPackageTest.java
+++ b/bundle-plugin/src/test/java/com/yahoo/container/plugin/osgi/ImportPackageTest.java
@@ -109,8 +109,9 @@ public class ImportPackageTest {
                 is("com.yahoo.exported;version=\"[1.2.3,2)\""));
     }
 
-    private static Set<Import> calculateImports(Set<String> referencedPackages, Set<String> implementedPackages,
-            Map<String, Export> exportedPackages) {
+    private static Set<Import> calculateImports(Set<String> referencedPackages,
+                                                Set<String> implementedPackages,
+                                                Map<String, Export> exportedPackages) {
         return new HashSet<>(ImportPackages.calculateImports(referencedPackages, implementedPackages, exportedPackages).values());
     }