package org.opendaylight.mdsal.binding.testutils;
import com.google.common.annotations.Beta;
+import com.google.common.base.Throwables;
+import java.util.function.Supplier;
import org.opendaylight.mdsal.binding.api.DataBroker;
import org.opendaylight.mdsal.binding.dom.adapter.CurrentAdapterSerializer;
import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractConcurrentDataBrokerTest;
import org.opendaylight.mdsal.dom.api.DOMDataBroker;
import org.opendaylight.mdsal.dom.api.DOMSchemaService;
import org.opendaylight.mdsal.dom.broker.DOMNotificationRouter;
-import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
@Beta
public class DataBrokerTestModule {
}
// Suppress IllegalCatch because of AbstractDataBrokerTest (change later)
- @SuppressWarnings({ "checkstyle:IllegalCatch", "checkstyle:IllegalThrows" })
- public DataBroker getDataBroker() throws RuntimeException {
+ @SuppressWarnings("checkstyle:IllegalCatch")
+ public DataBroker getDataBroker() {
try {
// This is a little bit "upside down" - in the future,
// we should probably put what is in AbstractDataBrokerTest
dataBrokerTest.setup();
return dataBrokerTest.getDataBroker();
} catch (Exception e) {
- throw new RuntimeException(e);
+ Throwables.throwIfUnchecked(e);
+ throw new IllegalStateException(e);
}
}
return dataBrokerTest.getDataBrokerTestCustomizer().getSchemaService();
}
- public SchemaContextProvider getSchemaContextProvider() {
+ public Supplier<EffectiveModelContext> getModelContextSupplier() {
return dataBrokerTest.getDataBrokerTestCustomizer().getSchemaService()::getGlobalContext;
}
}