You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ci...@apache.org on 2015/11/21 15:25:15 UTC
[1/2] incubator-brooklyn git commit: Fix eclipse 'Cannot cast' error
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 5f36cb028 -> 10e9a3c7c
Fix eclipse 'Cannot cast' error
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/7d918d37
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/7d918d37
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/7d918d37
Branch: refs/heads/master
Commit: 7d918d37c14d43d9560704afa8b607743df4cb15
Parents: 882a4d6
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Fri Nov 20 20:25:32 2015 -0500
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Fri Nov 20 20:25:32 2015 -0500
----------------------------------------------------------------------
.../rest/apidoc/RestApiResourceScanner.java | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7d918d37/utils/rest-swagger/src/main/java/org/apache/brooklyn/rest/apidoc/RestApiResourceScanner.java
----------------------------------------------------------------------
diff --git a/utils/rest-swagger/src/main/java/org/apache/brooklyn/rest/apidoc/RestApiResourceScanner.java b/utils/rest-swagger/src/main/java/org/apache/brooklyn/rest/apidoc/RestApiResourceScanner.java
index 2f3c8c7..96bd821 100644
--- a/utils/rest-swagger/src/main/java/org/apache/brooklyn/rest/apidoc/RestApiResourceScanner.java
+++ b/utils/rest-swagger/src/main/java/org/apache/brooklyn/rest/apidoc/RestApiResourceScanner.java
@@ -15,15 +15,17 @@
*/
package org.apache.brooklyn.rest.apidoc;
-import com.google.common.collect.Sets;
+
import io.swagger.annotations.Api;
import io.swagger.jaxrs.config.AbstractScanner;
import io.swagger.jaxrs.config.JaxrsScanner;
+
import java.util.HashSet;
import java.util.Set;
+
import javax.servlet.ServletConfig;
import javax.ws.rs.core.Application;
-import org.apache.brooklyn.util.collections.MutableSet;
+
/**
* Much like DefaultJaxrsScanner, but looks at annotations of ancestors as well.
@@ -31,19 +33,17 @@ import org.apache.brooklyn.util.collections.MutableSet;
* For instance, if a resource implementation exposes an annotated interface,
* that interface will be added as well.
*
- * @author Ciprian Ciubotariu <ch...@gmx.net>
*/
public class RestApiResourceScanner extends AbstractScanner implements JaxrsScanner {
private Set<Class<?>> apiClasses = null;
-
- private void addAnnotatedClasses(Set<Class<?>> output, Set<Class<?>> classes) {
+ private void addAnnotatedClasses(Set<Class<?>> output, Class<?>[] classes) {
for (Class<?> clz : classes) {
if (clz.getAnnotation(Api.class) != null) {
output.add(clz);
}
- addAnnotatedClasses(output, Sets.newHashSet(clz.getInterfaces()));
+ addAnnotatedClasses(output, clz.getInterfaces());
}
}
@@ -53,12 +53,14 @@ public class RestApiResourceScanner extends AbstractScanner implements JaxrsScan
if (app != null) {
Set<Class<?>> classes = app.getClasses();
if (classes != null) {
- addAnnotatedClasses(apiClasses, classes);
+ final Class<?>[] template = {};
+ addAnnotatedClasses(apiClasses, classes.toArray(template));
}
Set<Object> singletons = app.getSingletons();
if (singletons != null) {
for (Object o : singletons) {
- addAnnotatedClasses(apiClasses, (MutableSet<Class<?>>) MutableSet.of(o.getClass()));
+ Class<?>[] types = {o.getClass()};
+ addAnnotatedClasses(apiClasses, types);
}
}
}
[2/2] incubator-brooklyn git commit: This closes #1053
Posted by ci...@apache.org.
This closes #1053
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/10e9a3c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/10e9a3c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/10e9a3c7
Branch: refs/heads/master
Commit: 10e9a3c7c22175a0a9c6757b00375b19d954ada8
Parents: 5f36cb0 7d918d3
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Sat Nov 21 12:58:20 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Sat Nov 21 16:16:26 2015 +0200
----------------------------------------------------------------------
.../rest/apidoc/RestApiResourceScanner.java | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------