Excavator: Upgrades Baseline to the latest version

palantir · Sep 19, 2019 · fba6794 · fba6794
1 parent d56f302
commit fba6794
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 38 deletions.
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.netflix.nebula:gradle-info-plugin:5.1.0'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:13.6.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:2.8.1'
+        classpath 'com.palantir.baseline:gradle-baseline-java:2.9.1'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.12.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/tritium-core/src/main/java/com/palantir/tritium/event/InstrumentationFilters.java b/tritium-core/src/main/java/com/palantir/tritium/event/InstrumentationFilters.java
@@ -25,19 +25,19 @@ public enum InstrumentationFilters implements InstrumentationFilter {
     INSTRUMENT_ALL {
         @Override
         public boolean shouldInstrument(
-                @Nonnull Object unusedInstance,
-                @Nonnull Method unusedMethod,
-                @Nonnull Object[] unusedArgs) {
+                @Nonnull Object _instance,
+                @Nonnull Method _method,
+                @Nonnull Object[] _args) {
             return true;
         }
     },
 
     INSTRUMENT_NONE {
         @Override
         public boolean shouldInstrument(
-                @Nonnull Object unusedInstance,
-                @Nonnull Method unusedMethod,
-                @Nonnull Object[] unusedArgs) {
+                @Nonnull Object _instance,
+                @Nonnull Method _method,
+                @Nonnull Object[] _args) {
             return false;
         }
     };

diff --git a/tritium-core/src/main/java/com/palantir/tritium/event/NoOpInvocationEventHandler.java b/tritium-core/src/main/java/com/palantir/tritium/event/NoOpInvocationEventHandler.java
@@ -38,12 +38,12 @@ public InvocationContext preInvocation(@Nonnull Object instance, @Nonnull Method
     }
 
     @Override
-    public void onSuccess(@Nullable InvocationContext unusedContext, @Nullable Object unusedResult) {
+    public void onSuccess(@Nullable InvocationContext _context, @Nullable Object _result) {
         // no-op
     }
 
     @Override
-    public void onFailure(@Nullable InvocationContext unusedContext, @Nonnull Throwable unusedCause) {
+    public void onFailure(@Nullable InvocationContext _context, @Nonnull Throwable _cause) {
         // no-op
     }
 }
diff --git a/...um-core/src/test/java/com/palantir/tritium/event/CompositeInvocationEventHandlerTest.java b/...um-core/src/test/java/com/palantir/tritium/event/CompositeInvocationEventHandlerTest.java
@@ -221,10 +221,10 @@ public InvocationContext preInvocation(
         }
 
         @Override
-        public void onSuccess(@Nullable InvocationContext unusedContext, @Nullable Object unusedResult) {}
+        public void onSuccess(@Nullable InvocationContext _context, @Nullable Object _result) {}
 
         @Override
-        public void onFailure(@Nullable InvocationContext unusedContext, @Nonnull Throwable unusedCause) {}
+        public void onFailure(@Nullable InvocationContext _context, @Nonnull Throwable _cause) {}
     }
 
 }
diff --git a/tritium-jmh/src/jmh/java/com/palantir/tritium/microbenchmarks/ProxyBenchmark.java b/tritium-jmh/src/jmh/java/com/palantir/tritium/microbenchmarks/ProxyBenchmark.java
@@ -243,7 +243,7 @@ public String echo(String input) {
         }
     }
 
-    public static void main(String[] unusedArgs) throws Exception {
+    public static void main(String[] _args) throws Exception {
         Options options = new OptionsBuilder()
                 .include(ProxyBenchmark.class.getSimpleName())
                 .warmupTime(TimeValue.seconds(1))

diff --git a/tritium-lib/src/test/java/com/palantir/tritium/JitCompilationTest.java b/tritium-lib/src/test/java/com/palantir/tritium/JitCompilationTest.java
@@ -38,7 +38,7 @@ public final class JitCompilationTest {
         TestLogs.logTo("/dev/null");
     }
 
-    public static void main(String[] unusedArgs) {
+    public static void main(String[] _args) {
         JitCompilationTest test = new JitCompilationTest();
         test.jitAllSuccess();
         test.jitWithSomeExceptions();

diff --git a/tritium-lib/src/test/java/com/palantir/tritium/proxy/InvocationEventProxyTest.java b/tritium-lib/src/test/java/com/palantir/tritium/proxy/InvocationEventProxyTest.java
@@ -94,9 +94,9 @@ public void testInstrumentPreInvocationThrows() throws Throwable {
         InvocationEventHandler<InvocationContext> testHandler = new SimpleHandler() {
             @Override
             public InvocationContext preInvocation(
-                    @Nonnull Object unusedInstance,
-                    @Nonnull Method unusedMethod,
-                    @Nonnull Object[] unusedArgs) {
+                    @Nonnull Object _instance,
+                    @Nonnull Method _method,
+                    @Nonnull Object[] _args) {
                 throw new IllegalStateException("expected");
             }
         };
@@ -112,7 +112,7 @@ public InvocationContext preInvocation(
     public void testInstrumentOnSuccessThrows() throws Throwable {
         InvocationEventHandler<InvocationContext> testHandler = new SimpleHandler() {
             @Override
-            public void onSuccess(@Nullable InvocationContext unusedContext, @Nullable Object unusedResult) {
+            public void onSuccess(@Nullable InvocationContext _context, @Nullable Object _result) {
                 throw new IllegalStateException("expected");
             }
         };
@@ -132,12 +132,12 @@ public void onSuccess(@Nullable InvocationContext unusedContext, @Nullable Objec
     public void testInstrumentOnFailureThrows() throws Throwable {
         InvocationEventHandler<InvocationContext> testHandler = new SimpleHandler() {
             @Override
-            public void onSuccess(@Nullable InvocationContext unusedContext, @Nullable Object unusedResult) {
+            public void onSuccess(@Nullable InvocationContext _context, @Nullable Object _result) {
                 throw new IllegalStateException("expected");
             }
 
             @Override
-            public void onFailure(@Nullable InvocationContext unusedContext, @Nonnull Throwable unusedCause) {
+            public void onFailure(@Nullable InvocationContext _context, @Nonnull Throwable _cause) {
                 throw new IllegalStateException("expected");
             }
         };
@@ -331,10 +331,10 @@ public InvocationContext preInvocation(
         }
 
         @Override
-        public void onSuccess(@Nullable InvocationContext unusedContext, @Nullable Object unusedResult) {}
+        public void onSuccess(@Nullable InvocationContext _context, @Nullable Object _result) {}
 
         @Override
-        public void onFailure(@Nullable InvocationContext unusedContext, @Nonnull Throwable unusedCause) {}
+        public void onFailure(@Nullable InvocationContext _context, @Nonnull Throwable _cause) {}
     }
 
     private static class TestProxy extends InvocationEventProxy {

diff --git a/...trics/src/main/java/com/palantir/tritium/event/metrics/MetricsInvocationEventHandler.java b/...trics/src/main/java/com/palantir/tritium/event/metrics/MetricsInvocationEventHandler.java
@@ -103,7 +103,7 @@ public InvocationContext preInvocation(@Nonnull Object instance, @Nonnull Method
     }
 
     @Override
-    public void onSuccess(@Nullable InvocationContext context, @Nullable Object unusedResult) {
+    public void onSuccess(@Nullable InvocationContext context, @Nullable Object _result) {
         debugIfNullContext(context);
         if (context != null) {
             long nanos = updateTimer(context);

diff --git a/...n/java/com/palantir/tritium/event/metrics/TaggedMetricsServiceInvocationEventHandler.java b/...n/java/com/palantir/tritium/event/metrics/TaggedMetricsServiceInvocationEventHandler.java
@@ -87,7 +87,7 @@ public final InvocationContext preInvocation(
     }
 
     @Override
-    public final void onSuccess(@Nullable InvocationContext context, @Nullable Object unusedResult) {
+    public final void onSuccess(@Nullable InvocationContext context, @Nullable Object _result) {
         debugIfNullContext(context);
         if (context != null) {
             long nanos = System.nanoTime() - context.getStartTimeNanos();

diff --git a/...ium-slf4j/src/main/java/com/palantir/tritium/event/log/LoggingInvocationEventHandler.java b/...ium-slf4j/src/main/java/com/palantir/tritium/event/log/LoggingInvocationEventHandler.java
@@ -90,12 +90,12 @@ public final InvocationContext preInvocation(
     }
 
     @Override
-    public final void onSuccess(@Nullable InvocationContext context, @Nullable Object unusedResult) {
+    public final void onSuccess(@Nullable InvocationContext context, @Nullable Object _result) {
         logInvocation(context);
     }
 
     @Override
-    public final void onFailure(@Nullable InvocationContext context, @Nonnull Throwable unusedCause) {
+    public final void onFailure(@Nullable InvocationContext context, @Nonnull Throwable _cause) {
         logInvocation(context);
     }
 

diff --git a/tritium-test/src/main/java/com/palantir/tritium/test/TestImplementation.java b/tritium-test/src/main/java/com/palantir/tritium/test/TestImplementation.java
@@ -40,7 +40,7 @@ public String test() {
     }
 
     @Override
-    public void multiArgumentMethod(String unusedString, int unusedCount, Collection<String> unusedCollection) {
+    public void multiArgumentMethod(String _string, int _count, Collection<String> _collection) {
         test();
     }
 

diff --git a/...um-test/src/main/java/com/palantir/tritium/test/event/ThrowingInvocationEventHandler.java b/...um-test/src/main/java/com/palantir/tritium/test/event/ThrowingInvocationEventHandler.java
@@ -34,19 +34,19 @@ public ThrowingInvocationEventHandler(boolean isEnabled) {
 
     @Override
     public com.palantir.tritium.event.InvocationContext preInvocation(
-            @Nonnull Object unusedInstance,
-            @Nonnull Method unusedMethod,
-            @Nonnull Object[] unusedArgs) {
+            @Nonnull Object _instance,
+            @Nonnull Method _method,
+            @Nonnull Object[] _args) {
         throw new SafeIllegalStateException("preInvocation always throws");
     }
 
     @Override
-    public void onSuccess(@Nullable InvocationContext unusedContext, @Nullable Object unusedResult) {
+    public void onSuccess(@Nullable InvocationContext _context, @Nullable Object _result) {
         throw new SafeIllegalStateException("onSuccess always throws");
     }
 
     @Override
-    public void onFailure(@Nullable InvocationContext unusedContext, @Nonnull Throwable unusedCause) {
+    public void onFailure(@Nullable InvocationContext _context, @Nonnull Throwable _cause) {
         throw new SafeIllegalStateException("onFailure always throws");
     }
 

diff --git a/...in/java/com/palantir/tritium/tracing/RemotingCompatibleTracingInvocationEventHandler.java b/...in/java/com/palantir/tritium/tracing/RemotingCompatibleTracingInvocationEventHandler.java
@@ -64,15 +64,15 @@ private String getOperationName(Method method) {
     }
 
     @Override
-    public void onSuccess(@Nullable InvocationContext context, @Nullable Object unusedResult) {
+    public void onSuccess(@Nullable InvocationContext context, @Nullable Object _result) {
         debugIfNullContext(context);
         if (context != null) {
             tracer.completeSpan();
         }
     }
 
     @Override
-    public void onFailure(@Nullable InvocationContext context, @Nonnull Throwable unusedCause) {
+    public void onFailure(@Nullable InvocationContext context, @Nonnull Throwable _cause) {
         debugIfNullContext(context);
         if (context != null) {
             tracer.completeSpan();

diff --git a/...ium-tracing/src/main/java/com/palantir/tritium/tracing/TracingInvocationEventHandler.java b/...ium-tracing/src/main/java/com/palantir/tritium/tracing/TracingInvocationEventHandler.java
@@ -72,12 +72,12 @@ private String getOperationName(Method method) {
     }
 
     @Override
-    public void onSuccess(@Nullable InvocationContext context, @Nullable Object unusedResult) {
+    public void onSuccess(@Nullable InvocationContext context, @Nullable Object _result) {
         complete(context);
     }
 
     @Override
-    public void onFailure(@Nullable InvocationContext context, @Nonnull Throwable unusedCause) {
+    public void onFailure(@Nullable InvocationContext context, @Nonnull Throwable _cause) {
         complete(context);
     }
 

diff --git a/tritium-tracing/src/test/java/com/palantir/tritium/tracing/ReflectiveTracerTest.java b/tritium-tracing/src/test/java/com/palantir/tritium/tracing/ReflectiveTracerTest.java
@@ -66,13 +66,13 @@ public void createInvalid() throws Exception {
     public static final class MockTracer {
         private MockTracer() {}
 
-        public static void start(String unused) {}
+        public static void start(String _value) {}
 
         public static void stop() {}
 
-        public static void badStart(Integer unused) {}
+        public static void badStart(Integer _value) {}
 
-        public static void badStop(String unused) {}
+        public static void badStop(String _value) {}
     }
 
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,7 @@ public String test() { @@
         }
         @Override
-        public void multiArgumentMethod(String unusedString, int unusedCount, Collection<String> unusedCollection) {
+        public void multiArgumentMethod(String _string, int _count, Collection<String> _collection) {
             test();
         }
@@ Expand Down @@