Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Handle conflicting types in BundleScanner
[controller.git]
/
opendaylight
/
northbound
/
bundlescanner
/
api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
northbound
/
bundlescanner
/
IBundleScanService.java
diff --git
a/opendaylight/northbound/bundlescanner/api/src/main/java/org/opendaylight/controller/northbound/bundlescanner/IBundleScanService.java
b/opendaylight/northbound/bundlescanner/api/src/main/java/org/opendaylight/controller/northbound/bundlescanner/IBundleScanService.java
index 5cb0b63f1cc0b9895205cf582b6e2198f8add78e..dde205acd629148a8ce4beda31a1b73e0711211f 100644
(file)
--- a/
opendaylight/northbound/bundlescanner/api/src/main/java/org/opendaylight/controller/northbound/bundlescanner/IBundleScanService.java
+++ b/
opendaylight/northbound/bundlescanner/api/src/main/java/org/opendaylight/controller/northbound/bundlescanner/IBundleScanService.java
@@
-9,6
+9,7
@@
package org.opendaylight.controller.northbound.bundlescanner;
import java.util.List;
package org.opendaylight.controller.northbound.bundlescanner;
import java.util.List;
+import java.util.Set;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleContext;
@@
-30,5
+31,6
@@
public interface IBundleScanService {
public List<Class<?>> getAnnotatedClasses(
BundleContext context,
String[] annotations,
public List<Class<?>> getAnnotatedClasses(
BundleContext context,
String[] annotations,
+ Set<String> excludes,
boolean includeDependentBundleClasses);
}
boolean includeDependentBundleClasses);
}