forked from hazelcast/hazelcast
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix wrong client defaults when configured via Spring
Fix hazelcast#8746 It would be great to just use equals() on the config objects, however a lot of our *Config(s) do not override equals()/hashcode() and moreover the config objects are mutated in some cases - e.g. https://github.com/hazelcast/hazelcast/blob/eef987b9920f3f7b4c506e433b0d067cab9ba93c/hazelcast-client/src/main/java/com/hazelcast/client/config/ClientNetworkConfig.java#L207-L207
- Loading branch information
Showing
3 changed files
with
97 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
hazelcast-spring/src/test/java/com/hazelcast/spring/TestClientConfigAndSpringDefaults.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| * Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.hazelcast.spring; | ||
|
|
||
| import com.hazelcast.client.config.ClientConfig; | ||
| import com.hazelcast.client.impl.HazelcastClientProxy; | ||
| import com.hazelcast.core.Hazelcast; | ||
| import com.hazelcast.test.annotation.QuickTest; | ||
| import org.junit.AfterClass; | ||
| import org.junit.Before; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Test; | ||
| import org.junit.experimental.categories.Category; | ||
| import org.junit.runner.RunWith; | ||
| import org.springframework.test.context.ContextConfiguration; | ||
|
|
||
| import javax.annotation.Resource; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
|
|
||
| @RunWith(CustomSpringJUnit4ClassRunner.class) | ||
| @ContextConfiguration(locations = {"client-defaults-context.xml"}) | ||
| @Category(QuickTest.class) | ||
| public class TestClientConfigAndSpringDefaults { | ||
|
|
||
| private ClientConfig clientConfig; | ||
|
|
||
| @Resource(name = "client") | ||
| private HazelcastClientProxy client; | ||
|
|
||
| @BeforeClass | ||
| @AfterClass | ||
| public static void start() { | ||
| Hazelcast.shutdownAll(); | ||
| } | ||
|
|
||
| @Before | ||
| public void before() throws IllegalAccessException { | ||
| clientConfig = client.getClientConfig(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testDefaults() { | ||
| ClientConfig defaults = new ClientConfig(); | ||
|
|
||
| assertEquals(defaults.isSmartRouting(), clientConfig.isSmartRouting()); | ||
| assertEquals(defaults.getNetworkConfig().isSmartRouting(), clientConfig.getNetworkConfig().isSmartRouting()); | ||
| assertEquals(defaults.getNetworkConfig().getConnectionTimeout(), clientConfig.getNetworkConfig().getConnectionTimeout()); | ||
| } | ||
| } |
31 changes: 31 additions & 0 deletions
31
hazelcast-spring/src/test/resources/com/hazelcast/spring/client-defaults-context.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| ~ Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved. | ||
| ~ | ||
| ~ Licensed under the Apache License, Version 2.0 (the "License"); | ||
| ~ you may not use this file except in compliance with the License. | ||
| ~ You may obtain a copy of the License at | ||
| ~ | ||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Unless required by applicable law or agreed to in writing, software | ||
| ~ distributed under the License is distributed on an "AS IS" BASIS, | ||
| ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| ~ See the License for the specific language governing permissions and | ||
| ~ limitations under the License. | ||
| --> | ||
| <beans xmlns="http://www.springframework.org/schema/beans" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xmlns:hz="http://www.hazelcast.com/schema/spring" | ||
| xsi:schemaLocation="http://www.springframework.org/schema/beans | ||
| http://www.springframework.org/schema/beans/spring-beans-3.0.xsd | ||
| http://www.hazelcast.com/schema/spring | ||
| http://www.hazelcast.com/schema/spring/hazelcast-spring.xsd"> | ||
|
|
||
| <hz:hazelcast id="instance"/> | ||
|
|
||
| <hz:client id="client"> | ||
| <hz:network/> | ||
| </hz:client> | ||
|
|
||
| </beans> |