one more sonar

Author: mkleene

sdk/src/main/java/io/opentdf/platform/sdk/Autoconfigure.java

@@ -711,45 +711,47 @@ public static Granter newGranterFromService(AttributesServiceClient as, KASKeyCa
         return getGranter(keyCache, new ArrayList<>(av.getFqnAttributeValuesMap().values()));
     }
 
+    private static List<KeyAccessServer> getGrants(GetAttributeValuesByFqnsResponse.AttributeAndValue attributeAndValue) {
+        var val = attributeAndValue.getValue();
+        var attribute = attributeAndValue.getAttribute();
+        String fqnstr = val.getFqn();
+        AttributeValueFQN fqn = new AttributeValueFQN(fqnstr);
+
+        if (!val.getGrantsList().isEmpty()) {
+            if (logger.isDebugEnabled()) {
+                logger.debug("adding grants from attribute value [{}]: {}", val.getFqn(), val.getGrantsList().stream().map(KeyAccessServer::getUri).collect(Collectors.toList()));
+            }
+            return val.getGrantsList();
+        } else if (!attribute.getGrantsList().isEmpty()) {
+            var attributeGrants = attribute.getGrantsList();
+            if (logger.isDebugEnabled()) {
+                logger.debug("adding grants from attribute [{}]: {}", attribute.getFqn(), attributeGrants.stream().map(KeyAccessServer::getId).collect(Collectors.toList()));
+            }
+            return attributeGrants;
+        } else if (!attribute.getNamespace().getGrantsList().isEmpty()) {
+            var nsGrants = attribute.getNamespace().getGrantsList();
+            if (logger.isDebugEnabled()) {
+                logger.debug("adding grants from namespace [{}]: [{}]", attribute.getNamespace().getName(), nsGrants.stream().map(KeyAccessServer::getId).collect(Collectors.toList()));
+            }
+            return nsGrants;
+        } else {
+            // this is needed to mark the fact that we have an empty
+            logger.debug("didn't find any grants on value, attribute, or namespace for attribute value [{}]", fqnstr);
+            return Collections.emptyList();
+        }
+
+    }
+
     private static Granter getGranter(@Nullable KASKeyCache keyCache, List<GetAttributeValuesByFqnsResponse.AttributeAndValue> values) {
         Granter grants = new Granter(values.stream().map(GetAttributeValuesByFqnsResponse.AttributeAndValue::getValue).map(Value::getFqn).map(AttributeValueFQN::new).collect(Collectors.toList()));
 
         for (var attributeAndValue: values) {
-            var val = attributeAndValue.getValue();
-            var attribute = attributeAndValue.getAttribute();
-            String fqnstr = val.getFqn();
+            var attributeGrants = getGrants(attributeAndValue);
+            String fqnstr = attributeAndValue.getValue().getFqn();
             AttributeValueFQN fqn = new AttributeValueFQN(fqnstr);
-
-            if (!val.getGrantsList().isEmpty()) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("adding grants from attribute value [{}]: {}", val.getFqn(), val.getGrantsList().stream().map(KeyAccessServer::getUri).collect(Collectors.toList()));
-                }
-                grants.addAllGrants(fqn, val.getGrantsList(), attribute);
-                if (keyCache != null) {
-                    storeKeysToCache(val.getGrantsList(), keyCache);
-                }
-            } else if (!attribute.getGrantsList().isEmpty()) {
-                var attributeGrants = attribute.getGrantsList();
-                if (logger.isDebugEnabled()) {
-                    logger.debug("adding grants from attribute [{}]: {}", attribute.getFqn(), attributeGrants.stream().map(KeyAccessServer::getId).collect(Collectors.toList()));
-                }
-                grants.addAllGrants(fqn, attributeGrants, attribute);
-                if (keyCache != null) {
-                    storeKeysToCache(attributeGrants, keyCache);
-                }
-            } else if (!attribute.getNamespace().getGrantsList().isEmpty()) {
-                var nsGrants = attribute.getNamespace().getGrantsList();
-                if (logger.isDebugEnabled()) {
-                    logger.debug("adding grants from namespace [{}]: [{}]", attribute.getNamespace().getName(), nsGrants.stream().map(KeyAccessServer::getId).collect(Collectors.toList()));
-                }
-                grants.addAllGrants(fqn, nsGrants, attribute);
-                if (keyCache != null) {
-                    storeKeysToCache(nsGrants, keyCache);
-                }
-            } else {
-                // this is needed to mark the fact that we have an empty
-                grants.addAllGrants(fqn, List.of(), attribute);
-                logger.debug("didn't find any grants on value, attribute, or namespace for attribute value [{}]", fqnstr);
+            grants.addAllGrants(fqn, attributeGrants, attributeAndValue.getAttribute());
+            if (keyCache != null) {
+                storeKeysToCache(attributeGrants, keyCache);
             }
         }