Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "BUG-868: remove InstanceIdentifier.getPath() users"
[controller.git]
/
opendaylight
/
md-sal
/
sal-dom-broker
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
dom
/
broker
/
impl
/
SchemaAwareDataStoreAdapter.java
diff --git
a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareDataStoreAdapter.java
b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareDataStoreAdapter.java
index 1a572d157dba9f8272140495b8eabf9669df11bc..3cd7ed5e13ed16b2449f2386604aa81802679b17 100644
(file)
--- a/
opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareDataStoreAdapter.java
+++ b/
opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareDataStoreAdapter.java
@@
-9,6
+9,11
@@
package org.opendaylight.controller.sal.dom.broker.impl;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.base.Preconditions.checkState;
+import com.google.common.base.Predicate;
+import com.google.common.collect.FluentIterable;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
@@
-40,10
+45,6
@@
import org.opendaylight.yangtools.yang.model.api.SchemaContextListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Predicate;
-import com.google.common.collect.FluentIterable;
-import com.google.common.collect.ImmutableSet;
-
public class SchemaAwareDataStoreAdapter extends AbstractLockableDelegator<DataStore> implements //
DataStore, //
SchemaContextListener, //
public class SchemaAwareDataStoreAdapter extends AbstractLockableDelegator<DataStore> implements //
DataStore, //
SchemaContextListener, //
@@
-235,7
+236,7
@@
AutoCloseable {
public CompositeNode readConfigurationData(final InstanceIdentifier path) {
getDelegateReadLock().lock();
try {
public CompositeNode readConfigurationData(final InstanceIdentifier path) {
getDelegateReadLock().lock();
try {
- if (
path.getPath().isEmpty(
)) {
+ if (
Iterables.isEmpty(path.getPathArguments()
)) {
return null;
}
QName qname = null;
return null;
}
QName qname = null;
@@
-278,7
+279,7
@@
AutoCloseable {
public CompositeNode readOperationalData(final InstanceIdentifier path) {
getDelegateReadLock().lock();
try {
public CompositeNode readOperationalData(final InstanceIdentifier path) {
getDelegateReadLock().lock();
try {
- if (
path.getPath().isEmpty(
)) {
+ if (
Iterables.isEmpty(path.getPathArguments()
)) {
return null;
}
QName qname = null;
return null;
}
QName qname = null;