diff --git a/drift-api/src/main/java/io/airlift/drift/annotations/ThriftConstructor.java b/drift-api/src/main/java/io/airlift/drift/annotations/ThriftConstructor.java index db2a1bef8..5e5ef234e 100644 --- a/drift-api/src/main/java/io/airlift/drift/annotations/ThriftConstructor.java +++ b/drift-api/src/main/java/io/airlift/drift/annotations/ThriftConstructor.java @@ -30,6 +30,4 @@ @Documented @Retention(RUNTIME) @Target({METHOD, CONSTRUCTOR}) -public @interface ThriftConstructor -{ -} +public @interface ThriftConstructor {} diff --git a/drift-api/src/main/java/io/airlift/drift/annotations/ThriftEnumUnknownValue.java b/drift-api/src/main/java/io/airlift/drift/annotations/ThriftEnumUnknownValue.java index b6e6c29fe..bada0fa79 100644 --- a/drift-api/src/main/java/io/airlift/drift/annotations/ThriftEnumUnknownValue.java +++ b/drift-api/src/main/java/io/airlift/drift/annotations/ThriftEnumUnknownValue.java @@ -29,6 +29,4 @@ @Documented @Retention(RUNTIME) @Target(FIELD) -public @interface ThriftEnumUnknownValue -{ -} +public @interface ThriftEnumUnknownValue {} diff --git a/drift-api/src/main/java/io/airlift/drift/annotations/ThriftEnumValue.java b/drift-api/src/main/java/io/airlift/drift/annotations/ThriftEnumValue.java index 8f0e7fd4a..e897e2f97 100644 --- a/drift-api/src/main/java/io/airlift/drift/annotations/ThriftEnumValue.java +++ b/drift-api/src/main/java/io/airlift/drift/annotations/ThriftEnumValue.java @@ -30,6 +30,4 @@ @Documented @Retention(RUNTIME) @Target(METHOD) -public @interface ThriftEnumValue -{ -} +public @interface ThriftEnumValue {} diff --git a/drift-api/src/main/java/io/airlift/drift/annotations/ThriftField.java b/drift-api/src/main/java/io/airlift/drift/annotations/ThriftField.java index 49d687af8..61267523a 100644 --- a/drift-api/src/main/java/io/airlift/drift/annotations/ThriftField.java +++ b/drift-api/src/main/java/io/airlift/drift/annotations/ThriftField.java @@ -95,6 +95,6 @@ enum Requiredness * when this happens). As such, primitive types should be replaced with boxed types, so that * null is always a possibility. */ - OPTIONAL + OPTIONAL, } } diff --git a/drift-api/src/main/java/io/airlift/drift/annotations/ThriftUnionId.java b/drift-api/src/main/java/io/airlift/drift/annotations/ThriftUnionId.java index 13cf58cef..e9336891d 100644 --- a/drift-api/src/main/java/io/airlift/drift/annotations/ThriftUnionId.java +++ b/drift-api/src/main/java/io/airlift/drift/annotations/ThriftUnionId.java @@ -29,6 +29,4 @@ @Documented @Retention(RUNTIME) @Target({METHOD, FIELD}) -public @interface ThriftUnionId -{ -} +public @interface ThriftUnionId {} diff --git a/drift-client/src/main/java/io/airlift/drift/client/DriftClientFactory.java b/drift-client/src/main/java/io/airlift/drift/client/DriftClientFactory.java index 243ef80dc..b50d8968a 100644 --- a/drift-client/src/main/java/io/airlift/drift/client/DriftClientFactory.java +++ b/drift-client/src/main/java/io/airlift/drift/client/DriftClientFactory.java @@ -75,8 +75,7 @@ public DriftClientFactory( AddressSelector addressSelector, ExceptionClassifier exceptionClassifier) { - this( - codecManager, + this(codecManager, () -> invokerFactory.createMethodInvoker(null), addressSelector, exceptionClassifier, diff --git a/drift-client/src/main/java/io/airlift/drift/client/DriftClientFactoryManager.java b/drift-client/src/main/java/io/airlift/drift/client/DriftClientFactoryManager.java index 12487acd4..a6183eaee 100644 --- a/drift-client/src/main/java/io/airlift/drift/client/DriftClientFactoryManager.java +++ b/drift-client/src/main/java/io/airlift/drift/client/DriftClientFactoryManager.java @@ -34,7 +34,8 @@ public DriftClientFactoryManager(ThriftCodecManager codecManager, MethodInvokerF this(codecManager, methodInvokerFactory, new NullMethodInvocationStatsFactory()); } - public DriftClientFactoryManager(ThriftCodecManager codecManager, + public DriftClientFactoryManager( + ThriftCodecManager codecManager, MethodInvokerFactory methodInvokerFactory, MethodInvocationStatsFactory methodInvocationStatsFactory) { diff --git a/drift-client/src/main/java/io/airlift/drift/client/DriftInvocationHandler.java b/drift-client/src/main/java/io/airlift/drift/client/DriftInvocationHandler.java index 2a89efead..3daff7320 100644 --- a/drift-client/src/main/java/io/airlift/drift/client/DriftInvocationHandler.java +++ b/drift-client/src/main/java/io/airlift/drift/client/DriftInvocationHandler.java @@ -149,7 +149,9 @@ public Object invoke(Object proxy, Method method, Object[] args) private static ListenableFuture unwrapUserException(ListenableFuture future) { SettableFuture result = SettableFuture.create(); - Futures.addCallback(future, new FutureCallback() + Futures.addCallback( + future, + new FutureCallback() { @Override public void onSuccess(Object value) diff --git a/drift-client/src/main/java/io/airlift/drift/client/DriftMethodInvocation.java b/drift-client/src/main/java/io/airlift/drift/client/DriftMethodInvocation.java index e896bce21..e7451a924 100644 --- a/drift-client/src/main/java/io/airlift/drift/client/DriftMethodInvocation.java +++ b/drift-client/src/main/java/io/airlift/drift/client/DriftMethodInvocation.java @@ -188,7 +188,9 @@ private synchronized void invoke(A address) stat.recordResult(invocationStartTime, result); currentTask = result; - Futures.addCallback(result, new FutureCallback() + Futures.addCallback( + result, + new FutureCallback() { @Override public void onSuccess(Object result) @@ -267,7 +269,8 @@ else if (exceptionClassification.getHostStatus() == DOWN || exceptionClassificat // backoff before next invocation Duration backoffDelay = retryPolicy.getBackoffDelay(invocationAttempts); - log.debug("Failed invocation of %s with attempt %s, will retry in %s (overloadedRejects: %s). Exception: %s", + log.debug( + "Failed invocation of %s with attempt %s, will retry in %s (overloadedRejects: %s). Exception: %s", metadata.getName(), invocationAttempts, backoffDelay, @@ -286,7 +289,9 @@ private synchronized void schedule(Duration timeout, Runnable task) try { ListenableFuture delay = invoker.delay(timeout); currentTask = delay; - Futures.addCallback(delay, new FutureCallback() + Futures.addCallback( + delay, + new FutureCallback() { @Override public void onSuccess(Object result) diff --git a/drift-client/src/main/java/io/airlift/drift/client/ExceptionClassifier.java b/drift-client/src/main/java/io/airlift/drift/client/ExceptionClassifier.java index 053da4c81..8219174fb 100644 --- a/drift-client/src/main/java/io/airlift/drift/client/ExceptionClassifier.java +++ b/drift-client/src/main/java/io/airlift/drift/client/ExceptionClassifier.java @@ -25,7 +25,7 @@ public interface ExceptionClassifier { - ExceptionClassifier NORMAL_RESULT = throwable -> NORMAL_EXCEPTION; + ExceptionClassifier NORMAL_RESULT = _ -> NORMAL_EXCEPTION; static ExceptionClassifier mergeExceptionClassifiers(Iterable classifiers) { diff --git a/drift-client/src/main/java/io/airlift/drift/client/RetryPolicy.java b/drift-client/src/main/java/io/airlift/drift/client/RetryPolicy.java index c69f298f6..cf94a066b 100644 --- a/drift-client/src/main/java/io/airlift/drift/client/RetryPolicy.java +++ b/drift-client/src/main/java/io/airlift/drift/client/RetryPolicy.java @@ -57,8 +57,7 @@ public class RetryPolicy public RetryPolicy(DriftClientConfig config, ExceptionClassifier exceptionClassifier) { - this( - config.getMaxRetries(), + this(config.getMaxRetries(), config.getMinBackoffDelay(), config.getMaxBackoffDelay(), config.getBackoffScaleFactor(), @@ -66,7 +65,8 @@ public RetryPolicy(DriftClientConfig config, ExceptionClassifier exceptionClassi exceptionClassifier); } - public RetryPolicy(int maxRetries, + public RetryPolicy( + int maxRetries, Duration minBackoffDelay, Duration maxBackoffDelay, double backoffScaleFactor, diff --git a/drift-client/src/main/java/io/airlift/drift/client/guice/DefaultClient.java b/drift-client/src/main/java/io/airlift/drift/client/guice/DefaultClient.java index 55a46f306..b62dc0d93 100644 --- a/drift-client/src/main/java/io/airlift/drift/client/guice/DefaultClient.java +++ b/drift-client/src/main/java/io/airlift/drift/client/guice/DefaultClient.java @@ -28,6 +28,4 @@ @Target({FIELD, PARAMETER, METHOD}) @Retention(RUNTIME) @BindingAnnotation -public @interface DefaultClient -{ -} +public @interface DefaultClient {} diff --git a/drift-client/src/main/java/io/airlift/drift/client/guice/MethodInvocationFilterBinder.java b/drift-client/src/main/java/io/airlift/drift/client/guice/MethodInvocationFilterBinder.java index 69cd9cf11..d47af64eb 100644 --- a/drift-client/src/main/java/io/airlift/drift/client/guice/MethodInvocationFilterBinder.java +++ b/drift-client/src/main/java/io/airlift/drift/client/guice/MethodInvocationFilterBinder.java @@ -33,7 +33,7 @@ static MethodInvocationFilterBinder staticFilterBinder(MethodInvocationFilter... static MethodInvocationFilterBinder staticFilterBinder(List filters) { - return (filterMultibinder, binder, annotation, prefix) -> { + return (filterMultibinder, _, _, _) -> { for (MethodInvocationFilter filter : filters) { filterMultibinder.addBinding().toInstance(filter); } diff --git a/drift-client/src/main/java/io/airlift/drift/client/stats/JmxMethodInvocationStatsFactory.java b/drift-client/src/main/java/io/airlift/drift/client/stats/JmxMethodInvocationStatsFactory.java index 9d17a2122..c892cbe39 100644 --- a/drift-client/src/main/java/io/airlift/drift/client/stats/JmxMethodInvocationStatsFactory.java +++ b/drift-client/src/main/java/io/airlift/drift/client/stats/JmxMethodInvocationStatsFactory.java @@ -49,7 +49,7 @@ public synchronized MethodInvocationStat getStat(ThriftServiceMetadata serviceMe objectNameBuilder.withProperty("method", metadata.getName()); String objectName = objectNameBuilder.build(); - return stats.computeIfAbsent(objectName, name -> { + return stats.computeIfAbsent(objectName, _ -> { JmxMethodInvocationStat stat = new JmxMethodInvocationStat(metadata.getName()); exporter.export(objectName, stat); return stat; diff --git a/drift-client/src/test/java/io/airlift/drift/client/MockMethodInvoker.java b/drift-client/src/test/java/io/airlift/drift/client/MockMethodInvoker.java index 295fbcfcd..834885ab1 100644 --- a/drift-client/src/test/java/io/airlift/drift/client/MockMethodInvoker.java +++ b/drift-client/src/test/java/io/airlift/drift/client/MockMethodInvoker.java @@ -56,7 +56,7 @@ public MockMethodInvoker(Function> resul public MockMethodInvoker(Supplier> resultsSupplier, TestingTicker ticker) { - this(request -> resultsSupplier.get(), ticker); + this(_ -> resultsSupplier.get(), ticker); } private MockMethodInvoker(Function> resultsSupplier, TestingTicker ticker) diff --git a/drift-client/src/test/java/io/airlift/drift/client/TestDriftClient.java b/drift-client/src/test/java/io/airlift/drift/client/TestDriftClient.java index 857cf784e..b8524d317 100644 --- a/drift-client/src/test/java/io/airlift/drift/client/TestDriftClient.java +++ b/drift-client/src/test/java/io/airlift/drift/client/TestDriftClient.java @@ -167,7 +167,8 @@ public void testGuiceClient() DriftClient driftClient = injector.getInstance(DEFAULT_CLIENT_KEY); assertSame(injector.getInstance(DEFAULT_CLIENT_KEY), driftClient); Client client = driftClient.get(ADDRESS_SELECTION_CONTEXT, HEADERS); - testClient(resultsSupplier, + testClient( + resultsSupplier, ImmutableList.of(invokerFactory.getMethodInvoker()), ImmutableList.of(globalClassifierOne, globalClassifierTwo, clientClassifier), statsFactory, @@ -178,7 +179,8 @@ public void testGuiceClient() assertSame(injector.getInstance(CUSTOM_CLIENT_KEY), customDriftClient); assertNotSame(driftClient, customDriftClient); Client customClient = customDriftClient.get(ADDRESS_SELECTION_CONTEXT, HEADERS); - testClient(resultsSupplier, + testClient( + resultsSupplier, ImmutableList.of(invokerFactory.getMethodInvoker()), ImmutableList.of(globalClassifierOne, globalClassifierTwo, customClientClassifier), statsFactory, @@ -243,7 +245,8 @@ public void testGuiceClientFilter() DriftClient driftClient = injector.getInstance(DEFAULT_CLIENT_KEY); assertSame(injector.getInstance(DEFAULT_CLIENT_KEY), driftClient); Client client = driftClient.get(ADDRESS_SELECTION_CONTEXT, HEADERS); - testClient(resultsSupplier, + testClient( + resultsSupplier, ImmutableList.of(passThroughFilter, shortCircuitFilter), ImmutableList.of(globalClassifierOne, globalClassifierTwo, clientClassifier), statsFactory, @@ -254,7 +257,8 @@ public void testGuiceClientFilter() assertSame(injector.getInstance(CUSTOM_CLIENT_KEY), customDriftClient); assertNotSame(driftClient, customDriftClient); Client customClient = customDriftClient.get(ADDRESS_SELECTION_CONTEXT, HEADERS); - testClient(resultsSupplier, + testClient( + resultsSupplier, ImmutableList.of(passThroughFilter, shortCircuitFilter), ImmutableList.of(globalClassifierOne, globalClassifierTwo, customClientClassifier), statsFactory, @@ -506,14 +510,10 @@ String testHeader(@ThriftHeader("headerA") String firstHeader, int id, @ThriftHe @ThriftStruct public static class ClientException - extends Exception - { - } + extends Exception {} private static class UnknownException - extends Exception - { - } + extends Exception {} private static class TestingExceptionClassifier implements ExceptionClassifier diff --git a/drift-client/src/test/java/io/airlift/drift/client/TestDriftMethodInvocation.java b/drift-client/src/test/java/io/airlift/drift/client/TestDriftMethodInvocation.java index e7f4a12c6..5db143a8e 100644 --- a/drift-client/src/test/java/io/airlift/drift/client/TestDriftMethodInvocation.java +++ b/drift-client/src/test/java/io/airlift/drift/client/TestDriftMethodInvocation.java @@ -402,7 +402,7 @@ private static void testConnectionFailedDelay(boolean overloaded, int numberOfAd } } - MockMethodInvoker invoker = new MockMethodInvoker(request -> immediateFailedFuture(createClassifiedException(true, overloaded ? OVERLOADED : DOWN))); + MockMethodInvoker invoker = new MockMethodInvoker(_ -> immediateFailedFuture(createClassifiedException(true, overloaded ? OVERLOADED : DOWN))); DriftMethodInvocation methodInvocation = createDriftMethodInvocation( new RetryPolicy(new DriftClientConfig(), new TestingExceptionClassifier()), new TestingMethodInvocationStat(), diff --git a/drift-client/src/test/java/io/airlift/drift/client/TestRetryPolicy.java b/drift-client/src/test/java/io/airlift/drift/client/TestRetryPolicy.java index c6a8380da..6190623b6 100644 --- a/drift-client/src/test/java/io/airlift/drift/client/TestRetryPolicy.java +++ b/drift-client/src/test/java/io/airlift/drift/client/TestRetryPolicy.java @@ -66,11 +66,10 @@ public void testProvidedResult() private static Optional classify(Optional classifierResult, Optional providedResult) { - return new RetryPolicy(new DriftClientConfig(), classifier -> new ExceptionClassification(classifierResult, NORMAL)) + return new RetryPolicy(new DriftClientConfig(), _ -> new ExceptionClassification(classifierResult, NORMAL)) .classifyException(new DriftApplicationException(new TestingUserException(), providedResult), true).isRetry(); } private static class TestingUserException - extends Exception - {} + extends Exception {} } diff --git a/drift-client/src/test/java/io/airlift/drift/client/TestingMethodInvocationStatsFactory.java b/drift-client/src/test/java/io/airlift/drift/client/TestingMethodInvocationStatsFactory.java index 540dcb34a..4c4909873 100644 --- a/drift-client/src/test/java/io/airlift/drift/client/TestingMethodInvocationStatsFactory.java +++ b/drift-client/src/test/java/io/airlift/drift/client/TestingMethodInvocationStatsFactory.java @@ -39,7 +39,7 @@ public TestingMethodInvocationStat getStat(String serviceName, Optional @Override public TestingMethodInvocationStat getStat(ThriftServiceMetadata serviceMetadata, Optional qualifier, MethodMetadata metadata) { - return stats.computeIfAbsent(new Key(serviceMetadata.getName(), qualifier, metadata.getName()), key -> new TestingMethodInvocationStat()); + return stats.computeIfAbsent(new Key(serviceMetadata.getName(), qualifier, metadata.getName()), _ -> new TestingMethodInvocationStat()); } private static class Key diff --git a/drift-codec/src/main/java/io/airlift/drift/codec/InternalThriftCodec.java b/drift-codec/src/main/java/io/airlift/drift/codec/InternalThriftCodec.java index 9149782ae..942dae81d 100644 --- a/drift-codec/src/main/java/io/airlift/drift/codec/InternalThriftCodec.java +++ b/drift-codec/src/main/java/io/airlift/drift/codec/InternalThriftCodec.java @@ -29,6 +29,4 @@ @Target({METHOD, CONSTRUCTOR, FIELD, PARAMETER}) @Retention(RUNTIME) @BindingAnnotation -public @interface InternalThriftCodec -{ -} +public @interface InternalThriftCodec {} diff --git a/drift-codec/src/main/java/io/airlift/drift/codec/internal/ForCompiler.java b/drift-codec/src/main/java/io/airlift/drift/codec/internal/ForCompiler.java index 2e66fea96..4ad43f5b2 100644 --- a/drift-codec/src/main/java/io/airlift/drift/codec/internal/ForCompiler.java +++ b/drift-codec/src/main/java/io/airlift/drift/codec/internal/ForCompiler.java @@ -29,6 +29,4 @@ @Target({METHOD, CONSTRUCTOR, FIELD, PARAMETER}) @Retention(RUNTIME) @BindingAnnotation -public @interface ForCompiler -{ -} +public @interface ForCompiler {} diff --git a/drift-codec/src/main/java/io/airlift/drift/codec/internal/coercion/DefaultJavaCoercions.java b/drift-codec/src/main/java/io/airlift/drift/codec/internal/coercion/DefaultJavaCoercions.java index a6a9d6923..822f86788 100644 --- a/drift-codec/src/main/java/io/airlift/drift/codec/internal/coercion/DefaultJavaCoercions.java +++ b/drift-codec/src/main/java/io/airlift/drift/codec/internal/coercion/DefaultJavaCoercions.java @@ -22,9 +22,7 @@ @Immutable public final class DefaultJavaCoercions { - private DefaultJavaCoercions() - { - } + private DefaultJavaCoercions() {} @FromThrift public static Boolean booleanToBoxedBoolean(boolean value) diff --git a/drift-codec/src/main/java/io/airlift/drift/codec/internal/coercion/FromThrift.java b/drift-codec/src/main/java/io/airlift/drift/codec/internal/coercion/FromThrift.java index e6b14c139..811a0260e 100644 --- a/drift-codec/src/main/java/io/airlift/drift/codec/internal/coercion/FromThrift.java +++ b/drift-codec/src/main/java/io/airlift/drift/codec/internal/coercion/FromThrift.java @@ -30,6 +30,4 @@ @Documented @Retention(RUNTIME) @Target(METHOD) -public @interface FromThrift -{ -} +public @interface FromThrift {} diff --git a/drift-codec/src/main/java/io/airlift/drift/codec/internal/coercion/ToThrift.java b/drift-codec/src/main/java/io/airlift/drift/codec/internal/coercion/ToThrift.java index b9815f203..da5de5824 100644 --- a/drift-codec/src/main/java/io/airlift/drift/codec/internal/coercion/ToThrift.java +++ b/drift-codec/src/main/java/io/airlift/drift/codec/internal/coercion/ToThrift.java @@ -30,6 +30,4 @@ @Documented @Retention(RUNTIME) @Target(METHOD) -public @interface ToThrift -{ -} +public @interface ToThrift {} diff --git a/drift-codec/src/main/java/io/airlift/drift/codec/internal/reflection/ReflectionThriftStructCodec.java b/drift-codec/src/main/java/io/airlift/drift/codec/internal/reflection/ReflectionThriftStructCodec.java index 9c146895f..23b52fd03 100644 --- a/drift-codec/src/main/java/io/airlift/drift/codec/internal/reflection/ReflectionThriftStructCodec.java +++ b/drift-codec/src/main/java/io/airlift/drift/codec/internal/reflection/ReflectionThriftStructCodec.java @@ -192,8 +192,7 @@ static void validateCreatedInstance(Class clazz, Object instance) { verify(instance != null, "Builder method returned a null instance"); - verify( - clazz.isInstance(instance), + verify(clazz.isInstance(instance), "Builder method returned instance of type %s, but an instance of %s is required", instance.getClass().getName(), clazz.getName()); diff --git a/drift-codec/src/main/java/io/airlift/drift/codec/metadata/FieldKind.java b/drift-codec/src/main/java/io/airlift/drift/codec/metadata/FieldKind.java index 617e8833e..d86d34f06 100644 --- a/drift-codec/src/main/java/io/airlift/drift/codec/metadata/FieldKind.java +++ b/drift-codec/src/main/java/io/airlift/drift/codec/metadata/FieldKind.java @@ -18,5 +18,5 @@ public enum FieldKind { THRIFT_FIELD, - THRIFT_UNION_ID + THRIFT_UNION_ID, } diff --git a/drift-codec/src/main/java/io/airlift/drift/codec/metadata/MetadataErrors.java b/drift-codec/src/main/java/io/airlift/drift/codec/metadata/MetadataErrors.java index 561e5bbe6..4cd76b2f8 100644 --- a/drift-codec/src/main/java/io/airlift/drift/codec/metadata/MetadataErrors.java +++ b/drift-codec/src/main/java/io/airlift/drift/codec/metadata/MetadataErrors.java @@ -46,14 +46,10 @@ private static final class NullMonitor implements MetadataErrors.Monitor { @Override - public void onError(MetadataErrorException unused) - { - } + public void onError(MetadataErrorException unused) {} @Override - public void onWarning(MetadataWarningException unused) - { - } + public void onWarning(MetadataWarningException unused) {} } public MetadataErrors() diff --git a/drift-codec/src/main/java/io/airlift/drift/codec/metadata/ReflectionHelper.java b/drift-codec/src/main/java/io/airlift/drift/codec/metadata/ReflectionHelper.java index 1d0381d50..5823e56b8 100644 --- a/drift-codec/src/main/java/io/airlift/drift/codec/metadata/ReflectionHelper.java +++ b/drift-codec/src/main/java/io/airlift/drift/codec/metadata/ReflectionHelper.java @@ -48,9 +48,7 @@ public final class ReflectionHelper { - private ReflectionHelper() - { - } + private ReflectionHelper() {} private static final Type MAP_KEY_TYPE; private static final Type MAP_VALUE_TYPE; diff --git a/drift-codec/src/main/java/io/airlift/drift/codec/metadata/ThriftConstructorInjection.java b/drift-codec/src/main/java/io/airlift/drift/codec/metadata/ThriftConstructorInjection.java index 962d9dacd..21956a198 100644 --- a/drift-codec/src/main/java/io/airlift/drift/codec/metadata/ThriftConstructorInjection.java +++ b/drift-codec/src/main/java/io/airlift/drift/codec/metadata/ThriftConstructorInjection.java @@ -32,8 +32,7 @@ public class ThriftConstructorInjection public ThriftConstructorInjection(Constructor constructor, ThriftParameterInjection... parameters) { - this( - requireNonNull(constructor, "constructor is null"), + this(requireNonNull(constructor, "constructor is null"), ImmutableList.copyOf(requireNonNull(parameters, "parameters is null"))); } diff --git a/drift-codec/src/main/java/io/airlift/drift/codec/metadata/ThriftFieldExtractor.java b/drift-codec/src/main/java/io/airlift/drift/codec/metadata/ThriftFieldExtractor.java index 5c6e54701..cd5064a51 100644 --- a/drift-codec/src/main/java/io/airlift/drift/codec/metadata/ThriftFieldExtractor.java +++ b/drift-codec/src/main/java/io/airlift/drift/codec/metadata/ThriftFieldExtractor.java @@ -36,7 +36,11 @@ public class ThriftFieldExtractor private final Class type; public ThriftFieldExtractor( - short fieldId, String fieldName, FieldKind fieldKind, Field field, Type fieldType) + short fieldId, + String fieldName, + FieldKind fieldKind, + Field field, + Type fieldType) { this.name = requireNonNull(fieldName, "name is null"); this.field = requireNonNull(field, "field is null"); diff --git a/drift-codec/src/main/java/io/airlift/drift/codec/metadata/ThriftMethodExtractor.java b/drift-codec/src/main/java/io/airlift/drift/codec/metadata/ThriftMethodExtractor.java index cb64a9e9c..57e1b63c2 100644 --- a/drift-codec/src/main/java/io/airlift/drift/codec/metadata/ThriftMethodExtractor.java +++ b/drift-codec/src/main/java/io/airlift/drift/codec/metadata/ThriftMethodExtractor.java @@ -36,7 +36,11 @@ public class ThriftMethodExtractor private final Class type; public ThriftMethodExtractor( - short fieldId, String fieldName, FieldKind fieldKind, Method method, Type fieldType) + short fieldId, + String fieldName, + FieldKind fieldKind, + Method method, + Type fieldType) { this.name = requireNonNull(fieldName, "name is null"); this.method = requireNonNull(method, "method is null"); diff --git a/drift-codec/src/main/java/io/airlift/drift/codec/metadata/ThriftType.java b/drift-codec/src/main/java/io/airlift/drift/codec/metadata/ThriftType.java index 2621a36fe..51c80ef0d 100644 --- a/drift-codec/src/main/java/io/airlift/drift/codec/metadata/ThriftType.java +++ b/drift-codec/src/main/java/io/airlift/drift/codec/metadata/ThriftType.java @@ -71,7 +71,8 @@ public static ThriftType map(ThriftType keyType, ThriftType valueType) return map(new DefaultThriftTypeReference(keyType), new DefaultThriftTypeReference(valueType)); } - public static ThriftType map(ThriftTypeReference keyTypeReference, + public static ThriftType map( + ThriftTypeReference keyTypeReference, ThriftTypeReference valueTypeReference) { requireNonNull(keyTypeReference, "keyTypeReference is null"); @@ -184,7 +185,8 @@ private ThriftType(ThriftProtocolType protocolType, Type javaType) nullValue = null; } - private ThriftType(ThriftProtocolType protocolType, + private ThriftType( + ThriftProtocolType protocolType, Type javaType, ThriftTypeReference keyTypeReference, ThriftTypeReference valueTypeReference, @@ -305,7 +307,8 @@ public ThriftType coerceTo(Type javaType) protocolType != ThriftProtocolType.SET && protocolType != ThriftProtocolType.LIST && protocolType != ThriftProtocolType.MAP, - "Coercion is not supported for %s", protocolType); + "Coercion is not supported for %s", + protocolType); return new ThriftType(this, javaType); } diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/AbstractThriftCodecManagerTest.java b/drift-codec/src/test/java/io/airlift/drift/codec/AbstractThriftCodecManagerTest.java index 39de25481..09f97a3b4 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/AbstractThriftCodecManagerTest.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/AbstractThriftCodecManagerTest.java @@ -338,6 +338,7 @@ public void testAllOptionalStruct() throws Exception { OptionalStruct optionalStruct = new OptionalStruct( + // optional Optional.of(true), Optional.of(Byte.MIN_VALUE), Optional.of(Short.MIN_VALUE), @@ -348,11 +349,11 @@ public void testAllOptionalStruct() Optional.of(new BonkField("message", 42)), Optional.of(Fruit.BANANA), Optional.of(Letter.C), - + // specialized optional OptionalDouble.of(87.6d), OptionalInt.of(Integer.MAX_VALUE - 10), OptionalLong.of(Long.MAX_VALUE - 20), - + // optional of list Optional.of(ImmutableList.of(true)), Optional.of(ImmutableList.of(Byte.MAX_VALUE)), Optional.of(ImmutableList.of(Short.MAX_VALUE)), @@ -725,7 +726,7 @@ private void assertAllFieldsSet(IsSetBean isSetBean, boolean expected) private void testRoundTripSerialize(T value) throws Exception { - testRoundTripSerialize(value, x -> {}); + testRoundTripSerialize(value, _ -> {}); } private void testRoundTripSerialize(T value, Consumer consumer) @@ -888,12 +889,10 @@ private OneOfEverything createOneOfEverything() "2: other", new BonkField("other", 11)))); one.aMapOfListToSet = ImmutableMap.of( - ImmutableList.of("a", "b"), - ImmutableSet.of( + ImmutableList.of("a", "b"), ImmutableSet.of( new BonkField("1: message", 42), new BonkField("1: other", 11)), - ImmutableList.of("c", "d"), - ImmutableSet.of( + ImmutableList.of("c", "d"), ImmutableSet.of( new BonkField("2: message", 42), new BonkField("2: other", 11))); @@ -902,11 +901,13 @@ private OneOfEverything createOneOfEverything() one.aUnionSet = ImmutableSet.of(new UnionField("Hello, World"), new UnionField(123456L), new UnionField(Fruit.CHERRY)); one.aUnionList = ImmutableList.of(new UnionField("Hello, World"), new UnionField(123456L), new UnionField(Fruit.CHERRY)); - one.aUnionKeyMap = ImmutableMap.of(new UnionField("Hello, World"), "Eins", + one.aUnionKeyMap = ImmutableMap.of( + new UnionField("Hello, World"), "Eins", new UnionField(123456L), "Zwei", new UnionField(Fruit.CHERRY), "Drei"); - one.aUnionValueMap = ImmutableMap.of("Eins", new UnionField("Hello, World"), + one.aUnionValueMap = ImmutableMap.of( + "Eins", new UnionField("Hello, World"), "Zwei", new UnionField(123456L), "Drei", new UnionField(Fruit.CHERRY)); diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/ArrayField.java b/drift-codec/src/test/java/io/airlift/drift/codec/ArrayField.java index de1ebc338..b2406cd1c 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/ArrayField.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/ArrayField.java @@ -67,9 +67,7 @@ public final class ArrayField @ThriftField(15) public Map mapDoubleArray; - public ArrayField() - { - } + public ArrayField() {} public ArrayField(boolean[] booleanArray, short[] shortArray, int[] intArray, long[] longArray, double[] doubleArray, byte[] byteArray) { @@ -81,7 +79,8 @@ public ArrayField(boolean[] booleanArray, short[] shortArray, int[] intArray, lo this.byteArray = byteArray; } - public ArrayField(boolean[] booleanArray, + public ArrayField( + boolean[] booleanArray, short[] shortArray, int[] intArray, long[] longArray, diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/BonkBean.java b/drift-codec/src/test/java/io/airlift/drift/codec/BonkBean.java index d02d2b224..eaa23e6da 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/BonkBean.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/BonkBean.java @@ -28,9 +28,7 @@ public final class BonkBean private String message; private int type; - public BonkBean() - { - } + public BonkBean() {} public BonkBean(String message, int type) { diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/BonkField.java b/drift-codec/src/test/java/io/airlift/drift/codec/BonkField.java index dadcc2f87..5d9ea78ea 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/BonkField.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/BonkField.java @@ -31,9 +31,7 @@ public final class BonkField @ThriftField(2) public int type; - public BonkField() - { - } + public BonkField() {} public BonkField(String message, int type) { diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/BonkMethod.java b/drift-codec/src/test/java/io/airlift/drift/codec/BonkMethod.java index d4b9af62b..3dbe86648 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/BonkMethod.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/BonkMethod.java @@ -28,9 +28,7 @@ public final class BonkMethod private String message; private int type; - public BonkMethod() - { - } + public BonkMethod() {} public BonkMethod(String message, int type) { diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/CoercionBean.java b/drift-codec/src/test/java/io/airlift/drift/codec/CoercionBean.java index b658031e6..932ec838f 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/CoercionBean.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/CoercionBean.java @@ -37,9 +37,7 @@ public final class CoercionBean private float primitiveFloat; private List floatList; - public CoercionBean() - { - } + public CoercionBean() {} public CoercionBean( Boolean booleanValue, diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/OneOfEverythingThriftCodec.java b/drift-codec/src/test/java/io/airlift/drift/codec/OneOfEverythingThriftCodec.java index ada69c64d..f7ed29167 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/OneOfEverythingThriftCodec.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/OneOfEverythingThriftCodec.java @@ -29,7 +29,8 @@ public class OneOfEverythingThriftCodec private final ThriftCodec aUnionCodec; private final ThriftCodec aFruitCodec; - public OneOfEverythingThriftCodec(ThriftType type, + public OneOfEverythingThriftCodec( + ThriftType type, ThriftCodec aStructCodec, ThriftCodec aUnionCodec, ThriftCodec aFruitCodec) diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/OptionalStruct.java b/drift-codec/src/test/java/io/airlift/drift/codec/OptionalStruct.java index f5db07ec0..916249f30 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/OptionalStruct.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/OptionalStruct.java @@ -89,6 +89,7 @@ public OptionalStruct() @ThriftConstructor public OptionalStruct( + // optional Optional aBooleanOptional, Optional aByteOptional, Optional aShortOptional, @@ -99,11 +100,11 @@ public OptionalStruct( Optional aStructOptional, Optional aEnumOptional, Optional aCustomEnumOptional, - + // specialized optional OptionalDouble aOptionalDouble, OptionalInt aOptionalInt, OptionalLong aOptionalLong, - + // optional of list Optional> aListBooleanOptional, Optional> aListByteOptional, Optional> aListShortOptional, diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/TestThriftCodecManager.java b/drift-codec/src/test/java/io/airlift/drift/codec/TestThriftCodecManager.java index a212383ba..55e22240d 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/TestThriftCodecManager.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/TestThriftCodecManager.java @@ -58,7 +58,7 @@ public class TestThriftCodecManager @BeforeMethod protected void setUp() { - codecManager = new ThriftCodecManager((codecManager, metadata) -> { + codecManager = new ThriftCodecManager((_, _) -> { throw new UnsupportedOperationException(); }); ThriftCatalog catalog = codecManager.getCatalog(); diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/UnionConstructorDuplicateTypes.java b/drift-codec/src/test/java/io/airlift/drift/codec/UnionConstructorDuplicateTypes.java index ca2c7db5d..f325f4b80 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/UnionConstructorDuplicateTypes.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/UnionConstructorDuplicateTypes.java @@ -33,9 +33,7 @@ public class UnionConstructorDuplicateTypes private String name; @ThriftConstructor - public UnionConstructorDuplicateTypes() - { - } + public UnionConstructorDuplicateTypes() {} @ThriftField public void setFirstIntValue(int firstIntValue) diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/UnionField.java b/drift-codec/src/test/java/io/airlift/drift/codec/UnionField.java index 70a27c4a6..944e5732d 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/UnionField.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/UnionField.java @@ -38,9 +38,7 @@ public final class UnionField @ThriftUnionId public short id; - public UnionField() - { - } + public UnionField() {} public UnionField(String stringValue) { diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/UnionMethod.java b/drift-codec/src/test/java/io/airlift/drift/codec/UnionMethod.java index 8bb03866b..923aea69b 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/UnionMethod.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/UnionMethod.java @@ -31,9 +31,7 @@ public final class UnionMethod @ThriftUnionId public int type; - public UnionMethod() - { - } + public UnionMethod() {} @ThriftField public void setData(String stringValue, Long longValue, Fruit fruitValue) diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/generics/GenericThriftStructBean.java b/drift-codec/src/test/java/io/airlift/drift/codec/generics/GenericThriftStructBean.java index ea981ba87..dd2b9af44 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/generics/GenericThriftStructBean.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/generics/GenericThriftStructBean.java @@ -19,6 +19,4 @@ @ThriftStruct public final class GenericThriftStructBean - extends GenericThriftStructBeanBase -{ -} + extends GenericThriftStructBeanBase {} diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/generics/GenericThriftStructField.java b/drift-codec/src/test/java/io/airlift/drift/codec/generics/GenericThriftStructField.java index f1d312407..cef6adfb7 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/generics/GenericThriftStructField.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/generics/GenericThriftStructField.java @@ -19,6 +19,4 @@ @ThriftStruct public final class GenericThriftStructField - extends GenericThriftStructFieldBase -{ -} + extends GenericThriftStructFieldBase {} diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/BeanWIthConflictingIdlAnnotationMapsForField.java b/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/BeanWIthConflictingIdlAnnotationMapsForField.java index 50f8e5e8b..415bd2a45 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/BeanWIthConflictingIdlAnnotationMapsForField.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/BeanWIthConflictingIdlAnnotationMapsForField.java @@ -32,7 +32,8 @@ public class BeanWIthConflictingIdlAnnotationMapsForField @ThriftField(value = 2, idlAnnotations = { @ThriftIdlAnnotation(key = "testkey1", value = "testvalue1"), - @ThriftIdlAnnotation(key = "testkey2", value = "testvalue2")}) + @ThriftIdlAnnotation(key = "testkey2", value = "testvalue2"), + }) public int getType() { return type; @@ -40,7 +41,8 @@ public int getType() @ThriftField(value = 2, idlAnnotations = { @ThriftIdlAnnotation(key = "testkey3", value = "testvalue3"), - @ThriftIdlAnnotation(key = "testkey4", value = "testvalue4")}) + @ThriftIdlAnnotation(key = "testkey4", value = "testvalue4"), + }) public void setType(int type) { this.type = type; diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/BeanWithMatchingIdlAnnotationsMapsForField.java b/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/BeanWithMatchingIdlAnnotationsMapsForField.java index f7869f8c0..8a7298ab5 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/BeanWithMatchingIdlAnnotationsMapsForField.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/BeanWithMatchingIdlAnnotationsMapsForField.java @@ -29,7 +29,8 @@ public class BeanWithMatchingIdlAnnotationsMapsForField @ThriftField(value = 2, idlAnnotations = { @ThriftIdlAnnotation(key = "testkey1", value = "testvalue1"), - @ThriftIdlAnnotation(key = "testkey2", value = "testvalue2")}) + @ThriftIdlAnnotation(key = "testkey2", value = "testvalue2"), + }) public int getType() { return type; @@ -37,7 +38,8 @@ public int getType() @ThriftField(value = 2, idlAnnotations = { @ThriftIdlAnnotation(key = "testkey1", value = "testvalue1"), - @ThriftIdlAnnotation(key = "testkey2", value = "testvalue2")}) + @ThriftIdlAnnotation(key = "testkey2", value = "testvalue2"), + }) public void setType(int type) { this.type = type; diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/BeanWithOneIdlAnnotationMapForField.java b/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/BeanWithOneIdlAnnotationMapForField.java index 87a357cad..dcf66c85d 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/BeanWithOneIdlAnnotationMapForField.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/BeanWithOneIdlAnnotationMapForField.java @@ -29,7 +29,8 @@ public class BeanWithOneIdlAnnotationMapForField @ThriftField(value = 2, idlAnnotations = { @ThriftIdlAnnotation(key = "testkey1", value = "testvalue1"), - @ThriftIdlAnnotation(key = "testkey2", value = "testvalue2")}) + @ThriftIdlAnnotation(key = "testkey2", value = "testvalue2"), + }) public int getType() { return type; diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/ExceptionWithIdlAnnotations.java b/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/ExceptionWithIdlAnnotations.java index e7502ac04..08ac424e4 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/ExceptionWithIdlAnnotations.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/ExceptionWithIdlAnnotations.java @@ -27,7 +27,8 @@ public class ExceptionWithIdlAnnotations private final int type; @ThriftConstructor - public ExceptionWithIdlAnnotations(@ThriftField(1) String message, + public ExceptionWithIdlAnnotations( + @ThriftField(1) String message, @ThriftField(2) int type) { super(message); diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/StructWithIdlAnnotations.java b/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/StructWithIdlAnnotations.java index 8f326cf37..bc08130fa 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/StructWithIdlAnnotations.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/StructWithIdlAnnotations.java @@ -21,7 +21,8 @@ @ThriftStruct(idlAnnotations = { @ThriftIdlAnnotation(key = "testkey1", value = "testvalue1"), - @ThriftIdlAnnotation(key = "testkey2", value = "testvalue2")}) + @ThriftIdlAnnotation(key = "testkey2", value = "testvalue2"), +}) public class StructWithIdlAnnotations { @ThriftField(1) diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/UnionWithIdlAnnotations.java b/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/UnionWithIdlAnnotations.java index 355a28d64..649e361bf 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/UnionWithIdlAnnotations.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/idlannotations/UnionWithIdlAnnotations.java @@ -23,7 +23,8 @@ @ThriftUnion( idlAnnotations = { @ThriftIdlAnnotation(key = "testkey1", value = "testvalue1"), - @ThriftIdlAnnotation(key = "testkey2", value = "testvalue2")}) + @ThriftIdlAnnotation(key = "testkey2", value = "testvalue2"), + }) public class UnionWithIdlAnnotations { private short unionType; diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestLegacyFieldIds.java b/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestLegacyFieldIds.java index eab9ed466..8b415996a 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestLegacyFieldIds.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestLegacyFieldIds.java @@ -112,9 +112,7 @@ public boolean getLegacyIdOnGetterOnly() } @ThriftField - public void setLegacyIdOnGetterOnly(boolean value) - { - } + public void setLegacyIdOnGetterOnly(boolean value) {} @ThriftField public boolean getLegacyIdOnSetterOnly() @@ -123,9 +121,7 @@ public boolean getLegacyIdOnSetterOnly() } @ThriftField(value = -3, isLegacyId = true) - public void setLegacyIdOnSetterOnly(boolean value) - { - } + public void setLegacyIdOnSetterOnly(boolean value) {} @ThriftField(value = -4, isLegacyId = true) public boolean getLegacyIdOnBoth() @@ -134,9 +130,7 @@ public boolean getLegacyIdOnBoth() } @ThriftField(value = -4, isLegacyId = true) - public void setLegacyIdOnBoth(boolean value) - { - } + public void setLegacyIdOnBoth(boolean value) {} } @Test @@ -225,9 +219,7 @@ public boolean getField() } @ThriftField(-4) - public void setField(boolean value) - { - } + public void setField(boolean value) {} } /* legacy, setter correct, getter wrong */ @@ -241,9 +233,7 @@ public boolean getField() } @ThriftField(value = -4, isLegacyId = true) - public void setField(boolean value) - { - } + public void setField(boolean value) {} } /* not legacy, setter correct, getter wrong */ @@ -257,9 +247,7 @@ public boolean getField() } @ThriftField(4) - public void setField(boolean value) - { - } + public void setField(boolean value) {} } /* not legacy, getter correct, setter wrong */ @@ -273,9 +261,7 @@ public boolean getField() } @ThriftField(value = 4, isLegacyId = true) - public void setField(boolean value) - { - } + public void setField(boolean value) {} } @Test @@ -380,9 +366,7 @@ public boolean getLegacyIdOnGetterOnly() } @ThriftField - public void setLegacyIdOnGetterOnly(boolean value) - { - } + public void setLegacyIdOnGetterOnly(boolean value) {} @ThriftField public boolean getLegacyIdOnSetterOnly() @@ -391,9 +375,7 @@ public boolean getLegacyIdOnSetterOnly() } @ThriftField(value = -3, isLegacyId = true) - public void setLegacyIdOnSetterOnly(boolean value) - { - } + public void setLegacyIdOnSetterOnly(boolean value) {} @ThriftField(value = -4, isLegacyId = true) public boolean getLegacyIdOnBoth() @@ -402,8 +384,6 @@ public boolean getLegacyIdOnBoth() } @ThriftField(value = -4, isLegacyId = true) - public void setLegacyIdOnBoth(boolean value) - { - } + public void setLegacyIdOnBoth(boolean value) {} } } diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestReflectionHelper.java b/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestReflectionHelper.java index 843882d12..8f5ca2b77 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestReflectionHelper.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestReflectionHelper.java @@ -33,9 +33,7 @@ public void testExtractParameterNamesNoAnnotations() ImmutableList.of("a", "b", "c")); } - private static void noAnnotations(String a, String b, String c) - { - } + private static void noAnnotations(String a, String b, String c) {} @Test public void testExtractParameterNamesThriftFieldAnnotation() @@ -50,8 +48,7 @@ private static void thriftFieldAnnotation( @ThriftField(name = "a") String arg0, @ThriftField(name = "b") String arg1, @ThriftField(name = "c") String arg2) - { - } + {} @Test public void testExtractParameterNamesMixedThriftFieldAnnotation() @@ -66,6 +63,5 @@ private static void mixedThriftFieldAnnotation( @ThriftField(name = "a") String arg0, String b, @ThriftField(name = "c") String arg2) - { - } + {} } diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestThriftEnumMetadata.java b/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestThriftEnumMetadata.java index 4675d95ca..b639b3243 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestThriftEnumMetadata.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestThriftEnumMetadata.java @@ -96,7 +96,7 @@ public int value() @ThriftEnum public enum MissingValueMethod { - FOO + FOO, } @ThriftEnum diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestThriftMethodMetadata.java b/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestThriftMethodMetadata.java index 3543ab05a..f414e05da 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestThriftMethodMetadata.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestThriftMethodMetadata.java @@ -338,19 +338,13 @@ void testExceptionMixedAnnotationStyle() @ThriftStruct public static final class ExceptionA - extends Exception - { - } + extends Exception {} @ThriftStruct public static final class ExceptionB - extends Exception - { - } + extends Exception {} @ThriftStruct public static final class ExceptionC - extends Exception - { - } + extends Exception {} } diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestThriftStructMetadataBuilder.java b/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestThriftStructMetadataBuilder.java index 75f7090c6..8e15dd888 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestThriftStructMetadataBuilder.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestThriftStructMetadataBuilder.java @@ -59,9 +59,7 @@ public String getField1() } @ThriftField - public void setField1(String value) - { - } + public void setField1(String value) {} } @Test @@ -88,14 +86,10 @@ public void testMultipleIds() public static final class MultipleIds { @ThriftField(name = "foo", value = 1) - public void setField1(String value) - { - } + public void setField1(String value) {} @ThriftField(name = "foo", value = 2) - public void setField2(String value) - { - } + public void setField2(String value) {} @ThriftField(name = "foo") public String getField1() @@ -140,9 +134,7 @@ public String getFoo() } @ThriftField(value = 1, name = "bar") - public void setFoo(String value) - { - } + public void setFoo(String value) {} } @Test @@ -202,9 +194,7 @@ public int getFoo() } @ThriftField - public void setFoo(short value) - { - } + public void setFoo(short value) {} } @Test @@ -261,9 +251,7 @@ public void testGenericBuilderForNonGenericStruct() @ThriftStruct(builder = NonGenericStruct.GenericBuilder.class) public static class NonGenericStruct { - private NonGenericStruct() - { - } + private NonGenericStruct() {} public static class GenericBuilder { @@ -305,9 +293,7 @@ public int getFoo() } @ThriftField(value = 1, requiredness = Requiredness.NONE) - public void setFoo(int value) - { - } + public void setFoo(int value) {} } @Test @@ -329,9 +315,7 @@ public int getFoo() } @ThriftField - public void setFoo(int value) - { - } + public void setFoo(int value) {} } @Test @@ -342,7 +326,5 @@ public void testNonFinalStructsOk() } @ThriftStruct - public static class NotFinalStruct - { - } + public static class NotFinalStruct {} } diff --git a/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestThriftUnionMetadataBuilder.java b/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestThriftUnionMetadataBuilder.java index a763ab9db..9e440d366 100644 --- a/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestThriftUnionMetadataBuilder.java +++ b/drift-codec/src/test/java/io/airlift/drift/codec/metadata/TestThriftUnionMetadataBuilder.java @@ -59,9 +59,7 @@ public String getField1() } @ThriftField - public void setField1(String value) - { - } + public void setField1(String value) {} } @Test @@ -88,19 +86,13 @@ public void testMultipleIds() public static final class MultipleIds { @ThriftUnionId - public void setId(short id) - { - } + public void setId(short id) {} @ThriftField(name = "foo", value = 1) - public void setField1(String value) - { - } + public void setField1(String value) {} @ThriftField(name = "foo", value = 2) - public void setField2(String value) - { - } + public void setField2(String value) {} @ThriftField(name = "foo") public String getField1() @@ -139,9 +131,7 @@ public void testMultipleNames() public static final class MultipleNames { @ThriftUnionId - public void setId(short id) - { - } + public void setId(short id) {} @ThriftField(value = 1, name = "foo") public String getFoo() @@ -150,9 +140,7 @@ public String getFoo() } @ThriftField(value = 1, name = "bar") - public void setFoo(String value) - { - } + public void setFoo(String value) {} } @Test @@ -179,9 +167,7 @@ public void testUnsupportedType() public static final class UnsupportedJavaType { @ThriftUnionId - public void setId(short id) - { - } + public void setId(short id) {} @ThriftField(1) public Lock unsupportedJavaType; @@ -211,9 +197,7 @@ public void testMultipleTypes() public static final class MultipleTypes { @ThriftUnionId - public void setId(short id) - { - } + public void setId(short id) {} @ThriftField(1) public int getFoo() @@ -222,9 +206,7 @@ public int getFoo() } @ThriftField - public void setFoo(short value) - { - } + public void setFoo(short value) {} } @Test diff --git a/drift-idl-generator/src/main/java/io/airlift/drift/idl/generator/ThriftIdlGeneratorConfig.java b/drift-idl-generator/src/main/java/io/airlift/drift/idl/generator/ThriftIdlGeneratorConfig.java index 05c7b7bf9..ed8596bb4 100644 --- a/drift-idl-generator/src/main/java/io/airlift/drift/idl/generator/ThriftIdlGeneratorConfig.java +++ b/drift-idl-generator/src/main/java/io/airlift/drift/idl/generator/ThriftIdlGeneratorConfig.java @@ -45,9 +45,9 @@ private ThriftIdlGeneratorConfig( this.namespaces = ImmutableMap.copyOf(firstNonNull(namespaces, ImmutableMap.of())); this.includes = ImmutableMap.copyOf(firstNonNull(includes, ImmutableMap.of())); this.recursive = recursive; - this.errorLogger = firstNonNull(errorLogger, ignored -> {}); - this.warningLogger = firstNonNull(warningLogger, ignored -> {}); - this.verboseLogger = firstNonNull(verboseLogger, ignored -> {}); + this.errorLogger = firstNonNull(errorLogger, _ -> {}); + this.warningLogger = firstNonNull(warningLogger, _ -> {}); + this.verboseLogger = firstNonNull(verboseLogger, _ -> {}); } public static Builder builder() diff --git a/drift-idl-generator/src/main/java/io/airlift/drift/idl/generator/ThriftIdlRenderer.java b/drift-idl-generator/src/main/java/io/airlift/drift/idl/generator/ThriftIdlRenderer.java index 59864b74c..93f486013 100644 --- a/drift-idl-generator/src/main/java/io/airlift/drift/idl/generator/ThriftIdlRenderer.java +++ b/drift-idl-generator/src/main/java/io/airlift/drift/idl/generator/ThriftIdlRenderer.java @@ -35,7 +35,6 @@ import static com.google.common.base.Strings.emptyToNull; import static com.google.common.collect.Streams.mapWithIndex; -import static java.lang.String.format; import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; @@ -92,7 +91,7 @@ private static String renderNamespaces(Map namespaces) return null; } return namespaces.entrySet().stream() - .map(entry -> format("namespace %s %s", entry.getKey(), entry.getValue())) + .map(entry -> "namespace %s %s".formatted(entry.getKey(), entry.getValue())) .collect(joining("\n")) + "\n"; } @@ -102,7 +101,7 @@ private static String renderIncludes(Set includes) return null; } return includes.stream() - .map(include -> format("include \"%s\"", include)) + .map("include \"%s\""::formatted) .collect(joining("\n")) + "\n"; } @@ -116,7 +115,7 @@ private static String renderEnums(List> enums) private static String renderEnum(ThriftEnumMetadata metadata) { return documentation(metadata.getDocumentation(), "") + - format("enum %s {\n%s}\n", metadata.getEnumName(), renderEnumElements(metadata)); + "enum %s {\n%s}\n".formatted(metadata.getEnumName(), renderEnumElements(metadata)); } private static > String renderEnumElements(ThriftEnumMetadata metadata) @@ -153,7 +152,7 @@ private String renderStruct(ThriftStructMetadata struct) { StringBuilder builder = new StringBuilder() .append(documentation(struct.getDocumentation(), "")) - .append(format("%s %s {\n", structKind(struct), struct.getStructName())); + .append("%s %s {\n".formatted(structKind(struct), struct.getStructName())); LineSeparator separator = new LineSeparator(); for (ThriftFieldMetadata field : struct.getFields()) { @@ -162,7 +161,7 @@ private String renderStruct(ThriftStructMetadata struct) } builder.append(separator.getAndUpdate(!field.getDocumentation().isEmpty())) .append(documentation(field.getDocumentation(), " ")) - .append(format(" %s: %s%s %s;\n", + .append(" %s: %s%s %s;\n".formatted( field.getId(), requiredness(field.getRequiredness()), typeName(field.getThriftType()), @@ -207,7 +206,7 @@ private String renderServices(List services) private String renderService(ThriftServiceMetadata service) { return documentation(service.getDocumentation(), "") + - format("service %s {\n", service.getIdlName()) + + "service %s {\n".formatted(service.getIdlName()) + service.getMethods().values().stream() .map(this::renderMethod) .collect(joining("\n")) + @@ -219,13 +218,13 @@ private String renderMethod(ThriftMethodMetadata method) StringBuilder builder = new StringBuilder() .append(documentation(method.getDocumentation(), " ")); - String methodStart = format(" %s%s %s(", + String methodStart = " %s%s %s(".formatted( method.getOneway() ? "oneway " : "", typeName(method.getReturnType()), method.getName()); List parameters = method.getParameters().stream() - .map(parameter -> format("%s: %s %s", + .map(parameter -> "%s: %s %s".formatted( parameter.getId(), typeName(parameter.getThriftType()), parameter.getName())) @@ -234,8 +233,9 @@ private String renderMethod(ThriftMethodMetadata method) builder.append(renderParameters(methodStart, parameters)); if (!method.getExceptions().isEmpty()) { - List exceptions = mapWithIndex(method.getExceptions().entrySet().stream(), - (entry, index) -> format("%s: %s ex%s", + List exceptions = mapWithIndex( + method.getExceptions().entrySet().stream(), + (entry, index) -> "%s: %s ex%s".formatted( entry.getKey(), typeName(entry.getValue().getThriftType()), index + 1)) diff --git a/drift-idl-generator/src/test/java/io/airlift/drift/idl/generator/TestThriftIdlGenerator.java b/drift-idl-generator/src/test/java/io/airlift/drift/idl/generator/TestThriftIdlGenerator.java index 6c288e4a9..507390b8f 100644 --- a/drift-idl-generator/src/test/java/io/airlift/drift/idl/generator/TestThriftIdlGenerator.java +++ b/drift-idl-generator/src/test/java/io/airlift/drift/idl/generator/TestThriftIdlGenerator.java @@ -34,10 +34,10 @@ public class TestThriftIdlGenerator public void testGenerator() throws Exception { - assertGenerated(DriftScribe.class, "scribe", ignored -> {}); - assertGenerated(RenamedService.class, "renamed", ignored -> {}); - assertGenerated(Fruit.class, "fruit", ignored -> {}); - assertGenerated(TreeNode.class, "tree", ignored -> {}); + assertGenerated(DriftScribe.class, "scribe", _ -> {}); + assertGenerated(RenamedService.class, "renamed", _ -> {}); + assertGenerated(Fruit.class, "fruit", _ -> {}); + assertGenerated(TreeNode.class, "tree", _ -> {}); assertGenerated(Point.class, "point", config -> config .namespaces(ImmutableMap.builder() diff --git a/drift-integration-tests/src/test/java/io/airlift/drift/integration/ApacheThriftTesterUtil.java b/drift-integration-tests/src/test/java/io/airlift/drift/integration/ApacheThriftTesterUtil.java index d406bdcd0..0df667f3b 100644 --- a/drift-integration-tests/src/test/java/io/airlift/drift/integration/ApacheThriftTesterUtil.java +++ b/drift-integration-tests/src/test/java/io/airlift/drift/integration/ApacheThriftTesterUtil.java @@ -73,14 +73,14 @@ private static int logApacheThriftDriftClient( return 0; } - AddressSelector addressSelector = (context, attempted) -> Optional.of(() -> address); + AddressSelector addressSelector = (_, _) -> Optional.of(() -> address); ApacheThriftClientConfig config = new ApacheThriftClientConfig() .setTransport(toApacheThriftTransport(transport)) .setProtocol(toApacheThriftProtocol(protocol)) .setTrustCertificate(ClientTestUtils.getCertificateChainFile()) .setSslEnabled(secure); ApacheThriftConnectionFactoryConfig factoryConfig = new ApacheThriftConnectionFactoryConfig(); - try (ApacheThriftMethodInvokerFactory methodInvokerFactory = new ApacheThriftMethodInvokerFactory<>(factoryConfig, clientIdentity -> config)) { + try (ApacheThriftMethodInvokerFactory methodInvokerFactory = new ApacheThriftMethodInvokerFactory<>(factoryConfig, _ -> config)) { DriftClientFactoryManager clientFactoryManager = new DriftClientFactoryManager<>(CODEC_MANAGER, methodInvokerFactory); DriftClientFactory proxyFactory = clientFactoryManager.createDriftClientFactory("clientIdentity", addressSelector, NORMAL_RESULT); @@ -107,7 +107,7 @@ private static int logApacheThriftStaticDriftClient( return 0; } - AddressSelector addressSelector = (context, attempted) -> Optional.of(() -> address); + AddressSelector addressSelector = (_, _) -> Optional.of(() -> address); ApacheThriftClientConfig config = new ApacheThriftClientConfig() .setTransport(toApacheThriftTransport(transport)) .setProtocol(toApacheThriftProtocol(protocol)) @@ -140,14 +140,14 @@ private static int logApacheThriftDriftClientAsync( return 0; } - AddressSelector addressSelector = (context, attempted) -> Optional.of(() -> address); + AddressSelector addressSelector = (_, _) -> Optional.of(() -> address); ApacheThriftClientConfig config = new ApacheThriftClientConfig() .setTransport(toApacheThriftTransport(transport)) .setProtocol(toApacheThriftProtocol(protocol)) .setTrustCertificate(ClientTestUtils.getCertificateChainFile()) .setSslEnabled(secure); ApacheThriftConnectionFactoryConfig factoryConfig = new ApacheThriftConnectionFactoryConfig(); - try (ApacheThriftMethodInvokerFactory methodInvokerFactory = new ApacheThriftMethodInvokerFactory<>(factoryConfig, clientIdentity -> config)) { + try (ApacheThriftMethodInvokerFactory methodInvokerFactory = new ApacheThriftMethodInvokerFactory<>(factoryConfig, _ -> config)) { DriftClientFactoryManager proxyFactoryManager = new DriftClientFactoryManager<>(CODEC_MANAGER, methodInvokerFactory); DriftClientFactory proxyFactory = proxyFactoryManager.createDriftClientFactory("myFactory", addressSelector, NORMAL_RESULT); diff --git a/drift-integration-tests/src/test/java/io/airlift/drift/integration/ClientTestUtils.java b/drift-integration-tests/src/test/java/io/airlift/drift/integration/ClientTestUtils.java index 03d31924e..8adb02225 100644 --- a/drift-integration-tests/src/test/java/io/airlift/drift/integration/ClientTestUtils.java +++ b/drift-integration-tests/src/test/java/io/airlift/drift/integration/ClientTestUtils.java @@ -95,7 +95,7 @@ public static int logDriftClientBinder( return 0; } - AddressSelector addressSelector = (context, attempted) -> Optional.of(() -> address); + AddressSelector addressSelector = (_, _) -> Optional.of(() -> address); Bootstrap app = new Bootstrap( new MBeanModule(), diff --git a/drift-integration-tests/src/test/java/io/airlift/drift/integration/DriftNettyTesterUtil.java b/drift-integration-tests/src/test/java/io/airlift/drift/integration/DriftNettyTesterUtil.java index 3b9906d51..95962f397 100644 --- a/drift-integration-tests/src/test/java/io/airlift/drift/integration/DriftNettyTesterUtil.java +++ b/drift-integration-tests/src/test/java/io/airlift/drift/integration/DriftNettyTesterUtil.java @@ -74,7 +74,7 @@ private static int logNettyDriftClient( return 0; } - AddressSelector addressSelector = (context, attempted) -> Optional.of(() -> address); + AddressSelector addressSelector = (_, _) -> Optional.of(() -> address); DriftNettyClientConfig config = new DriftNettyClientConfig() .setTransport(transport) .setProtocol(protocol) @@ -84,7 +84,7 @@ private static int logNettyDriftClient( try (TestingPooledByteBufAllocator testingAllocator = new TestingPooledByteBufAllocator(); DriftNettyMethodInvokerFactory methodInvokerFactory = new DriftNettyMethodInvokerFactory<>( new DriftNettyConnectionFactoryConfig(), - clientIdentity -> config, + _ -> config, testingAllocator)) { DriftClientFactoryManager clientFactoryManager = new DriftClientFactoryManager<>(CODEC_MANAGER, methodInvokerFactory); DriftClientFactory proxyFactory = clientFactoryManager.createDriftClientFactory("clientIdentity", addressSelector, NORMAL_RESULT); @@ -112,7 +112,7 @@ private static int logNettyStaticDriftClient( return 0; } - AddressSelector addressSelector = (context, attempted) -> Optional.of(() -> address); + AddressSelector addressSelector = (_, _) -> Optional.of(() -> address); DriftNettyClientConfig config = new DriftNettyClientConfig() .setTransport(transport) .setProtocol(protocol) @@ -146,7 +146,7 @@ private static int logNettyDriftClientAsync( return 0; } - AddressSelector addressSelector = (context, attempted) -> Optional.of(() -> address); + AddressSelector addressSelector = (_, _) -> Optional.of(() -> address); DriftNettyClientConfig config = new DriftNettyClientConfig() .setTransport(transport) .setProtocol(protocol) @@ -156,7 +156,7 @@ private static int logNettyDriftClientAsync( try (TestingPooledByteBufAllocator testingAllocator = new TestingPooledByteBufAllocator(); DriftNettyMethodInvokerFactory methodInvokerFactory = new DriftNettyMethodInvokerFactory<>( new DriftNettyConnectionFactoryConfig(), - clientIdentity -> config, + _ -> config, testingAllocator)) { DriftClientFactoryManager proxyFactoryManager = new DriftClientFactoryManager<>(CODEC_MANAGER, methodInvokerFactory); DriftClientFactory proxyFactory = proxyFactoryManager.createDriftClientFactory("myFactory", addressSelector, NORMAL_RESULT); diff --git a/drift-integration-tests/src/test/java/io/airlift/drift/integration/TestClientsWithDriftNettyServer.java b/drift-integration-tests/src/test/java/io/airlift/drift/integration/TestClientsWithDriftNettyServer.java index dbc5423d4..54f5749d8 100644 --- a/drift-integration-tests/src/test/java/io/airlift/drift/integration/TestClientsWithDriftNettyServer.java +++ b/drift-integration-tests/src/test/java/io/airlift/drift/integration/TestClientsWithDriftNettyServer.java @@ -81,9 +81,9 @@ private static int testDriftServer(List filters) for (Transport transport : ImmutableList.of(HEADER)) { for (Protocol protocol : Protocol.values()) { int count = Streams.concat( - legacyApacheThriftTestClients(filters, transport, protocol, secure).stream(), - driftNettyTestClients(filters, transport, protocol, secure).stream(), - apacheThriftTestClients(filters, transport, protocol, secure).stream()) + legacyApacheThriftTestClients(filters, transport, protocol, secure).stream(), + driftNettyTestClients(filters, transport, protocol, secure).stream(), + apacheThriftTestClients(filters, transport, protocol, secure).stream()) .mapToInt(client -> client.applyAsInt(address)) .sum(); invocationCount.addAndGet(count); diff --git a/drift-integration-tests/src/test/java/io/airlift/drift/integration/guice/EchoService.java b/drift-integration-tests/src/test/java/io/airlift/drift/integration/guice/EchoService.java index 7973f3b92..92626ccec 100644 --- a/drift-integration-tests/src/test/java/io/airlift/drift/integration/guice/EchoService.java +++ b/drift-integration-tests/src/test/java/io/airlift/drift/integration/guice/EchoService.java @@ -104,11 +104,9 @@ List echoOptionalListString(Optional> value) @ThriftStruct class NullValueException - extends Exception - {} + extends Exception {} @ThriftStruct class EmptyOptionalException - extends Exception - {} + extends Exception {} } diff --git a/drift-integration-tests/src/test/java/io/airlift/drift/integration/scribe/apache/LogEntry.java b/drift-integration-tests/src/test/java/io/airlift/drift/integration/scribe/apache/LogEntry.java index 0edc61a15..0f8b06e42 100644 --- a/drift-integration-tests/src/test/java/io/airlift/drift/integration/scribe/apache/LogEntry.java +++ b/drift-integration-tests/src/test/java/io/airlift/drift/integration/scribe/apache/LogEntry.java @@ -30,7 +30,10 @@ @SuppressWarnings(value = {"ALL", "all"}) public class LogEntry - implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable + implements Cloneable, + Comparable, + java.io.Serializable, + org.apache.thrift.TBase { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LogEntry"); @@ -127,9 +130,13 @@ public String getFieldName() static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class); - tmpMap.put(_Fields.CATEGORY, new org.apache.thrift.meta_data.FieldMetaData("category", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.CATEGORY, new org.apache.thrift.meta_data.FieldMetaData( + "category", + org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData( + "message", + org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LogEntry.class, metaDataMap); diff --git a/drift-integration-tests/src/test/java/io/airlift/drift/integration/scribe/apache/scribe.java b/drift-integration-tests/src/test/java/io/airlift/drift/integration/scribe/apache/scribe.java index 9aae6d795..2f4f937b7 100644 --- a/drift-integration-tests/src/test/java/io/airlift/drift/integration/scribe/apache/scribe.java +++ b/drift-integration-tests/src/test/java/io/airlift/drift/integration/scribe/apache/scribe.java @@ -125,7 +125,8 @@ public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransp } } - public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory, + public AsyncClient( + org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.transport.TNonblockingTransport transport) { @@ -146,7 +147,8 @@ public static class Log_call { private List messages; - public Log_call(List messages, + public Log_call( + List messages, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, @@ -234,7 +236,10 @@ public Log_result getResult(I iface, Log_args args) } public static class Log_args - implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable + implements Cloneable, + Comparable, + java.io.Serializable, + org.apache.thrift.TBase { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Log_args"); @@ -331,9 +336,7 @@ public String getFieldName() org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Log_args.class, metaDataMap); } - public Log_args() - { - } + public Log_args() {} public Log_args( List messages) @@ -725,7 +728,10 @@ private static S scheme(org.apache. } public static class Log_result - implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable + implements Cloneable, + Comparable, + java.io.Serializable, + org.apache.thrift.TBase { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Log_result"); @@ -820,15 +826,15 @@ public String getFieldName() static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class); - tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData( + "success", + org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ResultCode.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Log_result.class, metaDataMap); } - public Log_result() - { - } + public Log_result() {} public Log_result( ResultCode success) diff --git a/drift-javadoc/src/main/java/io/airlift/drift/javadoc/JavadocProcessor.java b/drift-javadoc/src/main/java/io/airlift/drift/javadoc/JavadocProcessor.java index 66b6c61d6..ebb1a0465 100644 --- a/drift-javadoc/src/main/java/io/airlift/drift/javadoc/JavadocProcessor.java +++ b/drift-javadoc/src/main/java/io/airlift/drift/javadoc/JavadocProcessor.java @@ -58,7 +58,8 @@ @SupportedAnnotationTypes({ ThriftAnnotations.THRIFT_ENUM, ThriftAnnotations.THRIFT_SERVICE, - ThriftAnnotations.THRIFT_STRUCT}) + ThriftAnnotations.THRIFT_STRUCT, +}) public class JavadocProcessor extends AbstractProcessor { diff --git a/drift-protocol/src/main/java/io/airlift/drift/protocol/TBinaryProtocol.java b/drift-protocol/src/main/java/io/airlift/drift/protocol/TBinaryProtocol.java index 627824d41..acd924a14 100644 --- a/drift-protocol/src/main/java/io/airlift/drift/protocol/TBinaryProtocol.java +++ b/drift-protocol/src/main/java/io/airlift/drift/protocol/TBinaryProtocol.java @@ -37,7 +37,7 @@ public class TBinaryProtocol { private static final TStruct ANONYMOUS_STRUCT = new TStruct(""); - protected static final int VERSION_MASK = 0xffff0000; + protected static final int VERSION_MASK = 0xFFFF0000; protected static final int VERSION_1 = 0x80010000; private final TTransport transport; @@ -143,8 +143,8 @@ public void writeByte(byte value) public void writeI16(short value) throws TException { - i16out[0] = (byte) (0xff & (value >> 8)); - i16out[1] = (byte) (0xff & (value)); + i16out[0] = (byte) (0xFF & (value >> 8)); + i16out[1] = (byte) (0xFF & (value)); transport.write(i16out, 0, 2); } @@ -154,10 +154,10 @@ public void writeI16(short value) public void writeI32(int value) throws TException { - i32out[0] = (byte) (0xff & (value >> 24)); - i32out[1] = (byte) (0xff & (value >> 16)); - i32out[2] = (byte) (0xff & (value >> 8)); - i32out[3] = (byte) (0xff & (value)); + i32out[0] = (byte) (0xFF & (value >> 24)); + i32out[1] = (byte) (0xFF & (value >> 16)); + i32out[2] = (byte) (0xFF & (value >> 8)); + i32out[3] = (byte) (0xFF & (value)); transport.write(i32out, 0, 4); } @@ -167,14 +167,14 @@ public void writeI32(int value) public void writeI64(long value) throws TException { - i64out[0] = (byte) (0xff & (value >> 56)); - i64out[1] = (byte) (0xff & (value >> 48)); - i64out[2] = (byte) (0xff & (value >> 40)); - i64out[3] = (byte) (0xff & (value >> 32)); - i64out[4] = (byte) (0xff & (value >> 24)); - i64out[5] = (byte) (0xff & (value >> 16)); - i64out[6] = (byte) (0xff & (value >> 8)); - i64out[7] = (byte) (0xff & (value)); + i64out[0] = (byte) (0xFF & (value >> 56)); + i64out[1] = (byte) (0xFF & (value >> 48)); + i64out[2] = (byte) (0xFF & (value >> 40)); + i64out[3] = (byte) (0xFF & (value >> 32)); + i64out[4] = (byte) (0xFF & (value >> 24)); + i64out[5] = (byte) (0xFF & (value >> 16)); + i64out[6] = (byte) (0xFF & (value >> 8)); + i64out[7] = (byte) (0xFF & (value)); transport.write(i64out, 0, 8); } @@ -224,7 +224,7 @@ public TMessage readMessageBegin() if (version != VERSION_1) { throw new TProtocolException("Bad version in readMessageBegin: " + version); } - return new TMessage(readString(), (byte) (size & 0x000000ff), readI32()); + return new TMessage(readString(), (byte) (size & 0x000000FF), readI32()); } // throw new TProtocolException("Missing version in readMessageBegin (old client?)"); @@ -317,7 +317,7 @@ public short readI16() byte[] buf = i16rd; int off = 0; readAll(i16rd, 2); - return (short) (((buf[off] & 0xff) << 8) | ((buf[off + 1] & 0xff))); + return (short) (((buf[off] & 0xFF) << 8) | ((buf[off + 1] & 0xFF))); } private final byte[] i32rd = new byte[4]; @@ -329,10 +329,10 @@ public int readI32() byte[] buf = i32rd; int off = 0; readAll(i32rd, 4); - return ((buf[off] & 0xff) << 24) | - ((buf[off + 1] & 0xff) << 16) | - ((buf[off + 2] & 0xff) << 8) | - ((buf[off + 3] & 0xff)); + return ((buf[off] & 0xFF) << 24) | + ((buf[off + 1] & 0xFF) << 16) | + ((buf[off + 2] & 0xFF) << 8) | + ((buf[off + 3] & 0xFF)); } private final byte[] i64rd = new byte[8]; @@ -344,14 +344,14 @@ public long readI64() byte[] buf = i64rd; int off = 0; readAll(i64rd, 8); - return ((long) (buf[off] & 0xff) << 56) | - ((long) (buf[off + 1] & 0xff) << 48) | - ((long) (buf[off + 2] & 0xff) << 40) | - ((long) (buf[off + 3] & 0xff) << 32) | - ((long) (buf[off + 4] & 0xff) << 24) | - ((long) (buf[off + 5] & 0xff) << 16) | - ((long) (buf[off + 6] & 0xff) << 8) | - ((long) (buf[off + 7] & 0xff)); + return ((long) (buf[off] & 0xFF) << 56) | + ((long) (buf[off + 1] & 0xFF) << 48) | + ((long) (buf[off + 2] & 0xFF) << 40) | + ((long) (buf[off + 3] & 0xFF) << 32) | + ((long) (buf[off + 4] & 0xFF) << 24) | + ((long) (buf[off + 5] & 0xFF) << 16) | + ((long) (buf[off + 6] & 0xFF) << 8) | + ((long) (buf[off + 7] & 0xFF)); } @Override diff --git a/drift-protocol/src/main/java/io/airlift/drift/protocol/TCompactProtocol.java b/drift-protocol/src/main/java/io/airlift/drift/protocol/TCompactProtocol.java index 7c1d97148..aae6e1f75 100644 --- a/drift-protocol/src/main/java/io/airlift/drift/protocol/TCompactProtocol.java +++ b/drift-protocol/src/main/java/io/airlift/drift/protocol/TCompactProtocol.java @@ -68,7 +68,7 @@ public class TCompactProtocol private static final byte PROTOCOL_ID = (byte) 0x82; private static final byte VERSION = 1; - private static final byte VERSION_MASK = 0x1f; // 0001 1111 + private static final byte VERSION_MASK = 0x1F; // 0001 1111 private static final byte TYPE_MASK = (byte) 0xE0; // 1110 0000 private static final byte TYPE_BITS = 0x07; // 0000 0111 private static final int TYPE_SHIFT_AMOUNT = 5; @@ -411,7 +411,7 @@ private void writeCollectionBegin(byte elemType, int size) writeByteDirect(size << 4 | getCompactType(elemType)); } else { - writeByteDirect(0xf0 | getCompactType(elemType)); + writeByteDirect(0xF0 | getCompactType(elemType)); writeVarint32(size); } } @@ -481,14 +481,14 @@ private static int intToZigZag(int n) */ private static void fixedLongToBytes(long n, byte[] buf) { - buf[0] = (byte) (n & 0xff); - buf[1] = (byte) ((n >> 8) & 0xff); - buf[2] = (byte) ((n >> 16) & 0xff); - buf[3] = (byte) ((n >> 24) & 0xff); - buf[4] = (byte) ((n >> 32) & 0xff); - buf[5] = (byte) ((n >> 40) & 0xff); - buf[6] = (byte) ((n >> 48) & 0xff); - buf[7] = (byte) ((n >> 56) & 0xff); + buf[0] = (byte) (n & 0xFF); + buf[1] = (byte) ((n >> 8) & 0xFF); + buf[2] = (byte) ((n >> 16) & 0xFF); + buf[3] = (byte) ((n >> 24) & 0xFF); + buf[4] = (byte) ((n >> 32) & 0xFF); + buf[5] = (byte) ((n >> 40) & 0xFF); + buf[6] = (byte) ((n >> 48) & 0xFF); + buf[7] = (byte) ((n >> 56) & 0xFF); } /** @@ -496,10 +496,10 @@ private static void fixedLongToBytes(long n, byte[] buf) */ private static void fixedIntToBytes(int n, byte[] buf) { - buf[0] = (byte) (n & 0xff); - buf[1] = (byte) ((n >> 8) & 0xff); - buf[2] = (byte) ((n >> 16) & 0xff); - buf[3] = (byte) ((n >> 24) & 0xff); + buf[0] = (byte) (n & 0xFF); + buf[1] = (byte) ((n >> 8) & 0xFF); + buf[2] = (byte) ((n >> 16) & 0xFF); + buf[3] = (byte) ((n >> 24) & 0xFF); } private final byte[] byteDirectBuffer = new byte[1]; @@ -590,7 +590,7 @@ public TField readFieldBegin() short fieldId; // mask off the 4 MSB of the type header. it could contain a field id delta. - short modifier = (short) ((type & 0xf0) >> 4); + short modifier = (short) ((type & 0xF0) >> 4); if (modifier == 0) { // not a delta. look ahead for the zigzag varint field id. fieldId = readI16(); @@ -600,12 +600,12 @@ public TField readFieldBegin() fieldId = (short) (lastFieldId + modifier); } - TField field = new TField("", getTType((byte) (type & 0x0f)), fieldId); + TField field = new TField("", getTType((byte) (type & 0x0F)), fieldId); // if this happens to be a boolean field, the value is encoded in the type if (isBoolType(type)) { // save the boolean value in a special instance variable. - booleanValue = (byte) (type & 0x0f) == Types.BOOLEAN_TRUE ? Boolean.TRUE : Boolean.FALSE; + booleanValue = (byte) (type & 0x0F) == Types.BOOLEAN_TRUE ? Boolean.TRUE : Boolean.FALSE; } // push the new field onto the field stack so we can keep the deltas going. @@ -624,7 +624,7 @@ public TMap readMapBegin() { int size = checkSize(readVarint32()); byte keyAndValueType = size == 0 ? 0 : readByte(); - return new TMap(getTType((byte) (keyAndValueType >> 4)), getTType((byte) (keyAndValueType & 0xf)), size); + return new TMap(getTType((byte) (keyAndValueType >> 4)), getTType((byte) (keyAndValueType & 0xF)), size); } /** @@ -638,7 +638,7 @@ public TList readListBegin() throws TException { byte sizeAndType = readByte(); - int size = (sizeAndType >> 4) & 0x0f; + int size = (sizeAndType >> 4) & 0x0F; if (size == 15) { size = readVarint32(); } @@ -835,7 +835,7 @@ private int readVarint32() int shift = 0; while (true) { byte b = readByte(); - result |= (b & 0x7f) << shift; + result |= (b & 0x7F) << shift; if ((b & 0x80) != 0x80) { break; } @@ -855,7 +855,7 @@ private long readVarint64() long result = 0; while (true) { byte b = readByte(); - result |= (long) (b & 0x7f) << shift; + result |= (long) (b & 0x7F) << shift; if ((b & 0x80) != 0x80) { break; } @@ -891,22 +891,22 @@ private static long zigzagToLong(long n) */ private static long bytesToLong(byte[] bytes) { - return ((bytes[7] & 0xffL) << 56) | - ((bytes[6] & 0xffL) << 48) | - ((bytes[5] & 0xffL) << 40) | - ((bytes[4] & 0xffL) << 32) | - ((bytes[3] & 0xffL) << 24) | - ((bytes[2] & 0xffL) << 16) | - ((bytes[1] & 0xffL) << 8) | - ((bytes[0] & 0xffL)); + return ((bytes[7] & 0xFFL) << 56) | + ((bytes[6] & 0xFFL) << 48) | + ((bytes[5] & 0xFFL) << 40) | + ((bytes[4] & 0xFFL) << 32) | + ((bytes[3] & 0xFFL) << 24) | + ((bytes[2] & 0xFFL) << 16) | + ((bytes[1] & 0xFFL) << 8) | + ((bytes[0] & 0xFFL)); } private static int bytesToInt(byte[] bytes) { - return ((bytes[3] & 0xff) << 24) | - ((bytes[2] & 0xff) << 16) | - ((bytes[1] & 0xff) << 8) | - ((bytes[0] & 0xff)); + return ((bytes[3] & 0xFF) << 24) | + ((bytes[2] & 0xFF) << 16) | + ((bytes[1] & 0xFF) << 8) | + ((bytes[0] & 0xFF)); } // @@ -915,7 +915,7 @@ private static int bytesToInt(byte[] bytes) private static boolean isBoolType(byte b) { - int lowerNibble = b & 0x0f; + int lowerNibble = b & 0x0F; return lowerNibble == Types.BOOLEAN_TRUE || lowerNibble == Types.BOOLEAN_FALSE; } @@ -926,7 +926,7 @@ private static boolean isBoolType(byte b) private static byte getTType(byte type) throws TProtocolException { - switch ((byte) (type & 0x0f)) { + switch ((byte) (type & 0x0F)) { case TType.STOP: return TType.STOP; case Types.BOOLEAN_FALSE: @@ -955,7 +955,7 @@ private static byte getTType(byte type) case Types.STRUCT: return TType.STRUCT; default: - throw new TProtocolException("don't know what type: " + (byte) (type & 0x0f)); + throw new TProtocolException("don't know what type: " + (byte) (type & 0x0F)); } } diff --git a/drift-protocol/src/main/java/io/airlift/drift/protocol/TFacebookCompactProtocol.java b/drift-protocol/src/main/java/io/airlift/drift/protocol/TFacebookCompactProtocol.java index 9ff5974c5..dc449cc14 100644 --- a/drift-protocol/src/main/java/io/airlift/drift/protocol/TFacebookCompactProtocol.java +++ b/drift-protocol/src/main/java/io/airlift/drift/protocol/TFacebookCompactProtocol.java @@ -68,7 +68,7 @@ public class TFacebookCompactProtocol private static final byte PROTOCOL_ID = (byte) 0x82; private static final byte VERSION = 2; - private static final byte VERSION_MASK = 0x1f; // 0001 1111 + private static final byte VERSION_MASK = 0x1F; // 0001 1111 private static final byte TYPE_MASK = (byte) 0xE0; // 1110 0000 private static final byte TYPE_BITS = 0b0000_0111; private static final int TYPE_SHIFT_AMOUNT = 5; @@ -411,7 +411,7 @@ private void writeCollectionBegin(byte elemType, int size) writeByteDirect(size << 4 | getCompactType(elemType)); } else { - writeByteDirect(0xf0 | getCompactType(elemType)); + writeByteDirect(0xF0 | getCompactType(elemType)); writeVarint32(size); } } @@ -481,14 +481,14 @@ private static int intToZigZag(int n) */ private static void fixedLongToBytes(long n, byte[] buf) { - buf[0] = (byte) ((n >> 56) & 0xff); - buf[1] = (byte) ((n >> 48) & 0xff); - buf[2] = (byte) ((n >> 40) & 0xff); - buf[3] = (byte) ((n >> 32) & 0xff); - buf[4] = (byte) ((n >> 24) & 0xff); - buf[5] = (byte) ((n >> 16) & 0xff); - buf[6] = (byte) ((n >> 8) & 0xff); - buf[7] = (byte) (n & 0xff); + buf[0] = (byte) ((n >> 56) & 0xFF); + buf[1] = (byte) ((n >> 48) & 0xFF); + buf[2] = (byte) ((n >> 40) & 0xFF); + buf[3] = (byte) ((n >> 32) & 0xFF); + buf[4] = (byte) ((n >> 24) & 0xFF); + buf[5] = (byte) ((n >> 16) & 0xFF); + buf[6] = (byte) ((n >> 8) & 0xFF); + buf[7] = (byte) (n & 0xFF); } /** @@ -496,10 +496,10 @@ private static void fixedLongToBytes(long n, byte[] buf) */ private static void fixedIntToBytes(int n, byte[] buf) { - buf[0] = (byte) ((n >> 24) & 0xff); - buf[1] = (byte) ((n >> 16) & 0xff); - buf[2] = (byte) ((n >> 8) & 0xff); - buf[3] = (byte) (n & 0xff); + buf[0] = (byte) ((n >> 24) & 0xFF); + buf[1] = (byte) ((n >> 16) & 0xFF); + buf[2] = (byte) ((n >> 8) & 0xFF); + buf[3] = (byte) (n & 0xFF); } private final byte[] byteDirectBuffer = new byte[1]; @@ -590,7 +590,7 @@ public TField readFieldBegin() short fieldId; // mask off the 4 MSB of the type header. it could contain a field id delta. - short modifier = (short) ((type & 0xf0) >> 4); + short modifier = (short) ((type & 0xF0) >> 4); if (modifier == 0) { // not a delta. look ahead for the zigzag varint field id. fieldId = readI16(); @@ -600,12 +600,12 @@ public TField readFieldBegin() fieldId = (short) (lastFieldId + modifier); } - TField field = new TField("", getTType((byte) (type & 0x0f)), fieldId); + TField field = new TField("", getTType((byte) (type & 0x0F)), fieldId); // if this happens to be a boolean field, the value is encoded in the type if (isBoolType(type)) { // save the boolean value in a special instance variable. - booleanValue = (byte) (type & 0x0f) == Types.BOOLEAN_TRUE ? Boolean.TRUE : Boolean.FALSE; + booleanValue = (byte) (type & 0x0F) == Types.BOOLEAN_TRUE ? Boolean.TRUE : Boolean.FALSE; } // push the new field onto the field stack so we can keep the deltas going. @@ -624,7 +624,7 @@ public TMap readMapBegin() { int size = checkSize(readVarint32()); byte keyAndValueType = size == 0 ? 0 : readByte(); - return new TMap(getTType((byte) (keyAndValueType >> 4)), getTType((byte) (keyAndValueType & 0xf)), size); + return new TMap(getTType((byte) (keyAndValueType >> 4)), getTType((byte) (keyAndValueType & 0xF)), size); } /** @@ -638,7 +638,7 @@ public TList readListBegin() throws TException { byte sizeAndType = readByte(); - int size = (sizeAndType >> 4) & 0x0f; + int size = (sizeAndType >> 4) & 0x0F; if (size == 15) { size = readVarint32(); } @@ -835,7 +835,7 @@ private int readVarint32() int shift = 0; while (true) { byte b = readByte(); - result |= (b & 0x7f) << shift; + result |= (b & 0x7F) << shift; if ((b & 0x80) != 0x80) { break; } @@ -855,7 +855,7 @@ private long readVarint64() long result = 0; while (true) { byte b = readByte(); - result |= (long) (b & 0x7f) << shift; + result |= (long) (b & 0x7F) << shift; if ((b & 0x80) != 0x80) { break; } @@ -891,22 +891,22 @@ private static long zigzagToLong(long n) */ private static long bytesToLong(byte[] bytes) { - return ((bytes[0] & 0xffL) << 56) | - ((bytes[1] & 0xffL) << 48) | - ((bytes[2] & 0xffL) << 40) | - ((bytes[3] & 0xffL) << 32) | - ((bytes[4] & 0xffL) << 24) | - ((bytes[5] & 0xffL) << 16) | - ((bytes[6] & 0xffL) << 8) | - (bytes[7] & 0xffL); + return ((bytes[0] & 0xFFL) << 56) | + ((bytes[1] & 0xFFL) << 48) | + ((bytes[2] & 0xFFL) << 40) | + ((bytes[3] & 0xFFL) << 32) | + ((bytes[4] & 0xFFL) << 24) | + ((bytes[5] & 0xFFL) << 16) | + ((bytes[6] & 0xFFL) << 8) | + (bytes[7] & 0xFFL); } private static int bytesToInt(byte[] bytes) { - return ((bytes[0] & 0xff) << 24) | - ((bytes[1] & 0xff) << 16) | - ((bytes[2] & 0xff) << 8) | - ((bytes[3] & 0xff)); + return ((bytes[0] & 0xFF) << 24) | + ((bytes[1] & 0xFF) << 16) | + ((bytes[2] & 0xFF) << 8) | + ((bytes[3] & 0xFF)); } // @@ -915,7 +915,7 @@ private static int bytesToInt(byte[] bytes) private static boolean isBoolType(byte b) { - int lowerNibble = b & 0x0f; + int lowerNibble = b & 0x0F; return lowerNibble == Types.BOOLEAN_TRUE || lowerNibble == Types.BOOLEAN_FALSE; } @@ -926,7 +926,7 @@ private static boolean isBoolType(byte b) private static byte getTType(byte type) throws TProtocolException { - switch ((byte) (type & 0x0f)) { + switch ((byte) (type & 0x0F)) { case TType.STOP: return TType.STOP; case Types.BOOLEAN_FALSE: @@ -955,7 +955,7 @@ private static byte getTType(byte type) case Types.STRUCT: return TType.STRUCT; default: - throw new TProtocolException("don't know what type: " + (byte) (type & 0x0f)); + throw new TProtocolException("don't know what type: " + (byte) (type & 0x0F)); } } diff --git a/drift-protocol/src/main/java/io/airlift/drift/protocol/TProtocol.java b/drift-protocol/src/main/java/io/airlift/drift/protocol/TProtocol.java index f49f39ce5..848f241f9 100644 --- a/drift-protocol/src/main/java/io/airlift/drift/protocol/TProtocol.java +++ b/drift-protocol/src/main/java/io/airlift/drift/protocol/TProtocol.java @@ -16,5 +16,4 @@ package io.airlift.drift.protocol; public interface TProtocol - extends TProtocolReader, TProtocolWriter -{} + extends TProtocolReader, TProtocolWriter {} diff --git a/drift-server/src/main/java/io/airlift/drift/server/guice/DefaultService.java b/drift-server/src/main/java/io/airlift/drift/server/guice/DefaultService.java index ecf196a56..d55d2f1b6 100644 --- a/drift-server/src/main/java/io/airlift/drift/server/guice/DefaultService.java +++ b/drift-server/src/main/java/io/airlift/drift/server/guice/DefaultService.java @@ -28,6 +28,4 @@ @Target({FIELD, PARAMETER, METHOD}) @Retention(RUNTIME) @BindingAnnotation -@interface DefaultService -{ -} +@interface DefaultService {} diff --git a/drift-server/src/main/java/io/airlift/drift/server/guice/MethodInvocationFilterBinder.java b/drift-server/src/main/java/io/airlift/drift/server/guice/MethodInvocationFilterBinder.java index 9f14c669b..ce91b005a 100644 --- a/drift-server/src/main/java/io/airlift/drift/server/guice/MethodInvocationFilterBinder.java +++ b/drift-server/src/main/java/io/airlift/drift/server/guice/MethodInvocationFilterBinder.java @@ -33,7 +33,7 @@ static MethodInvocationFilterBinder staticFilterBinder(MethodInvocationFilter... static MethodInvocationFilterBinder staticFilterBinder(List filters) { - return (filterMultibinder, binder, annotation, prefix) -> { + return (filterMultibinder, _, _, _) -> { for (MethodInvocationFilter filter : filters) { filterMultibinder.addBinding().toInstance(filter); } diff --git a/drift-server/src/main/java/io/airlift/drift/server/stats/JmxMethodInvocationStatsFactory.java b/drift-server/src/main/java/io/airlift/drift/server/stats/JmxMethodInvocationStatsFactory.java index 3060cb8db..5630c71c9 100644 --- a/drift-server/src/main/java/io/airlift/drift/server/stats/JmxMethodInvocationStatsFactory.java +++ b/drift-server/src/main/java/io/airlift/drift/server/stats/JmxMethodInvocationStatsFactory.java @@ -49,7 +49,7 @@ public synchronized MethodInvocationStat getStat(ThriftServiceMetadata serviceMe objectNameBuilder.withProperty("method", metadata.getName()); String objectName = objectNameBuilder.build(); - return stats.computeIfAbsent(objectName, name -> { + return stats.computeIfAbsent(objectName, _ -> { JmxMethodInvocationStat stat = new JmxMethodInvocationStat(metadata.getName()); exporter.export(objectName, stat); return stat; diff --git a/drift-server/src/test/java/io/airlift/drift/server/TestDriftServer.java b/drift-server/src/test/java/io/airlift/drift/server/TestDriftServer.java index b6d93209e..301bd1f32 100644 --- a/drift-server/src/test/java/io/airlift/drift/server/TestDriftServer.java +++ b/drift-server/src/test/java/io/airlift/drift/server/TestDriftServer.java @@ -356,7 +356,5 @@ public void assertInvocation(String expectedMethodName, int expectedId, String e @ThriftStruct("testService") public static class TestServiceException - extends Exception - { - } + extends Exception {} } diff --git a/drift-server/src/test/java/io/airlift/drift/server/TestingMethodInvocationStatsFactory.java b/drift-server/src/test/java/io/airlift/drift/server/TestingMethodInvocationStatsFactory.java index ac8eacd46..6a6669840 100644 --- a/drift-server/src/test/java/io/airlift/drift/server/TestingMethodInvocationStatsFactory.java +++ b/drift-server/src/test/java/io/airlift/drift/server/TestingMethodInvocationStatsFactory.java @@ -39,7 +39,7 @@ public TestingMethodInvocationStat getStat(String serviceName, Optional @Override public TestingMethodInvocationStat getStat(ThriftServiceMetadata serviceMetadata, Optional qualifier, MethodMetadata metadata) { - return stats.computeIfAbsent(new Key(serviceMetadata.getName(), qualifier, metadata.getName()), key -> new TestingMethodInvocationStat()); + return stats.computeIfAbsent(new Key(serviceMetadata.getName(), qualifier, metadata.getName()), _ -> new TestingMethodInvocationStat()); } private static class Key diff --git a/drift-transport-apache/src/main/java/io/airlift/drift/transport/apache/client/ApacheThriftMethodInvokerFactory.java b/drift-transport-apache/src/main/java/io/airlift/drift/transport/apache/client/ApacheThriftMethodInvokerFactory.java index 01133126f..3bd7526ea 100644 --- a/drift-transport-apache/src/main/java/io/airlift/drift/transport/apache/client/ApacheThriftMethodInvokerFactory.java +++ b/drift-transport-apache/src/main/java/io/airlift/drift/transport/apache/client/ApacheThriftMethodInvokerFactory.java @@ -71,7 +71,7 @@ public static ApacheThriftMethodInvokerFactory createStaticApacheThriftMethod ApacheThriftConnectionFactoryConfig factoryConfig) { requireNonNull(clientConfig, "clientConfig is null"); - return new ApacheThriftMethodInvokerFactory<>(factoryConfig, clientIdentity -> clientConfig); + return new ApacheThriftMethodInvokerFactory<>(factoryConfig, _ -> clientConfig); } @Inject diff --git a/drift-transport-apache/src/test/java/io/airlift/drift/transport/apache/TestApacheThriftMethodInvoker.java b/drift-transport-apache/src/test/java/io/airlift/drift/transport/apache/TestApacheThriftMethodInvoker.java index 45c441500..f33eea418 100644 --- a/drift-transport-apache/src/test/java/io/airlift/drift/transport/apache/TestApacheThriftMethodInvoker.java +++ b/drift-transport-apache/src/test/java/io/airlift/drift/transport/apache/TestApacheThriftMethodInvoker.java @@ -196,7 +196,7 @@ private static int logApacheThriftInvocationHandler(HostAndPort address, List methodInvokerFactory = new ApacheThriftMethodInvokerFactory<>(factoryConfig, clientIdentity -> config)) { + try (ApacheThriftMethodInvokerFactory methodInvokerFactory = new ApacheThriftMethodInvokerFactory<>(factoryConfig, _ -> config)) { MethodInvoker methodInvoker = methodInvokerFactory.createMethodInvoker(null); ParameterMetadata parameter = new ParameterMetadata( @@ -227,7 +227,7 @@ private static int logApacheThriftInvocationHandlerOptional(HostAndPort address, { ApacheThriftClientConfig config = new ApacheThriftClientConfig(); ApacheThriftConnectionFactoryConfig factoryConfig = new ApacheThriftConnectionFactoryConfig(); - try (ApacheThriftMethodInvokerFactory methodInvokerFactory = new ApacheThriftMethodInvokerFactory<>(factoryConfig, clientIdentity -> config)) { + try (ApacheThriftMethodInvokerFactory methodInvokerFactory = new ApacheThriftMethodInvokerFactory<>(factoryConfig, _ -> config)) { MethodInvoker methodInvoker = methodInvokerFactory.createMethodInvoker(null); ThriftType optionalType = optional(list(codecManager.getCatalog().getThriftType(DriftLogEntry.class))); diff --git a/drift-transport-apache/src/test/java/io/airlift/drift/transport/apache/scribe/apache/LogEntry.java b/drift-transport-apache/src/test/java/io/airlift/drift/transport/apache/scribe/apache/LogEntry.java index 8c54842c5..8d3939206 100644 --- a/drift-transport-apache/src/test/java/io/airlift/drift/transport/apache/scribe/apache/LogEntry.java +++ b/drift-transport-apache/src/test/java/io/airlift/drift/transport/apache/scribe/apache/LogEntry.java @@ -30,7 +30,10 @@ @SuppressWarnings(value = {"ALL", "all"}) public class LogEntry - implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable + implements Cloneable, + Comparable, + java.io.Serializable, + org.apache.thrift.TBase { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LogEntry"); @@ -127,9 +130,13 @@ public String getFieldName() static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class); - tmpMap.put(_Fields.CATEGORY, new org.apache.thrift.meta_data.FieldMetaData("category", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.CATEGORY, new org.apache.thrift.meta_data.FieldMetaData( + "category", + org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData( + "message", + org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LogEntry.class, metaDataMap); diff --git a/drift-transport-apache/src/test/java/io/airlift/drift/transport/apache/scribe/apache/scribe.java b/drift-transport-apache/src/test/java/io/airlift/drift/transport/apache/scribe/apache/scribe.java index 363aa9408..6459d97c7 100644 --- a/drift-transport-apache/src/test/java/io/airlift/drift/transport/apache/scribe/apache/scribe.java +++ b/drift-transport-apache/src/test/java/io/airlift/drift/transport/apache/scribe/apache/scribe.java @@ -125,7 +125,8 @@ public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransp } } - public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory, + public AsyncClient( + org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.transport.TNonblockingTransport transport) { @@ -146,7 +147,8 @@ public static class Log_call { private List messages; - public Log_call(List messages, + public Log_call( + List messages, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, @@ -234,7 +236,10 @@ public Log_result getResult(I iface, Log_args args) } public static class Log_args - implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable + implements Cloneable, + Comparable, + java.io.Serializable, + org.apache.thrift.TBase { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Log_args"); @@ -331,9 +336,7 @@ public String getFieldName() org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Log_args.class, metaDataMap); } - public Log_args() - { - } + public Log_args() {} public Log_args( List messages) @@ -725,7 +728,10 @@ private static S scheme(org.apache. } public static class Log_result - implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable + implements Cloneable, + Comparable, + java.io.Serializable, + org.apache.thrift.TBase { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Log_result"); @@ -820,15 +826,15 @@ public String getFieldName() static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class); - tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData( + "success", + org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ResultCode.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Log_result.class, metaDataMap); } - public Log_result() - { - } + public Log_result() {} public Log_result( ResultCode success) diff --git a/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/client/ConnectionPool.java b/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/client/ConnectionPool.java index 4ebd1e48d..d037ae248 100644 --- a/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/client/ConnectionPool.java +++ b/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/client/ConnectionPool.java @@ -105,9 +105,9 @@ private Future createConnection(ConnectionKey key) Future future = connectionFactory.getConnection(key.getConnectionParameters(), key.getAddress()); // remove connection from cache when it is closed - future.addListener(channelFuture -> { + future.addListener(_ -> { if (future.isSuccess()) { - future.getNow().closeFuture().addListener(closeFuture -> cachedConnections.asMap().remove(key, future)); + future.getNow().closeFuture().addListener(_ -> cachedConnections.asMap().remove(key, future)); } }); @@ -115,9 +115,7 @@ private Future createConnection(ConnectionKey key) } @Override - public void returnConnection(Channel connection) - { - } + public void returnConnection(Channel connection) {} @Override public synchronized void close() @@ -137,7 +135,7 @@ public synchronized void close() private static void closeConnection(Future future) { - future.addListener(ignored -> { + future.addListener(_ -> { if (future.isSuccess()) { Channel channel = future.getNow(); channel.close(); diff --git a/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/client/DriftNettyMethodInvokerFactory.java b/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/client/DriftNettyMethodInvokerFactory.java index 87fbe7be9..5f855f2af 100644 --- a/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/client/DriftNettyMethodInvokerFactory.java +++ b/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/client/DriftNettyMethodInvokerFactory.java @@ -58,7 +58,7 @@ public static DriftNettyMethodInvokerFactory createStaticDriftNettyMethodInvo @VisibleForTesting public static DriftNettyMethodInvokerFactory createStaticDriftNettyMethodInvokerFactory(DriftNettyClientConfig clientConfig, ByteBufAllocator allocator) { - return new DriftNettyMethodInvokerFactory<>(new DriftNettyConnectionFactoryConfig(), clientIdentity -> clientConfig, allocator); + return new DriftNettyMethodInvokerFactory<>(new DriftNettyConnectionFactoryConfig(), _ -> clientConfig, allocator); } public DriftNettyMethodInvokerFactory( diff --git a/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/client/InvocationResponseFuture.java b/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/client/InvocationResponseFuture.java index aa8467a75..ca011adfa 100644 --- a/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/client/InvocationResponseFuture.java +++ b/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/client/InvocationResponseFuture.java @@ -103,7 +103,9 @@ private synchronized void tryInvocation(Channel channel) try { invocationFuture = new ThriftRequest(request.getMethod(), request.getParameters(), request.getHeaders()); - Futures.addCallback(invocationFuture, new FutureCallback() + Futures.addCallback( + invocationFuture, + new FutureCallback() { @Override public void onSuccess(Object result) diff --git a/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/client/ThriftClientHandler.java b/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/client/ThriftClientHandler.java index 967ffa06f..8a2fc3f7c 100644 --- a/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/client/ThriftClientHandler.java +++ b/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/client/ThriftClientHandler.java @@ -142,7 +142,7 @@ private void sendMessage(ChannelHandlerContext context, ThriftRequest thriftRequ true); ChannelFuture sendFuture = context.write(thriftFrame, promise); - sendFuture.addListener(future -> messageSent(context, sendFuture, requestHandler)); + sendFuture.addListener(_ -> messageSent(context, sendFuture, requestHandler)); } catch (Throwable t) { onError(context, t, Optional.of(requestHandler)); diff --git a/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/codec/HeaderTransport.java b/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/codec/HeaderTransport.java index 7caa58dd3..b819f6547 100644 --- a/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/codec/HeaderTransport.java +++ b/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/codec/HeaderTransport.java @@ -236,7 +236,7 @@ private static int readVariableLengthInt(ByteBuf messageHeader) while (true) { byte b = messageHeader.readByte(); - result |= (b & 0x7f) << shift; + result |= (b & 0x7F) << shift; if ((b & 0x80) != 0x80) { break; } diff --git a/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/server/ThriftServerHandler.java b/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/server/ThriftServerHandler.java index 653be9df1..3f3cf7532 100644 --- a/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/server/ThriftServerHandler.java +++ b/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/server/ThriftServerHandler.java @@ -150,7 +150,9 @@ private void messageReceived(ChannelHandlerContext context, ThriftFrame frame) frame.getProtocol(), frame.getHeaders(), frame.isSupportOutOfOrderResponse()); - Futures.addCallback(response, new FutureCallback() + Futures.addCallback( + response, + new FutureCallback() { @Override public void onSuccess(ThriftFrame result) @@ -336,7 +338,8 @@ private static ThriftFrame writeSuccessResponse( } } - private static ThriftFrame writeExceptionResponse(ChannelHandlerContext context, + private static ThriftFrame writeExceptionResponse( + ChannelHandlerContext context, MethodMetadata methodMetadata, Transport transport, Protocol protocol, diff --git a/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/ssl/SslContextFactory.java b/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/ssl/SslContextFactory.java index 779684992..8357b9b4f 100644 --- a/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/ssl/SslContextFactory.java +++ b/drift-transport-netty/src/main/java/io/airlift/drift/transport/netty/ssl/SslContextFactory.java @@ -111,7 +111,8 @@ public SslContextParameters( Optional privateKeyFile, Optional privateKeyPassword, long sessionCacheSize, - Duration sessionTimeout, List ciphers) + Duration sessionTimeout, + List ciphers) { this.trustCertificatesFile = requireNonNull(trustCertificatesFile, "trustCertificatesFile is null"); this.clientCertificatesFile = requireNonNull(clientCertificatesFile, "clientCertificatesFile is null"); diff --git a/drift-transport-netty/src/test/java/io/airlift/drift/transport/netty/client/TestDriftNettyMethodInvoker.java b/drift-transport-netty/src/test/java/io/airlift/drift/transport/netty/client/TestDriftNettyMethodInvoker.java index 9e2c21fb4..b1888d7ca 100644 --- a/drift-transport-netty/src/test/java/io/airlift/drift/transport/netty/client/TestDriftNettyMethodInvoker.java +++ b/drift-transport-netty/src/test/java/io/airlift/drift/transport/netty/client/TestDriftNettyMethodInvoker.java @@ -300,7 +300,7 @@ private static int logNiftyInvocationHandler(HostAndPort address, List methodInvokerFactory = new DriftNettyMethodInvokerFactory<>( new DriftNettyConnectionFactoryConfig(), - clientIdentity -> config, + _ -> config, testingAllocator)) { MethodInvoker methodInvoker = methodInvokerFactory.createMethodInvoker(null); @@ -376,7 +376,7 @@ private static int logNiftyInvocationHandlerOptional(HostAndPort address, List methodInvokerFactory = new DriftNettyMethodInvokerFactory<>( new DriftNettyConnectionFactoryConfig(), - clientIdentity -> config, + _ -> config, testingAllocator)) { MethodInvoker methodInvoker = methodInvokerFactory.createMethodInvoker(null); diff --git a/drift-transport-netty/src/test/java/io/airlift/drift/transport/netty/scribe/apache/LogEntry.java b/drift-transport-netty/src/test/java/io/airlift/drift/transport/netty/scribe/apache/LogEntry.java index 48a51b64e..89baad917 100644 --- a/drift-transport-netty/src/test/java/io/airlift/drift/transport/netty/scribe/apache/LogEntry.java +++ b/drift-transport-netty/src/test/java/io/airlift/drift/transport/netty/scribe/apache/LogEntry.java @@ -30,7 +30,10 @@ @SuppressWarnings(value = {"ALL", "all"}) public class LogEntry - implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable + implements Cloneable, + Comparable, + java.io.Serializable, + org.apache.thrift.TBase { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LogEntry"); @@ -127,9 +130,13 @@ public String getFieldName() static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class); - tmpMap.put(_Fields.CATEGORY, new org.apache.thrift.meta_data.FieldMetaData("category", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.CATEGORY, new org.apache.thrift.meta_data.FieldMetaData( + "category", + org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData( + "message", + org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LogEntry.class, metaDataMap); diff --git a/drift-transport-netty/src/test/java/io/airlift/drift/transport/netty/scribe/apache/scribe.java b/drift-transport-netty/src/test/java/io/airlift/drift/transport/netty/scribe/apache/scribe.java index 553f774a9..8638548c3 100644 --- a/drift-transport-netty/src/test/java/io/airlift/drift/transport/netty/scribe/apache/scribe.java +++ b/drift-transport-netty/src/test/java/io/airlift/drift/transport/netty/scribe/apache/scribe.java @@ -125,7 +125,8 @@ public AsyncClient getAsyncClient(org.apache.thrift.transport.TNonblockingTransp } } - public AsyncClient(org.apache.thrift.protocol.TProtocolFactory protocolFactory, + public AsyncClient( + org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.async.TAsyncClientManager clientManager, org.apache.thrift.transport.TNonblockingTransport transport) { @@ -146,7 +147,8 @@ public static class Log_call { private List messages; - public Log_call(List messages, + public Log_call( + List messages, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, @@ -234,7 +236,10 @@ public Log_result getResult(I iface, Log_args args) } public static class Log_args - implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable + implements Cloneable, + Comparable, + java.io.Serializable, + org.apache.thrift.TBase { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Log_args"); @@ -331,9 +336,7 @@ public String getFieldName() org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Log_args.class, metaDataMap); } - public Log_args() - { - } + public Log_args() {} public Log_args( List messages) @@ -725,7 +728,10 @@ private static S scheme(org.apache. } public static class Log_result - implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable + implements Cloneable, + Comparable, + java.io.Serializable, + org.apache.thrift.TBase { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Log_result"); @@ -820,15 +826,15 @@ public String getFieldName() static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<>(_Fields.class); - tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData( + "success", + org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ResultCode.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Log_result.class, metaDataMap); } - public Log_result() - { - } + public Log_result() {} public Log_result( ResultCode success)