From 8e1895513fc40a3cfb274262cd4d6027b0bd5310 Mon Sep 17 00:00:00 2001 From: Pramila Singh Date: Mon, 26 Aug 2013 09:50:34 -0700 Subject: [PATCH] Fix to remove camel case for Northbound API Change-Id: I2d13e9d53b0d73504c15d32a57207110d70afb3a Signed-off-by: Pramila Singh --- .../integrationtest/NorthboundIT.java | 34 +++++++++---------- .../controller/sal/core/Actions.java | 3 +- .../controller/sal/core/Bandwidth.java | 3 +- .../controller/sal/core/Buffers.java | 3 +- .../controller/sal/core/Capabilities.java | 3 +- .../controller/sal/core/Config.java | 3 +- .../controller/sal/core/Description.java | 3 +- .../controller/sal/core/ForwardingMode.java | 2 +- .../controller/sal/core/Latency.java | 3 +- .../controller/sal/core/MacAddress.java | 2 +- .../controller/sal/core/Name.java | 3 +- .../controller/sal/core/State.java | 3 +- .../controller/sal/core/Tables.java | 3 +- .../controller/sal/core/Tier.java | 3 +- .../controller/sal/core/TimeStamp.java | 5 +-- 15 files changed, 44 insertions(+), 32 deletions(-) diff --git a/opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java b/opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java index dfc4b4978a..b4c3e1e028 100644 --- a/opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java +++ b/opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java @@ -208,29 +208,29 @@ public class NorthboundIT { if (timestamp == null || timestampName == null) { Assert.assertFalse(properties.has("timeStamp")); } else { - Assert.assertEquals(timestamp, (Integer) properties.getJSONObject("timeStamp").getInt("timestamp")); - Assert.assertEquals(timestampName, properties.getJSONObject("timeStamp").getString("timestampName")); + Assert.assertEquals(timestamp, (Integer) properties.getJSONObject("timeStamp").getInt("value")); + Assert.assertEquals(timestampName, properties.getJSONObject("timeStamp").getString("name")); } if (actionsValue == null) { Assert.assertFalse(properties.has("actions")); } else { - Assert.assertEquals(actionsValue, (Integer) properties.getJSONObject("actions").getInt("actionsValue")); + Assert.assertEquals(actionsValue, (Integer) properties.getJSONObject("actions").getInt("value")); } if (capabilitiesValue == null) { Assert.assertFalse(properties.has("capabilities")); } else { Assert.assertEquals(capabilitiesValue, - (Integer) properties.getJSONObject("capabilities").getInt("capabilitiesValue")); + (Integer) properties.getJSONObject("capabilities").getInt("value")); } if (tablesValue == null) { Assert.assertFalse(properties.has("tables")); } else { - Assert.assertEquals(tablesValue, (Integer) properties.getJSONObject("tables").getInt("tablesValue")); + Assert.assertEquals(tablesValue, (Integer) properties.getJSONObject("tables").getInt("value")); } if (buffersValue == null) { Assert.assertFalse(properties.has("buffers")); } else { - Assert.assertEquals(buffersValue, (Integer) properties.getJSONObject("buffers").getInt("buffersValue")); + Assert.assertEquals(buffersValue, (Integer) properties.getJSONObject("buffers").getInt("value")); } } @@ -249,18 +249,18 @@ public class NorthboundIT { if (state == null) { Assert.assertFalse(properties.has("state")); } else { - Assert.assertEquals(state, (Integer) properties.getJSONObject("state").getInt("stateValue")); + Assert.assertEquals(state, (Integer) properties.getJSONObject("state").getInt("value")); } if (capabilities == null) { Assert.assertFalse(properties.has("capabilities")); } else { Assert.assertEquals(capabilities, - (Integer) properties.getJSONObject("capabilities").getInt("capabilitiesValue")); + (Integer) properties.getJSONObject("capabilities").getInt("value")); } if (bandwidth == null) { Assert.assertFalse(properties.has("bandwidth")); } else { - Assert.assertEquals(bandwidth, (Integer) properties.getJSONObject("bandwidth").getInt("bandwidthValue")); + Assert.assertEquals(bandwidth, (Integer) properties.getJSONObject("bandwidth").getInt("value")); } } @@ -499,8 +499,8 @@ public class NorthboundIT { json = new JSONObject(jt); node = getJsonInstance(json, "nodeProperties", nodeId_1); Assert.assertNotNull(node); - Assert.assertEquals(1001, node.getJSONObject("properties").getJSONObject("tier").getInt("tierValue")); - Assert.assertEquals("node1", node.getJSONObject("properties").getJSONObject("description").getString("descriptionValue")); + Assert.assertEquals(1001, node.getJSONObject("properties").getJSONObject("tier").getInt("value")); + Assert.assertEquals("node1", node.getJSONObject("properties").getJSONObject("description").getString("value")); // Test delete nodeConnector property // Delete state property of nodeconnector1 @@ -1091,9 +1091,9 @@ public class NorthboundIT { Assert.assertEquals(tailNode.getString("@type"),nodeType); Assert.assertEquals(tailNode.getString("@type"), nodeConnType); Assert.assertEquals(tailNC.getLong("@id"), tailNC1_nodeConnId); - Assert.assertEquals(bandw.getLong("bandwidthValue"), bw_1); - Assert.assertTrue((short) stt.getInt("stateValue") == state_1); - Assert.assertEquals(ltc.getLong("latencyValue"), lat_1); + Assert.assertEquals(bandw.getLong("value"), bw_1); + Assert.assertTrue((short) stt.getInt("value") == state_1); + Assert.assertEquals(ltc.getLong("value"), lat_1); } else if (headNC.getInt("@id") == headNC2_nodeConnId) { Assert.assertEquals(headNode.getString("@type"),nodeType); Assert.assertEquals(headNode.getLong("@id"), headNC2_nodeId); @@ -1102,9 +1102,9 @@ public class NorthboundIT { Assert.assertTrue(tailNode.getInt("@id") == tailNC2_nodeId); Assert.assertEquals(tailNC.getString("@type"), nodeConnType); Assert.assertEquals(tailNC.getLong("@id"), tailNC2_nodeConnId); - Assert.assertEquals(bandw.getLong("bandwidthValue"), bw_2); - Assert.assertTrue((short) stt.getInt("stateValue") == state_2); - Assert.assertEquals(ltc.getLong("latencyValue"), lat_2); + Assert.assertEquals(bandw.getLong("value"), bw_2); + Assert.assertTrue((short) stt.getInt("value") == state_2); + Assert.assertEquals(ltc.getLong("value"), lat_2); } } diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Actions.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Actions.java index 135a67dcd1..c26800890b 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Actions.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Actions.java @@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement public class Actions extends Property { private static final long serialVersionUID = 1L; - @XmlElement + @XmlElement(name="value") private int actionsValue; public enum ActionType { @@ -69,6 +69,7 @@ public class Actions extends Property { this.actionsValue = 0; } + @Override public Actions clone() { return new Actions(this.actionsValue); } diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Bandwidth.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Bandwidth.java index 8048cf882c..1282d5ef9c 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Bandwidth.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Bandwidth.java @@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlRootElement; public class Bandwidth extends Property { private static final long serialVersionUID = 1L; - @XmlElement + @XmlElement(name="value") protected long bandwidthValue; public static final long BWUNK = 0; @@ -71,6 +71,7 @@ public class Bandwidth extends Property { super(name); } + @Override public Bandwidth clone() { return new Bandwidth(this.bandwidthValue); } diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Buffers.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Buffers.java index 99089d9096..6d7369d72b 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Buffers.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Buffers.java @@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement public class Buffers extends Property { private static final long serialVersionUID = 1L; - @XmlElement + @XmlElement(name="value") private int buffersValue; public static final String BuffersPropName = "buffers"; @@ -46,6 +46,7 @@ public class Buffers extends Property { this.buffersValue = 0; } + @Override public Buffers clone() { return new Buffers(this.buffersValue); } diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Capabilities.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Capabilities.java index fb121d7b9a..7867b93a68 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Capabilities.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Capabilities.java @@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement public class Capabilities extends Property { private static final long serialVersionUID = 1L; - @XmlElement + @XmlElement(name="value") private int capabilitiesValue; public enum CapabilitiesType { @@ -63,6 +63,7 @@ public class Capabilities extends Property { this.capabilitiesValue = 0; } + @Override public Capabilities clone() { return new Capabilities(this.capabilitiesValue); } diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Config.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Config.java index bae984eaec..ef6efc5821 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Config.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Config.java @@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement @SuppressWarnings("serial") public class Config extends Property { - @XmlElement + @XmlElement(name="value") private short configValue; public static final short ADMIN_DOWN = 0; @@ -40,6 +40,7 @@ public class Config extends Property { this.configValue = config; } + @Override public Config clone() { return new Config(this.configValue); } diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Description.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Description.java index 92cd5b12e4..6915404e24 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Description.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Description.java @@ -9,7 +9,7 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement @SuppressWarnings("serial") public class Description extends Property { - @XmlElement + @XmlElement(name="value") private String descriptionValue; public static final String propertyName = "description"; @@ -26,6 +26,7 @@ public class Description extends Property { this.descriptionValue = description; } + @Override public Description clone() { return new Description(this.descriptionValue); } diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ForwardingMode.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ForwardingMode.java index c28eb13d55..a1d4ff9db7 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ForwardingMode.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ForwardingMode.java @@ -9,7 +9,7 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement @SuppressWarnings("serial") public class ForwardingMode extends Property { - @XmlElement + @XmlElement(name="value") private final int modeValue; public static final int REACTIVE_FORWARDING = 0; public static final int PROACTIVE_FORWARDING = 1; diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Latency.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Latency.java index 818002a21e..a0ba47b29d 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Latency.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Latency.java @@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement; public class Latency extends Property { private static final long serialVersionUID = 1L; - @XmlElement + @XmlElement(name="value") private long latencyValue; public static final long LATENCYUNK = 0; @@ -61,6 +61,7 @@ public class Latency extends Property { this.latencyValue = (long) latency; } + @Override public Latency clone() { return new Latency(this.latencyValue); } diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/MacAddress.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/MacAddress.java index 4470e17e82..27e74e0800 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/MacAddress.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/MacAddress.java @@ -22,7 +22,7 @@ import org.opendaylight.controller.sal.utils.HexEncode; @XmlAccessorType(XmlAccessType.NONE) public class MacAddress extends Property implements Cloneable { private static final long serialVersionUID = 1L; - @XmlElement(name="macAddress") + @XmlElement(name="value") private final String address; public static final String name = "macAddress"; diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Name.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Name.java index ddb663f590..d35610add0 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Name.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Name.java @@ -18,7 +18,7 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement @SuppressWarnings("serial") public class Name extends Property { - @XmlElement + @XmlElement(name="value") private String nameValue; public static final String NamePropName = "name"; @@ -35,6 +35,7 @@ public class Name extends Property { this.nameValue = name; } + @Override public Name clone() { return new Name(this.nameValue); } diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/State.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/State.java index ba67e0d821..058adb63e2 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/State.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/State.java @@ -20,7 +20,7 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement @SuppressWarnings("serial") public class State extends Property { - @XmlElement + @XmlElement(name="value") private short stateValue; public static final short EDGE_DOWN = 0; @@ -41,6 +41,7 @@ public class State extends Property { this.stateValue = state; } + @Override public State clone() { return new State(this.stateValue); } diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Tables.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Tables.java index 156a0b8ee0..bd50cf9be0 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Tables.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Tables.java @@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement public class Tables extends Property { private static final long serialVersionUID = 1L; - @XmlElement + @XmlElement(name="value") private byte tablesValue; public static final String TablesPropName = "tables"; @@ -45,6 +45,7 @@ public class Tables extends Property { this.tablesValue = 0; } + @Override public Tables clone() { return new Tables(this.tablesValue); } diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Tier.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Tier.java index ed4d02b245..6756a82135 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Tier.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Tier.java @@ -20,7 +20,7 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement @SuppressWarnings("serial") public class Tier extends Property { - @XmlElement + @XmlElement(name="value") private int tierValue; public static final String TierPropName = "tier"; @@ -37,6 +37,7 @@ public class Tier extends Property { this.tierValue = 0; } + @Override public Tier clone() { return new Tier(this.tierValue); } diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/TimeStamp.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/TimeStamp.java index a15b3fa9cd..b38ec8582b 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/TimeStamp.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/TimeStamp.java @@ -25,9 +25,9 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement public class TimeStamp extends Property { private static final long serialVersionUID = 1L; - @XmlElement + @XmlElement(name = "value") private long timestamp; - @XmlElement + @XmlElement(name = "name") private String timestampName; public static final String TimeStampPropName = "timeStamp"; @@ -57,6 +57,7 @@ public class TimeStamp extends Property { this.timestampName = null; } + @Override public TimeStamp clone() { return new TimeStamp(this.timestamp, this.timestampName); } -- 2.36.6