Code Review
/
yangtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Make ParserNamespace an identifier
[yangtools.git]
/
parser
/
yang-parser-reactor
/
src
/
main
/
java
/
org
/
opendaylight
/
yangtools
/
yang
/
parser
/
stmt
/
reactor
/
ReactorStmtCtx.java
diff --git
a/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java
b/parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java
index dd89e878f2f6a577aa1d1a4aaf3e7afee6075dfe..724bbf486fc7c71b1fd36fa2a6d4fd72f5c74276 100644
(file)
--- a/
parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java
+++ b/
parser/yang-parser-reactor/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/ReactorStmtCtx.java
@@
-48,7
+48,7
@@
import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable;
import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils;
import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable;
import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils;
import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
-import org.opendaylight.yangtools.yang.parser.spi.source.S
upportedFeaturesNamespace
;
+import org.opendaylight.yangtools.yang.parser.spi.source.S
ourceParserNamespaces
;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@
-236,8
+236,8
@@
abstract class ReactorStmtCtx<A, D extends DeclaredStatement<A>, E extends Effec
@Override
public final QName moduleName() {
@Override
public final QName moduleName() {
- final
RootStatementContext<?, ?, ?>
root = getRoot();
- return QName.create(StmtContextUtils.get
Root
ModuleQName(root), root.getRawArgument());
+ final
var
root = getRoot();
+ return QName.create(StmtContextUtils.getModuleQName(root), root.getRawArgument());
}
//
}
//
@@
-321,24
+321,23
@@
abstract class ReactorStmtCtx<A, D extends DeclaredStatement<A>, E extends Effec
//
@Override
//
@Override
- public final <K, V, T extends K, N extends ParserNamespace<K, V>> V namespaceItem(final
Class<@NonNull N>
type,
+ public final <K, V, T extends K, N extends ParserNamespace<K, V>> V namespaceItem(final
@NonNull N
type,
final T key) {
return getBehaviourRegistry().getNamespaceBehaviour(type).getFrom(this, key);
}
@Override
final T key) {
return getBehaviourRegistry().getNamespaceBehaviour(type).getFrom(this, key);
}
@Override
- public final <K, V, N extends ParserNamespace<K, V>> Map<K, V> namespace(final
Class<@NonNull N>
type) {
+ public final <K, V, N extends ParserNamespace<K, V>> Map<K, V> namespace(final
@NonNull N
type) {
return getNamespace(type);
}
@Override
return getNamespace(type);
}
@Override
- public final <K, V, N extends ParserNamespace<K, V>>
- Map<K, V> localNamespacePortion(final Class<@NonNull N> type) {
+ public final <K, V, N extends ParserNamespace<K, V>> Map<K, V> localNamespacePortion(final @NonNull N type) {
return getLocalNamespace(type);
}
@Override
return getLocalNamespace(type);
}
@Override
- protected <K, V, N extends ParserNamespace<K, V>> void onNamespaceElementAdded(final
Class<N>
type, final K key,
+ protected <K, V, N extends ParserNamespace<K, V>> void onNamespaceElementAdded(final
N
type, final K key,
final V value) {
// definition().onNamespaceElementAdded(this, type, key, value);
}
final V value) {
// definition().onNamespaceElementAdded(this, type, key, value);
}
@@
-495,7
+494,8
@@
abstract class ReactorStmtCtx<A, D extends DeclaredStatement<A>, E extends Effec
*/
if (isParentSupportedByFeatures()) {
// If the set of supported features has not been provided, all features are supported by default.
*/
if (isParentSupportedByFeatures()) {
// If the set of supported features has not been provided, all features are supported by default.
- final Set<QName> supportedFeatures = getFromNamespace(SupportedFeaturesNamespace.class, Empty.value());
+ final Set<QName> supportedFeatures = getFromNamespace(SourceParserNamespaces.SUPPORTED_FEATURES,
+ Empty.value());
if (supportedFeatures == null || StmtContextUtils.checkFeatureSupport(this, supportedFeatures)) {
flags |= SET_SUPPORTED_BY_FEATURES;
return true;
if (supportedFeatures == null || StmtContextUtils.checkFeatureSupport(this, supportedFeatures)) {
flags |= SET_SUPPORTED_BY_FEATURES;
return true;