maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject [08/50] [abbrv] maven-aether git commit: Polished code
Date Sat, 07 May 2016 13:30:01 GMT
Polished code


Project: http://git-wip-us.apache.org/repos/asf/maven-aether/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-aether/commit/6734757d
Tree: http://git-wip-us.apache.org/repos/asf/maven-aether/tree/6734757d
Diff: http://git-wip-us.apache.org/repos/asf/maven-aether/diff/6734757d

Branch: refs/heads/ant-tasks
Commit: 6734757d8ee630d9d0a254929b0e2b1f8ef05483
Parents: 69d85aa
Author: Benjamin Bentmann <bentmann@sonatype.com>
Authored: Thu Jan 2 23:03:29 2014 +0100
Committer: Benjamin Bentmann <bentmann@sonatype.com>
Committed: Thu Jan 2 23:03:29 2014 +0100

----------------------------------------------------------------------
 .../java/org/eclipse/aether/ant/AntRepoSys.java | 10 ++---
 .../aether/ant/ProjectWorkspaceReader.java      | 43 ++++++++------------
 2 files changed, 23 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-aether/blob/6734757d/src/main/java/org/eclipse/aether/ant/AntRepoSys.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/eclipse/aether/ant/AntRepoSys.java b/src/main/java/org/eclipse/aether/ant/AntRepoSys.java
index 8c34197..d9af18b 100644
--- a/src/main/java/org/eclipse/aether/ant/AntRepoSys.java
+++ b/src/main/java/org/eclipse/aether/ant/AntRepoSys.java
@@ -101,9 +101,9 @@ public class AntRepoSys
 
     private static final SettingsDecrypter settingsDecrypter = new AntSettingsDecryptorFactory().newInstance();
 
-    private Project project;
+    private final Project project;
 
-    private DefaultServiceLocator locator;
+    private final DefaultServiceLocator locator;
 
     private RepositorySystem repoSys;
 
@@ -115,11 +115,11 @@ public class AntRepoSys
 
     private Settings settings;
 
-    private List<Mirror> mirrors = new CopyOnWriteArrayList<Mirror>();
+    private final List<Mirror> mirrors = new CopyOnWriteArrayList<Mirror>();
 
-    private List<Proxy> proxies = new CopyOnWriteArrayList<Proxy>();
+    private final List<Proxy> proxies = new CopyOnWriteArrayList<Proxy>();
 
-    private List<Authentication> authentications = new CopyOnWriteArrayList<Authentication>();
+    private final List<Authentication> authentications = new CopyOnWriteArrayList<Authentication>();
 
     private LocalRepository localRepository;
 

http://git-wip-us.apache.org/repos/asf/maven-aether/blob/6734757d/src/main/java/org/eclipse/aether/ant/ProjectWorkspaceReader.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/eclipse/aether/ant/ProjectWorkspaceReader.java b/src/main/java/org/eclipse/aether/ant/ProjectWorkspaceReader.java
index 9c3f5fe..9372493 100644
--- a/src/main/java/org/eclipse/aether/ant/ProjectWorkspaceReader.java
+++ b/src/main/java/org/eclipse/aether/ant/ProjectWorkspaceReader.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2012 Sonatype, Inc.
+ * Copyright (c) 2010, 2014 Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,9 +12,9 @@ package org.eclipse.aether.ant;
 
 import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.maven.model.Model;
 import org.eclipse.aether.ant.types.Pom;
@@ -22,6 +22,7 @@ import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.repository.WorkspaceReader;
 import org.eclipse.aether.repository.WorkspaceRepository;
+import org.eclipse.aether.util.artifact.ArtifactIdUtils;
 
 /**
  * Workspace reader caching available POMs and artifacts for ant builds.
@@ -34,18 +35,19 @@ public class ProjectWorkspaceReader
     implements WorkspaceReader
 {
 
-    private static ProjectWorkspaceReader instance;
+    private static volatile ProjectWorkspaceReader instance;
 
-    private static Object lock = new Object();
+    private static final Object LOCK = new Object();
 
-    private Map<String, File> artifacts = Collections.synchronizedMap( new HashMap<String,
File>() );
+    private Map<String, File> artifacts = new ConcurrentHashMap<String, File>();
 
     public void addPom( Pom pom )
     {
         if ( pom.getFile() != null )
         {
             Model model = pom.getModel( pom );
-            String coords = coords( new DefaultArtifact( model.getGroupId(), model.getArtifactId(),
null, "pom", model.getVersion() ) );
+            String coords =
+                coords( new DefaultArtifact( model.getGroupId(), model.getArtifactId(), null,
"pom", model.getVersion() ) );
             artifacts.put( coords, pom.getFile() );
         }
     }
@@ -63,8 +65,7 @@ public class ProjectWorkspaceReader
                 Model model = pom.getModel( pom );
                 aetherArtifact =
                     new DefaultArtifact( model.getGroupId(), model.getArtifactId(), artifact.getClassifier(),
-                                             artifact.getType(),
-                                             model.getVersion() );
+                                         artifact.getType(), model.getVersion() );
             }
             else
             {
@@ -80,13 +81,7 @@ public class ProjectWorkspaceReader
 
     private String coords( Artifact artifact )
     {
-        StringBuilder buffer = new StringBuilder( 128 );
-        buffer.append( artifact.getGroupId() );
-        buffer.append( ':' ).append( artifact.getArtifactId() );
-        buffer.append( ':' ).append( artifact.getExtension() );
-        buffer.append( ':' ).append( artifact.getClassifier() );
-        buffer.append( ':' ).append( artifact.getVersion() );
-        return buffer.toString();
+        return ArtifactIdUtils.toId( artifact );
     }
 
     public WorkspaceRepository getRepository()
@@ -110,22 +105,20 @@ public class ProjectWorkspaceReader
 
     public static ProjectWorkspaceReader getInstance()
     {
-        if ( instance != null )
+        if ( instance == null )
         {
-            return instance;
-        }
-
-        synchronized ( lock )
-        {
-            if ( instance == null )
+            synchronized ( LOCK )
             {
-                instance = new ProjectWorkspaceReader();
+                if ( instance == null )
+                {
+                    instance = new ProjectWorkspaceReader();
+                }
             }
-            return instance;
         }
+        return instance;
     }
 
-    public static void dropInstance()
+    static void dropInstance()
     {
         instance = null;
     }


Mime
View raw message