You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/12/14 22:48:16 UTC
[5/5] git commit: adding a log for payload string and overriding
toString methods
adding a log for payload string and overriding toString methods
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8d995e24
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8d995e24
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8d995e24
Branch: refs/heads/master
Commit: 8d995e2439b5044acb8d6b8aab027aefee0ed160
Parents: 6df1c6c
Author: Isuru <is...@wso2.com>
Authored: Sun Dec 15 03:17:01 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Sun Dec 15 03:17:01 2013 +0530
----------------------------------------------------------------------
.../java/org/apache/stratos/adc/mgt/dao/Cluster.java | 4 ++++
.../org/apache/stratos/adc/mgt/payload/PayloadData.java | 11 ++++++++++-
.../adc/mgt/subscription/CartridgeSubscription.java | 3 +--
3 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8d995e24/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/dao/Cluster.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/dao/Cluster.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/dao/Cluster.java
index 6120a80..18f6f37 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/dao/Cluster.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/dao/Cluster.java
@@ -70,4 +70,8 @@ public class Cluster implements Serializable {
public void setServiceStatus(String serviceStatus) {
this.serviceStatus = serviceStatus;
}
+
+ public String toString () {
+ return clusterDomain;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8d995e24/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadData.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadData.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadData.java
index b07f6fe..1601c21 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadData.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/payload/PayloadData.java
@@ -48,7 +48,12 @@ public abstract class PayloadData implements Serializable {
}*/
public StringBuilder getCompletePayloadData () {
- return additionalPayloadDataBuilder.append(",").append(getBasicPayloadData().getPayloadData());
+
+ if(additionalPayloadDataBuilder.length() > 0) {
+ return getBasicPayloadData().getPayloadData().append(",").append(additionalPayloadDataBuilder);
+ } else {
+ return getBasicPayloadData().getPayloadData();
+ }
}
public BasicPayloadData getBasicPayloadData() {
@@ -58,4 +63,8 @@ public abstract class PayloadData implements Serializable {
public void setBasicPayloadData(BasicPayloadData basicPayloadData) {
this.basicPayloadData = basicPayloadData;
}
+
+ public String toString () {
+ return getCompletePayloadData().toString();
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8d995e24/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java
index d190f10..d62d9be 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/subscription/CartridgeSubscription.java
@@ -453,7 +453,6 @@ public abstract class CartridgeSubscription implements Serializable {
", alias=" + alias + ", autoscalingPolicyName=" + autoscalingPolicyName +
", deploymentPolicyName=" + deploymentPolicyName + ", subscriber=" + subscriber +
", repository=" + repository + ", cartridgeInfo=" + cartridgeInfo + ", payload=" +
- payload + ", cluster=" + cluster + ", subscriptionStatus=" + subscriptionStatus +
- ", serviceStatus=" + serviceStatus + ", mappedDomain=" + mappedDomain+ "]";
+ payloadData + ", cluster=" + cluster + "]";
}
}