Browse Source

Trying to remove compiler warning

pull/46/head
Martin Stockhammer 6 years ago
parent
commit
60bbe9dde6

+ 49
- 3
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java View File

@@ -166,7 +166,7 @@ public class CleanupReleasedSnapshotsRepositoryPurge

if ( needsMetadataUpdate )
{
updateMetadata( path );
updateMetadata( artifactRef );
}
}
catch ( LayoutException e )
@@ -183,17 +183,63 @@ public class CleanupReleasedSnapshotsRepositoryPurge
}
}

private void updateMetadata( String path )

/*
* TODO: Uses a deprecated API, but if we use the API with location string, it does not work as expected
* -> not sure what needs to be changed here.
*/
@SuppressWarnings( "deprecation" )
private void updateMetadata( ArtifactReference artifact )
{
VersionedReference versionRef = new VersionedReference( );
versionRef.setGroupId( artifact.getGroupId( ) );
versionRef.setArtifactId( artifact.getArtifactId( ) );
versionRef.setVersion( artifact.getVersion( ) );

ProjectReference projectRef = new ProjectReference( );
projectRef.setGroupId( artifact.getGroupId( ) );
projectRef.setArtifactId( artifact.getArtifactId( ) );

try
{
metadataTools.updateMetadata( repository, path );
metadataTools.updateMetadata( repository, versionRef );
}
catch ( ContentNotFoundException e )
{
// Ignore. (Just means we have no snapshot versions left to reference).
}
catch ( RepositoryMetadataException e )
{
// Ignore.
}
catch ( IOException e )
{
// Ignore.
}
catch ( LayoutException e )
{
// Ignore.
}

try
{
metadataTools.updateMetadata( repository, projectRef );
}
catch ( ContentNotFoundException e )
{
// Ignore. (Just means we have no snapshot versions left to reference).
}
catch ( RepositoryMetadataException e )
{
// Ignore.
}
catch ( IOException e )
{
// Ignore.
}
catch ( LayoutException e )
{
// Ignore.
}
}
}

+ 1
- 0
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurgeTest.java View File

@@ -171,6 +171,7 @@ public class CleanupReleasedSnapshotsRepositoryPurgeTest

XMLAssert.assertXpathEvaluatesTo( "2.3", "//metadata/versioning/release", metadataXml );
XMLAssert.assertXpathEvaluatesTo( "2.3", "//metadata/versioning/latest", metadataXml );
System.out.println(metadataXml);
XMLAssert.assertXpathsEqual( "//expected/versions/version", expectedVersions,
"//metadata/versioning/versions/version", metadataXml );
XMLAssert.assertXpathEvaluatesTo( "20070315032817", "//metadata/versioning/lastUpdated", metadataXml );

+ 2
- 0
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java View File

@@ -285,6 +285,8 @@ public class MetadataTools
return reference;
}



public String toPath( ProjectReference reference )
{
StringBuilder path = new StringBuilder();

Loading…
Cancel
Save