Use local variable type inference.
Change-Id: I0b2bb0de72ab207ed01060cf3d6c76dbf5e450bd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit
1aa58ce7aca9f9e65e0fa3b5d9101af9945e38a5)
import static java.util.Objects.requireNonNull;
import com.google.common.annotations.Beta;
import static java.util.Objects.requireNonNull;
import com.google.common.annotations.Beta;
-import java.util.Map.Entry;
import javax.xml.XMLConstants;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import javax.xml.XMLConstants;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
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;
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.codec.InstanceIdentifierCodec;
import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
import org.opendaylight.yangtools.yang.model.util.LeafrefResolver;
import org.opendaylight.yangtools.yang.data.api.codec.InstanceIdentifierCodec;
import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
import org.opendaylight.yangtools.yang.model.util.LeafrefResolver;
final StringBuilder sb = new StringBuilder();
DataSchemaContextNode<?> current = getDataContextTree().getRoot();
QNameModule lastModule = null;
final StringBuilder sb = new StringBuilder();
DataSchemaContextNode<?> current = getDataContextTree().getRoot();
QNameModule lastModule = null;
- for (PathArgument arg : data.getPathArguments()) {
+ for (var arg : data.getPathArguments()) {
current = current.getChild(arg);
checkArgument(current != null, "Invalid input %s: schema for argument %s (after %s) not found", data, arg,
sb);
current = current.getChild(arg);
checkArgument(current != null, "Invalid input %s: schema for argument %s (after %s) not found", data, arg,
sb);
- final QName qname = arg.getNodeType();
+ final var qname = arg.getNodeType();
sb.append('/');
appendQName(sb, qname, lastModule);
lastModule = qname.getModule();
if (arg instanceof NodeIdentifierWithPredicates) {
sb.append('/');
appendQName(sb, qname, lastModule);
lastModule = qname.getModule();
if (arg instanceof NodeIdentifierWithPredicates) {
- for (Entry<QName, Object> entry : ((NodeIdentifierWithPredicates) arg).entrySet()) {
+ for (var entry : ((NodeIdentifierWithPredicates) arg).entrySet()) {
appendQName(sb.append('['), entry.getKey(), lastModule);
sb.append("='").append(String.valueOf(entry.getValue())).append("']");
}
appendQName(sb.append('['), entry.getKey(), lastModule);
sb.append("='").append(String.valueOf(entry.getValue())).append("']");
}
@Override
protected final YangInstanceIdentifier deserializeImpl(final String data) {
@Override
protected final YangInstanceIdentifier deserializeImpl(final String data) {
- XpathStringParsingPathArgumentBuilder builder = new XpathStringParsingPathArgumentBuilder(this,
- requireNonNull(data));
- return YangInstanceIdentifier.create(builder.build());
+ return YangInstanceIdentifier.create(
+ new XpathStringParsingPathArgumentBuilder(this, requireNonNull(data)).build());