Contribute MD5 via artifactChecksums extension point instead of MD5Verifier processing step

Since now, artifact checksums are verified exclusively by the
combination of ChecksumVerifier processing step + contributions to
artifactChecksums extension point.

There are no more internal usages of MD5Verifier and it can be
removed. But let it sit here for some time.

ChecksumUtilitiesTest ensures that MD5 checksums from
IArtifactDescriptor.ARTIFACT_MD5 and IArtifactDescriptor.DOWNLOAD_MD5
properties are still honored.

Change-Id: Ib4bec48504c3b2f4296425f6d2e930e402b5b984
Signed-off-by: Mykola Nikishov <mn@mn.com.ua>

2 files changed, 12 insertions, 15 deletions

diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/checksum/ChecksumUtilities.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/checksum/ChecksumUtilities.java
index 9a478c069..317778e28 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/checksum/ChecksumUtilities.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/checksum/ChecksumUtilities.java
@@ -19,7 +19,6 @@ import java.security.NoSuchAlgorithmException;
 import java.util.*;
 import java.util.Map.Entry;
 import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.internal.p2.artifact.processors.md5.MD5Verifier;
 import org.eclipse.equinox.internal.p2.artifact.repository.Messages;
 import org.eclipse.equinox.internal.p2.repository.Activator;
 import org.eclipse.equinox.internal.p2.repository.helpers.ChecksumHelper;
@@ -67,9 +66,6 @@ public class ChecksumUtilities {
 			}
 		}
 
-		Optional<MD5Verifier> legacyMd5Verifier = getLegacyMd5Verifier(checksums.get(ChecksumHelper.MD5));
-		legacyMd5Verifier.ifPresent(verifier -> steps.add(verifier));
-
 		return steps;
 	}
 
@@ -138,17 +134,6 @@ public class ChecksumUtilities {
 		return properties;
 	}
 
-	private static Optional<MD5Verifier> getLegacyMd5Verifier(String md5) {
-		if (md5 != null) {
-			@SuppressWarnings("resource") //It's used later so shouldn't be closed
-			MD5Verifier checksumVerifier = new MD5Verifier(md5);
-			if (checksumVerifier.getStatus().isOK())
-				return Optional.of(checksumVerifier);
-		}
-
-		return Optional.empty();
-	}
-
 	private static void putLegacyMd5Property(String propertyNamespace, Map<String, String> checksums, HashMap<String, String> result) {
 		String md5 = checksums.get(ChecksumHelper.MD5);
 		if (md5 != null) {
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/checksum/ChecksumVerifier.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/checksum/ChecksumVerifier.java
index 1e1d4fe55..3335fdb48 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/checksum/ChecksumVerifier.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/checksum/ChecksumVerifier.java
@@ -73,4 +73,16 @@ final public class ChecksumVerifier extends MessageDigestProcessingStep {
 			setStatus(new Status(IStatus.ERROR, Activator.ID, ProvisionException.ARTIFACT_MD5_NOT_MATCH, NLS.bind(Messages.Error_unexpected_checksum, new Object[] {algorithmName, expectedChecksum, digestString}), null));
 	}
 
+	public String getExpectedChecksum() {
+		return expectedChecksum;
+	}
+
+	public String getAlgorithmName() {
+		return algorithmName;
+	}
+
+	public String getAlgorithmId() {
+		return algorithmId;
+	}
+
 }