From 7d466be94e77e94a2ef949ef25af9748584f06a3 Mon Sep 17 00:00:00 2001 From: vramik Date: Thu, 7 Jun 2018 11:08:00 +0200 Subject: [PATCH] KEYCLOAK-6541 rename AppServerContainerSPI to AppServerContainerProvider --- ...ntainerSPI.java => AppServerContainerProvider.java} | 2 +- .../container/AppServerContainerService.java | 10 +++++----- .../arquillian/eap/container/EAPAppServerProvider.java | 8 ++++---- ...te.arquillian.container.AppServerContainerProvider} | 0 .../wildfly/container/WildflyAppServerProvider.java | 8 ++++---- ...te.arquillian.container.AppServerContainerProvider} | 0 .../undertow/container/UndertowAppServerProvider.java | 8 ++++---- ...te.arquillian.container.AppServerContainerProvider} | 0 8 files changed, 18 insertions(+), 18 deletions(-) rename testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/{AppServerContainerSPI.java => AppServerContainerProvider.java} (96%) rename testsuite/integration-arquillian/servers/app-server/jboss/eap/src/main/resources/META-INF/services/{org.keycloak.testsuite.arquillian.container.AppServerContainerSPI => org.keycloak.testsuite.arquillian.container.AppServerContainerProvider} (100%) rename testsuite/integration-arquillian/servers/app-server/jboss/wildfly/src/main/resources/META-INF/services/{org.keycloak.testsuite.arquillian.container.AppServerContainerSPI => org.keycloak.testsuite.arquillian.container.AppServerContainerProvider} (100%) rename testsuite/integration-arquillian/servers/app-server/undertow/src/main/resources/META-INF/services/{org.keycloak.testsuite.arquillian.container.AppServerContainerSPI => org.keycloak.testsuite.arquillian.container.AppServerContainerProvider} (100%) diff --git a/testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/AppServerContainerSPI.java b/testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/AppServerContainerProvider.java similarity index 96% rename from testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/AppServerContainerSPI.java rename to testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/AppServerContainerProvider.java index 3fdb55f679..f1ae0fad26 100644 --- a/testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/AppServerContainerSPI.java +++ b/testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/AppServerContainerProvider.java @@ -23,7 +23,7 @@ import org.jboss.shrinkwrap.descriptor.spi.node.Node; /** * @author Vlasta Ramik */ -public interface AppServerContainerSPI { +public interface AppServerContainerProvider { public static final String APP_SERVER = "app-server"; diff --git a/testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/AppServerContainerService.java b/testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/AppServerContainerService.java index 986c020daa..6338ce5108 100644 --- a/testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/AppServerContainerService.java +++ b/testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/AppServerContainerService.java @@ -30,10 +30,10 @@ import org.jboss.shrinkwrap.descriptor.spi.node.Node; public class AppServerContainerService { private static AppServerContainerService service; - private final ServiceLoader loader; + private final ServiceLoader loader; private AppServerContainerService() { - loader = ServiceLoader.load(AppServerContainerSPI.class); + loader = ServiceLoader.load(AppServerContainerProvider.class); } public static synchronized AppServerContainerService getInstance() { @@ -46,13 +46,13 @@ public class AppServerContainerService { public List getContainers(String appServerName) { List containers = null; try { - Iterator definitions = loader.iterator(); + Iterator definitions = loader.iterator(); - List availableDefinitions = new ArrayList<>(); + List availableDefinitions = new ArrayList<>(); while (definitions != null && definitions.hasNext()) { availableDefinitions.add(definitions.next()); } - for (AppServerContainerSPI def : availableDefinitions) { + for (AppServerContainerProvider def : availableDefinitions) { if (def.getName().equals(appServerName)) { containers = def.getContainers(); } diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/eap/src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAPAppServerProvider.java b/testsuite/integration-arquillian/servers/app-server/jboss/eap/src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAPAppServerProvider.java index ee9b9ea3e2..e7c02a884d 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/eap/src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAPAppServerProvider.java +++ b/testsuite/integration-arquillian/servers/app-server/jboss/eap/src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAPAppServerProvider.java @@ -22,12 +22,12 @@ import java.util.List; import org.jboss.arquillian.core.spi.Validate; import org.jboss.as.arquillian.container.managed.ManagedDeployableContainer; import org.jboss.shrinkwrap.descriptor.spi.node.Node; -import org.keycloak.testsuite.arquillian.container.AppServerContainerSPI; +import org.keycloak.testsuite.arquillian.container.AppServerContainerProvider; /** * @author Vlasta Ramik */ -public class EAPAppServerProvider implements AppServerContainerSPI { +public class EAPAppServerProvider implements AppServerContainerProvider { private Node configuration; private static final String containerName = "eap"; @@ -77,7 +77,7 @@ public class EAPAppServerProvider implements AppServerContainerSPI { private Node standaloneContainer() { Node container = new Node("container"); container.attribute("mode", "manual"); - container.attribute("qualifier", AppServerContainerSPI.APP_SERVER + "-" + containerName); + container.attribute("qualifier", AppServerContainerProvider.APP_SERVER + "-" + containerName); configuration = container.createChild("configuration"); createChild("enabled", "true"); @@ -117,7 +117,7 @@ public class EAPAppServerProvider implements AppServerContainerSPI { Node container = group.createChild("container"); container.attribute("mode", "manual"); - container.attribute("qualifier", AppServerContainerSPI.APP_SERVER + "-" + containerName + "-ha-node-" + number); + container.attribute("qualifier", AppServerContainerProvider.APP_SERVER + "-" + containerName + "-ha-node-" + number); configuration = container.createChild("configuration"); createChild("enabled", "true"); diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/eap/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerSPI b/testsuite/integration-arquillian/servers/app-server/jboss/eap/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider similarity index 100% rename from testsuite/integration-arquillian/servers/app-server/jboss/eap/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerSPI rename to testsuite/integration-arquillian/servers/app-server/jboss/eap/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyAppServerProvider.java b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyAppServerProvider.java index a3865cf4ca..46f2e43759 100644 --- a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyAppServerProvider.java +++ b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyAppServerProvider.java @@ -22,12 +22,12 @@ import java.util.List; import org.jboss.arquillian.core.spi.Validate; import org.jboss.as.arquillian.container.managed.ManagedDeployableContainer; import org.jboss.shrinkwrap.descriptor.spi.node.Node; -import org.keycloak.testsuite.arquillian.container.AppServerContainerSPI; +import org.keycloak.testsuite.arquillian.container.AppServerContainerProvider; /** * @author Vlasta Ramik */ -public class WildflyAppServerProvider implements AppServerContainerSPI { +public class WildflyAppServerProvider implements AppServerContainerProvider { private Node configuration; private static final String containerName = "wildfly"; @@ -77,7 +77,7 @@ public class WildflyAppServerProvider implements AppServerContainerSPI { private Node standaloneContainer() { Node container = new Node("container"); container.attribute("mode", "manual"); - container.attribute("qualifier", AppServerContainerSPI.APP_SERVER + "-" + containerName); + container.attribute("qualifier", AppServerContainerProvider.APP_SERVER + "-" + containerName); configuration = container.createChild("configuration"); createChild("enabled", "true"); @@ -117,7 +117,7 @@ public class WildflyAppServerProvider implements AppServerContainerSPI { Node container = group.createChild("container"); container.attribute("mode", "manual"); - container.attribute("qualifier", AppServerContainerSPI.APP_SERVER + "-" + containerName + "-ha-node-" + number); + container.attribute("qualifier", AppServerContainerProvider.APP_SERVER + "-" + containerName + "-ha-node-" + number); configuration = container.createChild("configuration"); createChild("enabled", "true"); diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerSPI b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider similarity index 100% rename from testsuite/integration-arquillian/servers/app-server/jboss/wildfly/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerSPI rename to testsuite/integration-arquillian/servers/app-server/jboss/wildfly/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider diff --git a/testsuite/integration-arquillian/servers/app-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/container/UndertowAppServerProvider.java b/testsuite/integration-arquillian/servers/app-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/container/UndertowAppServerProvider.java index cd60f89b8f..f9af9fe725 100644 --- a/testsuite/integration-arquillian/servers/app-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/container/UndertowAppServerProvider.java +++ b/testsuite/integration-arquillian/servers/app-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/container/UndertowAppServerProvider.java @@ -20,13 +20,13 @@ package org.keycloak.testsuite.arquillian.undertow.container; import java.util.ArrayList; import java.util.List; import org.jboss.shrinkwrap.descriptor.spi.node.Node; -import org.keycloak.testsuite.arquillian.container.AppServerContainerSPI; import org.keycloak.testsuite.arquillian.undertow.UndertowAppServer; +import org.keycloak.testsuite.arquillian.container.AppServerContainerProvider; /** * @author Vlasta Ramik */ -public class UndertowAppServerProvider implements AppServerContainerSPI { +public class UndertowAppServerProvider implements AppServerContainerProvider { private Node configuration; private static final String containerName = "undertow"; @@ -56,7 +56,7 @@ public class UndertowAppServerProvider implements AppServerContainerSPI { private Node standaloneContainer() { Node container = new Node("container"); container.attribute("mode", "manual"); - container.attribute("qualifier", AppServerContainerSPI.APP_SERVER + "-" + containerName); + container.attribute("qualifier", AppServerContainerProvider.APP_SERVER + "-" + containerName); configuration = container.createChild("configuration"); createChild("enabled", "true"); @@ -70,7 +70,7 @@ public class UndertowAppServerProvider implements AppServerContainerSPI { private Node haNodeContainer(int number) { Node container = new Node("container"); container.attribute("mode", "manual"); - container.attribute("qualifier", AppServerContainerSPI.APP_SERVER + "-" + containerName + "-ha-node-" + number); + container.attribute("qualifier", AppServerContainerProvider.APP_SERVER + "-" + containerName + "-ha-node-" + number); configuration = container.createChild("configuration"); createChild("enabled", "true"); diff --git a/testsuite/integration-arquillian/servers/app-server/undertow/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerSPI b/testsuite/integration-arquillian/servers/app-server/undertow/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider similarity index 100% rename from testsuite/integration-arquillian/servers/app-server/undertow/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerSPI rename to testsuite/integration-arquillian/servers/app-server/undertow/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider