Merge remote-tracking branch 'sm/bumpAirbase'

Author: unidevel

drift-codec/src/main/java/com/facebook/drift/codec/internal/compiler/ThriftCodecByteCodeGenerator.java

@@ -53,6 +53,7 @@
 import com.facebook.drift.protocol.TProtocolWriter;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.MoreCollectors;
 import com.google.common.reflect.TypeToken;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -111,7 +112,6 @@
 import static com.facebook.drift.codec.ThriftProtocolType.STRING;
 import static com.facebook.drift.codec.ThriftProtocolType.STRUCT;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.Iterables.getOnlyElement;
 import static java.lang.String.format;
 import static java.util.stream.Collectors.joining;
 
@@ -540,7 +540,8 @@ private Variable buildUnion(MethodDefinition method, Variable fieldId, Map<Short
         method.getBody().append(switchBuilder.build());
 
         // find the @ThriftUnionId field
-        ThriftFieldMetadata idField = getOnlyElement(metadata.getFields(FieldKind.THRIFT_UNION_ID));
+        ThriftFieldMetadata idField = metadata.getFields(FieldKind.THRIFT_UNION_ID).stream()
+                .collect(MoreCollectors.onlyElement());
 
         injectIdField(method, idField, instance, fieldId);
 
@@ -810,7 +811,8 @@ private void defineWriteUnionMethod()
         body.append(writer.invoke("writeStructBegin", void.class, constantString(metadata.getStructName())));
 
         // find the @ThriftUnionId field
-        ThriftFieldMetadata idField = getOnlyElement(metadata.getFields(FieldKind.THRIFT_UNION_ID));
+        ThriftFieldMetadata idField = metadata.getFields(FieldKind.THRIFT_UNION_ID).stream()
+                .collect(MoreCollectors.onlyElement());
 
         // load its value
         BytecodeExpression value = getFieldValue(method, idField);

drift-codec/src/main/java/com/facebook/drift/codec/internal/reflection/ReflectionThriftUnionCodec.java

@@ -29,13 +29,13 @@
 import com.facebook.drift.protocol.TProtocolReader;
 import com.facebook.drift.protocol.TProtocolWriter;
 import com.google.common.collect.Maps;
+import com.google.common.collect.MoreCollectors;
 
 import javax.annotation.concurrent.Immutable;
 
 import java.util.Map;
 
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.collect.Maps.uniqueIndex;
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
@@ -51,7 +51,8 @@ public ReflectionThriftUnionCodec(ThriftCodecManager manager, ThriftStructMetada
     {
         super(manager, metadata);
 
-        ThriftFieldMetadata idField = getOnlyElement(metadata.getFields(FieldKind.THRIFT_UNION_ID));
+        ThriftFieldMetadata idField = metadata.getFields(FieldKind.THRIFT_UNION_ID).stream()
+                .collect(MoreCollectors.onlyElement());
 
         this.idField = Maps.immutableEntry(idField, manager.getCodec(idField.getThriftType()));
         requireNonNull(this.idField.getValue(), () -> "No codec for ID field found: " + idField);

drift-codec/src/main/java/com/facebook/drift/codec/metadata/AbstractThriftMetadataBuilder.java

@@ -19,7 +19,7 @@
 import com.facebook.drift.annotations.ThriftField;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
+import com.google.common.collect.MoreCollectors;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 import com.google.common.reflect.TypeToken;
@@ -584,7 +584,8 @@ protected final void inferThriftFieldIds(Multimap<String, FieldMetadata> fieldsB
             // single id, so set on all fields in this group (groups with no id are handled later),
             // and validate isLegacyId is consistent and correct.
             if (ids.size() == 1) {
-                short id = Iterables.getOnlyElement(ids);
+                short id = ids.stream()
+                        .collect(MoreCollectors.onlyElement());
 
                 boolean isLegacyId = extractFieldIsLegacyId(id, fieldName, fields);
 

drift-codec/src/main/java/com/facebook/drift/codec/metadata/ThriftServiceMetadata.java

@@ -18,7 +18,7 @@
 import com.facebook.drift.annotations.ThriftMethod;
 import com.facebook.drift.annotations.ThriftService;
 import com.google.common.collect.ComparisonChain;
-import com.google.common.collect.Iterables;
+import com.google.common.collect.MoreCollectors;
 
 import javax.annotation.concurrent.Immutable;
 
@@ -103,7 +103,8 @@ public static ThriftService getThriftServiceAnnotation(Class<?> serviceClass)
         checkArgument(!serviceAnnotations.isEmpty(), "Service class %s is not annotated with @ThriftService", serviceClass.getName());
         checkArgument(serviceAnnotations.size() == 1, "Service class %s has multiple conflicting @ThriftService annotations: %s", serviceClass.getName(), serviceAnnotations);
 
-        return Iterables.getOnlyElement(serviceAnnotations);
+        return serviceAnnotations.stream()
+                .collect(MoreCollectors.onlyElement());
     }
 
     @Override

drift-codec/src/main/java/com/facebook/drift/codec/metadata/ThriftStructMetadataBuilder.java

@@ -20,7 +20,7 @@
 import com.facebook.drift.codec.metadata.ThriftStructMetadata.MetadataType;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
+import com.google.common.collect.MoreCollectors;
 
 import javax.annotation.concurrent.NotThreadSafe;
 
@@ -141,7 +141,8 @@ public ThriftStructMetadata build()
 
     private ThriftConstructorInjection buildConstructorInjection()
     {
-        ConstructorInjection injection = Iterables.getOnlyElement(constructorInjections);
+        ConstructorInjection injection = constructorInjections.stream()
+                .collect(MoreCollectors.onlyElement());
         return new ThriftConstructorInjection(injection.getConstructor(), buildParameterInjections(injection.getParameters()));
     }
 

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.facebook.airlift</groupId>
         <artifactId>airbase</artifactId>
-        <version>95</version>
+        <version>107</version>
     </parent>
 
     <groupId>com.facebook.drift</groupId>
@@ -154,12 +154,6 @@
                 <version>${dep.airlift.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>units</artifactId>
-                <version>${dep.airlift.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>io.airlift</groupId>
                 <artifactId>parameternames</artifactId>
@@ -321,6 +315,18 @@
                 <artifactId>joda-time</artifactId>
                 <version>2.9.9</version>
             </dependency>
+
+            <dependency>
+                <groupId>javax.validation</groupId>
+                <artifactId>validation-api</artifactId>
+                <version>2.0.1.Final</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.google.inject</groupId>
+                <artifactId>guice</artifactId>
+                <version>4.2.2</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>