brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [06/10] brooklyn-server git commit: CatalogResource: minor tidy
Date Wed, 16 Nov 2016 18:15:50 GMT
CatalogResource: minor tidy

Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d400b320
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d400b320
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d400b320

Branch: refs/heads/master
Commit: d400b320e947407f7072f42dab275aa8ea4335a1
Parents: b15b1eb
Author: Aled Sage <aled.sage@gmail.com>
Authored: Wed Nov 9 16:18:12 2016 +0000
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Wed Nov 16 18:08:12 2016 +0000

----------------------------------------------------------------------
 .../org/apache/brooklyn/rest/resources/CatalogResource.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d400b320/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
index 77f8470..2ac5b35 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java
@@ -30,6 +30,7 @@ import javax.annotation.Nullable;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.core.UriInfo;
 
 import org.apache.brooklyn.api.catalog.CatalogItem;
 import org.apache.brooklyn.api.entity.Application;
@@ -63,6 +64,7 @@ import org.apache.brooklyn.util.collections.MutableMap;
 import org.apache.brooklyn.util.collections.MutableSet;
 import org.apache.brooklyn.util.core.ResourceUtils;
 import org.apache.brooklyn.util.exceptions.Exceptions;
+import org.apache.brooklyn.util.guava.Maybe;
 import org.apache.brooklyn.util.text.StringPredicates;
 import org.apache.brooklyn.util.text.Strings;
 import org.slf4j.Logger;
@@ -75,8 +77,6 @@ import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.io.Files;
-import javax.ws.rs.core.UriInfo;
-import org.apache.brooklyn.util.guava.Maybe;
 
 @HaHotStateRequired
 public class CatalogResource extends AbstractBrooklynRestResource implements CatalogApi {
@@ -386,7 +386,7 @@ public class CatalogResource extends AbstractBrooklynRestResource implements
Cat
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    private <T,SpecT> List<CatalogItemSummary> getCatalogItemSummariesMatchingRegexFragment(Predicate<CatalogItem<T,SpecT>>
type, String regex, String fragment, boolean allVersions) {
+    private <T,SpecT> List<CatalogItemSummary> getCatalogItemSummariesMatchingRegexFragment(Predicate<?
super CatalogItem<T,SpecT>> type, String regex, String fragment, boolean allVersions)
{
         List filters = new ArrayList();
         filters.add(type);
         if (Strings.isNonEmpty(regex))


Mime
View raw message