*/
package org.opendaylight.mdsal.binding.dom.adapter.test.util;
+import com.google.common.collect.ClassToInstanceMap;
+import com.google.common.collect.ImmutableClassToInstanceMap;
import org.opendaylight.mdsal.dom.api.DOMSchemaService;
+import org.opendaylight.mdsal.dom.api.DOMSchemaServiceExtension;
import org.opendaylight.yangtools.concepts.ListenerRegistration;
import org.opendaylight.yangtools.util.ListenerRegistry;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
return schemaContext;
}
+ @Override
+ public ClassToInstanceMap<DOMSchemaServiceExtension> getExtensions() {
+ return ImmutableClassToInstanceMap.of();
+ }
+
public synchronized void changeSchema(final SchemaContext newContext) {
schemaContext = newContext;
for (ListenerRegistration<SchemaContextListener> listener : listeners) {
public BindingDOMDataBrokerAdapter(final DOMDataBroker domDataBroker, final BindingToNormalizedNodeCodec codec) {
super(domDataBroker, codec);
+ // FIXME: this is an invalid lookup
final DOMDataTreeService domTreeChange =
- (DOMDataTreeService) domDataBroker.getSupportedExtensions().get(DOMDataTreeService.class);
+ (DOMDataTreeService) domDataBroker.getExtensions().get(DOMDataTreeService.class);
if (domTreeChange != null) {
treeService = BindingDOMDataTreeServiceAdapter.create(domTreeChange, codec);
} else {
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.doReturn;
import static org.mockito.MockitoAnnotations.initMocks;
+import com.google.common.collect.ImmutableClassToInstanceMap;
import javax.annotation.Nullable;
import org.junit.Before;
import org.junit.Test;
@Before
public void setUp() throws Exception {
initMocks(this);
+ doReturn(ImmutableClassToInstanceMap.of()).when(domService).getExtensions();
+
bindingDOMAdapterLoader = new BindingDOMAdapterLoader(
new BindingToNormalizedNodeCodec((GeneratedClassLoadingStrategy)
GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(), mockCodecRegistry)) {
package org.opendaylight.mdsal.binding.javav2.dom.adapter.test;
import com.google.common.annotations.Beta;
+import com.google.common.collect.ClassToInstanceMap;
+import com.google.common.collect.ImmutableClassToInstanceMap;
import org.opendaylight.mdsal.dom.api.DOMSchemaService;
+import org.opendaylight.mdsal.dom.api.DOMSchemaServiceExtension;
import org.opendaylight.yangtools.concepts.ListenerRegistration;
import org.opendaylight.yangtools.util.ListenerRegistry;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
return schemaContext;
}
+ @Override
+ public ClassToInstanceMap<DOMSchemaServiceExtension> getExtensions() {
+ return ImmutableClassToInstanceMap.of();
+ }
+
public synchronized void changeSchema(final SchemaContext newContext) {
schemaContext = newContext;
for (final ListenerRegistration<SchemaContextListener> listener : listeners) {
import static org.mockito.Mockito.verify;
import static org.mockito.MockitoAnnotations.initMocks;
+import com.google.common.collect.ImmutableClassToInstanceMap;
import javax.annotation.Nullable;
import org.junit.Before;
import org.junit.Test;
public void setUp() throws Exception {
initMocks(this);
doReturn(transactionChain).when(domService).createTransactionChain(any());
+ doReturn(ImmutableClassToInstanceMap.of()).when(domService).getExtensions();
BindingDOMAdapterLoader bindingDOMAdapterLoader = new BindingDOMAdapterLoader(
new BindingToNormalizedNodeCodec((GeneratedClassLoadingStrategy)
GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(), mockCodecRegistry)) {
import com.google.common.annotations.Beta;
import com.google.common.collect.ClassToInstanceMap;
-import com.google.common.collect.ImmutableClassToInstanceMap;
-import java.util.Map;
import org.eclipse.jdt.annotation.NonNull;
/**
* which provide access to the specific functionality bound to this service.
*
* @return A map of supported functionality.
- * @deprecated Use {@link #getExtensions()} instead.
*/
- @Deprecated
- @NonNull Map<Class<? extends E>, E> getSupportedExtensions();
-
- /**
- * Return a map of currently-supported extensions, along with accessor services
- * which provide access to the specific functionality bound to this service.
- *
- * @return A map of supported functionality.
- */
- default @NonNull ClassToInstanceMap<E> getExtensions() {
- return ImmutableClassToInstanceMap.copyOf(getSupportedExtensions());
- }
+ @NonNull ClassToInstanceMap<E> getExtensions();
}
*/
package org.opendaylight.mdsal.dom.api;
-import com.google.common.collect.ImmutableClassToInstanceMap;
-import java.util.Map;
import org.opendaylight.yangtools.concepts.ListenerRegistration;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.opendaylight.yangtools.yang.model.api.SchemaContextListener;
* @return Listener registration handle
*/
ListenerRegistration<SchemaContextListener> registerSchemaContextListener(SchemaContextListener listener);
-
- @Override
- @Deprecated
- default Map<Class<? extends DOMSchemaServiceExtension>, DOMSchemaServiceExtension> getSupportedExtensions() {
- return ImmutableClassToInstanceMap.of();
- }
}
return "DOM-" + txNum.getAndIncrement();
}
- @Override
- @Deprecated
- public Map<Class<? extends DOMDataBrokerExtension>, DOMDataBrokerExtension> getSupportedExtensions() {
- return extensions;
- }
-
@Override
public ClassToInstanceMap<DOMDataBrokerExtension> getExtensions() {
return extensions;
* 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.mdsal.dom.broker;
import com.google.common.collect.ClassToInstanceMap;
import com.google.common.collect.ImmutableClassToInstanceMap;
-import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
import org.opendaylight.mdsal.common.api.TransactionChainListener;
import org.opendaylight.mdsal.dom.api.DOMDataBroker;
this.service = service;
}
- @Override
- @Deprecated
- public Map<Class<? extends DOMDataBrokerExtension>, DOMDataBrokerExtension> getSupportedExtensions() {
- return ImmutableClassToInstanceMap.of();
- }
-
@Override
public ClassToInstanceMap<DOMDataBrokerExtension> getExtensions() {
return ImmutableClassToInstanceMap.of();
}
}
- @Override
- @Deprecated
- public Map<Class<? extends DOMDataTreeServiceExtension>, DOMDataTreeServiceExtension> getSupportedExtensions() {
- return ImmutableClassToInstanceMap.of();
- }
-
@Override
public ClassToInstanceMap<DOMDataTreeServiceExtension> getExtensions() {
return ImmutableClassToInstanceMap.of();
return delegateTreeService.registerListener(listener, subtrees, allowRxMerges, producers);
}
- @Override
- @Deprecated
- public Map<Class<? extends DOMDataTreeServiceExtension>, DOMDataTreeServiceExtension> getSupportedExtensions() {
- return delegateTreeService.getSupportedExtensions();
- }
-
@Override
public ClassToInstanceMap<DOMDataTreeServiceExtension> getExtensions() {
return delegateTreeService.getExtensions();
@Override
public <L extends DOMDataTreeChangeListener> ListenerRegistration<L> registerDataTreeChangeListener(
final DOMDataTreeIdentifier treeId, final L listener) {
- final DOMDataTreeChangeService treeService = (DOMDataTreeChangeService) delegate.getSupportedExtensions()
- .get(DOMDataTreeChangeService.class);
+ final DOMDataTreeChangeService treeService = delegate.getExtensions()
+ .getInstance(DOMDataTreeChangeService.class);
if (treeService != null) {
return treeService.registerDataTreeChangeListener(treeId, listener);
}
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ClassToInstanceMap;
import com.google.common.collect.ImmutableClassToInstanceMap;
-import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import com.google.common.util.concurrent.ListenableFuture;
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
import java.util.Optional;
import javax.annotation.concurrent.GuardedBy;
import org.opendaylight.mdsal.dom.api.DOMSchemaService;
return ImmutableClassToInstanceMap.of(DOMYangTextSourceProvider.class, this);
}
- @Override
- @Deprecated
- public Map<Class<? extends DOMSchemaServiceExtension>, DOMSchemaServiceExtension> getSupportedExtensions() {
- return ImmutableMap.of(DOMYangTextSourceProvider.class, this);
- }
-
@Override
public void close() {
synchronized (lock) {
}
private static class TestTreeService implements DOMDataTreeService {
-
- @Override
- @Deprecated
- public Map<Class<? extends DOMDataTreeServiceExtension>, DOMDataTreeServiceExtension> getSupportedExtensions() {
- return ImmutableClassToInstanceMap.of();
- }
-
@Override
public ClassToInstanceMap<DOMDataTreeServiceExtension> getExtensions() {
return ImmutableClassToInstanceMap.of();
import com.google.common.collect.ClassToInstanceMap;
import com.google.common.collect.ForwardingObject;
-import java.util.Map;
import javax.annotation.Nonnull;
import org.opendaylight.mdsal.common.api.TransactionChainListener;
import org.opendaylight.mdsal.dom.api.DOMDataBroker;
return delegate().createTransactionChain(listener);
}
- @Override
- @Deprecated
- public Map<Class<? extends DOMDataBrokerExtension>, DOMDataBrokerExtension> getSupportedExtensions() {
- return delegate().getSupportedExtensions();
- }
-
@Override
public ClassToInstanceMap<DOMDataBrokerExtension> getExtensions() {
return delegate().getExtensions();
this.getExtensions();
verify(domDataBroker).getExtensions();
- doReturn(ImmutableClassToInstanceMap.of()).when(domDataBroker).getSupportedExtensions();
- this.getSupportedExtensions();
- verify(domDataBroker).getSupportedExtensions();
-
doReturn(null).when(domDataBroker).newReadOnlyTransaction();
this.newReadOnlyTransaction();
verify(domDataBroker).newReadOnlyTransaction();