From 91efffa848090dc0902577b10d1427495817eff9 Mon Sep 17 00:00:00 2001 From: Xavi Aracil Date: Wed, 30 Nov 2022 12:45:54 +0100 Subject: [PATCH] Validation probes moved to its own package --- .../src/main/java/org/oneedtech/inspect/vc/OB20Inspector.java | 4 ++-- .../probe/{ => validation}/ValidationImagePropertyProbe.java | 2 +- .../vc/probe/{ => validation}/ValidationPropertyProbe.java | 4 +++- .../{ => validation}/ValidationPropertyProbeFactory.java | 2 +- .../{ => validation}/ValidationRdfTypePropertyProbe.java | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) rename inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/{ => validation}/ValidationImagePropertyProbe.java (98%) rename inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/{ => validation}/ValidationPropertyProbe.java (98%) rename inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/{ => validation}/ValidationPropertyProbeFactory.java (94%) rename inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/{ => validation}/ValidationRdfTypePropertyProbe.java (97%) 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 f2c70e5..0b7090c 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 @@ -30,8 +30,8 @@ import org.oneedtech.inspect.vc.payload.SvgParser; import org.oneedtech.inspect.vc.probe.ContextPropertyProbe; import org.oneedtech.inspect.vc.probe.CredentialParseProbe; import org.oneedtech.inspect.vc.probe.TypePropertyProbe; -import org.oneedtech.inspect.vc.probe.ValidationPropertyProbe; -import org.oneedtech.inspect.vc.probe.ValidationPropertyProbeFactory; +import org.oneedtech.inspect.vc.probe.validation.ValidationPropertyProbe; +import org.oneedtech.inspect.vc.probe.validation.ValidationPropertyProbeFactory; import org.oneedtech.inspect.vc.util.CachingDocumentLoader; import com.apicatalog.jsonld.loader.DocumentLoader; diff --git a/inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/ValidationImagePropertyProbe.java b/inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/validation/ValidationImagePropertyProbe.java similarity index 98% rename from inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/ValidationImagePropertyProbe.java rename to inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/validation/ValidationImagePropertyProbe.java index d9781ac..d2dfa30 100644 --- a/inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/ValidationImagePropertyProbe.java +++ b/inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/validation/ValidationImagePropertyProbe.java @@ -1,4 +1,4 @@ -package org.oneedtech.inspect.vc.probe; +package org.oneedtech.inspect.vc.probe.validation; import java.util.List; import java.util.regex.Matcher; diff --git a/inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/ValidationPropertyProbe.java b/inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/validation/ValidationPropertyProbe.java similarity index 98% rename from inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/ValidationPropertyProbe.java rename to inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/validation/ValidationPropertyProbe.java index ba242a6..fb5bd1e 100644 --- a/inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/ValidationPropertyProbe.java +++ b/inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/validation/ValidationPropertyProbe.java @@ -1,4 +1,4 @@ -package org.oneedtech.inspect.vc.probe; +package org.oneedtech.inspect.vc.probe.validation; import static org.oneedtech.inspect.vc.Assertion.ValueType.DATA_URI; import static org.oneedtech.inspect.vc.Assertion.ValueType.DATA_URI_OR_URL; @@ -22,6 +22,8 @@ import org.oneedtech.inspect.vc.Assertion.ValueType; import org.oneedtech.inspect.vc.Validation; import org.oneedtech.inspect.vc.jsonld.JsonLdGeneratedObject; import org.oneedtech.inspect.vc.jsonld.probe.JsonLDCompactionProve; +import org.oneedtech.inspect.vc.probe.CredentialParseProbe; +import org.oneedtech.inspect.vc.probe.PropertyProbe; import org.oneedtech.inspect.vc.util.CachingDocumentLoader; import org.oneedtech.inspect.vc.util.JsonNodeUtil; diff --git a/inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/ValidationPropertyProbeFactory.java b/inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/validation/ValidationPropertyProbeFactory.java similarity index 94% rename from inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/ValidationPropertyProbeFactory.java rename to inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/validation/ValidationPropertyProbeFactory.java index 896adb6..195a8ac 100644 --- a/inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/ValidationPropertyProbeFactory.java +++ b/inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/validation/ValidationPropertyProbeFactory.java @@ -1,4 +1,4 @@ -package org.oneedtech.inspect.vc.probe; +package org.oneedtech.inspect.vc.probe.validation; import static org.oneedtech.inspect.util.code.Defensives.checkNotNull; diff --git a/inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/ValidationRdfTypePropertyProbe.java b/inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/validation/ValidationRdfTypePropertyProbe.java similarity index 97% rename from inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/ValidationRdfTypePropertyProbe.java rename to inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/validation/ValidationRdfTypePropertyProbe.java index 338820e..8929f79 100644 --- a/inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/ValidationRdfTypePropertyProbe.java +++ b/inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/validation/ValidationRdfTypePropertyProbe.java @@ -1,4 +1,4 @@ -package org.oneedtech.inspect.vc.probe; +package org.oneedtech.inspect.vc.probe.validation; import java.util.List; import java.util.stream.Collectors;