Excavator: Upgrades Baseline to the latest version (#12)

palantir · Nov 22, 2019 · 22d43a4 · 22d43a4
1 parent f7bfd20
commit 22d43a4
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 14 deletions.
diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
@@ -468,7 +468,6 @@
             <property name="format" value="^_?[a-z][a-zA-Z0-9]+$"/>
             <message key="name.invalidPattern" value="Parameter name ''{0}'' must match pattern ''{1}''."/>
         </module>
-        <module name="SingleLineJavadoc"/> <!-- Java Style Guide: General form -->
         <module name="SummaryJavadocCheck"> <!-- Java Coding Guidelines: Javadoc -->
             <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
         </module>

diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:14.1.1'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.12.4'
-        classpath 'com.palantir.baseline:gradle-baseline-java:2.31.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:2.35.2'
         classpath 'com.palantir.gradle.conjure:gradle-conjure:4.13.4'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.1.0'

diff --git a/...etric-schema/src/main/java/com/palantir/metric/schema/gradle/CompileMetricSchemaTask.java b/...etric-schema/src/main/java/com/palantir/metric/schema/gradle/CompileMetricSchemaTask.java
@@ -33,8 +33,8 @@
 import org.gradle.api.tasks.TaskAction;
 
 public class CompileMetricSchemaTask extends SourceTask {
-    private static final ObjectReader reader =
-            ObjectMappers.withDefaultModules(new ObjectMapper(new YAMLFactory())).readerFor(MetricSchema.class);
+    private static final ObjectReader reader = ObjectMappers.withDefaultModules(new ObjectMapper(new YAMLFactory()))
+            .readerFor(MetricSchema.class);
     private static final ObjectWriter writer = ObjectMappers.newServerObjectMapper().writer();
 
     private final RegularFileProperty outputFile = getProject().getObjects().fileProperty();

diff --git a/...ric-schema/src/main/java/com/palantir/metric/schema/gradle/CreateMetricsManifestTask.java b/...ric-schema/src/main/java/com/palantir/metric/schema/gradle/CreateMetricsManifestTask.java
@@ -139,13 +139,14 @@ private Stream<MetricSchema> discoverMetricSchema() {
                     CompileMetricSchemaTask compileMetricSchemaTask = (CompileMetricSchemaTask)
                             dependencyProject.getTasks().getByName(MetricSchemaPlugin.COMPILE_METRIC_SCHEMA);
 
-                    metricSchemaStream =
-                            Files.asByteSource(compileMetricSchemaTask.getOutputFile().get().getAsFile()).openStream();
+                    metricSchemaStream = Files.asByteSource(compileMetricSchemaTask.getOutputFile().get().getAsFile())
+                            .openStream();
                 } else {
                     if (!artifact.getFile().exists()) {
                         log.debug("Artifact did not exist: {}", artifact.getFile());
                         return Stream.empty();
-                    } else if (!Files.getFileExtension(artifact.getFile().getName()).equals("jar")) {
+                    } else if (!Files.getFileExtension(artifact.getFile().getName())
+                            .equals("jar")) {
                         log.debug("Artifact is not jar: {}", artifact.getFile());
                         return Stream.empty();
                     }

diff --git a/gradle-metric-schema/src/main/java/com/palantir/metric/schema/gradle/MetricSchemaPlugin.java b/gradle-metric-schema/src/main/java/com/palantir/metric/schema/gradle/MetricSchemaPlugin.java
@@ -118,8 +118,9 @@ private static TaskProvider<CompileMetricSchemaTask> createCompileSchemaTask(
                 .named("processResources", processResources -> processResources.dependsOn(compileMetricSchema));
 
         javaPlugin.getSourceSets().getByName("main").resources(resources -> {
-            SourceDirectorySet sourceDir =
-                    project.getObjects().sourceDirectorySet("metricSchema", "metric schema").srcDir(metricSchemaDir);
+            SourceDirectorySet sourceDir = project.getObjects()
+                    .sourceDirectorySet("metricSchema", "metric schema")
+                    .srcDir(metricSchemaDir);
             sourceDir.include("metric-schema/**");
             resources.source(sourceDir);
         });

diff --git a/metric-schema-java/src/main/java/com/palantir/metric/schema/UtilityGenerator.java b/metric-schema-java/src/main/java/com/palantir/metric/schema/UtilityGenerator.java
@@ -206,8 +206,8 @@ private static void generateMetricFactoryBuilder(
                         .collect(ImmutableList.toImmutableList()))
                 .addSuperinterface(ClassName.bestGuess(buildStage(metricName)))
                 .addFields(tagList.stream()
-                        .map(tag ->
-                                FieldSpec.builder(String.class, Custodian.sanitizeName(tag), Modifier.PRIVATE).build())
+                        .map(tag -> FieldSpec.builder(String.class, Custodian.sanitizeName(tag), Modifier.PRIVATE)
+                                .build())
                         .collect(ImmutableList.toImmutableList()))
                 .addMethod(buildMethodBuilder.build())
                 .addMethods(tagList.stream()

diff --git a/metric-schema-java/src/test/java/com/palantir/metric/schema/ValidatorTest.java b/metric-schema-java/src/test/java/com/palantir/metric/schema/ValidatorTest.java
@@ -92,9 +92,11 @@ void testEmptyTag() {
         assertThatThrownBy(() -> Validator.validate(MetricSchema.builder()
                         .namespaces("test", MetricNamespace.builder()
                                 .docs(DOCS)
-                                .metrics(
-                                        "name",
-                                        MetricDefinition.builder().docs(DOCS).type(MetricType.COUNTER).tags("").build())
+                                .metrics("name", MetricDefinition.builder()
+                                        .docs(DOCS)
+                                        .type(MetricType.COUNTER)
+                                        .tags("")
+                                        .build())
                                 .build())
                         .build()))
                 .isInstanceOf(SafeIllegalArgumentException.class)