From f0c3ea7fb7f34a66a448ad66755ff125a143cb69 Mon Sep 17 00:00:00 2001 From: Daniel Newport Date: Mon, 20 Jul 2020 06:28:53 -0400 Subject: [PATCH] rename trustStoreFileName to trustStore for consistency with other extensions --- extensions/infinispan-client/README.MD | 2 +- .../infinispan/client/runtime/InfinispanClientProducer.java | 2 +- .../client/runtime/InfinispanClientRuntimeConfig.java | 2 +- .../infinispan-client/src/main/resources/application.properties | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/infinispan-client/README.MD b/extensions/infinispan-client/README.MD index 93f45a7ca2bc2..fccab46151eaf 100644 --- a/extensions/infinispan-client/README.MD +++ b/extensions/infinispan-client/README.MD @@ -74,7 +74,7 @@ This is working, but requires some additional steps to get configured. #### Configure truststore information -This is configured via the `quarkus.infinispan-client.trust-store-file-name` application property. Everything is the same as normal in that +This is configured via the `quarkus.infinispan-client.trust-store` application property. Everything is the same as normal in that you have to add the certificate from the server to the configured truststore if it already trusted in the default java cacerts file. diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java index 4edbfc46bb5ed..7f939bc0c4b45 100644 --- a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java +++ b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java @@ -187,7 +187,7 @@ private ConfigurationBuilder builderFromProperties(Properties properties) { infinispanClientRuntimeConfig.saslMechanism .ifPresent(v -> properties.put(ConfigurationProperties.SASL_MECHANISM, v)); - infinispanClientRuntimeConfig.trustStoreFileName + infinispanClientRuntimeConfig.trustStore .ifPresent(v -> properties.put(ConfigurationProperties.TRUST_STORE_FILE_NAME, v)); infinispanClientRuntimeConfig.trustStorePassword diff --git a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientRuntimeConfig.java b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientRuntimeConfig.java index 1a0c22fe49dca..b24149963d3de 100644 --- a/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientRuntimeConfig.java +++ b/extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientRuntimeConfig.java @@ -76,7 +76,7 @@ public class InfinispanClientRuntimeConfig { * Sets the trust store path */ @ConfigItem - Optional trustStoreFileName; + Optional trustStore; /** * Sets the trust store password diff --git a/integration-tests/infinispan-client/src/main/resources/application.properties b/integration-tests/infinispan-client/src/main/resources/application.properties index 8c60019b4c22c..d28fd785e1337 100644 --- a/integration-tests/infinispan-client/src/main/resources/application.properties +++ b/integration-tests/infinispan-client/src/main/resources/application.properties @@ -1,6 +1,6 @@ quarkus.infinispan-client.server-list=localhost:11232 quarkus.infinispan-client.near-cache-max-entries=3 -quarkus.infinispan-client.trust-store-file-name=src/main/resources/server.p12 +quarkus.infinispan-client.trust-store=src/main/resources/server.p12 quarkus.infinispan-client.trust-store-password=changeit quarkus.infinispan-client.trust-store-type=PKCS12