Code Review
/
controller.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (from parent 1:
14c92df
)
Bump yangtools to 4.0.1
04/83804/49
author
Robert Varga
<robert.varga@pantheon.tech>
Tue, 20 Aug 2019 14:37:51 +0000
(16:37 +0200)
committer
Robert Varga
<robert.varga@pantheon.tech>
Thu, 10 Oct 2019 09:07:01 +0000
(11:07 +0200)
This bumps yangtools to 4.0.1 as part of Magnesium MRI.
Change-Id: I1ac7d3f856af310f4e8015875223d30eac3a8276
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
22 files changed:
features/mdsal/odl-controller-blueprint/pom.xml
patch
|
blob
|
history
features/mdsal/odl-controller-blueprint/src/main/feature/feature.xml
patch
|
blob
|
history
features/mdsal/odl-mdsal-broker-local/pom.xml
patch
|
blob
|
history
features/mdsal/odl-mdsal-clustering-commons/pom.xml
patch
|
blob
|
history
features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml
patch
|
blob
|
history
features/mdsal/odl-mdsal-distributed-datastore/pom.xml
patch
|
blob
|
history
features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
patch
|
blob
|
history
opendaylight/blueprint/pom.xml
patch
|
blob
|
history
opendaylight/md-sal/sal-binding-dom-it/pom.xml
patch
|
blob
|
history
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractLithiumDataInput.java
patch
|
blob
|
history
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractLithiumDataOutput.java
patch
|
blob
|
history
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractMagnesiumDataInput.java
patch
|
blob
|
history
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractMagnesiumDataOutput.java
patch
|
blob
|
history
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractNormalizedNodeDataOutput.java
patch
|
blob
|
history
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/AbstractNormalizedNodePruner.java
patch
|
blob
|
history
opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamReaderWriterTest.java
patch
|
blob
|
history
opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtilsTest.java
patch
|
blob
|
history
opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodePrunerTest.java
patch
|
blob
|
history
opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java
patch
|
blob
|
history
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java
patch
|
blob
|
history
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTree.java
patch
|
blob
|
history
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinatorTest.java
patch
|
blob
|
history
diff --git
a/features/mdsal/odl-controller-blueprint/pom.xml
b/features/mdsal/odl-controller-blueprint/pom.xml
index ec5cecca1ec0667dce2410b583fb308ad8f122e8..8172e9700b6c38695e5150a3da2c4d2d365524fa 100644
(file)
--- a/
features/mdsal/odl-controller-blueprint/pom.xml
+++ b/
features/mdsal/odl-controller-blueprint/pom.xml
@@
-33,7
+33,7
@@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
- <version>
3.0.5
</version>
+ <version>
4.0.1
</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git
a/features/mdsal/odl-controller-blueprint/src/main/feature/feature.xml
b/features/mdsal/odl-controller-blueprint/src/main/feature/feature.xml
index 636ef9f96eff3b7672396ad2bc8a1ca2b8c93056..78feb3ea46f87879287004159481b33346f416bb 100644
(file)
--- a/
features/mdsal/odl-controller-blueprint/src/main/feature/feature.xml
+++ b/
features/mdsal/odl-controller-blueprint/src/main/feature/feature.xml
@@
-8,7
+8,7
@@
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-controller-blueprint-${project.version}">
<feature name="odl-controller-blueprint" version="${project.version}">
-->
<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-controller-blueprint-${project.version}">
<feature name="odl-controller-blueprint" version="${project.version}">
- <feature version="[
3,4
)">odl-yangtools-codec</feature>
+ <feature version="[
4,5
)">odl-yangtools-codec</feature>
<bundle start-level="40">mvn:org.opendaylight.controller/blueprint/${blueprint.version}</bundle>
</feature>
</features>
<bundle start-level="40">mvn:org.opendaylight.controller/blueprint/${blueprint.version}</bundle>
</feature>
</features>
diff --git
a/features/mdsal/odl-mdsal-broker-local/pom.xml
b/features/mdsal/odl-mdsal-broker-local/pom.xml
index 3373a7e27989e0ee6e52e939d5f7784164a3743b..7dafb4d2eb3e1bd12426b3f3b93cf5b4e00639bd 100644
(file)
--- a/
features/mdsal/odl-mdsal-broker-local/pom.xml
+++ b/
features/mdsal/odl-mdsal-broker-local/pom.xml
@@
-37,7
+37,7
@@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
- <version>
3.0.5
</version>
+ <version>
4.0.1
</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git
a/features/mdsal/odl-mdsal-clustering-commons/pom.xml
b/features/mdsal/odl-mdsal-clustering-commons/pom.xml
index 0eeadc096d2da264bfe1c86f7c9d545a025835a8..543d237c871ecb9714111d00c8c0d9bd8571cb75 100644
(file)
--- a/
features/mdsal/odl-mdsal-clustering-commons/pom.xml
+++ b/
features/mdsal/odl-mdsal-clustering-commons/pom.xml
@@
-29,7
+29,7
@@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
- <version>
3.0.5
</version>
+ <version>
4.0.1
</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git
a/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml
b/features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml
index 907bd59aa061c70425ee89dda68dad731c42b38d..bf6fbbeca2bbf4883936f4ef29817dfe40138637 100644
(file)
--- a/
features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml
+++ b/
features/mdsal/odl-mdsal-clustering-commons/src/main/feature/feature.xml
@@
-14,6
+14,6
@@
<feature version="[6,7)">odl-apache-commons-lang3</feature>
<feature version="[6,7)">odl-dropwizard-metrics</feature>
<feature version="[6,7)">odl-servlet-api</feature>
<feature version="[6,7)">odl-apache-commons-lang3</feature>
<feature version="[6,7)">odl-dropwizard-metrics</feature>
<feature version="[6,7)">odl-servlet-api</feature>
- <feature version="[
3,4
)">odl-yangtools-data</feature>
+ <feature version="[
4,5
)">odl-yangtools-data</feature>
</feature>
</features>
</feature>
</features>
diff --git
a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml
b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml
index 1501438ef0ccd8a735f39628f00292ca54557e3a..d07dd9da0a0be0145b4b4bed462d67f972ec0da6 100644
(file)
--- a/
features/mdsal/odl-mdsal-distributed-datastore/pom.xml
+++ b/
features/mdsal/odl-mdsal-distributed-datastore/pom.xml
@@
-29,7
+29,7
@@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
- <version>
3.0.5
</version>
+ <version>
4.0.1
</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git
a/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
b/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
index bf2fb94a4f97794437c79ceaf2fa5cfeb48e0e06..089d7683b80ec5953698552cc12d40736fbbf76c 100644
(file)
--- a/
features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
+++ b/
features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
@@
-9,7
+9,7
@@
<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-controller-${project.version}">
<feature name="odl-mdsal-distributed-datastore" version="${project.version}">
<feature version="[6,7)">odl-apache-commons-text</feature>
<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-controller-${project.version}">
<feature name="odl-mdsal-distributed-datastore" version="${project.version}">
<feature version="[6,7)">odl-apache-commons-text</feature>
- <feature version="[
3,4
)">odl-yangtools-codec</feature>
+ <feature version="[
4,5
)">odl-yangtools-codec</feature>
<feature version="[4,5)">odl-mdsal-eos-dom</feature>
<feature version="[4,5)">odl-mdsal-dom-broker</feature>
<feature version="[4.0.1,5)">odl-mdsal-binding-dom-adapter</feature>
<feature version="[4,5)">odl-mdsal-eos-dom</feature>
<feature version="[4,5)">odl-mdsal-dom-broker</feature>
<feature version="[4.0.1,5)">odl-mdsal-binding-dom-adapter</feature>
diff --git
a/opendaylight/blueprint/pom.xml
b/opendaylight/blueprint/pom.xml
index 81071f210d832f7babd581447776486ba8476a68..e672ef168b01586f98515a8194a07dc0bb8abf99 100644
(file)
--- a/
opendaylight/blueprint/pom.xml
+++ b/
opendaylight/blueprint/pom.xml
@@
-41,7
+41,7
@@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
- <version>
3.0.5
</version>
+ <version>
4.0.1
</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git
a/opendaylight/md-sal/sal-binding-dom-it/pom.xml
b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
index b1cdac6f2effb9ffd059d999b7ee45c01f79724e..21cf3df976294d28cf70ecd8fb0951722d524056 100644
(file)
--- a/
opendaylight/md-sal/sal-binding-dom-it/pom.xml
+++ b/
opendaylight/md-sal/sal-binding-dom-it/pom.xml
@@
-18,7
+18,7
@@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yangtools-artifacts</artifactId>
- <version>
3.0.5
</version>
+ <version>
4.0.1
</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git
a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractLithiumDataInput.java
b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractLithiumDataInput.java
index 3ef0defdc8d46e3281bb8d8449d3f9cd5a9da435..d921076f716636f8053adb4ae874ed39df1c4e8b 100644
(file)
--- a/
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractLithiumDataInput.java
+++ b/
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractLithiumDataInput.java
@@
-114,9
+114,12
@@
abstract class AbstractLithiumDataInput extends AbstractNormalizedNodeDataInput
private void streamAnyxml(final NormalizedNodeStreamWriter writer) throws IOException {
final NodeIdentifier identifier = readNodeIdentifier();
LOG.trace("Streaming anyxml node {}", identifier);
private void streamAnyxml(final NormalizedNodeStreamWriter writer) throws IOException {
final NodeIdentifier identifier = readNodeIdentifier();
LOG.trace("Streaming anyxml node {}", identifier);
- writer.startAnyxmlNode(identifier);
- writer.domSourceValue(readDOMSource());
- writer.endNode();
+
+ final DOMSource value = readDOMSource();
+ if (writer.startAnyxmlNode(identifier, DOMSource.class)) {
+ writer.domSourceValue(value);
+ writer.endNode();
+ }
}
private void streamAugmentation(final NormalizedNodeStreamWriter writer) throws IOException {
}
private void streamAugmentation(final NormalizedNodeStreamWriter writer) throws IOException {
diff --git
a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractLithiumDataOutput.java
b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractLithiumDataOutput.java
index 95c62fc4c793df43b522bfff93ffa217dfc24b1e..25e14b13ebad17684eb3bda3f3c4049ee4e9899f 100644
(file)
--- a/
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractLithiumDataOutput.java
+++ b/
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractLithiumDataOutput.java
@@
-179,10
+179,14
@@
abstract class AbstractLithiumDataOutput extends AbstractNormalizedNodeDataOutpu
}
@Override
}
@Override
- public final void startAnyxmlNode(final NodeIdentifier name) throws IOException {
- LOG.trace("Starting any xml node");
- startNode(name, LithiumNode.ANY_XML_NODE);
- inSimple = true;
+ public final boolean startAnyxmlNode(final NodeIdentifier name, final Class<?> objectModel) throws IOException {
+ if (DOMSource.class.isAssignableFrom(objectModel)) {
+ LOG.trace("Starting anyxml node");
+ startNode(name, LithiumNode.ANY_XML_NODE);
+ inSimple = true;
+ return true;
+ }
+ return false;
}
@Override
}
@Override
diff --git
a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractMagnesiumDataInput.java
b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractMagnesiumDataInput.java
index 1ea8917d4a5efd04c83a04c9aea27d4d9f722871..d8302e5bcd1c6be22d1449d08e49d064d07a9fcf 100644
(file)
--- a/
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractMagnesiumDataInput.java
+++ b/
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractMagnesiumDataInput.java
@@
-137,9
+137,12
@@
abstract class AbstractMagnesiumDataInput extends AbstractNormalizedNodeDataInpu
private void streamAnyxml(final NormalizedNodeStreamWriter writer, final byte nodeHeader) throws IOException {
final NodeIdentifier identifier = decodeNodeIdentifier(nodeHeader);
LOG.trace("Streaming anyxml node {}", identifier);
private void streamAnyxml(final NormalizedNodeStreamWriter writer, final byte nodeHeader) throws IOException {
final NodeIdentifier identifier = decodeNodeIdentifier(nodeHeader);
LOG.trace("Streaming anyxml node {}", identifier);
- writer.startAnyxmlNode(identifier);
- writer.domSourceValue(readDOMSource());
- writer.endNode();
+
+ final DOMSource value = readDOMSource();
+ if (writer.startAnyxmlNode(identifier, DOMSource.class)) {
+ writer.domSourceValue(value);
+ writer.endNode();
+ }
}
private void streamAnyxmlModeled(final NormalizedNodeStreamWriter writer, final byte nodeHeader)
}
private void streamAnyxmlModeled(final NormalizedNodeStreamWriter writer, final byte nodeHeader)
diff --git
a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractMagnesiumDataOutput.java
b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractMagnesiumDataOutput.java
index c0dfb1bc5f17056544ed63d0e8b93ec3e4357d93..3f28f0672d73a956fa558e1f328071c7f076d3ad 100644
(file)
--- a/
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractMagnesiumDataOutput.java
+++ b/
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractMagnesiumDataOutput.java
@@
-180,8
+180,12
@@
abstract class AbstractMagnesiumDataOutput extends AbstractNormalizedNodeDataOut
}
@Override
}
@Override
- public final void startAnyxmlNode(final NodeIdentifier name) throws IOException {
- startSimpleNode(MagnesiumNode.NODE_ANYXML, name);
+ public final boolean startAnyxmlNode(final NodeIdentifier name, final Class<?> objectModel) throws IOException {
+ if (DOMSource.class.isAssignableFrom(objectModel)) {
+ startSimpleNode(MagnesiumNode.NODE_ANYXML, name);
+ return true;
+ }
+ return false;
}
@Override
}
@Override
diff --git
a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractNormalizedNodeDataOutput.java
b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractNormalizedNodeDataOutput.java
index 7907fcfc9f493c23d08737e4649f40d3d7140ed8..d8e021fc6095e924876f8441225f6dd69778404e 100755
(executable)
--- a/
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractNormalizedNodeDataOutput.java
+++ b/
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractNormalizedNodeDataOutput.java
@@
-16,6
+16,7
@@
import java.util.List;
import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
@@
-186,6
+187,12
@@
abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut
}
}
}
}
+ @Override
+ public final boolean startAnydataNode(final NodeIdentifier name, final Class<?> objectModel) throws IOException {
+ // FIXME: We do not support anydata nodes of any kind, yet
+ return false;
+ }
+
abstract short streamVersion();
abstract void writeQNameInternal(@NonNull QName qname) throws IOException;
abstract short streamVersion();
abstract void writeQNameInternal(@NonNull QName qname) throws IOException;
diff --git
a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/AbstractNormalizedNodePruner.java
b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/AbstractNormalizedNodePruner.java
index c3628ad1e8208eab7c85485b78824e94f8688f4f..d6d409ceadf5683d04dce9a438b183feeb34825b 100644
(file)
--- a/
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/AbstractNormalizedNodePruner.java
+++ b/
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/AbstractNormalizedNodePruner.java
@@
-8,6
+8,7
@@
package org.opendaylight.controller.cluster.datastore.node.utils.transformer;
import static com.google.common.base.Preconditions.checkState;
package org.opendaylight.controller.cluster.datastore.node.utils.transformer;
import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Verify.verify;
import static java.util.Objects.requireNonNull;
import java.io.IOException;
import static java.util.Objects.requireNonNull;
import java.io.IOException;
@@
-158,8
+159,18
@@
abstract class AbstractNormalizedNodePruner implements NormalizedNodeStreamWrite
}
@Override
}
@Override
- public void startAnyxmlNode(final NodeIdentifier name) throws IOException {
- enter(ReusableImmutableNormalizedNodeStreamWriter::startAnyxmlNode, name);
+ public boolean startAnyxmlNode(final NodeIdentifier name, final Class<?> objectModel) throws IOException {
+ if (enter(name)) {
+ verify(delegate.startAnyxmlNode(name, objectModel),
+ "Unexpected failure to stream DOMSource node %s model %s", name, objectModel);
+ }
+ return true;
+ }
+
+ @Override
+ public boolean startAnydataNode(final NodeIdentifier name, final Class<?> objectModel) throws IOException {
+ // FIXME: we do not support anydata nodes yet
+ return false;
}
@Override
}
@Override
diff --git
a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamReaderWriterTest.java
b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamReaderWriterTest.java
index 4b45af48e900b29d67b8a34292828cd826bfa6ed..1e57eb4b7ebbb240fed1b6b1e69e0e0fc0090c86 100644
(file)
--- a/
opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamReaderWriterTest.java
+++ b/
opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamReaderWriterTest.java
@@
-5,7
+5,6
@@
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.controller.cluster.datastore.node.utils.stream;
import static org.junit.Assert.assertEquals;
package org.opendaylight.controller.cluster.datastore.node.utils.stream;
import static org.junit.Assert.assertEquals;
@@
-33,8
+32,8
@@
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
-import org.opendaylight.yangtools.yang.data.api.schema.AnyXmlNode;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+import org.opendaylight.yangtools.yang.data.api.schema.DOMSourceAnyxmlNode;
import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
@@
-220,10
+219,11
@@
public class NormalizedNodeStreamReaderWriterTest {
StreamResult xmlOutput = new StreamResult(new StringWriter());
Transformer transformer = TransformerFactory.newInstance().newTransformer();
transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
StreamResult xmlOutput = new StreamResult(new StringWriter());
Transformer transformer = TransformerFactory.newInstance().newTransformer();
transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
- transformer.transform(((
AnyX
mlNode)child.get()).getValue(), xmlOutput);
+ transformer.transform(((
DOMSourceAnyx
mlNode)child.get()).getValue(), xmlOutput);
assertEquals("XML", xml, xmlOutput.getWriter().toString());
assertEquals("XML", xml, xmlOutput.getWriter().toString());
- assertEquals("http://www.w3.org/TR/html4/", ((AnyXmlNode)child.get()).getValue().getNode().getNamespaceURI());
+ assertEquals("http://www.w3.org/TR/html4/",
+ ((DOMSourceAnyxmlNode)child.get()).getValue().getNode().getNamespaceURI());
}
@Test
}
@Test
diff --git
a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtilsTest.java
b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtilsTest.java
index 610a2328f367590cf04af176cad64d28dc853056..04da2a6956fb1a3837b2ad7f821448c2ffa3ffa8 100644
(file)
--- a/
opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtilsTest.java
+++ b/
opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SerializationUtilsTest.java
@@
-30,9
+30,9
@@
import org.opendaylight.yangtools.util.xml.UntrustedXML;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.AnyXmlNode;
import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode;
import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode;
+import org.opendaylight.yangtools.yang.data.api.schema.DOMSourceAnyxmlNode;
import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode;
import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode;
@@
-63,7
+63,7
@@
public class SerializationUtilsTest {
final ByteArrayInputStream is =
new ByteArrayInputStream("<xml><data/></xml>".getBytes(Charset.defaultCharset()));
final Document parse = UntrustedXML.newDocumentBuilder().parse(is);
final ByteArrayInputStream is =
new ByteArrayInputStream("<xml><data/></xml>".getBytes(Charset.defaultCharset()));
final Document parse = UntrustedXML.newDocumentBuilder().parse(is);
- final
AnyX
mlNode anyXmlNode = Builders.anyXmlBuilder()
+ final
DOMSourceAnyx
mlNode anyXmlNode = Builders.anyXmlBuilder()
.withNodeIdentifier(id("anyXmlNode"))
.withValue(new DOMSource(parse))
.build();
.withNodeIdentifier(id("anyXmlNode"))
.withValue(new DOMSource(parse))
.build();
diff --git
a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodePrunerTest.java
b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodePrunerTest.java
index f15b184513dd7ba31c10418e27ee9ff7e739c98f..50ade7875f8383366a327ccfcfc89f908fb780f7 100644
(file)
--- a/
opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodePrunerTest.java
+++ b/
opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/node/utils/transformer/NormalizedNodePrunerTest.java
@@
-30,7
+30,7
@@
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;
-import org.opendaylight.yangtools.yang.data.api.schema.
AnyX
mlNode;
+import org.opendaylight.yangtools.yang.data.api.schema.
DOMSourceAnyx
mlNode;
import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
@@
-257,7
+257,7
@@
public class NormalizedNodePrunerTest {
@Test
public void testAnyXMLNodeNotPrunedWhenHasParent() throws IOException {
NormalizedNodePruner pruner = prunerFullSchema(TestModel.TEST_PATH);
@Test
public void testAnyXMLNodeNotPrunedWhenHasParent() throws IOException {
NormalizedNodePruner pruner = prunerFullSchema(TestModel.TEST_PATH);
-
AnyX
mlNode child = Builders.anyXmlBuilder().withNodeIdentifier(
+
DOMSourceAnyx
mlNode child = Builders.anyXmlBuilder().withNodeIdentifier(
new NodeIdentifier(TestModel.ANY_XML_QNAME)).withValue(mock(DOMSource.class)).build();
NormalizedNode<?, ?> input = Builders.containerBuilder().withNodeIdentifier(
new NodeIdentifier(TestModel.TEST_QNAME)).withChild(child).build();
new NodeIdentifier(TestModel.ANY_XML_QNAME)).withValue(mock(DOMSource.class)).build();
NormalizedNode<?, ?> input = Builders.containerBuilder().withNodeIdentifier(
new NodeIdentifier(TestModel.TEST_QNAME)).withChild(child).build();
diff --git
a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java
b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java
index 4dbd7db03e64992e3ae566fe9c6d7fb52fddb346..7a2388231c08dfd7de92390ee9b9e19cb1c289f4 100644
(file)
--- a/
opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java
+++ b/
opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java
@@
-32,7
+32,7
@@
import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder;
-import org.opendaylight.yangtools.yang.model.api.Any
X
mlSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.Any
x
mlSchemaNode;
import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode;
import org.opendaylight.yangtools.yang.model.api.AugmentationTarget;
import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode;
import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode;
import org.opendaylight.yangtools.yang.model.api.AugmentationTarget;
import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode;
@@
-483,8
+483,8
@@
public abstract class DataNormalizationOperation<T extends PathArgument> impleme
}
}
}
}
- private static class Any
X
mlNormalization extends DataNormalizationOperation<NodeIdentifier> {
- Any
XmlNormalization(final AnyX
mlSchemaNode schema) {
+ private static class Any
x
mlNormalization extends DataNormalizationOperation<NodeIdentifier> {
+ Any
xmlNormalization(final Anyx
mlSchemaNode schema) {
super(new NodeIdentifier(schema.getQName()), schema);
}
super(new NodeIdentifier(schema.getQName()), schema);
}
@@
-574,8
+574,8
@@
public abstract class DataNormalizationOperation<T extends PathArgument> impleme
return new ChoiceNodeNormalization((ChoiceSchemaNode) potential);
} else if (potential instanceof LeafListSchemaNode) {
return fromLeafListSchemaNode((LeafListSchemaNode) potential);
return new ChoiceNodeNormalization((ChoiceSchemaNode) potential);
} else if (potential instanceof LeafListSchemaNode) {
return fromLeafListSchemaNode((LeafListSchemaNode) potential);
- } else if (potential instanceof Any
X
mlSchemaNode) {
- return new Any
XmlNormalization((AnyX
mlSchemaNode) potential);
+ } else if (potential instanceof Any
x
mlSchemaNode) {
+ return new Any
xmlNormalization((Anyx
mlSchemaNode) potential);
}
return null;
}
}
return null;
}
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java
index 93aee0d245d17d57454155ddbcfa89ba38fa1713..f22a98a3cc2d8e990540b76d77e03e830ce6ca2e 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java
@@
-29,6
+29,7
@@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import java.util.function.Function;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.text.WordUtils;
import org.checkerframework.checker.lock.qual.GuardedBy;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.text.WordUtils;
import org.checkerframework.checker.lock.qual.GuardedBy;
@@
-39,6
+40,10
@@
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.distributed.datastore.provider.rev140612.DataStorePropertiesContainer;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.distributed.datastore.provider.rev140612.DataStorePropertiesContainer;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint64;
+import org.opendaylight.yangtools.yang.common.Uint8;
import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@
-59,6
+64,14
@@
public class DatastoreContextIntrospector {
private static final Map<String, Method> BUILDER_SETTERS = new HashMap<>();
private static final Map<String, Method> BUILDER_SETTERS = new HashMap<>();
+ private static final ImmutableMap<Class<?>, Function<String, Object>> UINT_FACTORIES =
+ ImmutableMap.<Class<?>, Function<String, Object>>builder()
+ .put(Uint8.class, Uint8::valueOf)
+ .put(Uint16.class, Uint16::valueOf)
+ .put(Uint32.class, Uint32::valueOf)
+ .put(Uint64.class, Uint64::valueOf)
+ .build();
+
static {
try {
introspectDatastoreContextBuilder();
static {
try {
introspectDatastoreContextBuilder();
@@
-393,13
+406,18
@@
public class DatastoreContextIntrospector {
}
final Constructor<?> ctor = CONSTRUCTORS.get(toType);
}
final Constructor<?> ctor = CONSTRUCTORS.get(toType);
-
- LOG.trace("Found {}", ctor);
-
if (ctor == null) {
if (ctor == null) {
+ if (fromValue instanceof String) {
+ final Function<String, Object> factory = UINT_FACTORIES.get(toType);
+ if (factory != null) {
+ return factory.apply((String) fromValue);
+ }
+ }
+
throw new IllegalArgumentException(String.format("Constructor not found for type %s", toType));
}
throw new IllegalArgumentException(String.format("Constructor not found for type %s", toType));
}
+ LOG.trace("Found {}", ctor);
Object value = fromValue;
// Once we find a constructor that takes the original type as an argument, we're done recursing.
Object value = fromValue;
// Once we find a constructor that takes the original type as an argument, we're done recursing.
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTree.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTree.java
index 614a346068c6163442420fda028992b170977c83..43a3f6dc49cb201ea34c167a6d57c5794740b6f8 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTree.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTree.java
@@
-945,7
+945,7
@@
public class ShardDataTree extends ShardDataTreeTransactionParent {
try {
candidate = tip.prepare(cohort.getDataTreeModification());
LOG.debug("{}: Transaction {} candidate ready", logContext, currentId);
try {
candidate = tip.prepare(cohort.getDataTreeModification());
LOG.debug("{}: Transaction {} candidate ready", logContext, currentId);
- } catch (RuntimeException e) {
+ } catch (
DataValidationFailedException |
RuntimeException e) {
failPreCommit(e);
return;
}
failPreCommit(e);
return;
}
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinatorTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinatorTest.java
index 0b78e3244d588fc3c7b0ec1b8072e908b0a56f12..4ad48a1d8301de1a19a70349cae12e1cacb798bd 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinatorTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinatorTest.java
@@
-29,6
+29,7
@@
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot;
+import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException;
import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType;
import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory;
import org.opendaylight.yangtools.yang.data.impl.schema.tree.SchemaValidationFailedException;
import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType;
import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory;
import org.opendaylight.yangtools.yang.data.impl.schema.tree.SchemaValidationFailedException;
@@
-57,7
+58,8
@@
public class ShardRecoveryCoordinatorTest extends AbstractTest {
}
@Test
}
@Test
- public void testAppendRecoveredLogEntryCommitTransactionPayload() throws IOException {
+ public void testAppendRecoveredLogEntryCommitTransactionPayload() throws IOException,
+ DataValidationFailedException {
try {
coordinator.appendRecoveredLogEntry(CommitTransactionPayload.create(nextTransactionId(), createCar()));
} catch (final SchemaValidationFailedException e) {
try {
coordinator.appendRecoveredLogEntry(CommitTransactionPayload.create(nextTransactionId(), createCar()));
} catch (final SchemaValidationFailedException e) {
@@
-68,7
+70,7
@@
public class ShardRecoveryCoordinatorTest extends AbstractTest {
}
@Test
}
@Test
- public void testApplyRecoverySnapshot() {
+ public void testApplyRecoverySnapshot()
throws DataValidationFailedException
{
coordinator.applyRecoverySnapshot(createSnapshot());
assertFalse(readCars(peopleDataTree).isPresent());
coordinator.applyRecoverySnapshot(createSnapshot());
assertFalse(readCars(peopleDataTree).isPresent());
@@
-85,7
+87,7
@@
public class ShardRecoveryCoordinatorTest extends AbstractTest {
}
}
}
}
- private DataTreeCandidate createCar() {
+ private DataTreeCandidate createCar()
throws DataValidationFailedException
{
final DataTree dataTree = new InMemoryDataTreeFactory().create(
DataTreeConfiguration.DEFAULT_OPERATIONAL, carsSchemaContext);
final DataTree dataTree = new InMemoryDataTreeFactory().create(
DataTreeConfiguration.DEFAULT_OPERATIONAL, carsSchemaContext);
@@
-114,7
+116,7
@@
public class ShardRecoveryCoordinatorTest extends AbstractTest {
return shardDataTree.readNode(PeopleModel.BASE_PATH);
}
return shardDataTree.readNode(PeopleModel.BASE_PATH);
}
- private static ShardSnapshotState createSnapshot() {
+ private static ShardSnapshotState createSnapshot()
throws DataValidationFailedException
{
final DataTree dataTree = new InMemoryDataTreeFactory().create(
DataTreeConfiguration.DEFAULT_OPERATIONAL, SchemaContextHelper.select(SchemaContextHelper.CARS_YANG,
SchemaContextHelper.PEOPLE_YANG));
final DataTree dataTree = new InMemoryDataTreeFactory().create(
DataTreeConfiguration.DEFAULT_OPERATIONAL, SchemaContextHelper.select(SchemaContextHelper.CARS_YANG,
SchemaContextHelper.PEOPLE_YANG));