import java.util.HashSet;
import java.util.Set;
+import javax.annotation.Nullable;
+
import org.opendaylight.controller.sal.core.api.BrokerService;
import org.opendaylight.yangtools.concepts.Registration;
import org.osgi.framework.ServiceReference;
private T delegate;
private final ServiceReference<T> reference;
- public AbstractBrokerServiceProxy(final ServiceReference<T> ref, final T delegate) {
+ public AbstractBrokerServiceProxy(final @Nullable ServiceReference<T> ref, final T delegate) {
this.delegate = checkNotNull(delegate, "Delegate should not be null.");
- this.reference = checkNotNull(ref, "Reference should not be null.");
+ this.reference = ref;
}
protected final T getDelegate() {
return reference;
}
- private final Set<Registration<?>> registrations = Collections.synchronizedSet(new HashSet<Registration<?>>());
+ private final Set<Registration> registrations = Collections.synchronizedSet(new HashSet<Registration>());
- protected <R extends Registration<?>> R addRegistration(final R registration) {
+ protected <R extends Registration> R addRegistration(final R registration) {
if (registration != null) {
registrations.add(registration);
}
RuntimeException potentialException = new RuntimeException(
"Uncaught exceptions occured during unregistration");
boolean hasSuppressed = false;
- for (Registration<?> registration : registrations) {
+ for (Registration registration : registrations) {
try {
registration.close();
} catch (Exception e) {