Revert "Add FieldDescriptor support to DataEncoder. (#1608)" (#1648)

This reverts commit d0a55d4.

Author: davidmotson

encoders/firebase-encoders-json/api.txt

@@ -15,7 +15,6 @@ package com.google.firebase.encoders {
     method @NonNull public static com.google.firebase.encoders.FieldDescriptor.Builder builder(@NonNull String);
     method @NonNull public String getName();
     method @Nullable public <T extends java.lang.annotation.Annotation> T getProperty(@NonNull Class<T>);
-    method @NonNull public static com.google.firebase.encoders.FieldDescriptor of(@NonNull String);
   }
 
   public static final class FieldDescriptor.Builder {
@@ -27,19 +26,13 @@ package com.google.firebase.encoders {
   }
 
   public interface ObjectEncoderContext {
-    method @Deprecated @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, @Nullable Object) throws java.io.IOException;
-    method @Deprecated @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, double) throws java.io.IOException;
-    method @Deprecated @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, int) throws java.io.IOException;
-    method @Deprecated @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, long) throws java.io.IOException;
-    method @Deprecated @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, boolean) throws java.io.IOException;
-    method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull com.google.firebase.encoders.FieldDescriptor, @Nullable Object) throws java.io.IOException;
-    method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull com.google.firebase.encoders.FieldDescriptor, double) throws java.io.IOException;
-    method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull com.google.firebase.encoders.FieldDescriptor, int) throws java.io.IOException;
-    method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull com.google.firebase.encoders.FieldDescriptor, long) throws java.io.IOException;
-    method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull com.google.firebase.encoders.FieldDescriptor, boolean) throws java.io.IOException;
+    method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, @Nullable Object) throws java.io.IOException;
+    method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, double) throws java.io.IOException;
+    method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, int) throws java.io.IOException;
+    method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, long) throws java.io.IOException;
+    method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, boolean) throws java.io.IOException;
     method @NonNull public com.google.firebase.encoders.ObjectEncoderContext inline(@Nullable Object) throws java.io.IOException;
     method @NonNull public com.google.firebase.encoders.ObjectEncoderContext nested(@NonNull String) throws java.io.IOException;
-    method @NonNull public com.google.firebase.encoders.ObjectEncoderContext nested(@NonNull com.google.firebase.encoders.FieldDescriptor) throws java.io.IOException;
   }
 
   public interface ValueEncoder<T> {

encoders/firebase-encoders-json/src/json/java/com/google/firebase/encoders/json/JsonValueObjectEncoderContext.java

@@ -19,7 +19,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.firebase.encoders.EncodingException;
-import com.google.firebase.encoders.FieldDescriptor;
 import com.google.firebase.encoders.ObjectEncoder;
 import com.google.firebase.encoders.ObjectEncoderContext;
 import com.google.firebase.encoders.ValueEncoder;
@@ -103,38 +102,6 @@ public JsonValueObjectEncoderContext add(@NonNull String name, boolean value) th
     return add(value);
   }
 
-  @NonNull
-  @Override
-  public ObjectEncoderContext add(@NonNull FieldDescriptor field, @Nullable Object obj)
-      throws IOException {
-    return add(field.getName(), obj);
-  }
-
-  @NonNull
-  @Override
-  public ObjectEncoderContext add(@NonNull FieldDescriptor field, double value) throws IOException {
-    return add(field.getName(), value);
-  }
-
-  @NonNull
-  @Override
-  public ObjectEncoderContext add(@NonNull FieldDescriptor field, int value) throws IOException {
-    return add(field.getName(), value);
-  }
-
-  @NonNull
-  @Override
-  public ObjectEncoderContext add(@NonNull FieldDescriptor field, long value) throws IOException {
-    return add(field.getName(), value);
-  }
-
-  @NonNull
-  @Override
-  public ObjectEncoderContext add(@NonNull FieldDescriptor field, boolean value)
-      throws IOException {
-    return add(field.getName(), value);
-  }
-
   @NonNull
   @Override
   public ObjectEncoderContext inline(@Nullable Object value) throws IOException {
@@ -151,12 +118,6 @@ public ObjectEncoderContext nested(@NonNull String name) throws IOException {
     return childContext;
   }
 
-  @NonNull
-  @Override
-  public ObjectEncoderContext nested(@NonNull FieldDescriptor field) throws IOException {
-    return nested(field.getName());
-  }
-
   @NonNull
   @Override
   public JsonValueObjectEncoderContext add(@Nullable String value) throws IOException {

encoders/firebase-encoders-json/src/main/java/com/google/firebase/encoders/FieldDescriptor.java

@@ -67,11 +67,6 @@ public <T extends Annotation> T getProperty(@NonNull Class<T> type) {
     return (T) properties.get(type);
   }
 
-  @NonNull
-  public static FieldDescriptor of(@NonNull String name) {
-    return new FieldDescriptor(name, Collections.emptyMap());
-  }
-
   @NonNull
   public static Builder builder(@NonNull String name) {
     return new Builder(name);

encoders/firebase-encoders-json/src/main/java/com/google/firebase/encoders/ObjectEncoderContext.java

@@ -35,99 +35,37 @@ public interface ObjectEncoderContext {
    *
    * <p>{@code obj} can be an array. If the elements of the array are primitive types, they will be
    * directly encoded. Otherwise, the matching {@code Encoder} registered for the type will be used.
-   * In this case, the value of the entry will be an encoded array obtained by sequentially applying
+   * In this case, the value of the entry will be an encoded array obtained by sequencially applying
    * the encoder to each element of the array. Nested arrays are supported.
    *
    * <p>{@code obj} can be a {@link java.util.Collection}. The matching {@code Encoder} registered
    * for the type contained within the collection will be used. In this case, the value of the entry
-   * will be an encoded array obtained by sequentially applying the encoder to each element of the
+   * will be an encoded array obtained by sequencially applying the encoder to each element of the
    * array. Nested collections are supported.
    *
    * <p>If {@code obj} does not match any of the criteria above, or if there's no matching {@code
    * Encoder} for the type, an {@code EncodingException} will be thrown. Also, any exceptions thrown
    * by the encoders will be propagated.
-   *
-   * @deprecated Use {@link #add(FieldDescriptor, Object)} instead.
    */
-  @Deprecated
   @NonNull
   ObjectEncoderContext add(@NonNull String name, @Nullable Object obj) throws IOException;
 
-  /**
-   * Add an entry with {@code name} mapped to the encoded primitive type of {@code value}.
-   *
-   * @deprecated Use {@link #add(FieldDescriptor, double)} instead.
-   */
-  @Deprecated
+  /** Add an entry with {@code name} mapped to the encoded primitive type of {@code value}. */
   @NonNull
   ObjectEncoderContext add(@NonNull String name, double value) throws IOException;
 
-  /**
-   * Add an entry with {@code name} mapped to the encoded primitive type of {@code value}.
-   *
-   * @deprecated Use {@link #add(FieldDescriptor, double)} instead.
-   */
-  @Deprecated
+  /** Add an entry with {@code name} mapped to the encoded primitive type of {@code value}. */
   @NonNull
   ObjectEncoderContext add(@NonNull String name, int value) throws IOException;
 
-  /**
-   * Add an entry with {@code name} mapped to the encoded primitive type of {@code value}.
-   *
-   * @deprecated Use {@link #add(FieldDescriptor, double)} instead.
-   */
-  @Deprecated
+  /** Add an entry with {@code name} mapped to the encoded primitive type of {@code value}. */
   @NonNull
   ObjectEncoderContext add(@NonNull String name, long value) throws IOException;
 
-  /**
-   * Add an entry with {@code name} mapped to the encoded primitive type of {@code value}.
-   *
-   * @deprecated Use {@link #add(FieldDescriptor, double)} instead.
-   */
-  @Deprecated
+  /** Add an entry with {@code name} mapped to the encoded primitive type of {@code value}. */
   @NonNull
   ObjectEncoderContext add(@NonNull String name, boolean value) throws IOException;
 
-  /**
-   * Add an entry with {@code field} mapped to the encoded version of {@code obj}.
-   *
-   * <p>{@code obj} can be a regular type with a matching {@code Encoder} registered. In this case,
-   * the value of the entry will be the encoded version of {@code obj}.
-   *
-   * <p>{@code obj} can be an array. If the elements of the array are primitive types, they will be
-   * directly encoded. Otherwise, the matching {@code Encoder} registered for the type will be used.
-   * In this case, the value of the entry will be an encoded array obtained by sequentially applying
-   * the encoder to each element of the array. Nested arrays are supported.
-   *
-   * <p>{@code obj} can be a {@link java.util.Collection}. The matching {@code Encoder} registered
-   * for the type contained within the collection will be used. In this case, the value of the entry
-   * will be an encoded array obtained by sequentially applying the encoder to each element of the
-   * array. Nested collections are supported.
-   *
-   * <p>If {@code obj} does not match any of the criteria above, or if there's no matching {@code
-   * Encoder} for the type, an {@code EncodingException} will be thrown. Also, any exceptions thrown
-   * by the encoders will be propagated.
-   */
-  @NonNull
-  ObjectEncoderContext add(@NonNull FieldDescriptor field, @Nullable Object obj) throws IOException;
-
-  /** Add an entry with {@code field} mapped to the encoded primitive type of {@code value}. */
-  @NonNull
-  ObjectEncoderContext add(@NonNull FieldDescriptor field, double value) throws IOException;
-
-  /** Add an entry with {@code field} mapped to the encoded primitive type of {@code value}. */
-  @NonNull
-  ObjectEncoderContext add(@NonNull FieldDescriptor field, int value) throws IOException;
-
-  /** Add an entry with {@code field} mapped to the encoded primitive type of {@code value}. */
-  @NonNull
-  ObjectEncoderContext add(@NonNull FieldDescriptor field, long value) throws IOException;
-
-  /** Add an entry with {@code field} mapped to the encoded primitive type of {@code value}. */
-  @NonNull
-  ObjectEncoderContext add(@NonNull FieldDescriptor field, boolean value) throws IOException;
-
   /**
    * Encodes a given object inline in current context.
    *
@@ -171,28 +109,4 @@ public interface ObjectEncoderContext {
    */
   @NonNull
   ObjectEncoderContext nested(@NonNull String name) throws IOException;
-
-  /**
-   * Begin a nested JSON object.
-   *
-   * <p>Unlike {@code add()} methods, this method returns a new "child" context that's used to
-   * populate the nested JSON object. This context can only be used until the parent context is
-   * mutated by calls to {@code add()} or {@code nested()}, violating this will result in a {@link
-   * IllegalStateException}.
-   *
-   * <p>Nesting can be arbitrarily deep.
-   *
-   * <p>Example:
-   *
-   * <pre>{@code
-   * ctx.add("key", "value");
-   * ObjectEncoderContext nested = ctx.nested("nested");
-   * nested.add("key", "value");
-   *
-   * // After this call the above nested context is invalid.
-   * ctx.add("anotherKey", 1);
-   * }</pre>
-   */
-  @NonNull
-  ObjectEncoderContext nested(@NonNull FieldDescriptor field) throws IOException;
 }

encoders/firebase-encoders-processor/src/main/java/com/google/firebase/encoders/processor/EncodableProcessor.java

@@ -18,12 +18,9 @@
 import com.google.auto.service.AutoService;
 import com.google.auto.value.AutoValue;
 import com.google.firebase.encoders.annotations.Encodable;
-import com.google.firebase.encoders.processor.getters.AnnotationDescriptor;
-import com.google.firebase.encoders.processor.getters.AnnotationProperty;
 import com.google.firebase.encoders.processor.getters.Getter;
 import com.google.firebase.encoders.processor.getters.GetterFactory;
 import com.squareup.javapoet.ClassName;
-import com.squareup.javapoet.CodeBlock;
 import com.squareup.javapoet.FieldSpec;
 import com.squareup.javapoet.JavaFile;
 import com.squareup.javapoet.MethodSpec;
@@ -60,7 +57,6 @@
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
 public class EncodableProcessor extends AbstractProcessor {
 
-  private static final String CODEGEN_VERSION = "2";
   static final String ENCODABLE_ANNOTATION = "com.google.firebase.encoders.annotations.Encodable";
   private Elements elements;
   private Types types;
@@ -88,11 +84,6 @@ public boolean process(Set<? extends TypeElement> set, RoundEnvironment roundEnv
   }
 
   private void processClass(Element element) {
-    if (types.isAssignable(
-        element.asType(), elements.getTypeElement("java.lang.annotation.Annotation").asType())) {
-      return;
-    }
-
     // generates class of the following shape:
     //
     // public class AutoFooEncoder implements Configurator {
@@ -116,7 +107,7 @@ private void processClass(Element element) {
                         Modifier.PUBLIC,
                         Modifier.STATIC,
                         Modifier.FINAL)
-                    .initializer(CODEGEN_VERSION)
+                    .initializer("1")
                     .build())
             .addField(
                 FieldSpec.builder(
@@ -268,47 +259,12 @@ public VisitResult<Encoder> visit(TypeMirror type) {
               .addAnnotation(Override.class);
 
       Set<TypeMirror> result = new LinkedHashSet<>();
-      Set<FieldSpec> descriptorFields = new LinkedHashSet<>();
-      ClassName fieldDescriptor = ClassName.get("com.google.firebase.encoders", "FieldDescriptor");
       for (Getter getter : getterFactory.allGetters((DeclaredType) type)) {
         result.addAll(getTypesToVisit(getter.getUnderlyingType()));
         if (getter.inline()) {
           methodBuilder.addCode("ctx.inline(value.$L);\n", getter.expression());
         } else {
-          CodeBlock.Builder codeBuilder;
-          if (getter.annotationDescriptors().isEmpty()) {
-            codeBuilder = CodeBlock.builder().add("$T.of($S)", fieldDescriptor, getter.name());
-          } else {
-            codeBuilder =
-                CodeBlock.builder()
-                    .add("$T.builder($S)\n", fieldDescriptor, getter.name())
-                    .indent()
-                    .indent();
-            for (AnnotationDescriptor desc : getter.annotationDescriptors()) {
-              ClassName annotationBuilder =
-                  builderName(
-                      ClassName.get((TypeElement) desc.type().getAnnotationType().asElement()));
-              codeBuilder.add(".withProperty($T.builder()\n", annotationBuilder);
-              for (AnnotationProperty property : desc.properties()) {
-                codeBuilder.add("$>.$L($L)\n$<", property.name(), property.value());
-              }
-              codeBuilder.add("$>.build())\n$<");
-            }
-            codeBuilder.add(".build()").unindent().unindent();
-          }
-          descriptorFields.add(
-              FieldSpec.builder(
-                      fieldDescriptor,
-                      getter.name().toUpperCase() + "_DESCRIPTOR",
-                      Modifier.PRIVATE,
-                      Modifier.FINAL,
-                      Modifier.STATIC)
-                  .initializer(codeBuilder.build())
-                  .build());
-          methodBuilder.addCode(
-              "ctx.add($L_DESCRIPTOR, value.$L);\n",
-              getter.name().toUpperCase(),
-              getter.expression());
+          methodBuilder.addCode("ctx.add($S, value.$L);\n", getter.name(), getter.expression());
         }
       }
 
@@ -325,25 +281,12 @@ public VisitResult<Encoder> visit(TypeMirror type) {
                   FieldSpec.builder(className, "INSTANCE", Modifier.FINAL, Modifier.STATIC)
                       .initializer("new $T()", className)
                       .build())
-              .addFields(descriptorFields)
               .addMethod(methodBuilder.build())
               .build();
       encoded.put(types.erasure(type), encoder);
       return VisitResult.of(result, Encoder.create(types.erasure(type), encoder));
     }
 
-    private ClassName builderName(ClassName annotation) {
-      return ClassName.get(annotation.packageName(), compositeName(annotation));
-    }
-
-    private String compositeName(ClassName annotation) {
-      ClassName parentName = annotation.enclosingClassName();
-      if (parentName == null) {
-        return "At" + annotation.simpleName();
-      }
-      return compositeName(parentName) + annotation.simpleName();
-    }
-
     private Set<TypeMirror> getTypesToVisit(TypeMirror type) {
       TypeMirror date = elements.getTypeElement("java.util.Date").asType();
       TypeMirror enumType = types.erasure(elements.getTypeElement("java.lang.Enum").asType());

encoders/firebase-encoders-processor/src/main/java/com/google/firebase/encoders/processor/annotations/AnnotationBuilder.java

@@ -21,6 +21,7 @@
 import com.squareup.javapoet.ParameterizedTypeName;
 import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeSpec;
+import com.squareup.javapoet.TypeSpec.Builder;
 import com.squareup.javapoet.WildcardTypeName;
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
@@ -79,7 +80,7 @@ public static TypeSpec generate(TypeElement element) {
 
   private static TypeSpec createBuilder(
       ClassName builderName, ClassName annotationName, AnnotationImpl annotationImpl) {
-    TypeSpec.Builder annotationBuilder =
+    Builder annotationBuilder =
         TypeSpec.classBuilder(builderName)
             .addModifiers(Modifier.PUBLIC, Modifier.FINAL)
             .addType(annotationImpl.typeSpec);
@@ -171,7 +172,7 @@ private static String compositeName(ClassName annotation) {
 
   private static AnnotationImpl createAnnotationImpl(TypeElement annotation) {
     String implName = annotation.getSimpleName().toString() + "Impl";
-    TypeSpec.Builder annotationImpl =
+    Builder annotationImpl =
         TypeSpec.classBuilder(implName)
             .addModifiers(Modifier.PRIVATE, Modifier.STATIC, Modifier.FINAL)
             .addSuperinterface(TypeName.get(annotation.asType()))

encoders/firebase-encoders-processor/src/main/java/com/google/firebase/encoders/processor/annotations/ToStringMethod.java

@@ -17,6 +17,7 @@
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.CodeBlock;
 import com.squareup.javapoet.MethodSpec;
+import com.squareup.javapoet.MethodSpec.Builder;
 import java.util.List;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
@@ -26,7 +27,7 @@
 final class ToStringMethod {
   static MethodSpec generate(TypeElement element) {
     ClassName.get(element).reflectionName();
-    MethodSpec.Builder result =
+    Builder result =
         MethodSpec.methodBuilder("toString")
             .addModifiers(Modifier.PUBLIC)
             .returns(String.class)