chore(*): remove reliance on servo library (spinnaker#2906)

sicp618 · May 9, 2019 · f7842b2 · f7842b2
1 parent 1420750
commit f7842b2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/orca-front50/orca-front50.gradle b/orca-front50/orca-front50.gradle
@@ -20,7 +20,6 @@ dependencies {
   implementation(project(":orca-core"))
   implementation(project(":orca-retrofit"))
   implementation(project(":orca-extensionpoint"))
-  implementation("com.netflix.servo:servo-core:0.12.21")
   implementation("com.netflix.spinnaker.fiat:fiat-api:$fiatVersion")
   implementation("com.netflix.spinnaker.fiat:fiat-core:$fiatVersion")
   implementation("org.springframework.security:spring-security-config")

diff --git a/...roovy/com/netflix/spinnaker/orca/front50/pipeline/PipelineExpressionFunctionProvider.java b/...roovy/com/netflix/spinnaker/orca/front50/pipeline/PipelineExpressionFunctionProvider.java
@@ -16,7 +16,7 @@
 
 package com.netflix.spinnaker.orca.front50.pipeline;
 
-import com.netflix.servo.util.Strings;
+import com.google.common.base.Strings;
 import com.netflix.spinnaker.kork.core.RetrySupport;
 import com.netflix.spinnaker.orca.front50.Front50Service;
 import com.netflix.spinnaker.orca.pipeline.expressions.ExpressionFunctionProvider;

diff --git a/orca-pipelinetemplate/orca-pipelinetemplate.gradle b/orca-pipelinetemplate/orca-pipelinetemplate.gradle
@@ -25,7 +25,6 @@ dependencies {
   implementation("com.netflix.spinnaker.kork:kork-exceptions")
   implementation("com.squareup.okhttp3:okhttp")
   implementation("javax.validation:validation-api")
-  implementation("com.netflix.servo:servo-core:0.12.21")
 
   compileOnly("org.projectlombok:lombok")
   annotationProcessor("org.projectlombok:lombok")

diff --git a/...main/java/com/netflix/spinnaker/orca/pipelinetemplate/tasks/SavePipelineTemplateTask.java b/...main/java/com/netflix/spinnaker/orca/pipelinetemplate/tasks/SavePipelineTemplateTask.java
@@ -15,10 +15,11 @@
  */
 package com.netflix.spinnaker.orca.pipelinetemplate.tasks;
 
-import com.netflix.servo.util.Strings;
 import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.model.PipelineTemplate;
 
 import com.netflix.spinnaker.orca.pipelinetemplate.v1schema.model.PipelineTemplate.Variable;
+import org.apache.logging.log4j.util.Strings;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -42,7 +43,7 @@ default void validate(PipelineTemplate template) {
     }
 
     if (!missingFields.isEmpty()) {
-      throw new IllegalArgumentException("Missing required fields: " + Strings.join(",", missingFields.iterator()));
+      throw new IllegalArgumentException("Missing required fields: " + String.join(",", missingFields));
     }
 
     if (template.getVariables() != null) {
@@ -54,7 +55,7 @@ default void validate(PipelineTemplate template) {
 
       if (!invalidVariableNames.isEmpty()) {
         throw new IllegalArgumentException("Variable names cannot include dashes (-)."
-          + " Invalid variable names: " + Strings.join(", ", invalidVariableNames.iterator()));
+          + " Invalid variable names: " + String.join(", ", invalidVariableNames));
       }
     }
   }

diff --git a/...java/com/netflix/spinnaker/orca/pipelinetemplate/tasks/v2/SaveV2PipelineTemplateTask.java b/...java/com/netflix/spinnaker/orca/pipelinetemplate/tasks/v2/SaveV2PipelineTemplateTask.java
@@ -16,7 +16,7 @@
 
 package com.netflix.spinnaker.orca.pipelinetemplate.tasks.v2;
 
-import com.netflix.servo.util.Strings;
+import com.google.common.base.Strings;
 import com.netflix.spinnaker.orca.pipelinetemplate.v2schema.model.V2PipelineTemplate;
 
 import java.util.ArrayList;
@@ -49,7 +49,7 @@ default void validate(V2PipelineTemplate template) {
     }
 
     if (!missingFields.isEmpty()) {
-      throw new IllegalArgumentException("Missing required fields: " + Strings.join(",", missingFields.iterator()));
+      throw new IllegalArgumentException("Missing required fields: " + String.join(",", missingFields));
     }
 
     if (!template.getSchema().equals(V2PipelineTemplate.V2_SCHEMA_VERSION)) {
@@ -72,7 +72,7 @@ default void validate(V2PipelineTemplate template) {
       if (!invalidVariableNames.isEmpty()) {
         throw new IllegalArgumentException(
           String.format("Illegal variable names: %s. Variable names must match the regex: %s",
-                        Strings.join(", ", invalidVariableNames.iterator()),
+                        String.join(", ", invalidVariableNames),
                         TEMPLATE_VALID_VARIABLE_NAME_REGEX));
       }
     }