diff -uNr core.orig/src/main/java/org/jboss/on/embedded/bean/MeasurementUtils.java core/src/main/java/org/jboss/on/embedded/bean/MeasurementUtils.java --- core.orig/src/main/java/org/jboss/on/embedded/bean/MeasurementUtils.java 2010-06-30 18:35:16.546478199 +0800 +++ core/src/main/java/org/jboss/on/embedded/bean/MeasurementUtils.java 2010-06-30 18:39:07.678340815 +0800 @@ -27,8 +27,8 @@ import java.util.Set; import org.jboss.on.embedded.util.MeasurementConversionUtility; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +//import org.jetbrains.annotations.NotNull; +//import org.jetbrains.annotations.Nullable; import org.rhq.core.clientapi.agent.measurement.MeasurementAgentService; import org.rhq.core.domain.measurement.DataType; import org.rhq.core.domain.measurement.DisplayType; @@ -96,9 +96,9 @@ * @return a set of all metrics that have the given display type and data * type */ - public @Nullable + public List loadMeasurementData( - @Nullable DisplayType displayType, DataType dataType) { + DisplayType displayType, DataType dataType) { Map requestedMetricDefs = new HashMap(); // Get the definitions of the requested measurements. @@ -151,11 +151,11 @@ * @param measurementDisplayMap * @return */ - public @NotNull + public List loadCategoryList( - @NotNull Map measurementDefinitionMap, - @Nullable List measurementDataList, - @NotNull Map> measurementDisplayMap) { + Map measurementDefinitionMap, + List measurementDataList, + Map> measurementDisplayMap) { // measurementDisplayMap = new HashMap>(); diff -uNr core.orig/src/main/java/org/jboss/on/embedded/EmbeddedInventoryEventListener.java core/src/main/java/org/jboss/on/embedded/EmbeddedInventoryEventListener.java --- core.orig/src/main/java/org/jboss/on/embedded/EmbeddedInventoryEventListener.java 2010-06-30 18:35:16.545478351 +0800 +++ core/src/main/java/org/jboss/on/embedded/EmbeddedInventoryEventListener.java 2010-06-30 18:40:14.416195119 +0800 @@ -23,7 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jetbrains.annotations.Nullable; +//import org.jetbrains.annotations.Nullable; import org.rhq.core.clientapi.agent.PluginContainerException; import org.rhq.core.domain.content.PackageType; import org.rhq.core.domain.resource.Resource; @@ -106,7 +106,7 @@ return resourceType.isCreatable() && resourceType.getCreationDataType() == ResourceCreationDataType.CONTENT; } - @Nullable + private static PackageType getCreationPackageType(ResourceType resourceType) { Set packageTypes = resourceType.getPackageTypes(); diff -uNr core.orig/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java core/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java --- core.orig/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java 2010-06-30 18:35:16.548477895 +0800 +++ core/src/main/java/org/jboss/on/embedded/manager/pc/PluginContainerResourceManager.java 2010-06-30 18:39:03.515973591 +0800 @@ -26,7 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jetbrains.annotations.NotNull; +//import org.jetbrains.annotations.NotNull; import org.rhq.core.clientapi.agent.PluginContainerException; import org.rhq.core.clientapi.agent.configuration.ConfigurationAgentService; import org.rhq.core.clientapi.agent.configuration.ConfigurationUpdateRequest; @@ -149,7 +149,7 @@ return getPluginContainer().getPluginManager().getMetadataManager().getAllTypes(); } - @NotNull + public Set getResources(ResourceType resourceType, Resource rootResource) { // Use a TreeSet to ensure the Set is sorted via Resource.compareTo() (i.e. by name). @@ -196,7 +196,7 @@ return getInventoryService().getPlatform(); } - private Resource getResource(@NotNull Resource resource, @NotNull Integer id) + private Resource getResource( Resource resource, Integer id) { Resource result = null; // first of all check the passed in resource itself @@ -333,7 +333,7 @@ return getInventoryService().getCurrentAvailability(resource); } - @NotNull + public List getOperationsForResource(Resource resource) { List operationDefinitions = new ArrayList(); diff -uNr core.orig/src/main/java/org/jboss/on/embedded/manager/ResourceManager.java core/src/main/java/org/jboss/on/embedded/manager/ResourceManager.java --- core.orig/src/main/java/org/jboss/on/embedded/manager/ResourceManager.java 2010-06-30 18:35:16.547478047 +0800 +++ core/src/main/java/org/jboss/on/embedded/manager/ResourceManager.java 2010-06-30 18:39:07.845315431 +0800 @@ -22,8 +22,8 @@ import java.util.List; import java.util.Set; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +//import org.jetbrains.annotations.NotNull; +//import org.jetbrains.annotations.Nullable; import org.rhq.core.clientapi.agent.inventory.CreateResourceResponse; import org.rhq.core.clientapi.agent.inventory.DeleteResourceResponse; import org.rhq.core.clientapi.server.configuration.ConfigurationUpdateResponse; @@ -73,7 +73,7 @@ * @return the ResourceType with the specified name, or, if no ResourceType exists with that name, * null is returned */ - @Nullable + ResourceType getResourceType(String resourceTypeName); /** @@ -91,10 +91,10 @@ * @param resource parent resource. * @return set of Resource instances; empty list if none match the resource type. */ - @NotNull + Set getResources(ResourceType resourceType, Resource resource); - @Nullable + Resource getResource(Integer id); /** diff -uNr core.orig/src/main/java/org/jboss/on/embedded/ui/BootstrapAction.java core/src/main/java/org/jboss/on/embedded/ui/BootstrapAction.java --- core.orig/src/main/java/org/jboss/on/embedded/ui/BootstrapAction.java 2010-06-30 18:35:16.544478503 +0800 +++ core/src/main/java/org/jboss/on/embedded/ui/BootstrapAction.java 2010-06-30 18:40:14.578170495 +0800 @@ -34,7 +34,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jetbrains.annotations.Nullable; +//import org.jetbrains.annotations.Nullable; import org.rhq.core.pc.PluginContainer; import org.rhq.core.pc.PluginContainerConfiguration; import org.rhq.core.pc.ServerServices; @@ -158,7 +158,7 @@ pluginContainer.getInventoryManager().addInventoryEventListener(new LoggingInventoryEventListener()); } - @Nullable + private String getVersion() { String version = null; @@ -282,7 +282,7 @@ return this.tempDir; } - @Nullable + private static File getDirectory(String systemProperty) { File directory = null; diff -uNr core.orig/src/main/java/org/jboss/on/embedded/ui/CommonActionUtil.java core/src/main/java/org/jboss/on/embedded/ui/CommonActionUtil.java --- core.orig/src/main/java/org/jboss/on/embedded/ui/CommonActionUtil.java 2010-06-30 18:35:16.540479111 +0800 +++ core/src/main/java/org/jboss/on/embedded/ui/CommonActionUtil.java 2010-06-30 18:38:05.701762687 +0800 @@ -27,7 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jetbrains.annotations.NotNull; +//import org.jetbrains.annotations.NotNull; import org.rhq.core.domain.measurement.Availability; import org.rhq.core.domain.resource.Resource; @@ -62,7 +62,7 @@ // and also consider splitting out the retrieval of availability since // not all clients need this public - @NotNull + ResourceListItem getCurrentResourceListItem() { ResourceListItem resourceListItem; @@ -79,7 +79,7 @@ * @return the Resource specified by the current navigation path */ public - @NotNull + Resource getCurrentResource() { // there are plenty of other implementations we could use here diff -uNr core.orig/src/main/java/org/jboss/on/embedded/ui/configuration/resource/AbstractResourceConfigurationUIBean.java core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/AbstractResourceConfigurationUIBean.java --- core.orig/src/main/java/org/jboss/on/embedded/ui/configuration/resource/AbstractResourceConfigurationUIBean.java 2010-06-30 18:35:16.540479111 +0800 +++ core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/AbstractResourceConfigurationUIBean.java 2010-06-30 18:39:07.183416055 +0800 @@ -19,8 +19,8 @@ */ package org.jboss.on.embedded.ui.configuration.resource; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +//import org.jetbrains.annotations.NotNull; +//import org.jetbrains.annotations.Nullable; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.gui.RequestParameterNameConstants; @@ -44,19 +44,19 @@ protected Configuration configuration; protected ConfigurationDefinition configurationDefinition; - @Nullable + public ConfigurationDefinition getConfigurationDefinition() { return this.configurationDefinition; } - @Nullable + public Configuration getConfiguration() { return this.configuration; } - public void setConfigurationDefinition(@NotNull ConfigurationDefinition configurationDefinition) + public void setConfigurationDefinition( ConfigurationDefinition configurationDefinition) { this.configurationDefinition = configurationDefinition; } @@ -69,7 +69,7 @@ } } - @Nullable + protected Integer getConfigurationId() { String configIdString = FacesContextUtility.getOptionalRequestParameter(RequestParameterNameConstants.CONFIG_ID_PARAM); diff -uNr core.orig/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java --- core.orig/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java 2010-06-30 18:35:16.540479111 +0800 +++ core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java 2010-06-30 18:39:07.015441591 +0800 @@ -26,7 +26,7 @@ import javax.faces.application.FacesMessage; -import org.jetbrains.annotations.NotNull; +//import org.jetbrains.annotations.NotNull; import org.rhq.core.clientapi.agent.inventory.CreateResourceResponse; import org.rhq.core.clientapi.server.configuration.ConfigurationUpdateResponse; import org.rhq.core.domain.configuration.Configuration; @@ -267,7 +267,7 @@ return configHelperUIBean; } - private void addActionFailureMessageToFacesMessages(@NotNull String baseMessage, String errorDetails, + private void addActionFailureMessageToFacesMessages( String baseMessage, String errorDetails, Configuration resourceConfiguration) { if (errorDetails == null || errorDetails.trim().equals("")) diff -uNr core.orig/src/main/java/org/jboss/on/embedded/ui/nav/BaseTreeNode.java core/src/main/java/org/jboss/on/embedded/ui/nav/BaseTreeNode.java --- core.orig/src/main/java/org/jboss/on/embedded/ui/nav/BaseTreeNode.java 2010-06-30 18:35:16.543478655 +0800 +++ core/src/main/java/org/jboss/on/embedded/ui/nav/BaseTreeNode.java 2010-06-30 18:39:07.360389151 +0800 @@ -29,8 +29,8 @@ import java.util.TreeSet; import java.util.concurrent.atomic.AtomicInteger; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +//import org.jetbrains.annotations.NotNull; +//import org.jetbrains.annotations.Nullable; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceSubCategory; import org.rhq.core.domain.resource.ResourceType; @@ -196,7 +196,7 @@ // checks the resource type and if appropriate adds a // tree node to the collection of children // if the resourceType is tagged with a subcategory it is ignored - protected void addChildResourceTypeNode(@NotNull ResourceType resourceType, @NotNull Resource parentResource) + protected void addChildResourceTypeNode( ResourceType resourceType, Resource parentResource) { addChildResourceTypeNode(resourceType, parentResource, true); } @@ -204,12 +204,12 @@ // checks the resource type and if appropriate adds a // tree node to the collection of children // if the resourceType is tagged with a subcategory it is not automatically ignored - protected void addChildResourceTypeNodeWithSubCategory(@NotNull ResourceType resourceType, @NotNull Resource parentResource) + protected void addChildResourceTypeNodeWithSubCategory( ResourceType resourceType, Resource parentResource) { addChildResourceTypeNode(resourceType, parentResource, false); } - private void addChildResourceTypeNode(@NotNull ResourceType resourceType, @NotNull Resource parentResource, boolean ignoreSubCategorizedResources) + private void addChildResourceTypeNode( ResourceType resourceType, Resource parentResource, boolean ignoreSubCategorizedResources) { if (resourceType == null) { @@ -255,7 +255,7 @@ } // utility method utilized by some sub classes - protected void addChildResourceTypeOrSubCategoryNodes(@NotNull ResourceType resourceType, @NotNull Resource parentResource) + protected void addChildResourceTypeOrSubCategoryNodes( ResourceType resourceType, Resource parentResource) { //noinspection ConstantConditions if (resourceType == null) @@ -300,8 +300,8 @@ * Finds a JONTreeNode based on its path. Looks at this node and its children recursively as necessary */ public - @Nullable - JONTreeNode findNode(@Nullable String path) + + JONTreeNode findNode( String path) { if (path != null && !path.equals("")) { @@ -320,8 +320,8 @@ // problems due to having the same resource types // appearing under multiple resources, see JBMANCON-365 public - @Nullable - JONTreeNode findNodeByTypeName(@Nullable String typeName) + + JONTreeNode findNodeByTypeName( String typeName) { if (typeName != null && !typeName.equals("")) { @@ -335,7 +335,7 @@ // instance of BaseTreeNode, i.e. the parent, otherwise you are going to have // problems due to having the same resource types // appearing under multiple resources, see JBMANCON-365 - public ResourceTypeTreeNode findNodeByType(@NotNull ResourceType resourceType) + public ResourceTypeTreeNode findNodeByType( ResourceType resourceType) { if (resourceType != null) { @@ -369,7 +369,7 @@ { private String path; - public PathBasedNodeMatcher(@NotNull String path) + public PathBasedNodeMatcher( String path) { this.path = path; } @@ -384,7 +384,7 @@ { private String resourceTypeName; - public ResourceTypeNameNodeMatcher(@NotNull String resourceTypeName) + public ResourceTypeNameNodeMatcher( String resourceTypeName) { this.resourceTypeName = resourceTypeName; } @@ -407,7 +407,7 @@ { private ResourceType resourceType; - public ResourceTypeNodeMatcher(@NotNull ResourceType resourceType) + public ResourceTypeNodeMatcher( ResourceType resourceType) { if (resourceType == null) { diff -uNr core.orig/src/main/java/org/jboss/on/embedded/ui/nav/ResourceTreeNode.java core/src/main/java/org/jboss/on/embedded/ui/nav/ResourceTreeNode.java --- core.orig/src/main/java/org/jboss/on/embedded/ui/nav/ResourceTreeNode.java 2010-06-30 18:35:16.544478503 +0800 +++ core/src/main/java/org/jboss/on/embedded/ui/nav/ResourceTreeNode.java 2010-06-30 18:39:07.524364223 +0800 @@ -20,7 +20,7 @@ package org.jboss.on.embedded.ui.nav; -import org.jetbrains.annotations.NotNull; +//import org.jetbrains.annotations.NotNull; import org.rhq.core.domain.resource.Resource; import org.jboss.on.embedded.ui.SummaryAction; @@ -38,7 +38,7 @@ { private Resource resource; - public ResourceTreeNode(@NotNull String key, @NotNull Resource resource) + public ResourceTreeNode( String key, Resource resource) { super(key); //noinspection ConstantConditions diff -uNr core.orig/src/main/java/org/jboss/on/embedded/ui/SingleResourceAction.java core/src/main/java/org/jboss/on/embedded/ui/SingleResourceAction.java --- core.orig/src/main/java/org/jboss/on/embedded/ui/SingleResourceAction.java 2010-06-30 18:35:16.542478807 +0800 +++ core/src/main/java/org/jboss/on/embedded/ui/SingleResourceAction.java 2010-06-30 18:38:05.865737759 +0800 @@ -23,7 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jetbrains.annotations.NotNull; +//import org.jetbrains.annotations.NotNull; import org.rhq.core.clientapi.agent.inventory.DeleteResourceResponse; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; @@ -119,7 +119,7 @@ * @return a string representing the outcome of this action (Constants.OUTCOME_SUCCESS, Constants.OUTCOME_FAILURE, * etc) */ - public String removeResourceAction(@NotNull Resource resource) + public String removeResourceAction( Resource resource) { log.debug("Removing Resource " + resource + "..."); DeleteResourceResponse deleteResourceResponse = resourceManager.removeResource(resource); diff -uNr core.orig/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java --- core.orig/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java 2010-06-30 18:35:16.542478807 +0800 +++ core/src/main/java/org/jboss/on/embedded/ui/SummaryAction.java 2010-06-30 18:38:02.019322503 +0800 @@ -28,7 +28,7 @@ import javax.faces.context.FacesContext; import javax.faces.event.ValueChangeEvent; -import org.jetbrains.annotations.NotNull; +//import org.jetbrains.annotations.NotNull; import org.rhq.core.domain.measurement.Availability; import org.rhq.core.domain.measurement.DataType; import org.rhq.core.domain.measurement.DisplayType; @@ -252,7 +252,7 @@ return treeNode.getPath(); } - @NotNull + public void setResourceAndSummaryInfo(Resource selectedResource) { Availability availability = ResourceManagerFactory.resourceManager().getAvailability(selectedResource); diff -uNr core.orig/src/main/java/org/jboss/on/embedded/util/ContentUtility.java core/src/main/java/org/jboss/on/embedded/util/ContentUtility.java --- core.orig/src/main/java/org/jboss/on/embedded/util/ContentUtility.java 2010-06-30 18:35:16.545478351 +0800 +++ core/src/main/java/org/jboss/on/embedded/util/ContentUtility.java 2010-06-30 18:40:14.755143591 +0800 @@ -23,7 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jetbrains.annotations.Nullable; +//import org.jetbrains.annotations.Nullable; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.content.PackageType; @@ -46,7 +46,7 @@ return resourceType.isCreatable() && resourceType.getCreationDataType() == ResourceCreationDataType.CONTENT; } - @Nullable + public static PackageType getCreationPackageType(ResourceType resourceType) { PackageType creationPackageType = null; @@ -63,7 +63,7 @@ return creationPackageType; } - @Nullable + public static Configuration getDefaultDeploymentConfiguration(PackageType packageType) { ConfigurationDefinition configurationDefinition = packageType.getDeploymentConfigurationDefinition();