Skip to content

Commit 545d69f

Browse files
aalmirayaalmiray
authored
Fix #71 Load JSON schemas from classpath (#76)
Closes #71 Signed-off-by: Andres Almiray <[email protected]>
1 parent dd13d25 commit 545d69f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+103
-361
lines changed

‎generator/src/main/resources/template/event-template.mustache‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,12 @@ package dev.cdevents.events;
2222

2323

2424
import dev.cdevents.constants.CDEventConstants;
25-
import dev.cdevents.exception.CDEventsException;
2625
import dev.cdevents.models.CDEvent;
2726
import dev.cdevents.models.{{subject}}.{{predicate}}.*;
2827

2928
import java.net.URI;
3029
import java.util.Date;
3130
import java.util.UUID;
32-
import java.io.IOException;
33-
import java.nio.file.Files;
34-
import java.nio.file.Paths;
3531

3632

3733
public class {{capitalizedSubject}}{{capitalizedPredicate}}CDEvent extends {{capitalizedSubject}}{{predicate}} implements CDEvent {
@@ -103,11 +99,7 @@ public class {{capitalizedSubject}}{{capitalizedPredicate}}CDEvent extends {{cap
10399

104100
@Override
105101
public String eventSchema() {
106-
try {
107-
return Files.readString(Paths.get(CDEventConstants.SCHEMA_FOLDER + "/{{schemaFileName}}"));
108-
} catch (IOException e) {
109-
throw new CDEventsException("Exception while reading Event JsonSchema file ", e);
110-
}
102+
return dev.cdevents.spec.schemas.SchemaLoader.loadSchema("{{schemaFileName}}");
111103
}
112104

113105

‎sdk/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
<goal>copy-resources</goal>
100100
</goals>
101101
<configuration>
102-
<outputDirectory>${project.build.directory}/schemas/spec/schemas</outputDirectory>
102+
<outputDirectory>${project.build.directory}/schemas/dev/cdevents/spec/schemas</outputDirectory>
103103
<resources>
104104
<resource>
105105
<directory>../spec/schemas</directory>

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,12 @@
2222

2323

2424
import dev.cdevents.constants.CDEventConstants;
25-
import dev.cdevents.exception.CDEventsException;
2625
import dev.cdevents.models.CDEvent;
2726
import dev.cdevents.models.artifact.packaged.*;
2827

2928
import java.net.URI;
3029
import java.util.Date;
3130
import java.util.UUID;
32-
import java.io.IOException;
33-
import java.nio.file.Files;
34-
import java.nio.file.Paths;
3531

3632

3733
public class ArtifactPackagedCDEvent extends Artifactpackaged implements CDEvent {
@@ -101,11 +97,7 @@ public String schemaURL() {
10197

10298
@Override
10399
public String eventSchema() {
104-
try {
105-
return Files.readString(Paths.get(CDEventConstants.SCHEMA_FOLDER + "/artifactpackaged.json"));
106-
} catch (IOException e) {
107-
throw new CDEventsException("Exception while reading Event JsonSchema file ", e);
108-
}
100+
return dev.cdevents.spec.schemas.SchemaLoader.loadSchema("artifactpackaged.json");
109101
}
110102

111103

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,12 @@
2222

2323

2424
import dev.cdevents.constants.CDEventConstants;
25-
import dev.cdevents.exception.CDEventsException;
2625
import dev.cdevents.models.CDEvent;
2726
import dev.cdevents.models.artifact.published.*;
2827

2928
import java.net.URI;
3029
import java.util.Date;
3130
import java.util.UUID;
32-
import java.io.IOException;
33-
import java.nio.file.Files;
34-
import java.nio.file.Paths;
3531

3632

3733
public class ArtifactPublishedCDEvent extends Artifactpublished implements CDEvent {
@@ -100,11 +96,7 @@ public String schemaURL() {
10096

10197
@Override
10298
public String eventSchema() {
103-
try {
104-
return Files.readString(Paths.get(CDEventConstants.SCHEMA_FOLDER + "/artifactpublished.json"));
105-
} catch (IOException e) {
106-
throw new CDEventsException("Exception while reading Event JsonSchema file ", e);
107-
}
99+
return dev.cdevents.spec.schemas.SchemaLoader.loadSchema("artifactpublished.json");
108100
}
109101

110102

‎sdk/src/main/java/dev/cdevents/events/ArtifactSignedCDEvent.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,12 @@
2222

2323

2424
import dev.cdevents.constants.CDEventConstants;
25-
import dev.cdevents.exception.CDEventsException;
2625
import dev.cdevents.models.CDEvent;
2726
import dev.cdevents.models.artifact.signed.*;
2827

2928
import java.net.URI;
3029
import java.util.Date;
3130
import java.util.UUID;
32-
import java.io.IOException;
33-
import java.nio.file.Files;
34-
import java.nio.file.Paths;
3531

3632

3733
public class ArtifactSignedCDEvent extends Artifactsigned implements CDEvent {
@@ -100,11 +96,7 @@ public String schemaURL() {
10096

10197
@Override
10298
public String eventSchema() {
103-
try {
104-
return Files.readString(Paths.get(CDEventConstants.SCHEMA_FOLDER + "/artifactsigned.json"));
105-
} catch (IOException e) {
106-
throw new CDEventsException("Exception while reading Event JsonSchema file ", e);
107-
}
99+
return dev.cdevents.spec.schemas.SchemaLoader.loadSchema("artifactsigned.json");
108100
}
109101

110102

‎sdk/src/main/java/dev/cdevents/events/BranchCreatedCDEvent.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,12 @@
2222

2323

2424
import dev.cdevents.constants.CDEventConstants;
25-
import dev.cdevents.exception.CDEventsException;
2625
import dev.cdevents.models.CDEvent;
2726
import dev.cdevents.models.branch.created.*;
2827

2928
import java.net.URI;
3029
import java.util.Date;
3130
import java.util.UUID;
32-
import java.io.IOException;
33-
import java.nio.file.Files;
34-
import java.nio.file.Paths;
3531

3632

3733
public class BranchCreatedCDEvent extends Branchcreated implements CDEvent {
@@ -101,11 +97,7 @@ public String schemaURL() {
10197

10298
@Override
10399
public String eventSchema() {
104-
try {
105-
return Files.readString(Paths.get(CDEventConstants.SCHEMA_FOLDER + "/branchcreated.json"));
106-
} catch (IOException e) {
107-
throw new CDEventsException("Exception while reading Event JsonSchema file ", e);
108-
}
100+
return dev.cdevents.spec.schemas.SchemaLoader.loadSchema("branchcreated.json");
109101
}
110102

111103

‎sdk/src/main/java/dev/cdevents/events/BranchDeletedCDEvent.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,12 @@
2222

2323

2424
import dev.cdevents.constants.CDEventConstants;
25-
import dev.cdevents.exception.CDEventsException;
2625
import dev.cdevents.models.CDEvent;
2726
import dev.cdevents.models.branch.deleted.*;
2827

2928
import java.net.URI;
3029
import java.util.Date;
3130
import java.util.UUID;
32-
import java.io.IOException;
33-
import java.nio.file.Files;
34-
import java.nio.file.Paths;
3531

3632

3733
public class BranchDeletedCDEvent extends Branchdeleted implements CDEvent {
@@ -101,11 +97,7 @@ public String schemaURL() {
10197

10298
@Override
10399
public String eventSchema() {
104-
try {
105-
return Files.readString(Paths.get(CDEventConstants.SCHEMA_FOLDER + "/branchdeleted.json"));
106-
} catch (IOException e) {
107-
throw new CDEventsException("Exception while reading Event JsonSchema file ", e);
108-
}
100+
return dev.cdevents.spec.schemas.SchemaLoader.loadSchema("branchdeleted.json");
109101
}
110102

111103

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,12 @@
2222

2323

2424
import dev.cdevents.constants.CDEventConstants;
25-
import dev.cdevents.exception.CDEventsException;
2625
import dev.cdevents.models.CDEvent;
2726
import dev.cdevents.models.build.finished.*;
2827

2928
import java.net.URI;
3029
import java.util.Date;
3130
import java.util.UUID;
32-
import java.io.IOException;
33-
import java.nio.file.Files;
34-
import java.nio.file.Paths;
3531

3632

3733
public class BuildFinishedCDEvent extends Buildfinished implements CDEvent {
@@ -100,11 +96,7 @@ public String schemaURL() {
10096

10197
@Override
10298
public String eventSchema() {
103-
try {
104-
return Files.readString(Paths.get(CDEventConstants.SCHEMA_FOLDER + "/buildfinished.json"));
105-
} catch (IOException e) {
106-
throw new CDEventsException("Exception while reading Event JsonSchema file ", e);
107-
}
99+
return dev.cdevents.spec.schemas.SchemaLoader.loadSchema("buildfinished.json");
108100
}
109101

110102

‎sdk/src/main/java/dev/cdevents/events/BuildQueuedCDEvent.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,12 @@
2222

2323

2424
import dev.cdevents.constants.CDEventConstants;
25-
import dev.cdevents.exception.CDEventsException;
2625
import dev.cdevents.models.CDEvent;
2726
import dev.cdevents.models.build.queued.*;
2827

2928
import java.net.URI;
3029
import java.util.Date;
3130
import java.util.UUID;
32-
import java.io.IOException;
33-
import java.nio.file.Files;
34-
import java.nio.file.Paths;
3531

3632

3733
public class BuildQueuedCDEvent extends Buildqueued implements CDEvent {
@@ -100,11 +96,7 @@ public String schemaURL() {
10096

10197
@Override
10298
public String eventSchema() {
103-
try {
104-
return Files.readString(Paths.get(CDEventConstants.SCHEMA_FOLDER + "/buildqueued.json"));
105-
} catch (IOException e) {
106-
throw new CDEventsException("Exception while reading Event JsonSchema file ", e);
107-
}
99+
return dev.cdevents.spec.schemas.SchemaLoader.loadSchema("buildqueued.json");
108100
}
109101

110102

‎sdk/src/main/java/dev/cdevents/events/BuildStartedCDEvent.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,12 @@
2222

2323

2424
import dev.cdevents.constants.CDEventConstants;
25-
import dev.cdevents.exception.CDEventsException;
2625
import dev.cdevents.models.CDEvent;
2726
import dev.cdevents.models.build.started.*;
2827

2928
import java.net.URI;
3029
import java.util.Date;
3130
import java.util.UUID;
32-
import java.io.IOException;
33-
import java.nio.file.Files;
34-
import java.nio.file.Paths;
3531

3632

3733
public class BuildStartedCDEvent extends Buildstarted implements CDEvent {
@@ -100,11 +96,7 @@ public String schemaURL() {
10096

10197
@Override
10298
public String eventSchema() {
103-
try {
104-
return Files.readString(Paths.get(CDEventConstants.SCHEMA_FOLDER + "/buildstarted.json"));
105-
} catch (IOException e) {
106-
throw new CDEventsException("Exception while reading Event JsonSchema file ", e);
107-
}
99+
return dev.cdevents.spec.schemas.SchemaLoader.loadSchema("buildstarted.json");
108100
}
109101

110102

0 commit comments

Comments
 (0)