import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
import java.util.Set;
-import javassist.ClassPool;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.MountPointService;
import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
import org.opendaylight.controller.sal.binding.impl.RootBindingAwareBroker;
import org.opendaylight.controller.sal.core.spi.data.DOMStore;
-import org.opendaylight.mdsal.binding.dom.codec.gen.impl.DataObjectSerializerGenerator;
-import org.opendaylight.mdsal.binding.dom.codec.gen.impl.StreamWriterGenerator;
import org.opendaylight.mdsal.binding.dom.codec.impl.BindingNormalizedNodeCodecRegistry;
import org.opendaylight.mdsal.binding.generator.impl.GeneratedClassLoadingStrategy;
import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext;
-import org.opendaylight.mdsal.binding.generator.util.JavassistUtils;
+import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections;
import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
-import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
@Beta
private final ListeningExecutorService executor;
- private final ClassPool classPool;
private final boolean startWithSchema;
return this.codec;
}
- protected BindingTestContext(final ListeningExecutorService executor, final ClassPool classPool,
- final boolean startWithSchema) {
+
+ protected BindingTestContext(final ListeningExecutorService executor, final boolean startWithSchema) {
this.executor = executor;
- this.classPool = classPool;
this.startWithSchema = startWithSchema;
}
}
public void startBindingToDomMappingService() {
- checkState(this.classPool != null, "ClassPool needs to be present");
-
- final DataObjectSerializerGenerator generator = StreamWriterGenerator.create(
- JavassistUtils.forClassPool(this.classPool));
- final BindingNormalizedNodeCodecRegistry codecRegistry = new BindingNormalizedNodeCodecRegistry(generator);
+ final BindingNormalizedNodeCodecRegistry codecRegistry = new BindingNormalizedNodeCodecRegistry();
final GeneratedClassLoadingStrategy loading = GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy();
this.codec = new BindingToNormalizedNodeCodec(loading, codecRegistry);
this.mockSchemaService.registerSchemaContextListener(this.codec);
this.mockSchemaService.changeSchema(getContext(moduleInfos));
}
- private SchemaContext getContext(final Set<YangModuleInfo> moduleInfos) {
+ private static SchemaContext getContext(final Set<YangModuleInfo> moduleInfos) {
final ModuleInfoBackedContext ctx = ModuleInfoBackedContext.create();
ctx.addModuleInfos(moduleInfos);
return ctx.tryToCreateSchemaContext().get();
checkState(this.executor != null);
delegateDomRouter = org.opendaylight.mdsal.dom.broker.DOMRpcRouter.newInstance(mockSchemaService);
- this.domRouter = new DOMRpcRouter(delegateDomRouter, delegateDomRouter);
+ this.domRouter = new DOMRpcRouter(delegateDomRouter.getRpcService(), delegateDomRouter.getRpcProviderService());
}
public void startBindingNotificationBroker() {
}
@Override
- public void close() throws Exception {
+ public void close() {
}