You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2011/12/03 20:03:25 UTC
svn commit: r1209980 - in /karaf/cellar/branches/cellar-2.2.x: ./
hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java
Author: iocanel
Date: Sat Dec 3 19:03:24 2011
New Revision: 1209980
URL: http://svn.apache.org/viewvc?rev=1209980&view=rev
Log:
Merged from trunk
[KARAF-1081] Reuse CellarUtils inside HazelcastConfigurationManager. [from revision 1209966]
Modified:
karaf/cellar/branches/cellar-2.2.x/ (props changed)
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java
Propchange: karaf/cellar/branches/cellar-2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 3 19:03:24 2011
@@ -1 +1 @@
-/karaf/cellar/trunk:1101991,1102000,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074,1161494,1161515,1161766,1162249,1162252,1162321,1162327,1162356-1162357,1162390,1162397,1162399,1164077,1164523,1164989,1164994,1166403,1166434,1181287,1186085,1202090,1202105,1202108,1202111,1203975,1204173,1204184,1204209,1205187,1209264,1209753,1209755,1209757,1209964
+/karaf/cellar/trunk:1101991,1102000,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074,1161494,1161515,1161766,1162249,1162252,1162321,1162327,1162356-1162357,1162390,1162397,1162399,1164077,1164523,1164989,1164994,1166403,1166434,1181287,1186085,1202090,1202105,1202108,1202111,1203975,1204173,1204184,1204209,1205187,1209264,1209753,1209755,1209757,1209964,1209966
Modified: karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java?rev=1209980&r1=1209979&r2=1209980&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java Sat Dec 3 19:03:24 2011
@@ -25,6 +25,7 @@ import com.hazelcast.config.TcpIpConfig;
import com.hazelcast.config.XmlConfigBuilder;
import com.hazelcast.core.HazelcastInstance;
import org.apache.karaf.cellar.core.discovery.Discovery;
+import org.apache.karaf.cellar.core.utils.CellarUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -140,8 +141,8 @@ public class HazelcastConfigurationManag
}
if (properties.containsKey(TCPIP_MEMBERS)) {
- Set<String> newTcpIpMemberSet = createSetFromString((String) properties.get(TCPIP_MEMBERS));
- if (!collectionEquals(tcpIpMemberSet, newTcpIpMemberSet)) {
+ Set<String> newTcpIpMemberSet = CellarUtils.createSetFromString((String) properties.get(TCPIP_MEMBERS));
+ if (!CellarUtils.collectionEquals(tcpIpMemberSet, newTcpIpMemberSet)) {
LOGGER.info("Hazelcast tcpIpMemberSet has been changed from {} to {}", tcpIpMemberSet, newTcpIpMemberSet);
tcpIpMemberSet = newTcpIpMemberSet;
updated = Boolean.TRUE;
@@ -150,8 +151,8 @@ public class HazelcastConfigurationManag
if (properties.containsKey(TCPIP_MEMBERS)) {
- Set<String> newDiscoveredMemberSet = createSetFromString((String) properties.get(Discovery.DISCOVERED_MEMBERS_PROPERTY_NAME));
- if (!collectionEquals(discoveredMemberSet, newDiscoveredMemberSet)) {
+ Set<String> newDiscoveredMemberSet = CellarUtils.createSetFromString((String) properties.get(Discovery.DISCOVERED_MEMBERS_PROPERTY_NAME));
+ if (!CellarUtils.collectionEquals(discoveredMemberSet, newDiscoveredMemberSet)) {
LOGGER.info("Hazelcast discoveredMemberSet has been changed from {} to {}", discoveredMemberSet, newDiscoveredMemberSet);
discoveredMemberSet = newDiscoveredMemberSet;
updated = Boolean.TRUE;
@@ -216,60 +217,4 @@ public class HazelcastConfigurationManag
return tcpIpConfig;
}
- /**
- * Converts a comma delimited String to a Set of Strings.
- *
- * @param text
- * @return
- */
- private Set<String> createSetFromString(String text) {
- Set<String> result = new LinkedHashSet<String>();
- if (text != null) {
- String[] items = text.split(",");
- if (items != null && items.length > 0) {
-
- for (String item : items) {
- if(item != null && item.length() > 0) {
- result.add(item.trim());
- }
- }
- }
- }
- return result;
- }
-
- /**
- * Returns true if both {@link java.util.Collection}s contain exactly the same items (order doesn't matter).
- *
- * @param col1
- * @param col2
- * @return
- */
- public boolean collectionEquals(Collection col1, Collection col2) {
- return collectionSubset(col1, col2) && collectionSubset(col2, col1);
- }
-
- /**
- * Returns true if one {@link Collection} contains all items of the others
- *
- * @param source
- * @param target
- * @return
- */
- private boolean collectionSubset(Collection source, Collection target) {
- if (source == null && target == null) {
- return true;
- } else if (source == null || target == null) {
- return false;
- } else if (source.isEmpty() && target.isEmpty()) {
- return true;
- } else {
- for (Object item : source) {
- if (!target.contains(item)) {
- return false;
- }
- }
- return true;
- }
- }
}