Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Migrate OSGI compendium reference
[controller.git]
/
opendaylight
/
md-sal
/
sal-binding-broker
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
md
/
sal
/
binding
/
spi
/
AdapterLoader.java
diff --git
a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/spi/AdapterLoader.java
b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/spi/AdapterLoader.java
index aea59078b03456a21feb684e6bac6c24b98de4a2..f3fac3c9fe81fcb6abbadd15762a8f61016ebc34 100644
(file)
--- a/
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/spi/AdapterLoader.java
+++ b/
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/spi/AdapterLoader.java
@@
-9,19
+9,22
@@
package org.opendaylight.controller.md.sal.binding.spi;
import com.google.common.base.Optional;
import com.google.common.cache.CacheLoader;
import com.google.common.base.Optional;
import com.google.common.cache.CacheLoader;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.gaul.modernizer_maven_annotations.SuppressModernizer;
+@Deprecated(forRemoval = true)
public abstract class AdapterLoader<T, D> extends CacheLoader<Class<? extends T>, Optional<T>> {
@Override
public abstract class AdapterLoader<T, D> extends CacheLoader<Class<? extends T>, Optional<T>> {
@Override
+ @SuppressModernizer
public Optional<T> load(final Class<? extends T> key) {
final AdapterBuilder<? extends T, D> builder = createBuilder(key);
public Optional<T> load(final Class<? extends T> key) {
final AdapterBuilder<? extends T, D> builder = createBuilder(key);
- for(final Class<? extends D> reqDeleg : builder.getRequiredDelegates()) {
+ for
(final Class<? extends D> reqDeleg : builder.getRequiredDelegates()) {
final D deleg = getDelegate(reqDeleg);
final D deleg = getDelegate(reqDeleg);
- if(deleg != null) {
- builder.addDelegate(reqDeleg,deleg);
+ if
(deleg != null) {
+ builder.addDelegate(reqDeleg,
deleg);
} else {
return Optional.absent();
}
} else {
return Optional.absent();
}
@@
-31,6
+34,5
@@
public abstract class AdapterLoader<T, D> extends CacheLoader<Class<? extends T>
protected abstract @Nullable D getDelegate(Class<? extends D> reqDeleg);
protected abstract @Nullable D getDelegate(Class<? extends D> reqDeleg);
- protected abstract @Nonnull AdapterBuilder<? extends T, D> createBuilder(Class<? extends T> key) throws IllegalArgumentException;
-
+ protected abstract @NonNull AdapterBuilder<? extends T, D> createBuilder(Class<? extends T> key);
}
}