Refactor our implementation classes, so that we lower their footprint.
Since we are in the area, also update argument parser so that it reports
illegal names through SourceException.
Change-Id: I88c154cac3b6397434356304ba5af09aee984246
JIRA: YANGTOOLS-1065
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
import com.google.common.annotations.Beta;
import java.net.URI;
+import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
@Beta
public interface NamespaceEffectiveStatement extends EffectiveStatement<URI, NamespaceStatement> {
-
+ @Override
+ default StatementDefinition statementDefinition() {
+ return YangStmtMapping.NAMESPACE;
+ }
}
import java.net.URI;
import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
+import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
public interface NamespaceStatement extends DeclaredStatement<URI> {
+ @Override
+ default StatementDefinition statementDefinition() {
+ return YangStmtMapping.NAMESPACE;
+ }
+
default @NonNull URI getUri() {
// FIXME: YANGTOOLS-908: verifyNotNull() should not be needed here
return verifyNotNull(argument());
import java.net.URI;
import org.opendaylight.yangtools.yang.model.api.stmt.NamespaceEffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.NamespaceStatement;
-import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.DeclaredEffectiveStatementBase;
-import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredEffectiveStatement.DefaultArgument;
-final class NamespaceEffectiveStatementImpl extends DeclaredEffectiveStatementBase<URI, NamespaceStatement>
+final class EmptyNamespaceEffectiveStatement extends DefaultArgument<URI, NamespaceStatement>
implements NamespaceEffectiveStatement {
- NamespaceEffectiveStatementImpl(final StmtContext<URI, NamespaceStatement, ?> ctx) {
- super(ctx);
+ EmptyNamespaceEffectiveStatement(final NamespaceStatement declared) {
+ super(declared);
}
}
import java.net.URI;
import org.opendaylight.yangtools.yang.model.api.stmt.NamespaceStatement;
-import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement;
-import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.ArgumentToString;
-final class NamespaceStatementImpl extends AbstractDeclaredStatement<URI> implements NamespaceStatement {
- NamespaceStatementImpl(final StmtContext<URI, NamespaceStatement,?> context) {
- super(context);
+final class EmptyNamespaceStatement extends ArgumentToString<URI> implements NamespaceStatement {
+ EmptyNamespaceStatement(final URI argument) {
+ super(argument);
}
}
*/
package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.namespace;
+import com.google.common.collect.ImmutableList;
import java.net.URI;
+import java.net.URISyntaxException;
+import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
+import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
+import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.NamespaceEffectiveStatement;
import org.opendaylight.yangtools.yang.model.api.stmt.NamespaceStatement;
-import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.BaseStatementSupport;
import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
+import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
public final class NamespaceStatementSupport
- extends AbstractStatementSupport<URI, NamespaceStatement, NamespaceEffectiveStatement> {
+ extends BaseStatementSupport<URI, NamespaceStatement, NamespaceEffectiveStatement> {
private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(YangStmtMapping
.NAMESPACE)
.build();
@Override
public URI parseArgumentValue(final StmtContext<?, ?,?> ctx, final String value) {
- return URI.create(value);
+ try {
+ return new URI(value);
+ } catch (URISyntaxException e) {
+ throw new SourceException(ctx.getStatementSourceReference(), e, "Invalid namespace \"%s\"", value);
+ }
}
@Override
- public NamespaceStatement createDeclared(final StmtContext<URI, NamespaceStatement,?> ctx) {
- return new NamespaceStatementImpl(ctx);
+ protected SubstatementValidator getSubstatementValidator() {
+ return SUBSTATEMENT_VALIDATOR;
}
@Override
- public NamespaceEffectiveStatement createEffective(
- final StmtContext<URI, NamespaceStatement, NamespaceEffectiveStatement> ctx) {
- return new NamespaceEffectiveStatementImpl(ctx);
+ protected NamespaceStatement createDeclared(@NonNull final StmtContext<URI, NamespaceStatement, ?> ctx,
+ final ImmutableList<? extends DeclaredStatement<?>> substatements) {
+ return new RegularNamespaceStatement(ctx.coerceStatementArgument(), substatements);
}
@Override
- protected SubstatementValidator getSubstatementValidator() {
- return SUBSTATEMENT_VALIDATOR;
+ protected NamespaceStatement createEmptyDeclared(final StmtContext<URI, NamespaceStatement, ?> ctx) {
+ return new EmptyNamespaceStatement(ctx.coerceStatementArgument());
+ }
+
+ @Override
+ protected NamespaceEffectiveStatement createEffective(
+ final StmtContext<URI, NamespaceStatement, NamespaceEffectiveStatement> ctx,
+ final NamespaceStatement declared, final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+ return new RegularNamespaceEffectiveStatement(declared, substatements);
+ }
+
+ @Override
+ protected NamespaceEffectiveStatement createEmptyEffective(
+ final StmtContext<URI, NamespaceStatement, NamespaceEffectiveStatement> ctx,
+ final NamespaceStatement declared) {
+ return new EmptyNamespaceEffectiveStatement(declared);
}
}
\ No newline at end of file
--- /dev/null
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * 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.yangtools.yang.parser.rfc7950.stmt.namespace;
+
+import com.google.common.collect.ImmutableList;
+import java.net.URI;
+import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.NamespaceEffectiveStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.NamespaceStatement;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredEffectiveStatement.DefaultArgument.WithSubstatements;
+
+final class RegularNamespaceEffectiveStatement extends WithSubstatements<URI, NamespaceStatement>
+ implements NamespaceEffectiveStatement {
+ RegularNamespaceEffectiveStatement(final NamespaceStatement declared,
+ final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+ super(declared, substatements);
+ }
+}
--- /dev/null
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * 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.yangtools.yang.parser.rfc7950.stmt.namespace;
+
+import com.google.common.collect.ImmutableList;
+import java.net.URI;
+import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.NamespaceStatement;
+import org.opendaylight.yangtools.yang.parser.rfc7950.stmt.AbstractDeclaredStatement.ArgumentToString.WithSubstatements;
+
+final class RegularNamespaceStatement extends WithSubstatements<URI> implements NamespaceStatement {
+ RegularNamespaceStatement(final URI argument,
+ final ImmutableList<? extends DeclaredStatement<?>> substatements) {
+ super(argument, substatements);
+ }
+}