Code cleanup and pom migration

pom.xml

@@ -2,23 +2,23 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.airlift</groupId>
+        <groupId>com.facebook.airlift</groupId>
         <artifactId>airbase</artifactId>
-        <version>134</version>
+        <version>105</version>
     </parent>
 
-    <groupId>io.airlift.resolver</groupId>
+    <groupId>com.facebook.airlift.resolver</groupId>
     <artifactId>resolver-root</artifactId>
-    <version>1.7.4-wxd</version>
+    <version>1.7-SNASPSHOT</version>
     <packaging>pom</packaging>
 
     <description>Resolve the dependencies of Maven coordinates or POM file</description>
     <name>${project.artifactId}</name>
     <inceptionYear>2013</inceptionYear>
 
     <scm>
-        <connection>scm:git:git://github.com/airlift/resolver.git</connection>
-        <url>https://github.com/airlift/resolver</url>
+        <connection>scm:git:git://github.com/prestodb/resolver.git</connection>
+        <url>https://github.com/prestodb/resolver</url>
         <tag>HEAD</tag>
     </scm>
 
@@ -37,7 +37,7 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>io.airlift.resolver</groupId>
+                <groupId>com.facebook.airlift.resolver</groupId>
                 <artifactId>resolver</artifactId>
                 <version>${project.version}</version>
             </dependency>

resolver-integration/pom.xml

@@ -2,12 +2,11 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.airlift.resolver</groupId>
+        <groupId>com.facebook.airlift.resolver</groupId>
         <artifactId>resolver-root</artifactId>
-        <version>1.7.4-wxd</version>
+        <version>1.7-SNASPSHOT</version>
     </parent>
 
-    <groupId>io.airlift.resolver</groupId>
     <artifactId>resolver-integration</artifactId>
     <packaging>jar</packaging>
 
@@ -18,7 +17,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.airlift.resolver</groupId>
+            <groupId>com.facebook.airlift.resolver</groupId>
             <artifactId>resolver</artifactId>
             <scope>test</scope>
         </dependency>

resolver-integration/src/main/java/io/airlift/resolver/Lame.java → resolver-integration/src/main/java/com/facebook/airlift/resolver/Lame.java

@@ -1,4 +1,4 @@
-package io.airlift.resolver;
+package com.facebook.airlift.resolver;
 
 public class Lame {
     // TODO remove this when the maven build is fixed so we can release

resolver-integration/src/test/java/io/airlift/resolver/TestArtifactResolve.java → resolver-integration/src/test/java/com/facebook/airlift/resolver/TestArtifactResolve.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.airlift.resolver;
+package com.facebook.airlift.resolver;
 
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
@@ -21,7 +21,7 @@
 import java.io.File;
 import java.util.List;
 
-import static io.airlift.resolver.ArtifactResolver.MAVEN_CENTRAL_URI;
+import static com.facebook.airlift.resolver.ArtifactResolver.MAVEN_CENTRAL_URI;
 
 // NOTE: Intellij does not resolver this class correctly since the resolver jar is generated by the assembler plugin
 public class TestArtifactResolve

resolver/pom.xml

@@ -2,16 +2,16 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.airlift.resolver</groupId>
+        <groupId>com.facebook.airlift.resolver</groupId>
         <artifactId>resolver-root</artifactId>
-        <version>1.7.4-wxd</version>
+        <version>1.7-SNASPSHOT</version>
     </parent>
 
-    <groupId>io.airlift.resolver</groupId>
     <artifactId>resolver</artifactId>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+        <dep.slf4j.version>2.0.16</dep.slf4j.version>
     </properties>
 
     <dependencies>
@@ -98,6 +98,14 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
+            <version>${dep.slf4j.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>${dep.slf4j.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

resolver/src/main/java/io/airlift/resolver/ArtifactResolver.java → resolver/src/main/java/com/facebook/airlift/resolver/ArtifactResolver.java

@@ -11,13 +11,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.airlift.resolver;
+package com.facebook.airlift.resolver;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import io.airlift.resolver.internal.ConsoleRepositoryListener;
-import io.airlift.resolver.internal.ConsoleTransferListener;
-import io.airlift.resolver.internal.DefaultArtifactResolver;
+import com.facebook.airlift.resolver.internal.ConsoleRepositoryListener;
+import com.facebook.airlift.resolver.internal.ConsoleTransferListener;
+import com.facebook.airlift.resolver.internal.DefaultArtifactResolver;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.project.DefaultProjectBuildingRequest;
 import org.apache.maven.project.MavenProject;

resolver/src/main/java/io/airlift/resolver/Main.java → resolver/src/main/java/com/facebook/airlift/resolver/Main.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.airlift.resolver;
+package com.facebook.airlift.resolver;
 
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
@@ -20,8 +20,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static io.airlift.resolver.ArtifactResolver.MAVEN_CENTRAL_URI;
-import static io.airlift.resolver.ArtifactResolver.USER_LOCAL_REPO;
+import static com.facebook.airlift.resolver.ArtifactResolver.MAVEN_CENTRAL_URI;
+import static com.facebook.airlift.resolver.ArtifactResolver.USER_LOCAL_REPO;
 
 public class Main
 {

resolver/src/main/java/io/airlift/resolver/internal/ConsoleRepositoryListener.java → resolver/src/main/java/com/facebook/airlift/resolver/internal/ConsoleRepositoryListener.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.airlift.resolver.internal;
+package com.facebook.airlift.resolver.internal;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

resolver/src/main/java/io/airlift/resolver/internal/ConsoleTransferListener.java → resolver/src/main/java/com/facebook/airlift/resolver/internal/ConsoleTransferListener.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.airlift.resolver.internal;
+package com.facebook.airlift.resolver.internal;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

resolver/src/main/java/io/airlift/resolver/internal/DefaultArtifactResolver.java → resolver/src/main/java/com/facebook/airlift/resolver/internal/DefaultArtifactResolver.java

@@ -1,4 +1,4 @@
-package io.airlift.resolver.internal;
+package com.facebook.airlift.resolver.internal;
 
 import java.io.File;
 import java.io.IOException;
@@ -65,7 +65,7 @@
 public class DefaultArtifactResolver implements ArtifactResolver, Service {
     private static final String CONFIG_PROP_SNAPSHOT_NORMALIZATION = "aether.artifactResolver.snapshotNormalization";
     private static final String CONFIG_PROP_SIMPLE_LRM_INTEROP = "aether.artifactResolver.simpleLrmInterop";
-    private static final Logger LOGGER = LoggerFactory.getLogger(io.airlift.resolver.internal.DefaultArtifactResolver.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultArtifactResolver.class);
     private FileProcessor fileProcessor;
     private RepositoryEventDispatcher repositoryEventDispatcher;
     private VersionResolver versionResolver;
@@ -109,56 +109,56 @@ public void initService(ServiceLocator locator) {
 
     /** @deprecated */
     @Deprecated
-    public io.airlift.resolver.internal.DefaultArtifactResolver setLoggerFactory(org.eclipse.aether.spi.log.LoggerFactory loggerFactory) {
+    public DefaultArtifactResolver setLoggerFactory(org.eclipse.aether.spi.log.LoggerFactory loggerFactory) {
         return this;
     }
 
-    public io.airlift.resolver.internal.DefaultArtifactResolver setFileProcessor(FileProcessor fileProcessor) {
+    public DefaultArtifactResolver setFileProcessor(FileProcessor fileProcessor) {
         this.fileProcessor = (FileProcessor)Objects.requireNonNull(fileProcessor, "file processor cannot be null");
         return this;
     }
 
-    public io.airlift.resolver.internal.DefaultArtifactResolver setRepositoryEventDispatcher(RepositoryEventDispatcher repositoryEventDispatcher) {
+    public DefaultArtifactResolver setRepositoryEventDispatcher(RepositoryEventDispatcher repositoryEventDispatcher) {
         this.repositoryEventDispatcher = (RepositoryEventDispatcher)Objects.requireNonNull(repositoryEventDispatcher, "repository event dispatcher cannot be null");
         return this;
     }
 
-    public io.airlift.resolver.internal.DefaultArtifactResolver setVersionResolver(VersionResolver versionResolver) {
+    public DefaultArtifactResolver setVersionResolver(VersionResolver versionResolver) {
         this.versionResolver = (VersionResolver)Objects.requireNonNull(versionResolver, "version resolver cannot be null");
         return this;
     }
 
-    public io.airlift.resolver.internal.DefaultArtifactResolver setUpdateCheckManager(UpdateCheckManager updateCheckManager) {
+    public DefaultArtifactResolver setUpdateCheckManager(UpdateCheckManager updateCheckManager) {
         this.updateCheckManager = (UpdateCheckManager)Objects.requireNonNull(updateCheckManager, "update check manager cannot be null");
         return this;
     }
 
-    public io.airlift.resolver.internal.DefaultArtifactResolver setRepositoryConnectorProvider(RepositoryConnectorProvider repositoryConnectorProvider) {
+    public DefaultArtifactResolver setRepositoryConnectorProvider(RepositoryConnectorProvider repositoryConnectorProvider) {
         this.repositoryConnectorProvider = (RepositoryConnectorProvider)Objects.requireNonNull(repositoryConnectorProvider, "repository connector provider cannot be null");
         return this;
     }
 
-    public io.airlift.resolver.internal.DefaultArtifactResolver setRemoteRepositoryManager(RemoteRepositoryManager remoteRepositoryManager) {
+    public DefaultArtifactResolver setRemoteRepositoryManager(RemoteRepositoryManager remoteRepositoryManager) {
         this.remoteRepositoryManager = (RemoteRepositoryManager)Objects.requireNonNull(remoteRepositoryManager, "remote repository provider cannot be null");
         return this;
     }
 
-    public io.airlift.resolver.internal.DefaultArtifactResolver setSyncContextFactory(SyncContextFactory syncContextFactory) {
+    public DefaultArtifactResolver setSyncContextFactory(SyncContextFactory syncContextFactory) {
         this.syncContextFactory = (SyncContextFactory)Objects.requireNonNull(syncContextFactory, "sync context factory cannot be null");
         return this;
     }
 
-    public io.airlift.resolver.internal.DefaultArtifactResolver setOfflineController(OfflineController offlineController) {
+    public DefaultArtifactResolver setOfflineController(OfflineController offlineController) {
         this.offlineController = (OfflineController)Objects.requireNonNull(offlineController, "offline controller cannot be null");
         return this;
     }
 
-    public io.airlift.resolver.internal.DefaultArtifactResolver setArtifactResolverPostProcessors(Map<String, ArtifactResolverPostProcessor> artifactResolverPostProcessors) {
+    public DefaultArtifactResolver setArtifactResolverPostProcessors(Map<String, ArtifactResolverPostProcessor> artifactResolverPostProcessors) {
         this.artifactResolverPostProcessors = (Map)Objects.requireNonNull(artifactResolverPostProcessors, "artifact resolver post-processors cannot be null");
         return this;
     }
 
-    public io.airlift.resolver.internal.DefaultArtifactResolver setRemoteRepositoryFilterManager(RemoteRepositoryFilterManager remoteRepositoryFilterManager) {
+    public DefaultArtifactResolver setRemoteRepositoryFilterManager(RemoteRepositoryFilterManager remoteRepositoryFilterManager) {
         this.remoteRepositoryFilterManager = (RemoteRepositoryFilterManager)Objects.requireNonNull(remoteRepositoryFilterManager, "remote repository filter manager cannot be null");
         return this;
     }
@@ -213,7 +213,7 @@ private List<ArtifactResult> resolve(RepositorySystemSession session, Collection
         boolean simpleLrmInterop = ConfigUtils.getBoolean(session, false, new String[]{"aether.artifactResolver.simpleLrmInterop"});
         LocalRepositoryManager lrm = session.getLocalRepositoryManager();
         WorkspaceReader workspace = session.getWorkspaceReader();
-        List<io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionGroup> groups = new ArrayList();
+        List<DefaultArtifactResolver.ResolutionGroup> groups = new ArrayList();
         RemoteRepositoryFilter filter = this.remoteRepositoryFilterManager.getRemoteRepositoryFilter(session);
         Iterator var10 = requests.iterator();
 
@@ -310,7 +310,7 @@ private List<ArtifactResult> resolve(RepositorySystemSession session, Collection
 
                         LOGGER.debug("Resolving artifact {} from {}", artifact, remoteRepositories);
                         AtomicBoolean resolved = new AtomicBoolean(false);
-                        Iterator<io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionGroup> groupIt = groups.iterator();
+                        Iterator<DefaultArtifactResolver.ResolutionGroup> groupIt = groups.iterator();
                         Iterator var23 = ((List)filteredRemoteRepositories).iterator();
 
                         while(true) {
@@ -334,23 +334,23 @@ private List<ArtifactResult> resolve(RepositorySystemSession session, Collection
                                 }
                             }
 
-                            io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionGroup group = null;
+                            DefaultArtifactResolver.ResolutionGroup group = null;
 
                             while(groupIt.hasNext()) {
-                                io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionGroup t = (io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionGroup)groupIt.next();
+                                DefaultArtifactResolver.ResolutionGroup t = (DefaultArtifactResolver.ResolutionGroup)groupIt.next();
                                 if (t.matches(repo)) {
                                     group = t;
                                     break;
                                 }
                             }
 
                             if (group == null) {
-                                group = new io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionGroup(repo);
+                                group = new DefaultArtifactResolver.ResolutionGroup(repo);
                                 groups.add(group);
                                 groupIt = Collections.emptyIterator();
                             }
 
-                            group.items.add(new io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionItem(trace, artifact, resolved, result, local, repo));
+                            group.items.add(new DefaultArtifactResolver.ResolutionItem(trace, artifact, resolved, result, local, repo));
                         }
                     }
                 }
@@ -359,7 +359,7 @@ private List<ArtifactResult> resolve(RepositorySystemSession session, Collection
             var10 = groups.iterator();
 
             while(var10.hasNext()) {
-                io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionGroup group = (io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionGroup)var10.next();
+                DefaultArtifactResolver.ResolutionGroup group = (DefaultArtifactResolver.ResolutionGroup)var10.next();
                 this.performDownloads(session, group);
             }
 
@@ -441,7 +441,7 @@ private File getFile(RepositorySystemSession session, Artifact artifact, File fi
         return file;
     }
 
-    private void performDownloads(RepositorySystemSession session, io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionGroup group) {
+    private void performDownloads(RepositorySystemSession session, DefaultArtifactResolver.ResolutionGroup group) {
         List<ArtifactDownload> downloads = this.gatherDownloads(session, group);
         if (!downloads.isEmpty()) {
             Iterator var4 = downloads.iterator();
@@ -485,21 +485,21 @@ private void performDownloads(RepositorySystemSession session, io.airlift.resolv
         }
     }
 
-    private List<ArtifactDownload> gatherDownloads(RepositorySystemSession session, io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionGroup group) {
+    private List<ArtifactDownload> gatherDownloads(RepositorySystemSession session, DefaultArtifactResolver.ResolutionGroup group) {
         LocalRepositoryManager lrm = session.getLocalRepositoryManager();
         List<ArtifactDownload> downloads = new ArrayList();
         Iterator var5 = group.items.iterator();
 
         while(true) {
             while(true) {
-                io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionItem item;
+                DefaultArtifactResolver.ResolutionItem item;
                 Artifact artifact;
                 do {
                     if (!var5.hasNext()) {
                         return downloads;
                     }
 
-                    item = (io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionItem)var5.next();
+                    item = (DefaultArtifactResolver.ResolutionItem)var5.next();
                     artifact = item.artifact;
                 } while(item.resolved.get());
 
@@ -542,12 +542,12 @@ private List<ArtifactDownload> gatherDownloads(RepositorySystemSession session,
         }
     }
 
-    private void evaluateDownloads(RepositorySystemSession session, io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionGroup group) {
+    private void evaluateDownloads(RepositorySystemSession session, DefaultArtifactResolver.ResolutionGroup group) {
         LocalRepositoryManager lrm = session.getLocalRepositoryManager();
         Iterator var4 = group.items.iterator();
 
         while(var4.hasNext()) {
-            io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionItem item = (io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionItem)var4.next();
+            DefaultArtifactResolver.ResolutionItem item = (DefaultArtifactResolver.ResolutionItem)var4.next();
             ArtifactDownload download = item.download;
             if (download != null) {
                 Artifact artifact = download.getArtifact();
@@ -625,7 +625,7 @@ private void artifactDownloaded(RepositorySystemSession session, RequestTrace tr
 
     static class ResolutionGroup {
         final RemoteRepository repository;
-        final List<io.airlift.resolver.internal.DefaultArtifactResolver.ResolutionItem> items = new ArrayList();
+        final List<DefaultArtifactResolver.ResolutionItem> items = new ArrayList();
 
         ResolutionGroup(RemoteRepository repository) {
             this.repository = repository;

resolver/src/main/java/io/airlift/resolver/internal/SafeTransferListener.java → resolver/src/main/java/com/facebook/airlift/resolver/internal/SafeTransferListener.java

@@ -1,4 +1,4 @@
-package io.airlift.resolver.internal;
+package com.facebook.airlift.resolver.internal;
 
 
 import org.eclipse.aether.RepositorySystemSession;
@@ -12,12 +12,12 @@
 import java.util.Objects;
 
 class SafeTransferListener extends AbstractTransferListener {
-    private static final Logger LOGGER = LoggerFactory.getLogger(io.airlift.resolver.internal.SafeTransferListener.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SafeTransferListener.class);
     private final TransferListener listener;
 
     public static TransferListener wrap(RepositorySystemSession session) {
         TransferListener listener = session.getTransferListener();
-        return listener == null ? null : new io.airlift.resolver.internal.SafeTransferListener(listener);
+        return listener == null ? null : new SafeTransferListener(listener);
     }
 
     protected SafeTransferListener(RepositorySystemSession session) {