Skip to content

Add target for validation only when no "availableInStores" specified #1358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jdcasey merged 2 commits into from
Sep 3, 2019
+18 −6
Merged

Add target for validation only when no "availableInStores" specified #1358

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c84f27
Add target for validation only when no "availableInStores" specified
ligangty Sep 2, 2019
d0f304c
Change method signature and add deprecated to old promote getValidati…
ligangty Sep 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions ...e/common/src/main/java/org/commonjava/indy/promote/validate/PromotionValidationTools.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand All @@ -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(
Expand All @@ -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] );
Expand Down