ROO-2644: Operations that manage the POM are slow under windows, sinc…

…e flushin UAA preferences takes long

metadata/src/main/java/org/springframework/roo/metadata/DefaultMetadataService.java

@@ -44,7 +44,7 @@ public class DefaultMetadataService extends AbstractMetadataCache implements Met
 	private Map<String, MetadataProvider> providerMap = new HashMap<String, MetadataProvider>();
 
 	// Mutex
-	private Boolean lock = new Boolean(true);
+	private Object lock = new Object();
 
 	// Request control
 	private List<String> activeRequests = new ArrayList<String>(); // List to assist output "stacks" which show the order of requests
@@ -172,6 +172,7 @@ public MetadataItem getInternal(String metadataIdentificationString, boolean evi
 				if (metadataLogger.getTraceLevel() > 0) {
 					metadataLogger.log("Returning " + metadataIdentificationString);
 				}
+
 				return result;
 			} catch (Exception e) {
 				activeRequests.remove(metadataIdentificationString);

metadata/src/main/java/org/springframework/roo/metadata/MetadataService.java

@@ -1,6 +1,5 @@
 package org.springframework.roo.metadata;
 
-
 /**
  * Indicates a service which is aware of all {@link MetadataProvider}s in the system and
  * can provide access to their respective capabilities.

project/src/main/java/org/springframework/roo/project/MavenProjectMetadataProvider.java

@@ -152,7 +152,7 @@ public MetadataItem get(String metadataIdentificationString) {
 			}
 			Dependency dependency = new Dependency(productInfo.getGroupId(), productInfo.getArtifactId(), "version_is_ignored_for_searching");
 			Set<Dependency> dependenciesExcludingVersion = result.getDependenciesExcludingVersion(dependency);
-			if (dependenciesExcludingVersion.size() > 0) {
+			if (!dependenciesExcludingVersion.isEmpty()) {
 				// This dependency was detected
 				Dependency first = dependenciesExcludingVersion.iterator().next();
 				// Convert the detected dependency into a Product as best we can
@@ -162,7 +162,7 @@ public MetadataItem get(String metadataIdentificationString) {
 					// Strip the ${ } from the version sequence
 					String propertyName = versionSequence.replace("${", "").replace("}", "");
 					Set<Property> prop = result.getPropertiesExcludingValue(new Property(propertyName));
-					if (prop.size() > 0) {
+					if (!prop.isEmpty()) {
 						// Take the first one's value and treat that as the version sequence
 						versionSequence = prop.iterator().next().getValue();
 					}
@@ -176,7 +176,7 @@ public MetadataItem get(String metadataIdentificationString) {
 				uaaRegistrationService.registerProject(product, topLevelPackage.getFullyQualifiedPackageName());
 			}
 		}
-
+		
 		return result;
 	}
 
@@ -206,7 +206,7 @@ public void addDependencies(List<Dependency> dependencies) {
 		if (dependencies.isEmpty()) {
 			return;
 		}
-		ProjectMetadata projectMetadata = (ProjectMetadata) get(ProjectMetadata.getProjectIdentifier());
+		ProjectMetadata projectMetadata = (ProjectMetadata) metadataService.get(ProjectMetadata.getProjectIdentifier());
 		Assert.notNull(projectMetadata, "Project metadata is not yet available, so dependency addition is unavailable");
 		if (projectMetadata.isAllDependenciesRegistered(dependencies)) {
 			return;
@@ -237,7 +237,7 @@ public void addDependencies(List<Dependency> dependencies) {
 
 	public void addDependency(Dependency dependency) {
 		Assert.notNull(dependency, "Dependency to add required");
-		ProjectMetadata projectMetadata = (ProjectMetadata) get(ProjectMetadata.getProjectIdentifier());
+		ProjectMetadata projectMetadata = (ProjectMetadata) metadataService.get(ProjectMetadata.getProjectIdentifier());
 		Assert.notNull(projectMetadata, "Project metadata is not yet available, so dependency addition is unavailable");
 		if (projectMetadata.isDependencyRegistered(dependency)) {
 			return;
@@ -259,7 +259,7 @@ public void removeDependencies(List<Dependency> dependencies) {
 		if (dependencies.isEmpty()) {
 			return;
 		}
-		ProjectMetadata projectMetadata = (ProjectMetadata) get(ProjectMetadata.getProjectIdentifier());
+		ProjectMetadata projectMetadata = (ProjectMetadata) metadataService.get(ProjectMetadata.getProjectIdentifier());
 		Assert.notNull(projectMetadata, "Project metadata is not yet available, so dependency removal is unavailable");
 		if (!projectMetadata.isAnyDependenciesRegistered(dependencies)) {
 			return;
@@ -303,7 +303,7 @@ public void addBuildPlugins(List<Plugin> plugins) {
 		if (plugins.isEmpty()) {
 			return;
 		}
-		ProjectMetadata projectMetadata = (ProjectMetadata) get(ProjectMetadata.getProjectIdentifier());
+		ProjectMetadata projectMetadata = (ProjectMetadata) metadataService.get(ProjectMetadata.getProjectIdentifier());
 		Assert.notNull(projectMetadata, "Project metadata is not yet available, so plugin addition is unavailable");
 		if (projectMetadata.isAllPluginsRegistered(plugins)) {
 			return;
@@ -334,7 +334,7 @@ public void addBuildPlugins(List<Plugin> plugins) {
 
 	public void addBuildPlugin(Plugin plugin) {
 		Assert.notNull(plugin, "Plugin to add required");
-		ProjectMetadata projectMetadata = (ProjectMetadata) get(ProjectMetadata.getProjectIdentifier());
+		ProjectMetadata projectMetadata = (ProjectMetadata) metadataService.get(ProjectMetadata.getProjectIdentifier());
 		Assert.notNull(projectMetadata, "Project metadata is not yet available, so build plugin addition is unavailable");
 		if (projectMetadata.isBuildPluginRegistered(plugin)) {
 			return;
@@ -356,7 +356,7 @@ public void removeBuildPlugins(List<Plugin> plugins) {
 		if (plugins.isEmpty()) {
 			return;
 		}
-		ProjectMetadata projectMetadata = (ProjectMetadata) get(ProjectMetadata.getProjectIdentifier());
+		ProjectMetadata projectMetadata = (ProjectMetadata) metadataService.get(ProjectMetadata.getProjectIdentifier());
 		Assert.notNull(projectMetadata, "Project metadata is not yet available, so plugin removal is unavailable");
 		if (!projectMetadata.isAnyPluginsRegistered(plugins)) {
 			return;
@@ -421,7 +421,7 @@ public void removePluginRepository(Repository repository) {
 
 	public void updateProjectType(ProjectType projectType) {
 		Assert.notNull(projectType, "Project type required");
-		ProjectMetadata projectMetadata = (ProjectMetadata) get(ProjectMetadata.getProjectIdentifier());
+		ProjectMetadata projectMetadata = (ProjectMetadata) metadataService.get(ProjectMetadata.getProjectIdentifier());
 		Assert.notNull(projectMetadata, "Project metadata is not yet available, so dependency addition is unavailable");
 
 		Document document = XmlUtils.readXml(fileManager.getInputStream(pom));
@@ -446,7 +446,7 @@ private void addRepositories(List<Repository> repositories, String containingPat
 		if (repositories.isEmpty()) {
 			return;
 		}
-		ProjectMetadata projectMetadata = (ProjectMetadata) get(ProjectMetadata.getProjectIdentifier());
+		ProjectMetadata projectMetadata = (ProjectMetadata) metadataService.get(ProjectMetadata.getProjectIdentifier());
 		Assert.notNull(projectMetadata, "Project metadata is not yet available, so repository addition is unavailable");
 		if (path.equals("pluginRepository")) {
 			if (projectMetadata.isAllPluginRepositoriesRegistered(repositories)) {
@@ -566,7 +566,7 @@ private Element createRepositoryElement(Document document, Repository repository
 
 	private void addRepository(Repository repository, String containingPath, String path) {
 		Assert.notNull(repository, "Repository required");
-		ProjectMetadata projectMetadata = (ProjectMetadata) get(ProjectMetadata.getProjectIdentifier());
+		ProjectMetadata projectMetadata = (ProjectMetadata) metadataService.get(ProjectMetadata.getProjectIdentifier());
 		Assert.notNull(projectMetadata, "Project metadata is not yet available, so repository addition is unavailable");
 		if (path.equals("pluginRepository")) {
 			if (projectMetadata.isPluginRepositoryRegistered(repository)) {
@@ -593,7 +593,7 @@ private void addRepository(Repository repository, String containingPath, String
 
 	private void removeRepository(Repository repository, String path) {
 		Assert.notNull(repository, "Repository required");
-		ProjectMetadata projectMetadata = (ProjectMetadata) get(ProjectMetadata.getProjectIdentifier());
+		ProjectMetadata projectMetadata = (ProjectMetadata) metadataService.get(ProjectMetadata.getProjectIdentifier());
 		Assert.notNull(projectMetadata, "Project metadata is not yet available, so plugin repository removal is unavailable");
 		if (path.equals("pluginRepository")) {
 			if (!projectMetadata.isPluginRepositoryRegistered(repository)) {
@@ -688,7 +688,7 @@ private Element getPluginElement(Plugin plugin, Document document) {
 
 	public void addProperty(Property property) {
 		Assert.notNull(property, "Property to add required");
-		ProjectMetadata projectMetadata = (ProjectMetadata) get(ProjectMetadata.getProjectIdentifier());
+		ProjectMetadata projectMetadata = (ProjectMetadata) metadataService.get(ProjectMetadata.getProjectIdentifier());
 		Assert.notNull(projectMetadata, "Project metadata is not yet available, so property addition is unavailable");
 		if (projectMetadata.isPropertyRegistered(property)) {
 			return;
@@ -716,7 +716,7 @@ public void addProperty(Property property) {
 
 	public void removeProperty(Property property) {
 		Assert.notNull(property, "Property to remove required");
-		ProjectMetadata projectMetadata = (ProjectMetadata) get(ProjectMetadata.getProjectIdentifier());
+		ProjectMetadata projectMetadata = (ProjectMetadata) metadataService.get(ProjectMetadata.getProjectIdentifier());
 		Assert.notNull(projectMetadata, "Project metadata is not yet available, so property removal is unavailable");
 		if (!projectMetadata.isPropertyRegistered(property)) {
 			return;
@@ -742,7 +742,7 @@ public void removeProperty(Property property) {
 
 	public void addFilter(Filter filter) {
 		Assert.notNull(filter, "Filter to add required");
-		ProjectMetadata projectMetadata = (ProjectMetadata) get(ProjectMetadata.getProjectIdentifier());
+		ProjectMetadata projectMetadata = (ProjectMetadata) metadataService.get(ProjectMetadata.getProjectIdentifier());
 		Assert.notNull(projectMetadata, "Project metadata is not yet available, so filter addition is unavailable");
 		if (projectMetadata.isFilterRegistered(filter)) {
 			return;
@@ -775,7 +775,7 @@ public void addFilter(Filter filter) {
 
 	public void removeFilter(Filter filter) {
 		Assert.notNull(filter, "Filter required");
-		ProjectMetadata projectMetadata = (ProjectMetadata) get(ProjectMetadata.getProjectIdentifier());
+		ProjectMetadata projectMetadata = (ProjectMetadata) metadataService.get(ProjectMetadata.getProjectIdentifier());
 		Assert.notNull(projectMetadata, "Project metadata is not yet available, so filter removal is unavailable");
 		if (!projectMetadata.isFilterRegistered(filter)) {
 			return;
@@ -810,7 +810,7 @@ public void removeFilter(Filter filter) {
 
 	public void addResource(Resource resource) {
 		Assert.notNull(resource, "Resource to add required");
-		ProjectMetadata projectMetadata = (ProjectMetadata) get(ProjectMetadata.getProjectIdentifier());
+		ProjectMetadata projectMetadata = (ProjectMetadata) metadataService.get(ProjectMetadata.getProjectIdentifier());
 		Assert.notNull(projectMetadata, "Project metadata is not yet available, so resource addition is unavailable");
 		if (projectMetadata.isResourceRegistered(resource)) {
 			return;
@@ -857,7 +857,7 @@ public void addResource(Resource resource) {
 
 	public void removeResource(Resource resource) {
 		Assert.notNull(resource, "Resource required");
-		ProjectMetadata projectMetadata = (ProjectMetadata) get(ProjectMetadata.getProjectIdentifier());
+		ProjectMetadata projectMetadata = (ProjectMetadata) metadataService.get(ProjectMetadata.getProjectIdentifier());
 		Assert.notNull(projectMetadata, "Project metadata is not yet available, so resource removal is unavailable");
 		if (!projectMetadata.isResourceRegistered(resource)) {
 			return;
@@ -892,7 +892,7 @@ public void removeResource(Resource resource) {
 	// Remove an element identified by dependency, whenever it occurs at path
 	private void removeDependency(Dependency dependency, String containingPath, String path) {
 		Assert.notNull(dependency, "Dependency to remove required");
-		ProjectMetadata projectMetadata = (ProjectMetadata) get(ProjectMetadata.getProjectIdentifier());
+		ProjectMetadata projectMetadata = (ProjectMetadata) metadataService.get(ProjectMetadata.getProjectIdentifier());
 		Assert.notNull(projectMetadata, "Project metadata is not yet available, so dependency removal is unavailable");
 		if (!projectMetadata.isDependencyRegistered(dependency)) {
 			return;
@@ -919,7 +919,7 @@ private void removeDependency(Dependency dependency, String containingPath, Stri
 	// Remove an element identified by plugin, whenever it occurs at path
 	private void removeBuildPlugin(Plugin plugin, String containingPath, String path) {
 		Assert.notNull(plugin, "Plugin to remove required");
-		ProjectMetadata projectMetadata = (ProjectMetadata) get(ProjectMetadata.getProjectIdentifier());
+		ProjectMetadata projectMetadata = (ProjectMetadata) metadataService.get(ProjectMetadata.getProjectIdentifier());
 		Assert.notNull(projectMetadata, "Project metadata is not yet available, so dependency addition is unavailable");
 		if (!projectMetadata.isBuildPluginRegistered(plugin)) {
 			return;

uaa/src/main/java/org/springframework/roo/uaa/UaaRegistrationServiceImpl.java

@@ -18,20 +18,18 @@
 import org.springframework.uaa.client.TransmissionEventListener;
 import org.springframework.uaa.client.UaaService;
 import org.springframework.uaa.client.protobuf.UaaClient.FeatureUse;
-import org.springframework.uaa.client.protobuf.UaaClient.Product;
 import org.springframework.uaa.client.protobuf.UaaClient.FeatureUse.Builder;
+import org.springframework.uaa.client.protobuf.UaaClient.Product;
 
 /**
  * Default implementation of {@link UaaRegistrationService}.
  * 
  * @author Ben Alex
  * @since 1.1.1
- *
  */
 @Service
 @Component
 public class UaaRegistrationServiceImpl implements UaaRegistrationService, TransmissionEventListener {
-
 	@Reference private UaaService uaaService;
 	@Reference private PublicFeatureResolver publicFeatureResolver;
 	/** key: bundleSymbolicName, value: customJson */
@@ -50,15 +48,15 @@ protected void activate(ComponentContext context) {
 		String bundleSymbolicName = BundleFindingUtils.findFirstBundleForTypeName(context.getBundleContext(), UaaRegistrationServiceImpl.class.getName());
 		registerBundleSymbolicNameUse(bundleSymbolicName, null);
 		if (uaaService instanceof TransmissionAwareUaaService) {
-			((TransmissionAwareUaaService)uaaService).addTransmissionEventListener(this);
+			((TransmissionAwareUaaService) uaaService).addTransmissionEventListener(this);
 		}
 	}
 
 	protected void deactivate(ComponentContext context) {
 		// Last effort to store the data given we're shutting down
 		flushIfPossible();
 		if (uaaService instanceof TransmissionAwareUaaService) {
-			((TransmissionAwareUaaService)uaaService).removeTransmissionEventListener(this);
+			((TransmissionAwareUaaService) uaaService).removeTransmissionEventListener(this);
 		}
 	}
 
@@ -240,5 +238,4 @@ private void populateVersionInfoIfPossible(Builder featureUseBuilder, String bun
 			featureUseBuilder.setSourceControlIdentifier(commitHash);
 		}
 	}
-
 }