diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/AbstractConfigurationChildBuilder.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/AbstractConfigurationChildBuilder.java index 3ce2c720e5d8..990d5d3f3687 100644 --- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/AbstractConfigurationChildBuilder.java +++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/AbstractConfigurationChildBuilder.java @@ -118,18 +118,18 @@ public ConfigurationBuilder marshaller(Marshaller marshaller) { } @Override - public ConfigurationBuilder contextInitializer(String contextInitializer) { - return builder.contextInitializer(contextInitializer); + public ConfigurationBuilder addContextInitializer(String contextInitializer) { + return builder.addContextInitializer(contextInitializer); } @Override - public ConfigurationBuilder contextInitializer(SerializationContextInitializer contextInitializer) { - return builder.contextInitializer(contextInitializer); + public ConfigurationBuilder addContextInitializer(SerializationContextInitializer contextInitializer) { + return builder.addContextInitializer(contextInitializer); } @Override - public ConfigurationBuilder contextInitializers(SerializationContextInitializer... contextInitializers) { - return builder.contextInitializers(contextInitializers); + public ConfigurationBuilder addContextInitializers(SerializationContextInitializer... contextInitializers) { + return builder.addContextInitializers(contextInitializers); } /** diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConfigurationBuilder.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConfigurationBuilder.java index af42cc8ba92c..dc61b957c797 100644 --- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConfigurationBuilder.java +++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConfigurationBuilder.java @@ -242,20 +242,20 @@ public ConfigurationBuilder marshaller(Marshaller marshaller) { } @Override - public ConfigurationBuilder contextInitializer(String contextInitializer) { + public ConfigurationBuilder addContextInitializer(String contextInitializer) { SerializationContextInitializer sci = Util.getInstance(contextInitializer, this.classLoader()); - return contextInitializers(sci); + return addContextInitializers(sci); } @Override - public ConfigurationBuilder contextInitializer(SerializationContextInitializer contextInitializer) { + public ConfigurationBuilder addContextInitializer(SerializationContextInitializer contextInitializer) { if (contextInitializer != null) this.contextInitializers.add(contextInitializer); return this; } @Override - public ConfigurationBuilder contextInitializers(SerializationContextInitializer... contextInitializers) { + public ConfigurationBuilder addContextInitializers(SerializationContextInitializer... contextInitializers) { this.contextInitializers.addAll(Arrays.asList(contextInitializers)); return this; } @@ -376,7 +376,7 @@ public ConfigurationBuilder withProperties(Properties properties) { if (typed.containsKey(ConfigurationProperties.CONTEXT_INITIALIZERS)) { String initializers = typed.getProperty(ConfigurationProperties.CONTEXT_INITIALIZERS); for (String sci : initializers.split(",")) - this.contextInitializer(sci); + this.addContextInitializer(sci); } this.version(ProtocolVersion.parseVersion(typed.getProperty(ConfigurationProperties.PROTOCOL_VERSION, protocolVersion.toString(), true))); String serverList = typed.getProperty(ConfigurationProperties.SERVER_LIST, null, true); diff --git a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConfigurationChildBuilder.java b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConfigurationChildBuilder.java index 7636f5bbb94f..ad4a3ccdf830 100644 --- a/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConfigurationChildBuilder.java +++ b/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/configuration/ConfigurationChildBuilder.java @@ -136,20 +136,20 @@ public interface ConfigurationChildBuilder { * Supply a {@link SerializationContextInitializer} implementation to register classes with the {@link * org.infinispan.commons.marshall.ProtoStreamMarshaller}'s {@link org.infinispan.protostream.SerializationContext}. */ - ConfigurationBuilder contextInitializer(String contextInitializer); + ConfigurationBuilder addContextInitializer(String contextInitializer); /** * Supply a {@link SerializationContextInitializer} implementation to register classes with the {@link * org.infinispan.commons.marshall.ProtoStreamMarshaller}'s {@link org.infinispan.protostream.SerializationContext}. */ - ConfigurationBuilder contextInitializer(SerializationContextInitializer contextInitializer); + ConfigurationBuilder addContextInitializer(SerializationContextInitializer contextInitializer); /** * Convenience method to supply multiple {@link SerializationContextInitializer} implementations. * - * @see #contextInitializer(SerializationContextInitializer). + * @see #addContextInitializer(SerializationContextInitializer). */ - ConfigurationBuilder contextInitializers(SerializationContextInitializer... contextInitializers); + ConfigurationBuilder addContextInitializers(SerializationContextInitializer... contextInitializers); /** * This property defines the protocol version that this client should use. Defaults to the latest protocol version diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/event/OldClientCustomEventsTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/event/OldClientCustomEventsTest.java index a68ff645dcf2..503a9de4b40b 100644 --- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/event/OldClientCustomEventsTest.java +++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/event/OldClientCustomEventsTest.java @@ -34,7 +34,7 @@ protected HotRodServer createHotRodServer() { protected RemoteCacheManager getRemoteCacheManager() { ConfigurationBuilder builder = HotRodClientTestingUtil.newRemoteConfigurationBuilder(); builder.addServer().host("127.0.0.1").port(hotrodServer.getPort()).version(VERSION) - .contextInitializer(contextInitializer()); + .addContextInitializer(contextInitializer()); return new InternalRemoteCacheManager(builder.build()); } diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/impl/iteration/BaseMultiServerRemoteIteratorTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/impl/iteration/BaseMultiServerRemoteIteratorTest.java index c678480bec2c..5c4657931287 100644 --- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/impl/iteration/BaseMultiServerRemoteIteratorTest.java +++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/impl/iteration/BaseMultiServerRemoteIteratorTest.java @@ -60,7 +60,7 @@ protected void modifyGlobalConfiguration(GlobalConfigurationBuilder builder) { @Override protected RemoteCacheManager createClient(int i) { - Configuration cfg = createHotRodClientConfigurationBuilder(server(i)).contextInitializer(DslSCI.INSTANCE).build(); + Configuration cfg = createHotRodClientConfigurationBuilder(server(i)).addContextInitializer(DslSCI.INSTANCE).build(); return new InternalRemoteCacheManager(cfg); } diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/impl/iteration/SingleServerRemoteIteratorTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/impl/iteration/SingleServerRemoteIteratorTest.java index 61cce65676e0..8f1c3349ac6d 100644 --- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/impl/iteration/SingleServerRemoteIteratorTest.java +++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/impl/iteration/SingleServerRemoteIteratorTest.java @@ -44,7 +44,7 @@ protected EmbeddedCacheManager createCacheManager() throws Exception { @Override protected RemoteCacheManager getRemoteCacheManager() { ConfigurationBuilder builder = HotRodClientTestingUtil.newRemoteConfigurationBuilder(); - builder.addServer().host("127.0.0.1").port(hotrodServer.getPort()).contextInitializer(DslSCI.INSTANCE); + builder.addServer().host("127.0.0.1").port(hotrodServer.getPort()).addContextInitializer(DslSCI.INSTANCE); return new InternalRemoteCacheManager(builder.build()); } diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/test/MultiHotRodServersTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/test/MultiHotRodServersTest.java index 3ca78a70bfaf..76540b597c79 100644 --- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/test/MultiHotRodServersTest.java +++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/test/MultiHotRodServersTest.java @@ -67,7 +67,7 @@ protected org.infinispan.client.hotrod.configuration.ConfigurationBuilder create .host(host) .port(serverPort) .maxRetries(maxRetries()) - .contextInitializers(contextInitializers().toArray(new SerializationContextInitializer[0])); + .addContextInitializers(contextInitializers().toArray(new SerializationContextInitializer[0])); return clientBuilder; } diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/test/SingleHotRodServerTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/test/SingleHotRodServerTest.java index f584af6dcc43..a62bcd3e0587 100644 --- a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/test/SingleHotRodServerTest.java +++ b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/test/SingleHotRodServerTest.java @@ -42,7 +42,7 @@ protected RemoteCacheManager getRemoteCacheManager() { builder.addServer().host("127.0.0.1").port(hotrodServer.getPort()); SerializationContextInitializer sci = contextInitializer(); if (sci != null) - builder.contextInitializer(sci); + builder.addContextInitializer(sci); return new InternalRemoteCacheManager(builder.build()); } diff --git a/documentation/src/main/asciidoc/topics/code_examples/ClientProtoStreamMarshaller.java b/documentation/src/main/asciidoc/topics/code_examples/ClientProtoStreamMarshaller.java index 770e08ec8926..6ad412be784c 100644 --- a/documentation/src/main/asciidoc/topics/code_examples/ClientProtoStreamMarshaller.java +++ b/documentation/src/main/asciidoc/topics/code_examples/ClientProtoStreamMarshaller.java @@ -1,5 +1,5 @@ ConfigurationBuilder builder = new ConfigurationBuilder() .addServer().host("localhost").port(hotRodServer.getPort()) - .contextInitializers(new LibraryInitializerImpl(), new AnotherExampleSciImpl()) + .addContextInitializers(new LibraryInitializerImpl(), new AnotherExampleSciImpl()) .build(); RemoteCacheManager rcm = new RemoteCacheManager(builder); \ No newline at end of file diff --git a/documentation/src/main/asciidoc/topics/code_examples/RemoteQuery.java b/documentation/src/main/asciidoc/topics/code_examples/RemoteQuery.java index 1b0bc0acfed7..2abf2687a163 100644 --- a/documentation/src/main/asciidoc/topics/code_examples/RemoteQuery.java +++ b/documentation/src/main/asciidoc/topics/code_examples/RemoteQuery.java @@ -1,7 +1,7 @@ ConfigurationBuilder clientBuilder = new ConfigurationBuilder(); clientBuilder.addServer() .host("10.1.2.3").port(11234) - .contextInitializers(new LibraryInitializerImpl()); + .addContextInitializers(new LibraryInitializerImpl()); RemoteCacheManager remoteCacheManager = new RemoteCacheManager(clientBuilder.build()); diff --git a/integrationtests/endpoints-interop-it/src/test/java/org/infinispan/it/endpoints/EndpointsCacheFactory.java b/integrationtests/endpoints-interop-it/src/test/java/org/infinispan/it/endpoints/EndpointsCacheFactory.java index f5d6c8445d45..fd2d05f10c3c 100644 --- a/integrationtests/endpoints-interop-it/src/test/java/org/infinispan/it/endpoints/EndpointsCacheFactory.java +++ b/integrationtests/endpoints-interop-it/src/test/java/org/infinispan/it/endpoints/EndpointsCacheFactory.java @@ -189,7 +189,7 @@ private void createHotRodCache(HotRodServer server) { .addServers("localhost:" + hotrod.getPort()) .addJavaSerialWhiteList(".*Person.*", ".*CustomEvent.*") .marshaller(marshaller) - .contextInitializer(contextInitializer) + .addContextInitializer(contextInitializer) .build()); hotrodCache = cacheName.isEmpty() ? hotrodClient.getCache() diff --git a/integrationtests/endpoints-interop-it/src/test/java/org/infinispan/it/endpoints/JsonIndexingProtobufStoreTest.java b/integrationtests/endpoints-interop-it/src/test/java/org/infinispan/it/endpoints/JsonIndexingProtobufStoreTest.java index a8c18fb14a9a..93d8587a121f 100644 --- a/integrationtests/endpoints-interop-it/src/test/java/org/infinispan/it/endpoints/JsonIndexingProtobufStoreTest.java +++ b/integrationtests/endpoints-interop-it/src/test/java/org/infinispan/it/endpoints/JsonIndexingProtobufStoreTest.java @@ -38,7 +38,7 @@ protected RemoteCacheManager createRemoteCacheManager() throws IOException { SerializationContextInitializer sci = EndpointITSCI.INSTANCE; RemoteCacheManager remoteCacheManager = new RemoteCacheManager(new org.infinispan.client.hotrod.configuration.ConfigurationBuilder() .addServer().host("localhost").port(hotRodServer.getPort()) - .contextInitializer(sci) + .addContextInitializer(sci) .build()); //initialize server-side serialization context diff --git a/integrationtests/endpoints-interop-it/src/test/java/org/infinispan/it/endpoints/JsonPojoStoreTest.java b/integrationtests/endpoints-interop-it/src/test/java/org/infinispan/it/endpoints/JsonPojoStoreTest.java index fc9c90ad332d..96150fecf68e 100644 --- a/integrationtests/endpoints-interop-it/src/test/java/org/infinispan/it/endpoints/JsonPojoStoreTest.java +++ b/integrationtests/endpoints-interop-it/src/test/java/org/infinispan/it/endpoints/JsonPojoStoreTest.java @@ -35,7 +35,7 @@ protected ConfigurationBuilder getIndexCacheConfiguration() { protected RemoteCacheManager createRemoteCacheManager() throws IOException { return new RemoteCacheManager(new org.infinispan.client.hotrod.configuration.ConfigurationBuilder() .addServer().host("localhost").port(hotRodServer.getPort()) - .contextInitializers(EndpointITSCI.INSTANCE) + .addContextInitializers(EndpointITSCI.INSTANCE) .build()); } diff --git a/integrationtests/endpoints-interop-it/src/test/java/org/infinispan/it/endpoints/ProtoRegistrationJsonTest.java b/integrationtests/endpoints-interop-it/src/test/java/org/infinispan/it/endpoints/ProtoRegistrationJsonTest.java index f6a0b0454aee..c00bf6a08dc7 100644 --- a/integrationtests/endpoints-interop-it/src/test/java/org/infinispan/it/endpoints/ProtoRegistrationJsonTest.java +++ b/integrationtests/endpoints-interop-it/src/test/java/org/infinispan/it/endpoints/ProtoRegistrationJsonTest.java @@ -27,7 +27,7 @@ protected RemoteCacheManager createRemoteCacheManager() throws IOException { SerializationContextInitializer sci = EndpointITSCI.INSTANCE; RemoteCacheManager remoteCacheManager = new RemoteCacheManager(new org.infinispan.client.hotrod.configuration.ConfigurationBuilder() .addServer().host("localhost").port(hotRodServer.getPort()) - .contextInitializer(sci) + .addContextInitializer(sci) .build()); //initialize server-side serialization context via rest endpoint