Merge pull request #1358 from ligangty/promote

 Add target for validation only when no "availableInStores" specified

Author: jdcasey

addons/promote/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidationTools.java

@@ -149,15 +149,25 @@ public PromotionValidationTools( final ContentManager manager, final StoreDataMa
         this.promoteConfig = config;
     }
 
-    public StoreKey[] getValidationStoreKeys( final ValidationRequest request, final boolean includeSource )
+    public StoreKey[] getValidationStoreKeys( final ValidationRequest request )
             throws PromotionValidationException
     {
-        return getValidationStoreKeys( request, includeSource, true );
+        return getValidationStoreKeys( request, false );
     }
 
+    /**
+     * @deprecated This method now is only used for api backward compatible
+     */
+    @Deprecated
     public StoreKey[] getValidationStoreKeys( final ValidationRequest request, final boolean includeSource,
                                               final boolean includeTarget )
             throws PromotionValidationException
+    {
+        return getValidationStoreKeys( request, includeSource );
+    }
+
+    public StoreKey[] getValidationStoreKeys( final ValidationRequest request, final boolean includeSource )
+            throws PromotionValidationException
     {
         String verifyStores = request.getValidationParameter( PromotionValidationTools.AVAILABLE_IN_STORES );
         if ( verifyStores == null )
@@ -174,10 +184,7 @@ public StoreKey[] getValidationStoreKeys( final ValidationRequest request, final
             verifyStoreKeys.add( request.getSourceRepository().getKey() );
         }
 
-        if ( includeTarget )
-        {
-            verifyStoreKeys.add( request.getTarget() );
-        }
+
         if ( verifyStores == null )
         {
             logger.warn(
@@ -202,6 +209,11 @@ public StoreKey[] getValidationStoreKeys( final ValidationRequest request, final
             }
         }
 
+        if ( verifyStoreKeys.isEmpty() )
+        {
+            verifyStoreKeys.add( request.getTarget() );
+        }
+
         logger.debug( "Using validation StoreKeys: {}", verifyStoreKeys );
 
         return verifyStoreKeys.toArray( new StoreKey[0] );