Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix for incorrect request assumption in Update Neutron Port op"
[controller.git]
/
opendaylight
/
config
/
config-api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
config
/
api
/
DependencyResolver.java
diff --git
a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/DependencyResolver.java
b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/DependencyResolver.java
index a2b171aec0e12f40e82cca30cf9877e5b661ae05..39845454ef5ed17d108255dbf5e47f5b774ab93b 100644
(file)
--- a/
opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/DependencyResolver.java
+++ b/
opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/DependencyResolver.java
@@
-10,6
+10,7
@@
package org.opendaylight.controller.config.api;
import javax.management.ObjectName;
import org.opendaylight.controller.config.api.annotations.AbstractServiceInterface;
import javax.management.ObjectName;
import org.opendaylight.controller.config.api.annotations.AbstractServiceInterface;
+import org.opendaylight.yangtools.concepts.Identifiable;
/**
* Each new {@link org.opendaylight.controller.config.spi.Module} can receive
/**
* Each new {@link org.opendaylight.controller.config.spi.Module} can receive
@@
-18,7
+19,7
@@
import org.opendaylight.controller.config.api.annotations.AbstractServiceInterfa
*
* @see org.opendaylight.controller.config.spi.Module
*/
*
* @see org.opendaylight.controller.config.spi.Module
*/
-public interface DependencyResolver {
+public interface DependencyResolver
extends Identifiable<ModuleIdentifier>
{
/**
* To be used during validation phase to validate serice interface of
/**
* To be used during validation phase to validate serice interface of
@@
-38,12
+39,6
@@
public interface DependencyResolver {
Class<? extends AbstractServiceInterface> expectedServiceInterface,
ObjectName objectName, JmxAttribute jmxAttribute);
Class<? extends AbstractServiceInterface> expectedServiceInterface,
ObjectName objectName, JmxAttribute jmxAttribute);
- @Deprecated
- // TODO remove once all config code is generated
- void validateDependency(
- Class<? extends AbstractServiceInterface> expectedServiceInterface,
- ObjectName objectName, String attributeNameForErrorReporting);
-
/**
* To be used during commit phase to wire actual dependencies.
*
/**
* To be used during commit phase to wire actual dependencies.
*
@@
-54,7
+49,4
@@
public interface DependencyResolver {
<T> T resolveInstance(Class<T> expectedType, ObjectName objectName,
JmxAttribute jmxAttribute);
<T> T resolveInstance(Class<T> expectedType, ObjectName objectName,
JmxAttribute jmxAttribute);
- @Deprecated
- <T> T resolveInstance(Class<T> expectedType, ObjectName objectName);
-
}
}