Merge pull request #2185 from ligangty/2.7.x

Chore: fix code warnings

Author: ligangty

db/common/src/main/java/org/commonjava/indy/db/common/DefaultArtifactStoreQuery.java

@@ -15,7 +15,6 @@
  */
 package org.commonjava.indy.db.common;
 
-import org.apache.commons.lang3.StringUtils;
 import org.commonjava.indy.data.ArtifactStoreQuery;
 import org.commonjava.indy.data.IndyDataException;
 import org.commonjava.indy.data.StoreDataManager;
@@ -62,13 +61,14 @@
  * Created by jdcasey on 5/10/17.
  */
 // TODO: Eventually, it should probably be an error if packageType isn't set explicitly
+@SuppressWarnings( "unchecked" )
 public class DefaultArtifactStoreQuery<T extends ArtifactStore>
         implements ArtifactStoreQuery<T>
 {
 
     private final Logger logger = LoggerFactory.getLogger( getClass() );
 
-    private StoreDataManager dataManager;
+    private final StoreDataManager dataManager;
 
     private String packageType = MavenPackageTypeDescriptor.MAVEN_PKG_KEY;
 
@@ -82,6 +82,7 @@ public DefaultArtifactStoreQuery( StoreDataManager dataManager )
         this.dataManager = dataManager;
     }
 
+    @SuppressWarnings( "unused" )
     private DefaultArtifactStoreQuery( final StoreDataManager dataManager, final String packageType,
                                        final Boolean enabled, final Class<T> storeCls )
     {
@@ -245,31 +246,27 @@ public T getByName( String name )
     @Override
     @Measure
     public Set<Group> getGroupsContaining( StoreKey storeKey )
-            throws IndyDataException
     {
         return getGroupsContaining( storeKey, Boolean.TRUE );
     }
 
     @Override
     @Measure
     public Set<Group> getGroupsContaining( StoreKey storeKey, Boolean enabled )
-                    throws IndyDataException
     {
         return getAllGroups( storeKey.getPackageType(), enabled ).stream().filter( g -> g.getConstituents().contains( storeKey ) ).collect( Collectors.toSet() );
     }
 
     @Override
     @Measure
     public List<RemoteRepository> getRemoteRepositoryByUrl( String packageType, String url )
-                    throws IndyDataException
     {
         return getRemoteRepositoryByUrl( packageType, url, Boolean.TRUE );
     }
 
     @Override
     @Measure
     public List<RemoteRepository> getRemoteRepositoryByUrl( String packageType, String url, Boolean enabled )
-            throws IndyDataException
     {
         /*
            This filter does these things:
@@ -307,15 +304,12 @@ public List<RemoteRepository> getRemoteRepositoryByUrl( String packageType, Stri
                 return false;
             }
 
-            if ( targetUrlInfo != null )
+            if ( urlInfo.getUrlWithNoSchemeAndLastSlash().equals( targetUrlInfo.getUrlWithNoSchemeAndLastSlash() )
+                    && urlInfo.getProtocol().equals( targetUrlInfo.getProtocol() ) )
             {
-                if ( urlInfo.getUrlWithNoSchemeAndLastSlash().equals( targetUrlInfo.getUrlWithNoSchemeAndLastSlash() )
-                                && urlInfo.getProtocol().equals( targetUrlInfo.getProtocol() ) )
-                {
-                    logger.debug( "Repository found because of same host, url is {}, store key is {}", url,
-                                  store.getKey() );
-                    return true;
-                }
+                logger.debug( "Repository found because of same host, url is {}, store key is {}", url,
+                              store.getKey() );
+                return true;
             }
 
             return false;
@@ -339,32 +333,28 @@ public List<RemoteRepository> getRemoteRepositoryByUrl( String packageType, Stri
                     return false;
                 }
 
-                if (  targetUrlInfo != null )
+                String ipForUrl = null;
+                String ipForTargetUrl = null;
+                try
                 {
-                    String ipForUrl = null;
-                    String ipForTargetUrl = null;
-                    try
+                    ipForUrl = urlInfo.getIpForUrl();
+                    ipForTargetUrl = targetUrlInfo.getIpForUrl();
+                    if ( ipForUrl != null && ipForUrl.equals( ipForTargetUrl )
+                            && urlInfo.getPort() == targetUrlInfo.getPort()
+                            && urlInfo.getFileWithNoLastSlash().equals( targetUrlInfo.getFileWithNoLastSlash() ) )
                     {
-                        ipForUrl = urlInfo.getIpForUrl();
-                        ipForTargetUrl = targetUrlInfo.getIpForUrl();
-                        if ( ipForUrl != null && ipForUrl.equals( ipForTargetUrl )
-                                && urlInfo.getPort() == targetUrlInfo.getPort()
-                                && urlInfo.getFileWithNoLastSlash().equals( targetUrlInfo.getFileWithNoLastSlash() ) )
-                        {
-                            logger.debug( "Repository found because of same ip, url is {}, store key is {}", url,
-                                          store.getKey() );
-                            return true;
-                        }
-                    }
-                    catch ( UnknownHostException ue )
-                    {
-                        logger.warn( "Failed to filter remote: {}, ip fetch error: {}.", store.getKey(), ue.getMessage() );
+                        logger.debug( "Repository found because of same ip, url is {}, store key is {}", url,
+                                      store.getKey() );
+                        return true;
                     }
-
-                    logger.debug( "ip not same: ip for url:{}-{}; ip for searching repo: {}-{}", url, ipForUrl,
-                                  store.getKey(), ipForTargetUrl );
+                }
+                catch ( UnknownHostException ue )
+                {
+                    logger.warn( "Failed to filter remote: {}, ip fetch error: {}.", store.getKey(), ue.getMessage() );
                 }
 
+                logger.debug( "ip not same: ip for url:{}-{}; ip for searching repo: {}-{}", url, ipForUrl,
+                              store.getKey(), ipForTargetUrl );
 
             return false;
         } ).collect(Collectors.toList());