*/
package org.opendaylight.restconf.nb.rfc8040.handlers;
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
import com.google.common.base.Throwables;
import java.util.Collection;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicInteger;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import org.apache.aries.blueprint.annotation.service.Reference;
import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.mdsal.common.api.TransactionCommitFailedException;
import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
import org.opendaylight.mdsal.dom.api.DOMSchemaService;
+import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
import org.opendaylight.restconf.common.errors.RestconfDocumentedException;
import org.opendaylight.restconf.nb.rfc8040.Rfc8040.IetfYangLibrary;
-import org.opendaylight.restconf.nb.rfc8040.Rfc8040.MonitoringModule;
import org.opendaylight.restconf.nb.rfc8040.utils.mapping.RestconfMappingNodeUtil;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.restconf.monitoring.rev170126.RestconfState;
import org.opendaylight.yangtools.concepts.ListenerRegistration;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.api.schema.tree.ConflictingModificationAppliedException;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextListener;
import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.model.api.SchemaContextListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Implementation of {@link SchemaContextHandler}.
- *
*/
-@SuppressWarnings("checkstyle:FinalClass")
-public class SchemaContextHandler implements SchemaContextListenerHandler, AutoCloseable {
-
+// FIXME: this really is a service which is maintaining ietf-yang-library contents inside the datastore. It really
+// should live in MD-SAL and be a dynamic store fragment. As a first step we should be turning this into a
+// completely standalone application.
+@Singleton
+public class SchemaContextHandler implements EffectiveModelContextListener, AutoCloseable {
private static final Logger LOG = LoggerFactory.getLogger(SchemaContextHandler.class);
private final AtomicInteger moduleSetId = new AtomicInteger(0);
private final TransactionChainHandler transactionChainHandler;
private final DOMSchemaService domSchemaService;
- private ListenerRegistration<SchemaContextListener> listenerRegistration;
+ private ListenerRegistration<?> listenerRegistration;
- private volatile SchemaContext schemaContext;
+ private volatile EffectiveModelContext schemaContext;
/**
* Constructor.
*
* @param transactionChainHandler Transaction chain handler
*/
- private SchemaContextHandler(final TransactionChainHandler transactionChainHandler,
- final DOMSchemaService domSchemaService) {
+ @Inject
+ public SchemaContextHandler(final TransactionChainHandler transactionChainHandler,
+ final @Reference DOMSchemaService domSchemaService) {
this.transactionChainHandler = transactionChainHandler;
this.domSchemaService = domSchemaService;
}
- public static SchemaContextHandler newInstance(final TransactionChainHandler transactionChainHandler,
- final DOMSchemaService domSchemaService) {
- return new SchemaContextHandler(transactionChainHandler, domSchemaService);
- }
-
+ @PostConstruct
public void init() {
listenerRegistration = domSchemaService.registerSchemaContextListener(this);
}
@Override
+ @PreDestroy
public void close() {
if (listenerRegistration != null) {
listenerRegistration.close();
}
@Override
- @SuppressWarnings("checkstyle:hiddenField")
- public void onGlobalContextUpdated(final SchemaContext context) {
- Preconditions.checkNotNull(context);
- schemaContext = context;
+ public void onModelContextUpdated(final EffectiveModelContext context) {
+ schemaContext = requireNonNull(context);
- final Module ietfYangLibraryModule =
- context.findModule(IetfYangLibrary.MODULE_QNAME).orElse(null);
- if (ietfYangLibraryModule != null) {
- NormalizedNode<NodeIdentifier, Collection<DataContainerChild<? extends PathArgument, ?>>> normNode =
- RestconfMappingNodeUtil.mapModulesByIetfYangLibraryYang(context.getModules(), ietfYangLibraryModule,
- context, String.valueOf(this.moduleSetId.incrementAndGet()));
- putData(normNode);
+ if (context.findModule(IetfYangLibrary.MODULE_QNAME).isPresent()) {
+ putData(RestconfMappingNodeUtil.mapModulesByIetfYangLibraryYang(context.getModules(), context,
+ String.valueOf(this.moduleSetId.incrementAndGet())));
}
- final Module monitoringModule =
- schemaContext.findModule(MonitoringModule.MODULE_QNAME).orElse(null);
+ final Module monitoringModule = schemaContext.findModule(RestconfState.QNAME.getModule()).orElse(null);
if (monitoringModule != null) {
- NormalizedNode<NodeIdentifier, Collection<DataContainerChild<? extends PathArgument, ?>>> normNode =
- RestconfMappingNodeUtil.mapCapabilites(monitoringModule);
- putData(normNode);
+ putData(RestconfMappingNodeUtil.mapCapabilites(monitoringModule));
}
}
- @Override
- public SchemaContext get() {
+ public EffectiveModelContext get() {
return schemaContext;
}
private void putData(
final NormalizedNode<NodeIdentifier, Collection<DataContainerChild<? extends PathArgument, ?>>> normNode) {
- final DOMDataTreeWriteTransaction wTx = this.transactionChainHandler.get().newWriteOnlyTransaction();
+ final DOMTransactionChain transactionChain = this.transactionChainHandler.get();
+ final DOMDataTreeWriteTransaction wTx = transactionChain.newWriteOnlyTransaction();
wTx.put(LogicalDatastoreType.OPERATIONAL,
YangInstanceIdentifier.create(NodeIdentifier.create(normNode.getNodeType())), normNode);
try {
* This is workaround for bug https://bugs.opendaylight.org/show_bug.cgi?id=7728
*/
LOG.warn("Ignoring that another cluster node is already putting the same data to DS.", e);
- this.transactionChainHandler.reset();
} else {
throw new RestconfDocumentedException("Problem occurred while putting data to DS.", failure);
}
+ } finally {
+ transactionChain.close();
}
}
}
Code Review / netconf.git / blobdiff