X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-common-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fcommon%2Fimpl%2Frouting%2FAbstractDataReadRouter.java;h=9e6147359db58cc1ff60e9100feca555f3061333;hb=a35fe9ae149bd4c7089d48665ccc8bff580bce53;hp=f83c61f8049205977e998c61295072fe84176624;hpb=6668a20ff21282576d2d408d9b1ce4cf9ba0c9ac;p=controller.git diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/AbstractDataReadRouter.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/AbstractDataReadRouter.java index f83c61f804..9e6147359d 100644 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/AbstractDataReadRouter.java +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/routing/AbstractDataReadRouter.java @@ -20,7 +20,7 @@ import com.google.common.collect.Multimap; * @param
* @param , D> implements DataReader {
+public abstract class AbstractDataReadRouter , D> implements DataReader {
Multimap > configReaders = HashMultimap.create();
Multimap > operationalReaders = HashMultimap.create();
@@ -35,7 +35,7 @@ public abstract class AbstractDataReadRouter , D> implements Da
@Override
public D readOperationalData(P path) {
FluentIterable , D> implements Da
return new Function input) {
- return input.readConfigurationData(path);
+ return input.readOperationalData(path);
}
};
}
@@ -139,14 +139,15 @@ public abstract class AbstractDataReadRouter , D> implements Da
@Override
public boolean apply(Entry > input) {
- final Path key = input.getKey();
- return key.contains(path) || ((Path) path).contains(key);
+ final P key = input.getKey();
+ return key.contains(path) || ((P) path).contains(key);
}
};
}
- private class ConfigurationDataReaderRegistration , D> extends DataReaderRegistration {
+ @SuppressWarnings("hiding")
+ private class ConfigurationDataReaderRegistration , D> extends DataReaderRegistration {
public ConfigurationDataReaderRegistration(P key, DataReader instance) {
super(key, instance);
@@ -158,7 +159,8 @@ public abstract class AbstractDataReadRouter , D> implements Da
}
}
- private class OperationalDataReaderRegistration , D> extends DataReaderRegistration {
+ @SuppressWarnings("hiding")
+ private class OperationalDataReaderRegistration , D> extends DataReaderRegistration {
public OperationalDataReaderRegistration(P key, DataReader instance) {
super(key, instance);
@@ -170,7 +172,7 @@ public abstract class AbstractDataReadRouter , D> implements Da
}
}
- private abstract static class DataReaderRegistration , D> extends
+ private abstract static class DataReaderRegistration , D> extends
AbstractObjectRegistration