chore(*): Apply codestyles (#394)

Enable codestyle enforcement on all subprojects and commit the results of spotlessApply.
spinnaker · Jun 26, 2019 · df39500 · df39500
1 parent d6eeae9
commit df39500
Show file tree

Hide file tree

Showing 19 changed files with 135 additions and 135 deletions.
diff --git a/build.gradle b/build.gradle
@@ -53,10 +53,6 @@ subprojects {
       exceptionFormat = 'full'
     }
   }
-
-  spinnakerCodeStyle {
-    enabled = false
-  }
 }
 
 defaultTasks ':rosco-web:run'
diff --git a/...rc/main/groovy/com/netflix/spinnaker/rosco/config/RoscoPackerConfigurationProperties.java b/...rc/main/groovy/com/netflix/spinnaker/rosco/config/RoscoPackerConfigurationProperties.java
@@ -1,10 +1,9 @@
 package com.netflix.spinnaker.rosco.config;
 
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
 import java.util.ArrayList;
 import java.util.List;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties("packer")
 @Data

diff --git a/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/providers/oracle/OCIBakeHandler.java b/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/providers/oracle/OCIBakeHandler.java
@@ -21,15 +21,14 @@
 import com.netflix.spinnaker.rosco.providers.oracle.config.OracleOperatingSystemVirtualizationSettings;
 import com.netflix.spinnaker.rosco.providers.oracle.config.OracleVirtualizationSettings;
 import com.netflix.spinnaker.rosco.providers.util.ImageNameFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Scanner;
 import java.util.stream.Collectors;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 @Component
 public class OCIBakeHandler extends CloudProviderBakeHandler {
@@ -38,11 +37,9 @@ public class OCIBakeHandler extends CloudProviderBakeHandler {
 
   ImageNameFactory imageNameFactory = new ImageNameFactory();
 
-  @Autowired
-  OracleBakeryDefaults oracleBakeryDefaults;
+  @Autowired OracleBakeryDefaults oracleBakeryDefaults;
 
-  @Autowired
-  OracleConfigurationProperties oracleConfigurationProperties;
+  @Autowired OracleConfigurationProperties oracleConfigurationProperties;
 
   @Override
   public Object getBakeryDefaults() {
@@ -53,7 +50,8 @@ public Object getBakeryDefaults() {
   public BakeOptions getBakeOptions() {
     List<BakeOptions.BaseImage> baseImages;
     if (oracleBakeryDefaults.getBaseImages().size() > 0) {
-      baseImages = oracleBakeryDefaults.getBaseImages().stream()
+      baseImages =
+          oracleBakeryDefaults.getBaseImages().stream()
               .map(OracleOperatingSystemVirtualizationSettings::getBaseImage)
               .collect(Collectors.toList());
     } else {
@@ -78,42 +76,51 @@ public String produceProviderSpecificBakeKeyComponent(String region, BakeRequest
   @Override
   public Object findVirtualizationSettings(String region, BakeRequest bakeRequest) {
     if (oracleBakeryDefaults.getBaseImages().size() > 0) {
-      OracleOperatingSystemVirtualizationSettings settings = oracleBakeryDefaults.getBaseImages().stream()
-              .filter(baseImage -> bakeRequest.getBase_os().equals(baseImage.getBaseImage().getId()))
+      OracleOperatingSystemVirtualizationSettings settings =
+          oracleBakeryDefaults.getBaseImages().stream()
+              .filter(
+                  baseImage -> bakeRequest.getBase_os().equals(baseImage.getBaseImage().getId()))
               .findAny()
               .orElse(null);
       if (settings != null) {
         return settings.getVirtualizationSettings();
       }
     }
 
-    throw new IllegalArgumentException("No virtualization settings found for '$bakeRequest.base_os'.");
+    throw new IllegalArgumentException(
+        "No virtualization settings found for '$bakeRequest.base_os'.");
   }
 
   @Override
-  public Map buildParameterMap(String region, Object virtualizationSettings, String imageName, BakeRequest bakeRequest, String appVersionStr) {
-    OracleVirtualizationSettings oracleVirtualizationSettings = (OracleVirtualizationSettings) virtualizationSettings;
+  public Map buildParameterMap(
+      String region,
+      Object virtualizationSettings,
+      String imageName,
+      BakeRequest bakeRequest,
+      String appVersionStr) {
+    OracleVirtualizationSettings oracleVirtualizationSettings =
+        (OracleVirtualizationSettings) virtualizationSettings;
 
     ManagedOracleAccount managedAccount = resolveAccount(bakeRequest);
 
-    Map<String, String> parameterMap = new HashMap<String, String>() {
-      {
-        put("oracle_compartment_id", managedAccount.getCompartmentId());
-        put("oracle_tenancy_id", managedAccount.getTenancyId());
-        put("oracle_user_id", managedAccount.getUserId());
-        put("oracle_fingerprint", managedAccount.getFingerprint());
-        put("oracle_ssh_private_key_file_path", managedAccount.getSshPrivateKeyFilePath());
-        put("oracle_pass_phrase", managedAccount.getPrivateKeyPassphrase());
-        put("oracle_region", managedAccount.getRegion());
-        put("oracle_availability_domain", oracleBakeryDefaults.getAvailabilityDomain());
-        put("oracle_instance_shape", oracleBakeryDefaults.getInstanceShape());
-        put("oracle_subnet_id", oracleBakeryDefaults.getSubnetId());
-        put("oracle_base_image_id", oracleVirtualizationSettings.getBaseImageId());
-        put("oracle_ssh_user_name", oracleVirtualizationSettings.getSshUserName());
-        put("oracle_image_name", imageName);
-      }
-    };
-
+    Map<String, String> parameterMap =
+        new HashMap<String, String>() {
+          {
+            put("oracle_compartment_id", managedAccount.getCompartmentId());
+            put("oracle_tenancy_id", managedAccount.getTenancyId());
+            put("oracle_user_id", managedAccount.getUserId());
+            put("oracle_fingerprint", managedAccount.getFingerprint());
+            put("oracle_ssh_private_key_file_path", managedAccount.getSshPrivateKeyFilePath());
+            put("oracle_pass_phrase", managedAccount.getPrivateKeyPassphrase());
+            put("oracle_region", managedAccount.getRegion());
+            put("oracle_availability_domain", oracleBakeryDefaults.getAvailabilityDomain());
+            put("oracle_instance_shape", oracleBakeryDefaults.getInstanceShape());
+            put("oracle_subnet_id", oracleBakeryDefaults.getSubnetId());
+            put("oracle_base_image_id", oracleVirtualizationSettings.getBaseImageId());
+            put("oracle_ssh_user_name", oracleVirtualizationSettings.getSshUserName());
+            put("oracle_image_name", imageName);
+          }
+        };
 
     if (!StringUtils.isNullOrEmpty(bakeRequest.getBuild_info_url())) {
       parameterMap.put("build_info_url", bakeRequest.getBuild_info_url());
@@ -164,27 +171,28 @@ private ManagedOracleAccount resolveAccount(BakeRequest bakeRequest) {
     ManagedOracleAccount managedAccount = null;
 
     if (StringUtils.isNullOrEmpty(bakeRequest.getAccount_name())) {
-      if (oracleConfigurationProperties != null &&
-              oracleConfigurationProperties.getAccounts() != null &&
-              oracleConfigurationProperties.getAccounts().size() > 0) {
+      if (oracleConfigurationProperties != null
+          && oracleConfigurationProperties.getAccounts() != null
+          && oracleConfigurationProperties.getAccounts().size() > 0) {
         managedAccount = oracleConfigurationProperties.getAccounts().get(0);
       }
     } else {
-      if (oracleConfigurationProperties != null &&
-              oracleConfigurationProperties.getAccounts() != null &&
-              oracleConfigurationProperties.getAccounts().size() > 0) {
-        managedAccount = oracleConfigurationProperties.getAccounts().stream()
+      if (oracleConfigurationProperties != null
+          && oracleConfigurationProperties.getAccounts() != null
+          && oracleConfigurationProperties.getAccounts().size() > 0) {
+        managedAccount =
+            oracleConfigurationProperties.getAccounts().stream()
                 .filter(account -> bakeRequest.getAccount_name().equals(account.getName()))
                 .findAny()
                 .orElse(null);
       }
     }
 
     if (managedAccount == null) {
-      throw new IllegalArgumentException("Could not resolve Oracle account: (account_name=$bakeRequest.account_name).");
+      throw new IllegalArgumentException(
+          "Could not resolve Oracle account: (account_name=$bakeRequest.account_name).");
     }
 
     return managedAccount;
   }
-
 }
diff --git a/.../groovy/com/netflix/spinnaker/rosco/providers/oracle/config/RoscoOracleConfiguration.java b/.../groovy/com/netflix/spinnaker/rosco/providers/oracle/config/RoscoOracleConfiguration.java
@@ -12,26 +12,27 @@
 import com.netflix.spinnaker.rosco.api.BakeRequest;
 import com.netflix.spinnaker.rosco.providers.oracle.OCIBakeHandler;
 import com.netflix.spinnaker.rosco.providers.registry.CloudProviderBakeHandlerRegistry;
+import javax.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
-import javax.annotation.PostConstruct;
-
 @Configuration
 @ConditionalOnProperty("oracle.enabled")
 @ComponentScan("com.netflix.spinnaker.rosco.providers.oracle")
 public class RoscoOracleConfiguration {
 
-  final private CloudProviderBakeHandlerRegistry cloudProviderBakeHandlerRegistry;
+  private final CloudProviderBakeHandlerRegistry cloudProviderBakeHandlerRegistry;
 
-  final private OCIBakeHandler ociBakeHandler;
+  private final OCIBakeHandler ociBakeHandler;
 
   @Autowired
-  public RoscoOracleConfiguration(CloudProviderBakeHandlerRegistry cloudProviderBakeHandlerRegistry, OCIBakeHandler ociBakeHandler) {
+  public RoscoOracleConfiguration(
+      CloudProviderBakeHandlerRegistry cloudProviderBakeHandlerRegistry,
+      OCIBakeHandler ociBakeHandler) {
     this.cloudProviderBakeHandlerRegistry = cloudProviderBakeHandlerRegistry;
     this.ociBakeHandler = ociBakeHandler;
   }
@@ -52,5 +53,4 @@ public OracleBakeryDefaults oracleBakeryDefaults() {
   public OracleConfigurationProperties oracleConfigurationProperties() {
     return new OracleConfigurationProperties();
   }
-
 }
diff --git a/...core/src/main/groovy/com/netflix/spinnaker/rosco/providers/util/PackageNameConverter.java b/...core/src/main/groovy/com/netflix/spinnaker/rosco/providers/util/PackageNameConverter.java
@@ -44,7 +44,9 @@ public static class OsPackageName {
     public String qualifiedPackageName(PackageType packageType) {
       if (StringUtils.isNotEmpty(version)) {
         String releaseTag = StringUtils.isNotEmpty(release) ? "-" + release : "";
-        return name + packageType.getUtil().getPackageManagerVersionSeparator() + version
+        return name
+            + packageType.getUtil().getPackageManagerVersionSeparator()
+            + version
             + releaseTag;
       } else {
         return null;
@@ -56,16 +58,16 @@ public static OsPackageName buildOsPackageName(PackageType packageType, String p
     return packageType.getUtil().parsePackageName(packageName);
   }
 
-  public static List<OsPackageName> buildOsPackageNames(final PackageType packageType,
-      List<String> packageNames) {
+  public static List<OsPackageName> buildOsPackageNames(
+      final PackageType packageType, List<String> packageNames) {
     return packageNames.stream()
         .map(packageName -> buildOsPackageName(packageType, packageName))
         .filter(osPackage -> StringUtils.isNotEmpty(osPackage.getName()))
         .collect(Collectors.toList());
   }
 
-  public static String buildAppVersionStr(BakeRequest bakeRequest, OsPackageName osPackageName,
-      PackageType packageType) {
+  public static String buildAppVersionStr(
+      BakeRequest bakeRequest, OsPackageName osPackageName, PackageType packageType) {
     // As per source of AppVersion, these are valid appversion tags:
     //   subscriberha-1.0.0-h150
     //   subscriberha-1.0.0-h150.586499

diff --git a/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/providers/util/PackageUtil.java b/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/providers/util/PackageUtil.java
@@ -18,15 +18,15 @@
 import com.netflix.spinnaker.rosco.providers.util.PackageNameConverter.OsPackageName;
 
 public interface PackageUtil {
-    String getPackageType();
+  String getPackageType();
 
-    String getPackageManagerVersionSeparator();
+  String getPackageManagerVersionSeparator();
 
-    String getVersionSeparator();
+  String getVersionSeparator();
 
-    String getBuildNumberSeparator();
+  String getBuildNumberSeparator();
 
-    String getCommitHashSeparator();
+  String getCommitHashSeparator();
 
-    OsPackageName parsePackageName(String fullyQualifiedPackageName);
+  OsPackageName parsePackageName(String fullyQualifiedPackageName);
 }
diff --git a/...ore/src/main/groovy/com/netflix/spinnaker/rosco/providers/util/PackerArtifactService.java b/...ore/src/main/groovy/com/netflix/spinnaker/rosco/providers/util/PackerArtifactService.java
@@ -47,12 +47,10 @@ public Path writeArtifactsToFile(String bakeId, List<Artifact> artifacts) {
       artifacts = new ArrayList<>();
     }
 
-    try (
-        BufferedOutputStream artifactStream =
-            new BufferedOutputStream(
-              Files.newOutputStream(artifactFile, StandardOpenOption.CREATE, StandardOpenOption.WRITE)
-            )
-    ) {
+    try (BufferedOutputStream artifactStream =
+        new BufferedOutputStream(
+            Files.newOutputStream(
+                artifactFile, StandardOpenOption.CREATE, StandardOpenOption.WRITE))) {
       objectMapper.writeValue(artifactStream, artifacts);
     } catch (IOException e) {
       throw new IllegalStateException("Could not write artifacts to file: " + e.getMessage());

diff --git a/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/providers/util/PackerManifest.java b/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/providers/util/PackerManifest.java
@@ -31,9 +31,10 @@ public class PackerManifest {
 
   public PackerBuild getLastBuild() {
     return builds.stream()
-      .filter(build -> build.packerRunUuid.equals(lastRunUuid))
-      .findFirst()
-      .orElseThrow(() -> new IllegalStateException("Could not find most recent build in packer manifest"));
+        .filter(build -> build.packerRunUuid.equals(lastRunUuid))
+        .findFirst()
+        .orElseThrow(
+            () -> new IllegalStateException("Could not find most recent build in packer manifest"));
   }
 
   @Data

diff --git a/...ore/src/main/groovy/com/netflix/spinnaker/rosco/providers/util/PackerManifestService.java b/...ore/src/main/groovy/com/netflix/spinnaker/rosco/providers/util/PackerManifestService.java
@@ -44,12 +44,12 @@ public PackerBuild getBuild(String bakeId) {
 
   private PackerManifest getManifest(String bakeId) {
     PackerManifest manifestData;
-    try (
-      BufferedInputStream manifestInput =
+    try (BufferedInputStream manifestInput =
         new BufferedInputStream(
-          Files.newInputStream(getManifestPath(bakeId), StandardOpenOption.READ, StandardOpenOption.DELETE_ON_CLOSE)
-        )
-    ) {
+            Files.newInputStream(
+                getManifestPath(bakeId),
+                StandardOpenOption.READ,
+                StandardOpenOption.DELETE_ON_CLOSE))) {
       manifestData = objectMapper.readValue(manifestInput, PackerManifest.class);
     } catch (IOException e) {
       throw new IllegalStateException("Could not read packer manifest file: " + e.getMessage());

diff --git a/...ain/groovy/com/netflix/spinnaker/rosco/providers/util/packagespecific/DebPackageUtil.java b/...ain/groovy/com/netflix/spinnaker/rosco/providers/util/packagespecific/DebPackageUtil.java
@@ -77,10 +77,8 @@ public OsPackageName parsePackageName(String fullyQualifiedPackageName) {
       if (parts.size() > 2) {
         arch = parts.get(2);
       }
-
     }
 
     return OsPackageName.builder().name(name).version(version).release(release).arch(arch).build();
   }
-
 }
diff --git a/...ain/groovy/com/netflix/spinnaker/rosco/providers/util/packagespecific/RpmPackageUtil.java b/...ain/groovy/com/netflix/spinnaker/rosco/providers/util/packagespecific/RpmPackageUtil.java
@@ -78,5 +78,4 @@ public OsPackageName parsePackageName(String fullyQualifiedPackageName) {
 
     return OsPackageName.builder().name(name).version(version).release(release).arch(arch).build();
   }
-
 }
diff --git a/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/services/ClouddriverService.java b/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/services/ClouddriverService.java
@@ -4,7 +4,6 @@
 import retrofit.client.Response;
 import retrofit.http.Body;
 import retrofit.http.PUT;
-import retrofit.http.Query;
 
 public interface ClouddriverService {
   @PUT("/artifacts/fetch/")

diff --git a/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/services/ServiceConfig.java b/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/services/ServiceConfig.java
@@ -36,9 +36,10 @@ public class ServiceConfig {
   // This should be service-agnostic if more integrations than clouddriver are used
   @Bean
   ClouddriverService clouddriverService() {
-    ObjectMapper objectMapper = new ObjectMapper()
-        .enable(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL)
-        .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+    ObjectMapper objectMapper =
+        new ObjectMapper()
+            .enable(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL)
+            .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
 
     return new RestAdapter.Builder()
         .setEndpoint(clouddriverBaseUrl)

diff --git a/rosco-manifests/src/main/java/com/netflix/spinnaker/rosco/manifests/BakeManifestRequest.java b/rosco-manifests/src/main/java/com/netflix/spinnaker/rosco/manifests/BakeManifestRequest.java
@@ -2,11 +2,10 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.netflix.spinnaker.kork.artifacts.model.Artifact;
-import lombok.Data;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import lombok.Data;
 
 @Data
 public class BakeManifestRequest {
@@ -28,7 +27,10 @@ public TemplateRenderer fromString(String value) {
       return Arrays.stream(values())
           .filter(v -> value.equalsIgnoreCase(v.toString()))
           .findFirst()
-          .orElseThrow(() -> new IllegalArgumentException("The value '" + value + "' is not a supported renderer"));
+          .orElseThrow(
+              () ->
+                  new IllegalArgumentException(
+                      "The value '" + value + "' is not a supported renderer"));
     }
   }
 }