tidy up of warnings
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e5841f4c Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e5841f4c Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e5841f4c Branch: refs/heads/0.8.0-incubating Commit: e5841f4cc676994263a2bc3ca8a3a768bbe8797b Parents: 0d4962d Author: Alex Heneveld <[email protected]> Authored: Thu Sep 3 22:37:30 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Fri Sep 4 14:33:51 2015 +0100 ---------------------------------------------------------------------- .../org/apache/brooklyn/api/mgmt/rebind/Rebindable.java | 2 +- .../java/org/apache/brooklyn/api/sensor/Enricher.java | 2 -- .../camp/spi/collection/AggregatingResourceLookup.java | 3 ++- .../camp/spi/collection/BasicResourceLookup.java | 3 ++- .../brooklyn/camp/brooklyn/BrooklynCampConstants.java | 1 - .../creation/service/BrooklynServiceTypeResolver.java | 8 +------- .../spi/creation/service/CatalogServiceTypeResolver.java | 1 + .../spi/creation/service/ChefServiceTypeResolver.java | 1 + .../spi/creation/service/JavaServiceTypeResolver.java | 1 + .../org/apache/brooklyn/cli/CloudExplorerLiveTest.java | 7 +++---- .../brooklyn/rest/domain/CatalogLocationSummary.java | 2 ++ .../brooklyn/rest/domain/LocationConfigSummary.java | 4 +++- .../org/apache/brooklyn/rest/domain/UsageStatistic.java | 11 +++++------ .../org/apache/brooklyn/rest/domain/VersionSummary.java | 1 - .../rest/resources/AbstractBrooklynRestResource.java | 4 +--- .../apache/brooklyn/rest/resources/CatalogResource.java | 1 + .../apache/brooklyn/rest/BrooklynRestApiLauncher.java | 2 +- 17 files changed, 25 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/Rebindable.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/Rebindable.java b/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/Rebindable.java index d443e3f..301e8e0 100644 --- a/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/Rebindable.java +++ b/api/src/main/java/org/apache/brooklyn/api/mgmt/rebind/Rebindable.java @@ -35,6 +35,6 @@ import com.google.common.annotations.Beta; @Beta public interface Rebindable { - public RebindSupport getRebindSupport(); + public RebindSupport<?> getRebindSupport(); } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/api/src/main/java/org/apache/brooklyn/api/sensor/Enricher.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/sensor/Enricher.java b/api/src/main/java/org/apache/brooklyn/api/sensor/Enricher.java index b81a948..aaaecf0 100644 --- a/api/src/main/java/org/apache/brooklyn/api/sensor/Enricher.java +++ b/api/src/main/java/org/apache/brooklyn/api/sensor/Enricher.java @@ -18,8 +18,6 @@ */ package org.apache.brooklyn.api.sensor; -import java.util.Map; - import org.apache.brooklyn.api.mgmt.rebind.RebindSupport; import org.apache.brooklyn.api.mgmt.rebind.Rebindable; import org.apache.brooklyn.api.mgmt.rebind.mementos.EnricherMemento; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/AggregatingResourceLookup.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/AggregatingResourceLookup.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/AggregatingResourceLookup.java index 700aafb..fe05a0c 100644 --- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/AggregatingResourceLookup.java +++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/AggregatingResourceLookup.java @@ -27,6 +27,7 @@ public class AggregatingResourceLookup<T extends AbstractResource> extends Abstr List<ResourceLookup<T>> targets = new ArrayList<ResourceLookup<T>>(); + @SafeVarargs public static <T extends AbstractResource> AggregatingResourceLookup<T> of(ResourceLookup<T> ...targets) { AggregatingResourceLookup<T> result = new AggregatingResourceLookup<T>(); for (ResourceLookup<T> item: targets) result.targets.add(item); @@ -52,5 +53,5 @@ public class AggregatingResourceLookup<T extends AbstractResource> extends Abstr for (ResourceLookup<T> item: targets) result.addAll(item.links()); return result; } - + } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/BasicResourceLookup.java ---------------------------------------------------------------------- diff --git a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/BasicResourceLookup.java b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/BasicResourceLookup.java index 408823e..f1d3176 100644 --- a/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/BasicResourceLookup.java +++ b/camp/camp-base/src/main/java/org/apache/brooklyn/camp/spi/collection/BasicResourceLookup.java @@ -47,7 +47,7 @@ public class BasicResourceLookup<T extends AbstractResource> extends AbstractRes links.put(item.getId(), newLink(item.getId(), item.getName())); } - public synchronized void addAll(T... items) { + public synchronized void addAll(@SuppressWarnings("unchecked") T... items) { for (T item: items) add(item); } @@ -62,6 +62,7 @@ public class BasicResourceLookup<T extends AbstractResource> extends AbstractRes return links.remove(id)!=null; } + @SafeVarargs public static <T extends AbstractResource> BasicResourceLookup<T> of(T ...items) { BasicResourceLookup<T> result = new BasicResourceLookup<T>(); for (T item: items) result.add(item); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampConstants.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampConstants.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampConstants.java index 515ec9f..0c27a74 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampConstants.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/BrooklynCampConstants.java @@ -24,7 +24,6 @@ import org.apache.brooklyn.camp.CampPlatform; import org.apache.brooklyn.config.ConfigInheritance; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; -import org.apache.brooklyn.core.server.BrooklynServerConfig; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/BrooklynServiceTypeResolver.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/BrooklynServiceTypeResolver.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/BrooklynServiceTypeResolver.java index f4bc9aa..e0d2e9e 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/BrooklynServiceTypeResolver.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/BrooklynServiceTypeResolver.java @@ -18,10 +18,6 @@ */ package org.apache.brooklyn.camp.brooklyn.spi.creation.service; -import static com.google.common.base.Preconditions.checkNotNull; - -import java.util.Map; - import javax.annotation.Nullable; import org.apache.brooklyn.api.catalog.CatalogItem; @@ -33,19 +29,17 @@ import org.apache.brooklyn.camp.brooklyn.spi.creation.BrooklynEntityDecorationRe import org.apache.brooklyn.camp.spi.PlatformComponentTemplate; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.mgmt.persist.DeserializingClassRenamesProvider; -import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Optional; - /** * This converts {@link PlatformComponentTemplate} instances whose type is prefixed {@code brooklyn:} * to Brooklyn {@link EntitySpec} instances. */ public class BrooklynServiceTypeResolver implements ServiceTypeResolver { + @SuppressWarnings("unused") private static final Logger LOG = LoggerFactory.getLogger(ServiceTypeResolver.class); public BrooklynServiceTypeResolver() { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/CatalogServiceTypeResolver.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/CatalogServiceTypeResolver.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/CatalogServiceTypeResolver.java index 08a04e5..94aa8fc 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/CatalogServiceTypeResolver.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/CatalogServiceTypeResolver.java @@ -40,6 +40,7 @@ import com.google.common.collect.ImmutableMap; */ public class CatalogServiceTypeResolver extends BrooklynServiceTypeResolver { + @SuppressWarnings("unused") private static final Logger LOG = LoggerFactory.getLogger(ServiceTypeResolver.class); // TODO currently a hardcoded list of aliases; would like that to come from mgmt somehow http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/ChefServiceTypeResolver.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/ChefServiceTypeResolver.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/ChefServiceTypeResolver.java index c0fb5f9..b44deb7 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/ChefServiceTypeResolver.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/ChefServiceTypeResolver.java @@ -35,6 +35,7 @@ import org.apache.brooklyn.util.text.Strings; */ public class ChefServiceTypeResolver extends BrooklynServiceTypeResolver { + @SuppressWarnings("unused") private static final Logger LOG = LoggerFactory.getLogger(ServiceTypeResolver.class); @Override http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/JavaServiceTypeResolver.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/JavaServiceTypeResolver.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/JavaServiceTypeResolver.java index 55cff35..d6c52f4 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/JavaServiceTypeResolver.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/service/JavaServiceTypeResolver.java @@ -29,6 +29,7 @@ import org.slf4j.LoggerFactory; */ public class JavaServiceTypeResolver extends BrooklynServiceTypeResolver { + @SuppressWarnings("unused") private static final Logger LOG = LoggerFactory.getLogger(ServiceTypeResolver.class); @Override http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/cli/src/test/java/org/apache/brooklyn/cli/CloudExplorerLiveTest.java ---------------------------------------------------------------------- diff --git a/usage/cli/src/test/java/org/apache/brooklyn/cli/CloudExplorerLiveTest.java b/usage/cli/src/test/java/org/apache/brooklyn/cli/CloudExplorerLiveTest.java index c027c83..4511d51 100644 --- a/usage/cli/src/test/java/org/apache/brooklyn/cli/CloudExplorerLiveTest.java +++ b/usage/cli/src/test/java/org/apache/brooklyn/cli/CloudExplorerLiveTest.java @@ -20,8 +20,6 @@ package org.apache.brooklyn.cli; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import io.airlift.command.Cli; -import io.airlift.command.ParseException; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -29,17 +27,18 @@ import java.io.InputStream; import java.io.PrintStream; import java.util.List; -import org.apache.brooklyn.cli.Main; import org.apache.brooklyn.cli.AbstractMain.BrooklynCommand; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.cli.AbstractMain.BrooklynCommand; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; +import io.airlift.command.Cli; +import io.airlift.command.ParseException; + public class CloudExplorerLiveTest { private String stdout; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogLocationSummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogLocationSummary.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogLocationSummary.java index c264db8..dd79fc1 100644 --- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogLocationSummary.java +++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/CatalogLocationSummary.java @@ -28,6 +28,8 @@ import com.google.common.collect.ImmutableSet; public class CatalogLocationSummary extends CatalogItemSummary { + private static final long serialVersionUID = 8420991584336514673L; + private final Set<LocationConfigSummary> config; public CatalogLocationSummary( http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationConfigSummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationConfigSummary.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationConfigSummary.java index 2331ee7..6b76c1e 100644 --- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationConfigSummary.java +++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationConfigSummary.java @@ -30,6 +30,8 @@ import com.google.common.collect.ImmutableMap; public class LocationConfigSummary extends ConfigSummary { + private static final long serialVersionUID = 2232321501735217002L; + @JsonSerialize(include = Inclusion.NON_NULL) private final Map<String, URI> links; @@ -58,5 +60,5 @@ public class LocationConfigSummary extends ConfigSummary { + "name='" + getName() + '\'' + ", type='" + getType() + '\'' + '}'; - } + } } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/UsageStatistic.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/UsageStatistic.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/UsageStatistic.java index 258bb93..4e04613 100644 --- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/UsageStatistic.java +++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/UsageStatistic.java @@ -18,16 +18,15 @@ */ package org.apache.brooklyn.rest.domain; -import org.codehaus.jackson.annotate.JsonProperty; - -import com.google.common.base.Objects; -import com.google.common.collect.ImmutableMap; +import static com.google.common.base.Preconditions.checkNotNull; import java.io.Serializable; -import java.net.URI; import java.util.Map; -import static com.google.common.base.Preconditions.checkNotNull; +import org.codehaus.jackson.annotate.JsonProperty; + +import com.google.common.base.Objects; +import com.google.common.collect.ImmutableMap; /** * @author Adam Lowe http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/VersionSummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/VersionSummary.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/VersionSummary.java index a6368b5..6ebf5e7 100644 --- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/VersionSummary.java +++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/VersionSummary.java @@ -23,7 +23,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.io.Serializable; import java.util.Collections; import java.util.List; -import java.util.Map; import javax.annotation.Nonnull; import javax.annotation.Nullable; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java index 8fbaec3..9c24707 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java @@ -22,14 +22,11 @@ import javax.annotation.Nullable; import javax.servlet.ServletContext; import javax.ws.rs.core.Context; -import org.codehaus.jackson.map.ObjectMapper; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.mgmt.ManagementContext; -import org.apache.brooklyn.camp.CampPlatform; import org.apache.brooklyn.core.config.render.RendererHints; import org.apache.brooklyn.core.mgmt.ManagementContextInjectable; -import org.apache.brooklyn.core.server.BrooklynServerConfig; import org.apache.brooklyn.core.server.BrooklynServiceAttributes; import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils; import org.apache.brooklyn.rest.util.WebResourceUtils; @@ -37,6 +34,7 @@ import org.apache.brooklyn.rest.util.json.BrooklynJacksonJsonProvider; import org.apache.brooklyn.util.core.task.Tasks; import org.apache.brooklyn.util.guava.Maybe; import org.apache.brooklyn.util.time.Duration; +import org.codehaus.jackson.map.ObjectMapper; public abstract class AbstractBrooklynRestResource implements ManagementContextInjectable { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java index 3dc578b..d7c26df 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/CatalogResource.java @@ -226,6 +226,7 @@ public class CatalogResource extends AbstractBrooklynRestResource implements Cat @Override public List<CatalogItemSummary> listApplications(String regex, String fragment, boolean allVersions) { + @SuppressWarnings("unchecked") Predicate<CatalogItem<Application, EntitySpec<? extends Application>>> filter = Predicates.and( CatalogPredicates.IS_TEMPLATE, http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e5841f4c/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java index d16669c..4261471 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncher.java @@ -131,7 +131,7 @@ public class BrooklynRestApiLauncher { * Runs the server with the given set of filters. * Overrides any previously supplied set (or {@link #DEFAULT_FILTERS} which is used by default). */ - public BrooklynRestApiLauncher filters(Class<? extends Filter>... filters) { + public BrooklynRestApiLauncher filters(@SuppressWarnings("unchecked") Class<? extends Filter>... filters) { this.filters = Lists.newArrayList(filters); return this; }
