Fix #71 Load JSON schemas from classpath

Closes #71 Signed-off-by: Andres Almiray <[email protected]>
cdevents · Feb 13, 2024 · 39cf879 · 39cf879
1 parent dd13d25
commit 39cf879
Show file tree

Hide file tree

Showing 43 changed files with 103 additions and 361 deletions.
diff --git a/generator/src/main/resources/template/event-template.mustache b/generator/src/main/resources/template/event-template.mustache
@@ -22,16 +22,12 @@ package dev.cdevents.events;
 
 
 import dev.cdevents.constants.CDEventConstants;
-import dev.cdevents.exception.CDEventsException;
 import dev.cdevents.models.CDEvent;
 import dev.cdevents.models.{{subject}}.{{predicate}}.*;
 
 import java.net.URI;
 import java.util.Date;
 import java.util.UUID;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 
 
 public class {{capitalizedSubject}}{{capitalizedPredicate}}CDEvent extends {{capitalizedSubject}}{{predicate}} implements CDEvent {
@@ -103,11 +99,7 @@ public class {{capitalizedSubject}}{{capitalizedPredicate}}CDEvent extends {{cap
 
     @Override
     public String eventSchema() {
-        try {
-            return Files.readString(Paths.get(CDEventConstants.SCHEMA_FOLDER + "/{{schemaFileName}}"));
-        } catch (IOException e) {
-            throw new CDEventsException("Exception while reading Event JsonSchema file ", e);
-        }
+        return dev.cdevents.spec.schemas.SchemaLoader.loadSchema("{{schemaFileName}}");
     }
 
 

diff --git a/sdk/pom.xml b/sdk/pom.xml
@@ -99,7 +99,7 @@
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${project.build.directory}/schemas/spec/schemas</outputDirectory>
+                            <outputDirectory>${project.build.directory}/schemas/dev/cdevents/spec/schemas</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>../spec/schemas</directory>

diff --git a/sdk/src/main/java/dev/cdevents/events/ArtifactPackagedCDEvent.java b/sdk/src/main/java/dev/cdevents/events/ArtifactPackagedCDEvent.java
@@ -22,16 +22,12 @@
 
 
 import dev.cdevents.constants.CDEventConstants;
-import dev.cdevents.exception.CDEventsException;
 import dev.cdevents.models.CDEvent;
 import dev.cdevents.models.artifact.packaged.*;
 
 import java.net.URI;
 import java.util.Date;
 import java.util.UUID;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 
 
 public class ArtifactPackagedCDEvent extends Artifactpackaged implements CDEvent {
@@ -101,11 +97,7 @@ public String schemaURL() {
 
     @Override
     public String eventSchema() {
-        try {
-            return Files.readString(Paths.get(CDEventConstants.SCHEMA_FOLDER + "/artifactpackaged.json"));
-        } catch (IOException e) {
-            throw new CDEventsException("Exception while reading Event JsonSchema file ", e);
-        }
+        return dev.cdevents.spec.schemas.SchemaLoader.loadSchema("artifactpackaged.json");
     }
 
 

diff --git a/sdk/src/main/java/dev/cdevents/events/ArtifactPublishedCDEvent.java b/sdk/src/main/java/dev/cdevents/events/ArtifactPublishedCDEvent.java
@@ -22,16 +22,12 @@
 
 
 import dev.cdevents.constants.CDEventConstants;
-import dev.cdevents.exception.CDEventsException;
 import dev.cdevents.models.CDEvent;
 import dev.cdevents.models.artifact.published.*;
 
 import java.net.URI;
 import java.util.Date;
 import java.util.UUID;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 
 
 public class ArtifactPublishedCDEvent extends Artifactpublished implements CDEvent {
@@ -100,11 +96,7 @@ public String schemaURL() {
 
     @Override
     public String eventSchema() {
-        try {
-            return Files.readString(Paths.get(CDEventConstants.SCHEMA_FOLDER + "/artifactpublished.json"));
-        } catch (IOException e) {
-            throw new CDEventsException("Exception while reading Event JsonSchema file ", e);
-        }
+        return dev.cdevents.spec.schemas.SchemaLoader.loadSchema("artifactpublished.json");
     }
 
 

diff --git a/sdk/src/main/java/dev/cdevents/events/ArtifactSignedCDEvent.java b/sdk/src/main/java/dev/cdevents/events/ArtifactSignedCDEvent.java
@@ -22,16 +22,12 @@
 
 
 import dev.cdevents.constants.CDEventConstants;
-import dev.cdevents.exception.CDEventsException;
 import dev.cdevents.models.CDEvent;
 import dev.cdevents.models.artifact.signed.*;
 
 import java.net.URI;
 import java.util.Date;
 import java.util.UUID;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 
 
 public class ArtifactSignedCDEvent extends Artifactsigned implements CDEvent {
@@ -100,11 +96,7 @@ public String schemaURL() {
 
     @Override
     public String eventSchema() {
-        try {
-            return Files.readString(Paths.get(CDEventConstants.SCHEMA_FOLDER + "/artifactsigned.json"));
-        } catch (IOException e) {
-            throw new CDEventsException("Exception while reading Event JsonSchema file ", e);
-        }
+        return dev.cdevents.spec.schemas.SchemaLoader.loadSchema("artifactsigned.json");
     }
 
 

diff --git a/sdk/src/main/java/dev/cdevents/events/BranchCreatedCDEvent.java b/sdk/src/main/java/dev/cdevents/events/BranchCreatedCDEvent.java
@@ -22,16 +22,12 @@
 
 
 import dev.cdevents.constants.CDEventConstants;
-import dev.cdevents.exception.CDEventsException;
 import dev.cdevents.models.CDEvent;
 import dev.cdevents.models.branch.created.*;
 
 import java.net.URI;
 import java.util.Date;
 import java.util.UUID;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 
 
 public class BranchCreatedCDEvent extends Branchcreated implements CDEvent {
@@ -101,11 +97,7 @@ public String schemaURL() {
 
     @Override
     public String eventSchema() {
-        try {
-            return Files.readString(Paths.get(CDEventConstants.SCHEMA_FOLDER + "/branchcreated.json"));
-        } catch (IOException e) {
-            throw new CDEventsException("Exception while reading Event JsonSchema file ", e);
-        }
+        return dev.cdevents.spec.schemas.SchemaLoader.loadSchema("branchcreated.json");
     }
 
 

diff --git a/sdk/src/main/java/dev/cdevents/events/BranchDeletedCDEvent.java b/sdk/src/main/java/dev/cdevents/events/BranchDeletedCDEvent.java
@@ -22,16 +22,12 @@
 
 
 import dev.cdevents.constants.CDEventConstants;
-import dev.cdevents.exception.CDEventsException;
 import dev.cdevents.models.CDEvent;
 import dev.cdevents.models.branch.deleted.*;
 
 import java.net.URI;
 import java.util.Date;
 import java.util.UUID;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 
 
 public class BranchDeletedCDEvent extends Branchdeleted implements CDEvent {
@@ -101,11 +97,7 @@ public String schemaURL() {
 
     @Override
     public String eventSchema() {
-        try {
-            return Files.readString(Paths.get(CDEventConstants.SCHEMA_FOLDER + "/branchdeleted.json"));
-        } catch (IOException e) {
-            throw new CDEventsException("Exception while reading Event JsonSchema file ", e);
-        }
+        return dev.cdevents.spec.schemas.SchemaLoader.loadSchema("branchdeleted.json");
     }
 
 

diff --git a/sdk/src/main/java/dev/cdevents/events/BuildFinishedCDEvent.java b/sdk/src/main/java/dev/cdevents/events/BuildFinishedCDEvent.java
@@ -22,16 +22,12 @@
 
 
 import dev.cdevents.constants.CDEventConstants;
-import dev.cdevents.exception.CDEventsException;
 import dev.cdevents.models.CDEvent;
 import dev.cdevents.models.build.finished.*;
 
 import java.net.URI;
 import java.util.Date;
 import java.util.UUID;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 
 
 public class BuildFinishedCDEvent extends Buildfinished implements CDEvent {
@@ -100,11 +96,7 @@ public String schemaURL() {
 
     @Override
     public String eventSchema() {
-        try {
-            return Files.readString(Paths.get(CDEventConstants.SCHEMA_FOLDER + "/buildfinished.json"));
-        } catch (IOException e) {
-            throw new CDEventsException("Exception while reading Event JsonSchema file ", e);
-        }
+        return dev.cdevents.spec.schemas.SchemaLoader.loadSchema("buildfinished.json");
     }
 
 

diff --git a/sdk/src/main/java/dev/cdevents/events/BuildQueuedCDEvent.java b/sdk/src/main/java/dev/cdevents/events/BuildQueuedCDEvent.java
@@ -22,16 +22,12 @@
 
 
 import dev.cdevents.constants.CDEventConstants;
-import dev.cdevents.exception.CDEventsException;
 import dev.cdevents.models.CDEvent;
 import dev.cdevents.models.build.queued.*;
 
 import java.net.URI;
 import java.util.Date;
 import java.util.UUID;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 
 
 public class BuildQueuedCDEvent extends Buildqueued implements CDEvent {
@@ -100,11 +96,7 @@ public String schemaURL() {
 
     @Override
     public String eventSchema() {
-        try {
-            return Files.readString(Paths.get(CDEventConstants.SCHEMA_FOLDER + "/buildqueued.json"));
-        } catch (IOException e) {
-            throw new CDEventsException("Exception while reading Event JsonSchema file ", e);
-        }
+        return dev.cdevents.spec.schemas.SchemaLoader.loadSchema("buildqueued.json");
     }
 
 

diff --git a/sdk/src/main/java/dev/cdevents/events/BuildStartedCDEvent.java b/sdk/src/main/java/dev/cdevents/events/BuildStartedCDEvent.java
@@ -22,16 +22,12 @@
 
 
 import dev.cdevents.constants.CDEventConstants;
-import dev.cdevents.exception.CDEventsException;
 import dev.cdevents.models.CDEvent;
 import dev.cdevents.models.build.started.*;
 
 import java.net.URI;
 import java.util.Date;
 import java.util.UUID;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 
 
 public class BuildStartedCDEvent extends Buildstarted implements CDEvent {
@@ -100,11 +96,7 @@ public String schemaURL() {
 
     @Override
     public String eventSchema() {
-        try {
-            return Files.readString(Paths.get(CDEventConstants.SCHEMA_FOLDER + "/buildstarted.json"));
-        } catch (IOException e) {
-            throw new CDEventsException("Exception while reading Event JsonSchema file ", e);
-        }
+        return dev.cdevents.spec.schemas.SchemaLoader.loadSchema("buildstarted.json");
     }
 
 

diff --git a/sdk/src/main/java/dev/cdevents/events/ChangeAbandonedCDEvent.java b/sdk/src/main/java/dev/cdevents/events/ChangeAbandonedCDEvent.java
@@ -22,16 +22,12 @@
 
 
 import dev.cdevents.constants.CDEventConstants;
-import dev.cdevents.exception.CDEventsException;
 import dev.cdevents.models.CDEvent;
 import dev.cdevents.models.change.abandoned.*;
 
 import java.net.URI;
 import java.util.Date;
 import java.util.UUID;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 
 
 public class ChangeAbandonedCDEvent extends Changeabandoned implements CDEvent {
@@ -101,11 +97,7 @@ public String schemaURL() {
 
     @Override
     public String eventSchema() {
-        try {
-            return Files.readString(Paths.get(CDEventConstants.SCHEMA_FOLDER + "/changeabandoned.json"));
-        } catch (IOException e) {
-            throw new CDEventsException("Exception while reading Event JsonSchema file ", e);
-        }
+        return dev.cdevents.spec.schemas.SchemaLoader.loadSchema("changeabandoned.json");
     }
 
 

diff --git a/sdk/src/main/java/dev/cdevents/events/ChangeCreatedCDEvent.java b/sdk/src/main/java/dev/cdevents/events/ChangeCreatedCDEvent.java
@@ -22,16 +22,12 @@
 
 
 import dev.cdevents.constants.CDEventConstants;
-import dev.cdevents.exception.CDEventsException;
 import dev.cdevents.models.CDEvent;
 import dev.cdevents.models.change.created.*;
 
 import java.net.URI;
 import java.util.Date;
 import java.util.UUID;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 
 
 public class ChangeCreatedCDEvent extends Changecreated implements CDEvent {
@@ -101,11 +97,7 @@ public String schemaURL() {
 
     @Override
     public String eventSchema() {
-        try {
-            return Files.readString(Paths.get(CDEventConstants.SCHEMA_FOLDER + "/changecreated.json"));
-        } catch (IOException e) {
-            throw new CDEventsException("Exception while reading Event JsonSchema file ", e);
-        }
+        return dev.cdevents.spec.schemas.SchemaLoader.loadSchema("changecreated.json");
     }
 
 

diff --git a/sdk/src/main/java/dev/cdevents/events/ChangeMergedCDEvent.java b/sdk/src/main/java/dev/cdevents/events/ChangeMergedCDEvent.java
@@ -22,16 +22,12 @@
 
 
 import dev.cdevents.constants.CDEventConstants;
-import dev.cdevents.exception.CDEventsException;
 import dev.cdevents.models.CDEvent;
 import dev.cdevents.models.change.merged.*;
 
 import java.net.URI;
 import java.util.Date;
 import java.util.UUID;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 
 
 public class ChangeMergedCDEvent extends Changemerged implements CDEvent {
@@ -101,11 +97,7 @@ public String schemaURL() {
 
     @Override
     public String eventSchema() {
-        try {
-            return Files.readString(Paths.get(CDEventConstants.SCHEMA_FOLDER + "/changemerged.json"));
-        } catch (IOException e) {
-            throw new CDEventsException("Exception while reading Event JsonSchema file ", e);
-        }
+        return dev.cdevents.spec.schemas.SchemaLoader.loadSchema("changemerged.json");
     }
 
 

diff --git a/sdk/src/main/java/dev/cdevents/events/ChangeReviewedCDEvent.java b/sdk/src/main/java/dev/cdevents/events/ChangeReviewedCDEvent.java
@@ -22,16 +22,12 @@
 
 
 import dev.cdevents.constants.CDEventConstants;
-import dev.cdevents.exception.CDEventsException;
 import dev.cdevents.models.CDEvent;
 import dev.cdevents.models.change.reviewed.*;
 
 import java.net.URI;
 import java.util.Date;
 import java.util.UUID;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 
 
 public class ChangeReviewedCDEvent extends Changereviewed implements CDEvent {
@@ -101,11 +97,7 @@ public String schemaURL() {
 
     @Override
     public String eventSchema() {
-        try {
-            return Files.readString(Paths.get(CDEventConstants.SCHEMA_FOLDER + "/changereviewed.json"));
-        } catch (IOException e) {
-            throw new CDEventsException("Exception while reading Event JsonSchema file ", e);
-        }
+        return dev.cdevents.spec.schemas.SchemaLoader.loadSchema("changereviewed.json");
     }