diff --git a/.github/workflows/contract-tests.yml b/.github/workflows/contract-tests.yml index 9a3c26f7..5699b910 100644 --- a/.github/workflows/contract-tests.yml +++ b/.github/workflows/contract-tests.yml @@ -122,6 +122,17 @@ jobs: cat /tmp/contract-baseline-diff.md + # The full report can exceed GitHub's 65,536-character comment limit when a whole + # package moves (the Detect package rename produced several hundred KB). Keep the + # complete markdown as a run artifact; the comment below is truncated to fit. + - name: Upload full contract diff + if: always() && (steps.baseline-diff-check.outputs.changed == 'true' || steps.baseline-diff-check.outputs.changed == 'new') + uses: actions/upload-artifact@v4 + with: + name: contract-baseline-diff-${{ matrix.module }} + path: /tmp/contract-baseline-diff.md + if-no-files-found: ignore + - name: Comment contract baseline change on PR if: always() && (steps.baseline-diff-check.outputs.changed == 'true' || steps.baseline-diff-check.outputs.changed == 'new') uses: actions/github-script@v7 @@ -142,7 +153,19 @@ jobs: const preamble = isNew ? `This PR adds \`${module}/api-report/${artifact}.baseline.jar\`, the approved public API contract for this module.` : `This PR updates \`${module}/api-report/${artifact}.baseline.jar\` (the approved public API contract). Here is exactly what it changes, comparing the baseline on \`${{ github.event.pull_request.base.ref }}\` against the baseline committed in this PR:`; - const body = `${marker}\n${heading}\n\n${preamble}\n\n${summary}`; + // GitHub rejects comment bodies over 65,536 characters ("Body is too long"), which + // took the whole job down when the Detect package was renamed. Truncate the report + // and point at the artifact and the step log, which both carry the full text. + const LIMIT = 60000; + const runUrl = `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`; + const head = `${marker}\n${heading}\n\n${preamble}\n\n`; + let report = summary; + if (head.length + report.length > LIMIT) { + const note = `\n\n---\n**Report truncated** (${summary.length.toLocaleString()} characters). The full report is the ` + + `\`contract-baseline-diff-${module}\` artifact and the "Diff old vs new contract baseline" step log of [this run](${runUrl}).\n`; + report = summary.slice(0, LIMIT - head.length - note.length) + note; + } + const body = head + report; const { data: comments } = await github.rest.issues.listComments({ owner: context.repo.owner, repo: context.repo.repo, diff --git a/codecov.yml b/codecov.yml index 64d0a4b6..d26eacef 100644 --- a/codecov.yml +++ b/codecov.yml @@ -117,11 +117,11 @@ component_management: - "**/src/main/java/com/skyflow/vault/controller/**" - component_id: vault_detect name: Detect - # Detect V2 lives in com.skyflow.detect (models, mappers, polling, file output) plus - # BaseDetectController / DetectController under vault.controller, which the Vault - # Controller component already covers. The old vault/detect package no longer exists. + # Detect V2 lives in com.skyflow.vault.detect (models, mappers, polling, file output), the + # same package the removed V1 classes used. BaseDetectController / DetectController sit under + # vault.controller, which the Vault Controller component already covers. paths: - - "**/src/main/java/com/skyflow/detect/**" + - "**/src/main/java/com/skyflow/vault/detect/**" - component_id: vault_audit name: Audit paths: diff --git a/common/src/main/java/com/skyflow/enums/RedactionType.java b/common/src/main/java/com/skyflow/enums/RedactionType.java index 636bd4e5..00255705 100644 --- a/common/src/main/java/com/skyflow/enums/RedactionType.java +++ b/common/src/main/java/com/skyflow/enums/RedactionType.java @@ -3,14 +3,14 @@ /** * How a stored value is rendered when it is read back. Shared by the skyvault vault operations * ({@code get} and {@code detokenize}) and by Detect re-identification, where a - * {@link com.skyflow.detect.RedactionRule} (the SDK's {@code RedactionLevel}) applies it to one entity type. + * {@link com.skyflow.vault.detect.RedactionRule} (the SDK's {@code RedactionLevel}) applies it to one entity type. */ public enum RedactionType { PLAIN_TEXT, MASKED, /** * Use the redaction configured on the vault column. Valid for {@code get} and {@code detokenize}. - * The Detect API rejects it with HTTP 400 in a {@link com.skyflow.detect.RedactionRule} + * The Detect API rejects it with HTTP 400 in a {@link com.skyflow.vault.detect.RedactionRule} * (the SDK's {@code RedactionLevel}); use {@link #PLAIN_TEXT}, {@link #MASKED} or {@link #REDACTED} * for re-identification. */ diff --git a/common/src/main/java/com/skyflow/vault/controller/BaseDetectController.java b/common/src/main/java/com/skyflow/vault/controller/BaseDetectController.java index aacb2c53..33b3b14d 100644 --- a/common/src/main/java/com/skyflow/vault/controller/BaseDetectController.java +++ b/common/src/main/java/com/skyflow/vault/controller/BaseDetectController.java @@ -3,26 +3,26 @@ import com.skyflow.BaseVaultClient; import com.skyflow.config.BaseCredentials; import com.skyflow.config.BaseVaultConfig; -import com.skyflow.detect.CheckGuardrailsRequest; -import com.skyflow.detect.CheckGuardrailsResponse; -import com.skyflow.detect.DeidentifyFileRequest; -import com.skyflow.detect.ReidentifyFileSource; -import com.skyflow.detect.DeidentifyFileSource; -import com.skyflow.detect.DeidentifyFileResponse; -import com.skyflow.detect.DeidentifyStringRequest; -import com.skyflow.detect.DeidentifyStringResponse; -import com.skyflow.detect.GetRunRequest; -import com.skyflow.detect.GetRunResponse; -import com.skyflow.detect.ReidentifyFileRequest; -import com.skyflow.detect.ReidentifyFileResponse; -import com.skyflow.detect.ReidentifyStringRequest; -import com.skyflow.detect.ReidentifyStringResponse; -import com.skyflow.detect.internal.DeidentifyFileFlow; -import com.skyflow.detect.internal.DetectRequestMapper; -import com.skyflow.detect.internal.DetectResponseMapper; -import com.skyflow.detect.internal.DetectValidations; -import com.skyflow.detect.internal.ReidentifyFileMapper; -import com.skyflow.detect.internal.ReidentifyFileValidations; +import com.skyflow.vault.detect.CheckGuardrailsRequest; +import com.skyflow.vault.detect.CheckGuardrailsResponse; +import com.skyflow.vault.detect.DeidentifyFileRequest; +import com.skyflow.vault.detect.ReidentifyFileSource; +import com.skyflow.vault.detect.DeidentifyFileSource; +import com.skyflow.vault.detect.DeidentifyFileResponse; +import com.skyflow.vault.detect.DeidentifyStringRequest; +import com.skyflow.vault.detect.DeidentifyStringResponse; +import com.skyflow.vault.detect.GetRunRequest; +import com.skyflow.vault.detect.GetRunResponse; +import com.skyflow.vault.detect.ReidentifyFileRequest; +import com.skyflow.vault.detect.ReidentifyFileResponse; +import com.skyflow.vault.detect.ReidentifyStringRequest; +import com.skyflow.vault.detect.ReidentifyStringResponse; +import com.skyflow.vault.detect.internal.DeidentifyFileFlow; +import com.skyflow.vault.detect.internal.DetectRequestMapper; +import com.skyflow.vault.detect.internal.DetectResponseMapper; +import com.skyflow.vault.detect.internal.DetectValidations; +import com.skyflow.vault.detect.internal.ReidentifyFileMapper; +import com.skyflow.vault.detect.internal.ReidentifyFileValidations; import com.skyflow.errors.SkyflowException; import com.skyflow.generated.common.rest.core.ApiClientApiException; import com.skyflow.generated.common.rest.core.ApiClientException; diff --git a/common/src/main/java/com/skyflow/detect/Audio.java b/common/src/main/java/com/skyflow/vault/detect/Audio.java similarity index 98% rename from common/src/main/java/com/skyflow/detect/Audio.java rename to common/src/main/java/com/skyflow/vault/detect/Audio.java index 6d4e46f9..11dfb19e 100644 --- a/common/src/main/java/com/skyflow/detect/Audio.java +++ b/common/src/main/java/com/skyflow/vault/detect/Audio.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Audio processing options. diff --git a/common/src/main/java/com/skyflow/detect/Bleep.java b/common/src/main/java/com/skyflow/vault/detect/Bleep.java similarity index 98% rename from common/src/main/java/com/skyflow/detect/Bleep.java rename to common/src/main/java/com/skyflow/vault/detect/Bleep.java index 63346aeb..b46fee7c 100644 --- a/common/src/main/java/com/skyflow/detect/Bleep.java +++ b/common/src/main/java/com/skyflow/vault/detect/Bleep.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Bleep tone applied over detected speech in audio. diff --git a/common/src/main/java/com/skyflow/detect/CheckGuardrailsRequest.java b/common/src/main/java/com/skyflow/vault/detect/CheckGuardrailsRequest.java similarity index 98% rename from common/src/main/java/com/skyflow/detect/CheckGuardrailsRequest.java rename to common/src/main/java/com/skyflow/vault/detect/CheckGuardrailsRequest.java index 526ddd9c..2ee13c5b 100644 --- a/common/src/main/java/com/skyflow/detect/CheckGuardrailsRequest.java +++ b/common/src/main/java/com/skyflow/vault/detect/CheckGuardrailsRequest.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; import java.util.List; diff --git a/common/src/main/java/com/skyflow/detect/CheckGuardrailsResponse.java b/common/src/main/java/com/skyflow/vault/detect/CheckGuardrailsResponse.java similarity index 97% rename from common/src/main/java/com/skyflow/detect/CheckGuardrailsResponse.java rename to common/src/main/java/com/skyflow/vault/detect/CheckGuardrailsResponse.java index 153e68cf..dd8dec54 100644 --- a/common/src/main/java/com/skyflow/detect/CheckGuardrailsResponse.java +++ b/common/src/main/java/com/skyflow/vault/detect/CheckGuardrailsResponse.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Response of {@code checkGuardrails}. diff --git a/common/src/main/java/com/skyflow/detect/CustomType.java b/common/src/main/java/com/skyflow/vault/detect/CustomType.java similarity index 99% rename from common/src/main/java/com/skyflow/detect/CustomType.java rename to common/src/main/java/com/skyflow/vault/detect/CustomType.java index a7ed00b6..7062d73d 100644 --- a/common/src/main/java/com/skyflow/detect/CustomType.java +++ b/common/src/main/java/com/skyflow/vault/detect/CustomType.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; import java.util.List; diff --git a/common/src/main/java/com/skyflow/detect/DeidentificationType.java b/common/src/main/java/com/skyflow/vault/detect/DeidentificationType.java similarity index 84% rename from common/src/main/java/com/skyflow/detect/DeidentificationType.java rename to common/src/main/java/com/skyflow/vault/detect/DeidentificationType.java index 067d533f..fe2668cb 100644 --- a/common/src/main/java/com/skyflow/detect/DeidentificationType.java +++ b/common/src/main/java/com/skyflow/vault/detect/DeidentificationType.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * How a detected entity is replaced in the processed output. diff --git a/common/src/main/java/com/skyflow/detect/DeidentifyFileDataFormat.java b/common/src/main/java/com/skyflow/vault/detect/DeidentifyFileDataFormat.java similarity index 96% rename from common/src/main/java/com/skyflow/detect/DeidentifyFileDataFormat.java rename to common/src/main/java/com/skyflow/vault/detect/DeidentifyFileDataFormat.java index 303e797b..ba9a36a9 100644 --- a/common/src/main/java/com/skyflow/detect/DeidentifyFileDataFormat.java +++ b/common/src/main/java/com/skyflow/vault/detect/DeidentifyFileDataFormat.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * File formats accepted by {@code deidentifyFile} as the request {@code dataFormat}. The wire value is the diff --git a/common/src/main/java/com/skyflow/detect/DeidentifyFileRequest.java b/common/src/main/java/com/skyflow/vault/detect/DeidentifyFileRequest.java similarity index 99% rename from common/src/main/java/com/skyflow/detect/DeidentifyFileRequest.java rename to common/src/main/java/com/skyflow/vault/detect/DeidentifyFileRequest.java index ce6165bf..d7184641 100644 --- a/common/src/main/java/com/skyflow/detect/DeidentifyFileRequest.java +++ b/common/src/main/java/com/skyflow/vault/detect/DeidentifyFileRequest.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; import java.io.File; diff --git a/common/src/main/java/com/skyflow/detect/DeidentifyFileResponse.java b/common/src/main/java/com/skyflow/vault/detect/DeidentifyFileResponse.java similarity index 98% rename from common/src/main/java/com/skyflow/detect/DeidentifyFileResponse.java rename to common/src/main/java/com/skyflow/vault/detect/DeidentifyFileResponse.java index 730177cc..6bda5411 100644 --- a/common/src/main/java/com/skyflow/detect/DeidentifyFileResponse.java +++ b/common/src/main/java/com/skyflow/vault/detect/DeidentifyFileResponse.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; import java.util.List; diff --git a/common/src/main/java/com/skyflow/detect/DeidentifyFileSource.java b/common/src/main/java/com/skyflow/vault/detect/DeidentifyFileSource.java similarity index 78% rename from common/src/main/java/com/skyflow/detect/DeidentifyFileSource.java rename to common/src/main/java/com/skyflow/vault/detect/DeidentifyFileSource.java index f60439ac..7930c566 100644 --- a/common/src/main/java/com/skyflow/detect/DeidentifyFileSource.java +++ b/common/src/main/java/com/skyflow/vault/detect/DeidentifyFileSource.java @@ -1,8 +1,8 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * How the file of {@code deidentifyFile} is supplied, and how a run reports its outputs. Each SDK ships its own - * {@code com.skyflow.detect.DeidentifySourceType} enum implementing this interface with the sources its vault + * {@code com.skyflow.vault.detect.DeidentifySourceType} enum implementing this interface with the sources its vault * type accepts: skyvault {@code BASE64}, {@code SKYFLOW_ID}, {@code PRESIGNED_URL}; flowvault {@code BASE64}, * {@code PRESIGNED_URL}. {@code getOutputType()} on {@code DeidentifyFileResponse} and {@code GetRunResponse} * returns a constant of that same enum. The constant name is the wire value. diff --git a/common/src/main/java/com/skyflow/detect/DeidentifyStringRequest.java b/common/src/main/java/com/skyflow/vault/detect/DeidentifyStringRequest.java similarity index 98% rename from common/src/main/java/com/skyflow/detect/DeidentifyStringRequest.java rename to common/src/main/java/com/skyflow/vault/detect/DeidentifyStringRequest.java index f5bb22c4..f553be8d 100644 --- a/common/src/main/java/com/skyflow/detect/DeidentifyStringRequest.java +++ b/common/src/main/java/com/skyflow/vault/detect/DeidentifyStringRequest.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Request for {@code deidentifyString}. configurationId and configuration are both optional and are sent diff --git a/common/src/main/java/com/skyflow/detect/DeidentifyStringResponse.java b/common/src/main/java/com/skyflow/vault/detect/DeidentifyStringResponse.java similarity index 97% rename from common/src/main/java/com/skyflow/detect/DeidentifyStringResponse.java rename to common/src/main/java/com/skyflow/vault/detect/DeidentifyStringResponse.java index 7ea68dcf..36533062 100644 --- a/common/src/main/java/com/skyflow/detect/DeidentifyStringResponse.java +++ b/common/src/main/java/com/skyflow/vault/detect/DeidentifyStringResponse.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; import java.util.List; diff --git a/common/src/main/java/com/skyflow/detect/Detect.java b/common/src/main/java/com/skyflow/vault/detect/Detect.java similarity index 99% rename from common/src/main/java/com/skyflow/detect/Detect.java rename to common/src/main/java/com/skyflow/vault/detect/Detect.java index dc998e57..bfd512e4 100644 --- a/common/src/main/java/com/skyflow/detect/Detect.java +++ b/common/src/main/java/com/skyflow/vault/detect/Detect.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; import java.util.List; diff --git a/common/src/main/java/com/skyflow/detect/DetectConfiguration.java b/common/src/main/java/com/skyflow/vault/detect/DetectConfiguration.java similarity index 99% rename from common/src/main/java/com/skyflow/detect/DetectConfiguration.java rename to common/src/main/java/com/skyflow/vault/detect/DetectConfiguration.java index e9209528..b99f6e27 100644 --- a/common/src/main/java/com/skyflow/detect/DetectConfiguration.java +++ b/common/src/main/java/com/skyflow/vault/detect/DetectConfiguration.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; import java.util.List; diff --git a/common/src/main/java/com/skyflow/detect/DetectRunStatus.java b/common/src/main/java/com/skyflow/vault/detect/DetectRunStatus.java similarity index 82% rename from common/src/main/java/com/skyflow/detect/DetectRunStatus.java rename to common/src/main/java/com/skyflow/vault/detect/DetectRunStatus.java index 3bb05886..9ec24382 100644 --- a/common/src/main/java/com/skyflow/detect/DetectRunStatus.java +++ b/common/src/main/java/com/skyflow/vault/detect/DetectRunStatus.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Lifecycle status of an asynchronous Detect file run. diff --git a/common/src/main/java/com/skyflow/detect/DetectedEntity.java b/common/src/main/java/com/skyflow/vault/detect/DetectedEntity.java similarity index 98% rename from common/src/main/java/com/skyflow/detect/DetectedEntity.java rename to common/src/main/java/com/skyflow/vault/detect/DetectedEntity.java index 6a443d1c..136da233 100644 --- a/common/src/main/java/com/skyflow/detect/DetectedEntity.java +++ b/common/src/main/java/com/skyflow/vault/detect/DetectedEntity.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; import java.util.Map; diff --git a/common/src/main/java/com/skyflow/detect/Document.java b/common/src/main/java/com/skyflow/vault/detect/Document.java similarity index 96% rename from common/src/main/java/com/skyflow/detect/Document.java rename to common/src/main/java/com/skyflow/vault/detect/Document.java index 2d461196..7972eaad 100644 --- a/common/src/main/java/com/skyflow/detect/Document.java +++ b/common/src/main/java/com/skyflow/vault/detect/Document.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Document processing options. diff --git a/common/src/main/java/com/skyflow/detect/Entity.java b/common/src/main/java/com/skyflow/vault/detect/Entity.java similarity index 99% rename from common/src/main/java/com/skyflow/detect/Entity.java rename to common/src/main/java/com/skyflow/vault/detect/Entity.java index c8ee907e..82b0f3e0 100644 --- a/common/src/main/java/com/skyflow/detect/Entity.java +++ b/common/src/main/java/com/skyflow/vault/detect/Entity.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Configures how a single entity type is detected and de-identified. diff --git a/common/src/main/java/com/skyflow/detect/EntityLocation.java b/common/src/main/java/com/skyflow/vault/detect/EntityLocation.java similarity index 97% rename from common/src/main/java/com/skyflow/detect/EntityLocation.java rename to common/src/main/java/com/skyflow/vault/detect/EntityLocation.java index 88b45048..8e340155 100644 --- a/common/src/main/java/com/skyflow/detect/EntityLocation.java +++ b/common/src/main/java/com/skyflow/vault/detect/EntityLocation.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Position of a detected entity in the original and processed text. diff --git a/common/src/main/java/com/skyflow/detect/EntityType.java b/common/src/main/java/com/skyflow/vault/detect/EntityType.java similarity index 97% rename from common/src/main/java/com/skyflow/detect/EntityType.java rename to common/src/main/java/com/skyflow/vault/detect/EntityType.java index 82cae959..b6519929 100644 --- a/common/src/main/java/com/skyflow/detect/EntityType.java +++ b/common/src/main/java/com/skyflow/vault/detect/EntityType.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Entity types Skyflow Detect can identify. Also used to target entities in {@code RedactionLevel}. diff --git a/common/src/main/java/com/skyflow/detect/FileMapping.java b/common/src/main/java/com/skyflow/vault/detect/FileMapping.java similarity index 99% rename from common/src/main/java/com/skyflow/detect/FileMapping.java rename to common/src/main/java/com/skyflow/vault/detect/FileMapping.java index da0663b0..f8281a26 100644 --- a/common/src/main/java/com/skyflow/detect/FileMapping.java +++ b/common/src/main/java/com/skyflow/vault/detect/FileMapping.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Maps an input file location to output locations. File inputs only. diff --git a/common/src/main/java/com/skyflow/detect/FileOutput.java b/common/src/main/java/com/skyflow/vault/detect/FileOutput.java similarity index 97% rename from common/src/main/java/com/skyflow/detect/FileOutput.java rename to common/src/main/java/com/skyflow/vault/detect/FileOutput.java index c578ad32..913bd132 100644 --- a/common/src/main/java/com/skyflow/detect/FileOutput.java +++ b/common/src/main/java/com/skyflow/vault/detect/FileOutput.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * One output artifact of a Detect file de-identification run, returned by {@code deidentifyFile} and {@code getRun}. diff --git a/common/src/main/java/com/skyflow/detect/GetRunRequest.java b/common/src/main/java/com/skyflow/vault/detect/GetRunRequest.java similarity index 97% rename from common/src/main/java/com/skyflow/detect/GetRunRequest.java rename to common/src/main/java/com/skyflow/vault/detect/GetRunRequest.java index 21a02689..33a18b30 100644 --- a/common/src/main/java/com/skyflow/detect/GetRunRequest.java +++ b/common/src/main/java/com/skyflow/vault/detect/GetRunRequest.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Request for {@code getRun}: retrieves the status and outputs of a Detect file run. diff --git a/common/src/main/java/com/skyflow/detect/GetRunResponse.java b/common/src/main/java/com/skyflow/vault/detect/GetRunResponse.java similarity index 98% rename from common/src/main/java/com/skyflow/detect/GetRunResponse.java rename to common/src/main/java/com/skyflow/vault/detect/GetRunResponse.java index c892355e..10bd369e 100644 --- a/common/src/main/java/com/skyflow/detect/GetRunResponse.java +++ b/common/src/main/java/com/skyflow/vault/detect/GetRunResponse.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; import java.util.List; diff --git a/common/src/main/java/com/skyflow/detect/GuardrailsValidation.java b/common/src/main/java/com/skyflow/vault/detect/GuardrailsValidation.java similarity index 84% rename from common/src/main/java/com/skyflow/detect/GuardrailsValidation.java rename to common/src/main/java/com/skyflow/vault/detect/GuardrailsValidation.java index 1d6f0f8c..49056087 100644 --- a/common/src/main/java/com/skyflow/detect/GuardrailsValidation.java +++ b/common/src/main/java/com/skyflow/vault/detect/GuardrailsValidation.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Overall result of a guardrails check. diff --git a/common/src/main/java/com/skyflow/detect/Image.java b/common/src/main/java/com/skyflow/vault/detect/Image.java similarity index 98% rename from common/src/main/java/com/skyflow/detect/Image.java rename to common/src/main/java/com/skyflow/vault/detect/Image.java index f1e33135..2979face 100644 --- a/common/src/main/java/com/skyflow/detect/Image.java +++ b/common/src/main/java/com/skyflow/vault/detect/Image.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Image processing options. diff --git a/common/src/main/java/com/skyflow/detect/IncludePrefix.java b/common/src/main/java/com/skyflow/vault/detect/IncludePrefix.java similarity index 92% rename from common/src/main/java/com/skyflow/detect/IncludePrefix.java rename to common/src/main/java/com/skyflow/vault/detect/IncludePrefix.java index 3209796d..cb2844fa 100644 --- a/common/src/main/java/com/skyflow/detect/IncludePrefix.java +++ b/common/src/main/java/com/skyflow/vault/detect/IncludePrefix.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Whether the entity label is included as a prefix in a generated vault token. Only applies when the diff --git a/common/src/main/java/com/skyflow/detect/MaskingMethod.java b/common/src/main/java/com/skyflow/vault/detect/MaskingMethod.java similarity index 79% rename from common/src/main/java/com/skyflow/detect/MaskingMethod.java rename to common/src/main/java/com/skyflow/vault/detect/MaskingMethod.java index 38402c52..a00797e6 100644 --- a/common/src/main/java/com/skyflow/detect/MaskingMethod.java +++ b/common/src/main/java/com/skyflow/vault/detect/MaskingMethod.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Masking method applied to detected regions in images. diff --git a/common/src/main/java/com/skyflow/detect/Media.java b/common/src/main/java/com/skyflow/vault/detect/Media.java similarity index 98% rename from common/src/main/java/com/skyflow/detect/Media.java rename to common/src/main/java/com/skyflow/vault/detect/Media.java index af6f24ac..b2596af0 100644 --- a/common/src/main/java/com/skyflow/detect/Media.java +++ b/common/src/main/java/com/skyflow/vault/detect/Media.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Media-type specific processing options. File inputs only. diff --git a/common/src/main/java/com/skyflow/detect/Metrics.java b/common/src/main/java/com/skyflow/vault/detect/Metrics.java similarity index 98% rename from common/src/main/java/com/skyflow/detect/Metrics.java rename to common/src/main/java/com/skyflow/vault/detect/Metrics.java index 46becb12..1eeafc86 100644 --- a/common/src/main/java/com/skyflow/detect/Metrics.java +++ b/common/src/main/java/com/skyflow/vault/detect/Metrics.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Processing metrics returned by Detect operations. diff --git a/common/src/main/java/com/skyflow/detect/ObjectDeidentificationType.java b/common/src/main/java/com/skyflow/vault/detect/ObjectDeidentificationType.java similarity index 79% rename from common/src/main/java/com/skyflow/detect/ObjectDeidentificationType.java rename to common/src/main/java/com/skyflow/vault/detect/ObjectDeidentificationType.java index 13f3fd6e..59c9d187 100644 --- a/common/src/main/java/com/skyflow/detect/ObjectDeidentificationType.java +++ b/common/src/main/java/com/skyflow/vault/detect/ObjectDeidentificationType.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * How a detected visual object is handled. diff --git a/common/src/main/java/com/skyflow/detect/ObjectEntity.java b/common/src/main/java/com/skyflow/vault/detect/ObjectEntity.java similarity index 98% rename from common/src/main/java/com/skyflow/detect/ObjectEntity.java rename to common/src/main/java/com/skyflow/vault/detect/ObjectEntity.java index 1f62853b..8628d500 100644 --- a/common/src/main/java/com/skyflow/detect/ObjectEntity.java +++ b/common/src/main/java/com/skyflow/vault/detect/ObjectEntity.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Configures detection of a visual object type in images or video. diff --git a/common/src/main/java/com/skyflow/detect/ObjectEntityType.java b/common/src/main/java/com/skyflow/vault/detect/ObjectEntityType.java similarity index 84% rename from common/src/main/java/com/skyflow/detect/ObjectEntityType.java rename to common/src/main/java/com/skyflow/vault/detect/ObjectEntityType.java index 679917c7..12942be0 100644 --- a/common/src/main/java/com/skyflow/detect/ObjectEntityType.java +++ b/common/src/main/java/com/skyflow/vault/detect/ObjectEntityType.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Visual objects Skyflow Detect can identify in images and video. diff --git a/common/src/main/java/com/skyflow/detect/OutputTranscriptionType.java b/common/src/main/java/com/skyflow/vault/detect/OutputTranscriptionType.java similarity index 86% rename from common/src/main/java/com/skyflow/detect/OutputTranscriptionType.java rename to common/src/main/java/com/skyflow/vault/detect/OutputTranscriptionType.java index ed2638ed..d37e13c1 100644 --- a/common/src/main/java/com/skyflow/detect/OutputTranscriptionType.java +++ b/common/src/main/java/com/skyflow/vault/detect/OutputTranscriptionType.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Transcription output produced for audio inputs. diff --git a/common/src/main/java/com/skyflow/detect/Pdf.java b/common/src/main/java/com/skyflow/vault/detect/Pdf.java similarity index 98% rename from common/src/main/java/com/skyflow/detect/Pdf.java rename to common/src/main/java/com/skyflow/vault/detect/Pdf.java index d147d632..f9ed0dad 100644 --- a/common/src/main/java/com/skyflow/detect/Pdf.java +++ b/common/src/main/java/com/skyflow/vault/detect/Pdf.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * PDF processing options. diff --git a/common/src/main/java/com/skyflow/detect/PdfProcessingMode.java b/common/src/main/java/com/skyflow/vault/detect/PdfProcessingMode.java similarity index 77% rename from common/src/main/java/com/skyflow/detect/PdfProcessingMode.java rename to common/src/main/java/com/skyflow/vault/detect/PdfProcessingMode.java index f32399ba..d1850ac8 100644 --- a/common/src/main/java/com/skyflow/detect/PdfProcessingMode.java +++ b/common/src/main/java/com/skyflow/vault/detect/PdfProcessingMode.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * How PDF documents are processed. diff --git a/common/src/main/java/com/skyflow/detect/PollOptions.java b/common/src/main/java/com/skyflow/vault/detect/PollOptions.java similarity index 98% rename from common/src/main/java/com/skyflow/detect/PollOptions.java rename to common/src/main/java/com/skyflow/vault/detect/PollOptions.java index c1aa656a..14ffeb5e 100644 --- a/common/src/main/java/com/skyflow/detect/PollOptions.java +++ b/common/src/main/java/com/skyflow/vault/detect/PollOptions.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Opts {@code deidentifyFile} into submit-and-poll mode. When present, the SDK polls the run with diff --git a/common/src/main/java/com/skyflow/detect/RedactionRule.java b/common/src/main/java/com/skyflow/vault/detect/RedactionRule.java similarity index 92% rename from common/src/main/java/com/skyflow/detect/RedactionRule.java rename to common/src/main/java/com/skyflow/vault/detect/RedactionRule.java index 19d20716..ad3232fa 100644 --- a/common/src/main/java/com/skyflow/detect/RedactionRule.java +++ b/common/src/main/java/com/skyflow/vault/detect/RedactionRule.java @@ -1,8 +1,8 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * One re-identification rendering rule, the element of {@code redactionLevel} on {@code ReidentifyStringRequest} - * and {@code ReidentifyFileRequest}. Each SDK ships its own {@code com.skyflow.detect.RedactionLevel} with the + * and {@code ReidentifyFileRequest}. Each SDK ships its own {@code com.skyflow.vault.detect.RedactionLevel} with the * pair of fields its vault type uses: skyvault names an {@code entityName} and a {@code redactionType}; flowvault * names a {@code tokenGroupName} and a {@code redactionPattern}. Only those classes can extend this type. */ diff --git a/common/src/main/java/com/skyflow/detect/RedactionRules.java b/common/src/main/java/com/skyflow/vault/detect/RedactionRules.java similarity index 97% rename from common/src/main/java/com/skyflow/detect/RedactionRules.java rename to common/src/main/java/com/skyflow/vault/detect/RedactionRules.java index 9a9817d6..1fae1ea6 100644 --- a/common/src/main/java/com/skyflow/detect/RedactionRules.java +++ b/common/src/main/java/com/skyflow/vault/detect/RedactionRules.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; import com.skyflow.generated.common.rest.types.RedactionLevel; import com.skyflow.generated.common.rest.types.RedactionLevelEntityName; diff --git a/common/src/main/java/com/skyflow/detect/ReidentifyFileDataFormat.java b/common/src/main/java/com/skyflow/vault/detect/ReidentifyFileDataFormat.java similarity index 94% rename from common/src/main/java/com/skyflow/detect/ReidentifyFileDataFormat.java rename to common/src/main/java/com/skyflow/vault/detect/ReidentifyFileDataFormat.java index 6e9686ad..3be4c282 100644 --- a/common/src/main/java/com/skyflow/detect/ReidentifyFileDataFormat.java +++ b/common/src/main/java/com/skyflow/vault/detect/ReidentifyFileDataFormat.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * File formats accepted by {@code reidentifyFile} as the request {@code dataFormat}: the formats that support the diff --git a/common/src/main/java/com/skyflow/detect/ReidentifyFileOutput.java b/common/src/main/java/com/skyflow/vault/detect/ReidentifyFileOutput.java similarity index 97% rename from common/src/main/java/com/skyflow/detect/ReidentifyFileOutput.java rename to common/src/main/java/com/skyflow/vault/detect/ReidentifyFileOutput.java index fbc79b16..6f0c369d 100644 --- a/common/src/main/java/com/skyflow/detect/ReidentifyFileOutput.java +++ b/common/src/main/java/com/skyflow/vault/detect/ReidentifyFileOutput.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * One output artifact of {@code reidentifyFile}. The same shape as {@link FileOutput}, with the format reported as a diff --git a/common/src/main/java/com/skyflow/detect/ReidentifyFileRequest.java b/common/src/main/java/com/skyflow/vault/detect/ReidentifyFileRequest.java similarity index 99% rename from common/src/main/java/com/skyflow/detect/ReidentifyFileRequest.java rename to common/src/main/java/com/skyflow/vault/detect/ReidentifyFileRequest.java index 84627950..afc1562c 100644 --- a/common/src/main/java/com/skyflow/detect/ReidentifyFileRequest.java +++ b/common/src/main/java/com/skyflow/vault/detect/ReidentifyFileRequest.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; import java.util.List; diff --git a/common/src/main/java/com/skyflow/detect/ReidentifyFileResponse.java b/common/src/main/java/com/skyflow/vault/detect/ReidentifyFileResponse.java similarity index 98% rename from common/src/main/java/com/skyflow/detect/ReidentifyFileResponse.java rename to common/src/main/java/com/skyflow/vault/detect/ReidentifyFileResponse.java index 3900b895..6a5f85a9 100644 --- a/common/src/main/java/com/skyflow/detect/ReidentifyFileResponse.java +++ b/common/src/main/java/com/skyflow/vault/detect/ReidentifyFileResponse.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; import java.util.List; diff --git a/common/src/main/java/com/skyflow/detect/ReidentifyFileSource.java b/common/src/main/java/com/skyflow/vault/detect/ReidentifyFileSource.java similarity index 73% rename from common/src/main/java/com/skyflow/detect/ReidentifyFileSource.java rename to common/src/main/java/com/skyflow/vault/detect/ReidentifyFileSource.java index d0f54ab3..e0faf6c1 100644 --- a/common/src/main/java/com/skyflow/detect/ReidentifyFileSource.java +++ b/common/src/main/java/com/skyflow/vault/detect/ReidentifyFileSource.java @@ -1,8 +1,8 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * How the file of {@code reidentifyFile} is supplied, and how its response reports the output. Each SDK ships - * its own {@code com.skyflow.detect.ReidentifySourceType} enum implementing this interface, with {@code BASE64} + * its own {@code com.skyflow.vault.detect.ReidentifySourceType} enum implementing this interface, with {@code BASE64} * and {@code PRESIGNED_URL} in both SDKs. {@code getOutputType()} on {@code ReidentifyFileResponse} returns a * constant of that same enum. The constant name is the wire value. */ diff --git a/common/src/main/java/com/skyflow/detect/ReidentifyStringRequest.java b/common/src/main/java/com/skyflow/vault/detect/ReidentifyStringRequest.java similarity index 98% rename from common/src/main/java/com/skyflow/detect/ReidentifyStringRequest.java rename to common/src/main/java/com/skyflow/vault/detect/ReidentifyStringRequest.java index acabf2bb..87743c07 100644 --- a/common/src/main/java/com/skyflow/detect/ReidentifyStringRequest.java +++ b/common/src/main/java/com/skyflow/vault/detect/ReidentifyStringRequest.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; import java.util.List; diff --git a/common/src/main/java/com/skyflow/detect/ReidentifyStringResponse.java b/common/src/main/java/com/skyflow/vault/detect/ReidentifyStringResponse.java similarity index 95% rename from common/src/main/java/com/skyflow/detect/ReidentifyStringResponse.java rename to common/src/main/java/com/skyflow/vault/detect/ReidentifyStringResponse.java index e1825bf2..e3d26a98 100644 --- a/common/src/main/java/com/skyflow/detect/ReidentifyStringResponse.java +++ b/common/src/main/java/com/skyflow/vault/detect/ReidentifyStringResponse.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Response of {@code reidentifyString}. diff --git a/common/src/main/java/com/skyflow/detect/ReturnEntitiesType.java b/common/src/main/java/com/skyflow/vault/detect/ReturnEntitiesType.java similarity index 82% rename from common/src/main/java/com/skyflow/detect/ReturnEntitiesType.java rename to common/src/main/java/com/skyflow/vault/detect/ReturnEntitiesType.java index 3ba4fa79..2ccebdb2 100644 --- a/common/src/main/java/com/skyflow/detect/ReturnEntitiesType.java +++ b/common/src/main/java/com/skyflow/vault/detect/ReturnEntitiesType.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Controls which detected entities are returned in the response. diff --git a/common/src/main/java/com/skyflow/detect/ShiftDates.java b/common/src/main/java/com/skyflow/vault/detect/ShiftDates.java similarity index 97% rename from common/src/main/java/com/skyflow/detect/ShiftDates.java rename to common/src/main/java/com/skyflow/vault/detect/ShiftDates.java index fd4adc24..f7e3e0f3 100644 --- a/common/src/main/java/com/skyflow/detect/ShiftDates.java +++ b/common/src/main/java/com/skyflow/vault/detect/ShiftDates.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Shifts detected dates by a random number of days within the given range. diff --git a/common/src/main/java/com/skyflow/detect/Transformation.java b/common/src/main/java/com/skyflow/vault/detect/Transformation.java similarity index 97% rename from common/src/main/java/com/skyflow/detect/Transformation.java rename to common/src/main/java/com/skyflow/vault/detect/Transformation.java index 5fb9cb69..6827c454 100644 --- a/common/src/main/java/com/skyflow/detect/Transformation.java +++ b/common/src/main/java/com/skyflow/vault/detect/Transformation.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Transformations applied to detected entities before they are written to the output. diff --git a/common/src/main/java/com/skyflow/detect/internal/DeidentifyFileFlow.java b/common/src/main/java/com/skyflow/vault/detect/internal/DeidentifyFileFlow.java similarity index 85% rename from common/src/main/java/com/skyflow/detect/internal/DeidentifyFileFlow.java rename to common/src/main/java/com/skyflow/vault/detect/internal/DeidentifyFileFlow.java index da64c9b2..54ca3869 100644 --- a/common/src/main/java/com/skyflow/detect/internal/DeidentifyFileFlow.java +++ b/common/src/main/java/com/skyflow/vault/detect/internal/DeidentifyFileFlow.java @@ -1,11 +1,11 @@ -package com.skyflow.detect.internal; +package com.skyflow.vault.detect.internal; import java.io.File; -import com.skyflow.detect.DeidentifyFileRequest; -import com.skyflow.detect.DeidentifyFileResponse; -import com.skyflow.detect.DetectRunStatus; -import com.skyflow.detect.GetRunResponse; -import com.skyflow.detect.polling.RunPoller; +import com.skyflow.vault.detect.DeidentifyFileRequest; +import com.skyflow.vault.detect.DeidentifyFileResponse; +import com.skyflow.vault.detect.DetectRunStatus; +import com.skyflow.vault.detect.GetRunResponse; +import com.skyflow.vault.detect.polling.RunPoller; import com.skyflow.errors.SkyflowException; import com.skyflow.logs.InfoLogs; import com.skyflow.utils.BaseUtils; diff --git a/common/src/main/java/com/skyflow/detect/internal/DetectRequestMapper.java b/common/src/main/java/com/skyflow/vault/detect/internal/DetectRequestMapper.java similarity index 94% rename from common/src/main/java/com/skyflow/detect/internal/DetectRequestMapper.java rename to common/src/main/java/com/skyflow/vault/detect/internal/DetectRequestMapper.java index ddf654a5..30ed401a 100644 --- a/common/src/main/java/com/skyflow/detect/internal/DetectRequestMapper.java +++ b/common/src/main/java/com/skyflow/vault/detect/internal/DetectRequestMapper.java @@ -1,4 +1,4 @@ -package com.skyflow.detect.internal; +package com.skyflow.vault.detect.internal; import java.io.File; import java.io.IOException; @@ -7,28 +7,28 @@ import java.util.Base64; import java.util.List; -import com.skyflow.detect.Audio; -import com.skyflow.detect.Bleep; -import com.skyflow.detect.CheckGuardrailsRequest; -import com.skyflow.detect.CustomType; -import com.skyflow.detect.DeidentifyFileRequest; -import com.skyflow.detect.DeidentifyStringRequest; -import com.skyflow.detect.DeidentifyFileDataFormat; -import com.skyflow.detect.Detect; -import com.skyflow.detect.DetectConfiguration; -import com.skyflow.detect.Document; -import com.skyflow.detect.Entity; -import com.skyflow.detect.FileMapping; -import com.skyflow.detect.Image; -import com.skyflow.detect.IncludePrefix; -import com.skyflow.detect.Media; -import com.skyflow.detect.ObjectEntity; -import com.skyflow.detect.Pdf; -import com.skyflow.detect.RedactionRule; -import com.skyflow.detect.RedactionRules; -import com.skyflow.detect.ReidentifyStringRequest; -import com.skyflow.detect.ShiftDates; -import com.skyflow.detect.Transformation; +import com.skyflow.vault.detect.Audio; +import com.skyflow.vault.detect.Bleep; +import com.skyflow.vault.detect.CheckGuardrailsRequest; +import com.skyflow.vault.detect.CustomType; +import com.skyflow.vault.detect.DeidentifyFileRequest; +import com.skyflow.vault.detect.DeidentifyStringRequest; +import com.skyflow.vault.detect.DeidentifyFileDataFormat; +import com.skyflow.vault.detect.Detect; +import com.skyflow.vault.detect.DetectConfiguration; +import com.skyflow.vault.detect.Document; +import com.skyflow.vault.detect.Entity; +import com.skyflow.vault.detect.FileMapping; +import com.skyflow.vault.detect.Image; +import com.skyflow.vault.detect.IncludePrefix; +import com.skyflow.vault.detect.Media; +import com.skyflow.vault.detect.ObjectEntity; +import com.skyflow.vault.detect.Pdf; +import com.skyflow.vault.detect.RedactionRule; +import com.skyflow.vault.detect.RedactionRules; +import com.skyflow.vault.detect.ReidentifyStringRequest; +import com.skyflow.vault.detect.ShiftDates; +import com.skyflow.vault.detect.Transformation; import com.skyflow.errors.BaseErrorMessage; import com.skyflow.errors.ErrorCode; import com.skyflow.errors.SkyflowException; diff --git a/common/src/main/java/com/skyflow/detect/internal/DetectResponseMapper.java b/common/src/main/java/com/skyflow/vault/detect/internal/DetectResponseMapper.java similarity index 90% rename from common/src/main/java/com/skyflow/detect/internal/DetectResponseMapper.java rename to common/src/main/java/com/skyflow/vault/detect/internal/DetectResponseMapper.java index 1d56ef99..69a4df60 100644 --- a/common/src/main/java/com/skyflow/detect/internal/DetectResponseMapper.java +++ b/common/src/main/java/com/skyflow/vault/detect/internal/DetectResponseMapper.java @@ -1,18 +1,18 @@ -package com.skyflow.detect.internal; +package com.skyflow.vault.detect.internal; -import com.skyflow.detect.CheckGuardrailsResponse; -import com.skyflow.detect.DeidentifyFileDataFormat; -import com.skyflow.detect.DeidentifyFileSource; -import com.skyflow.detect.DeidentifyFileResponse; -import com.skyflow.detect.DeidentifyStringResponse; -import com.skyflow.detect.DetectRunStatus; -import com.skyflow.detect.FileOutput; -import com.skyflow.detect.GetRunResponse; -import com.skyflow.detect.GuardrailsValidation; -import com.skyflow.detect.DetectedEntity; -import com.skyflow.detect.EntityLocation; -import com.skyflow.detect.Metrics; -import com.skyflow.detect.ReidentifyStringResponse; +import com.skyflow.vault.detect.CheckGuardrailsResponse; +import com.skyflow.vault.detect.DeidentifyFileDataFormat; +import com.skyflow.vault.detect.DeidentifyFileSource; +import com.skyflow.vault.detect.DeidentifyFileResponse; +import com.skyflow.vault.detect.DeidentifyStringResponse; +import com.skyflow.vault.detect.DetectRunStatus; +import com.skyflow.vault.detect.FileOutput; +import com.skyflow.vault.detect.GetRunResponse; +import com.skyflow.vault.detect.GuardrailsValidation; +import com.skyflow.vault.detect.DetectedEntity; +import com.skyflow.vault.detect.EntityLocation; +import com.skyflow.vault.detect.Metrics; +import com.skyflow.vault.detect.ReidentifyStringResponse; import com.skyflow.generated.common.rest.types.DeidentifyStringResponseV2; import com.skyflow.generated.common.rest.types.DeidentifyStringResponseV2DetectedEntity; import com.skyflow.generated.common.rest.types.DeidentifyStringResponseV2EntityLocation; diff --git a/common/src/main/java/com/skyflow/detect/internal/DetectValidations.java b/common/src/main/java/com/skyflow/vault/detect/internal/DetectValidations.java similarity index 94% rename from common/src/main/java/com/skyflow/detect/internal/DetectValidations.java rename to common/src/main/java/com/skyflow/vault/detect/internal/DetectValidations.java index db3345fb..b7f54a0c 100644 --- a/common/src/main/java/com/skyflow/detect/internal/DetectValidations.java +++ b/common/src/main/java/com/skyflow/vault/detect/internal/DetectValidations.java @@ -1,11 +1,11 @@ -package com.skyflow.detect.internal; +package com.skyflow.vault.detect.internal; -import com.skyflow.detect.CheckGuardrailsRequest; -import com.skyflow.detect.DeidentifyFileRequest; -import com.skyflow.detect.DeidentifyStringRequest; -import com.skyflow.detect.PollOptions; -import com.skyflow.detect.GetRunRequest; -import com.skyflow.detect.ReidentifyStringRequest; +import com.skyflow.vault.detect.CheckGuardrailsRequest; +import com.skyflow.vault.detect.DeidentifyFileRequest; +import com.skyflow.vault.detect.DeidentifyStringRequest; +import com.skyflow.vault.detect.PollOptions; +import com.skyflow.vault.detect.GetRunRequest; +import com.skyflow.vault.detect.ReidentifyStringRequest; import com.skyflow.errors.BaseErrorMessage; import com.skyflow.errors.ErrorCode; import com.skyflow.errors.SkyflowException; diff --git a/common/src/main/java/com/skyflow/detect/internal/FileOutputWriter.java b/common/src/main/java/com/skyflow/vault/detect/internal/FileOutputWriter.java similarity index 97% rename from common/src/main/java/com/skyflow/detect/internal/FileOutputWriter.java rename to common/src/main/java/com/skyflow/vault/detect/internal/FileOutputWriter.java index 73261728..b97a80ed 100644 --- a/common/src/main/java/com/skyflow/detect/internal/FileOutputWriter.java +++ b/common/src/main/java/com/skyflow/vault/detect/internal/FileOutputWriter.java @@ -1,7 +1,7 @@ -package com.skyflow.detect.internal; +package com.skyflow.vault.detect.internal; -import com.skyflow.detect.DeidentifyFileSource; -import com.skyflow.detect.FileOutput; +import com.skyflow.vault.detect.DeidentifyFileSource; +import com.skyflow.vault.detect.FileOutput; import com.skyflow.errors.BaseErrorMessage; import com.skyflow.errors.SkyflowException; import com.skyflow.logs.ErrorLogs; diff --git a/common/src/main/java/com/skyflow/detect/internal/ReidentifyFileMapper.java b/common/src/main/java/com/skyflow/vault/detect/internal/ReidentifyFileMapper.java similarity index 91% rename from common/src/main/java/com/skyflow/detect/internal/ReidentifyFileMapper.java rename to common/src/main/java/com/skyflow/vault/detect/internal/ReidentifyFileMapper.java index f1d14003..151fc053 100644 --- a/common/src/main/java/com/skyflow/detect/internal/ReidentifyFileMapper.java +++ b/common/src/main/java/com/skyflow/vault/detect/internal/ReidentifyFileMapper.java @@ -1,11 +1,11 @@ -package com.skyflow.detect.internal; +package com.skyflow.vault.detect.internal; -import com.skyflow.detect.ReidentifyFileSource; -import com.skyflow.detect.DetectRunStatus; -import com.skyflow.detect.ReidentifyFileDataFormat; -import com.skyflow.detect.ReidentifyFileOutput; -import com.skyflow.detect.ReidentifyFileRequest; -import com.skyflow.detect.ReidentifyFileResponse; +import com.skyflow.vault.detect.ReidentifyFileSource; +import com.skyflow.vault.detect.DetectRunStatus; +import com.skyflow.vault.detect.ReidentifyFileDataFormat; +import com.skyflow.vault.detect.ReidentifyFileOutput; +import com.skyflow.vault.detect.ReidentifyFileRequest; +import com.skyflow.vault.detect.ReidentifyFileResponse; import com.skyflow.generated.common.rest.resources.filesv2.requests.ReidentifyFileRequestV2; import com.skyflow.generated.common.rest.resources.filesv2.types.ReidentifyFileRequestV2DataFormat; import com.skyflow.generated.common.rest.resources.filesv2.types.ReidentifyFileRequestV2DataSource; diff --git a/common/src/main/java/com/skyflow/detect/internal/ReidentifyFileValidations.java b/common/src/main/java/com/skyflow/vault/detect/internal/ReidentifyFileValidations.java similarity index 94% rename from common/src/main/java/com/skyflow/detect/internal/ReidentifyFileValidations.java rename to common/src/main/java/com/skyflow/vault/detect/internal/ReidentifyFileValidations.java index 46106c96..53b24a61 100644 --- a/common/src/main/java/com/skyflow/detect/internal/ReidentifyFileValidations.java +++ b/common/src/main/java/com/skyflow/vault/detect/internal/ReidentifyFileValidations.java @@ -1,6 +1,6 @@ -package com.skyflow.detect.internal; +package com.skyflow.vault.detect.internal; -import com.skyflow.detect.ReidentifyFileRequest; +import com.skyflow.vault.detect.ReidentifyFileRequest; import com.skyflow.errors.BaseErrorMessage; import com.skyflow.errors.ErrorCode; import com.skyflow.errors.SkyflowException; diff --git a/common/src/main/java/com/skyflow/detect/polling/RunPoller.java b/common/src/main/java/com/skyflow/vault/detect/polling/RunPoller.java similarity index 94% rename from common/src/main/java/com/skyflow/detect/polling/RunPoller.java rename to common/src/main/java/com/skyflow/vault/detect/polling/RunPoller.java index 4aff5a31..69ac52d2 100644 --- a/common/src/main/java/com/skyflow/detect/polling/RunPoller.java +++ b/common/src/main/java/com/skyflow/vault/detect/polling/RunPoller.java @@ -1,9 +1,9 @@ -package com.skyflow.detect.polling; +package com.skyflow.vault.detect.polling; -import com.skyflow.detect.DetectRunStatus; -import com.skyflow.detect.FileOutput; -import com.skyflow.detect.GetRunResponse; -import com.skyflow.detect.PollOptions; +import com.skyflow.vault.detect.DetectRunStatus; +import com.skyflow.vault.detect.FileOutput; +import com.skyflow.vault.detect.GetRunResponse; +import com.skyflow.vault.detect.PollOptions; import com.skyflow.errors.SkyflowException; import com.skyflow.logs.InfoLogs; import com.skyflow.utils.BaseUtils; diff --git a/common/src/test/java/com/skyflow/vault/controller/BaseDetectControllerTests.java b/common/src/test/java/com/skyflow/vault/controller/BaseDetectControllerTests.java index 76ba7bc9..1a1527d2 100644 --- a/common/src/test/java/com/skyflow/vault/controller/BaseDetectControllerTests.java +++ b/common/src/test/java/com/skyflow/vault/controller/BaseDetectControllerTests.java @@ -1,26 +1,26 @@ package com.skyflow.vault.controller; -import com.skyflow.detect.TestReidentifySource; -import com.skyflow.detect.DeidentifyFileDataFormat; -import com.skyflow.detect.ReidentifyFileSource; -import com.skyflow.detect.DeidentifyFileSource; +import com.skyflow.vault.detect.TestReidentifySource; +import com.skyflow.vault.detect.DeidentifyFileDataFormat; +import com.skyflow.vault.detect.ReidentifyFileSource; +import com.skyflow.vault.detect.DeidentifyFileSource; import com.skyflow.config.BaseVaultConfig; -import com.skyflow.detect.DeidentifyStringRequest; -import com.skyflow.detect.DeidentifyStringResponse; -import com.skyflow.detect.Detect; -import com.skyflow.detect.DetectConfiguration; -import com.skyflow.detect.Entity; -import com.skyflow.detect.CheckGuardrailsRequest; -import com.skyflow.detect.CheckGuardrailsResponse; -import com.skyflow.detect.TestDeidentifySource; -import com.skyflow.detect.DetectRunStatus; -import com.skyflow.detect.EntityType; -import com.skyflow.detect.GetRunRequest; -import com.skyflow.detect.GetRunResponse; -import com.skyflow.detect.GuardrailsValidation; -import com.skyflow.detect.TestRedactionLevel; -import com.skyflow.detect.ReidentifyStringRequest; -import com.skyflow.detect.ReidentifyStringResponse; +import com.skyflow.vault.detect.DeidentifyStringRequest; +import com.skyflow.vault.detect.DeidentifyStringResponse; +import com.skyflow.vault.detect.Detect; +import com.skyflow.vault.detect.DetectConfiguration; +import com.skyflow.vault.detect.Entity; +import com.skyflow.vault.detect.CheckGuardrailsRequest; +import com.skyflow.vault.detect.CheckGuardrailsResponse; +import com.skyflow.vault.detect.TestDeidentifySource; +import com.skyflow.vault.detect.DetectRunStatus; +import com.skyflow.vault.detect.EntityType; +import com.skyflow.vault.detect.GetRunRequest; +import com.skyflow.vault.detect.GetRunResponse; +import com.skyflow.vault.detect.GuardrailsValidation; +import com.skyflow.vault.detect.TestRedactionLevel; +import com.skyflow.vault.detect.ReidentifyStringRequest; +import com.skyflow.vault.detect.ReidentifyStringResponse; import com.skyflow.enums.Env; import com.skyflow.errors.BaseErrorMessage; import com.skyflow.errors.ErrorCode; diff --git a/common/src/test/java/com/skyflow/detect/DetectFileFormatEnumsTests.java b/common/src/test/java/com/skyflow/vault/detect/DetectFileFormatEnumsTests.java similarity index 98% rename from common/src/test/java/com/skyflow/detect/DetectFileFormatEnumsTests.java rename to common/src/test/java/com/skyflow/vault/detect/DetectFileFormatEnumsTests.java index affb8d8b..3e04ed95 100644 --- a/common/src/test/java/com/skyflow/detect/DetectFileFormatEnumsTests.java +++ b/common/src/test/java/com/skyflow/vault/detect/DetectFileFormatEnumsTests.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; import com.skyflow.generated.common.rest.resources.filesv2.types.DeidentifyFileRequestV2DataFormat; import com.skyflow.generated.common.rest.resources.filesv2.types.ReidentifyFileRequestV2DataFormat; diff --git a/common/src/test/java/com/skyflow/detect/DetectFileModelsTests.java b/common/src/test/java/com/skyflow/vault/detect/DetectFileModelsTests.java similarity index 97% rename from common/src/test/java/com/skyflow/detect/DetectFileModelsTests.java rename to common/src/test/java/com/skyflow/vault/detect/DetectFileModelsTests.java index ec57008c..9ea4068e 100644 --- a/common/src/test/java/com/skyflow/detect/DetectFileModelsTests.java +++ b/common/src/test/java/com/skyflow/vault/detect/DetectFileModelsTests.java @@ -1,7 +1,7 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; -import com.skyflow.detect.internal.DetectResponseMapper; -import com.skyflow.detect.internal.ReidentifyFileMapper; +import com.skyflow.vault.detect.internal.DetectResponseMapper; +import com.skyflow.vault.detect.internal.ReidentifyFileMapper; import com.skyflow.enums.RedactionType; import com.skyflow.generated.common.rest.core.ObjectMappers; import com.skyflow.generated.common.rest.types.DetectRunsResponseV2; diff --git a/common/src/test/java/com/skyflow/detect/DetectModelsTests.java b/common/src/test/java/com/skyflow/vault/detect/DetectModelsTests.java similarity index 99% rename from common/src/test/java/com/skyflow/detect/DetectModelsTests.java rename to common/src/test/java/com/skyflow/vault/detect/DetectModelsTests.java index 1f8af952..894418a3 100644 --- a/common/src/test/java/com/skyflow/detect/DetectModelsTests.java +++ b/common/src/test/java/com/skyflow/vault/detect/DetectModelsTests.java @@ -1,6 +1,6 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; -import com.skyflow.detect.internal.DetectResponseMapper; +import com.skyflow.vault.detect.internal.DetectResponseMapper; import com.skyflow.generated.common.rest.core.ObjectMappers; import com.skyflow.generated.common.rest.types.DeidentifyStringResponseV2; import com.skyflow.generated.common.rest.types.DetectGuardrailsResponseV2; diff --git a/common/src/test/java/com/skyflow/detect/TestDeidentifySource.java b/common/src/test/java/com/skyflow/vault/detect/TestDeidentifySource.java similarity index 93% rename from common/src/test/java/com/skyflow/detect/TestDeidentifySource.java rename to common/src/test/java/com/skyflow/vault/detect/TestDeidentifySource.java index 471356fc..6a53b9ba 100644 --- a/common/src/test/java/com/skyflow/detect/TestDeidentifySource.java +++ b/common/src/test/java/com/skyflow/vault/detect/TestDeidentifySource.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** Test stand-in for the per-SDK {@code DeidentifySourceType} enums, which common cannot see. Carries every API value. */ public enum TestDeidentifySource implements DeidentifyFileSource { diff --git a/common/src/test/java/com/skyflow/detect/TestRedactionLevel.java b/common/src/test/java/com/skyflow/vault/detect/TestRedactionLevel.java similarity index 98% rename from common/src/test/java/com/skyflow/detect/TestRedactionLevel.java rename to common/src/test/java/com/skyflow/vault/detect/TestRedactionLevel.java index 5a2cece9..dd2f2f2d 100644 --- a/common/src/test/java/com/skyflow/detect/TestRedactionLevel.java +++ b/common/src/test/java/com/skyflow/vault/detect/TestRedactionLevel.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; import com.skyflow.enums.RedactionType; diff --git a/common/src/test/java/com/skyflow/detect/TestReidentifySource.java b/common/src/test/java/com/skyflow/vault/detect/TestReidentifySource.java similarity index 92% rename from common/src/test/java/com/skyflow/detect/TestReidentifySource.java rename to common/src/test/java/com/skyflow/vault/detect/TestReidentifySource.java index bba36ebc..007f3ab0 100644 --- a/common/src/test/java/com/skyflow/detect/TestReidentifySource.java +++ b/common/src/test/java/com/skyflow/vault/detect/TestReidentifySource.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** Test stand-in for the per-SDK {@code ReidentifySourceType} enums, which common cannot see. */ public enum TestReidentifySource implements ReidentifyFileSource { diff --git a/common/src/test/java/com/skyflow/detect/internal/DeidentifyFileFlowTests.java b/common/src/test/java/com/skyflow/vault/detect/internal/DeidentifyFileFlowTests.java similarity index 92% rename from common/src/test/java/com/skyflow/detect/internal/DeidentifyFileFlowTests.java rename to common/src/test/java/com/skyflow/vault/detect/internal/DeidentifyFileFlowTests.java index 4ff90144..bdce15da 100644 --- a/common/src/test/java/com/skyflow/detect/internal/DeidentifyFileFlowTests.java +++ b/common/src/test/java/com/skyflow/vault/detect/internal/DeidentifyFileFlowTests.java @@ -1,15 +1,15 @@ -package com.skyflow.detect.internal; - -import com.skyflow.detect.TestDeidentifySource; -import com.skyflow.detect.DeidentifyFileDataFormat; -import com.skyflow.detect.DeidentifyFileRequest; -import com.skyflow.detect.DeidentifyFileResponse; -import com.skyflow.detect.DetectRunStatus; -import com.skyflow.detect.FileOutput; -import com.skyflow.detect.GetRunResponse; -import com.skyflow.detect.Metrics; -import com.skyflow.detect.PollOptions; -import com.skyflow.detect.polling.RunPoller; +package com.skyflow.vault.detect.internal; + +import com.skyflow.vault.detect.TestDeidentifySource; +import com.skyflow.vault.detect.DeidentifyFileDataFormat; +import com.skyflow.vault.detect.DeidentifyFileRequest; +import com.skyflow.vault.detect.DeidentifyFileResponse; +import com.skyflow.vault.detect.DetectRunStatus; +import com.skyflow.vault.detect.FileOutput; +import com.skyflow.vault.detect.GetRunResponse; +import com.skyflow.vault.detect.Metrics; +import com.skyflow.vault.detect.PollOptions; +import com.skyflow.vault.detect.polling.RunPoller; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/common/src/test/java/com/skyflow/detect/internal/DeidentifyFileMapperTests.java b/common/src/test/java/com/skyflow/vault/detect/internal/DeidentifyFileMapperTests.java similarity index 93% rename from common/src/test/java/com/skyflow/detect/internal/DeidentifyFileMapperTests.java rename to common/src/test/java/com/skyflow/vault/detect/internal/DeidentifyFileMapperTests.java index 983ebac9..bab469d6 100644 --- a/common/src/test/java/com/skyflow/detect/internal/DeidentifyFileMapperTests.java +++ b/common/src/test/java/com/skyflow/vault/detect/internal/DeidentifyFileMapperTests.java @@ -1,15 +1,15 @@ -package com.skyflow.detect.internal; - -import com.skyflow.detect.TestDeidentifySource; -import com.skyflow.detect.DeidentifyFileRequest; -import com.skyflow.detect.DeidentifyFileResponse; -import com.skyflow.detect.Detect; -import com.skyflow.detect.DetectConfiguration; -import com.skyflow.detect.DetectRunStatus; -import com.skyflow.detect.Entity; -import com.skyflow.detect.EntityType; -import com.skyflow.detect.DeidentifyFileDataFormat; -import com.skyflow.detect.GetRunResponse; +package com.skyflow.vault.detect.internal; + +import com.skyflow.vault.detect.TestDeidentifySource; +import com.skyflow.vault.detect.DeidentifyFileRequest; +import com.skyflow.vault.detect.DeidentifyFileResponse; +import com.skyflow.vault.detect.Detect; +import com.skyflow.vault.detect.DetectConfiguration; +import com.skyflow.vault.detect.DetectRunStatus; +import com.skyflow.vault.detect.Entity; +import com.skyflow.vault.detect.EntityType; +import com.skyflow.vault.detect.DeidentifyFileDataFormat; +import com.skyflow.vault.detect.GetRunResponse; import com.skyflow.errors.BaseErrorMessage; import com.skyflow.errors.SkyflowException; import com.skyflow.generated.common.rest.core.ObjectMappers; diff --git a/common/src/test/java/com/skyflow/detect/internal/DeidentifyFileValidationsTests.java b/common/src/test/java/com/skyflow/vault/detect/internal/DeidentifyFileValidationsTests.java similarity index 96% rename from common/src/test/java/com/skyflow/detect/internal/DeidentifyFileValidationsTests.java rename to common/src/test/java/com/skyflow/vault/detect/internal/DeidentifyFileValidationsTests.java index 99567356..fa9db98f 100644 --- a/common/src/test/java/com/skyflow/detect/internal/DeidentifyFileValidationsTests.java +++ b/common/src/test/java/com/skyflow/vault/detect/internal/DeidentifyFileValidationsTests.java @@ -1,9 +1,9 @@ -package com.skyflow.detect.internal; +package com.skyflow.vault.detect.internal; -import com.skyflow.detect.TestDeidentifySource; +import com.skyflow.vault.detect.TestDeidentifySource; -import com.skyflow.detect.DeidentifyFileRequest; -import com.skyflow.detect.PollOptions; +import com.skyflow.vault.detect.DeidentifyFileRequest; +import com.skyflow.vault.detect.PollOptions; import com.skyflow.errors.BaseErrorMessage; import com.skyflow.errors.ErrorCode; import com.skyflow.errors.SkyflowException; diff --git a/common/src/test/java/com/skyflow/detect/internal/DetectConfigurationMapperTests.java b/common/src/test/java/com/skyflow/vault/detect/internal/DetectConfigurationMapperTests.java similarity index 93% rename from common/src/test/java/com/skyflow/detect/internal/DetectConfigurationMapperTests.java rename to common/src/test/java/com/skyflow/vault/detect/internal/DetectConfigurationMapperTests.java index 049890c3..5aa96da0 100644 --- a/common/src/test/java/com/skyflow/detect/internal/DetectConfigurationMapperTests.java +++ b/common/src/test/java/com/skyflow/vault/detect/internal/DetectConfigurationMapperTests.java @@ -1,28 +1,28 @@ -package com.skyflow.detect.internal; - -import com.skyflow.detect.Audio; -import com.skyflow.detect.Bleep; -import com.skyflow.detect.CustomType; -import com.skyflow.detect.DeidentificationType; -import com.skyflow.detect.Detect; -import com.skyflow.detect.DetectConfiguration; -import com.skyflow.detect.Document; -import com.skyflow.detect.EntityType; -import com.skyflow.detect.DeidentifyFileDataFormat; -import com.skyflow.detect.FileMapping; -import com.skyflow.detect.Image; -import com.skyflow.detect.IncludePrefix; -import com.skyflow.detect.MaskingMethod; -import com.skyflow.detect.Media; -import com.skyflow.detect.ObjectDeidentificationType; -import com.skyflow.detect.ObjectEntity; -import com.skyflow.detect.ObjectEntityType; -import com.skyflow.detect.OutputTranscriptionType; -import com.skyflow.detect.Pdf; -import com.skyflow.detect.PdfProcessingMode; -import com.skyflow.detect.ShiftDates; -import com.skyflow.detect.TestRedactionLevel; -import com.skyflow.detect.Transformation; +package com.skyflow.vault.detect.internal; + +import com.skyflow.vault.detect.Audio; +import com.skyflow.vault.detect.Bleep; +import com.skyflow.vault.detect.CustomType; +import com.skyflow.vault.detect.DeidentificationType; +import com.skyflow.vault.detect.Detect; +import com.skyflow.vault.detect.DetectConfiguration; +import com.skyflow.vault.detect.Document; +import com.skyflow.vault.detect.EntityType; +import com.skyflow.vault.detect.DeidentifyFileDataFormat; +import com.skyflow.vault.detect.FileMapping; +import com.skyflow.vault.detect.Image; +import com.skyflow.vault.detect.IncludePrefix; +import com.skyflow.vault.detect.MaskingMethod; +import com.skyflow.vault.detect.Media; +import com.skyflow.vault.detect.ObjectDeidentificationType; +import com.skyflow.vault.detect.ObjectEntity; +import com.skyflow.vault.detect.ObjectEntityType; +import com.skyflow.vault.detect.OutputTranscriptionType; +import com.skyflow.vault.detect.Pdf; +import com.skyflow.vault.detect.PdfProcessingMode; +import com.skyflow.vault.detect.ShiftDates; +import com.skyflow.vault.detect.TestRedactionLevel; +import com.skyflow.vault.detect.Transformation; import com.skyflow.enums.RedactionType; import com.skyflow.generated.common.rest.core.ObjectMappers; import com.skyflow.generated.common.rest.types.AudioV2; diff --git a/common/src/test/java/com/skyflow/detect/internal/DetectRequestMapperTests.java b/common/src/test/java/com/skyflow/vault/detect/internal/DetectRequestMapperTests.java similarity index 93% rename from common/src/test/java/com/skyflow/detect/internal/DetectRequestMapperTests.java rename to common/src/test/java/com/skyflow/vault/detect/internal/DetectRequestMapperTests.java index ff8e5055..98f7e0fb 100644 --- a/common/src/test/java/com/skyflow/detect/internal/DetectRequestMapperTests.java +++ b/common/src/test/java/com/skyflow/vault/detect/internal/DetectRequestMapperTests.java @@ -1,30 +1,30 @@ -package com.skyflow.detect.internal; - -import com.skyflow.detect.CheckGuardrailsRequest; -import com.skyflow.detect.CustomType; -import com.skyflow.detect.DeidentificationType; -import com.skyflow.detect.DeidentifyStringRequest; -import com.skyflow.detect.Detect; -import com.skyflow.detect.DetectConfiguration; -import com.skyflow.detect.Entity; -import com.skyflow.detect.EntityType; -import com.skyflow.detect.Image; -import com.skyflow.detect.IncludePrefix; -import com.skyflow.detect.MaskingMethod; -import com.skyflow.detect.Media; -import com.skyflow.detect.TestRedactionLevel; +package com.skyflow.vault.detect.internal; + +import com.skyflow.vault.detect.CheckGuardrailsRequest; +import com.skyflow.vault.detect.CustomType; +import com.skyflow.vault.detect.DeidentificationType; +import com.skyflow.vault.detect.DeidentifyStringRequest; +import com.skyflow.vault.detect.Detect; +import com.skyflow.vault.detect.DetectConfiguration; +import com.skyflow.vault.detect.Entity; +import com.skyflow.vault.detect.EntityType; +import com.skyflow.vault.detect.Image; +import com.skyflow.vault.detect.IncludePrefix; +import com.skyflow.vault.detect.MaskingMethod; +import com.skyflow.vault.detect.Media; +import com.skyflow.vault.detect.TestRedactionLevel; import com.skyflow.enums.RedactionType; -import com.skyflow.detect.ReidentifyStringRequest; -import com.skyflow.detect.ReturnEntitiesType; -import com.skyflow.detect.ShiftDates; -import com.skyflow.detect.Transformation; +import com.skyflow.vault.detect.ReidentifyStringRequest; +import com.skyflow.vault.detect.ReturnEntitiesType; +import com.skyflow.vault.detect.ShiftDates; +import com.skyflow.vault.detect.Transformation; import com.skyflow.generated.common.rest.core.ObjectMappers; import com.skyflow.generated.common.rest.resources.guardrailsv2.requests.DetectGuardrailsRequestV2; import com.skyflow.generated.common.rest.resources.stringsv2.requests.DeidentifyStringRequestV2; import com.skyflow.generated.common.rest.resources.stringsv2.requests.ReidentifyStringRequestV2; import com.skyflow.generated.common.rest.types.DetectConfigV2; -import com.skyflow.detect.FileMapping; -import com.skyflow.detect.ObjectEntity; +import com.skyflow.vault.detect.FileMapping; +import com.skyflow.vault.detect.ObjectEntity; import org.junit.Assert; import org.junit.Test; diff --git a/common/src/test/java/com/skyflow/detect/internal/DetectResponseMapperTests.java b/common/src/test/java/com/skyflow/vault/detect/internal/DetectResponseMapperTests.java similarity index 93% rename from common/src/test/java/com/skyflow/detect/internal/DetectResponseMapperTests.java rename to common/src/test/java/com/skyflow/vault/detect/internal/DetectResponseMapperTests.java index 2452422e..d981c4fe 100644 --- a/common/src/test/java/com/skyflow/detect/internal/DetectResponseMapperTests.java +++ b/common/src/test/java/com/skyflow/vault/detect/internal/DetectResponseMapperTests.java @@ -1,14 +1,14 @@ -package com.skyflow.detect.internal; +package com.skyflow.vault.detect.internal; -import com.skyflow.detect.CheckGuardrailsResponse; -import com.skyflow.detect.DeidentifyFileDataFormat; -import com.skyflow.detect.TestDeidentifySource; -import com.skyflow.detect.DeidentifyStringResponse; -import com.skyflow.detect.DetectRunStatus; -import com.skyflow.detect.GetRunResponse; -import com.skyflow.detect.GuardrailsValidation; -import com.skyflow.detect.DetectedEntity; -import com.skyflow.detect.ReidentifyStringResponse; +import com.skyflow.vault.detect.CheckGuardrailsResponse; +import com.skyflow.vault.detect.DeidentifyFileDataFormat; +import com.skyflow.vault.detect.TestDeidentifySource; +import com.skyflow.vault.detect.DeidentifyStringResponse; +import com.skyflow.vault.detect.DetectRunStatus; +import com.skyflow.vault.detect.GetRunResponse; +import com.skyflow.vault.detect.GuardrailsValidation; +import com.skyflow.vault.detect.DetectedEntity; +import com.skyflow.vault.detect.ReidentifyStringResponse; import com.skyflow.generated.common.rest.core.ObjectMappers; import com.skyflow.generated.common.rest.types.DeidentifyStringResponseV2; import com.skyflow.generated.common.rest.types.DetectGuardrailsResponseV2; diff --git a/common/src/test/java/com/skyflow/detect/internal/DetectValidationsTests.java b/common/src/test/java/com/skyflow/vault/detect/internal/DetectValidationsTests.java similarity index 93% rename from common/src/test/java/com/skyflow/detect/internal/DetectValidationsTests.java rename to common/src/test/java/com/skyflow/vault/detect/internal/DetectValidationsTests.java index 09fab254..b7b81a63 100644 --- a/common/src/test/java/com/skyflow/detect/internal/DetectValidationsTests.java +++ b/common/src/test/java/com/skyflow/vault/detect/internal/DetectValidationsTests.java @@ -1,13 +1,13 @@ -package com.skyflow.detect.internal; +package com.skyflow.vault.detect.internal; -import com.skyflow.detect.CheckGuardrailsRequest; -import com.skyflow.detect.DeidentifyStringRequest; -import com.skyflow.detect.DetectConfiguration; -import com.skyflow.detect.EntityType; -import com.skyflow.detect.GetRunRequest; -import com.skyflow.detect.TestRedactionLevel; +import com.skyflow.vault.detect.CheckGuardrailsRequest; +import com.skyflow.vault.detect.DeidentifyStringRequest; +import com.skyflow.vault.detect.DetectConfiguration; +import com.skyflow.vault.detect.EntityType; +import com.skyflow.vault.detect.GetRunRequest; +import com.skyflow.vault.detect.TestRedactionLevel; import com.skyflow.enums.RedactionType; -import com.skyflow.detect.ReidentifyStringRequest; +import com.skyflow.vault.detect.ReidentifyStringRequest; import com.skyflow.errors.BaseErrorMessage; import com.skyflow.errors.ErrorCode; import com.skyflow.errors.SkyflowException; diff --git a/common/src/test/java/com/skyflow/detect/internal/FileOutputWriterTests.java b/common/src/test/java/com/skyflow/vault/detect/internal/FileOutputWriterTests.java similarity index 98% rename from common/src/test/java/com/skyflow/detect/internal/FileOutputWriterTests.java rename to common/src/test/java/com/skyflow/vault/detect/internal/FileOutputWriterTests.java index 86d1f112..d0af1632 100644 --- a/common/src/test/java/com/skyflow/detect/internal/FileOutputWriterTests.java +++ b/common/src/test/java/com/skyflow/vault/detect/internal/FileOutputWriterTests.java @@ -1,8 +1,8 @@ -package com.skyflow.detect.internal; +package com.skyflow.vault.detect.internal; -import com.skyflow.detect.TestDeidentifySource; -import com.skyflow.detect.DeidentifyFileDataFormat; -import com.skyflow.detect.FileOutput; +import com.skyflow.vault.detect.TestDeidentifySource; +import com.skyflow.vault.detect.DeidentifyFileDataFormat; +import com.skyflow.vault.detect.FileOutput; import com.skyflow.errors.SkyflowException; import org.junit.Assert; import org.junit.Rule; diff --git a/common/src/test/java/com/skyflow/detect/internal/ReidentifyFileMapperTests.java b/common/src/test/java/com/skyflow/vault/detect/internal/ReidentifyFileMapperTests.java similarity index 95% rename from common/src/test/java/com/skyflow/detect/internal/ReidentifyFileMapperTests.java rename to common/src/test/java/com/skyflow/vault/detect/internal/ReidentifyFileMapperTests.java index 369c2d10..d97134ce 100644 --- a/common/src/test/java/com/skyflow/detect/internal/ReidentifyFileMapperTests.java +++ b/common/src/test/java/com/skyflow/vault/detect/internal/ReidentifyFileMapperTests.java @@ -1,14 +1,14 @@ -package com.skyflow.detect.internal; - -import com.skyflow.detect.TestReidentifySource; -import com.skyflow.detect.DetectRunStatus; -import com.skyflow.detect.EntityType; -import com.skyflow.detect.ReidentifyFileDataFormat; -import com.skyflow.detect.ReidentifyFileOutput; -import com.skyflow.detect.TestRedactionLevel; +package com.skyflow.vault.detect.internal; + +import com.skyflow.vault.detect.TestReidentifySource; +import com.skyflow.vault.detect.DetectRunStatus; +import com.skyflow.vault.detect.EntityType; +import com.skyflow.vault.detect.ReidentifyFileDataFormat; +import com.skyflow.vault.detect.ReidentifyFileOutput; +import com.skyflow.vault.detect.TestRedactionLevel; import com.skyflow.enums.RedactionType; -import com.skyflow.detect.ReidentifyFileRequest; -import com.skyflow.detect.ReidentifyFileResponse; +import com.skyflow.vault.detect.ReidentifyFileRequest; +import com.skyflow.vault.detect.ReidentifyFileResponse; import com.skyflow.generated.common.rest.core.ObjectMappers; import com.skyflow.generated.common.rest.resources.filesv2.requests.ReidentifyFileRequestV2; import com.skyflow.generated.common.rest.types.ReidentifyFileResponseV2; diff --git a/common/src/test/java/com/skyflow/detect/internal/ReidentifyFileValidationsTests.java b/common/src/test/java/com/skyflow/vault/detect/internal/ReidentifyFileValidationsTests.java similarity index 93% rename from common/src/test/java/com/skyflow/detect/internal/ReidentifyFileValidationsTests.java rename to common/src/test/java/com/skyflow/vault/detect/internal/ReidentifyFileValidationsTests.java index bcd06dd8..6a062edc 100644 --- a/common/src/test/java/com/skyflow/detect/internal/ReidentifyFileValidationsTests.java +++ b/common/src/test/java/com/skyflow/vault/detect/internal/ReidentifyFileValidationsTests.java @@ -1,11 +1,11 @@ -package com.skyflow.detect.internal; +package com.skyflow.vault.detect.internal; -import com.skyflow.detect.TestReidentifySource; -import com.skyflow.detect.EntityType; -import com.skyflow.detect.TestRedactionLevel; +import com.skyflow.vault.detect.TestReidentifySource; +import com.skyflow.vault.detect.EntityType; +import com.skyflow.vault.detect.TestRedactionLevel; import com.skyflow.enums.RedactionType; -import com.skyflow.detect.ReidentifyFileRequest; +import com.skyflow.vault.detect.ReidentifyFileRequest; import com.skyflow.errors.ErrorCode; import com.skyflow.errors.BaseErrorMessage; import com.skyflow.errors.SkyflowException; diff --git a/common/src/test/java/com/skyflow/detect/polling/RunPollerTests.java b/common/src/test/java/com/skyflow/vault/detect/polling/RunPollerTests.java similarity index 96% rename from common/src/test/java/com/skyflow/detect/polling/RunPollerTests.java rename to common/src/test/java/com/skyflow/vault/detect/polling/RunPollerTests.java index 946affeb..9eddd32d 100644 --- a/common/src/test/java/com/skyflow/detect/polling/RunPollerTests.java +++ b/common/src/test/java/com/skyflow/vault/detect/polling/RunPollerTests.java @@ -1,9 +1,9 @@ -package com.skyflow.detect.polling; +package com.skyflow.vault.detect.polling; -import com.skyflow.detect.TestDeidentifySource; -import com.skyflow.detect.DetectRunStatus; -import com.skyflow.detect.GetRunResponse; -import com.skyflow.detect.PollOptions; +import com.skyflow.vault.detect.TestDeidentifySource; +import com.skyflow.vault.detect.DetectRunStatus; +import com.skyflow.vault.detect.GetRunResponse; +import com.skyflow.vault.detect.PollOptions; import com.skyflow.errors.SkyflowException; import org.junit.Assert; import org.junit.Test; diff --git a/docs/api_reference.md b/docs/api_reference.md index 1ced7b14..5597653a 100644 --- a/docs/api_reference.md +++ b/docs/api_reference.md @@ -2,7 +2,7 @@ A reference for the public Skyflow Java SDK surface: client-management methods, config classes, request and response objects, helper classes, enums, and service-account utilities. -The vault, connection and file-upload classes belong to the skyvault SDK (`com.skyflow:skyflow-java`). The Detect classes in `com.skyflow.detect`, together with the credentials, config and service-account classes, live in the shared `common` module and apply to both the skyvault and the flowvault SDK (`com.skyflow:skyflow-flowvault-java`). Where a Detect field is specific to one vault type the table says so. The flowvault vault-operation classes (bulk insert, tokenize, detokenize and delete) are documented in the [flowvault README](../flowvault/README.md). +The vault, connection and file-upload classes belong to the skyvault SDK (`com.skyflow:skyflow-java`). The Detect classes in `com.skyflow.vault.detect`, together with the credentials, config and service-account classes, live in the shared `common` module and apply to both the skyvault and the flowvault SDK (`com.skyflow:skyflow-flowvault-java`). Where a Detect field is specific to one vault type the table says so. The flowvault vault-operation classes (bulk insert, tokenize, detokenize and delete) are documented in the [flowvault README](../flowvault/README.md). For task-oriented usage and examples, see the [skyvault README](../skyvault/README.md) and the [flowvault README](../flowvault/README.md). @@ -23,7 +23,7 @@ All attributes, parameters, and enum values below are taken directly from the SD ## Detect API -Shared by the skyvault and flowvault SDKs. `skyflowClient.detect()` and `skyflowClient.detect(vaultId)` return a `DetectController`; every class below is in `com.skyflow.detect`. Usage and examples: [skyvault README](../skyvault/README.md#detect), [flowvault README](../flowvault/README.md#detect). +Shared by the skyvault and flowvault SDKs. `skyflowClient.detect()` and `skyflowClient.detect(vaultId)` return a `DetectController`; every class below is in `com.skyflow.vault.detect`. Usage and examples: [skyvault README](../skyvault/README.md#detect), [flowvault README](../flowvault/README.md#detect). | Method | Request | Response | |--------|---------|----------| @@ -228,7 +228,7 @@ Parameters listed with their defaults as defined in the builders. ### `DeidentifyStringRequest` -`com.skyflow.detect` — passed to `detect().deidentifyString()`. +`com.skyflow.vault.detect` — passed to `detect().deidentifyString()`. | Builder method | Default | Description | |----------------|---------|-------------| @@ -238,7 +238,7 @@ Parameters listed with their defaults as defined in the builders. ### `DeidentifyFileRequest` -`com.skyflow.detect` — passed to `detect().deidentifyFile()`. Supply the file through exactly one of `value` (with a `dataSource`), `file` or `filePath`. +`com.skyflow.vault.detect` — passed to `detect().deidentifyFile()`. Supply the file through exactly one of `value` (with a `dataSource`), `file` or `filePath`. | Builder method | Default | Description | |----------------|---------|-------------| @@ -254,7 +254,7 @@ Parameters listed with their defaults as defined in the builders. ### `ReidentifyStringRequest` -`com.skyflow.detect` — passed to `detect().reidentifyString()`. +`com.skyflow.vault.detect` — passed to `detect().reidentifyString()`. | Builder method | Default | Description | |----------------|---------|-------------| @@ -263,7 +263,7 @@ Parameters listed with their defaults as defined in the builders. ### `ReidentifyFileRequest` -`com.skyflow.detect` — passed to `detect().reidentifyFile()`. Synchronous: the re-identified file comes back in the response. +`com.skyflow.vault.detect` — passed to `detect().reidentifyFile()`. Synchronous: the re-identified file comes back in the response. | Builder method | Default | Description | |----------------|---------|-------------| @@ -274,7 +274,7 @@ Parameters listed with their defaults as defined in the builders. ### `GetRunRequest` -`com.skyflow.detect` — passed to `detect().getRun()`. +`com.skyflow.vault.detect` — passed to `detect().getRun()`. | Builder method | Default | Description | |----------------|---------|-------------| @@ -282,7 +282,7 @@ Parameters listed with their defaults as defined in the builders. ### `CheckGuardrailsRequest` -`com.skyflow.detect` — passed to `detect().checkGuardrails()`. +`com.skyflow.vault.detect` — passed to `detect().checkGuardrails()`. | Builder method | Default | Description | |----------------|---------|-------------| @@ -396,7 +396,7 @@ Each element returned by `getDetokenizedFields()` and `getErrors()`. ### `DeidentifyStringResponse` -`com.skyflow.detect` — returned by `detect().deidentifyString()`. +`com.skyflow.vault.detect` — returned by `detect().deidentifyString()`. | Getter | Return type | Description | |--------|-------------|-------------| @@ -406,7 +406,7 @@ Each element returned by `getDetokenizedFields()` and `getErrors()`. ### `ReidentifyStringResponse` -`com.skyflow.detect` — returned by `detect().reidentifyString()`. +`com.skyflow.vault.detect` — returned by `detect().reidentifyString()`. | Getter | Return type | Description | |--------|-------------|-------------| @@ -415,7 +415,7 @@ Each element returned by `getDetokenizedFields()` and `getErrors()`. ### `DeidentifyFileResponse` -`com.skyflow.detect` — returned by `detect().deidentifyFile()`. Without `pollOptions` only `getRunId()` is set. +`com.skyflow.vault.detect` — returned by `detect().deidentifyFile()`. Without `pollOptions` only `getRunId()` is set. | Getter | Return type | Description | |--------|-------------|-------------| @@ -428,7 +428,7 @@ Each element returned by `getDetokenizedFields()` and `getErrors()`. ### `ReidentifyFileResponse` -`com.skyflow.detect` — returned by `detect().reidentifyFile()`. +`com.skyflow.vault.detect` — returned by `detect().reidentifyFile()`. | Getter | Return type | Description | |--------|-------------|-------------| @@ -439,11 +439,11 @@ Each element returned by `getDetokenizedFields()` and `getErrors()`. ### `GetRunResponse` -`com.skyflow.detect` — returned by `detect().getRun()`. Same getters as [`DeidentifyFileResponse`](#deidentifyfileresponse). +`com.skyflow.vault.detect` — returned by `detect().getRun()`. Same getters as [`DeidentifyFileResponse`](#deidentifyfileresponse). ### `CheckGuardrailsResponse` -`com.skyflow.detect` — returned by `detect().checkGuardrails()`. +`com.skyflow.vault.detect` — returned by `detect().checkGuardrails()`. | Getter | Return type | Description | |--------|-------------|-------------| @@ -496,7 +496,7 @@ Each element returned by `getDetokenizedFields()` and `getErrors()`. ### `DetectConfiguration` -`com.skyflow.detect` — inline Detect policy for `deidentifyString` and `deidentifyFile`. +`com.skyflow.vault.detect` — inline Detect policy for `deidentifyString` and `deidentifyFile`. | Builder method | Default | Description | |----------------|---------|-------------| @@ -574,7 +574,7 @@ Each element returned by `getDetokenizedFields()` and `getErrors()`. ### `PollOptions` -`com.skyflow.detect` — opts `deidentifyFile` into submit-and-poll mode. The SDK polls with exponential backoff (1, 2, 4, 8, 16, then 32 seconds) on the calling thread. +`com.skyflow.vault.detect` — opts `deidentifyFile` into submit-and-poll mode. The SDK polls with exponential backoff (1, 2, 4, 8, 16, then 32 seconds) on the calling thread. | Builder method | Default | Description | |----------------|---------|-------------| @@ -583,7 +583,7 @@ Each element returned by `getDetokenizedFields()` and `getErrors()`. ### `RedactionLevel` -`com.skyflow.detect` — element of `redactionLevel()` on `ReidentifyStringRequest` and `ReidentifyFileRequest`. The class is defined per SDK and carries only the pair of fields its vault type uses, so the other vault's fields cannot be set. Both fields are optional on the API and are sent as given. +`com.skyflow.vault.detect` — element of `redactionLevel()` on `ReidentifyStringRequest` and `ReidentifyFileRequest`. The class is defined per SDK and carries only the pair of fields its vault type uses, so the other vault's fields cannot be set. Both fields are optional on the API and are sent as given. | SDK | Builder method | Description | |-----|----------------|-------------| @@ -594,7 +594,7 @@ Each element returned by `getDetokenizedFields()` and `getErrors()`. ### `DetectedEntity` -`com.skyflow.detect` — element of `DeidentifyStringResponse.getEntities()`. +`com.skyflow.vault.detect` — element of `DeidentifyStringResponse.getEntities()`. | Getter | Return type | Description | |--------|-------------|-------------| @@ -624,7 +624,7 @@ Each element returned by `getDetokenizedFields()` and `getErrors()`. ### `FileOutput` -`com.skyflow.detect` — element of `getOutput()` on `DeidentifyFileResponse` and `GetRunResponse`. `ReidentifyFileResponse.getOutput()` holds `ReidentifyFileOutput`, which has the same three getters with `getProcessedFileExtension()` typed `ReidentifyFileDataFormat`. +`com.skyflow.vault.detect` — element of `getOutput()` on `DeidentifyFileResponse` and `GetRunResponse`. `ReidentifyFileResponse.getOutput()` holds `ReidentifyFileOutput`, which has the same three getters with `getProcessedFileExtension()` typed `ReidentifyFileDataFormat`. | Getter | Return type | Description | |--------|-------------|-------------| @@ -694,7 +694,7 @@ Each element returned by `getDetokenizedFields()` and `getErrors()`. ### Detect enums -All in `com.skyflow.detect`. +All in `com.skyflow.vault.detect`. | Enum | Values | |------|--------| diff --git a/docs/migrate_detect.md b/docs/migrate_detect.md index 5c48b802..f0a834da 100644 --- a/docs/migrate_detect.md +++ b/docs/migrate_detect.md @@ -4,7 +4,7 @@ This guide is for skyvault users of the Java SDK (`com.skyflow:skyflow-java`) wh `deidentifyText`, `reidentifyText`, `deidentifyFile` or `getDetectRun` from `com.skyflow.vault.detect`. Those methods, their request and response classes, and the enums `DetectEntities`, `TokenType`, `DetectOutputTranscriptions` and `MaskingMethod` in `com.skyflow.enums` are removed in **skyflow-java 2.2.0** and -replaced by the Detect methods in `com.skyflow.detect`, documented in the [skyvault README](../skyvault/README.md#detect). +replaced by the Detect methods in `com.skyflow.vault.detect`, documented in the [skyvault README](../skyvault/README.md#detect). Projects that call the removed methods stop compiling on upgrade, so pin the version explicitly and follow this guide rather than relying on a version range. @@ -44,7 +44,7 @@ Client creation and the `skyflowClient.detect()` / `skyflowClient.detect(vaultId | | Removed | Replacement | |---|---|---| -| Package | `com.skyflow.vault.detect`, enums in `com.skyflow.enums` | `com.skyflow.detect` for requests, responses and Detect enums; `RedactionType` stays in `com.skyflow.enums` | +| Package | `com.skyflow.vault.detect` (old classes), Detect enums in `com.skyflow.enums` | `com.skyflow.vault.detect` again, with a new set of classes; the Detect enums move there too. `RedactionType` stays in `com.skyflow.enums` | | API | `/v1/detect/...`, one file endpoint per file type | `/v2/detect/...`, one file endpoint | | Detection policy | flat fields on every request | a stored configuration id, or one inline `DetectConfiguration` | | Token type | `TokenFormat` with per-type lists | `deidentificationType` on each `Entity`; `VAULT_TOKEN` entities name their `table.column` | @@ -58,15 +58,17 @@ Client creation and the `skyflowClient.detect()` / `skyflowClient.detect(vaultId |---|---|---|---| | `deidentifyText(DeidentifyTextRequest)` | `deidentifyString(DeidentifyStringRequest)` | `DeidentifyStringRequest` | `DeidentifyStringResponse` | | `reidentifyText(ReidentifyTextRequest)` | `reidentifyString(ReidentifyStringRequest)` | `ReidentifyStringRequest` | `ReidentifyStringResponse` | -| `deidentifyFile(DeidentifyFileRequest)` | `deidentifyFile(DeidentifyFileRequest)`, same name, new types | `DeidentifyFileRequest` in `com.skyflow.detect` | `DeidentifyFileResponse` in `com.skyflow.detect` | +| `deidentifyFile(DeidentifyFileRequest)` | `deidentifyFile(DeidentifyFileRequest)`, same name, same class names, new shape | `DeidentifyFileRequest` (new builder and fields) | `DeidentifyFileResponse` (new fields) | | `getDetectRun(GetDetectRunRequest)` | `getRun(GetRunRequest)` | `GetRunRequest` | `GetRunResponse` | | — | `reidentifyFile(ReidentifyFileRequest)` | `ReidentifyFileRequest` | `ReidentifyFileResponse` | | — | `checkGuardrails(CheckGuardrailsRequest)` | `CheckGuardrailsRequest` | `CheckGuardrailsResponse` | -The file request and response keep their simple class names and only change package. A project that still imports -`com.skyflow.vault.detect.*` fails to compile; replace that import with `com.skyflow.detect.*`. Every method is still -reached through `skyflowClient.detect()`, takes a builder-built request, returns a response object and throws -`SkyflowException`. +The package name does not change, so an existing `import com.skyflow.vault.detect.*;` still resolves. What breaks +is what the package contains: the old request and response classes are gone except `DeidentifyFileRequest` and +`DeidentifyFileResponse`, which keep their names but have different builders, fields and getters. Expect the compile +errors on the removed classes, the removed enums in `com.skyflow.enums`, and the old `DeidentifyFileRequest` builder +calls, not on the import line. Every method is still reached through `skyflowClient.detect()`, takes a builder-built +request, returns a response object and throws `SkyflowException`. ## Step 1: move the detection policy into a configuration @@ -105,7 +107,7 @@ update or delete stored configurations. ### Enum renames -| Removed (`com.skyflow.enums`) | Replacement (`com.skyflow.detect`) | +| Removed (`com.skyflow.enums`) | Replacement (`com.skyflow.vault.detect`) | |---|---| | `DetectEntities` (`ALL`, `NAME`, `EMAIL_ADDRESS`, `SSN`, ...) | `EntityType`, the same values plus `NONE` | | `TokenType` (`VAULT_TOKEN`, `ENTITY_UNIQUE_COUNTER`, `ENTITY_ONLY`) | `DeidentificationType`, same names plus `MASK` and `UNKNOWN` | @@ -139,7 +141,7 @@ DeidentifyTextRequest request = DeidentifyTextRequest.builder() **Replacement, inline configuration** ```java -import com.skyflow.detect.*; +import com.skyflow.vault.detect.*; DetectConfiguration configuration = DetectConfiguration.builder() .detect(Detect.builder() @@ -265,11 +267,12 @@ to the flowvault SDK. ## Step 4: deidentifyFile, new request and response -The method keeps its name. The request and response classes keep their simple names but move to `com.skyflow.detect` -with new shapes. Three things change at once: the file input, the policy, and the polling. +The method keeps its name, and so do its request and response classes, in the same package. Only their shape changes, +which means the old builder calls fail to compile rather than the import. Three things change at once: the file input, +the policy, and the polling. ```java -// Removed (com.skyflow.vault.detect): always polled, result in one response, processed copy written to the temp directory +// Removed (old DeidentifyFileRequest builder): always polled, result in one response, processed copy written to the temp directory DeidentifyFileResponse before = skyflowClient.detect().deidentifyFile(DeidentifyFileRequest.builder() .file(FileInput.builder().filePath("/data/intake/patient-notes.pdf").build()) .entities(Collections.singletonList(DetectEntities.ALL)) @@ -284,7 +287,7 @@ before.getFileBase64(); // first output only before.getEntities(); // List before.getPageCount(); -// Replacement (com.skyflow.detect): same behaviour, opt in to polling +// Replacement (new DeidentifyFileRequest builder): same behaviour, opt in to polling DeidentifyFileResponse after = skyflowClient.detect().deidentifyFile(DeidentifyFileRequest.builder() .filePath("/data/intake/patient-notes.pdf") .configurationId("") // or .configuration(...) with media.document.pdf density 200, maxResolution 3000 @@ -318,7 +321,7 @@ String runId = submitted.getRunId(); // getStatus() is null, nothing w ### File response mapping -| Removed (`DeidentifyFileResponse` in `com.skyflow.vault.detect`) | Replacement (`DeidentifyFileResponse` in `com.skyflow.detect`, and `GetRunResponse`) | +| Removed (old `DeidentifyFileResponse`) | Replacement (new `DeidentifyFileResponse`, same name and package, and `GetRunResponse`) | |---|---| | `getRunId()` | `getRunId()` | | `getStatus()` as `String` (`IN_PROGRESS`, `FAILED`, `SUCCESS`) | `getStatus()` as `DetectRunStatus` (`SUCCESS`, `FAILED`, `IN_PROGRESS`, `QUEUED`, `UNKNOWN`), `null` when not polled | @@ -402,9 +405,10 @@ request, and writes nothing. A blank run id is rejected before the call. 1. Upgrade to `com.skyflow:skyflow-java:2.2.0`. 2. Create a stored Detect configuration in Studio that reproduces your policy, or build it inline with `DetectConfiguration` using the field mapping above. -3. Replace imports from `com.skyflow.vault.detect` and the removed enums with `com.skyflow.detect`. +3. Keep the `com.skyflow.vault.detect` imports; drop imports of the removed enums from `com.skyflow.enums` and import + their replacements from `com.skyflow.vault.detect`. 4. Rename the calls: `deidentifyText` to `deidentifyString`, `reidentifyText` to `reidentifyString`, `getDetectRun` to - `getRun`. `deidentifyFile` keeps its name; switch its request and response to the `com.skyflow.detect` classes. + `getRun`. `deidentifyFile` keeps its name; rebuild its request with the new builder and read the new response fields. 5. Give every `VAULT_TOKEN` entity a `destination(".")`. 6. Add `pollOptions` to every file call that expects a completed result. 7. Replace reads of `getFile()`, `getFileBase64()` and `getEntities()` on file responses with a loop over diff --git a/flowvault/README.md b/flowvault/README.md index f0da869c..df59d46b 100644 --- a/flowvault/README.md +++ b/flowvault/README.md @@ -1951,12 +1951,12 @@ Detect configurations are created in [Skyflow Studio](https://docs.skyflow.com) | Method | Request | Response | Description | |--------|---------|----------|-------------| -| `deidentifyString(DeidentifyStringRequest)` | `com.skyflow.detect.DeidentifyStringRequest` | `com.skyflow.detect.DeidentifyStringResponse` | Detect and replace sensitive data in a string | -| `deidentifyFile(DeidentifyFileRequest)` | `com.skyflow.detect.DeidentifyFileRequest` | `com.skyflow.detect.DeidentifyFileResponse` | Submit a file for de-identification, optionally polling the run to completion | -| `reidentifyString(ReidentifyStringRequest)` | `com.skyflow.detect.ReidentifyStringRequest` | `com.skyflow.detect.ReidentifyStringResponse` | Replace tokens in a string with their original or redacted values | -| `reidentifyFile(ReidentifyFileRequest)` | `com.skyflow.detect.ReidentifyFileRequest` | `com.skyflow.detect.ReidentifyFileResponse` | Replace tokens in a file with their original or redacted values | -| `getRun(GetRunRequest)` | `com.skyflow.detect.GetRunRequest` | `com.skyflow.detect.GetRunResponse` | Retrieve the status and outputs of a Detect file run | -| `checkGuardrails(CheckGuardrailsRequest)` | `com.skyflow.detect.CheckGuardrailsRequest` | `com.skyflow.detect.CheckGuardrailsResponse` | Screen text for toxicity and denied topics | +| `deidentifyString(DeidentifyStringRequest)` | `com.skyflow.vault.detect.DeidentifyStringRequest` | `com.skyflow.vault.detect.DeidentifyStringResponse` | Detect and replace sensitive data in a string | +| `deidentifyFile(DeidentifyFileRequest)` | `com.skyflow.vault.detect.DeidentifyFileRequest` | `com.skyflow.vault.detect.DeidentifyFileResponse` | Submit a file for de-identification, optionally polling the run to completion | +| `reidentifyString(ReidentifyStringRequest)` | `com.skyflow.vault.detect.ReidentifyStringRequest` | `com.skyflow.vault.detect.ReidentifyStringResponse` | Replace tokens in a string with their original or redacted values | +| `reidentifyFile(ReidentifyFileRequest)` | `com.skyflow.vault.detect.ReidentifyFileRequest` | `com.skyflow.vault.detect.ReidentifyFileResponse` | Replace tokens in a file with their original or redacted values | +| `getRun(GetRunRequest)` | `com.skyflow.vault.detect.GetRunRequest` | `com.skyflow.vault.detect.GetRunResponse` | Retrieve the status and outputs of a Detect file run | +| `checkGuardrails(CheckGuardrailsRequest)` | `com.skyflow.vault.detect.CheckGuardrailsRequest` | `com.skyflow.vault.detect.CheckGuardrailsResponse` | Screen text for toxicity and denied topics | ## Before you start @@ -1975,7 +1975,7 @@ Detect configurations are created in [Skyflow Studio](https://docs.skyflow.com) `DeidentifyStringRequest` takes the text plus, optionally, `configurationId` (a stored Detect configuration) or `configuration` (an inline `DetectConfiguration`). Both are sent exactly as supplied. With neither set the SDK sends only the vault id and the server applies the vault's defaults; sending both is rejected by the API (see [Before you start](#before-you-start)). The SDK fills the vault id into the configuration from the controller. ```java -import com.skyflow.detect.*; +import com.skyflow.vault.detect.*; // Stored configuration DeidentifyStringResponse response = skyflowClient.detect().deidentifyString( diff --git a/flowvault/api-report/skyflow-flowvault-java.baseline.jar b/flowvault/api-report/skyflow-flowvault-java.baseline.jar index 9bebd8e2..6786b128 100644 Binary files a/flowvault/api-report/skyflow-flowvault-java.baseline.jar and b/flowvault/api-report/skyflow-flowvault-java.baseline.jar differ diff --git a/flowvault/pom.xml b/flowvault/pom.xml index 6f14cd0b..9d450aff 100644 --- a/flowvault/pom.xml +++ b/flowvault/pom.xml @@ -12,7 +12,7 @@ skyflow-flowvault-java - 1.4.0 + 1.4.0-dev.28398337 jar ${project.groupId}:${project.artifactId} Skyflow FlowVault SDK for the Java programming language @@ -135,20 +135,7 @@ true true true - - + com.skyflow.Skyflow com.skyflow.config com.skyflow.enums @@ -156,6 +143,7 @@ com.skyflow.serviceaccount.util com.skyflow.vault.controller com.skyflow.vault.data + com.skyflow.vault.detect false false diff --git a/flowvault/samples/src/main/java/com/example/detect/CheckGuardrailsSample.java b/flowvault/samples/src/main/java/com/example/detect/CheckGuardrailsSample.java index 821032c5..b12adf72 100644 --- a/flowvault/samples/src/main/java/com/example/detect/CheckGuardrailsSample.java +++ b/flowvault/samples/src/main/java/com/example/detect/CheckGuardrailsSample.java @@ -3,9 +3,9 @@ import com.skyflow.Skyflow; import com.skyflow.config.Credentials; import com.skyflow.config.VaultConfig; -import com.skyflow.detect.CheckGuardrailsRequest; -import com.skyflow.detect.CheckGuardrailsResponse; -import com.skyflow.detect.GuardrailsValidation; +import com.skyflow.vault.detect.CheckGuardrailsRequest; +import com.skyflow.vault.detect.CheckGuardrailsResponse; +import com.skyflow.vault.detect.GuardrailsValidation; import com.skyflow.enums.Env; import com.skyflow.enums.LogLevel; import com.skyflow.errors.SkyflowException; diff --git a/flowvault/samples/src/main/java/com/example/detect/DeidentifyFileAsyncSample.java b/flowvault/samples/src/main/java/com/example/detect/DeidentifyFileAsyncSample.java index 0031124f..39c47373 100644 --- a/flowvault/samples/src/main/java/com/example/detect/DeidentifyFileAsyncSample.java +++ b/flowvault/samples/src/main/java/com/example/detect/DeidentifyFileAsyncSample.java @@ -3,10 +3,10 @@ import com.skyflow.Skyflow; import com.skyflow.config.Credentials; import com.skyflow.config.VaultConfig; -import com.skyflow.detect.DeidentifyFileRequest; -import com.skyflow.detect.DeidentifyFileResponse; -import com.skyflow.detect.DetectRunStatus; -import com.skyflow.detect.PollOptions; +import com.skyflow.vault.detect.DeidentifyFileRequest; +import com.skyflow.vault.detect.DeidentifyFileResponse; +import com.skyflow.vault.detect.DetectRunStatus; +import com.skyflow.vault.detect.PollOptions; import com.skyflow.enums.Env; import com.skyflow.enums.LogLevel; import com.skyflow.errors.SkyflowException; diff --git a/flowvault/samples/src/main/java/com/example/detect/DeidentifyFileSample.java b/flowvault/samples/src/main/java/com/example/detect/DeidentifyFileSample.java index 212b8e2e..7f9a3114 100644 --- a/flowvault/samples/src/main/java/com/example/detect/DeidentifyFileSample.java +++ b/flowvault/samples/src/main/java/com/example/detect/DeidentifyFileSample.java @@ -3,10 +3,10 @@ import com.skyflow.Skyflow; import com.skyflow.config.Credentials; import com.skyflow.config.VaultConfig; -import com.skyflow.detect.DeidentifyFileRequest; -import com.skyflow.detect.DeidentifyFileResponse; -import com.skyflow.detect.DetectRunStatus; -import com.skyflow.detect.PollOptions; +import com.skyflow.vault.detect.DeidentifyFileRequest; +import com.skyflow.vault.detect.DeidentifyFileResponse; +import com.skyflow.vault.detect.DetectRunStatus; +import com.skyflow.vault.detect.PollOptions; import com.skyflow.enums.Env; import com.skyflow.enums.LogLevel; import com.skyflow.errors.SkyflowException; diff --git a/flowvault/samples/src/main/java/com/example/detect/DeidentifyStringSample.java b/flowvault/samples/src/main/java/com/example/detect/DeidentifyStringSample.java index 0afd47cb..493a2bf2 100644 --- a/flowvault/samples/src/main/java/com/example/detect/DeidentifyStringSample.java +++ b/flowvault/samples/src/main/java/com/example/detect/DeidentifyStringSample.java @@ -3,15 +3,15 @@ import com.skyflow.Skyflow; import com.skyflow.config.Credentials; import com.skyflow.config.VaultConfig; -import com.skyflow.detect.DeidentificationType; -import com.skyflow.detect.DeidentifyStringRequest; -import com.skyflow.detect.DeidentifyStringResponse; -import com.skyflow.detect.Detect; -import com.skyflow.detect.DetectConfiguration; -import com.skyflow.detect.DetectedEntity; -import com.skyflow.detect.Entity; -import com.skyflow.detect.EntityType; -import com.skyflow.detect.ReturnEntitiesType; +import com.skyflow.vault.detect.DeidentificationType; +import com.skyflow.vault.detect.DeidentifyStringRequest; +import com.skyflow.vault.detect.DeidentifyStringResponse; +import com.skyflow.vault.detect.Detect; +import com.skyflow.vault.detect.DetectConfiguration; +import com.skyflow.vault.detect.DetectedEntity; +import com.skyflow.vault.detect.Entity; +import com.skyflow.vault.detect.EntityType; +import com.skyflow.vault.detect.ReturnEntitiesType; import com.skyflow.enums.Env; import com.skyflow.enums.LogLevel; import com.skyflow.errors.SkyflowException; diff --git a/flowvault/samples/src/main/java/com/example/detect/GetRunSample.java b/flowvault/samples/src/main/java/com/example/detect/GetRunSample.java index fcab057c..ec01ee26 100644 --- a/flowvault/samples/src/main/java/com/example/detect/GetRunSample.java +++ b/flowvault/samples/src/main/java/com/example/detect/GetRunSample.java @@ -3,11 +3,11 @@ import com.skyflow.Skyflow; import com.skyflow.config.Credentials; import com.skyflow.config.VaultConfig; -import com.skyflow.detect.DeidentifySourceType; -import com.skyflow.detect.DetectRunStatus; -import com.skyflow.detect.FileOutput; -import com.skyflow.detect.GetRunRequest; -import com.skyflow.detect.GetRunResponse; +import com.skyflow.vault.detect.DeidentifySourceType; +import com.skyflow.vault.detect.DetectRunStatus; +import com.skyflow.vault.detect.FileOutput; +import com.skyflow.vault.detect.GetRunRequest; +import com.skyflow.vault.detect.GetRunResponse; import com.skyflow.enums.Env; import com.skyflow.enums.LogLevel; import com.skyflow.errors.SkyflowException; diff --git a/flowvault/samples/src/main/java/com/example/detect/ReidentifyFileSample.java b/flowvault/samples/src/main/java/com/example/detect/ReidentifyFileSample.java index f8ff5c33..496a37d5 100644 --- a/flowvault/samples/src/main/java/com/example/detect/ReidentifyFileSample.java +++ b/flowvault/samples/src/main/java/com/example/detect/ReidentifyFileSample.java @@ -3,13 +3,13 @@ import com.skyflow.Skyflow; import com.skyflow.config.Credentials; import com.skyflow.config.VaultConfig; -import com.skyflow.detect.ReidentifySourceType; -import com.skyflow.detect.DetectRunStatus; -import com.skyflow.detect.ReidentifyFileDataFormat; -import com.skyflow.detect.ReidentifyFileOutput; -import com.skyflow.detect.RedactionLevel; -import com.skyflow.detect.ReidentifyFileRequest; -import com.skyflow.detect.ReidentifyFileResponse; +import com.skyflow.vault.detect.ReidentifySourceType; +import com.skyflow.vault.detect.DetectRunStatus; +import com.skyflow.vault.detect.ReidentifyFileDataFormat; +import com.skyflow.vault.detect.ReidentifyFileOutput; +import com.skyflow.vault.detect.RedactionLevel; +import com.skyflow.vault.detect.ReidentifyFileRequest; +import com.skyflow.vault.detect.ReidentifyFileResponse; import com.skyflow.enums.Env; import com.skyflow.enums.LogLevel; import com.skyflow.errors.SkyflowException; diff --git a/flowvault/samples/src/main/java/com/example/detect/ReidentifyStringSample.java b/flowvault/samples/src/main/java/com/example/detect/ReidentifyStringSample.java index 0b08f8e3..57a63361 100644 --- a/flowvault/samples/src/main/java/com/example/detect/ReidentifyStringSample.java +++ b/flowvault/samples/src/main/java/com/example/detect/ReidentifyStringSample.java @@ -3,16 +3,16 @@ import com.skyflow.Skyflow; import com.skyflow.config.Credentials; import com.skyflow.config.VaultConfig; -import com.skyflow.detect.DeidentificationType; -import com.skyflow.detect.DeidentifyStringRequest; -import com.skyflow.detect.DeidentifyStringResponse; -import com.skyflow.detect.Detect; -import com.skyflow.detect.DetectConfiguration; -import com.skyflow.detect.Entity; -import com.skyflow.detect.EntityType; -import com.skyflow.detect.RedactionLevel; -import com.skyflow.detect.ReidentifyStringRequest; -import com.skyflow.detect.ReidentifyStringResponse; +import com.skyflow.vault.detect.DeidentificationType; +import com.skyflow.vault.detect.DeidentifyStringRequest; +import com.skyflow.vault.detect.DeidentifyStringResponse; +import com.skyflow.vault.detect.Detect; +import com.skyflow.vault.detect.DetectConfiguration; +import com.skyflow.vault.detect.Entity; +import com.skyflow.vault.detect.EntityType; +import com.skyflow.vault.detect.RedactionLevel; +import com.skyflow.vault.detect.ReidentifyStringRequest; +import com.skyflow.vault.detect.ReidentifyStringResponse; import com.skyflow.enums.Env; import com.skyflow.enums.LogLevel; import com.skyflow.errors.SkyflowException; diff --git a/flowvault/src/main/java/com/skyflow/vault/controller/DetectController.java b/flowvault/src/main/java/com/skyflow/vault/controller/DetectController.java index 08745fb1..bc23c9e4 100644 --- a/flowvault/src/main/java/com/skyflow/vault/controller/DetectController.java +++ b/flowvault/src/main/java/com/skyflow/vault/controller/DetectController.java @@ -2,10 +2,10 @@ import com.skyflow.config.Credentials; import com.skyflow.config.VaultConfig; -import com.skyflow.detect.DeidentifyFileSource; -import com.skyflow.detect.DeidentifySourceType; -import com.skyflow.detect.ReidentifyFileSource; -import com.skyflow.detect.ReidentifySourceType; +import com.skyflow.vault.detect.DeidentifyFileSource; +import com.skyflow.vault.detect.DeidentifySourceType; +import com.skyflow.vault.detect.ReidentifyFileSource; +import com.skyflow.vault.detect.ReidentifySourceType; import com.skyflow.errors.SkyflowException; import com.skyflow.utils.Utils; diff --git a/flowvault/src/main/java/com/skyflow/detect/DeidentifySourceType.java b/flowvault/src/main/java/com/skyflow/vault/detect/DeidentifySourceType.java similarity index 92% rename from flowvault/src/main/java/com/skyflow/detect/DeidentifySourceType.java rename to flowvault/src/main/java/com/skyflow/vault/detect/DeidentifySourceType.java index 86f5e13f..8fa8e982 100644 --- a/flowvault/src/main/java/com/skyflow/detect/DeidentifySourceType.java +++ b/flowvault/src/main/java/com/skyflow/vault/detect/DeidentifySourceType.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * How the input file is supplied to {@code deidentifyFile} on a flowvault vault: base64 content or an S3 presigned URL. Flowvault vaults do not accept a skyflow id as the diff --git a/flowvault/src/main/java/com/skyflow/detect/RedactionLevel.java b/flowvault/src/main/java/com/skyflow/vault/detect/RedactionLevel.java similarity index 98% rename from flowvault/src/main/java/com/skyflow/detect/RedactionLevel.java rename to flowvault/src/main/java/com/skyflow/vault/detect/RedactionLevel.java index 031859dc..7b54d3a1 100644 --- a/flowvault/src/main/java/com/skyflow/detect/RedactionLevel.java +++ b/flowvault/src/main/java/com/skyflow/vault/detect/RedactionLevel.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * Controls how one group of tokens is rendered when re-identifying on a flowvault vault: the {@code tokenGroupName} diff --git a/flowvault/src/main/java/com/skyflow/detect/ReidentifySourceType.java b/flowvault/src/main/java/com/skyflow/vault/detect/ReidentifySourceType.java similarity index 91% rename from flowvault/src/main/java/com/skyflow/detect/ReidentifySourceType.java rename to flowvault/src/main/java/com/skyflow/vault/detect/ReidentifySourceType.java index c4e0b5bc..021d52c1 100644 --- a/flowvault/src/main/java/com/skyflow/detect/ReidentifySourceType.java +++ b/flowvault/src/main/java/com/skyflow/vault/detect/ReidentifySourceType.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * How the input file is supplied to {@code reidentifyFile} on a flowvault vault: base64 content or an S3 presigned diff --git a/flowvault/src/test/java/com/skyflow/vault/controller/DetectControllerTests.java b/flowvault/src/test/java/com/skyflow/vault/controller/DetectControllerTests.java index 6261496c..b1b875ac 100644 --- a/flowvault/src/test/java/com/skyflow/vault/controller/DetectControllerTests.java +++ b/flowvault/src/test/java/com/skyflow/vault/controller/DetectControllerTests.java @@ -1,33 +1,33 @@ package com.skyflow.vault.controller; -import com.skyflow.detect.ReidentifySourceType; +import com.skyflow.vault.detect.ReidentifySourceType; import com.skyflow.Skyflow; import com.skyflow.config.Credentials; import com.skyflow.config.VaultConfig; -import com.skyflow.detect.CheckGuardrailsRequest; -import com.skyflow.detect.CheckGuardrailsResponse; -import com.skyflow.detect.DeidentifySourceType; -import com.skyflow.detect.DeidentificationType; -import com.skyflow.detect.DeidentifyFileRequest; -import com.skyflow.detect.DeidentifyFileResponse; -import com.skyflow.detect.DeidentifyStringRequest; -import com.skyflow.detect.DeidentifyStringResponse; -import com.skyflow.detect.Detect; -import com.skyflow.detect.DetectConfiguration; -import com.skyflow.detect.DetectRunStatus; -import com.skyflow.detect.Entity; -import com.skyflow.detect.EntityType; -import com.skyflow.detect.ReidentifyFileDataFormat; -import com.skyflow.detect.DeidentifyFileDataFormat; -import com.skyflow.detect.GetRunRequest; -import com.skyflow.detect.GetRunResponse; -import com.skyflow.detect.GuardrailsValidation; -import com.skyflow.detect.PollOptions; -import com.skyflow.detect.RedactionLevel; -import com.skyflow.detect.ReidentifyFileRequest; -import com.skyflow.detect.ReidentifyFileResponse; -import com.skyflow.detect.ReidentifyStringRequest; -import com.skyflow.detect.ReidentifyStringResponse; +import com.skyflow.vault.detect.CheckGuardrailsRequest; +import com.skyflow.vault.detect.CheckGuardrailsResponse; +import com.skyflow.vault.detect.DeidentifySourceType; +import com.skyflow.vault.detect.DeidentificationType; +import com.skyflow.vault.detect.DeidentifyFileRequest; +import com.skyflow.vault.detect.DeidentifyFileResponse; +import com.skyflow.vault.detect.DeidentifyStringRequest; +import com.skyflow.vault.detect.DeidentifyStringResponse; +import com.skyflow.vault.detect.Detect; +import com.skyflow.vault.detect.DetectConfiguration; +import com.skyflow.vault.detect.DetectRunStatus; +import com.skyflow.vault.detect.Entity; +import com.skyflow.vault.detect.EntityType; +import com.skyflow.vault.detect.ReidentifyFileDataFormat; +import com.skyflow.vault.detect.DeidentifyFileDataFormat; +import com.skyflow.vault.detect.GetRunRequest; +import com.skyflow.vault.detect.GetRunResponse; +import com.skyflow.vault.detect.GuardrailsValidation; +import com.skyflow.vault.detect.PollOptions; +import com.skyflow.vault.detect.RedactionLevel; +import com.skyflow.vault.detect.ReidentifyFileRequest; +import com.skyflow.vault.detect.ReidentifyFileResponse; +import com.skyflow.vault.detect.ReidentifyStringRequest; +import com.skyflow.vault.detect.ReidentifyStringResponse; import com.skyflow.enums.Env; import com.skyflow.errors.BaseErrorMessage; import com.skyflow.errors.ErrorCode; diff --git a/flowvault/src/test/java/com/skyflow/detect/DetectSourceTypesTests.java b/flowvault/src/test/java/com/skyflow/vault/detect/DetectSourceTypesTests.java similarity index 97% rename from flowvault/src/test/java/com/skyflow/detect/DetectSourceTypesTests.java rename to flowvault/src/test/java/com/skyflow/vault/detect/DetectSourceTypesTests.java index 589b5aca..b21bb2ae 100644 --- a/flowvault/src/test/java/com/skyflow/detect/DetectSourceTypesTests.java +++ b/flowvault/src/test/java/com/skyflow/vault/detect/DetectSourceTypesTests.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; import org.junit.Assert; import org.junit.Test; diff --git a/flowvault/src/test/java/com/skyflow/detect/RedactionLevelTests.java b/flowvault/src/test/java/com/skyflow/vault/detect/RedactionLevelTests.java similarity index 96% rename from flowvault/src/test/java/com/skyflow/detect/RedactionLevelTests.java rename to flowvault/src/test/java/com/skyflow/vault/detect/RedactionLevelTests.java index 68c1026f..0ec34cc6 100644 --- a/flowvault/src/test/java/com/skyflow/detect/RedactionLevelTests.java +++ b/flowvault/src/test/java/com/skyflow/vault/detect/RedactionLevelTests.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; import org.junit.Assert; import org.junit.Test; diff --git a/skyvault/README.md b/skyvault/README.md index 4fe2702a..05aae7fb 100644 --- a/skyvault/README.md +++ b/skyvault/README.md @@ -1678,12 +1678,12 @@ Detect configurations are created in [Skyflow Studio](https://docs.skyflow.com) | Method | Request | Response | Description | |--------|---------|----------|-------------| -| `deidentifyString(DeidentifyStringRequest)` | `com.skyflow.detect.DeidentifyStringRequest` | `com.skyflow.detect.DeidentifyStringResponse` | Detect and replace sensitive data in a string | -| `deidentifyFile(DeidentifyFileRequest)` | `com.skyflow.detect.DeidentifyFileRequest` | `com.skyflow.detect.DeidentifyFileResponse` | Submit a file for de-identification, optionally polling the run to completion | -| `reidentifyString(ReidentifyStringRequest)` | `com.skyflow.detect.ReidentifyStringRequest` | `com.skyflow.detect.ReidentifyStringResponse` | Replace tokens in a string with their original or redacted values | -| `reidentifyFile(ReidentifyFileRequest)` | `com.skyflow.detect.ReidentifyFileRequest` | `com.skyflow.detect.ReidentifyFileResponse` | Replace tokens in a file with their original or redacted values | -| `getRun(GetRunRequest)` | `com.skyflow.detect.GetRunRequest` | `com.skyflow.detect.GetRunResponse` | Retrieve the status and outputs of a Detect file run | -| `checkGuardrails(CheckGuardrailsRequest)` | `com.skyflow.detect.CheckGuardrailsRequest` | `com.skyflow.detect.CheckGuardrailsResponse` | Screen text for toxicity and denied topics | +| `deidentifyString(DeidentifyStringRequest)` | `com.skyflow.vault.detect.DeidentifyStringRequest` | `com.skyflow.vault.detect.DeidentifyStringResponse` | Detect and replace sensitive data in a string | +| `deidentifyFile(DeidentifyFileRequest)` | `com.skyflow.vault.detect.DeidentifyFileRequest` | `com.skyflow.vault.detect.DeidentifyFileResponse` | Submit a file for de-identification, optionally polling the run to completion | +| `reidentifyString(ReidentifyStringRequest)` | `com.skyflow.vault.detect.ReidentifyStringRequest` | `com.skyflow.vault.detect.ReidentifyStringResponse` | Replace tokens in a string with their original or redacted values | +| `reidentifyFile(ReidentifyFileRequest)` | `com.skyflow.vault.detect.ReidentifyFileRequest` | `com.skyflow.vault.detect.ReidentifyFileResponse` | Replace tokens in a file with their original or redacted values | +| `getRun(GetRunRequest)` | `com.skyflow.vault.detect.GetRunRequest` | `com.skyflow.vault.detect.GetRunResponse` | Retrieve the status and outputs of a Detect file run | +| `checkGuardrails(CheckGuardrailsRequest)` | `com.skyflow.vault.detect.CheckGuardrailsRequest` | `com.skyflow.vault.detect.CheckGuardrailsResponse` | Screen text for toxicity and denied topics | ## Before you start - **Role.** The service account needs the Detect Invoker, Detect Manager or Vault Owner role on the vault. Detect Invoker can de-identify data and write vault tokens into the vault; Detect Manager adds the ability to create, update and delete Detect configurations. Re-identifying values stored as `VAULT_TOKEN` is governed like detokenization: the caller also needs a policy that grants the Detokenization action on the destination table and columns, unless it is a Vault Owner. Detect Invoker or Detect Manager alone is not enough. @@ -1701,7 +1701,7 @@ Detect configurations are created in [Skyflow Studio](https://docs.skyflow.com) `DeidentifyStringRequest` takes the text plus, optionally, `configurationId` (a stored Detect configuration) or `configuration` (an inline `DetectConfiguration`). Both are sent exactly as supplied. With neither set the SDK sends only the vault id and the server applies the vault's defaults; sending both is rejected by the API (see [Before you start](#before-you-start)). The SDK fills the vault id into the configuration from the controller. ```java -import com.skyflow.detect.*; +import com.skyflow.vault.detect.*; // Stored configuration DeidentifyStringResponse response = skyflowClient.detect().deidentifyString( diff --git a/skyvault/api-report/skyflow-java.baseline.jar b/skyvault/api-report/skyflow-java.baseline.jar index c55232f9..c64fed4e 100644 Binary files a/skyvault/api-report/skyflow-java.baseline.jar and b/skyvault/api-report/skyflow-java.baseline.jar differ diff --git a/skyvault/samples/src/main/java/com/example/detect/CheckGuardrailsSample.java b/skyvault/samples/src/main/java/com/example/detect/CheckGuardrailsSample.java index 723e1afe..d014ce47 100644 --- a/skyvault/samples/src/main/java/com/example/detect/CheckGuardrailsSample.java +++ b/skyvault/samples/src/main/java/com/example/detect/CheckGuardrailsSample.java @@ -3,9 +3,9 @@ import com.skyflow.Skyflow; import com.skyflow.config.Credentials; import com.skyflow.config.VaultConfig; -import com.skyflow.detect.CheckGuardrailsRequest; -import com.skyflow.detect.CheckGuardrailsResponse; -import com.skyflow.detect.GuardrailsValidation; +import com.skyflow.vault.detect.CheckGuardrailsRequest; +import com.skyflow.vault.detect.CheckGuardrailsResponse; +import com.skyflow.vault.detect.GuardrailsValidation; import com.skyflow.enums.Env; import com.skyflow.enums.LogLevel; import com.skyflow.errors.SkyflowException; diff --git a/skyvault/samples/src/main/java/com/example/detect/DeidentifyFileAsyncSample.java b/skyvault/samples/src/main/java/com/example/detect/DeidentifyFileAsyncSample.java index 0031124f..39c47373 100644 --- a/skyvault/samples/src/main/java/com/example/detect/DeidentifyFileAsyncSample.java +++ b/skyvault/samples/src/main/java/com/example/detect/DeidentifyFileAsyncSample.java @@ -3,10 +3,10 @@ import com.skyflow.Skyflow; import com.skyflow.config.Credentials; import com.skyflow.config.VaultConfig; -import com.skyflow.detect.DeidentifyFileRequest; -import com.skyflow.detect.DeidentifyFileResponse; -import com.skyflow.detect.DetectRunStatus; -import com.skyflow.detect.PollOptions; +import com.skyflow.vault.detect.DeidentifyFileRequest; +import com.skyflow.vault.detect.DeidentifyFileResponse; +import com.skyflow.vault.detect.DetectRunStatus; +import com.skyflow.vault.detect.PollOptions; import com.skyflow.enums.Env; import com.skyflow.enums.LogLevel; import com.skyflow.errors.SkyflowException; diff --git a/skyvault/samples/src/main/java/com/example/detect/DeidentifyFileSample.java b/skyvault/samples/src/main/java/com/example/detect/DeidentifyFileSample.java index 212b8e2e..7f9a3114 100644 --- a/skyvault/samples/src/main/java/com/example/detect/DeidentifyFileSample.java +++ b/skyvault/samples/src/main/java/com/example/detect/DeidentifyFileSample.java @@ -3,10 +3,10 @@ import com.skyflow.Skyflow; import com.skyflow.config.Credentials; import com.skyflow.config.VaultConfig; -import com.skyflow.detect.DeidentifyFileRequest; -import com.skyflow.detect.DeidentifyFileResponse; -import com.skyflow.detect.DetectRunStatus; -import com.skyflow.detect.PollOptions; +import com.skyflow.vault.detect.DeidentifyFileRequest; +import com.skyflow.vault.detect.DeidentifyFileResponse; +import com.skyflow.vault.detect.DetectRunStatus; +import com.skyflow.vault.detect.PollOptions; import com.skyflow.enums.Env; import com.skyflow.enums.LogLevel; import com.skyflow.errors.SkyflowException; diff --git a/skyvault/samples/src/main/java/com/example/detect/DeidentifyStringSample.java b/skyvault/samples/src/main/java/com/example/detect/DeidentifyStringSample.java index b6eaa2c7..308ce484 100644 --- a/skyvault/samples/src/main/java/com/example/detect/DeidentifyStringSample.java +++ b/skyvault/samples/src/main/java/com/example/detect/DeidentifyStringSample.java @@ -3,15 +3,15 @@ import com.skyflow.Skyflow; import com.skyflow.config.Credentials; import com.skyflow.config.VaultConfig; -import com.skyflow.detect.DeidentificationType; -import com.skyflow.detect.DeidentifyStringRequest; -import com.skyflow.detect.DeidentifyStringResponse; -import com.skyflow.detect.Detect; -import com.skyflow.detect.DetectConfiguration; -import com.skyflow.detect.DetectedEntity; -import com.skyflow.detect.Entity; -import com.skyflow.detect.EntityType; -import com.skyflow.detect.ReturnEntitiesType; +import com.skyflow.vault.detect.DeidentificationType; +import com.skyflow.vault.detect.DeidentifyStringRequest; +import com.skyflow.vault.detect.DeidentifyStringResponse; +import com.skyflow.vault.detect.Detect; +import com.skyflow.vault.detect.DetectConfiguration; +import com.skyflow.vault.detect.DetectedEntity; +import com.skyflow.vault.detect.Entity; +import com.skyflow.vault.detect.EntityType; +import com.skyflow.vault.detect.ReturnEntitiesType; import com.skyflow.enums.Env; import com.skyflow.enums.LogLevel; import com.skyflow.errors.SkyflowException; diff --git a/skyvault/samples/src/main/java/com/example/detect/GetRunSample.java b/skyvault/samples/src/main/java/com/example/detect/GetRunSample.java index fcab057c..ec01ee26 100644 --- a/skyvault/samples/src/main/java/com/example/detect/GetRunSample.java +++ b/skyvault/samples/src/main/java/com/example/detect/GetRunSample.java @@ -3,11 +3,11 @@ import com.skyflow.Skyflow; import com.skyflow.config.Credentials; import com.skyflow.config.VaultConfig; -import com.skyflow.detect.DeidentifySourceType; -import com.skyflow.detect.DetectRunStatus; -import com.skyflow.detect.FileOutput; -import com.skyflow.detect.GetRunRequest; -import com.skyflow.detect.GetRunResponse; +import com.skyflow.vault.detect.DeidentifySourceType; +import com.skyflow.vault.detect.DetectRunStatus; +import com.skyflow.vault.detect.FileOutput; +import com.skyflow.vault.detect.GetRunRequest; +import com.skyflow.vault.detect.GetRunResponse; import com.skyflow.enums.Env; import com.skyflow.enums.LogLevel; import com.skyflow.errors.SkyflowException; diff --git a/skyvault/samples/src/main/java/com/example/detect/ReidentifyFileSample.java b/skyvault/samples/src/main/java/com/example/detect/ReidentifyFileSample.java index bd2acff5..b119403b 100644 --- a/skyvault/samples/src/main/java/com/example/detect/ReidentifyFileSample.java +++ b/skyvault/samples/src/main/java/com/example/detect/ReidentifyFileSample.java @@ -3,15 +3,15 @@ import com.skyflow.Skyflow; import com.skyflow.config.Credentials; import com.skyflow.config.VaultConfig; -import com.skyflow.detect.ReidentifySourceType; -import com.skyflow.detect.DetectRunStatus; -import com.skyflow.detect.EntityType; -import com.skyflow.detect.ReidentifyFileDataFormat; -import com.skyflow.detect.ReidentifyFileOutput; -import com.skyflow.detect.RedactionLevel; +import com.skyflow.vault.detect.ReidentifySourceType; +import com.skyflow.vault.detect.DetectRunStatus; +import com.skyflow.vault.detect.EntityType; +import com.skyflow.vault.detect.ReidentifyFileDataFormat; +import com.skyflow.vault.detect.ReidentifyFileOutput; +import com.skyflow.vault.detect.RedactionLevel; import com.skyflow.enums.RedactionType; -import com.skyflow.detect.ReidentifyFileRequest; -import com.skyflow.detect.ReidentifyFileResponse; +import com.skyflow.vault.detect.ReidentifyFileRequest; +import com.skyflow.vault.detect.ReidentifyFileResponse; import com.skyflow.enums.Env; import com.skyflow.enums.LogLevel; import com.skyflow.errors.SkyflowException; diff --git a/skyvault/samples/src/main/java/com/example/detect/ReidentifyStringSample.java b/skyvault/samples/src/main/java/com/example/detect/ReidentifyStringSample.java index d789b5a4..0b6aeaa7 100644 --- a/skyvault/samples/src/main/java/com/example/detect/ReidentifyStringSample.java +++ b/skyvault/samples/src/main/java/com/example/detect/ReidentifyStringSample.java @@ -3,17 +3,17 @@ import com.skyflow.Skyflow; import com.skyflow.config.Credentials; import com.skyflow.config.VaultConfig; -import com.skyflow.detect.DeidentificationType; -import com.skyflow.detect.DeidentifyStringRequest; -import com.skyflow.detect.DeidentifyStringResponse; -import com.skyflow.detect.Detect; -import com.skyflow.detect.DetectConfiguration; -import com.skyflow.detect.Entity; -import com.skyflow.detect.EntityType; -import com.skyflow.detect.RedactionLevel; +import com.skyflow.vault.detect.DeidentificationType; +import com.skyflow.vault.detect.DeidentifyStringRequest; +import com.skyflow.vault.detect.DeidentifyStringResponse; +import com.skyflow.vault.detect.Detect; +import com.skyflow.vault.detect.DetectConfiguration; +import com.skyflow.vault.detect.Entity; +import com.skyflow.vault.detect.EntityType; +import com.skyflow.vault.detect.RedactionLevel; import com.skyflow.enums.RedactionType; -import com.skyflow.detect.ReidentifyStringRequest; -import com.skyflow.detect.ReidentifyStringResponse; +import com.skyflow.vault.detect.ReidentifyStringRequest; +import com.skyflow.vault.detect.ReidentifyStringResponse; import com.skyflow.enums.Env; import com.skyflow.enums.LogLevel; import com.skyflow.errors.SkyflowException; diff --git a/skyvault/src/main/java/com/skyflow/vault/controller/DetectController.java b/skyvault/src/main/java/com/skyflow/vault/controller/DetectController.java index bdae7554..5b701ecf 100644 --- a/skyvault/src/main/java/com/skyflow/vault/controller/DetectController.java +++ b/skyvault/src/main/java/com/skyflow/vault/controller/DetectController.java @@ -2,10 +2,10 @@ import com.skyflow.config.Credentials; import com.skyflow.config.VaultConfig; -import com.skyflow.detect.DeidentifyFileSource; -import com.skyflow.detect.DeidentifySourceType; -import com.skyflow.detect.ReidentifyFileSource; -import com.skyflow.detect.ReidentifySourceType; +import com.skyflow.vault.detect.DeidentifyFileSource; +import com.skyflow.vault.detect.DeidentifySourceType; +import com.skyflow.vault.detect.ReidentifyFileSource; +import com.skyflow.vault.detect.ReidentifySourceType; import com.skyflow.errors.SkyflowException; import com.skyflow.utils.Utils; diff --git a/skyvault/src/main/java/com/skyflow/detect/DeidentifySourceType.java b/skyvault/src/main/java/com/skyflow/vault/detect/DeidentifySourceType.java similarity index 92% rename from skyvault/src/main/java/com/skyflow/detect/DeidentifySourceType.java rename to skyvault/src/main/java/com/skyflow/vault/detect/DeidentifySourceType.java index 1649da53..beb76c56 100644 --- a/skyvault/src/main/java/com/skyflow/detect/DeidentifySourceType.java +++ b/skyvault/src/main/java/com/skyflow/vault/detect/DeidentifySourceType.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * How the input file is supplied to {@code deidentifyFile} on a skyvault vault: base64 content, the skyflow id of a file record already in the vault, or an S3 presigned URL. diff --git a/skyvault/src/main/java/com/skyflow/detect/RedactionLevel.java b/skyvault/src/main/java/com/skyflow/vault/detect/RedactionLevel.java similarity index 98% rename from skyvault/src/main/java/com/skyflow/detect/RedactionLevel.java rename to skyvault/src/main/java/com/skyflow/vault/detect/RedactionLevel.java index 184a2945..24b68ee9 100644 --- a/skyvault/src/main/java/com/skyflow/detect/RedactionLevel.java +++ b/skyvault/src/main/java/com/skyflow/vault/detect/RedactionLevel.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; import com.skyflow.enums.RedactionType; diff --git a/skyvault/src/main/java/com/skyflow/detect/ReidentifySourceType.java b/skyvault/src/main/java/com/skyflow/vault/detect/ReidentifySourceType.java similarity index 91% rename from skyvault/src/main/java/com/skyflow/detect/ReidentifySourceType.java rename to skyvault/src/main/java/com/skyflow/vault/detect/ReidentifySourceType.java index df8e5bda..2191bbeb 100644 --- a/skyvault/src/main/java/com/skyflow/detect/ReidentifySourceType.java +++ b/skyvault/src/main/java/com/skyflow/vault/detect/ReidentifySourceType.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; /** * How the input file is supplied to {@code reidentifyFile} on a skyvault vault: base64 content or an S3 presigned diff --git a/skyvault/src/test/java/com/skyflow/vault/controller/DetectControllerTests.java b/skyvault/src/test/java/com/skyflow/vault/controller/DetectControllerTests.java index 2c33bcf3..1c8ac80b 100644 --- a/skyvault/src/test/java/com/skyflow/vault/controller/DetectControllerTests.java +++ b/skyvault/src/test/java/com/skyflow/vault/controller/DetectControllerTests.java @@ -1,34 +1,34 @@ package com.skyflow.vault.controller; -import com.skyflow.detect.ReidentifySourceType; +import com.skyflow.vault.detect.ReidentifySourceType; import com.skyflow.Skyflow; import com.skyflow.config.Credentials; import com.skyflow.config.VaultConfig; -import com.skyflow.detect.CheckGuardrailsRequest; -import com.skyflow.detect.CheckGuardrailsResponse; -import com.skyflow.detect.DeidentifySourceType; -import com.skyflow.detect.DeidentificationType; -import com.skyflow.detect.DeidentifyFileRequest; -import com.skyflow.detect.DeidentifyFileResponse; -import com.skyflow.detect.DeidentifyStringRequest; -import com.skyflow.detect.DeidentifyStringResponse; -import com.skyflow.detect.Detect; -import com.skyflow.detect.DetectConfiguration; -import com.skyflow.detect.DetectRunStatus; -import com.skyflow.detect.Entity; -import com.skyflow.detect.EntityType; -import com.skyflow.detect.ReidentifyFileDataFormat; -import com.skyflow.detect.DeidentifyFileDataFormat; -import com.skyflow.detect.GetRunRequest; -import com.skyflow.detect.GetRunResponse; -import com.skyflow.detect.GuardrailsValidation; -import com.skyflow.detect.PollOptions; -import com.skyflow.detect.RedactionLevel; +import com.skyflow.vault.detect.CheckGuardrailsRequest; +import com.skyflow.vault.detect.CheckGuardrailsResponse; +import com.skyflow.vault.detect.DeidentifySourceType; +import com.skyflow.vault.detect.DeidentificationType; +import com.skyflow.vault.detect.DeidentifyFileRequest; +import com.skyflow.vault.detect.DeidentifyFileResponse; +import com.skyflow.vault.detect.DeidentifyStringRequest; +import com.skyflow.vault.detect.DeidentifyStringResponse; +import com.skyflow.vault.detect.Detect; +import com.skyflow.vault.detect.DetectConfiguration; +import com.skyflow.vault.detect.DetectRunStatus; +import com.skyflow.vault.detect.Entity; +import com.skyflow.vault.detect.EntityType; +import com.skyflow.vault.detect.ReidentifyFileDataFormat; +import com.skyflow.vault.detect.DeidentifyFileDataFormat; +import com.skyflow.vault.detect.GetRunRequest; +import com.skyflow.vault.detect.GetRunResponse; +import com.skyflow.vault.detect.GuardrailsValidation; +import com.skyflow.vault.detect.PollOptions; +import com.skyflow.vault.detect.RedactionLevel; import com.skyflow.enums.RedactionType; -import com.skyflow.detect.ReidentifyFileRequest; -import com.skyflow.detect.ReidentifyFileResponse; -import com.skyflow.detect.ReidentifyStringRequest; -import com.skyflow.detect.ReidentifyStringResponse; +import com.skyflow.vault.detect.ReidentifyFileRequest; +import com.skyflow.vault.detect.ReidentifyFileResponse; +import com.skyflow.vault.detect.ReidentifyStringRequest; +import com.skyflow.vault.detect.ReidentifyStringResponse; import com.skyflow.enums.Env; import com.skyflow.errors.BaseErrorMessage; import com.skyflow.errors.ErrorCode; diff --git a/skyvault/src/test/java/com/skyflow/detect/DetectSourceTypesTests.java b/skyvault/src/test/java/com/skyflow/vault/detect/DetectSourceTypesTests.java similarity index 97% rename from skyvault/src/test/java/com/skyflow/detect/DetectSourceTypesTests.java rename to skyvault/src/test/java/com/skyflow/vault/detect/DetectSourceTypesTests.java index 65ce17c0..69e60cc9 100644 --- a/skyvault/src/test/java/com/skyflow/detect/DetectSourceTypesTests.java +++ b/skyvault/src/test/java/com/skyflow/vault/detect/DetectSourceTypesTests.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; import org.junit.Assert; import org.junit.Test; diff --git a/skyvault/src/test/java/com/skyflow/detect/RedactionLevelTests.java b/skyvault/src/test/java/com/skyflow/vault/detect/RedactionLevelTests.java similarity index 97% rename from skyvault/src/test/java/com/skyflow/detect/RedactionLevelTests.java rename to skyvault/src/test/java/com/skyflow/vault/detect/RedactionLevelTests.java index b32f58d5..6731ed35 100644 --- a/skyvault/src/test/java/com/skyflow/detect/RedactionLevelTests.java +++ b/skyvault/src/test/java/com/skyflow/vault/detect/RedactionLevelTests.java @@ -1,4 +1,4 @@ -package com.skyflow.detect; +package com.skyflow.vault.detect; import com.skyflow.enums.RedactionType; import org.junit.Assert;