[SYNCOPE-1828] check on null value (#857)

apache · Oct 4, 2024 · 5d1f4cf · 5d1f4cf
1 parent b9e6d95
commit 5d1f4cf
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/...c/main/java/org/apache/syncope/client/console/authprofiles/AuthProfileDirectoryPanel.java b/...c/main/java/org/apache/syncope/client/console/authprofiles/AuthProfileDirectoryPanel.java
@@ -24,6 +24,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
 import org.apache.syncope.client.console.authprofiles.AuthProfileDirectoryPanel.AuthProfileProvider;
 import org.apache.syncope.client.console.commons.AMConstants;
@@ -127,7 +128,7 @@ protected List<IColumn<AuthProfileTO, String>> getColumns() {
 
             @Override
             protected boolean isCondition(final IModel<AuthProfileTO> rowModel) {
-                return !rowModel.getObject().getImpersonationAccounts().isEmpty();
+                return CollectionUtils.isNotEmpty(rowModel.getObject().getImpersonationAccounts());
             }
         });
         columns.add(new BooleanConditionColumn<>(new StringResourceModel("googleMfaAuthTokens")) {
@@ -136,7 +137,7 @@ protected boolean isCondition(final IModel<AuthProfileTO> rowModel) {
 
             @Override
             protected boolean isCondition(final IModel<AuthProfileTO> rowModel) {
-                return !rowModel.getObject().getGoogleMfaAuthTokens().isEmpty();
+                return CollectionUtils.isNotEmpty(rowModel.getObject().getGoogleMfaAuthTokens());
             }
         });
         columns.add(new BooleanConditionColumn<>(new StringResourceModel("googleMfaAuthAccounts")) {
@@ -145,7 +146,7 @@ protected boolean isCondition(final IModel<AuthProfileTO> rowModel) {
 
             @Override
             protected boolean isCondition(final IModel<AuthProfileTO> rowModel) {
-                return !rowModel.getObject().getGoogleMfaAuthAccounts().isEmpty();
+                return CollectionUtils.isNotEmpty(rowModel.getObject().getGoogleMfaAuthAccounts());
             }
         });
         columns.add(new BooleanConditionColumn<>(new StringResourceModel("mfaTrustedDevices")) {
@@ -154,7 +155,7 @@ protected boolean isCondition(final IModel<AuthProfileTO> rowModel) {
 
             @Override
             protected boolean isCondition(final IModel<AuthProfileTO> rowModel) {
-                return !rowModel.getObject().getMfaTrustedDevices().isEmpty();
+                return CollectionUtils.isNotEmpty(rowModel.getObject().getMfaTrustedDevices());
             }
         });
         columns.add(new BooleanConditionColumn<>(new StringResourceModel("webAuthnAccount")) {
@@ -163,7 +164,7 @@ protected boolean isCondition(final IModel<AuthProfileTO> rowModel) {
 
             @Override
             protected boolean isCondition(final IModel<AuthProfileTO> rowModel) {
-                return !rowModel.getObject().getWebAuthnDeviceCredentials().isEmpty();
+                return CollectionUtils.isNotEmpty(rowModel.getObject().getWebAuthnDeviceCredentials());
             }
         });