Validate artifactId with PacakgeURL format (#47)

* Validate artifactId with PacakgeURL format

* updating the project version to 0.1.2

Author: rjalander

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>dev.cdevents</groupId>
 	<artifactId>cdevents-sdk-java</artifactId>
-	<version>0.1.0-SNAPSHOT</version>
+	<version>0.1.2-SNAPSHOT</version>
 
 	<name>cdevents-sdk-java</name>
 	<description>cdevents java sdk</description>
@@ -26,6 +26,8 @@
         <assertj-core.version>3.22.0</assertj-core.version>
         <jackson.version>2.15.0</jackson.version>
         <slf4j.version>2.0.7</slf4j.version>
+		<json.schema.version>1.0.80</json.schema.version>
+		<packageurl.version>1.4.1</packageurl.version>
 		<project.github.repository>cdevents/sdk-java</project.github.repository>
 		<nexus.url>https://s01.oss.sonatype.org</nexus.url>
 		<repository.url>[email protected]:${project.github.repository}.git</repository.url>
@@ -111,7 +113,8 @@
         <dependency>
             <groupId>com.networknt</groupId>
             <artifactId>json-schema-validator</artifactId>
-            <version>1.0.80</version>
+			<version>${json.schema.version}</version>
+
         </dependency>
 
 		<dependency>
@@ -128,6 +131,12 @@
 			<scope>runtime</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>com.github.package-url</groupId>
+			<artifactId>packageurl-java</artifactId>
+			<version>${packageurl.version}</version>
+		</dependency>
+
 		<!-- Test dependencies -->
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>

src/main/java/dev/cdevents/events/ArtifactPackagedCDEvent.java

@@ -1,6 +1,7 @@
 package dev.cdevents.events;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.packageurl.PackageURL;
 import dev.cdevents.constants.CDEventConstants;
 import dev.cdevents.models.ArtifactPackagedSubject;
 import dev.cdevents.models.CDEvent;
@@ -169,10 +170,10 @@ public String eventSchema() {
 
     /**
      * @param subjectId
-     * sets the subject Id
+     * sets the subject Id in the PURL format
      */
-    public void setSubjectId(String subjectId) {
-        getSubject().setId(subjectId);
+    public void setSubjectId(PackageURL subjectId) {
+        getSubject().setId(subjectId.toString());
     }
 
     /**

src/main/java/dev/cdevents/events/ArtifactPublishedCDEvent.java

@@ -1,6 +1,7 @@
 package dev.cdevents.events;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.packageurl.PackageURL;
 import dev.cdevents.constants.CDEventConstants;
 import dev.cdevents.models.ArtifactPublishedSubject;
 import dev.cdevents.models.CDEvent;
@@ -149,10 +150,10 @@ public String eventSchema() {
 
     /**
      * @param subjectId
-     * sets the subject Id
+     * sets the subject Id in PURL format
      */
-    public void setSubjectId(String subjectId) {
-        getSubject().setId(subjectId);
+    public void setSubjectId(PackageURL subjectId) {
+        getSubject().setId(subjectId.toString());
     }
 
     /**

src/main/java/dev/cdevents/events/BuildFinishedCDEvent.java

@@ -1,6 +1,7 @@
 package dev.cdevents.events;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.github.packageurl.PackageURL;
 import dev.cdevents.constants.CDEventConstants;
 import dev.cdevents.models.BuildFinishedSubject;
 import dev.cdevents.models.CDEvent;
@@ -169,10 +170,10 @@ public void setSubjectSource(URI subjectSource) {
 
     /**
      * @param artifactId
-     * sets the subjects artifactId
+     * sets the subjects artifactId in PURL format
      */
-    public void setSubjectArtifactId(String artifactId) {
-        getSubject().getContent().setArtifactId(artifactId);
+    public void setSubjectArtifactId(PackageURL artifactId) {
+        getSubject().getContent().setArtifactId(artifactId.toString());
 
     }
 

src/test/java/dev/cdevents/CDEventsTest.java

@@ -1,6 +1,8 @@
 package dev.cdevents;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.github.packageurl.MalformedPackageURLException;
+import com.github.packageurl.PackageURL;
 import dev.cdevents.constants.CDEventConstants;
 import dev.cdevents.events.*;
 import dev.cdevents.exception.CDEventsException;
@@ -648,14 +650,14 @@ void testInvalidBuildStartedEventWithNoSubject() {
     }
 
     @Test
-    void createBuildFinishedAsCloudEvent() {
+    void createBuildFinishedAsCloudEvent() throws MalformedPackageURLException {
 
         BuildFinishedCDEvent cdEvent =  new BuildFinishedCDEvent();
         cdEvent.setSource(URI.create("http://dev.cdevents"));
 
         cdEvent.setSubjectId("test-build");
         cdEvent.setSubjectSource(URI.create("/dev/builds/test-build"));
-        cdEvent.setSubjectArtifactId("pkg:oci/myapp@sha256%3A0b31b1c02ff458ad9b7b81cbdf8f");
+        cdEvent.setSubjectArtifactId(new PackageURL("pkg:oci/myapp@sha256%3A0b31b1c02ff458ad9b7b81cbdf8f"));
 
         String cdEventJson = CDEvents.cdEventAsJson(cdEvent);
 
@@ -846,12 +848,12 @@ void testInvalidTestSuiteFinishedEventWithNoSubject() {
     }
 
     @Test
-    void createArtifactPackagedEventAsCloudEvent() {
+    void createArtifactPackagedEventAsCloudEvent() throws MalformedPackageURLException {
 
         ArtifactPackagedCDEvent cdEvent =  new ArtifactPackagedCDEvent();
         cdEvent.setSource(URI.create("http://dev.cdevents"));
 
-        cdEvent.setSubjectId("pkg:oci/myapp@sha256%3A0b31b1c02ff458ad9b7b");
+        cdEvent.setSubjectId(new PackageURL("pkg:oci/myapp@sha256%3A0b31b1c02ff458ad9b7b"));
         cdEvent.setSubjectSource(URI.create("/dev/artifact/source"));
 
         cdEvent.setSubjectChangeId("test-feature");
@@ -882,11 +884,11 @@ void testInvalidArtifactPackagedEventWithNoSubject() {
     }
 
     @Test
-    void createArtifactPublishedEventAsCloudEvent() {
+    void createArtifactPublishedEventAsCloudEvent() throws MalformedPackageURLException {
         ArtifactPublishedCDEvent cdEvent = new ArtifactPublishedCDEvent();
         cdEvent.setSource(URI.create("http://dev.cdevents"));
 
-        cdEvent.setSubjectId("pkg:oci/myapp@sha256%3A0b31b1c02ff458ad9b7b");
+        cdEvent.setSubjectId(new PackageURL("pkg:oci/myapp@sha256%3A0b31b1c02ff458ad9b7b"));
         cdEvent.setSubjectSource(URI.create("/dev/artifact/source"));
 
         String cdEventJson = CDEvents.cdEventAsJson(cdEvent);