Improve custom configuration and API

This commit is contained in:
Reinhard Prechtl 2017-12-14 16:56:53 +01:00
parent a14dac8a80
commit e51c95618e
10 changed files with 162 additions and 439 deletions

View file

@ -9,14 +9,17 @@ At the moment this is a rudimentary implementation and by no means complete. Fee
# Usage # Usage
For general usage info on Testcontainers please look at the examples of the project. Here's simple example how you can use the `InfinispanContainer`.
``` ```
@ClassRule @ClassRule
public static InfinispanContainer infinispan = InfinispanContainerFactory public static InfinispanContainer infinispan = new InfinispanContainer()
.standalone("9.1.3.Final") .withProtocolVersion(ProtocolVersion.PROTOCOL_VERSION_26)
.configurationFile("infinispan-standalone.xml") .withCaches("testCache");
.expose()
.hotrod()
.build();
``` ```
If you want, you can retrieve a `RemoteCacheManager` from the container:
```
infinispan.getCacheManager()
```
For general usage info on Testcontainers please look at the examples of the project.

View file

@ -30,7 +30,6 @@
<groupId>org.infinispan</groupId> <groupId>org.infinispan</groupId>
<artifactId>infinispan-client-hotrod</artifactId> <artifactId>infinispan-client-hotrod</artifactId>
<version>${infinispan.version}</version> <version>${infinispan.version}</version>
<scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

View file

@ -1,8 +1,94 @@
package de.rpr.testcontainers.infinispan; package de.rpr.testcontainers.infinispan;
import org.junit.rules.TestRule; import com.github.dockerjava.api.command.InspectContainerResponse;
import org.testcontainers.containers.Container; import org.infinispan.client.hotrod.ProtocolVersion;
import org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
import org.jetbrains.annotations.NotNull;
import org.junit.runner.Description;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.LogMessageWaitStrategy;
public interface InfinispanContainer<SELF extends InfinispanContainer<SELF>> extends Container<SELF>, TestRule { import java.io.File;
import java.net.URL;
import java.time.Duration;
import java.util.*;
@SuppressWarnings("ALL")
public class InfinispanContainer extends GenericContainer<InfinispanContainer> {
private static final String IMAGE_NAME = "jboss/infinispan-server";
private static Set<ProtocolVersion> incompatibleProtocolVersions = new HashSet<>();
static {
incompatibleProtocolVersions.add(ProtocolVersion.PROTOCOL_VERSION_10);
incompatibleProtocolVersions.add(ProtocolVersion.PROTOCOL_VERSION_11);
incompatibleProtocolVersions.add(ProtocolVersion.PROTOCOL_VERSION_12);
incompatibleProtocolVersions.add(ProtocolVersion.PROTOCOL_VERSION_13);
}
private ProtocolVersion protocolVersion;
private Collection<String> cacheNames;
private RemoteCacheManager cacheManager;
public InfinispanContainer() {
this("latest");
}
public InfinispanContainer(final String version) {
super(IMAGE_NAME + ":" + version);
withStartupTimeout(Duration.ofMillis(20000));
withCommand("standalone");
waitingFor(new LogMessageWaitStrategy().withRegEx(".*Infinispan Server.*started in.*\\s"));
}
public InfinispanContainer withProtocolVersion(final ProtocolVersion protocolVersion) {
if (incompatibleProtocolVersions.contains(protocolVersion)) {
throw new IllegalArgumentException("You have to use a Hotrod protocol version of 2.0 at least. 1.x can't create caches through the API.");
}
this.protocolVersion = protocolVersion;
return this;
}
public InfinispanContainer withCaches(final Collection<String> cacheNames) {
this.cacheNames = cacheNames;
return this;
}
public InfinispanContainer withCaches(final String... cacheNames) {
return withCaches(Arrays.asList(cacheNames));
}
@Override
protected void containerIsStarted(final InspectContainerResponse containerInfo) {
cacheManager = new RemoteCacheManager(new ConfigurationBuilder()
.addServers(getServerAddress())
.version(getProtocolVersion())
.build());
this.cacheNames.forEach(cacheName -> {
cacheManager.administration().createCache(cacheName, null);
});
}
@Override
protected void finished(final Description description) {
cacheManager.stop();
super.finished(description);
}
private ProtocolVersion getProtocolVersion() {
return protocolVersion != null ? protocolVersion : ProtocolVersion.PROTOCOL_VERSION_26;
}
public String getServerAddress() {
return getContainerIpAddress() + ":" + getMappedPort(11222);
}
public RemoteCacheManager getCacheManager() {
return cacheManager;
}
} }

View file

@ -1,8 +0,0 @@
package de.rpr.testcontainers.infinispan;
public interface InfinispanContainerBuilder {
InfinispanContainerExposedPortsBuilder expose();
InfinispanContainer build();
}

View file

@ -1,13 +0,0 @@
package de.rpr.testcontainers.infinispan;
public interface InfinispanContainerExposedPortsBuilder {
InfinispanContainerBuilder hotrod();
InfinispanContainerBuilder hotrod(int port);
InfinispanContainerBuilder rest();
InfinispanContainerBuilder rest(int port);
}

View file

@ -1,97 +0,0 @@
package de.rpr.testcontainers.infinispan;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.LogMessageWaitStrategy;
import java.io.File;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
public class InfinispanContainerFactory
extends GenericContainer<InfinispanContainerFactory>
implements InfinispanContainer<InfinispanContainerFactory>, InfinispanContainerExposedPortsBuilder, InfinispanContainerBuilder,
InfinispanContainerStandaloneBuilder {
private static final String IMAGE_NAME = "jboss/infinispan-server:";
@Override
public InfinispanContainerBuilder configurationFile(final String classPathResourceName) {
URL resourceUrl = this.getClass().getClassLoader().getResource(classPathResourceName);
if (resourceUrl == null) {
throw new IllegalArgumentException("Cannot read configuration resource");
}
return withFileSystemBind(new File(resourceUrl.getFile()).getAbsolutePath(),
"/opt/jboss/infinispan-server/standalone/configuration/standalone.xml",
BindMode.READ_ONLY);
}
@Override
public InfinispanContainerBuilder and() {
return this;
}
private enum Protocol {
HOTROD(11222),
REST(8080);
private final int defaultPort;
Protocol(final int defaultPort) {
this.defaultPort = defaultPort;
}
}
private final Map<Protocol, Integer> exposedPorts = new HashMap<>();
private InfinispanContainerFactory(final String dockerImageName) {
super(dockerImageName);
}
public static InfinispanContainerStandaloneBuilder standalone() {
return standalone("9.1.3.Final");
}
public static InfinispanContainerStandaloneBuilder standalone(final String version) {
InfinispanContainer container = new InfinispanContainerFactory(IMAGE_NAME + version);
container.withCommand("standalone");
return (InfinispanContainerStandaloneBuilder) container;
}
@Override
public InfinispanContainerExposedPortsBuilder expose() {
return this;
}
@Override
public InfinispanContainerBuilder hotrod() {
return hotrod(Protocol.HOTROD.defaultPort);
}
@Override
public InfinispanContainerBuilder hotrod(final int port) {
return exposePort(Protocol.HOTROD, port);
}
@Override
public InfinispanContainerBuilder rest() {
return rest(Protocol.REST.defaultPort);
}
@Override
public InfinispanContainerBuilder rest(final int port) {
return exposePort(Protocol.REST, port);
}
private InfinispanContainerFactory exposePort(final Protocol service, final int port) {
exposedPorts.put(service, port);
return this;
}
@Override
public InfinispanContainer build() {
return waitingFor(new LogMessageWaitStrategy().withRegEx(".*Infinispan Server.*started in.*\\s"));
}
}

View file

@ -1,9 +0,0 @@
package de.rpr.testcontainers.infinispan;
public interface InfinispanContainerStandaloneBuilder {
InfinispanContainerBuilder configurationFile(String classPathResourceName);
InfinispanContainerBuilder and();
}

View file

@ -1,286 +0,0 @@
<?xml version="1.0" ?>
<server xmlns="urn:jboss:domain:4.2">
<extensions>
<extension module="org.infinispan.extension"/>
<extension module="org.infinispan.server.endpoint"/>
<extension module="org.jboss.as.connector"/>
<extension module="org.jboss.as.deployment-scanner"/>
<extension module="org.jboss.as.jdr"/>
<extension module="org.jboss.as.jmx"/>
<extension module="org.jboss.as.logging"/>
<extension module="org.jboss.as.naming"/>
<extension module="org.jboss.as.remoting"/>
<extension module="org.jboss.as.security"/>
<extension module="org.jboss.as.transactions"/>
<extension module="org.wildfly.extension.io"/>
<extension module="org.wildfly.extension.security.manager"/>
</extensions>
<management>
<security-realms>
<security-realm name="ManagementRealm">
<authentication>
<local default-user="$local" skip-group-loading="true"/>
<properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
</authentication>
<authorization map-groups-to-roles="false">
<properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
</authorization>
</security-realm>
<security-realm name="ApplicationRealm">
<authentication>
<local default-user="$local" allowed-users="*" skip-group-loading="true"/>
<properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
</authentication>
<authorization>
<properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
</authorization>
</security-realm>
</security-realms>
<audit-log>
<formatters>
<json-formatter name="json-formatter"/>
</formatters>
<handlers>
<file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
</handlers>
<logger log-boot="true" log-read-only="false" enabled="false">
<handlers>
<handler name="file"/>
</handlers>
</logger>
</audit-log>
<management-interfaces>
<http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
<socket-binding http="management-http"/>
</http-interface>
</management-interfaces>
<access-control provider="simple">
<role-mapping>
<role name="SuperUser">
<include>
<user name="$local"/>
</include>
</role>
</role-mapping>
</access-control>
</management>
<profile>
<subsystem xmlns="urn:jboss:domain:logging:3.0">
<console-handler name="CONSOLE">
<level name="INFO"/>
<formatter>
<named-formatter name="COLOR-PATTERN"/>
</formatter>
</console-handler>
<periodic-rotating-file-handler name="FILE" autoflush="true">
<formatter>
<named-formatter name="PATTERN"/>
</formatter>
<file relative-to="jboss.server.log.dir" path="server.log"/>
<suffix value=".yyyy-MM-dd"/>
<append value="true"/>
</periodic-rotating-file-handler>
<size-rotating-file-handler name="HR-ACCESS-FILE" autoflush="true">
<formatter>
<pattern-formatter pattern="(%t) %s%e%n"/>
</formatter>
<file relative-to="jboss.server.log.dir" path="hotrod-access.log"/>
<append value="true"/>
<rotate-size value="10M"/>
<max-backup-index value="10"/>
</size-rotating-file-handler>
<size-rotating-file-handler name="REST-ACCESS-FILE" autoflush="true">
<formatter>
<pattern-formatter pattern="(%t) %s%e%n"/>
</formatter>
<file relative-to="jboss.server.log.dir" path="rest-access.log"/>
<append value="true"/>
<rotate-size value="10M"/>
<max-backup-index value="10"/>
</size-rotating-file-handler>
<logger category="com.arjuna">
<level name="WARN"/>
</logger>
<logger category="org.jboss.as.config">
<level name="DEBUG"/>
</logger>
<logger category="sun.rmi">
<level name="WARN"/>
</logger>
<logger category="org.infinispan.server.hotrod.logging.HotRodAccessLoggingHandler">
<!-- Set to TRACE to enable access logging for hot rod or use DMR -->
<level name="INFO"/>
<handlers>
<handler name="HR-ACCESS-FILE"/>
</handlers>
</logger>
<logger category="org.infinispan.rest.logging.RestAccessLoggingHandler">
<!-- Set to TRACE to enable access logging for rest or use DMR -->
<level name="INFO"/>
<handlers>
<handler name="REST-ACCESS-FILE"/>
</handlers>
</logger>
<root-logger>
<level name="INFO"/>
<handlers>
<handler name="CONSOLE"/>
<handler name="FILE"/>
</handlers>
</root-logger>
<formatter name="PATTERN">
<pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
</formatter>
<formatter name="COLOR-PATTERN">
<pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
</formatter>
</subsystem>
<subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
<deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:datasources:4.0">
<datasources>
<datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
<driver>h2</driver>
<security>
<user-name>sa</user-name>
<password>sa</password>
</security>
</datasource>
<drivers>
<driver name="h2" module="com.h2database.h2">
<xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
</driver>
</drivers>
</datasources>
</subsystem>
<subsystem xmlns="urn:jboss:domain:io:1.1">
<worker name="default"/>
<buffer-pool name="default"/>
</subsystem>
<subsystem xmlns="urn:infinispan:server:core:9.1" default-cache-container="local">
<cache-container name="local" default-cache="default" statistics="true">
<global-state/>
<local-cache name="default"/>
<local-cache name="testCache"/>
</cache-container>
</subsystem>
<subsystem xmlns="urn:infinispan:server:endpoint:9.0">
<hotrod-connector socket-binding="hotrod" cache-container="local">
<topology-state-transfer lazy-retrieval="false" lock-timeout="1000" replication-timeout="5000"/>
</hotrod-connector>
<rest-connector socket-binding="rest" cache-container="local">
<authentication security-realm="ApplicationRealm" auth-method="BASIC"/>
</rest-connector>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jca:4.0">
<archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
<bean-validation enabled="true"/>
<default-workmanager>
<short-running-threads>
<core-threads count="50"/>
<queue-length count="50"/>
<max-threads count="50"/>
<keepalive-time time="10" unit="seconds"/>
</short-running-threads>
<long-running-threads>
<core-threads count="50"/>
<queue-length count="50"/>
<max-threads count="50"/>
<keepalive-time time="10" unit="seconds"/>
</long-running-threads>
</default-workmanager>
<cached-connection-manager/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
<subsystem xmlns="urn:jboss:domain:jmx:1.3">
<expose-resolved-model/>
<expose-expression-model/>
<remoting-connector/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:naming:2.0">
<remote-naming/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:remoting:3.0">
<endpoint/>
<http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
</subsystem>
<subsystem xmlns="urn:jboss:domain:security:1.2">
<security-domains>
<security-domain name="other" cache-type="default">
<authentication>
<login-module code="Remoting" flag="optional">
<module-option name="password-stacking" value="useFirstPass"/>
</login-module>
<login-module code="RealmDirect" flag="required">
<module-option name="password-stacking" value="useFirstPass"/>
</login-module>
</authentication>
</security-domain>
<security-domain name="jboss-web-policy" cache-type="default">
<authorization>
<policy-module code="Delegating" flag="required"/>
</authorization>
</security-domain>
<security-domain name="jboss-ejb-policy" cache-type="default">
<authorization>
<policy-module code="Delegating" flag="required"/>
</authorization>
</security-domain>
<security-domain name="jaspitest" cache-type="default">
<authentication-jaspi>
<login-module-stack name="dummy">
<login-module code="Dummy" flag="optional"/>
</login-module-stack>
<auth-module code="Dummy"/>
</authentication-jaspi>
</security-domain>
</security-domains>
</subsystem>
<subsystem xmlns="urn:jboss:domain:security-manager:1.0">
<deployment-permissions>
<maximum-set>
<permission class="java.security.AllPermission"/>
</maximum-set>
</deployment-permissions>
</subsystem>
<subsystem xmlns="urn:jboss:domain:transactions:3.0">
<core-environment>
<process-id>
<uuid/>
</process-id>
</core-environment>
<recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
</subsystem>
</profile>
<interfaces>
<interface name="management">
<inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
</interface>
<interface name="public">
<inet-address value="${jboss.bind.address:127.0.0.1}"/>
</interface>
</interfaces>
<socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
<socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
<socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
<socket-binding name="hotrod" port="11222"/>
<socket-binding name="hotrod-internal" port="11223"/>
<socket-binding name="hotrod-multi-tenancy" port="11224"/>
<socket-binding name="memcached" port="11211"/>
<socket-binding name="rest" port="8080"/>
<socket-binding name="rest-multi-tenancy" port="8081"/>
<socket-binding name="rest-ssl" port="8443"/>
<socket-binding name="txn-recovery-environment" port="4712"/>
<socket-binding name="txn-status-manager" port="4713"/>
<socket-binding name="websocket" port="8181"/>
<outbound-socket-binding name="remote-store-hotrod-server">
<remote-destination host="remote-host" port="11222"/>
</outbound-socket-binding>
<outbound-socket-binding name="remote-store-rest-server">
<remote-destination host="remote-host" port="8080"/>
</outbound-socket-binding>
</socket-binding-group>
</server>

View file

@ -0,0 +1,58 @@
import org.infinispan.client.hotrod.ProtocolVersion;
import org.infinispan.client.hotrod.RemoteCache;
import org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.LogMessageWaitStrategy;
import java.time.Duration;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertNotNull;
public class GenericInfinispanContainerIntegrationTest {
ExecutorService executorService = Executors.newCachedThreadPool();
RemoteCacheManager cacheManager;
@ClassRule
public static GenericContainer container =
new GenericContainer("jboss/infinispan-server:9.1.3.Final")
.waitingFor(new LogMessageWaitStrategy().withRegEx(".*Infinispan Server.*started in.*\\s"))
.withStartupTimeout(Duration.ofMillis(20000))
.withClasspathResourceMapping(
"infinispan-standalone.xml",
"/opt/jboss/infinispan-server/standalone/configuration/standalone.xml",
BindMode.READ_ONLY)
.withCommand("standalone");
@Before
public void setup() {
cacheManager = new RemoteCacheManager(new ConfigurationBuilder()
.addServers(getServerAddress())
.version(ProtocolVersion.PROTOCOL_VERSION_26)
.build());
}
@Test
public void should_be_able_to_retrieve_a_cache() throws Exception {
Future<RemoteCache<Object, Object>> result = executorService.submit(() -> cacheManager.getCache());
assertNotNull(result.get(1500, TimeUnit.MILLISECONDS));
}
@Test
public void should_be_able_to_retrieve_a_configured_cache() {
assertNotNull(cacheManager.getCache("testCache"));
}
private String getServerAddress() {
return container.getContainerIpAddress() + ":" + container.getMappedPort(11222);
}
}

View file

@ -1,8 +1,5 @@
import de.rpr.testcontainers.infinispan.InfinispanContainer; import de.rpr.testcontainers.infinispan.InfinispanContainer;
import de.rpr.testcontainers.infinispan.InfinispanContainerFactory;
import org.infinispan.client.hotrod.ProtocolVersion; import org.infinispan.client.hotrod.ProtocolVersion;
import org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.client.hotrod.configuration.ConfigurationBuilder;
import org.junit.ClassRule; import org.junit.ClassRule;
import org.junit.Test; import org.junit.Test;
@ -12,12 +9,9 @@ public class InfinispanContainerIntegrationTest {
@ClassRule @ClassRule
public static InfinispanContainer infinispan = public static InfinispanContainer infinispan =
InfinispanContainerFactory new InfinispanContainer("9.1.3.Final")
.standalone("9.1.3.Final") .withProtocolVersion(ProtocolVersion.PROTOCOL_VERSION_26)
.configurationFile("infinispan-standalone.xml") .withCaches("testCache");
.expose()
.hotrod()
.build();
@Test @Test
public void rule_should_have_mapped_hotrod_port() { public void rule_should_have_mapped_hotrod_port() {
@ -26,10 +20,6 @@ public class InfinispanContainerIntegrationTest {
@Test @Test
public void should_get_existing_cache() { public void should_get_existing_cache() {
RemoteCacheManager cacheManager = new RemoteCacheManager(new ConfigurationBuilder() assertNotNull(infinispan.getCacheManager().getCache("testCache"));
.addServers(infinispan.getContainerIpAddress() + ":" + infinispan.getMappedPort(11222))
.version(ProtocolVersion.PROTOCOL_VERSION_26)
.build());
assertNotNull(cacheManager.getCache("testCache"));
} }
} }