Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix for bug #236 and bug #240 Have made changes in opendaylight-table-types...
[controller.git]
/
opendaylight
/
md-sal
/
sal-binding-broker
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
config
/
yang
/
md
/
sal
/
binding
/
impl
/
RuntimeMappingModule.java
diff --git
a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java
b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java
index 51efa9e2e5498ef3e1e5e6296ea61fee9fa0646c..583591615c1089fb6741db79e68ab3eef3531bce 100644
(file)
--- a/
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java
+++ b/
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/RuntimeMappingModule.java
@@
-1,14
+1,13
@@
-/**
- * Generated file
-
- * Generated from: yang module name: opendaylight-sal-binding-broker-impl yang module local name: runtime-generated-mapping
- * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
- * Generated at: Wed Nov 20 18:20:19 CET 2013
+/*
+ * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
*
*
- * Do not modify this file unless it is present under src/main directory
+ * 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.controller.config.yang.md.sal.binding.impl;
*/
package org.opendaylight.controller.config.yang.md.sal.binding.impl;
+import java.util.Hashtable;
import java.util.Map.Entry;
import java.util.Set;
import java.util.Map.Entry;
import java.util.Set;
@@
-26,9
+25,11
@@
import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
import org.opendaylight.yangtools.yang.data.impl.codec.BindingIndependentMappingService;
import org.opendaylight.yangtools.yang.data.impl.codec.CodecRegistry;
import org.opendaylight.yangtools.yang.data.impl.codec.DeserializationException;
import org.opendaylight.yangtools.yang.data.impl.codec.BindingIndependentMappingService;
import org.opendaylight.yangtools.yang.data.impl.codec.CodecRegistry;
import org.opendaylight.yangtools.yang.data.impl.codec.DeserializationException;
+import org.opendaylight.yangtools.yang.model.api.SchemaServiceListener;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
+import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
/**
import com.google.common.base.Preconditions;
/**
@@
-64,7
+65,7
@@
public final class RuntimeMappingModule extends
@Override
public java.lang.AutoCloseable createInstance() {
@Override
public java.lang.AutoCloseable createInstance() {
-
+
RuntimeGeneratedMappingServiceProxy potential = tryToReuseGlobalInstance();
if(potential != null) {
return potential;
RuntimeGeneratedMappingServiceProxy potential = tryToReuseGlobalInstance();
if(potential != null) {
return potential;
@@
-72,6
+73,7
@@
public final class RuntimeMappingModule extends
RuntimeGeneratedMappingServiceImpl service = new RuntimeGeneratedMappingServiceImpl();
service.setPool(SingletonHolder.CLASS_POOL);
service.init();
RuntimeGeneratedMappingServiceImpl service = new RuntimeGeneratedMappingServiceImpl();
service.setPool(SingletonHolder.CLASS_POOL);
service.init();
+ bundleContext.registerService(SchemaServiceListener.class, service, new Hashtable<String,String>());
return service;
}
return service;
}
@@
-100,7
+102,7
@@
public final class RuntimeMappingModule extends
BindingIndependentMappingService, //
Delegator<BindingIndependentMappingService>, //
AutoCloseable {
BindingIndependentMappingService, //
Delegator<BindingIndependentMappingService>, //
AutoCloseable {
-
+
private BindingIndependentMappingService delegate;
private ServiceReference<BindingIndependentMappingService> reference;
private BundleContext bundleContext;
private BindingIndependentMappingService delegate;
private ServiceReference<BindingIndependentMappingService> reference;
private BundleContext bundleContext;
@@
-149,7
+151,12
@@
public final class RuntimeMappingModule extends
public DataContainer dataObjectFromDataDom(Class<? extends DataContainer> inputClass, CompositeNode domInput) {
return delegate.dataObjectFromDataDom(inputClass, domInput);
}
public DataContainer dataObjectFromDataDom(Class<? extends DataContainer> inputClass, CompositeNode domInput) {
return delegate.dataObjectFromDataDom(inputClass, domInput);
}
-
+
+ @Override
+ public Optional<Class<? extends RpcService>> getRpcServiceClassFor(String namespace, String revision) {
+ return delegate.getRpcServiceClassFor(namespace, revision);
+ }
+
@Override
public void close() throws Exception {
if(delegate != null) {
@Override
public void close() throws Exception {
if(delegate != null) {