From 90329d26e3811af2e3b79581f441066c09454c84 Mon Sep 17 00:00:00 2001 From: Maximilien LEDOUX Date: Sat, 19 Mar 2022 12:57:55 +0100 Subject: [PATCH] =?UTF-8?q?Nouvelles=20Regex=20:=20SBE=5FRETRIEVE=5FRESULT?= =?UTF-8?q?=5FERROR=20valid=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../protocol/rules/reader/RetrieveErrorRule.java | 6 +++++- app/src/main/resources/appdata.json | 12 +++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/lightcontainer/protocol/rules/reader/RetrieveErrorRule.java b/app/src/main/java/lightcontainer/protocol/rules/reader/RetrieveErrorRule.java index 9bb8339..c686075 100644 --- a/app/src/main/java/lightcontainer/protocol/rules/reader/RetrieveErrorRule.java +++ b/app/src/main/java/lightcontainer/protocol/rules/reader/RetrieveErrorRule.java @@ -3,11 +3,15 @@ package lightcontainer.protocol.rules.reader; import lightcontainer.domains.client.Context; import lightcontainer.interfaces.ProtocolRepository; import lightcontainer.protocol.ProtocolReader; +import lightcontainer.protocol.StandardizedDefinitions; import lightcontainer.protocol.rules.writer.GetFileErrorRule; +import static lightcontainer.protocol.StandardizedDefinitions.SBE_RETRIEVE_RESULT_ERROR; + public class RetrieveErrorRule extends ProtocolReader { // Constants - private static final String PATTERN = "^RETRIEVE_ERROR\r\n$"; + //"^RETRIEVE_ERROR\r\n$" + private static final String PATTERN = SBE_RETRIEVE_RESULT_ERROR; private static final String NAME = "RETRIEVE_ERROR"; // Variables diff --git a/app/src/main/resources/appdata.json b/app/src/main/resources/appdata.json index a99218c..ec60f88 100644 --- a/app/src/main/resources/appdata.json +++ b/app/src/main/resources/appdata.json @@ -10,7 +10,17 @@ "name": "aaaaa", "password": "$2a$10$Tuh5xmGEy0g26hQO1SHNY.TNy8rY9VCkpzRLP3rlpnVHtwYew4.km", "aes_key": "a68CqbWmmf0cuvgvMhm9OC+Y24ut3DY/0WBqtd3nGfU=", - "files": [] + "files": [ + { + "name": "test.txt", + "fileNameSalt": "LvFNF7uz324NgsISSpUbwg==", + "size": 301, + "iv": "lGvyIzgGMiaiHeGwIaCESg==", + "storage": [ + "lightcontainerSB01" + ] + } + ] } ] } \ No newline at end of file