diff --git a/.github/workflows/artifacts.yaml b/.github/workflows/artifacts.yaml deleted file mode 100644 index 5bf7a22..0000000 --- a/.github/workflows/artifacts.yaml +++ /dev/null @@ -1,33 +0,0 @@ -name: Verify Artifacts - -on: - workflow_call: - - workflow_dispatch: - - pull_request: - paths: - - "artifacts/**" - -jobs: - verify-formatting: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - uses: ./.github/actions/setup-java - - name: Run Checkstyle - working-directory: ./artifacts - run: | - ./gradlew checkstyleMain checkstyleTest - - verify-artifacts: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - uses: ./.github/actions/setup-java - - name: Checks artifacts - working-directory: ./artifacts - run: | - ./gradlew test diff --git a/artifacts/src/test/java/org/eclipse/dsp/context/fixtures/AbstractJsonLdTest.java b/artifacts/src/test/java/org/eclipse/dsp/context/fixtures/AbstractJsonLdTest.java index 08a809e..ee55589 100644 --- a/artifacts/src/test/java/org/eclipse/dsp/context/fixtures/AbstractJsonLdTest.java +++ b/artifacts/src/test/java/org/eclipse/dsp/context/fixtures/AbstractJsonLdTest.java @@ -36,12 +36,12 @@ import static com.apicatalog.jsonld.JsonLd.compact; import static com.apicatalog.jsonld.JsonLd.expand; -import static org.eclipse.dsp.DspConstants.DSP_CONTEXT; -import static org.eclipse.dsp.DspConstants.DSP_PREFIX; -import static org.eclipse.dsp.DspConstants.ODRL_CONTEXT; import static com.networknt.schema.SpecVersion.VersionFlag.V202012; import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; +import static org.eclipse.dsp.DspConstants.DSP_CONTEXT; +import static org.eclipse.dsp.DspConstants.DSP_PREFIX; +import static org.eclipse.dsp.DspConstants.ODRL_CONTEXT; /** * Base class for Json-Ld expansion and compaction tests. @@ -79,7 +79,7 @@ void setUp() { mapper.registerModule(new JSONPModule()); try (var dspaceStream = getClass().getResourceAsStream("/context/dspace.jsonld"); - var odrlStream = getClass().getResourceAsStream("/context/odrl.jsonld")) { + var odrlStream = getClass().getResourceAsStream("/context/odrl.jsonld")) { var dspaceContext = mapper.readValue(dspaceStream, JsonObject.class); @SuppressWarnings("DataFlowIssue") Map cache = Map.of(DSP_CONTEXT, JsonDocument.of(dspaceContext), @@ -97,7 +97,7 @@ void setUp() { private static class LocalDocumentLoader implements DocumentLoader { private final Map contexts = new HashMap<>(); - public LocalDocumentLoader(Map contexts) { + LocalDocumentLoader(Map contexts) { this.contexts.putAll(contexts); } diff --git a/artifacts/src/test/java/org/eclipse/dsp/schema/transfer/InvalidTransferStartMessageSchemaTest.java b/artifacts/src/test/java/org/eclipse/dsp/schema/transfer/InvalidTransferStartMessageSchemaTest.java index 1d692ad..a2de26e 100644 --- a/artifacts/src/test/java/org/eclipse/dsp/schema/transfer/InvalidTransferStartMessageSchemaTest.java +++ b/artifacts/src/test/java/org/eclipse/dsp/schema/transfer/InvalidTransferStartMessageSchemaTest.java @@ -25,9 +25,9 @@ public class InvalidTransferStartMessageSchemaTest extends AbstractSchemaTest { @Test void verifyInvalidCases() { - assertThat(schema.validate(INVALID_NO_TYPE, JSON).iterator().next().getType()).isEqualTo(REQUIRED); - assertThat(schema.validate(INVALID_NO_PROVIDER_ID, JSON).iterator().next().getType()).isEqualTo(REQUIRED); - assertThat(schema.validate(INVALID_NO_CONSUMER_ID, JSON).iterator().next().getType()).isEqualTo(REQUIRED); + assertThat(schema.validate(INVALID_NO_TYPE, JSON).iterator().next().getType()).isEqualTo(REQUIRED); + assertThat(schema.validate(INVALID_NO_PROVIDER_ID, JSON).iterator().next().getType()).isEqualTo(REQUIRED); + assertThat(schema.validate(INVALID_NO_CONSUMER_ID, JSON).iterator().next().getType()).isEqualTo(REQUIRED); } @BeforeEach