Change-Id: Iff4edfb67a169cc6075be7ae87b9e2fd40e43055
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
private static final ListenableFuture<RpcResult<TransactionStatus>> SUCCESS_FUTURE =
Futures.immediateFuture(RpcResultBuilder.success(TransactionStatus.COMMITED).build());
private static final ListenableFuture<RpcResult<TransactionStatus>> SUCCESS_FUTURE =
Futures.immediateFuture(RpcResultBuilder.success(TransactionStatus.COMMITED).build());
- public static ListenableFuture<RpcResult<TransactionStatus>> convertToLegacyCommitFuture(final CheckedFuture<Void,TransactionCommitFailedException> from) {
+ public static ListenableFuture<RpcResult<TransactionStatus>> convertToLegacyCommitFuture(
+ final CheckedFuture<Void,TransactionCommitFailedException> from) {
return Futures.transformAsync(from, input -> SUCCESS_FUTURE);
}
}
return Futures.transformAsync(from, input -> SUCCESS_FUTURE);
}
}
protected DataNormalizationOperation(final T identifier, final SchemaNode schema) {
this.identifier = identifier;
protected DataNormalizationOperation(final T identifier, final SchemaNode schema) {
this.identifier = identifier;
- if(schema instanceof DataSchemaNode) {
+ if (schema instanceof DataSchemaNode) {
this.dataSchemaNode = Optional.of((DataSchemaNode) schema);
} else {
this.dataSchemaNode = Optional.absent();
this.dataSchemaNode = Optional.of((DataSchemaNode) schema);
} else {
this.dataSchemaNode = Optional.absent();
return Collections.singleton(identifier.getNodeType());
}
return Collections.singleton(identifier.getNodeType());
}
- public abstract DataNormalizationOperation<?> getChild(final PathArgument child) throws DataNormalizationException;
+ public abstract DataNormalizationOperation<?> getChild(PathArgument child) throws DataNormalizationException;
public abstract DataNormalizationOperation<?> getChild(QName child) throws DataNormalizationException;
public abstract DataNormalizationOperation<?> getChild(QName child) throws DataNormalizationException;
- private static abstract class SimpleTypeNormalization<T extends PathArgument> extends DataNormalizationOperation<T> {
+ private abstract static class SimpleTypeNormalization<T extends PathArgument>
+ extends DataNormalizationOperation<T> {
protected SimpleTypeNormalization(final T identifier, final DataSchemaNode potential) {
super(identifier,potential);
protected SimpleTypeNormalization(final T identifier, final DataSchemaNode potential) {
super(identifier,potential);
public boolean isLeaf() {
return true;
}
public boolean isLeaf() {
return true;
}
}
private static final class LeafNormalization extends SimpleTypeNormalization<NodeIdentifier> {
}
private static final class LeafNormalization extends SimpleTypeNormalization<NodeIdentifier> {
private static final class LeafListEntryNormalization extends SimpleTypeNormalization<NodeWithValue> {
private static final class LeafListEntryNormalization extends SimpleTypeNormalization<NodeWithValue> {
- public LeafListEntryNormalization(final LeafListSchemaNode potential) {
+ LeafListEntryNormalization(final LeafListSchemaNode potential) {
super(new NodeWithValue(potential.getQName(), null),potential);
}
super(new NodeWithValue(potential.getQName(), null),potential);
}
- private static abstract class CompositeNodeNormalizationOperation<T extends PathArgument> extends
- DataNormalizationOperation<T> {
+ private abstract static class CompositeNodeNormalizationOperation<T extends PathArgument>
+ extends DataNormalizationOperation<T> {
protected CompositeNodeNormalizationOperation(final T identifier, final DataSchemaNode schema) {
super(identifier,schema);
protected CompositeNodeNormalizationOperation(final T identifier, final DataSchemaNode schema) {
super(identifier,schema);
- private static abstract class DataContainerNormalizationOperation<T extends PathArgument> extends
- CompositeNodeNormalizationOperation<T> {
+ private abstract static class DataContainerNormalizationOperation<T extends PathArgument>
+ extends CompositeNodeNormalizationOperation<T> {
private final DataNodeContainer schema;
private final Map<QName, DataNormalizationOperation<?>> byQName;
private final Map<PathArgument, DataNormalizationOperation<?>> byArg;
private final DataNodeContainer schema;
private final Map<QName, DataNormalizationOperation<?>> byQName;
private final Map<PathArgument, DataNormalizationOperation<?>> byArg;
- protected DataContainerNormalizationOperation(final T identifier, final DataNodeContainer schema, final DataSchemaNode node) {
+ protected DataContainerNormalizationOperation(final T identifier, final DataNodeContainer schema,
+ final DataSchemaNode node) {
super(identifier,node);
this.schema = schema;
this.byArg = new ConcurrentHashMap<>();
super(identifier,node);
this.schema = schema;
this.byArg = new ConcurrentHashMap<>();
return register(potential);
}
return register(potential);
}
- private DataNormalizationOperation<?> fromLocalSchema(final PathArgument child) throws DataNormalizationException {
- if (child instanceof AugmentationIdentifier) {
- return fromSchemaAndQNameChecked(schema, ((AugmentationIdentifier) child).getPossibleChildNames()
- .iterator().next());
- }
- return fromSchemaAndQNameChecked(schema, child.getNodeType());
- }
-
@Override
public DataNormalizationOperation<?> getChild(final QName child) throws DataNormalizationException {
DataNormalizationOperation<?> potential = byQName.get(child);
@Override
public DataNormalizationOperation<?> getChild(final QName child) throws DataNormalizationException {
DataNormalizationOperation<?> potential = byQName.get(child);
return register(potential);
}
return register(potential);
}
- protected DataNormalizationOperation<?> fromLocalSchemaAndQName(final DataNodeContainer schema2, final QName child) throws DataNormalizationException {
+ private DataNormalizationOperation<?> fromLocalSchema(final PathArgument child)
+ throws DataNormalizationException {
+ if (child instanceof AugmentationIdentifier) {
+ return fromSchemaAndQNameChecked(schema, ((AugmentationIdentifier) child).getPossibleChildNames()
+ .iterator().next());
+ }
+ return fromSchemaAndQNameChecked(schema, child.getNodeType());
+ }
+
+ protected DataNormalizationOperation<?> fromLocalSchemaAndQName(final DataNodeContainer schema2,
+ final QName child) throws DataNormalizationException {
return fromSchemaAndQNameChecked(schema2, child);
}
private DataNormalizationOperation<?> register(final DataNormalizationOperation<?> potential) {
if (potential != null) {
byArg.put(potential.getIdentifier(), potential);
return fromSchemaAndQNameChecked(schema2, child);
}
private DataNormalizationOperation<?> register(final DataNormalizationOperation<?> potential) {
if (potential != null) {
byArg.put(potential.getIdentifier(), potential);
- for (final QName qName : potential.getQNameIdentifiers()) {
- byQName.put(qName, potential);
+ for (final QName qname : potential.getQNameIdentifiers()) {
+ byQName.put(qname, potential);
}
private static final class ListItemNormalization extends
}
private static final class ListItemNormalization extends
- DataContainerNormalizationOperation<NodeIdentifierWithPredicates> {
-
- private final List<QName> keyDefinition;
+ DataContainerNormalizationOperation<NodeIdentifierWithPredicates> {
protected ListItemNormalization(final NodeIdentifierWithPredicates identifier, final ListSchemaNode schema) {
protected ListItemNormalization(final NodeIdentifierWithPredicates identifier, final ListSchemaNode schema) {
- super(identifier, schema,schema);
- keyDefinition = schema.getKeyDefinition();
+ super(identifier, schema, schema);
}
@Override
public NormalizedNode<?, ?> createDefault(final PathArgument currentArg) {
final DataContainerNodeAttrBuilder<NodeIdentifierWithPredicates, MapEntryNode> builder = Builders
.mapEntryBuilder().withNodeIdentifier((NodeIdentifierWithPredicates) currentArg);
}
@Override
public NormalizedNode<?, ?> createDefault(final PathArgument currentArg) {
final DataContainerNodeAttrBuilder<NodeIdentifierWithPredicates, MapEntryNode> builder = Builders
.mapEntryBuilder().withNodeIdentifier((NodeIdentifierWithPredicates) currentArg);
- for (final Entry<QName, Object> keyValue : ((NodeIdentifierWithPredicates) currentArg).getKeyValues().entrySet()) {
+ for (final Entry<QName, Object> keyValue :
+ ((NodeIdentifierWithPredicates) currentArg).getKeyValues().entrySet()) {
builder.addChild(Builders.leafBuilder()
//
.withNodeIdentifier(new NodeIdentifier(keyValue.getKey())).withValue(keyValue.getValue())
builder.addChild(Builders.leafBuilder()
//
.withNodeIdentifier(new NodeIdentifier(keyValue.getKey())).withValue(keyValue.getValue())
- private static final class UnkeyedListItemNormalization extends DataContainerNormalizationOperation<NodeIdentifier> {
+ private static final class UnkeyedListItemNormalization
+ extends DataContainerNormalizationOperation<NodeIdentifier> {
protected UnkeyedListItemNormalization(final ListSchemaNode schema) {
super(new NodeIdentifier(schema.getQName()), schema,schema);
protected UnkeyedListItemNormalization(final ListSchemaNode schema) {
super(new NodeIdentifier(schema.getQName()), schema,schema);
- private static abstract class MixinNormalizationOp<T extends PathArgument> extends
- CompositeNodeNormalizationOperation<T> {
+ private abstract static class MixinNormalizationOp<T extends PathArgument>
+ extends CompositeNodeNormalizationOperation<T> {
protected MixinNormalizationOp(final T identifier, final DataSchemaNode schema) {
super(identifier,schema);
protected MixinNormalizationOp(final T identifier, final DataSchemaNode schema) {
super(identifier,schema);
private static final class OrderedLeafListMixinNormalization extends UnorderedLeafListMixinNormalization {
private static final class OrderedLeafListMixinNormalization extends UnorderedLeafListMixinNormalization {
-
-
- public OrderedLeafListMixinNormalization(final LeafListSchemaNode potential) {
+ OrderedLeafListMixinNormalization(final LeafListSchemaNode potential) {
private final DataNormalizationOperation<?> innerOp;
private final DataNormalizationOperation<?> innerOp;
- public UnorderedLeafListMixinNormalization(final LeafListSchemaNode potential) {
+ UnorderedLeafListMixinNormalization(final LeafListSchemaNode potential) {
super(new NodeIdentifier(potential.getQName()),potential);
innerOp = new LeafListEntryNormalization(potential);
}
super(new NodeIdentifier(potential.getQName()),potential);
innerOp = new LeafListEntryNormalization(potential);
}
@Override
public NormalizedNode<?, ?> createDefault(final PathArgument currentArg) {
return Builders.leafSetBuilder().withNodeIdentifier(getIdentifier()).build();
@Override
public NormalizedNode<?, ?> createDefault(final PathArgument currentArg) {
return Builders.leafSetBuilder().withNodeIdentifier(getIdentifier()).build();
- private static final class AugmentationNormalization extends DataContainerNormalizationOperation<AugmentationIdentifier> {
+ private static final class AugmentationNormalization
+ extends DataContainerNormalizationOperation<AugmentationIdentifier> {
- public AugmentationNormalization(final AugmentationSchemaNode augmentation, final DataNodeContainer schema) {
+ AugmentationNormalization(final AugmentationSchemaNode augmentation, final DataNodeContainer schema) {
super(augmentationIdentifierFrom(augmentation), augmentationProxy(augmentation,schema),null);
}
super(augmentationIdentifierFrom(augmentation), augmentationProxy(augmentation,schema),null);
}
- protected DataNormalizationOperation<?> fromLocalSchemaAndQName(final DataNodeContainer schema, final QName child)
- throws DataNormalizationException {
+ protected DataNormalizationOperation<?> fromLocalSchemaAndQName(final DataNodeContainer schema,
+ final QName child) throws DataNormalizationException {
final Optional<DataSchemaNode> potential = findChildSchemaNode(schema, child);
if (!potential.isPresent()) {
return null;
final Optional<DataSchemaNode> potential = findChildSchemaNode(schema, child);
if (!potential.isPresent()) {
return null;
private final ListItemNormalization innerNode;
private final ListItemNormalization innerNode;
- public UnorderedMapMixinNormalization(final ListSchemaNode list) {
+ UnorderedMapMixinNormalization(final ListSchemaNode list) {
super(new NodeIdentifier(list.getQName()),list);
this.innerNode = new ListItemNormalization(new NodeIdentifierWithPredicates(list.getQName(),
super(new NodeIdentifier(list.getQName()),list);
this.innerNode = new ListItemNormalization(new NodeIdentifierWithPredicates(list.getQName(),
- Collections.<QName, Object> emptyMap()), list);
+ Collections.<QName, Object>emptyMap()), list);
private final UnkeyedListItemNormalization innerNode;
private final UnkeyedListItemNormalization innerNode;
- public UnkeyedListMixinNormalization(final ListSchemaNode list) {
+ UnkeyedListMixinNormalization(final ListSchemaNode list) {
super(new NodeIdentifier(list.getQName()),list);
this.innerNode = new UnkeyedListItemNormalization(list);
}
super(new NodeIdentifier(list.getQName()),list);
this.innerNode = new UnkeyedListItemNormalization(list);
}
private static final class OrderedMapMixinNormalization extends UnorderedMapMixinNormalization {
private static final class OrderedMapMixinNormalization extends UnorderedMapMixinNormalization {
- public OrderedMapMixinNormalization(final ListSchemaNode list) {
+ OrderedMapMixinNormalization(final ListSchemaNode list) {
protected ChoiceNodeNormalization(final ChoiceSchemaNode schema) {
super(new NodeIdentifier(schema.getQName()),schema);
final ImmutableMap.Builder<QName, DataNormalizationOperation<?>> byQNameBuilder = ImmutableMap.builder();
protected ChoiceNodeNormalization(final ChoiceSchemaNode schema) {
super(new NodeIdentifier(schema.getQName()),schema);
final ImmutableMap.Builder<QName, DataNormalizationOperation<?>> byQNameBuilder = ImmutableMap.builder();
- final ImmutableMap.Builder<PathArgument, DataNormalizationOperation<?>> byArgBuilder = ImmutableMap.builder();
+ final ImmutableMap.Builder<PathArgument, DataNormalizationOperation<?>> byArgBuilder =
+ ImmutableMap.builder();
for (final CaseSchemaNode caze : schema.getCases().values()) {
for (final DataSchemaNode cazeChild : caze.getChildNodes()) {
for (final CaseSchemaNode caze : schema.getCases().values()) {
for (final DataSchemaNode cazeChild : caze.getChildNodes()) {
private static class AnyXmlNormalization extends DataNormalizationOperation<NodeIdentifier> {
private static class AnyXmlNormalization extends DataNormalizationOperation<NodeIdentifier> {
- protected AnyXmlNormalization( final AnyXmlSchemaNode schema) {
- super( new NodeIdentifier(schema.getQName()), schema);
+ protected AnyXmlNormalization(final AnyXmlSchemaNode schema) {
+ super(new NodeIdentifier(schema.getQName()), schema);
- public DataNormalizationOperation<?> getChild( final PathArgument child ) throws DataNormalizationException {
+ public DataNormalizationOperation<?> getChild(final PathArgument child) throws DataNormalizationException {
- public DataNormalizationOperation<?> getChild( final QName child ) throws DataNormalizationException {
+ public DataNormalizationOperation<?> getChild(final QName child) throws DataNormalizationException {
- public NormalizedNode<?, ?> createDefault( final PathArgument currentArg ) {
+ public NormalizedNode<?, ?> createDefault(final PathArgument currentArg) {
- private static final Optional<DataSchemaNode> findChildSchemaNode(final DataNodeContainer parent,final QName child) {
+ private static Optional<DataSchemaNode> findChildSchemaNode(final DataNodeContainer parent,
+ final QName child) {
DataSchemaNode potential = parent.getDataChildByName(child);
if (potential == null) {
DataSchemaNode potential = parent.getDataChildByName(child);
if (potential == null) {
- final Iterable<ChoiceSchemaNode> choices = FluentIterable.from(parent.getChildNodes()).filter(ChoiceSchemaNode.class);
+ final Iterable<ChoiceSchemaNode> choices = FluentIterable.from(parent.getChildNodes())
+ .filter(ChoiceSchemaNode.class);
potential = findChoice(choices, child);
}
return Optional.fromNullable(potential);
potential = findChoice(choices, child);
}
return Optional.fromNullable(potential);
final Optional<DataSchemaNode> potential = findChildSchemaNode(schema, child);
if (!potential.isPresent()) {
final Optional<DataSchemaNode> potential = findChildSchemaNode(schema, child);
if (!potential.isPresent()) {
- throw new DataNormalizationException(String.format("Supplied QName %s is not valid according to schema %s, potential children nodes: %s", child, schema,schema.getChildNodes()));
+ throw new DataNormalizationException(String.format(
+ "Supplied QName %s is not valid according to schema %s, potential children nodes: %s", child,
+ schema,schema.getChildNodes()));
}
final DataSchemaNode result = potential.get();
}
final DataSchemaNode result = potential.get();
- * Returns a DataNormalizationOperation for provided child node
+ * Returns a DataNormalizationOperation for provided child node.
* If supplied child is added by Augmentation this operation returns
* a DataNormalizationOperation for augmentation,
* otherwise returns a DataNormalizationOperation for child as
* call for {@link #fromDataSchemaNode(DataSchemaNode)}.
* If supplied child is added by Augmentation this operation returns
* a DataNormalizationOperation for augmentation,
* otherwise returns a DataNormalizationOperation for child as
* call for {@link #fromDataSchemaNode(DataSchemaNode)}.
- *
- *
- * @param parent
- * @param parentAug
- * @param child
- * @return
*/
private static DataNormalizationOperation<?> fromAugmentation(final DataNodeContainer parent,
final AugmentationTarget parentAug, final DataSchemaNode child) {
*/
private static DataNormalizationOperation<?> fromAugmentation(final DataNodeContainer parent,
final AugmentationTarget parentAug, final DataSchemaNode child) {
} else if (potential instanceof LeafListSchemaNode) {
return fromLeafListSchemaNode((LeafListSchemaNode) potential);
} else if (potential instanceof AnyXmlSchemaNode) {
} else if (potential instanceof LeafListSchemaNode) {
return fromLeafListSchemaNode((LeafListSchemaNode) potential);
} else if (potential instanceof AnyXmlSchemaNode) {
- return new AnyXmlNormalization( (AnyXmlSchemaNode) potential);
+ return new AnyXmlNormalization((AnyXmlSchemaNode) potential);
}
return null;
}
private static DataNormalizationOperation<?> fromListSchemaNode(final ListSchemaNode potential) {
final List<QName> keyDefinition = potential.getKeyDefinition();
}
return null;
}
private static DataNormalizationOperation<?> fromListSchemaNode(final ListSchemaNode potential) {
final List<QName> keyDefinition = potential.getKeyDefinition();
- if(keyDefinition == null || keyDefinition.isEmpty()) {
+ if (keyDefinition == null || keyDefinition.isEmpty()) {
return new UnkeyedListMixinNormalization(potential);
}
return new UnkeyedListMixinNormalization(potential);
}
- if(potential.isUserOrdered()) {
+ if (potential.isUserOrdered()) {
return new OrderedMapMixinNormalization(potential);
}
return new UnorderedMapMixinNormalization(potential);
}
private static DataNormalizationOperation<?> fromLeafListSchemaNode(final LeafListSchemaNode potential) {
return new OrderedMapMixinNormalization(potential);
}
return new UnorderedMapMixinNormalization(potential);
}
private static DataNormalizationOperation<?> fromLeafListSchemaNode(final LeafListSchemaNode potential) {
- if(potential.isUserOrdered()) {
+ if (potential.isUserOrdered()) {
return new OrderedLeafListMixinNormalization(potential);
}
return new UnorderedLeafListMixinNormalization(potential);
return new OrderedLeafListMixinNormalization(potential);
}
return new UnorderedLeafListMixinNormalization(potential);
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
/**
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
/**
* @deprecated This class provides compatibility between XML semantics
* @deprecated This class provides compatibility between XML semantics
- * and {@link org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree}
+ * and {@link org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree}
*/
@Deprecated
public class DataNormalizer {
*/
@Deprecated
public class DataNormalizer {
return YangInstanceIdentifier.create(normalizedArgs.build());
}
return YangInstanceIdentifier.create(normalizedArgs.build());
}
- public DataNormalizationOperation<?> getOperation(final YangInstanceIdentifier legacy) throws DataNormalizationException {
+ public DataNormalizationOperation<?> getOperation(final YangInstanceIdentifier legacy)
+ throws DataNormalizationException {
DataNormalizationOperation<?> currentOp = operation;
for (PathArgument pathArgument : legacy.getPathArguments()) {
DataNormalizationOperation<?> currentOp = operation;
for (PathArgument pathArgument : legacy.getPathArguments()) {
public DataNormalizationOperation<?> getRootOperation() {
return operation;
}
public DataNormalizationOperation<?> getRootOperation() {
return operation;
}
private final Set<DataSchemaNode> realChildSchemas;
private final Map<QName, DataSchemaNode> mappedChildSchemas;
private final Set<DataSchemaNode> realChildSchemas;
private final Map<QName, DataSchemaNode> mappedChildSchemas;
- public DataSchemaContainerProxy(final Set<DataSchemaNode> realChildSchema) {
+ DataSchemaContainerProxy(final Set<DataSchemaNode> realChildSchema) {
realChildSchemas = realChildSchema;
mappedChildSchemas = new HashMap<>();
realChildSchemas = realChildSchema;
mappedChildSchemas = new HashMap<>();
- for(DataSchemaNode schema : realChildSchemas) {
+ for (DataSchemaNode schema : realChildSchemas) {
mappedChildSchemas.put(schema.getQName(), schema);
}
}
mappedChildSchemas.put(schema.getQName(), schema);
}
}