Merge branch 'master' into issue/SLING-7584 5/head
authorDan Klco <klcodanr@users.noreply.github.com>
Wed, 17 Oct 2018 16:43:10 +0000 (12:43 -0400)
committerGitHub <noreply@github.com>
Wed, 17 Oct 2018 16:43:10 +0000 (12:43 -0400)
1  2 
src/main/java/org/apache/sling/models/impl/ModelAdapterFactory.java
src/test/java/org/apache/sling/models/impl/RequestDisposalTest.java

@@@ -187,11 -152,9 +187,11 @@@ public class RequestDisposalTest 
              return "disposed";
          }
  
-         @CheckForNull
+         @Nullable
          @Override
 -        public Object getValue(@NotNull Object o, String s, @NotNull Type type, @NotNull AnnotatedElement annotatedElement, @NotNull DisposalCallbackRegistry disposalCallbackRegistry) {
 +        public Object getValue(@Nonnull Object o, String s, @Nonnull Type type, @Nonnull AnnotatedElement annotatedElement, @Nonnull DisposalCallbackRegistry disposalCallbackRegistry) {
 +            TestDisposalCallback callback = new TestDisposalCallback();
 +            callbacks.add(callback);
              disposalCallbackRegistry.addDisposalCallback(callback);
              return "teststring";
          }