Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG 1623 - Clustering : Parsing Error thrown on startup
[controller.git]
/
opendaylight
/
md-sal
/
sal-rest-connector
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
restconf
/
impl
/
SimpleNodeWrapper.java
diff --git
a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/SimpleNodeWrapper.java
b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/SimpleNodeWrapper.java
index 4d22bfa73adce9106ff3ebc59a8a2f9227d4dda7..854e9635cf3cde883d97bbcc28f29c99bbda5c9c 100644
(file)
--- a/
opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/SimpleNodeWrapper.java
+++ b/
opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/SimpleNodeWrapper.java
@@
-7,8
+7,8
@@
*/
package org.opendaylight.controller.sal.restconf.impl;
*/
package org.opendaylight.controller.sal.restconf.impl;
+import com.google.common.base.Preconditions;
import java.net.URI;
import java.net.URI;
-
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.CompositeNode;
import org.opendaylight.yangtools.yang.data.api.ModifyAction;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.CompositeNode;
import org.opendaylight.yangtools.yang.data.api.ModifyAction;
@@
-16,38
+16,36
@@
import org.opendaylight.yangtools.yang.data.api.MutableSimpleNode;
import org.opendaylight.yangtools.yang.data.api.SimpleNode;
import org.opendaylight.yangtools.yang.data.impl.NodeFactory;
import org.opendaylight.yangtools.yang.data.api.SimpleNode;
import org.opendaylight.yangtools.yang.data.impl.NodeFactory;
-import com.google.common.base.Preconditions;
-
public final class SimpleNodeWrapper implements NodeWrapper<SimpleNode<?>>, SimpleNode<Object> {
public final class SimpleNodeWrapper implements NodeWrapper<SimpleNode<?>>, SimpleNode<Object> {
-
+
private SimpleNode<Object> simpleNode;
private SimpleNode<Object> simpleNode;
-
+
private String localName;
private Object value;
private URI namespace;
private QName name;
private String localName;
private Object value;
private URI namespace;
private QName name;
- public SimpleNodeWrapper(
String localName,
Object value) {
+ public SimpleNodeWrapper(
final String localName, final
Object value) {
this.localName = Preconditions.checkNotNull(localName);
this.value = value;
}
this.localName = Preconditions.checkNotNull(localName);
this.value = value;
}
-
- public SimpleNodeWrapper(
URI namespace, String localName,
Object value) {
+
+ public SimpleNodeWrapper(
final URI namespace, final String localName, final
Object value) {
this(localName, value);
this.namespace = namespace;
}
this(localName, value);
this.namespace = namespace;
}
-
+
@Override
@Override
- public void setQname(QName name) {
+ public void setQname(
final
QName name) {
Preconditions.checkState(simpleNode == null, "Cannot change the object, due to data inconsistencies.");
this.name = name;
}
Preconditions.checkState(simpleNode == null, "Cannot change the object, due to data inconsistencies.");
this.name = name;
}
-
+
@Override
public QName getQname() {
return name;
}
@Override
public QName getQname() {
return name;
}
-
+
@Override
public String getLocalName() {
if (simpleNode != null) {
@Override
public String getLocalName() {
if (simpleNode != null) {
@@
-55,7
+53,7
@@
public final class SimpleNodeWrapper implements NodeWrapper<SimpleNode<?>>, Simp
}
return localName;
}
}
return localName;
}
-
+
@Override
public URI getNamespace() {
if (simpleNode != null) {
@Override
public URI getNamespace() {
if (simpleNode != null) {
@@
-65,7
+63,7
@@
public final class SimpleNodeWrapper implements NodeWrapper<SimpleNode<?>>, Simp
}
@Override
}
@Override
- public void setNamespace(URI namespace) {
+ public void setNamespace(
final
URI namespace) {
Preconditions.checkState(simpleNode == null, "Cannot change the object, due to data inconsistencies.");
this.namespace = namespace;
}
Preconditions.checkState(simpleNode == null, "Cannot change the object, due to data inconsistencies.");
this.namespace = namespace;
}
@@
-83,13
+81,13
@@
public final class SimpleNodeWrapper implements NodeWrapper<SimpleNode<?>>, Simp
name = new QName(namespace, localName);
}
simpleNode = NodeFactory.createImmutableSimpleNode(name, null, value);
name = new QName(namespace, localName);
}
simpleNode = NodeFactory.createImmutableSimpleNode(name, null, value);
-
+
value = null;
namespace = null;
localName = null;
name = null;
}
value = null;
namespace = null;
localName = null;
name = null;
}
- return
(SimpleNode<Object>)
simpleNode;
+ return simpleNode;
}
@Override
}
@Override
@@
-98,6
+96,7
@@
public final class SimpleNodeWrapper implements NodeWrapper<SimpleNode<?>>, Simp
}
@Override
}
@Override
+ @Deprecated
public CompositeNode getParent() {
return unwrap().getParent();
}
public CompositeNode getParent() {
return unwrap().getParent();
}
@@
-108,6
+107,7
@@
public final class SimpleNodeWrapper implements NodeWrapper<SimpleNode<?>>, Simp
}
@Override
}
@Override
+ @Deprecated
public ModifyAction getModificationAction() {
return unwrap().getModificationAction();
}
public ModifyAction getModificationAction() {
return unwrap().getModificationAction();
}
@@
-123,10
+123,8
@@
public final class SimpleNodeWrapper implements NodeWrapper<SimpleNode<?>>, Simp
}
@Override
}
@Override
- public Object setValue(Object value) {
+ public Object setValue(
final
Object value) {
return unwrap().setValue(value);
}
return unwrap().setValue(value);
}
-
-
}
}