Updated BaseRequestOptions.transform api (update for issue #2875) (#3365

)
bumptech · Oct 26, 2018 · 8a26a6b · 8a26a6b
1 parent 6782541
commit 8a26a6b
Show file tree

Hide file tree

Showing 21 changed files with 245 additions and 3 deletions.
diff --git a/...src/main/java/com/bumptech/glide/annotation/compiler/RequestOptionsOverrideGenerator.java b/...src/main/java/com/bumptech/glide/annotation/compiler/RequestOptionsOverrideGenerator.java
@@ -86,7 +86,8 @@ public String apply(ParameterSpec input) {
             .add(");\n")
             .build());
 
-    if (methodToOverride.getSimpleName().toString().equals("transforms")) {
+    if (methodToOverride.getSimpleName().toString().contains("transform")
+        && methodToOverride.isVarArgs()) {
       result
           .addModifiers(Modifier.FINAL)
           .addAnnotation(SafeVarargs.class)

diff --git a/annotation/compiler/test/src/test/resources/EmptyAppGlideModuleTest/GlideOptions.java b/annotation/compiler/test/src/test/resources/EmptyAppGlideModuleTest/GlideOptions.java
@@ -20,6 +20,7 @@
 import com.bumptech.glide.request.RequestOptions;
 import java.lang.Class;
 import java.lang.Cloneable;
+import java.lang.Deprecated;
 import java.lang.Override;
 import java.lang.SafeVarargs;
 import java.lang.SuppressWarnings;
@@ -558,6 +559,16 @@ public GlideOptions transform(@NonNull Transformation<Bitmap> transformation) {
   @SuppressWarnings("varargs")
   @NonNull
   @CheckResult
+  public final GlideOptions transform(@NonNull Transformation<Bitmap>... transformations) {
+    return (GlideOptions) super.transform(transformations);
+  }
+
+  @Override
+  @SafeVarargs
+  @SuppressWarnings("varargs")
+  @Deprecated
+  @NonNull
+  @CheckResult
   public final GlideOptions transforms(@NonNull Transformation<Bitmap>... transformations) {
     return (GlideOptions) super.transforms(transformations);
   }

diff --git a/annotation/compiler/test/src/test/resources/EmptyAppGlideModuleTest/GlideRequest.java b/annotation/compiler/test/src/test/resources/EmptyAppGlideModuleTest/GlideRequest.java
@@ -384,9 +384,23 @@ public GlideRequest<TranscodeType> transform(@NonNull Transformation<Bitmap> tra
     return (GlideRequest<TranscodeType>) super.transform(transformation);
   }
 
+  /**
+   * @see GlideOptions#transform(Transformation<Bitmap>[])
+   */
+  @NonNull
+  @CheckResult
+  @SuppressWarnings({
+      "unchecked",
+      "varargs"
+  })
+  public GlideRequest<TranscodeType> transform(@NonNull Transformation<Bitmap>... transformations) {
+    return (GlideRequest<TranscodeType>) super.transform(transformations);
+  }
+
   /**
    * @see GlideOptions#transforms(Transformation<Bitmap>[])
    */
+  @Deprecated
   @NonNull
   @CheckResult
   @SuppressWarnings({

diff --git a/...r/test/src/test/resources/GlideExtensionOptionsTest/MemoizeStaticMethod/GlideOptions.java b/...r/test/src/test/resources/GlideExtensionOptionsTest/MemoizeStaticMethod/GlideOptions.java
@@ -20,6 +20,7 @@
 import com.bumptech.glide.request.RequestOptions;
 import java.lang.Class;
 import java.lang.Cloneable;
+import java.lang.Deprecated;
 import java.lang.Override;
 import java.lang.SafeVarargs;
 import java.lang.SuppressWarnings;
@@ -561,6 +562,16 @@ public GlideOptions transform(@NonNull Transformation<Bitmap> transformation) {
   @SuppressWarnings("varargs")
   @NonNull
   @CheckResult
+  public final GlideOptions transform(@NonNull Transformation<Bitmap>... transformations) {
+    return (GlideOptions) super.transform(transformations);
+  }
+
+  @Override
+  @SafeVarargs
+  @SuppressWarnings("varargs")
+  @Deprecated
+  @NonNull
+  @CheckResult
   public final GlideOptions transforms(@NonNull Transformation<Bitmap>... transformations) {
     return (GlideOptions) super.transforms(transformations);
   }

diff --git a/...r/test/src/test/resources/GlideExtensionOptionsTest/MemoizeStaticMethod/GlideRequest.java b/...r/test/src/test/resources/GlideExtensionOptionsTest/MemoizeStaticMethod/GlideRequest.java
@@ -384,9 +384,23 @@ public GlideRequest<TranscodeType> transform(@NonNull Transformation<Bitmap> tra
     return (GlideRequest<TranscodeType>) super.transform(transformation);
   }
 
+  /**
+   * @see GlideOptions#transform(Transformation<Bitmap>[])
+   */
+  @NonNull
+  @CheckResult
+  @SuppressWarnings({
+      "unchecked",
+      "varargs"
+  })
+  public GlideRequest<TranscodeType> transform(@NonNull Transformation<Bitmap>... transformations) {
+    return (GlideRequest<TranscodeType>) super.transform(transformations);
+  }
+
   /**
    * @see GlideOptions#transforms(Transformation<Bitmap>[])
    */
+  @Deprecated
   @NonNull
   @CheckResult
   @SuppressWarnings({

diff --git a/...mpiler/test/src/test/resources/GlideExtensionOptionsTest/OverrideExtend/GlideOptions.java b/...mpiler/test/src/test/resources/GlideExtensionOptionsTest/OverrideExtend/GlideOptions.java
@@ -20,6 +20,7 @@
 import com.bumptech.glide.request.RequestOptions;
 import java.lang.Class;
 import java.lang.Cloneable;
+import java.lang.Deprecated;
 import java.lang.Override;
 import java.lang.SafeVarargs;
 import java.lang.SuppressWarnings;
@@ -552,6 +553,16 @@ public GlideOptions transform(@NonNull Transformation<Bitmap> transformation) {
   @SuppressWarnings("varargs")
   @NonNull
   @CheckResult
+  public final GlideOptions transform(@NonNull Transformation<Bitmap>... transformations) {
+    return (GlideOptions) super.transform(transformations);
+  }
+
+  @Override
+  @SafeVarargs
+  @SuppressWarnings("varargs")
+  @Deprecated
+  @NonNull
+  @CheckResult
   public final GlideOptions transforms(@NonNull Transformation<Bitmap>... transformations) {
     return (GlideOptions) super.transforms(transformations);
   }

diff --git a/...mpiler/test/src/test/resources/GlideExtensionOptionsTest/OverrideExtend/GlideRequest.java b/...mpiler/test/src/test/resources/GlideExtensionOptionsTest/OverrideExtend/GlideRequest.java
@@ -375,9 +375,23 @@ public GlideRequest<TranscodeType> transform(@NonNull Transformation<Bitmap> tra
     return (GlideRequest<TranscodeType>) super.transform(transformation);
   }
 
+  /**
+   * @see GlideOptions#transform(Transformation<Bitmap>[])
+   */
+  @NonNull
+  @CheckResult
+  @SuppressWarnings({
+      "unchecked",
+      "varargs"
+  })
+  public GlideRequest<TranscodeType> transform(@NonNull Transformation<Bitmap>... transformations) {
+    return (GlideRequest<TranscodeType>) super.transform(transformations);
+  }
+
   /**
    * @see GlideOptions#transforms(Transformation<Bitmap>[])
    */
+  @Deprecated
   @NonNull
   @CheckResult
   @SuppressWarnings({

diff --git a/...est/resources/GlideExtensionOptionsTest/OverrideExtendMultipleArguments/GlideOptions.java b/...est/resources/GlideExtensionOptionsTest/OverrideExtendMultipleArguments/GlideOptions.java
@@ -20,6 +20,7 @@
 import com.bumptech.glide.request.RequestOptions;
 import java.lang.Class;
 import java.lang.Cloneable;
+import java.lang.Deprecated;
 import java.lang.Override;
 import java.lang.SafeVarargs;
 import java.lang.SuppressWarnings;
@@ -542,6 +543,16 @@ public GlideOptions transform(@NonNull Transformation<Bitmap> transformation) {
   @SuppressWarnings("varargs")
   @NonNull
   @CheckResult
+  public final GlideOptions transform(@NonNull Transformation<Bitmap>... transformations) {
+    return (GlideOptions) super.transform(transformations);
+  }
+
+  @Override
+  @SafeVarargs
+  @SuppressWarnings("varargs")
+  @Deprecated
+  @NonNull
+  @CheckResult
   public final GlideOptions transforms(@NonNull Transformation<Bitmap>... transformations) {
     return (GlideOptions) super.transforms(transformations);
   }

diff --git a/...est/resources/GlideExtensionOptionsTest/OverrideExtendMultipleArguments/GlideRequest.java b/...est/resources/GlideExtensionOptionsTest/OverrideExtendMultipleArguments/GlideRequest.java
@@ -375,9 +375,23 @@ public GlideRequest<TranscodeType> transform(@NonNull Transformation<Bitmap> tra
     return (GlideRequest<TranscodeType>) super.transform(transformation);
   }
 
+  /**
+   * @see GlideOptions#transform(Transformation<Bitmap>[])
+   */
+  @NonNull
+  @CheckResult
+  @SuppressWarnings({
+      "unchecked",
+      "varargs"
+  })
+  public GlideRequest<TranscodeType> transform(@NonNull Transformation<Bitmap>... transformations) {
+    return (GlideRequest<TranscodeType>) super.transform(transformations);
+  }
+
   /**
    * @see GlideOptions#transforms(Transformation<Bitmap>[])
    */
+  @Deprecated
   @NonNull
   @CheckResult
   @SuppressWarnings({

diff --git a/...piler/test/src/test/resources/GlideExtensionOptionsTest/OverrideReplace/GlideOptions.java b/...piler/test/src/test/resources/GlideExtensionOptionsTest/OverrideReplace/GlideOptions.java
@@ -20,6 +20,7 @@
 import com.bumptech.glide.request.RequestOptions;
 import java.lang.Class;
 import java.lang.Cloneable;
+import java.lang.Deprecated;
 import java.lang.Override;
 import java.lang.SafeVarargs;
 import java.lang.SuppressWarnings;
@@ -552,6 +553,16 @@ public GlideOptions transform(@NonNull Transformation<Bitmap> transformation) {
   @SuppressWarnings("varargs")
   @NonNull
   @CheckResult
+  public final GlideOptions transform(@NonNull Transformation<Bitmap>... transformations) {
+    return (GlideOptions) super.transform(transformations);
+  }
+
+  @Override
+  @SafeVarargs
+  @SuppressWarnings("varargs")
+  @Deprecated
+  @NonNull
+  @CheckResult
   public final GlideOptions transforms(@NonNull Transformation<Bitmap>... transformations) {
     return (GlideOptions) super.transforms(transformations);
   }

diff --git a/...piler/test/src/test/resources/GlideExtensionOptionsTest/OverrideReplace/GlideRequest.java b/...piler/test/src/test/resources/GlideExtensionOptionsTest/OverrideReplace/GlideRequest.java
@@ -375,9 +375,23 @@ public GlideRequest<TranscodeType> transform(@NonNull Transformation<Bitmap> tra
     return (GlideRequest<TranscodeType>) super.transform(transformation);
   }
 
+  /**
+   * @see GlideOptions#transform(Transformation<Bitmap>[])
+   */
+  @NonNull
+  @CheckResult
+  @SuppressWarnings({
+      "unchecked",
+      "varargs"
+  })
+  public GlideRequest<TranscodeType> transform(@NonNull Transformation<Bitmap>... transformations) {
+    return (GlideRequest<TranscodeType>) super.transform(transformations);
+  }
+
   /**
    * @see GlideOptions#transforms(Transformation<Bitmap>[])
    */
+  @Deprecated
   @NonNull
   @CheckResult
   @SuppressWarnings({

diff --git a/...iler/test/src/test/resources/GlideExtensionOptionsTest/SkipStaticMethod/GlideOptions.java b/...iler/test/src/test/resources/GlideExtensionOptionsTest/SkipStaticMethod/GlideOptions.java
@@ -20,6 +20,7 @@
 import com.bumptech.glide.request.RequestOptions;
 import java.lang.Class;
 import java.lang.Cloneable;
+import java.lang.Deprecated;
 import java.lang.Override;
 import java.lang.SafeVarargs;
 import java.lang.SuppressWarnings;
@@ -559,6 +560,16 @@ public GlideOptions transform(@NonNull Transformation<Bitmap> transformation) {
   @SuppressWarnings("varargs")
   @NonNull
   @CheckResult
+  public final GlideOptions transform(@NonNull Transformation<Bitmap>... transformations) {
+    return (GlideOptions) super.transform(transformations);
+  }
+
+  @Override
+  @SafeVarargs
+  @SuppressWarnings("varargs")
+  @Deprecated
+  @NonNull
+  @CheckResult
   public final GlideOptions transforms(@NonNull Transformation<Bitmap>... transformations) {
     return (GlideOptions) super.transforms(transformations);
   }

diff --git a/...iler/test/src/test/resources/GlideExtensionOptionsTest/SkipStaticMethod/GlideRequest.java b/...iler/test/src/test/resources/GlideExtensionOptionsTest/SkipStaticMethod/GlideRequest.java
@@ -384,9 +384,23 @@ public GlideRequest<TranscodeType> transform(@NonNull Transformation<Bitmap> tra
     return (GlideRequest<TranscodeType>) super.transform(transformation);
   }
 
+  /**
+   * @see GlideOptions#transform(Transformation<Bitmap>[])
+   */
+  @NonNull
+  @CheckResult
+  @SuppressWarnings({
+      "unchecked",
+      "varargs"
+  })
+  public GlideRequest<TranscodeType> transform(@NonNull Transformation<Bitmap>... transformations) {
+    return (GlideRequest<TranscodeType>) super.transform(transformations);
+  }
+
   /**
    * @see GlideOptions#transforms(Transformation<Bitmap>[])
    */
+  @Deprecated
   @NonNull
   @CheckResult
   @SuppressWarnings({

diff --git a/...iler/test/src/test/resources/GlideExtensionOptionsTest/StaticMethodName/GlideOptions.java b/...iler/test/src/test/resources/GlideExtensionOptionsTest/StaticMethodName/GlideOptions.java
@@ -20,6 +20,7 @@
 import com.bumptech.glide.request.RequestOptions;
 import java.lang.Class;
 import java.lang.Cloneable;
+import java.lang.Deprecated;
 import java.lang.Override;
 import java.lang.SafeVarargs;
 import java.lang.SuppressWarnings;
@@ -559,6 +560,16 @@ public GlideOptions transform(@NonNull Transformation<Bitmap> transformation) {
   @SuppressWarnings("varargs")
   @NonNull
   @CheckResult
+  public final GlideOptions transform(@NonNull Transformation<Bitmap>... transformations) {
+    return (GlideOptions) super.transform(transformations);
+  }
+
+  @Override
+  @SafeVarargs
+  @SuppressWarnings("varargs")
+  @Deprecated
+  @NonNull
+  @CheckResult
   public final GlideOptions transforms(@NonNull Transformation<Bitmap>... transformations) {
     return (GlideOptions) super.transforms(transformations);
   }

diff --git a/...iler/test/src/test/resources/GlideExtensionOptionsTest/StaticMethodName/GlideRequest.java b/...iler/test/src/test/resources/GlideExtensionOptionsTest/StaticMethodName/GlideRequest.java
@@ -384,9 +384,23 @@ public GlideRequest<TranscodeType> transform(@NonNull Transformation<Bitmap> tra
     return (GlideRequest<TranscodeType>) super.transform(transformation);
   }
 
+  /**
+   * @see GlideOptions#transform(Transformation<Bitmap>[])
+   */
+  @NonNull
+  @CheckResult
+  @SuppressWarnings({
+      "unchecked",
+      "varargs"
+  })
+  public GlideRequest<TranscodeType> transform(@NonNull Transformation<Bitmap>... transformations) {
+    return (GlideRequest<TranscodeType>) super.transform(transformations);
+  }
+
   /**
    * @see GlideOptions#transforms(Transformation<Bitmap>[])
    */
+  @Deprecated
   @NonNull
   @CheckResult
   @SuppressWarnings({

diff --git a/annotation/compiler/test/src/test/resources/GlideExtensionWithOptionTest/GlideOptions.java b/annotation/compiler/test/src/test/resources/GlideExtensionWithOptionTest/GlideOptions.java
@@ -20,6 +20,7 @@
 import com.bumptech.glide.request.RequestOptions;
 import java.lang.Class;
 import java.lang.Cloneable;
+import java.lang.Deprecated;
 import java.lang.Override;
 import java.lang.SafeVarargs;
 import java.lang.SuppressWarnings;
@@ -559,6 +560,16 @@ public GlideOptions transform(@NonNull Transformation<Bitmap> transformation) {
   @SuppressWarnings("varargs")
   @NonNull
   @CheckResult
+  public final GlideOptions transform(@NonNull Transformation<Bitmap>... transformations) {
+    return (GlideOptions) super.transform(transformations);
+  }
+
+  @Override
+  @SafeVarargs
+  @SuppressWarnings("varargs")
+  @Deprecated
+  @NonNull
+  @CheckResult
   public final GlideOptions transforms(@NonNull Transformation<Bitmap>... transformations) {
     return (GlideOptions) super.transforms(transformations);
   }