FISH-5878 Made requested PR changes

payara · Dec 9, 2021 · 233d71e · 233d71e
1 parent 94f9a9f
commit 233d71e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 63 deletions.
diff --git a/api/payara-api/src/main/java/fish/payara/security/client/PayaraConstants.java b/api/payara-api/src/main/java/fish/payara/security/client/PayaraConstants.java
@@ -40,7 +40,7 @@
 package fish.payara.security.client;
 
 /**
- * Holds the constants for JAX-RS Client and MP Client Certificate Alias (FISH-230)
+ * Holds the constants for JAX-RS Client and MP Client Certificate Alias
  * @author Kalin Chan
  * @since 5.2022.1
  */
@@ -55,4 +55,9 @@ public final class PayaraConstants {
      * Specifies the Rest Client property name.
      */
     public static final String REST_CLIENT_CERTIFICATE_ALIAS = "fish.payara.rest.client.certificate.alias";
+
+    /**
+     * Specifies the MP Client property name
+     */
+    public static final String MP_CONFIG_CLIENT_CERTIFICATE_ALIAS = "payara.certificate.alias";
 }
diff --git a/...t-client-ssl/src/main/java/fish/payara/microprofile/jaxrs/client/ssl/PayaraConstants.java b/...t-client-ssl/src/main/java/fish/payara/microprofile/jaxrs/client/ssl/PayaraConstants.java
diff --git a/...ain/java/fish/payara/microprofile/jaxrs/client/ssl/RestClientSslContextAliasListener.java b/...ain/java/fish/payara/microprofile/jaxrs/client/ssl/RestClientSslContextAliasListener.java
@@ -62,8 +62,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import static fish.payara.microprofile.jaxrs.client.ssl.PayaraConstants.PAYARA_MP_CONFIG_CLIENT_CERTIFICATE_ALIAS;
-import static fish.payara.microprofile.jaxrs.client.ssl.PayaraConstants.PAYARA_REST_CLIENT_CERTIFICATE_ALIAS;
+import static fish.payara.security.client.PayaraConstants.MP_CONFIG_CLIENT_CERTIFICATE_ALIAS;
+import static fish.payara.security.client.PayaraConstants.REST_CLIENT_CERTIFICATE_ALIAS;
 
 /**
  * This class implements RestClientListener to evaluate the alias property and set a custom sslContext
@@ -77,7 +77,7 @@ public class RestClientSslContextAliasListener implements RestClientListener {
     public void onNewClient(Class<?> serviceInterface, RestClientBuilder restClientBuilder) {
         logger.log(Level.FINE, "Evaluating state of the RestClientBuilder after calling build method");
         Object objectProperty = restClientBuilder.getConfiguration()
-                .getProperty(PAYARA_REST_CLIENT_CERTIFICATE_ALIAS);
+                .getProperty(REST_CLIENT_CERTIFICATE_ALIAS);
 
         if (objectProperty instanceof String) {
             String alias = (String) objectProperty;
@@ -93,7 +93,7 @@ public void onNewClient(Class<?> serviceInterface, RestClientBuilder restClientB
         } else {
             Config config = getConfig();
             try {
-                String alias = config.getValue(PAYARA_MP_CONFIG_CLIENT_CERTIFICATE_ALIAS,
+                String alias = config.getValue(MP_CONFIG_CLIENT_CERTIFICATE_ALIAS,
                         String.class);
                 if (alias != null) {
                     logger.log(Level.INFO, String.format("The alias: %s is available from the MP Config", alias));
@@ -107,7 +107,7 @@ public void onNewClient(Class<?> serviceInterface, RestClientBuilder restClientB
                 }
             } catch (NoSuchElementException e) {
                 logger.log(Level.FINE, String.format("The MP config property %s was not set",
-                        PAYARA_MP_CONFIG_CLIENT_CERTIFICATE_ALIAS));
+                        MP_CONFIG_CLIENT_CERTIFICATE_ALIAS));
             }
         }
     }

diff --git a/...java/fish/payara/microprofile/jaxrs/client/ssl/RestClientSslContextAliasListenerTest.java b/...java/fish/payara/microprofile/jaxrs/client/ssl/RestClientSslContextAliasListenerTest.java
@@ -60,8 +60,8 @@
 import java.security.*;
 import java.security.cert.CertificateException;
 
-import static fish.payara.microprofile.jaxrs.client.ssl.PayaraConstants.PAYARA_MP_CONFIG_CLIENT_CERTIFICATE_ALIAS;
-import static fish.payara.microprofile.jaxrs.client.ssl.PayaraConstants.PAYARA_REST_CLIENT_CERTIFICATE_ALIAS;
+import static fish.payara.security.client.PayaraConstants.MP_CONFIG_CLIENT_CERTIFICATE_ALIAS;
+import static fish.payara.security.client.PayaraConstants.REST_CLIENT_CERTIFICATE_ALIAS;
 import static org.mockito.Mockito.*;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -87,7 +87,7 @@ public void restClientAliasPropertySslContextTest() throws Exception {
         KeyStore[] keyStores = new KeyStore[]{getKeyStore()};
 
         when(restClientBuilder.getConfiguration()).thenReturn(configuration);
-        when(configuration.getProperty(PAYARA_REST_CLIENT_CERTIFICATE_ALIAS)).thenReturn("myKey");
+        when(configuration.getProperty(REST_CLIENT_CERTIFICATE_ALIAS)).thenReturn("myKey");
         doReturn(managers).when(restClientSslContextAliasListener).getKeyManagers();
         doReturn(keyStores).when(restClientSslContextAliasListener).getKeyStores();
 
@@ -105,11 +105,11 @@ public void restClientAliasPropertyFromMPConfigSslContextTest() throws Exception
         KeyStore[] keyStores = new KeyStore[]{getKeyStore()};
 
         when(restClientBuilder.getConfiguration()).thenReturn(configuration);
-        when(configuration.getProperty(PAYARA_REST_CLIENT_CERTIFICATE_ALIAS)).thenReturn(null);
+        when(configuration.getProperty(REST_CLIENT_CERTIFICATE_ALIAS)).thenReturn(null);
         doReturn(managers).when(restClientSslContextAliasListener).getKeyManagers();
         doReturn(keyStores).when(restClientSslContextAliasListener).getKeyStores();
         doReturn(config).when(restClientSslContextAliasListener).getConfig();
-        when(config.getValue(PAYARA_MP_CONFIG_CLIENT_CERTIFICATE_ALIAS, String.class)).thenReturn("myKey");
+        when(config.getValue(MP_CONFIG_CLIENT_CERTIFICATE_ALIAS, String.class)).thenReturn("myKey");
 
         restClientSslContextAliasListener.onNewClient(RestClientBuilder.class, restClientBuilder);