From 543a2c5bdb74e114fa1c3344137e32ddad1c400f Mon Sep 17 00:00:00 2001 From: Xavi Aracil Date: Thu, 24 Nov 2022 17:09:21 +0100 Subject: [PATCH] Refactored out to a new package --- .../main/java/org/oneedtech/inspect/vc/OB20Inspector.java | 5 +++-- .../inspect/vc/{ => jsonld}/JsonLdGeneratedObject.java | 2 +- .../inspect/vc/{ => jsonld}/probe/JsonLDCompactionProve.java | 4 ++-- .../inspect/vc/{ => jsonld}/probe/JsonLDValidationProbe.java | 4 ++-- .../org/oneedtech/inspect/vc/util/TestOB20Inspector.java | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) rename inspector-vc/src/main/java/org/oneedtech/inspect/vc/{ => jsonld}/JsonLdGeneratedObject.java (91%) rename inspector-vc/src/main/java/org/oneedtech/inspect/vc/{ => jsonld}/probe/JsonLDCompactionProve.java (95%) rename inspector-vc/src/main/java/org/oneedtech/inspect/vc/{ => jsonld}/probe/JsonLDValidationProbe.java (90%) diff --git a/inspector-vc/src/main/java/org/oneedtech/inspect/vc/OB20Inspector.java b/inspector-vc/src/main/java/org/oneedtech/inspect/vc/OB20Inspector.java index dd1f6b7..ef28c04 100644 --- a/inspector-vc/src/main/java/org/oneedtech/inspect/vc/OB20Inspector.java +++ b/inspector-vc/src/main/java/org/oneedtech/inspect/vc/OB20Inspector.java @@ -21,11 +21,12 @@ import org.oneedtech.inspect.util.json.ObjectMapperCache; import org.oneedtech.inspect.util.resource.Resource; import org.oneedtech.inspect.util.resource.ResourceType; import org.oneedtech.inspect.util.spec.Specification; +import org.oneedtech.inspect.vc.jsonld.JsonLdGeneratedObject; +import org.oneedtech.inspect.vc.jsonld.probe.JsonLDCompactionProve; +import org.oneedtech.inspect.vc.jsonld.probe.JsonLDValidationProbe; import org.oneedtech.inspect.vc.payload.PngParser; import org.oneedtech.inspect.vc.payload.SvgParser; import org.oneedtech.inspect.vc.probe.CredentialParseProbe; -import org.oneedtech.inspect.vc.probe.JsonLDCompactionProve; -import org.oneedtech.inspect.vc.probe.JsonLDValidationProbe; import org.oneedtech.inspect.vc.util.CachingDocumentLoader; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/inspector-vc/src/main/java/org/oneedtech/inspect/vc/JsonLdGeneratedObject.java b/inspector-vc/src/main/java/org/oneedtech/inspect/vc/jsonld/JsonLdGeneratedObject.java similarity index 91% rename from inspector-vc/src/main/java/org/oneedtech/inspect/vc/JsonLdGeneratedObject.java rename to inspector-vc/src/main/java/org/oneedtech/inspect/vc/jsonld/JsonLdGeneratedObject.java index 5a529bd..9fdd752 100644 --- a/inspector-vc/src/main/java/org/oneedtech/inspect/vc/JsonLdGeneratedObject.java +++ b/inspector-vc/src/main/java/org/oneedtech/inspect/vc/jsonld/JsonLdGeneratedObject.java @@ -1,4 +1,4 @@ -package org.oneedtech.inspect.vc; +package org.oneedtech.inspect.vc.jsonld; import org.oneedtech.inspect.core.probe.GeneratedObject; diff --git a/inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/JsonLDCompactionProve.java b/inspector-vc/src/main/java/org/oneedtech/inspect/vc/jsonld/probe/JsonLDCompactionProve.java similarity index 95% rename from inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/JsonLDCompactionProve.java rename to inspector-vc/src/main/java/org/oneedtech/inspect/vc/jsonld/probe/JsonLDCompactionProve.java index e849395..284f44b 100644 --- a/inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/JsonLDCompactionProve.java +++ b/inspector-vc/src/main/java/org/oneedtech/inspect/vc/jsonld/probe/JsonLDCompactionProve.java @@ -1,4 +1,4 @@ -package org.oneedtech.inspect.vc.probe; +package org.oneedtech.inspect.vc.jsonld.probe; import java.io.StringReader; import java.net.URI; @@ -8,7 +8,7 @@ import org.oneedtech.inspect.core.probe.Probe; import org.oneedtech.inspect.core.probe.RunContext; import org.oneedtech.inspect.core.report.ReportItems; import org.oneedtech.inspect.vc.Credential; -import org.oneedtech.inspect.vc.JsonLdGeneratedObject; +import org.oneedtech.inspect.vc.jsonld.JsonLdGeneratedObject; import org.oneedtech.inspect.vc.util.CachingDocumentLoader; import com.apicatalog.jsonld.JsonLd; diff --git a/inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/JsonLDValidationProbe.java b/inspector-vc/src/main/java/org/oneedtech/inspect/vc/jsonld/probe/JsonLDValidationProbe.java similarity index 90% rename from inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/JsonLDValidationProbe.java rename to inspector-vc/src/main/java/org/oneedtech/inspect/vc/jsonld/probe/JsonLDValidationProbe.java index 23bc2cd..9a2b1a4 100644 --- a/inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/JsonLDValidationProbe.java +++ b/inspector-vc/src/main/java/org/oneedtech/inspect/vc/jsonld/probe/JsonLDValidationProbe.java @@ -1,4 +1,4 @@ -package org.oneedtech.inspect.vc.probe; +package org.oneedtech.inspect.vc.jsonld.probe; import java.io.StringReader; @@ -6,7 +6,7 @@ import org.oneedtech.inspect.core.probe.Probe; import org.oneedtech.inspect.core.probe.RunContext; import org.oneedtech.inspect.core.report.ReportItems; import org.oneedtech.inspect.vc.Credential; -import org.oneedtech.inspect.vc.JsonLdGeneratedObject; +import org.oneedtech.inspect.vc.jsonld.JsonLdGeneratedObject; import foundation.identity.jsonld.JsonLDObject; import foundation.identity.jsonld.validation.Validation; diff --git a/inspector-vc/src/test/java/org/oneedtech/inspect/vc/util/TestOB20Inspector.java b/inspector-vc/src/test/java/org/oneedtech/inspect/vc/util/TestOB20Inspector.java index e3c51cf..1e80e40 100644 --- a/inspector-vc/src/test/java/org/oneedtech/inspect/vc/util/TestOB20Inspector.java +++ b/inspector-vc/src/test/java/org/oneedtech/inspect/vc/util/TestOB20Inspector.java @@ -9,7 +9,7 @@ import org.oneedtech.inspect.util.resource.ResourceType; import org.oneedtech.inspect.util.spec.Specification; import org.oneedtech.inspect.vc.Assertion; import org.oneedtech.inspect.vc.OB20Inspector; -import org.oneedtech.inspect.vc.probe.JsonLDCompactionProve; +import org.oneedtech.inspect.vc.jsonld.probe.JsonLDCompactionProve; /** * OpenBadges 2.0 Test inspector.