[isis] 03/03: ISIS-2297: fixes flipped nullability marker in AopPatch

[ah...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit a33f2d826c79a5d34b39632ffddbf3f4da34889c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Apr 27 07:15:38 2022 +0200

    ISIS-2297: fixes flipped nullability marker in AopPatch
---
 .../org/apache/isis/commons/internal/reflection/_ClassCache.java   | 5 +++--
 .../java/org/apache/isis/core/config/beans/aoppatch/AopPatch.java  | 7 +++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/commons/src/main/java/org/apache/isis/commons/internal/reflection/_ClassCache.java b/commons/src/main/java/org/apache/isis/commons/internal/reflection/_ClassCache.java
index ef03c6670a..077af9839b 100644
--- a/commons/src/main/java/org/apache/isis/commons/internal/reflection/_ClassCache.java
+++ b/commons/src/main/java/org/apache/isis/commons/internal/reflection/_ClassCache.java
@@ -27,6 +27,7 @@ import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
+import org.springframework.lang.Nullable;
 import org.springframework.util.ReflectionUtils;
 
 import org.apache.isis.commons.collections.Can;
@@ -170,7 +171,7 @@ public final class _ClassCache implements AutoCloseable {
     @AllArgsConstructor(staticName = "of") @EqualsAndHashCode
     private static final class ConstructorKey {
         private final Class<?> type; // constructors's declaring class
-        private final Class<?>[] paramTypes;
+        private final @Nullable Class<?>[] paramTypes;
 
         public static ConstructorKey of(final Class<?> type, final Constructor<?> constructor) {
             return ConstructorKey.of(type, _Arrays.emptyToNull(constructor.getParameterTypes()));
@@ -181,7 +182,7 @@ public final class _ClassCache implements AutoCloseable {
     private static final class MethodKey {
         private final Class<?> type; // method's declaring class
         private final String name; // method name
-        private final Class<?>[] paramTypes;
+        private final @Nullable Class<?>[] paramTypes;
 
         public static MethodKey of(final Class<?> type, final Method method) {
             return MethodKey.of(type, method.getName(), _Arrays.emptyToNull(method.getParameterTypes()));
diff --git a/core/config/src/main/java/org/apache/isis/core/config/beans/aoppatch/AopPatch.java b/core/config/src/main/java/org/apache/isis/core/config/beans/aoppatch/AopPatch.java
index bbd3aba84b..f744d055be 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/beans/aoppatch/AopPatch.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/beans/aoppatch/AopPatch.java
@@ -18,7 +18,6 @@
  */
 package org.apache.isis.core.config.beans.aoppatch;
 
-import org.springframework.lang.Nullable;
 import javax.inject.Named;
 
 import org.springframework.beans.BeansException;
@@ -27,13 +26,13 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Role;
+import org.springframework.lang.Nullable;
 import org.springframework.transaction.TransactionManager;
 import org.springframework.transaction.config.TransactionManagementConfigUtils;
 import org.springframework.transaction.interceptor.BeanFactoryTransactionAttributeSourceAdvisor;
 import org.springframework.transaction.interceptor.TransactionAttributeSource;
 import org.springframework.transaction.interceptor.TransactionInterceptor;
 
-import lombok.NonNull;
 import lombok.val;
 import lombok.extern.log4j.Log4j2;
 
@@ -52,7 +51,7 @@ import lombok.extern.log4j.Log4j2;
 public class AopPatch implements ApplicationContextAware {
 
     @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+    public void setApplicationContext(final ApplicationContext applicationContext) throws BeansException {
 
         if(!applicationContext.containsBean(TransactionManagementConfigUtils.TRANSACTION_ADVISOR_BEAN_NAME)) {
             return;
@@ -86,7 +85,7 @@ public class AopPatch implements ApplicationContextAware {
     private TransactionInterceptor patchedTransactionInterceptor(
             final @Nullable TransactionAttributeSource transactionAttributeSource,
             final @Nullable TransactionInterceptorFactory transactionInterceptorFactory,
-            final @NonNull  TransactionManager txManager) {
+            final @Nullable TransactionManager txManager) {
 
         final TransactionInterceptor interceptor = transactionInterceptorFactory==null
                 ? new TransactionInterceptor()