import org.opendaylight.controller.md.sal.common.api.TransactionStatus;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.controller.md.sal.common.impl.service.AbstractDataTransaction;
import org.opendaylight.controller.md.sal.common.impl.util.compat.DataNormalizationException;
import org.opendaylight.controller.md.sal.common.impl.util.compat.DataNormalizationOperation;
import org.opendaylight.controller.md.sal.common.impl.util.compat.DataNormalizer;
+import org.opendaylight.controller.md.sal.dom.api.DOMDataReadOnlyTransaction;
import org.opendaylight.controller.md.sal.dom.api.DOMDataReadTransaction;
import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction;
import org.opendaylight.controller.sal.core.api.data.DataModificationTransaction;
import org.opendaylight.yangtools.concepts.ListenerRegistration;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.data.api.CompositeNode;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.util.concurrent.ListenableFuture;
public abstract class BackwardsCompatibleTransaction<T extends DOMDataReadTransaction> implements
- DataModificationTransaction, Delegator<T> {
+DataModificationTransaction, Delegator<T> {
private static final Logger LOG = LoggerFactory.getLogger(BackwardsCompatibleTransaction.class);
this.normalizer = normalizer;
}
- public static BackwardsCompatibleTransaction<?> readOnlyTransaction(final DOMDataReadTransaction readTx,
+ public static BackwardsCompatibleTransaction<?> readOnlyTransaction(final DOMDataReadOnlyTransaction readTx,
final DataNormalizer normalizer) {
- return new BackwardsCompatibleTransaction<DOMDataReadTransaction>(readTx, normalizer) {
+ return new BackwardsCompatibleTransaction<DOMDataReadOnlyTransaction>(readTx, normalizer) {
@Override
public TransactionStatus getStatus() {
};
@Override
- public CompositeNode readConfigurationData(final InstanceIdentifier legacyPath) {
+ public CompositeNode readConfigurationData(final YangInstanceIdentifier legacyPath) {
- InstanceIdentifier normalizedPath = normalizer.toNormalized(legacyPath);
+ YangInstanceIdentifier normalizedPath = normalizer.toNormalized(legacyPath);
ListenableFuture<Optional<NormalizedNode<?, ?>>> normalizedData = asyncTx.read(
LogicalDatastoreType.CONFIGURATION, normalizedPath);
}
@Override
- public CompositeNode readOperationalData(final InstanceIdentifier legacyPath) {
- InstanceIdentifier normalizedPath = normalizer.toNormalized(legacyPath);
+ public CompositeNode readOperationalData(final YangInstanceIdentifier legacyPath) {
+ YangInstanceIdentifier normalizedPath = normalizer.toNormalized(legacyPath);
ListenableFuture<Optional<NormalizedNode<?, ?>>> normalizedData = asyncTx.read(
LogicalDatastoreType.OPERATIONAL, normalizedPath);
}
@Override
- public Map<InstanceIdentifier, CompositeNode> getCreatedConfigurationData() {
+ public Map<YangInstanceIdentifier, CompositeNode> getCreatedConfigurationData() {
return Collections.emptyMap();
}
@Override
- public Map<InstanceIdentifier, CompositeNode> getCreatedOperationalData() {
+ public Map<YangInstanceIdentifier, CompositeNode> getCreatedOperationalData() {
return Collections.emptyMap();
}
@Override
- public Map<InstanceIdentifier, CompositeNode> getOriginalConfigurationData() {
+ public Map<YangInstanceIdentifier, CompositeNode> getOriginalConfigurationData() {
return Collections.emptyMap();
}
@Override
- public Map<InstanceIdentifier, CompositeNode> getOriginalOperationalData() {
+ public Map<YangInstanceIdentifier, CompositeNode> getOriginalOperationalData() {
return Collections.emptyMap();
}
@Override
- public Set<InstanceIdentifier> getRemovedConfigurationData() {
+ public Set<YangInstanceIdentifier> getRemovedConfigurationData() {
return Collections.emptySet();
}
@Override
- public Set<InstanceIdentifier> getRemovedOperationalData() {
+ public Set<YangInstanceIdentifier> getRemovedOperationalData() {
return Collections.emptySet();
}
@Override
- public Map<InstanceIdentifier, CompositeNode> getUpdatedConfigurationData() {
+ public Map<YangInstanceIdentifier, CompositeNode> getUpdatedConfigurationData() {
return Collections.emptyMap();
}
@Override
- public Map<InstanceIdentifier, CompositeNode> getUpdatedOperationalData() {
+ public Map<YangInstanceIdentifier, CompositeNode> getUpdatedOperationalData() {
return Collections.emptyMap();
}
@Override
- public void putConfigurationData(final InstanceIdentifier path, final CompositeNode data) {
+ public void putConfigurationData(final YangInstanceIdentifier path, final CompositeNode data) {
throw new UnsupportedOperationException();
}
@Override
- public void putOperationalData(final InstanceIdentifier path, final CompositeNode data) {
+ public void putOperationalData(final YangInstanceIdentifier path, final CompositeNode data) {
throw new UnsupportedOperationException();
}
@Override
- public void removeConfigurationData(final InstanceIdentifier path) {
+ public void removeConfigurationData(final YangInstanceIdentifier path) {
throw new UnsupportedOperationException();
}
@Override
- public void removeOperationalData(final InstanceIdentifier path) {
+ public void removeOperationalData(final YangInstanceIdentifier path) {
throw new UnsupportedOperationException();
}
public Future<RpcResult<TransactionStatus>> commit() {
Preconditions.checkState(status == TransactionStatus.NEW);
status = TransactionStatus.SUBMITED;
- return getDelegate().commit();
+ return AbstractDataTransaction.convertToLegacyCommitFuture(getDelegate().submit());
}
@Override
- public void putConfigurationData(final InstanceIdentifier legacyPath, final CompositeNode legacyData) {
+ public void putConfigurationData(final YangInstanceIdentifier legacyPath, final CompositeNode legacyData) {
checkNotNull(legacyPath, "Path MUST NOT be null.");
checkNotNull(legacyData, "Data for path %s MUST NOT be null",legacyData);
- Entry<InstanceIdentifier, NormalizedNode<?, ?>> normalizedData = getNormalizer().toNormalized(legacyPath, legacyData);
+ Entry<YangInstanceIdentifier, NormalizedNode<?, ?>> normalizedData = getNormalizer().toNormalized(legacyPath, legacyData);
putWithEnsuredParents(LogicalDatastoreType.CONFIGURATION, normalizedData.getKey(), normalizedData.getValue());
}
@Override
- public void putOperationalData(final InstanceIdentifier legacyPath, final CompositeNode legacyData) {
+ public void putOperationalData(final YangInstanceIdentifier legacyPath, final CompositeNode legacyData) {
checkNotNull(legacyPath, "Path MUST NOT be null.");
checkNotNull(legacyData, "Data for path %s MUST NOT be null",legacyData);
- Entry<InstanceIdentifier, NormalizedNode<?, ?>> normalizedData = getNormalizer().toNormalized(legacyPath, legacyData);
+ Entry<YangInstanceIdentifier, NormalizedNode<?, ?>> normalizedData = getNormalizer().toNormalized(legacyPath, legacyData);
putWithEnsuredParents(LogicalDatastoreType.OPERATIONAL, normalizedData.getKey(), normalizedData.getValue());
}
- private void putWithEnsuredParents(final LogicalDatastoreType store, final InstanceIdentifier normalizedPath,
+ private void putWithEnsuredParents(final LogicalDatastoreType store, final YangInstanceIdentifier normalizedPath,
final NormalizedNode<?, ?> normalizedData) {
LOG.trace("write {}:{} ",store,normalizedPath);
try {
- List<PathArgument> currentArguments = new ArrayList<>();
- DataNormalizationOperation<?> currentOp = getNormalizer().getRootOperation();
- Iterator<PathArgument> iterator = normalizedPath.getPath().iterator();
- while(iterator.hasNext()) {
- PathArgument currentArg = iterator.next();
- try {
- currentOp = currentOp.getChild(currentArg);
- } catch (DataNormalizationException e) {
- throw new IllegalArgumentException(String.format("Invalid child encountered in path %s", normalizedPath), e);
+ List<PathArgument> currentArguments = new ArrayList<>();
+ DataNormalizationOperation<?> currentOp = getNormalizer().getRootOperation();
+ Iterator<PathArgument> iterator = normalizedPath.getPathArguments().iterator();
+ while(iterator.hasNext()) {
+ PathArgument currentArg = iterator.next();
+ try {
+ currentOp = currentOp.getChild(currentArg);
+ } catch (DataNormalizationException e) {
+ throw new IllegalArgumentException(String.format("Invalid child encountered in path %s", normalizedPath), e);
+ }
+ currentArguments.add(currentArg);
+ YangInstanceIdentifier currentPath = YangInstanceIdentifier.create(currentArguments);
+ boolean isPresent = getDelegate().read(store, currentPath).get().isPresent();
+ if(isPresent == false && iterator.hasNext()) {
+ getDelegate().merge(store, currentPath, currentOp.createDefault(currentArg));
+ }
}
- currentArguments.add(currentArg);
- InstanceIdentifier currentPath = new InstanceIdentifier(currentArguments);
- boolean isPresent = getDelegate().read(store, currentPath).get().isPresent();
- if(isPresent == false && iterator.hasNext()) {
- getDelegate().merge(store, currentPath, currentOp.createDefault(currentArg));
- }
- }
} catch (InterruptedException | ExecutionException e) {
LOG.error("Exception durring read.",e);
}
}
@Override
- public void removeConfigurationData(final InstanceIdentifier legacyPath) {
+ public void removeConfigurationData(final YangInstanceIdentifier legacyPath) {
checkNotNull(legacyPath, "Path MUST NOT be null.");
getDelegate().delete(LogicalDatastoreType.CONFIGURATION, getNormalizer().toNormalized(legacyPath));
}
@Override
- public void removeOperationalData(final InstanceIdentifier legacyPath) {
+ public void removeOperationalData(final YangInstanceIdentifier legacyPath) {
checkNotNull(legacyPath, "Path MUST NOT be null.");
getDelegate().delete(LogicalDatastoreType.OPERATIONAL, getNormalizer().toNormalized(legacyPath));
}
Code Review / controller.git / blobdiff