Add @checkresult to intermediate builder methods

bumptech · Oct 5, 2017 · 739cb35 · 739cb35 · paulsowden · Jul 26, 2023
1 parent 56a4275
commit 739cb35
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/...ompiler/src/main/java/com/bumptech/glide/annotation/compiler/RequestBuilderGenerator.java b/...ompiler/src/main/java/com/bumptech/glide/annotation/compiler/RequestBuilderGenerator.java
@@ -306,10 +306,7 @@ public boolean apply(AnnotationSpec input) {
                     return !input.type.equals(TypeName.get(Override.class))
                         // SafeVarargs can only be applied to final methods. GlideRequest is
                         // non-final to allow for mocking.
-                        && !input.type.equals(TypeName.get(SafeVarargs.class))
-                        // @CheckResult isn't applicable for RequestBuilder because there is no
-                        // autoClone() in RequestBuilder.
-                        && !input.type.equals(CHECK_RESULT_CLASS_NAME);
+                        && !input.type.equals(TypeName.get(SafeVarargs.class));
                   }
                 })
                 .toList()

diff --git a/library/src/main/java/com/bumptech/glide/RequestBuilder.java b/library/src/main/java/com/bumptech/glide/RequestBuilder.java
@@ -85,6 +85,7 @@ protected RequestBuilder(Class<TranscodeType> transcodeClass, RequestBuilder<?>
    * @see RequestOptions#apply(RequestOptions)
    * @return This request builder.
    */
+  @CheckResult
   public RequestBuilder<TranscodeType> apply(@NonNull RequestOptions requestOptions) {
     Preconditions.checkNotNull(requestOptions);
     this.requestOptions = getMutableOptions().apply(requestOptions);
@@ -105,6 +106,7 @@ protected RequestOptions getMutableOptions() {
    *
    * @return This request builder.
    */
+  @CheckResult
   public RequestBuilder<TranscodeType> transition(
       @NonNull TransitionOptions<?, ? super TranscodeType> transitionOptions) {
     this.transitionOptions = Preconditions.checkNotNull(transitionOptions);
@@ -120,6 +122,7 @@ public RequestBuilder<TranscodeType> transition(
    * @param requestListener The request listener to use.
    * @return This request builder.
    */
+  @CheckResult
   @SuppressWarnings("unchecked")
   public RequestBuilder<TranscodeType> listener(
       @Nullable RequestListener<TranscodeType> requestListener) {
@@ -141,6 +144,7 @@ public RequestBuilder<TranscodeType> listener(
    *
    * <p> Recursive calls to thumbnail are supported. </p>
    */
+  @CheckResult
   @SuppressWarnings("unchecked")
   public RequestBuilder<TranscodeType> thumbnail(
       @Nullable RequestBuilder<TranscodeType> thumbnailRequest) {
@@ -173,6 +177,7 @@ public RequestBuilder<TranscodeType> thumbnail(
    *                       the thumbnail.
    * @return This request builder.
    */
+  @CheckResult
   @SuppressWarnings("unchecked")
   public RequestBuilder<TranscodeType> thumbnail(float sizeMultiplier) {
     if (sizeMultiplier < 0f || sizeMultiplier > 1f) {
@@ -192,6 +197,7 @@ public RequestBuilder<TranscodeType> thumbnail(float sizeMultiplier) {
    * @param model The model to load data for, or null.
    * @return This request builder.
    */
+  @CheckResult
   @SuppressWarnings("unchecked")
   public RequestBuilder<TranscodeType> load(@Nullable Object model) {
     return loadGeneric(model);
@@ -222,6 +228,7 @@ private RequestBuilder<TranscodeType> loadGeneric(@Nullable Object model) {
    * @param string A file path, or a uri or url handled by
    * {@link com.bumptech.glide.load.model.UriLoader}.
    */
+  @CheckResult
   public RequestBuilder<TranscodeType> load(@Nullable String string) {
     return loadGeneric(string);
   }
@@ -244,6 +251,7 @@ public RequestBuilder<TranscodeType> load(@Nullable String string) {
    * @param uri The Uri representing the image. Must be of a type handled by
    * {@link com.bumptech.glide.load.model.UriLoader}.
    */
+  @CheckResult
   public RequestBuilder<TranscodeType> load(@Nullable Uri uri) {
     return loadGeneric(uri);
   }
@@ -266,6 +274,7 @@ public RequestBuilder<TranscodeType> load(@Nullable Uri uri) {
    *
    * @param file The File containing the image
    */
+  @CheckResult
   public RequestBuilder<TranscodeType> load(@Nullable File file) {
     return loadGeneric(file);
   }
@@ -289,6 +298,7 @@ public RequestBuilder<TranscodeType> load(@Nullable File file) {
    * @see #load(Integer)
    * @see com.bumptech.glide.signature.ApplicationVersionSignature
    */
+  @CheckResult
   public RequestBuilder<TranscodeType> load(@Nullable Integer resourceId) {
     return loadGeneric(resourceId).apply(signatureOf(ApplicationVersionSignature.obtain(context)));
   }
@@ -303,6 +313,7 @@ public RequestBuilder<TranscodeType> load(@Nullable Integer resourceId) {
    * {@link #load(android.net.Uri)} or {@link #load(String)}.
    */
   @Deprecated
+  @CheckResult
   public RequestBuilder<TranscodeType> load(@Nullable URL url) {
     return loadGeneric(url);
   }
@@ -316,6 +327,7 @@ public RequestBuilder<TranscodeType> load(@Nullable URL url) {
    * @param model the data to load.
    * @see #load(Object)
    */
+  @CheckResult
   public RequestBuilder<TranscodeType> load(@Nullable byte[] model) {
     return loadGeneric(model).apply(signatureOf(new ObjectKey(UUID.randomUUID().toString()))
         .diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true /*skipMemoryCache*/));