You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/05/01 08:00:58 UTC
git commit: Updated port map abstraction to expose port map as a
collection
Repository: incubator-stratos
Updated Branches:
refs/heads/master f7dca7d5f -> 10bb2e15a
Updated port map abstraction to expose port map as a collection
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/10bb2e15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/10bb2e15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/10bb2e15
Branch: refs/heads/master
Commit: 10bb2e15a0d98afbaee988be654276b9a2dae21f
Parents: f7dca7d
Author: Imesh Gunaratne <im...@wso2.com>
Authored: Thu May 1 11:30:45 2014 +0530
Committer: Imesh Gunaratne <im...@wso2.com>
Committed: Thu May 1 11:30:45 2014 +0530
----------------------------------------------------------------------
.../messaging/domain/topology/Member.java | 15 +++++++++------
.../messaging/domain/topology/Service.java | 12 ++++++++----
.../event/topology/MemberActivatedEvent.java | 20 +++++++++++++++-----
.../event/topology/ServiceCreatedEvent.java | 18 ++++++++++++++----
4 files changed, 46 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10bb2e15/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java
index 09d38a7..4a3bf17 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java
@@ -39,6 +39,7 @@ public class Member implements Serializable {
private final String networkPartitionId;
private final String partitionId;
private final String memberId;
+ // Key: Port.proxy
@XmlJavaTypeAdapter(MapAdapter.class)
private final Map<Integer, Port> portMap;
private String memberPublicIp;
@@ -81,6 +82,10 @@ public class Member implements Serializable {
return (this.status == MemberStatus.Activated);
}
+ public Collection<Port> getPorts() {
+ return Collections.unmodifiableCollection(portMap.values());
+ }
+
public Port getPort(int proxy) {
if(portMap.containsKey(proxy)) {
return portMap.get(proxy);
@@ -88,16 +93,14 @@ public class Member implements Serializable {
return null;
}
- public Map<Integer, Port> getPorts() {
- return Collections.unmodifiableMap(portMap);
- }
-
public void addPort(Port port) {
this.portMap.put(port.getProxy(), port);
}
- public void addPorts(Map<Integer, Port> portMap) {
- this.portMap.putAll(portMap);
+ public void addPorts(Collection<Port> ports) {
+ for(Port port : ports) {
+ addPort(port);
+ }
}
public void removePort(Port port) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10bb2e15/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Service.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Service.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Service.java
index f35dc40..46d46d4 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Service.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Service.java
@@ -34,6 +34,7 @@ public class Service implements Serializable{
private final ServiceType serviceType;
// Key: Cluster.clusterId
private Map<String, Cluster> clusterIdClusterMap;
+ // Key: Port.proxy
private Map<Integer, Port> portMap;
private Properties properties;
@@ -76,8 +77,8 @@ public class Service implements Serializable{
return this.clusterIdClusterMap.get(clusterId);
}
- public Map<Integer, Port> getPorts() {
- return Collections.unmodifiableMap(portMap);
+ public Collection<Port> getPorts() {
+ return Collections.unmodifiableCollection(portMap.values());
}
public Port getPort(int proxy) {
@@ -91,8 +92,10 @@ public class Service implements Serializable{
this.portMap.put(port.getProxy(), port);
}
- public void addPorts(Map<Integer, Port> portSet) {
- this.portMap.putAll(portSet);
+ public void addPorts(Collection<Port> ports) {
+ for(Port port : ports) {
+ addPort(port);
+ }
}
public void removePort(Port port) {
@@ -102,6 +105,7 @@ public class Service implements Serializable{
public boolean portExists(Port port) {
return this.portMap.containsKey(port.getProxy());
}
+
public Properties getProperties() {
return properties;
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10bb2e15/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java
index 22f3735..e505537 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/MemberActivatedEvent.java
@@ -36,6 +36,7 @@ public class MemberActivatedEvent extends TopologyEvent implements Serializable
private final String networkPartitionId;
private final String partitionId;
private final String memberId;
+ // Key: Port.proxy
private Map<Integer, Port> portMap;
private String memberIp;
@@ -68,16 +69,25 @@ public class MemberActivatedEvent extends TopologyEvent implements Serializable
return memberId;
}
- public Map<Integer, Port> getPorts() {
- return Collections.unmodifiableMap(portMap);
+ public Collection<Port> getPorts() {
+ return Collections.unmodifiableCollection(portMap.values());
+ }
+
+ public Port getPort(int proxy) {
+ if(portMap.containsKey(proxy)) {
+ return portMap.get(proxy);
+ }
+ return null;
}
public void addPort(Port port) {
this.portMap.put(port.getProxy(), port);
}
- public void addPorts(Map<Integer, Port> portSet) {
- this.portMap.putAll(portSet);
+ public void addPorts(Collection<Port> ports) {
+ for(Port port : ports) {
+ addPort(port);
+ }
}
public void removePort(Port port) {
@@ -88,7 +98,7 @@ public class MemberActivatedEvent extends TopologyEvent implements Serializable
return this.portMap.containsKey(port.getProxy());
}
- public String getMemberIp() {
+ public String getMemberIp() {
return memberIp;
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/10bb2e15/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceCreatedEvent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceCreatedEvent.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceCreatedEvent.java
index 1bd5ff4..8ed701a 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceCreatedEvent.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/event/topology/ServiceCreatedEvent.java
@@ -34,6 +34,7 @@ public class ServiceCreatedEvent extends TopologyEvent implements Serializable {
private final String serviceName;
private final ServiceType serviceType;
+ // Key: Port.proxy
private final Map<Integer, Port> portMap;
private Properties properties;
@@ -51,16 +52,25 @@ public class ServiceCreatedEvent extends TopologyEvent implements Serializable {
return serviceType;
}
- public Map<Integer, Port> getPorts() {
- return Collections.unmodifiableMap(portMap);
+ public Collection<Port> getPorts() {
+ return Collections.unmodifiableCollection(portMap.values());
+ }
+
+ public Port getPort(int proxy) {
+ if(portMap.containsKey(proxy)) {
+ return portMap.get(proxy);
+ }
+ return null;
}
public void addPort(Port port) {
this.portMap.put(port.getProxy(), port);
}
- public void addPorts(Map<Integer, Port> portSet) {
- this.portMap.putAll(portSet);
+ public void addPorts(Collection<Port> ports) {
+ for(Port port : ports) {
+ addPort(port);
+ }
}
public void removePort(Port port) {