Use 'mvn-utils' version 1.0.0 (#23)

Author: jmini

build.gradle

@@ -43,6 +43,7 @@ task javadocJar(type: Jar) {
 }
 
 dependencies {
+    implementation "fr.jmini.utils:mvn-utils:$mvnUtils"
     implementation "biz.aQute.bnd:biz.aQute.bnd:$bndVersion"
     implementation "com.google.code.gson:gson:$gsonVersion"
 

gradle.properties

@@ -7,6 +7,7 @@ assertjVersion=3.11.1
 bndVersion=5.3.0
 junitVersion=5.7.1
 gsonVersion=2.8.7
+mvnUtils=1.0.0
 
 githubRepositoryOwner=jmini
 githubRepositoryName=ecentral

src/main/java/fr/jmini/utils/ecentral/Algorithm.java

@@ -12,7 +12,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.security.MessageDigest;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -25,6 +24,10 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 
+import fr.jmini.utils.mvnutils.Algorithm;
+import fr.jmini.utils.mvnutils.Maven;
+import fr.jmini.utils.mvnutils.MavenArtifact;
+
 public class ECentralTask {
 
     private static final String GROUP_ID = "fr.jmini.ecentral";
@@ -43,7 +46,6 @@ public ECentralTask(Input input) {
 
     public void run() {
         try {
-            Files.createDirectories(getMavenBomFile().getParent());
             Files.createDirectories(getDataFolder());
             runInternal();
         } catch (IOException e) {
@@ -272,7 +274,7 @@ private void createMavenArtifacts() throws IOException {
     }
 
     private static boolean checkArtifactInMavenCentral(MavenArtifact artifact) {
-        String centralUrl = computeMavenCentralUrl(artifact);
+        String centralUrl = Maven.jarMavenCentralUrl(artifact);
         try {
             HttpURLConnection connection = (HttpURLConnection) new URL(centralUrl).openConnection();
             connection.setRequestMethod("HEAD");
@@ -283,49 +285,10 @@ private static boolean checkArtifactInMavenCentral(MavenArtifact artifact) {
         }
     }
 
-    static String computeMavenCentralUrl(MavenArtifact artifact) {
-        return computeMavenCentralUrl(artifact, ".jar");
-    }
-
-    static String computeMavenCentralUrl(MavenArtifact artifact, String extension) {
-        // See https://github.com/eclipse/aether-core/blob/aether-0.9.1.v20140329/aether-util/src/main/java/org/eclipse/aether/util/repository/layout/MavenDefaultLayout.java#L42
-
-        StringBuilder sb = new StringBuilder();
-        sb.append("https://repo1.maven.org/maven2/");
-        sb.append(subPathInMavenRepo(artifact, extension));
-        return sb.toString();
-    }
-
-    private static String subPathInMavenRepo(MavenArtifact artifact, String extension) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(artifact.getGroupId()
-                .replace('.', '/'));
-        sb.append('/');
-        sb.append(artifact.getArtifactId());
-        sb.append('/');
-        sb.append(artifact.getVersion());
-        sb.append('/');
-        sb.append(artifact.getArtifactId());
-        sb.append('-');
-        sb.append(artifact.getVersion());
-        sb.append(extension);
-        return sb.toString();
-    }
-
     private void createMavenBomFile() throws IOException {
         List<MavenArtifact> entries = parseArtifactsFile(getMavenArtifactsFile());
         String content = createMavenBomContent(entries);
-        Files.writeString(getMavenBomFile(), content, StandardCharsets.UTF_8);
-
-        writeHash(content, Algorithm.MD_5);
-        writeHash(content, Algorithm.SHA_1);
-        writeHash(content, Algorithm.SHA_256);
-        writeHash(content, Algorithm.SHA_512);
-    }
-
-    private void writeHash(String content, Algorithm algorithm) throws IOException {
-        String hash = calculateHash(content, algorithm);
-        Files.writeString(getMavenBomFile(".pom" + algorithm.getExtension()), hash, StandardCharsets.UTF_8);
+        Maven.writeFileToRepositoryWithArmoredFiles(Paths.get("repo"), getBomArtifact(), ".pom", content, Algorithm.MD_5, Algorithm.SHA_1, Algorithm.SHA_256, Algorithm.SHA_512);
     }
 
     private String createMavenBomContent(List<MavenArtifact> entries) {
@@ -376,25 +339,6 @@ private String createMavenBomContent(List<MavenArtifact> entries) {
         return sb.toString();
     }
 
-    static String calculateHash(String content, Algorithm algorithm) {
-        MessageDigest digest = algorithm.getMessageDigest();
-        byte[] encodedhash = digest.digest(
-                content.getBytes(StandardCharsets.UTF_8));
-        return bytesToHex(encodedhash);
-    }
-
-    private static String bytesToHex(byte[] hash) {
-        StringBuilder hexString = new StringBuilder(2 * hash.length);
-        for (int i = 0; i < hash.length; i++) {
-            String hex = Integer.toHexString(0xff & hash[i]);
-            if (hex.length() == 1) {
-                hexString.append('0');
-            }
-            hexString.append(hex);
-        }
-        return hexString.toString();
-    }
-
     private void writeArtifactsToFile(Path file, List<MavenArtifact> artifacts) throws IOException {
         Gson gson = new GsonBuilder()
                 .setPrettyPrinting()
@@ -425,13 +369,7 @@ private Path getMavenArtifactsFile() {
         return getDataFolder().resolve("maven-artifacts.json");
     }
 
-    private Path getMavenBomFile() {
-        return getMavenBomFile(".pom");
-    }
-
-    private Path getMavenBomFile(String extension) {
-        MavenArtifact artifact = new MavenArtifact(GROUP_ID, ARTIFACT_ID, input.getReleaseVersion());
-        return Paths.get("repo")
-                .resolve(subPathInMavenRepo(artifact, extension));
+    private MavenArtifact getBomArtifact() {
+        return new MavenArtifact(GROUP_ID, ARTIFACT_ID, input.getReleaseVersion());
     }
 }

src/main/java/fr/jmini/utils/ecentral/ECentralTask.java

@@ -7,6 +7,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import fr.jmini.utils.mvnutils.MavenArtifact;
+
 class ECentralTaskTest {
     @Test
     void testParseBndEntry() throws Exception {
@@ -233,35 +235,4 @@ void testConvertVersion() throws Exception {
                 .isEqualTo("4.12.0");
     }
 
-    @Test
-    void testComputeMavenCentralUrl() throws Exception {
-        MavenArtifact a = new MavenArtifact("org.eclipse.platform", "org.eclipse.ant.core", "3.5.600");
-        assertThat(ECentralTask.computeMavenCentralUrl(a))
-                .as("url of the jar in maven central")
-                .isEqualTo("https://repo1.maven.org/maven2/org/eclipse/platform/org.eclipse.ant.core/3.5.600/org.eclipse.ant.core-3.5.600.jar");
-
-        assertThat(ECentralTask.computeMavenCentralUrl(a, ".pom"))
-                .as("url of the pom in maven central")
-                .isEqualTo("https://repo1.maven.org/maven2/org/eclipse/platform/org.eclipse.ant.core/3.5.600/org.eclipse.ant.core-3.5.600.pom");
-
-        assertThat(ECentralTask.computeMavenCentralUrl(a, ".jar.asc"))
-                .as("url of the armored ASCII file of the jar in maven central")
-                .isEqualTo("https://repo1.maven.org/maven2/org/eclipse/platform/org.eclipse.ant.core/3.5.600/org.eclipse.ant.core-3.5.600.jar.asc");
-
-    }
-
-    @Test
-    void testCalculateHash() throws Exception {
-        String md5 = ECentralTask.calculateHash("test", Algorithm.MD_5);
-        assertThat(md5).isEqualTo("098f6bcd4621d373cade4e832627b4f6");
-
-        String sha1 = ECentralTask.calculateHash("test", Algorithm.SHA_1);
-        assertThat(sha1).isEqualTo("a94a8fe5ccb19ba61c4c0873d391e987982fbbd3");
-
-        String sha256 = ECentralTask.calculateHash("test", Algorithm.SHA_256);
-        assertThat(sha256).isEqualTo("9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08");
-
-        String sha512 = ECentralTask.calculateHash("test", Algorithm.SHA_512);
-        assertThat(sha512).isEqualTo("ee26b0dd4af7e749aa1a8ee3c10ae9923f618980772e473f8819a5d4940e0db27ac185f8a0e1d5f84f88bc887fd67b143732c304cc5fa9ad8e6f57f50028a8ff");
-    }
 }