Sync from amadeus-creation-platform/Dataspace_Ecosystem

Author: github-sync-app[bot]

core/kafka-proxy-k8s-manager-core/src/main/java/org/eclipse/dse/core/kafkaproxy/service/VaultDiscoveryService.java

@@ -47,6 +47,7 @@ public class VaultDiscoveryService {
     private static final Logger LOGGER = Logger.getLogger(VaultDiscoveryService.class.getName());
     private static final String EDR_PREFIX = "edr--";
     private static final String KAFKA_TYPE = "Kafka";
+    private static final String SECRET_BASE_PATH = "secret/";
 
     private final Vault vault;
     private final String vaultAddress;
@@ -77,23 +78,23 @@ public VaultDiscoveryService(String vaultAddress, String vaultToken, String vaul
      * Get the vault path for listing secrets (with folder support)
      */
     private String getSecretListPath() {
-        return vaultFolder.isEmpty() ? "secret/" : "secret/" + vaultFolder + "/";
+        return vaultFolder.isEmpty() ? SECRET_BASE_PATH : (SECRET_BASE_PATH + vaultFolder + "/");
     }
 
     /**
      * Get the vault path for reading a secret (with folder support)
      */
     private String getSecretPath(String edrKey) {
-        return vaultFolder.isEmpty() ? "secret/" + edrKey : "secret/" + vaultFolder + "/" + edrKey;
+        return vaultFolder.isEmpty() ? (SECRET_BASE_PATH + edrKey) : (SECRET_BASE_PATH + vaultFolder + "/" + edrKey);
     }
 
     /**
      * Get the vault HTTP API path for metadata (with folder support)
      */
     private String getMetadataApiPath(String edrKey) {
         return vaultFolder.isEmpty()
-                ? "/v1/secret/metadata/" + edrKey
-                : "/v1/secret/metadata/" + vaultFolder + "/" + edrKey;
+                ? ("/v1/secret/metadata/" + edrKey)
+                : ("/v1/secret/metadata/" + vaultFolder + "/" + edrKey);
     }
 
     /**

core/telemetry-agent-core/src/main/java/org/eclipse/dse/core/telemetry/TelemetryServiceCredentialManager.java

@@ -118,7 +118,7 @@ private void performLogic() {
                 }
             } else {
                 int failureCount = consecutiveFailures.updateAndGet(current ->
-                        current < Integer.MAX_VALUE ? current + 1 : Integer.MAX_VALUE);
+                        current < Integer.MAX_VALUE ? (current + 1) : Integer.MAX_VALUE);
                 monitor.warning(format("Failed to fetch credential from Telemetry Service (attempt #%d): %s",
                         failureCount, result.getFailureDetail()));
                 delay = computeBackoffDelay(failureCount);
@@ -132,7 +132,7 @@ private void performLogic() {
             monitor.severe(format("Credential manager [%s] unrecoverable error", name), e);
         } catch (Throwable e) {
             int failureCount = consecutiveFailures.updateAndGet(current ->
-                    current < Integer.MAX_VALUE ? current + 1 : Integer.MAX_VALUE);
+                    current < Integer.MAX_VALUE ? (current + 1) : Integer.MAX_VALUE);
             monitor.severe(format("Credential manager [%s] error caught (attempt #%d)", name, failureCount), e);
             long backoffDelay = computeBackoffDelay(failureCount);
             scheduleNextIterationIn(backoffDelay);

extensions/data-plane/data-plane-public-api-v2/src/main/java/org/eclipse/edc/dse/dataplane/api/controller/ContainerRequestContextApiImpl.java

@@ -102,7 +102,7 @@ public boolean isValid() {
 
         @Override
         public String toString() {
-            return valid ? key + "=" + values : "";
+            return valid ? (key + "=" + values) : "";
         }
     }
 }