[WFLY-7186] Move UndertowApplicationSecurityDomain and make public fo…

…r use with other tests.
wildfly · Nov 30, 2018 · 2156060 · 2156060
1 parent 796c816
commit 2156060
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 41 deletions.
diff --git a/...ron/src/test/java/org/wildfly/test/integration/elytron/jaspi/ConfiguredJaspiTestBase.java b/...ron/src/test/java/org/wildfly/test/integration/elytron/jaspi/ConfiguredJaspiTestBase.java
@@ -56,6 +56,7 @@
 import org.wildfly.security.auth.jaspi.Flag;
 import org.wildfly.test.security.common.AbstractElytronSetupTask;
 import org.wildfly.test.security.common.elytron.ConfigurableElement;
+import org.wildfly.test.undertow.common.UndertowApplicationSecurityDomain;
 
 /**
  * A base for the configured JASPI testing allowing us to repeat the same set of tests across a different set of server

diff --git a/...lytron/src/test/java/org/wildfly/test/integration/elytron/jaspi/DynamicJaspiTestCase.java b/...lytron/src/test/java/org/wildfly/test/integration/elytron/jaspi/DynamicJaspiTestCase.java
@@ -46,6 +46,7 @@
 import org.junit.runner.RunWith;
 import org.wildfly.test.security.common.AbstractElytronSetupTask;
 import org.wildfly.test.security.common.elytron.ConfigurableElement;
+import org.wildfly.test.undertow.common.UndertowApplicationSecurityDomain;
 
 /**
  * Test case testing a deployment secured using JASPI dynamically registered by the deployment.

diff --git a/...rc/main/java/org/wildfly/test/security/common/elytron/ClientCertUndertowDomainMapper.java b/...rc/main/java/org/wildfly/test/security/common/elytron/ClientCertUndertowDomainMapper.java
@@ -33,7 +33,7 @@
  *
  * @author Ondrej Kotek
  */
-public class ClientCertUndertowDomainMapper extends AbstractConfigurableElement implements SecurityDomainMapper {
+public class ClientCertUndertowDomainMapper extends AbstractConfigurableElement {
 
     private final String securityDomain;
 

diff --git a/...e/shared/src/main/java/org/wildfly/test/security/common/elytron/SecurityDomainMapper.java b/...e/shared/src/main/java/org/wildfly/test/security/common/elytron/SecurityDomainMapper.java
diff --git a/...e/shared/src/main/java/org/wildfly/test/security/common/elytron/UndertowDomainMapper.java b/...e/shared/src/main/java/org/wildfly/test/security/common/elytron/UndertowDomainMapper.java
@@ -40,8 +40,10 @@
  * </p>
  *
  * @author Josef Cacek
+ * @deprecated Configures more than one resource, use {@code UndertowApplicationSecurityDomain}
  */
-public class UndertowDomainMapper  extends AbstractConfigurableElement implements SecurityDomainMapper {
+@Deprecated
+public class UndertowDomainMapper  extends AbstractConfigurableElement {
 
     private final Set<String> applicationDomains;
 

diff --git a/...pi/UndertowApplicationSecurityDomain.java → ...on/UndertowApplicationSecurityDomain.java b/...pi/UndertowApplicationSecurityDomain.java → ...on/UndertowApplicationSecurityDomain.java
@@ -20,7 +20,7 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 
-package org.wildfly.test.integration.elytron.jaspi;
+package org.wildfly.test.undertow.common;
 
 import static org.wildfly.test.security.common.ModelNodeUtil.setIfNotNull;
 
@@ -38,12 +38,7 @@
  *
  * @author <a href="mailto:darran.lofthouse@jboss.com">Darran Lofthouse</a>
  */
- class UndertowApplicationSecurityDomain extends AbstractConfigurableElement {
-
-     /*
-      * Reduced visibility until we decide to make this accessible for use elsewhere which would also mean moving this class into
-      * common.
-      */
+ public class UndertowApplicationSecurityDomain extends AbstractConfigurableElement {
 
      private final PathAddress address;
      private final String securityDomain;