Skip to content

Commit 13f17f8

Browse files
author
pablo gonzalez granados
committed
Join infinispan scenarios in order to reduce native package time
1 parent db294cc commit 13f17f8

File tree

16 files changed

+49
-102
lines changed

16 files changed

+49
-102
lines changed

008-infinispan-getting-started/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Quarkus - Infinispan scenario
1+
# Quarkus - Infinispan scenario ([Moved to 009-quarkus-infinispan-grpc-kafka](../009-quarkus-infinispan-grpc-kafka))
22

33
##hotrod-client.properties
44
Test that hotrod-client.properties file is picked up at the build time (should be placed under src/main/resources/META-INF).

008-infinispan-getting-started/pom.xml

-27
This file was deleted.

008-infinispan-getting-started/src/main/resources/application.properties

-4
This file was deleted.

008-infinispan-getting-started/src/test/java/org/acme/quickstart/containers/InfinispanTestResource.java

-46
This file was deleted.
+17-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
1+
# Table of Contents
2+
1. [Quarkus infinispan grpc kafka](#Quarkus-infinispan-grpc-kafka)
3+
2. [Quarkus SSL/TLS Infinispan scenario ](#Quarkus-SSL/TLS-Infinispan-scenario )
4+
5+
## Quarkus SSL/TLS infinispan grpc kafka
16
Module that test whether gRPC, Infinispan and Kafka extensions work together:
27
- for gRPC: there is a simple greetings endpoint. This example will use a `helloworld.proto` file to generate the required sources.
38
- for Infinispan: to check whether the cache persistence is working fine
4-
- for Kafka: to verify the messages are working in a chain workflow.
9+
- for Kafka: to verify the messages are working in a chain workflow.
10+
11+
## Quarkus SSL/TLS Infinispan scenario
12+
13+
##hotrod-client.properties
14+
Test that hotrod-client.properties file is picked up at the build time (should be placed under src/main/resources/META-INF).
15+
Infinispan Server mimicked by Testcontainers.
16+
17+
##Infinispan server SSL/TLS
18+
Test SSL/TLS secure connection between Infinispan client and Infinispan server.
19+
Client and server are using the same `server.jks` file for authentication (client truststore / server keystore)
20+
Information about Infinispan server configuration can be found at [this Github page](https://github.com/infinispan/infinispan-images)

008-infinispan-getting-started/src/main/java/org/acme/quickstart/InfinispanClientApp.java 009-quarkus-infinispan-grpc-kafka/src/main/java/io/quarkus/qe/InfinispanPopulated.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1-
package org.acme.quickstart;
1+
package io.quarkus.qe;
22

33
import javax.enterprise.context.ApplicationScoped;
44
import javax.enterprise.event.Observes;
55
import javax.inject.Inject;
6-
import io.quarkus.runtime.StartupEvent;
6+
77
import org.infinispan.client.hotrod.RemoteCache;
88
import org.infinispan.client.hotrod.RemoteCacheManager;
99
import org.infinispan.commons.configuration.XMLStringConfiguration;
1010
import org.jboss.logging.Logger;
1111

12+
import io.quarkus.runtime.StartupEvent;
13+
1214
@ApplicationScoped
13-
public class InfinispanClientApp {
15+
public class InfinispanPopulated {
1416

15-
private static final Logger LOGGER = Logger.getLogger(InfinispanClientApp.class);
17+
private static final Logger LOGGER = Logger.getLogger(InfinispanPopulated.class);
1618

1719
@Inject
1820
RemoteCacheManager cacheManager;
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
package org.acme.quickstart;
1+
package io.quarkus.qe.quickstart;
22

3-
import io.quarkus.infinispan.client.Remote;
4-
import org.infinispan.client.hotrod.RemoteCache;
53
import javax.inject.Inject;
64
import javax.ws.rs.GET;
75
import javax.ws.rs.Path;
86
import javax.ws.rs.Produces;
97
import javax.ws.rs.core.MediaType;
108

9+
import org.infinispan.client.hotrod.RemoteCache;
10+
11+
import io.quarkus.infinispan.client.Remote;
12+
1113
@Path("/infinispan")
12-
public class GreetingResource {
14+
public class GreetingCachedResource {
1315

1416
@Inject
1517
@Remote("mycache")
@@ -20,4 +22,4 @@ public class GreetingResource {
2022
public String hello() {
2123
return cache.get("hello");
2224
}
23-
}
25+
}

009-quarkus-infinispan-grpc-kafka/src/main/resources/application.properties

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11

22
# Infinispan
3+
quarkus.infinispan-client.trust-store=src/main/resources/server.jks
4+
quarkus.infinispan-client.trust-store-password=changeit
5+
quarkus.infinispan-client.trust-store-type=jks
6+
37
quarkus.infinispan-client.server-list=localhost:11222
48
quarkus.infinispan-client.use-auth=true
5-
quarkus.infinispan-client.auth-username=my_username
6-
quarkus.infinispan-client.auth-password=my_password
7-
quarkus.infinispan-client.auth-realm=default
8-
quarkus.infinispan-client.auth-server-name=infinispan
9-
quarkus.infinispan-client.client-intelligence=BASIC
10-
quarkus.infinispan-client.sasl-mechanism=DIGEST-MD5
119

1210
# gRPC
1311
quarkus.grpc.clients.hello.host=localhost

009-quarkus-infinispan-grpc-kafka/src/test/java/io/quarkus/qe/containers/InfinispanTestResource.java

+9-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.Map;
66
import java.util.Optional;
77

8+
import org.testcontainers.containers.BindMode;
89
import org.testcontainers.containers.GenericContainer;
910
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
1011

@@ -23,8 +24,14 @@ public Map<String, String> start() {
2324
infinispan = new GenericContainer<>("infinispan/server:11.0.4.Final-2")
2425
.waitingFor(new LogMessageWaitStrategy().withRegEx(".*Infinispan Server.*started in.*\\s"))
2526
.withStartupTimeout(Duration.ofMillis(20000))
26-
.withEnv("USER", "my_username")
27-
.withEnv("PASS", "my_password");
27+
.withClasspathResourceMapping("identities.yaml",
28+
"/user-config/identities.yaml", BindMode.READ_ONLY)
29+
.withClasspathResourceMapping("config.yaml",
30+
"/user-config/config.yaml", BindMode.READ_ONLY)
31+
.withClasspathResourceMapping("server.jks",
32+
"/user-config/server.jks", BindMode.READ_ONLY)
33+
.withEnv("CONFIG_PATH", "/user-config/config.yaml")
34+
.withEnv("IDENTITIES_PATH", "/user-config/identities.yaml");
2835

2936
infinispan.start();
3037
final String hosts = infinispan.getContainerIpAddress() + ":" + infinispan.getMappedPort(INFINISPAN_PORT);

008-infinispan-getting-started/src/test/java/org/acme/quickstart/InfinispanServerResourceTest.java 009-quarkus-infinispan-grpc-kafka/src/test/java/io/quarkus/qe/quickstart/InfinispanServerResourceTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package org.acme.quickstart;
1+
package io.quarkus.qe.quickstart;
22

33
import static io.restassured.RestAssured.given;
44
import static org.hamcrest.CoreMatchers.is;
55

6-
import org.acme.quickstart.containers.InfinispanTestResource;
76
import org.junit.jupiter.api.Test;
87

8+
import io.quarkus.qe.containers.InfinispanTestResource;
99
import io.quarkus.test.common.QuarkusTestResource;
1010
import io.quarkus.test.junit.QuarkusTest;
1111

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package org.acme.quickstart;
1+
package io.quarkus.qe.quickstart;
22

33
import io.quarkus.test.junit.NativeImageTest;
44

55
@NativeImageTest
6-
public class NativeInfinispanServerResourceIT extends InfinispanServerResourceTest {
6+
public class NativeInfinispanServerResourceIT extends InfinispanServerResourceTest{
77
// Run the same tests
8-
}
8+
}

pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<module>004-quarkus-HHH-and-HV</module>
1515
<module>005-quarkus-and-maven-profiles</module>
1616
<module>006-quartz-manually-scheduled-job</module>
17-
<module>008-infinispan-getting-started</module>
1817
<module>009-quarkus-infinispan-grpc-kafka</module>
1918
<module>010-quarkus-opentracing-reactive-grpc</module>
2019
<module>011-quarkus-panache-rest-flyway</module>

0 commit comments

Comments
 (0)