Move AzurePasswordlessPropertiesMapping to implementation package (#3…

…4318)
Azure · Apr 6, 2023 · f33f062 · f33f062
1 parent 31bc613
commit f33f062
Show file tree

Hide file tree

Showing 2 changed files with 97 additions and 81 deletions.
diff --git a/...azure/spring/cloud/core/implementation/properties/AzurePasswordlessPropertiesMapping.java b/...azure/spring/cloud/core/implementation/properties/AzurePasswordlessPropertiesMapping.java
@@ -0,0 +1,94 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.spring.cloud.core.implementation.properties;
+
+import com.azure.identity.extensions.implementation.enums.AuthProperty;
+import com.azure.spring.cloud.core.properties.PasswordlessProperties;
+
+import java.util.Properties;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
+/**
+ * A mapping util used to convert a {@link PasswordlessProperties} instance to a {@link Properties} instance.
+ */
+public enum AzurePasswordlessPropertiesMapping {
+
+    /**
+     * Getter function and setter biConsumer for scopes.
+     */
+    SCOPES(p -> p.getScopes(),
+        (p, s) -> p.setProperty(AuthProperty.SCOPES.getPropertyKey(), s)),
+
+    /**
+     * Getter function and setter biConsumer for clientCertificatePassword.
+     */
+    CLIENT_CERTIFICATE_PASSWORD(p -> p.getCredential().getClientCertificatePassword(),
+        (p, s) -> p.setProperty(AuthProperty.CLIENT_CERTIFICATE_PASSWORD.getPropertyKey(), s)),
+
+    /**
+     * Getter function and setter biConsumer for clientCertificatePath.
+     */
+    CLIENT_CERTIFICATE_PATH(p -> p.getCredential().getClientCertificatePath(),
+        (p, s) -> p.setProperty(AuthProperty.CLIENT_CERTIFICATE_PATH.getPropertyKey(), s)),
+
+    /**
+     * Getter function and setter biConsumer for clientId.
+     */
+    CLIENT_ID(p -> p.getCredential().getClientId(),
+        (p, s) -> p.setProperty(AuthProperty.CLIENT_ID.getPropertyKey(), s)),
+
+    /**
+     * Getter function and setter biConsumer for clientSecret.
+     */
+    CLIENT_SECRET(p -> p.getCredential().getClientSecret(),
+        (p, s) -> p.setProperty(AuthProperty.CLIENT_SECRET.getPropertyKey(), s)),
+
+    /**
+     * Getter function and setter biConsumer for managedIdentityEnabled.
+     */
+    MANAGED_IDENTITY_ENABLED(p -> String.valueOf(p.getCredential().isManagedIdentityEnabled()),
+        (p, s) -> p.setProperty(AuthProperty.MANAGED_IDENTITY_ENABLED.getPropertyKey(), s)),
+
+    /**
+     * Getter function and setter biConsumer for password.
+     */
+    PASSWORD(p -> p.getCredential().getPassword(),
+        (p, s) -> p.setProperty(AuthProperty.PASSWORD.getPropertyKey(), s)),
+
+    /**
+     * Getter function and setter biConsumer for username.
+     */
+    USERNAME(p -> p.getCredential().getUsername(),
+        (p, s) -> p.setProperty(AuthProperty.USERNAME.getPropertyKey(), s)),
+
+    /**
+     * Getter function and setter biConsumer for tenantId.
+     */
+    TENANT_ID(p -> p.getProfile().getTenantId(),
+        (p, s) -> p.setProperty(AuthProperty.TENANT_ID.getPropertyKey(), s)),
+
+    /**
+     * Getter function and setter biConsumer for authorityHost.
+     */
+    AUTHORITY_HOST(p -> p.getProfile().getEnvironment().getActiveDirectoryEndpoint(),
+        (p, s) -> p.setProperty(AuthProperty.AUTHORITY_HOST.getPropertyKey(), s));
+
+    private Function<PasswordlessProperties, String> getter;
+    private BiConsumer<Properties, String> setter;
+
+    public Function<PasswordlessProperties, String> getGetter() {
+        return getter;
+    }
+
+    public BiConsumer<Properties, String> getSetter() {
+        return setter;
+    }
+
+    AzurePasswordlessPropertiesMapping(Function<PasswordlessProperties, String> getter, BiConsumer<Properties,
+        String> setter) {
+        this.getter = getter;
+        this.setter = setter;
+    }
+}
diff --git a/...ure-core/src/main/java/com/azure/spring/cloud/core/properties/PasswordlessProperties.java b/...ure-core/src/main/java/com/azure/spring/cloud/core/properties/PasswordlessProperties.java
@@ -3,13 +3,11 @@
 
 package com.azure.spring.cloud.core.properties;
 
-import com.azure.identity.extensions.implementation.enums.AuthProperty;
+import com.azure.spring.cloud.core.implementation.properties.AzurePasswordlessPropertiesMapping;
 import com.azure.spring.cloud.core.provider.AzureProfileOptionsProvider;
 import com.azure.spring.cloud.core.provider.authentication.TokenCredentialOptionsProvider;
 
 import java.util.Properties;
-import java.util.function.BiConsumer;
-import java.util.function.Function;
 
 /**
  * Unified properties for Azure passwordless clients.
@@ -51,87 +49,11 @@ public interface PasswordlessProperties extends TokenCredentialOptionsProvider,
     default Properties toPasswordlessProperties() {
         Properties target = new Properties();
         for (AzurePasswordlessPropertiesMapping m : AzurePasswordlessPropertiesMapping.values()) {
-            if (m.getter.apply(this) != null) {
-                m.setter.accept(target, m.getter.apply(this));
+            if (m.getGetter().apply(this) != null) {
+                m.getSetter().accept(target, m.getGetter().apply(this));
             }
         }
         return target;
     }
 
-    /**
-     * A mapping util used to convert a {@link PasswordlessProperties} instance to a {@link Properties} instance.
-     */
-    enum AzurePasswordlessPropertiesMapping {
-
-        /**
-         * Getter function and setter biConsumer for scopes.
-         */
-        SCOPES(p -> p.getScopes(),
-            (p, s) -> p.setProperty(AuthProperty.SCOPES.getPropertyKey(), s)),
-
-        /**
-         * Getter function and setter biConsumer for clientCertificatePassword.
-         */
-        CLIENT_CERTIFICATE_PASSWORD(p -> p.getCredential().getClientCertificatePassword(),
-            (p, s) -> p.setProperty(AuthProperty.CLIENT_CERTIFICATE_PASSWORD.getPropertyKey(), s)),
-
-        /**
-         * Getter function and setter biConsumer for clientCertificatePath.
-         */
-        CLIENT_CERTIFICATE_PATH(p -> p.getCredential().getClientCertificatePath(),
-            (p, s) -> p.setProperty(AuthProperty.CLIENT_CERTIFICATE_PATH.getPropertyKey(), s)),
-
-        /**
-         * Getter function and setter biConsumer for clientId.
-         */
-        CLIENT_ID(p -> p.getCredential().getClientId(),
-            (p, s) -> p.setProperty(AuthProperty.CLIENT_ID.getPropertyKey(), s)),
-
-        /**
-         * Getter function and setter biConsumer for clientSecret.
-         */
-        CLIENT_SECRET(p -> p.getCredential().getClientSecret(),
-            (p, s) -> p.setProperty(AuthProperty.CLIENT_SECRET.getPropertyKey(), s)),
-
-        /**
-         * Getter function and setter biConsumer for managedIdentityEnabled.
-         */
-        MANAGED_IDENTITY_ENABLED(p -> String.valueOf(p.getCredential().isManagedIdentityEnabled()),
-            (p, s) -> p.setProperty(AuthProperty.MANAGED_IDENTITY_ENABLED.getPropertyKey(), s)),
-
-        /**
-         * Getter function and setter biConsumer for password.
-         */
-        PASSWORD(p -> p.getCredential().getPassword(),
-            (p, s) -> p.setProperty(AuthProperty.PASSWORD.getPropertyKey(), s)),
-
-        /**
-         * Getter function and setter biConsumer for username.
-         */
-        USERNAME(p -> p.getCredential().getUsername(),
-            (p, s) -> p.setProperty(AuthProperty.USERNAME.getPropertyKey(), s)),
-
-        /**
-         * Getter function and setter biConsumer for tenantId.
-         */
-        TENANT_ID(p -> p.getProfile().getTenantId(),
-            (p, s) -> p.setProperty(AuthProperty.TENANT_ID.getPropertyKey(), s)),
-
-        /**
-         * Getter function and setter biConsumer for authorityHost.
-         */
-        AUTHORITY_HOST(p -> p.getProfile().getEnvironment().getActiveDirectoryEndpoint(),
-            (p, s) -> p.setProperty(AuthProperty.AUTHORITY_HOST.getPropertyKey(), s));
-
-        private Function<PasswordlessProperties, String> getter;
-        private BiConsumer<Properties, String> setter;
-
-        AzurePasswordlessPropertiesMapping(Function<PasswordlessProperties, String> getter, BiConsumer<Properties,
-            String> setter) {
-            this.getter = getter;
-            this.setter = setter;
-        }
-
-    }
 }
-