From 2815d529a85eeb246550fb8093ad9e0aa8defa31 Mon Sep 17 00:00:00 2001 From: robotdorog Date: Fri, 1 Oct 2021 19:26:34 +0800 Subject: [PATCH 01/21] =?UTF-8?q?=D0=A0=D0=B5=D1=88=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 3 + .idea/misc.xml | 6 ++ .idea/modules.xml | 8 +++ Cryptor.iml | 11 ++++ Projects | 1 + src/Cryptor.java | 150 ++++++++++++++++++++++++++++++++++++++++++++++ src/main.java | 12 ++++ 7 files changed, 191 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 Cryptor.iml create mode 160000 Projects create mode 100644 src/Cryptor.java create mode 100644 src/main.java diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..b1001d2 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..d65723f --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Cryptor.iml b/Cryptor.iml new file mode 100644 index 0000000..c90834f --- /dev/null +++ b/Cryptor.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Projects b/Projects new file mode 160000 index 0000000..95dc913 --- /dev/null +++ b/Projects @@ -0,0 +1 @@ +Subproject commit 95dc913ea86bf54c8318100020e6508ab8814ab3 diff --git a/src/Cryptor.java b/src/Cryptor.java new file mode 100644 index 0000000..fae3826 --- /dev/null +++ b/src/Cryptor.java @@ -0,0 +1,150 @@ +import java.io.*; +import java.nio.file.Files; +import java.nio.file.Path; + +public class Cryptor { + + public String crypt(String str) throws IOException { + // решить вопрос с обработкой пустой строки + + String result = ""; + if (str == null) { + + return result; + } else { + String strToCrypt = CryptReader(); + int count = 0; + char currentChar = 0; + + for (int i = 0; i < strToCrypt.length(); i++) { + + if (currentChar == strToCrypt.charAt(i)) { + count++; + } else { + result += currentChar; + + if (count > 1) { + result += count; + } + currentChar = strToCrypt.charAt(i); + + count = 1; + } + } + if (count > 1) { + result += strToCrypt.charAt(strToCrypt.length() - 1); + result += count; + } else + result += strToCrypt.charAt(strToCrypt.length() - 1); + + + if (Files.exists(Path.of("C:\\Users\\Usr1\\IdeaProjects\\Crypt\\src\\tasks\\file2.txt"))) { + CryptWriter(result); + } else Files.createFile(Path.of("C:\\Users\\Usr1\\IdeaProjects\\Crypt\\src\\tasks\\file2.txt")); + CryptWriter(result); + + } + + return result; + } + + public String decrypt() throws IOException { + + String result = ""; + String strToDecrypt = DeCryptReader(); + + char currentChar = 0; + int count = 0; + for (int i = 0; i < strToDecrypt.length(); i++) { + if (Character.isDigit(strToDecrypt.charAt(i))) { + count = Character.getNumericValue(strToDecrypt.charAt(i)); + for (int j = 1; j < count; j++) { + + result += currentChar; + } + + } else { + result += currentChar; + } + if (!Character.isDigit(strToDecrypt.charAt(i))) + currentChar = strToDecrypt.charAt(i); + + } + + if (!Character.isDigit(strToDecrypt.charAt(strToDecrypt.length() - 1))) + result += currentChar; + else { + for (int i = 0; i < strToDecrypt.length(); i++) + count = Character.getNumericValue(strToDecrypt.charAt(i)); + for (int j = 1; j < count; j++) { + + result += currentChar; + } + + } + + if (Files.exists(Path.of("C:\\Users\\Usr1\\IdeaProjects\\Crypt\\src\\tasks\\file4.txt"))) { + DeCryptWriter(result); + } else Files.createFile(Path.of("C:\\Users\\Usr1\\IdeaProjects\\Crypt\\src\\tasks\\file4.txt")); + + DeCryptWriter(result); + return result; + } + + + private void CryptWriter(String str) { + try (BufferedWriter writer = new BufferedWriter(new FileWriter("C:\\Users\\Usr1\\IdeaProjects\\Crypt\\src\\tasks\\file2.txt"))) { + writer.write(str); + writer.flush(); + } catch (Exception e) { + System.out.println(e.getMessage()); + } + + + } + + private void DeCryptWriter(String str) { + + try (BufferedWriter writer = new BufferedWriter(new FileWriter("C:\\Users\\Usr1\\IdeaProjects\\Crypt\\src\\tasks\\file4.txt"))) { + writer.write(str); + writer.flush(); + } catch (Exception e) { + System.out.println(e.getMessage()); + } + + + } + + private String CryptReader() { + BufferedReader reader; + String str = ""; + try { + reader = new BufferedReader(new FileReader("C:\\Users\\Usr1\\IdeaProjects\\Crypt\\src\\tasks\\file1.txt")); + + str = reader.readLine(); + + } catch (Exception e) { + e.printStackTrace(); + } + + return str; + + } + + private String DeCryptReader() { + BufferedReader reader; + String str = ""; + try { + reader = new BufferedReader(new FileReader("C:\\Users\\Usr1\\IdeaProjects\\Crypt\\src\\tasks\\file3.txt")); + + str = reader.readLine(); + + } catch (Exception e) { + e.printStackTrace(); + } + + return str; + } + +} + diff --git a/src/main.java b/src/main.java new file mode 100644 index 0000000..82781fc --- /dev/null +++ b/src/main.java @@ -0,0 +1,12 @@ +import java.io.IOException; + +public class main { + + + public static void main(String[] args) throws IOException { + Cryptor cryptor = new Cryptor(); + System.out.println(cryptor.crypt("C:\\Users\\Usr1\\IdeaProjects\\Crypt\\src\\tasks\\file1.txt")); + System.out.println(cryptor.decrypt()); + + } +} From 7a8bb66d30bfe8693b66d6337acc3358e22664d3 Mon Sep 17 00:00:00 2001 From: robotdorog Date: Sun, 3 Oct 2021 16:50:08 +0800 Subject: [PATCH 02/21] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20.idea=20=D0=B2=20.gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index a1c2a23..77dc552 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +/out/ +.idea # Compiled class file *.class From 8264e775765572fa5bf32e74c88843b312d842b0 Mon Sep 17 00:00:00 2001 From: robotdorog Date: Sun, 17 Oct 2021 19:16:36 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=D0=A1=D0=BE=D0=B3=D0=BB=D0=B0=D1=81?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=87=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=D0=BC=20=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B4=D0=B2?= =?UTF-8?q?=D0=B0=20=D0=B4=D1=83=D0=B1=D0=BB=D0=B8=D1=80=D1=83=D1=89=D0=B8?= =?UTF-8?q?=D1=85=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4.=20=D0=9E=D1=81=D1=82?= =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D1=8B?= =?UTF-8?q?=20writer=20=D0=B8=20reader.=20=D0=A3=D0=B1=D1=80=D0=B0=D0=BB?= =?UTF-8?q?=20=D0=B8=D0=B7=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0=20Crypto?= =?UTF-8?q?r=20=D0=BF=D1=83=D1=82=D0=B8.=20=D0=9F=D1=83=D1=82=D0=B8=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=BD=D0=B8=D0=BC=D0=B0=D1=8E=D1=82=D1=81?= =?UTF-8?q?=D1=8F=20=D0=B2=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D1=85=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 25 +-------- .idea/.gitignore | 5 ++ src/Cryptor.java | 133 ++++++++++++++++------------------------------- src/main.java | 4 +- 4 files changed, 54 insertions(+), 113 deletions(-) diff --git a/.gitignore b/.gitignore index 77dc552..bd754eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,25 +1,2 @@ /out/ -.idea -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* +.idea \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore index 26d3352..4c55865 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -1,3 +1,8 @@ # Default ignored files /shelf/ /workspace.xml +/.gitignore +/misc.xml +/modules.xml +/vcs.xml +/out/ diff --git a/src/Cryptor.java b/src/Cryptor.java index fae3826..cbc2b4a 100644 --- a/src/Cryptor.java +++ b/src/Cryptor.java @@ -4,15 +4,12 @@ public class Cryptor { - public String crypt(String str) throws IOException { - // решить вопрос с обработкой пустой строки + public String crypt(String toCryptFilePath, String cryptFileResultPath) throws IOException { String result = ""; - if (str == null) { + String strToCrypt = reader(toCryptFilePath); - return result; - } else { - String strToCrypt = CryptReader(); + if (strToCrypt != null) { int count = 0; char currentChar = 0; @@ -36,115 +33,77 @@ public String crypt(String str) throws IOException { result += count; } else result += strToCrypt.charAt(strToCrypt.length() - 1); - - - if (Files.exists(Path.of("C:\\Users\\Usr1\\IdeaProjects\\Crypt\\src\\tasks\\file2.txt"))) { - CryptWriter(result); - } else Files.createFile(Path.of("C:\\Users\\Usr1\\IdeaProjects\\Crypt\\src\\tasks\\file2.txt")); - CryptWriter(result); - + if (Files.exists(Path.of(cryptFileResultPath))) { + writer(result, cryptFileResultPath); + } else Files.createFile(Path.of(cryptFileResultPath)); + writer(result, cryptFileResultPath); + return result; + } else { + return result; } - - return result; } - public String decrypt() throws IOException { + public String decrypt(String toDecryptFilePath, String decryptFileResultPath) throws IOException { String result = ""; - String strToDecrypt = DeCryptReader(); - - char currentChar = 0; - int count = 0; - for (int i = 0; i < strToDecrypt.length(); i++) { - if (Character.isDigit(strToDecrypt.charAt(i))) { - count = Character.getNumericValue(strToDecrypt.charAt(i)); - for (int j = 1; j < count; j++) { + String strToDecrypt = reader(toDecryptFilePath); + if (strToDecrypt != null) { + char currentChar = 0; + int count = 0; + for (int i = 0; i < strToDecrypt.length(); i++) { + if (Character.isDigit(strToDecrypt.charAt(i))) { + count = Character.getNumericValue(strToDecrypt.charAt(i)); + for (int j = 1; j < count; j++) { + result += currentChar; + } + } else { result += currentChar; } - - } else { - result += currentChar; + if (!Character.isDigit(strToDecrypt.charAt(i))) + currentChar = strToDecrypt.charAt(i); } - if (!Character.isDigit(strToDecrypt.charAt(i))) - currentChar = strToDecrypt.charAt(i); - - } - - if (!Character.isDigit(strToDecrypt.charAt(strToDecrypt.length() - 1))) - result += currentChar; - else { - for (int i = 0; i < strToDecrypt.length(); i++) - count = Character.getNumericValue(strToDecrypt.charAt(i)); - for (int j = 1; j < count; j++) { + if (!Character.isDigit(strToDecrypt.charAt(strToDecrypt.length() - 1))) result += currentChar; - } - - } - - if (Files.exists(Path.of("C:\\Users\\Usr1\\IdeaProjects\\Crypt\\src\\tasks\\file4.txt"))) { - DeCryptWriter(result); - } else Files.createFile(Path.of("C:\\Users\\Usr1\\IdeaProjects\\Crypt\\src\\tasks\\file4.txt")); - - DeCryptWriter(result); - return result; - } - + else { + for (int i = 0; i < strToDecrypt.length(); i++) + count = Character.getNumericValue(strToDecrypt.charAt(i)); + for (int j = 1; j < count; j++) { - private void CryptWriter(String str) { - try (BufferedWriter writer = new BufferedWriter(new FileWriter("C:\\Users\\Usr1\\IdeaProjects\\Crypt\\src\\tasks\\file2.txt"))) { - writer.write(str); - writer.flush(); - } catch (Exception e) { - System.out.println(e.getMessage()); + result += currentChar; + } + } + if (Files.exists(Path.of(decryptFileResultPath))) { + writer(result, decryptFileResultPath); + } else Files.createFile(Path.of(decryptFileResultPath)); + writer(result, decryptFileResultPath); + return result; + } else { + return result; } - - } - private void DeCryptWriter(String str) { + private void writer(String Result, String filePath) { - try (BufferedWriter writer = new BufferedWriter(new FileWriter("C:\\Users\\Usr1\\IdeaProjects\\Crypt\\src\\tasks\\file4.txt"))) { - writer.write(str); + try (BufferedWriter writer = new BufferedWriter(new FileWriter(filePath))) { + writer.write(Result); writer.flush(); - } catch (Exception e) { - System.out.println(e.getMessage()); - } - - - } - - private String CryptReader() { - BufferedReader reader; - String str = ""; - try { - reader = new BufferedReader(new FileReader("C:\\Users\\Usr1\\IdeaProjects\\Crypt\\src\\tasks\\file1.txt")); - - str = reader.readLine(); - - } catch (Exception e) { + } catch (IOException e) { e.printStackTrace(); } - - return str; - } - private String DeCryptReader() { + private String reader(String filePath) { BufferedReader reader; String str = ""; try { - reader = new BufferedReader(new FileReader("C:\\Users\\Usr1\\IdeaProjects\\Crypt\\src\\tasks\\file3.txt")); - + reader = new BufferedReader(new FileReader(filePath)); str = reader.readLine(); - - } catch (Exception e) { + } catch (IOException e) { e.printStackTrace(); } - return str; } - } diff --git a/src/main.java b/src/main.java index 82781fc..3301a03 100644 --- a/src/main.java +++ b/src/main.java @@ -5,8 +5,8 @@ public class main { public static void main(String[] args) throws IOException { Cryptor cryptor = new Cryptor(); - System.out.println(cryptor.crypt("C:\\Users\\Usr1\\IdeaProjects\\Crypt\\src\\tasks\\file1.txt")); - System.out.println(cryptor.decrypt()); + System.out.println(cryptor.crypt("C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file1.txt", "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file2.txt" )); + System.out.println(cryptor.decrypt("C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file3.txt", "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file4.txt" )); } } From 0cd1faf437b488fe260178e2d2523d5090ffc81f Mon Sep 17 00:00:00 2001 From: robotdorog Date: Thu, 21 Oct 2021 18:44:04 +0800 Subject: [PATCH 04/21] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD?= =?UTF-8?q?=D0=BE=202=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0.=20=D0=9F?= =?UTF-8?q?=D0=B5=D1=80=D0=B2=D1=8B=D0=B9=20=D0=B4=D0=BB=D1=8F=20=D1=88?= =?UTF-8?q?=D0=B8=D1=84=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F/=D0=B4?= =?UTF-8?q?=D0=B5=D1=88=D0=B8=D1=84=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F,=20=D0=B2=D1=82=D0=BE=D1=80=D0=BE=D0=B9=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D1=87=D1=82=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B8=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=BF=D0=B8=D1=81=D0=B8=20=D0=B2=20=D1=84=D0=B0=D0=B9?= =?UTF-8?q?=D0=BB.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Cryptor.java | 37 ++++--------------------------------- src/FileHandler.java | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/main.java | 20 ++++++++++++++++++-- 3 files changed, 66 insertions(+), 35 deletions(-) create mode 100644 src/FileHandler.java diff --git a/src/Cryptor.java b/src/Cryptor.java index cbc2b4a..6525895 100644 --- a/src/Cryptor.java +++ b/src/Cryptor.java @@ -4,10 +4,9 @@ public class Cryptor { - public String crypt(String toCryptFilePath, String cryptFileResultPath) throws IOException { + public String crypt(String strToCrypt) throws IOException { String result = ""; - String strToCrypt = reader(toCryptFilePath); if (strToCrypt != null) { int count = 0; @@ -33,20 +32,15 @@ public String crypt(String toCryptFilePath, String cryptFileResultPath) throws I result += count; } else result += strToCrypt.charAt(strToCrypt.length() - 1); - if (Files.exists(Path.of(cryptFileResultPath))) { - writer(result, cryptFileResultPath); - } else Files.createFile(Path.of(cryptFileResultPath)); - writer(result, cryptFileResultPath); return result; } else { return result; } } - public String decrypt(String toDecryptFilePath, String decryptFileResultPath) throws IOException { + public String decrypt(String strToDecrypt) throws IOException { String result = ""; - String strToDecrypt = reader(toDecryptFilePath); if (strToDecrypt != null) { char currentChar = 0; @@ -74,36 +68,13 @@ public String decrypt(String toDecryptFilePath, String decryptFileResultPath) th result += currentChar; } } - if (Files.exists(Path.of(decryptFileResultPath))) { - writer(result, decryptFileResultPath); - } else Files.createFile(Path.of(decryptFileResultPath)); - writer(result, decryptFileResultPath); + return result; } else { return result; } } - private void writer(String Result, String filePath) { - - try (BufferedWriter writer = new BufferedWriter(new FileWriter(filePath))) { - writer.write(Result); - writer.flush(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - private String reader(String filePath) { - BufferedReader reader; - String str = ""; - try { - reader = new BufferedReader(new FileReader(filePath)); - str = reader.readLine(); - } catch (IOException e) { - e.printStackTrace(); - } - return str; - } } + diff --git a/src/FileHandler.java b/src/FileHandler.java new file mode 100644 index 0000000..bf7d6c3 --- /dev/null +++ b/src/FileHandler.java @@ -0,0 +1,44 @@ +import java.io.*; +import java.nio.file.Files; +import java.nio.file.Path; + +public class FileHandler { + + String fileIn; + String fileOut; + + + public FileHandler(String fileIn, String fileOut) { + this.fileIn = fileIn; + this.fileOut = fileOut; + } + + private void writeToFile(String fileIn, String fileOut, String Result) { + + try (BufferedWriter writer = new BufferedWriter(new FileWriter(fileIn))) { + if (Files.exists(Path.of(fileOut))) { + writer.write(Result); + writer.flush(); + } else { + Files.createFile(Path.of(fileOut)); + writer.write(Result); + writer.flush(); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + private String readFromFile(String filePath) { + BufferedReader reader; + String str = ""; + try { + reader = new BufferedReader(new FileReader(filePath)); + str = reader.readLine(); + } catch (IOException e) { + e.printStackTrace(); + } + return str; + } + +} diff --git a/src/main.java b/src/main.java index 3301a03..7589066 100644 --- a/src/main.java +++ b/src/main.java @@ -4,9 +4,25 @@ public class main { public static void main(String[] args) throws IOException { + + String filePathToCrypt = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file1.txt"; + String filePathCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file2.txt"; + String filePathToDeCrypt = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file3.txt"; + String filePathDeCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file4.txt"; + + + + FileHandler fileHandlerCrypt = new FileHandler(filePathToCrypt, filePathCryptResult); + FileHandler fileHandlerDecrypt = new FileHandler(filePathToDeCrypt, filePathDeCryptResult); Cryptor cryptor = new Cryptor(); - System.out.println(cryptor.crypt("C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file1.txt", "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file2.txt" )); - System.out.println(cryptor.decrypt("C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file3.txt", "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file4.txt" )); + + // + + + + +// System.out.println(cryptor.crypt("C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file1.txt", "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file2.txt" )); +// System.out.println(cryptor.decrypt("C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file3.txt", "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file4.txt" )); } } From 83517a45475f65ce3ec12c4df05610e9918cc524 Mon Sep 17 00:00:00 2001 From: robotdorog Date: Fri, 12 Nov 2021 12:06:22 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=D0=92=D0=BD=D0=B5=D1=81=D0=B5=D0=BD?= =?UTF-8?q?=D1=8B=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=B2=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D1=8B=20=D0=BA=D0=BB?= =?UTF-8?q?=D0=B0=D1=81=D1=81=D0=BE=D0=B2=20Cryptor=20=D0=B8=20FileHandler?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Cryptor.java | 1 + src/FileHandler.java | 62 ++++++++++++++++++++++++++++---------------- src/main.java | 10 ++----- 3 files changed, 43 insertions(+), 30 deletions(-) diff --git a/src/Cryptor.java b/src/Cryptor.java index 6525895..03f6333 100644 --- a/src/Cryptor.java +++ b/src/Cryptor.java @@ -4,6 +4,7 @@ public class Cryptor { + public String crypt(String strToCrypt) throws IOException { String result = ""; diff --git a/src/FileHandler.java b/src/FileHandler.java index bf7d6c3..c8cb33e 100644 --- a/src/FileHandler.java +++ b/src/FileHandler.java @@ -6,39 +6,57 @@ public class FileHandler { String fileIn; String fileOut; + Cryptor cryptor; public FileHandler(String fileIn, String fileOut) { this.fileIn = fileIn; this.fileOut = fileOut; + cryptor = new Cryptor(); + } - private void writeToFile(String fileIn, String fileOut, String Result) { + public void crypt() throws IOException { + String strToRead = readFromFile(fileIn); + String cryptedStringToWrite = cryptor.crypt(strToRead); + System.out.println("Crypted string to write: " + cryptedStringToWrite); + writeToFile(cryptedStringToWrite, fileOut); + + } - try (BufferedWriter writer = new BufferedWriter(new FileWriter(fileIn))) { - if (Files.exists(Path.of(fileOut))) { - writer.write(Result); - writer.flush(); - } else { - Files.createFile(Path.of(fileOut)); - writer.write(Result); - writer.flush(); + public void decrypt() throws IOException { + String strToRead = readFromFile(fileIn); + String decryptedStringToWrite = cryptor.decrypt(strToRead); + System.out.println("Decrypted string to write: " + decryptedStringToWrite); + writeToFile(decryptedStringToWrite, fileOut); + } + + private void writeToFile (String strIn, String fileOut) throws IOException { + try (BufferedWriter writer = new BufferedWriter(new FileWriter(fileOut))) { + if (Files.exists(Path.of(fileOut))) { + writer.write(strIn); + writer.flush(); + } else { + Files.createFile(Path.of(fileOut)); + writer.write(strIn); + writer.flush(); + writer.close(); + } + } catch (IOException e) { + e.printStackTrace(); } - } catch (IOException e) { - e.printStackTrace(); } - } - private String readFromFile(String filePath) { - BufferedReader reader; - String str = ""; - try { - reader = new BufferedReader(new FileReader(filePath)); - str = reader.readLine(); - } catch (IOException e) { - e.printStackTrace(); + private String readFromFile (String fileIn) throws IOException { + BufferedReader reader; + String str = ""; + try { + reader = new BufferedReader(new FileReader(fileIn)); + str = reader.readLine(); + } catch (IOException e) { + e.printStackTrace(); + } + return str; } - return str; } -} diff --git a/src/main.java b/src/main.java index 7589066..63269d5 100644 --- a/src/main.java +++ b/src/main.java @@ -14,15 +14,9 @@ public static void main(String[] args) throws IOException { FileHandler fileHandlerCrypt = new FileHandler(filePathToCrypt, filePathCryptResult); FileHandler fileHandlerDecrypt = new FileHandler(filePathToDeCrypt, filePathDeCryptResult); - Cryptor cryptor = new Cryptor(); - // - - - - -// System.out.println(cryptor.crypt("C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file1.txt", "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file2.txt" )); -// System.out.println(cryptor.decrypt("C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file3.txt", "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file4.txt" )); + fileHandlerCrypt.crypt(); + fileHandlerDecrypt.decrypt(); } } From b989939927277d192a0a538152ef3446e1877fe4 Mon Sep 17 00:00:00 2001 From: robotdorog Date: Sat, 13 Nov 2021 14:51:04 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D1=8D?= =?UTF-8?q?=D0=BA=D1=81=D0=B5=D0=BF=D1=88=D0=B5=D0=BD=D1=8B=20=D0=B8=D0=B7?= =?UTF-8?q?=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0=20Cryptor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Cryptor.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/Cryptor.java b/src/Cryptor.java index 03f6333..47c255b 100644 --- a/src/Cryptor.java +++ b/src/Cryptor.java @@ -1,11 +1,7 @@ -import java.io.*; -import java.nio.file.Files; -import java.nio.file.Path; public class Cryptor { - - public String crypt(String strToCrypt) throws IOException { + public String crypt(String strToCrypt) { String result = ""; @@ -14,17 +10,14 @@ public String crypt(String strToCrypt) throws IOException { char currentChar = 0; for (int i = 0; i < strToCrypt.length(); i++) { - if (currentChar == strToCrypt.charAt(i)) { count++; } else { result += currentChar; - if (count > 1) { result += count; } currentChar = strToCrypt.charAt(i); - count = 1; } } @@ -39,7 +32,7 @@ public String crypt(String strToCrypt) throws IOException { } } - public String decrypt(String strToDecrypt) throws IOException { + public String decrypt(String strToDecrypt) { String result = ""; @@ -58,24 +51,20 @@ public String decrypt(String strToDecrypt) throws IOException { if (!Character.isDigit(strToDecrypt.charAt(i))) currentChar = strToDecrypt.charAt(i); } - if (!Character.isDigit(strToDecrypt.charAt(strToDecrypt.length() - 1))) result += currentChar; else { for (int i = 0; i < strToDecrypt.length(); i++) count = Character.getNumericValue(strToDecrypt.charAt(i)); for (int j = 1; j < count; j++) { - result += currentChar; } } - return result; } else { return result; } } - } From c6863c3b72f0908a30e579f3d72c9793ba4a6843 Mon Sep 17 00:00:00 2001 From: robotdorog Date: Wed, 17 Nov 2021 12:32:21 +0800 Subject: [PATCH 07/21] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=82=D0=B5=D1=81=D1=82=D1=8B=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D1=8B=20crypt=20=D0=B8?= =?UTF-8?q?=20decrypt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cryptor.iml | 17 +++++++++++++++++ src/CryptorTest.java | 20 ++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 src/CryptorTest.java diff --git a/Cryptor.iml b/Cryptor.iml index c90834f..d872f73 100644 --- a/Cryptor.iml +++ b/Cryptor.iml @@ -7,5 +7,22 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/CryptorTest.java b/src/CryptorTest.java new file mode 100644 index 0000000..002aece --- /dev/null +++ b/src/CryptorTest.java @@ -0,0 +1,20 @@ +import org.junit.Assert; + +import static org.junit.jupiter.api.Assertions.*; + +class CryptorTest { + Cryptor cryptor = new Cryptor(); + @org.junit.jupiter.api.Test + void crypt() { + String testString = "A2a3b3z3tcz3"; + String resultString = cryptor.crypt("AAaaabbbzzztczzz"); + Assert.assertEquals(testString, resultString); + } + + @org.junit.jupiter.api.Test + void decrypt() { + String testString = "Aa3b3z3tcz3"; + String resultString = cryptor.decrypt("Aaaabbbzzztczzzz"); + Assert.assertEquals(testString, resultString); + } +} \ No newline at end of file From 5b5367ebc47c7b7556be3b6b221c6d4aaa984994 Mon Sep 17 00:00:00 2001 From: robotdorog Date: Fri, 19 Nov 2021 13:04:01 +0800 Subject: [PATCH 08/21] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=82=D0=B5=D1=81=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Cryptor.java | 4 +-- src/CryptorTest.java | 68 ++++++++++++++++++++++++++++++++++++++++---- src/FileHandler.java | 15 +++++----- src/main.java | 1 + 4 files changed, 72 insertions(+), 16 deletions(-) diff --git a/src/Cryptor.java b/src/Cryptor.java index 47c255b..fbed670 100644 --- a/src/Cryptor.java +++ b/src/Cryptor.java @@ -26,10 +26,8 @@ public String crypt(String strToCrypt) { result += count; } else result += strToCrypt.charAt(strToCrypt.length() - 1); - return result; - } else { - return result; } + return result; } public String decrypt(String strToDecrypt) { diff --git a/src/CryptorTest.java b/src/CryptorTest.java index 002aece..0bc8c8d 100644 --- a/src/CryptorTest.java +++ b/src/CryptorTest.java @@ -1,20 +1,76 @@ import org.junit.Assert; -import static org.junit.jupiter.api.Assertions.*; - class CryptorTest { Cryptor cryptor = new Cryptor(); + @org.junit.jupiter.api.Test - void crypt() { + void cryptBasicTest() { String testString = "A2a3b3z3tcz3"; String resultString = cryptor.crypt("AAaaabbbzzztczzz"); Assert.assertEquals(testString, resultString); } @org.junit.jupiter.api.Test - void decrypt() { - String testString = "Aa3b3z3tcz3"; - String resultString = cryptor.decrypt("Aaaabbbzzztczzzz"); + void decryptBasicTest() { + String testString = "Aaaabbbzzztczzzz"; + String resultString = cryptor.decrypt("Aa3b3z3tcz3"); + Assert.assertEquals(testString, resultString); + } + + @org.junit.jupiter.api.Test + void cryptOneCharTest() { + String testString = "a"; + String resultString = cryptor.decrypt("a"); + Assert.assertEquals(testString, resultString); + } + + @org.junit.jupiter.api.Test + void decryptOneCharTest() { + String testString = "a"; + String resultString = cryptor.decrypt("a"); + Assert.assertEquals(testString, resultString); + } + + @org.junit.jupiter.api.Test + void cryptEmptyStrTest() { + String testString = ""; + String resultString = cryptor.decrypt(""); + Assert.assertEquals(testString, resultString); + } + + @org.junit.jupiter.api.Test + void decryptEmptyStrTest() { + String testString = ""; + String resultString = cryptor.decrypt(""); Assert.assertEquals(testString, resultString); } + + @org.junit.jupiter.api.Test + void cryptOneRepeatTest() { + String testString = "aaaa"; + String resultString = cryptor.decrypt("a3"); + Assert.assertEquals(testString, resultString); + } + + @org.junit.jupiter.api.Test + void decryptOneRepeatTest() { + String testString = "a3"; + String resultString = cryptor.decrypt("aaa"); + Assert.assertEquals(testString, resultString); + } + + @org.junit.jupiter.api.Test + void cryptNoRepeatTest() { + String testString = "abcdef"; + String resultString = cryptor.decrypt("abcdef"); + Assert.assertEquals(testString, resultString); + } + + @org.junit.jupiter.api.Test + void decryptNoRepeatTest() { + String testString = "abcdef"; + String resultString = cryptor.decrypt("abcdef"); + Assert.assertEquals(testString, resultString); + + } } \ No newline at end of file diff --git a/src/FileHandler.java b/src/FileHandler.java index c8cb33e..b9a3164 100644 --- a/src/FileHandler.java +++ b/src/FileHandler.java @@ -19,7 +19,7 @@ public FileHandler(String fileIn, String fileOut) { public void crypt() throws IOException { String strToRead = readFromFile(fileIn); String cryptedStringToWrite = cryptor.crypt(strToRead); - System.out.println("Crypted string to write: " + cryptedStringToWrite); + System.out.println("Crypted string to write:" + cryptedStringToWrite); writeToFile(cryptedStringToWrite, fileOut); } @@ -27,17 +27,19 @@ public void crypt() throws IOException { public void decrypt() throws IOException { String strToRead = readFromFile(fileIn); String decryptedStringToWrite = cryptor.decrypt(strToRead); - System.out.println("Decrypted string to write: " + decryptedStringToWrite); + System.out.println("Decrypted string to write:" + decryptedStringToWrite); writeToFile(decryptedStringToWrite, fileOut); } private void writeToFile (String strIn, String fileOut) throws IOException { try (BufferedWriter writer = new BufferedWriter(new FileWriter(fileOut))) { if (Files.exists(Path.of(fileOut))) { + System.out.println("Writer:" + strIn); writer.write(strIn); writer.flush(); } else { Files.createFile(Path.of(fileOut)); + System.out.println("Writer:" + strIn); writer.write(strIn); writer.flush(); writer.close(); @@ -49,13 +51,12 @@ private void writeToFile (String strIn, String fileOut) throws IOException { private String readFromFile (String fileIn) throws IOException { BufferedReader reader; - String str = ""; - try { + String str; + reader = new BufferedReader(new FileReader(fileIn)); str = reader.readLine(); - } catch (IOException e) { - e.printStackTrace(); - } + + System.out.println("This string is from read method:" + str); return str; } } diff --git a/src/main.java b/src/main.java index 63269d5..fb99555 100644 --- a/src/main.java +++ b/src/main.java @@ -12,6 +12,7 @@ public static void main(String[] args) throws IOException { + FileHandler fileHandlerCrypt = new FileHandler(filePathToCrypt, filePathCryptResult); FileHandler fileHandlerDecrypt = new FileHandler(filePathToDeCrypt, filePathDeCryptResult); From e149b54b8d591a1fc66367ee29957eb008ee8c8f Mon Sep 17 00:00:00 2001 From: robotdorog Date: Fri, 19 Nov 2021 13:05:37 +0800 Subject: [PATCH 09/21] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=82=D0=B5=D1=81=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/CryptorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CryptorTest.java b/src/CryptorTest.java index 0bc8c8d..9e2f771 100644 --- a/src/CryptorTest.java +++ b/src/CryptorTest.java @@ -48,7 +48,7 @@ void decryptEmptyStrTest() { @org.junit.jupiter.api.Test void cryptOneRepeatTest() { String testString = "aaaa"; - String resultString = cryptor.decrypt("a3"); + String resultString = cryptor.decrypt("a4"); Assert.assertEquals(testString, resultString); } From e8a7aa043e7e69a0097196b41dbb723c0fad5512 Mon Sep 17 00:00:00 2001 From: robotdorog Date: Mon, 22 Nov 2021 13:08:34 +0800 Subject: [PATCH 10/21] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?= =?UTF-8?q?,=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D0=B5=20=D0=B1=D1=8B?= =?UTF-8?q?=D0=BB=D0=B8=20=D0=BE=D0=B1=D0=BD=D0=B0=D1=80=D1=83=D0=B6=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Cryptor.java | 34 +++++++++++++++------------------- src/CryptorTest.java | 12 ++++++------ src/FileHandler.java | 13 ++++--------- src/main.java | 3 --- 4 files changed, 25 insertions(+), 37 deletions(-) diff --git a/src/Cryptor.java b/src/Cryptor.java index fbed670..25396fa 100644 --- a/src/Cryptor.java +++ b/src/Cryptor.java @@ -5,7 +5,7 @@ public String crypt(String strToCrypt) { String result = ""; - if (strToCrypt != null) { + if (strToCrypt != null && !strToCrypt.equals("")) { int count = 0; char currentChar = 0; @@ -13,7 +13,9 @@ public String crypt(String strToCrypt) { if (currentChar == strToCrypt.charAt(i)) { count++; } else { - result += currentChar; + if (currentChar != 0) + result += currentChar; + if (count > 1) { result += count; } @@ -33,10 +35,11 @@ public String crypt(String strToCrypt) { public String decrypt(String strToDecrypt) { String result = ""; + char currentChar = 0; + int count; + + if (strToDecrypt != null && !strToDecrypt.equals("")) { - if (strToDecrypt != null) { - char currentChar = 0; - int count = 0; for (int i = 0; i < strToDecrypt.length(); i++) { if (Character.isDigit(strToDecrypt.charAt(i))) { count = Character.getNumericValue(strToDecrypt.charAt(i)); @@ -44,24 +47,17 @@ public String decrypt(String strToDecrypt) { result += currentChar; } } else { - result += currentChar; - } - if (!Character.isDigit(strToDecrypt.charAt(i))) currentChar = strToDecrypt.charAt(i); - } - if (!Character.isDigit(strToDecrypt.charAt(strToDecrypt.length() - 1))) - result += currentChar; - else { - for (int i = 0; i < strToDecrypt.length(); i++) - count = Character.getNumericValue(strToDecrypt.charAt(i)); - for (int j = 1; j < count; j++) { - result += currentChar; + if (currentChar != 0) + result += currentChar; } } - return result; - } else { - return result; + + if (!Character.isDigit(strToDecrypt.charAt(strToDecrypt.length() - 1)) && + !(currentChar == (strToDecrypt.charAt(strToDecrypt.length() - 1)))) + result += currentChar; } + return result; } } diff --git a/src/CryptorTest.java b/src/CryptorTest.java index 9e2f771..957f48a 100644 --- a/src/CryptorTest.java +++ b/src/CryptorTest.java @@ -12,8 +12,8 @@ void cryptBasicTest() { @org.junit.jupiter.api.Test void decryptBasicTest() { - String testString = "Aaaabbbzzztczzzz"; - String resultString = cryptor.decrypt("Aa3b3z3tcz3"); + String testString = "AAaaabbbzzztczzz"; + String resultString = cryptor.decrypt("A2a3b3z3tcz3"); Assert.assertEquals(testString, resultString); } @@ -47,15 +47,15 @@ void decryptEmptyStrTest() { @org.junit.jupiter.api.Test void cryptOneRepeatTest() { - String testString = "aaaa"; - String resultString = cryptor.decrypt("a4"); + String testString = "a3"; + String resultString = cryptor.crypt("aaa"); Assert.assertEquals(testString, resultString); } @org.junit.jupiter.api.Test void decryptOneRepeatTest() { - String testString = "a3"; - String resultString = cryptor.decrypt("aaa"); + String testString = "aaa"; + String resultString = cryptor.decrypt("a3"); Assert.assertEquals(testString, resultString); } diff --git a/src/FileHandler.java b/src/FileHandler.java index b9a3164..e7948e6 100644 --- a/src/FileHandler.java +++ b/src/FileHandler.java @@ -19,27 +19,25 @@ public FileHandler(String fileIn, String fileOut) { public void crypt() throws IOException { String strToRead = readFromFile(fileIn); String cryptedStringToWrite = cryptor.crypt(strToRead); - System.out.println("Crypted string to write:" + cryptedStringToWrite); writeToFile(cryptedStringToWrite, fileOut); } public void decrypt() throws IOException { String strToRead = readFromFile(fileIn); + System.out.println("String to decrypt: " + strToRead); String decryptedStringToWrite = cryptor.decrypt(strToRead); System.out.println("Decrypted string to write:" + decryptedStringToWrite); writeToFile(decryptedStringToWrite, fileOut); } - private void writeToFile (String strIn, String fileOut) throws IOException { - try (BufferedWriter writer = new BufferedWriter(new FileWriter(fileOut))) { + private void writeToFile (String strIn, String fileOut) { + try (FileWriter writer = new FileWriter(fileOut)) { if (Files.exists(Path.of(fileOut))) { - System.out.println("Writer:" + strIn); writer.write(strIn); writer.flush(); } else { Files.createFile(Path.of(fileOut)); - System.out.println("Writer:" + strIn); writer.write(strIn); writer.flush(); writer.close(); @@ -52,11 +50,8 @@ private void writeToFile (String strIn, String fileOut) throws IOException { private String readFromFile (String fileIn) throws IOException { BufferedReader reader; String str; - - reader = new BufferedReader(new FileReader(fileIn)); + reader = new BufferedReader(new FileReader(fileIn)); str = reader.readLine(); - - System.out.println("This string is from read method:" + str); return str; } } diff --git a/src/main.java b/src/main.java index fb99555..d0e7d52 100644 --- a/src/main.java +++ b/src/main.java @@ -10,9 +10,6 @@ public static void main(String[] args) throws IOException { String filePathToDeCrypt = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file3.txt"; String filePathDeCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file4.txt"; - - - FileHandler fileHandlerCrypt = new FileHandler(filePathToCrypt, filePathCryptResult); FileHandler fileHandlerDecrypt = new FileHandler(filePathToDeCrypt, filePathDeCryptResult); From 54cad7894ee908c5eb0407f4fcbccc82eae6fe36 Mon Sep 17 00:00:00 2001 From: robotdorog Date: Thu, 25 Nov 2021 19:21:05 +0800 Subject: [PATCH 11/21] =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=20?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81?= =?UTF-8?q?=20CryptorV2=20=D1=81=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=D0=BC=20StringBuilde?= =?UTF-8?q?r,=20=D0=BD=D0=B5=D0=BE=D0=B1=D1=85=D0=BE=D0=B4=D0=B8=D0=BC?= =?UTF-8?q?=D0=BE=20=D1=80=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=82=D1=8C=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=20FileHandlerV2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/CryptorV2.java | 61 +++++++++++++++++++++++++++++++++++++++++ src/FileHandler.java | 6 ++-- src/FileHandlerV2.java | 62 ++++++++++++++++++++++++++++++++++++++++++ src/main.java | 6 ++-- 4 files changed, 131 insertions(+), 4 deletions(-) create mode 100644 src/CryptorV2.java create mode 100644 src/FileHandlerV2.java diff --git a/src/CryptorV2.java b/src/CryptorV2.java new file mode 100644 index 0000000..e2d316e --- /dev/null +++ b/src/CryptorV2.java @@ -0,0 +1,61 @@ +public class CryptorV2 { + + public StringBuilder crypt(String strToCrypt) { + + StringBuilder result = new StringBuilder(); + + if (strToCrypt != null && !strToCrypt.equals("")) { + int count = 0; + char currentChar = 0; + + for (int i = 0; i < strToCrypt.length(); i++) { + if (currentChar == strToCrypt.charAt(i)) { + count++; + } else { + if (currentChar != 0) + result.append(currentChar); + + if (count > 1) { + result.append(count); + } + currentChar = strToCrypt.charAt(i); + count = 1; + } + } + if (count > 1) { + result.append(strToCrypt.charAt(strToCrypt.length() - 1)); + result.append(count); + } else + result.append(strToCrypt.charAt(strToCrypt.length() - 1)); + } + return result; + } + + public String decrypt(String strToDecrypt) { + + String result = ""; + char currentChar = 0; + int count; + + if (strToDecrypt != null && !strToDecrypt.equals("")) { + + for (int i = 0; i < strToDecrypt.length(); i++) { + if (Character.isDigit(strToDecrypt.charAt(i))) { + count = Character.getNumericValue(strToDecrypt.charAt(i)); + for (int j = 1; j < count; j++) { + result += currentChar; + } + } else { + currentChar = strToDecrypt.charAt(i); + if (currentChar != 0) + result += currentChar; + } + } + + if (!Character.isDigit(strToDecrypt.charAt(strToDecrypt.length() - 1)) && + !(currentChar == (strToDecrypt.charAt(strToDecrypt.length() - 1)))) + result += currentChar; + } + return result; + } +} diff --git a/src/FileHandler.java b/src/FileHandler.java index e7948e6..11f7624 100644 --- a/src/FileHandler.java +++ b/src/FileHandler.java @@ -7,6 +7,8 @@ public class FileHandler { String fileIn; String fileOut; Cryptor cryptor; + CryptorV2 cryptorV2; + public FileHandler(String fileIn, String fileOut) { @@ -25,9 +27,9 @@ public void crypt() throws IOException { public void decrypt() throws IOException { String strToRead = readFromFile(fileIn); - System.out.println("String to decrypt: " + strToRead); +// System.out.println("String to decrypt: " + strToRead); String decryptedStringToWrite = cryptor.decrypt(strToRead); - System.out.println("Decrypted string to write:" + decryptedStringToWrite); +// System.out.println("Decrypted string to write:" + decryptedStringToWrite); writeToFile(decryptedStringToWrite, fileOut); } diff --git a/src/FileHandlerV2.java b/src/FileHandlerV2.java new file mode 100644 index 0000000..f375587 --- /dev/null +++ b/src/FileHandlerV2.java @@ -0,0 +1,62 @@ +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; + +public class FileHandlerV2 { + + String fileIn; + String fileOut; + Cryptor cryptor; + CryptorV2 cryptorV2; + + + + public FileHandler(String fileIn, String fileOut) { + this.fileIn = fileIn; + this.fileOut = fileOut; + cryptor = new Cryptor(); + + } + + public void crypt() throws IOException { + String strToRead = readFromFile(fileIn); + String cryptedStringToWrite = cryptor.crypt(strToRead); + writeToFile(cryptedStringToWrite, fileOut); + + } + + public void decrypt() throws IOException { + String strToRead = readFromFile(fileIn); +// System.out.println("String to decrypt: " + strToRead); + String decryptedStringToWrite = cryptor.decrypt(strToRead); +// System.out.println("Decrypted string to write:" + decryptedStringToWrite); + writeToFile(decryptedStringToWrite, fileOut); + } + + private void writeToFile (String strIn, String fileOut) { + try (FileWriter writer = new FileWriter(fileOut)) { + if (Files.exists(Path.of(fileOut))) { + writer.write(strIn); + writer.flush(); + } else { + Files.createFile(Path.of(fileOut)); + writer.write(strIn); + writer.flush(); + writer.close(); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + private String readFromFile (String fileIn) throws IOException { + BufferedReader reader; + String str; + reader = new BufferedReader(new FileReader(fileIn)); + str = reader.readLine(); + return str; + } +} diff --git a/src/main.java b/src/main.java index d0e7d52..b1a4033 100644 --- a/src/main.java +++ b/src/main.java @@ -5,16 +5,18 @@ public class main { public static void main(String[] args) throws IOException { - String filePathToCrypt = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file1.txt"; + String filePathToCrypt = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file5.txt"; String filePathCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file2.txt"; - String filePathToDeCrypt = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file3.txt"; + String filePathToDeCrypt = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file2.txt"; String filePathDeCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file4.txt"; FileHandler fileHandlerCrypt = new FileHandler(filePathToCrypt, filePathCryptResult); FileHandler fileHandlerDecrypt = new FileHandler(filePathToDeCrypt, filePathDeCryptResult); + long m = System.currentTimeMillis(); fileHandlerCrypt.crypt(); fileHandlerDecrypt.decrypt(); + System.out.println("При использывании String программа выполняется: " + (double)(System.currentTimeMillis() - m) + " мс"); } } From c714810ab750319c30be66a0d6948b44dee854c4 Mon Sep 17 00:00:00 2001 From: robotdorog Date: Fri, 26 Nov 2021 12:14:05 +0800 Subject: [PATCH 12/21] =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=20?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81?= =?UTF-8?q?=20CryptorV2=20=D1=81=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=D0=BC=20StringBuilde?= =?UTF-8?q?r=20=D0=B8=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=20FileHandlerV2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/CryptorTest.java | 6 ++++++ src/CryptorV2.java | 15 +++++++------- src/FileHandler.java | 4 +--- src/FileHandlerV2.java | 46 +++++++++++++++++++++++------------------- src/main.java | 29 ++++++++++++++++++++++---- 5 files changed, 64 insertions(+), 36 deletions(-) diff --git a/src/CryptorTest.java b/src/CryptorTest.java index 957f48a..9d69b24 100644 --- a/src/CryptorTest.java +++ b/src/CryptorTest.java @@ -2,6 +2,7 @@ class CryptorTest { Cryptor cryptor = new Cryptor(); + CryptorV2 cryptorV2 = new CryptorV2(); @org.junit.jupiter.api.Test void cryptBasicTest() { @@ -73,4 +74,9 @@ void decryptNoRepeatTest() { Assert.assertEquals(testString, resultString); } + + // CryptorV2 + + + } \ No newline at end of file diff --git a/src/CryptorV2.java b/src/CryptorV2.java index e2d316e..b8a3cd3 100644 --- a/src/CryptorV2.java +++ b/src/CryptorV2.java @@ -1,8 +1,7 @@ public class CryptorV2 { + StringBuilder result = new StringBuilder(); - public StringBuilder crypt(String strToCrypt) { - - StringBuilder result = new StringBuilder(); + public StringBuilder crypt(StringBuilder strToCrypt) { if (strToCrypt != null && !strToCrypt.equals("")) { int count = 0; @@ -31,9 +30,9 @@ public StringBuilder crypt(String strToCrypt) { return result; } - public String decrypt(String strToDecrypt) { + public StringBuilder decrypt(StringBuilder strToDecrypt) { + - String result = ""; char currentChar = 0; int count; @@ -43,18 +42,18 @@ public String decrypt(String strToDecrypt) { if (Character.isDigit(strToDecrypt.charAt(i))) { count = Character.getNumericValue(strToDecrypt.charAt(i)); for (int j = 1; j < count; j++) { - result += currentChar; + result.append(currentChar); } } else { currentChar = strToDecrypt.charAt(i); if (currentChar != 0) - result += currentChar; + result.append(currentChar); } } if (!Character.isDigit(strToDecrypt.charAt(strToDecrypt.length() - 1)) && !(currentChar == (strToDecrypt.charAt(strToDecrypt.length() - 1)))) - result += currentChar; + result.append(currentChar); } return result; } diff --git a/src/FileHandler.java b/src/FileHandler.java index 11f7624..8e42dce 100644 --- a/src/FileHandler.java +++ b/src/FileHandler.java @@ -7,7 +7,7 @@ public class FileHandler { String fileIn; String fileOut; Cryptor cryptor; - CryptorV2 cryptorV2; + @@ -27,9 +27,7 @@ public void crypt() throws IOException { public void decrypt() throws IOException { String strToRead = readFromFile(fileIn); -// System.out.println("String to decrypt: " + strToRead); String decryptedStringToWrite = cryptor.decrypt(strToRead); -// System.out.println("Decrypted string to write:" + decryptedStringToWrite); writeToFile(decryptedStringToWrite, fileOut); } diff --git a/src/FileHandlerV2.java b/src/FileHandlerV2.java index f375587..09bf3f2 100644 --- a/src/FileHandlerV2.java +++ b/src/FileHandlerV2.java @@ -9,41 +9,37 @@ public class FileHandlerV2 { String fileIn; String fileOut; - Cryptor cryptor; CryptorV2 cryptorV2; - - public FileHandler(String fileIn, String fileOut) { + public FileHandlerV2(String fileIn, String fileOut) { this.fileIn = fileIn; this.fileOut = fileOut; - cryptor = new Cryptor(); + cryptorV2 = new CryptorV2(); } - public void crypt() throws IOException { - String strToRead = readFromFile(fileIn); - String cryptedStringToWrite = cryptor.crypt(strToRead); + public void cryptV2() throws IOException { + StringBuilder strToRead = readFromFile(fileIn); + StringBuilder cryptedStringToWrite = cryptorV2.crypt(strToRead); writeToFile(cryptedStringToWrite, fileOut); } - public void decrypt() throws IOException { - String strToRead = readFromFile(fileIn); -// System.out.println("String to decrypt: " + strToRead); - String decryptedStringToWrite = cryptor.decrypt(strToRead); -// System.out.println("Decrypted string to write:" + decryptedStringToWrite); + public void decryptV2() throws IOException { + StringBuilder strToRead = readFromFile(fileIn); + StringBuilder decryptedStringToWrite = cryptorV2.decrypt(strToRead); writeToFile(decryptedStringToWrite, fileOut); } - private void writeToFile (String strIn, String fileOut) { + private void writeToFile(StringBuilder strIn, String fileOut) { try (FileWriter writer = new FileWriter(fileOut)) { if (Files.exists(Path.of(fileOut))) { - writer.write(strIn); + writer.write(String.valueOf(strIn)); writer.flush(); } else { Files.createFile(Path.of(fileOut)); - writer.write(strIn); + writer.write(String.valueOf(strIn)); writer.flush(); writer.close(); } @@ -52,11 +48,19 @@ private void writeToFile (String strIn, String fileOut) { } } - private String readFromFile (String fileIn) throws IOException { - BufferedReader reader; - String str; - reader = new BufferedReader(new FileReader(fileIn)); - str = reader.readLine(); - return str; + private StringBuilder readFromFile(String fileIn) throws IOException { + + BufferedReader reader = new BufferedReader(new FileReader(fileIn)); + String str = ""; + StringBuilder stringBuild = new StringBuilder(); + + try { +// while ((str = reader.readLine()) != null); + str = reader.readLine(); + stringBuild.append(str); + return stringBuild; + } finally { + reader.close(); + } } } diff --git a/src/main.java b/src/main.java index b1a4033..8def5e6 100644 --- a/src/main.java +++ b/src/main.java @@ -4,11 +4,21 @@ public class main { public static void main(String[] args) throws IOException { +// +// String filePathToCrypt = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file5.txt"; +// String filePathCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file2.txt"; +// String filePathToDeCrypt = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file2.txt"; +// String filePathDeCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file4.txt"; - String filePathToCrypt = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file5.txt"; - String filePathCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file2.txt"; - String filePathToDeCrypt = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file2.txt"; - String filePathDeCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file4.txt"; + String filePathToCrypt = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\filetoCrypt.txt"; + String filePathCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\filecryptResult.txt"; + String filePathToDeCrypt = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\filecryptResult.txt"; + String filePathDeCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\filedecryptResult.txt"; + + String filePathToCryptV2 = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\fileV2toCrypt.txt"; + String filePathCryptResultV2 = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\fileV2cryptResult.txt"; + String filePathToDeCryptV2 = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\fileV2cryptResult.txt"; + String filePathDeCryptResultV2 = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\fileV2decryptResult.txt"; FileHandler fileHandlerCrypt = new FileHandler(filePathToCrypt, filePathCryptResult); FileHandler fileHandlerDecrypt = new FileHandler(filePathToDeCrypt, filePathDeCryptResult); @@ -18,5 +28,16 @@ public static void main(String[] args) throws IOException { fileHandlerDecrypt.decrypt(); System.out.println("При использывании String программа выполняется: " + (double)(System.currentTimeMillis() - m) + " мс"); + + + FileHandlerV2 fileHandlerCryptV2 = new FileHandlerV2(filePathToCryptV2, filePathCryptResultV2); + FileHandlerV2 fileHandlerDecryptV2 = new FileHandlerV2(filePathToDeCryptV2, filePathDeCryptResultV2); + long mV2 = System.currentTimeMillis(); + + fileHandlerCryptV2.cryptV2(); + fileHandlerDecryptV2.decryptV2(); + + System.out.println("При использывании StringBuilder программа выполняется: " + (double)(System.currentTimeMillis() - mV2) + " мс"); + } } From 6bebfcb9dc9b60561e40e14a767acea9d1ff611d Mon Sep 17 00:00:00 2001 From: robotdorog Date: Mon, 29 Nov 2021 13:23:28 +0800 Subject: [PATCH 13/21] =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=20?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D1=8B=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D1=8B?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BB=D0=B0=D1=81?= =?UTF-8?q?=D1=81=D0=BE=D0=B2=20=D1=81=D0=BE=20StringBuilder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/CryptorTest.java | 74 ++++++++++++++++++++++++++++++++++++++++++++ src/CryptorV2.java | 2 +- 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/src/CryptorTest.java b/src/CryptorTest.java index 9d69b24..10bcb74 100644 --- a/src/CryptorTest.java +++ b/src/CryptorTest.java @@ -3,6 +3,8 @@ class CryptorTest { Cryptor cryptor = new Cryptor(); CryptorV2 cryptorV2 = new CryptorV2(); + StringBuilder testStringBuilder = new StringBuilder(); + StringBuilder resultSringBuilder = new StringBuilder(); @org.junit.jupiter.api.Test void cryptBasicTest() { @@ -77,6 +79,78 @@ void decryptNoRepeatTest() { // CryptorV2 + @org.junit.jupiter.api.Test + void cryptBasicV2Test() { + StringBuilder testStringBuilder = new StringBuilder("A2a3b3z3tcz3"); + StringBuilder resultSringBuilder = cryptorV2.crypt(new StringBuilder("AAaaabbbzzztczzz")); + Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); + } + + @org.junit.jupiter.api.Test + void decryptBasicV2Test() { + StringBuilder testStringBuilder = new StringBuilder("AAaaabbbzzztczzz"); + StringBuilder resultSringBuilder = cryptorV2.decrypt(new StringBuilder("A2a3b3z3tcz3")); + Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); + } + + @org.junit.jupiter.api.Test + void cryptV2OneCharTest() { + StringBuilder testStringBuilder = new StringBuilder("a"); + StringBuilder resultSringBuilder = cryptorV2.crypt(new StringBuilder("a")); + Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); + } + + @org.junit.jupiter.api.Test + void decryptV2OneCharTest() { + StringBuilder testStringBuilder = new StringBuilder("a"); + StringBuilder resultSringBuilder = cryptorV2.decrypt(new StringBuilder("a")); + Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); + } + + @org.junit.jupiter.api.Test + void cryptV2EmptyStrTest() { + String emptyStrTest = ""; + StringBuilder testStringBuilder = new StringBuilder(emptyStrTest); + StringBuilder resultSringBuilder = cryptorV2.crypt(new StringBuilder(emptyStrTest)); + Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); + } + + @org.junit.jupiter.api.Test + void decryptV2EmptyStrTest() { + String emptyStrTest = ""; + StringBuilder testStringBuilder = new StringBuilder(emptyStrTest); + StringBuilder resultSringBuilder = cryptorV2.decrypt(new StringBuilder(emptyStrTest)); + Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); + } + + @org.junit.jupiter.api.Test + void cryptV2OneRepeatTest() { + StringBuilder testStringBuilder = new StringBuilder("a3"); + StringBuilder resultSringBuilder = cryptorV2.crypt(new StringBuilder("aaa")); + Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); + } + + @org.junit.jupiter.api.Test + void decryptV2OneRepeatTest() { + StringBuilder testStringBuilder = new StringBuilder("aaa"); + StringBuilder resultSringBuilder = cryptorV2.decrypt(new StringBuilder("a3")); + Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); + } + + @org.junit.jupiter.api.Test + void cryptV2NoRepeatTest() { + StringBuilder testStringBuilder = new StringBuilder("abcdef"); + StringBuilder resultSringBuilder = cryptorV2.crypt(new StringBuilder("abcdef")); + Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); + } + + + @org.junit.jupiter.api.Test + void decryptV2NoRepeatTest() { + StringBuilder testStringBuilder = new StringBuilder("abcdef"); + StringBuilder resultSringBuilder = cryptorV2.decrypt(new StringBuilder("abcdef")); + Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); + } } \ No newline at end of file diff --git a/src/CryptorV2.java b/src/CryptorV2.java index b8a3cd3..e187cdf 100644 --- a/src/CryptorV2.java +++ b/src/CryptorV2.java @@ -26,7 +26,7 @@ public StringBuilder crypt(StringBuilder strToCrypt) { result.append(count); } else result.append(strToCrypt.charAt(strToCrypt.length() - 1)); - } + } return result; } From 5ef33fd3d8d563aabc27ece938ee14f085abdcde Mon Sep 17 00:00:00 2001 From: robotdorog Date: Tue, 30 Nov 2021 17:16:12 +0800 Subject: [PATCH 14/21] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D1=82=D0=B5=D1=81=D1=82=D1=8B,=20=D1=81=D0=B4?= =?UTF-8?q?=D0=B5=D0=BB=D0=B0=D0=BD=20=D0=B8=D0=BC=D0=BF=D0=BE=D1=80=D1=82?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20@test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/CryptorTest.java | 85 ++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/src/CryptorTest.java b/src/CryptorTest.java index 10bcb74..bab8fa9 100644 --- a/src/CryptorTest.java +++ b/src/CryptorTest.java @@ -1,76 +1,78 @@ import org.junit.Assert; +import org.junit.Test; -class CryptorTest { + +public class CryptorTest { Cryptor cryptor = new Cryptor(); CryptorV2 cryptorV2 = new CryptorV2(); StringBuilder testStringBuilder = new StringBuilder(); StringBuilder resultSringBuilder = new StringBuilder(); - @org.junit.jupiter.api.Test - void cryptBasicTest() { + @Test + public void cryptBasicTest() { String testString = "A2a3b3z3tcz3"; String resultString = cryptor.crypt("AAaaabbbzzztczzz"); Assert.assertEquals(testString, resultString); } - @org.junit.jupiter.api.Test - void decryptBasicTest() { + @Test + public void decryptBasicTest() { String testString = "AAaaabbbzzztczzz"; String resultString = cryptor.decrypt("A2a3b3z3tcz3"); Assert.assertEquals(testString, resultString); } - @org.junit.jupiter.api.Test - void cryptOneCharTest() { + @Test + public void cryptOneCharTest() { String testString = "a"; String resultString = cryptor.decrypt("a"); Assert.assertEquals(testString, resultString); } - @org.junit.jupiter.api.Test - void decryptOneCharTest() { + @Test + public void decryptOneCharTest() { String testString = "a"; String resultString = cryptor.decrypt("a"); Assert.assertEquals(testString, resultString); } - @org.junit.jupiter.api.Test - void cryptEmptyStrTest() { + @Test + public void cryptEmptyStrTest() { String testString = ""; String resultString = cryptor.decrypt(""); Assert.assertEquals(testString, resultString); } - @org.junit.jupiter.api.Test - void decryptEmptyStrTest() { + @Test + public void decryptEmptyStrTest() { String testString = ""; String resultString = cryptor.decrypt(""); Assert.assertEquals(testString, resultString); } - @org.junit.jupiter.api.Test - void cryptOneRepeatTest() { + @Test + public void cryptOneRepeatTest() { String testString = "a3"; String resultString = cryptor.crypt("aaa"); Assert.assertEquals(testString, resultString); } - @org.junit.jupiter.api.Test - void decryptOneRepeatTest() { + @Test + public void decryptOneRepeatTest() { String testString = "aaa"; String resultString = cryptor.decrypt("a3"); Assert.assertEquals(testString, resultString); } - @org.junit.jupiter.api.Test - void cryptNoRepeatTest() { + @Test + public void cryptNoRepeatTest() { String testString = "abcdef"; String resultString = cryptor.decrypt("abcdef"); Assert.assertEquals(testString, resultString); } - @org.junit.jupiter.api.Test - void decryptNoRepeatTest() { + @Test + public void decryptNoRepeatTest() { String testString = "abcdef"; String resultString = cryptor.decrypt("abcdef"); Assert.assertEquals(testString, resultString); @@ -79,74 +81,73 @@ void decryptNoRepeatTest() { // CryptorV2 - @org.junit.jupiter.api.Test - void cryptBasicV2Test() { + @Test + public void cryptBasicV2Test() { StringBuilder testStringBuilder = new StringBuilder("A2a3b3z3tcz3"); StringBuilder resultSringBuilder = cryptorV2.crypt(new StringBuilder("AAaaabbbzzztczzz")); Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); } - @org.junit.jupiter.api.Test - void decryptBasicV2Test() { + @Test + public void decryptBasicV2Test() { StringBuilder testStringBuilder = new StringBuilder("AAaaabbbzzztczzz"); StringBuilder resultSringBuilder = cryptorV2.decrypt(new StringBuilder("A2a3b3z3tcz3")); Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); } - @org.junit.jupiter.api.Test - void cryptV2OneCharTest() { + @Test + public void cryptV2OneCharTest() { StringBuilder testStringBuilder = new StringBuilder("a"); StringBuilder resultSringBuilder = cryptorV2.crypt(new StringBuilder("a")); Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); } - @org.junit.jupiter.api.Test - void decryptV2OneCharTest() { + @Test + public void decryptV2OneCharTest() { StringBuilder testStringBuilder = new StringBuilder("a"); StringBuilder resultSringBuilder = cryptorV2.decrypt(new StringBuilder("a")); Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); } - @org.junit.jupiter.api.Test - void cryptV2EmptyStrTest() { + @Test + public void cryptV2EmptyStrTest() { String emptyStrTest = ""; StringBuilder testStringBuilder = new StringBuilder(emptyStrTest); StringBuilder resultSringBuilder = cryptorV2.crypt(new StringBuilder(emptyStrTest)); Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); } - @org.junit.jupiter.api.Test - void decryptV2EmptyStrTest() { + @Test + public void decryptV2EmptyStrTest() { String emptyStrTest = ""; StringBuilder testStringBuilder = new StringBuilder(emptyStrTest); StringBuilder resultSringBuilder = cryptorV2.decrypt(new StringBuilder(emptyStrTest)); Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); } - @org.junit.jupiter.api.Test - void cryptV2OneRepeatTest() { + @Test + public void cryptV2OneRepeatTest() { StringBuilder testStringBuilder = new StringBuilder("a3"); StringBuilder resultSringBuilder = cryptorV2.crypt(new StringBuilder("aaa")); Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); } - @org.junit.jupiter.api.Test - void decryptV2OneRepeatTest() { + @Test + public void decryptV2OneRepeatTest() { StringBuilder testStringBuilder = new StringBuilder("aaa"); StringBuilder resultSringBuilder = cryptorV2.decrypt(new StringBuilder("a3")); Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); } - @org.junit.jupiter.api.Test - void cryptV2NoRepeatTest() { + @Test + public void cryptV2NoRepeatTest() { StringBuilder testStringBuilder = new StringBuilder("abcdef"); StringBuilder resultSringBuilder = cryptorV2.crypt(new StringBuilder("abcdef")); Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); } - - @org.junit.jupiter.api.Test - void decryptV2NoRepeatTest() { + @Test + public void decryptV2NoRepeatTest() { StringBuilder testStringBuilder = new StringBuilder("abcdef"); StringBuilder resultSringBuilder = cryptorV2.decrypt(new StringBuilder("abcdef")); Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); From 7ab3ae7bc46d909245fc85c5007f439e0c39f3a9 Mon Sep 17 00:00:00 2001 From: robotdorog Date: Wed, 8 Dec 2021 12:52:31 +0800 Subject: [PATCH 15/21] =?UTF-8?q?=D0=A0=D0=B0=D0=B7=D1=80=D0=B0=D0=B1?= =?UTF-8?q?=D0=BE=D1=82=D0=BA=D0=B0=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=B0?= =?UTF-8?q?=20=D0=BE=D1=86=D0=B5=D0=BD=D0=BA=D0=B8=20=D0=B2=D1=80=D0=B5?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Crypt.java | 4 + src/CryptorTest.java | 86 +++++++++---------- src/{Cryptor.java => CryptorViaString.java} | 3 +- ...orV2.java => CryptorViaStringBuilder.java} | 12 +-- src/FileHandler.java | 17 +--- src/FileHandlerV2.java | 66 -------------- src/TestClass.java | 27 ++++++ src/main.java | 44 ++++++---- 8 files changed, 110 insertions(+), 149 deletions(-) create mode 100644 src/Crypt.java rename src/{Cryptor.java => CryptorViaString.java} (97%) rename src/{CryptorV2.java => CryptorViaStringBuilder.java} (88%) delete mode 100644 src/FileHandlerV2.java create mode 100644 src/TestClass.java diff --git a/src/Crypt.java b/src/Crypt.java new file mode 100644 index 0000000..8c7e0b5 --- /dev/null +++ b/src/Crypt.java @@ -0,0 +1,4 @@ +public interface Crypt { + public String crypt(String strToCrypt); + public String decrypt(String strToDecrypt); +} diff --git a/src/CryptorTest.java b/src/CryptorTest.java index bab8fa9..c2bc1cd 100644 --- a/src/CryptorTest.java +++ b/src/CryptorTest.java @@ -3,154 +3,150 @@ public class CryptorTest { - Cryptor cryptor = new Cryptor(); - CryptorV2 cryptorV2 = new CryptorV2(); + CryptorViaString cryptorViaString = new CryptorViaString(); + CryptorViaStringBuilder cryptorViaStringBuilder = new CryptorViaStringBuilder(); StringBuilder testStringBuilder = new StringBuilder(); StringBuilder resultSringBuilder = new StringBuilder(); @Test public void cryptBasicTest() { String testString = "A2a3b3z3tcz3"; - String resultString = cryptor.crypt("AAaaabbbzzztczzz"); + String resultString = cryptorViaString.crypt("AAaaabbbzzztczzz"); Assert.assertEquals(testString, resultString); } @Test public void decryptBasicTest() { String testString = "AAaaabbbzzztczzz"; - String resultString = cryptor.decrypt("A2a3b3z3tcz3"); + String resultString = cryptorViaString.decrypt("A2a3b3z3tcz3"); Assert.assertEquals(testString, resultString); } @Test public void cryptOneCharTest() { String testString = "a"; - String resultString = cryptor.decrypt("a"); + String resultString = cryptorViaString.decrypt("a"); Assert.assertEquals(testString, resultString); } @Test public void decryptOneCharTest() { String testString = "a"; - String resultString = cryptor.decrypt("a"); + String resultString = cryptorViaString.decrypt("a"); Assert.assertEquals(testString, resultString); } @Test public void cryptEmptyStrTest() { String testString = ""; - String resultString = cryptor.decrypt(""); + String resultString = cryptorViaString.decrypt(""); Assert.assertEquals(testString, resultString); } @Test public void decryptEmptyStrTest() { String testString = ""; - String resultString = cryptor.decrypt(""); + String resultString = cryptorViaString.decrypt(""); Assert.assertEquals(testString, resultString); } @Test public void cryptOneRepeatTest() { String testString = "a3"; - String resultString = cryptor.crypt("aaa"); + String resultString = cryptorViaString.crypt("aaa"); Assert.assertEquals(testString, resultString); } @Test public void decryptOneRepeatTest() { String testString = "aaa"; - String resultString = cryptor.decrypt("a3"); + String resultString = cryptorViaString.decrypt("a3"); Assert.assertEquals(testString, resultString); } @Test public void cryptNoRepeatTest() { String testString = "abcdef"; - String resultString = cryptor.decrypt("abcdef"); + String resultString = cryptorViaString.decrypt("abcdef"); Assert.assertEquals(testString, resultString); } @Test public void decryptNoRepeatTest() { String testString = "abcdef"; - String resultString = cryptor.decrypt("abcdef"); + String resultString = cryptorViaString.decrypt("abcdef"); Assert.assertEquals(testString, resultString); } - // CryptorV2 + // CryptorViaStringBuilder @Test public void cryptBasicV2Test() { - StringBuilder testStringBuilder = new StringBuilder("A2a3b3z3tcz3"); - StringBuilder resultSringBuilder = cryptorV2.crypt(new StringBuilder("AAaaabbbzzztczzz")); - Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); + String testStringBuilder = "A2a3b3z3tcz3"; + String resultSringBuilder = cryptorViaStringBuilder.crypt("AAaaabbbzzztczzz"); + Assert.assertEquals(testStringBuilder, resultSringBuilder); } @Test public void decryptBasicV2Test() { - StringBuilder testStringBuilder = new StringBuilder("AAaaabbbzzztczzz"); - StringBuilder resultSringBuilder = cryptorV2.decrypt(new StringBuilder("A2a3b3z3tcz3")); - Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); + String testStringBuilder = "AAaaabbbzzztczzz"; + String resultSringBuilder = cryptorViaStringBuilder.decrypt("A2a3b3z3tcz3"); + Assert.assertEquals(testStringBuilder, resultSringBuilder); } @Test public void cryptV2OneCharTest() { - StringBuilder testStringBuilder = new StringBuilder("a"); - StringBuilder resultSringBuilder = cryptorV2.crypt(new StringBuilder("a")); - Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); + String testStringBuilder = "a"; + String resultSringBuilder = cryptorViaStringBuilder.crypt("a"); + Assert.assertEquals(testStringBuilder, resultSringBuilder); } @Test public void decryptV2OneCharTest() { - StringBuilder testStringBuilder = new StringBuilder("a"); - StringBuilder resultSringBuilder = cryptorV2.decrypt(new StringBuilder("a")); - Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); + String testStringBuilder = "a"; + String resultSringBuilder = cryptorViaStringBuilder.decrypt("a"); + Assert.assertEquals(testStringBuilder, resultSringBuilder); } @Test public void cryptV2EmptyStrTest() { - String emptyStrTest = ""; - StringBuilder testStringBuilder = new StringBuilder(emptyStrTest); - StringBuilder resultSringBuilder = cryptorV2.crypt(new StringBuilder(emptyStrTest)); - Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); + String resultSringBuilder = cryptorViaStringBuilder.crypt(""); + Assert.assertEquals(testStringBuilder, resultSringBuilder); } @Test public void decryptV2EmptyStrTest() { - String emptyStrTest = ""; - StringBuilder testStringBuilder = new StringBuilder(emptyStrTest); - StringBuilder resultSringBuilder = cryptorV2.decrypt(new StringBuilder(emptyStrTest)); - Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); + String resultSringBuilder = cryptorViaStringBuilder.decrypt(""); + Assert.assertEquals(testStringBuilder, resultSringBuilder); } @Test public void cryptV2OneRepeatTest() { - StringBuilder testStringBuilder = new StringBuilder("a3"); - StringBuilder resultSringBuilder = cryptorV2.crypt(new StringBuilder("aaa")); - Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); + String testStringBuilder = "a3"; + String resultSringBuilder = cryptorViaStringBuilder.crypt("aaa"); + Assert.assertEquals(testStringBuilder, resultSringBuilder); } @Test public void decryptV2OneRepeatTest() { - StringBuilder testStringBuilder = new StringBuilder("aaa"); - StringBuilder resultSringBuilder = cryptorV2.decrypt(new StringBuilder("a3")); - Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); + String testStringBuilder = "aaa"; + String resultSringBuilder = cryptorViaStringBuilder.decrypt("a3"); + Assert.assertEquals(testStringBuilder, resultSringBuilder); } @Test public void cryptV2NoRepeatTest() { - StringBuilder testStringBuilder = new StringBuilder("abcdef"); - StringBuilder resultSringBuilder = cryptorV2.crypt(new StringBuilder("abcdef")); - Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); + String testStringBuilder = "abcdef"; + String resultSringBuilder = cryptorViaStringBuilder.crypt("abcdef"); + Assert.assertEquals(testStringBuilder, resultSringBuilder); } @Test public void decryptV2NoRepeatTest() { - StringBuilder testStringBuilder = new StringBuilder("abcdef"); - StringBuilder resultSringBuilder = cryptorV2.decrypt(new StringBuilder("abcdef")); - Assert.assertEquals(testStringBuilder.toString(), resultSringBuilder.toString()); + String testStringBuilder = "abcdef"; + String resultSringBuilder = cryptorViaStringBuilder.decrypt("abcdef"); + Assert.assertEquals(testStringBuilder, resultSringBuilder); } diff --git a/src/Cryptor.java b/src/CryptorViaString.java similarity index 97% rename from src/Cryptor.java rename to src/CryptorViaString.java index 25396fa..60ff8c4 100644 --- a/src/Cryptor.java +++ b/src/CryptorViaString.java @@ -1,5 +1,6 @@ -public class Cryptor { +public class CryptorViaString implements Crypt { + public String crypt(String strToCrypt) { diff --git a/src/CryptorV2.java b/src/CryptorViaStringBuilder.java similarity index 88% rename from src/CryptorV2.java rename to src/CryptorViaStringBuilder.java index e187cdf..b45c655 100644 --- a/src/CryptorV2.java +++ b/src/CryptorViaStringBuilder.java @@ -1,7 +1,9 @@ -public class CryptorV2 { +public class CryptorViaStringBuilder implements Crypt, Decrypt { + + StringBuilder result = new StringBuilder(); - public StringBuilder crypt(StringBuilder strToCrypt) { + public String crypt(String strToCrypt) { if (strToCrypt != null && !strToCrypt.equals("")) { int count = 0; @@ -27,10 +29,10 @@ public StringBuilder crypt(StringBuilder strToCrypt) { } else result.append(strToCrypt.charAt(strToCrypt.length() - 1)); } - return result; + return result.toString(); } - public StringBuilder decrypt(StringBuilder strToDecrypt) { + public String decrypt(String strToDecrypt) { char currentChar = 0; @@ -55,6 +57,6 @@ public StringBuilder decrypt(StringBuilder strToDecrypt) { !(currentChar == (strToDecrypt.charAt(strToDecrypt.length() - 1)))) result.append(currentChar); } - return result; + return result.toString(); } } diff --git a/src/FileHandler.java b/src/FileHandler.java index 8e42dce..1adf182 100644 --- a/src/FileHandler.java +++ b/src/FileHandler.java @@ -6,7 +6,8 @@ public class FileHandler { String fileIn; String fileOut; - Cryptor cryptor; + CryptorViaString cryptorViaString; + CryptorViaStringBuilder cryptorViaStringBuilder; @@ -14,22 +15,12 @@ public class FileHandler { public FileHandler(String fileIn, String fileOut) { this.fileIn = fileIn; this.fileOut = fileOut; - cryptor = new Cryptor(); + cryptorViaString = new CryptorViaString(); + cryptorViaStringBuilder = new CryptorViaStringBuilder(); } - public void crypt() throws IOException { - String strToRead = readFromFile(fileIn); - String cryptedStringToWrite = cryptor.crypt(strToRead); - writeToFile(cryptedStringToWrite, fileOut); - } - - public void decrypt() throws IOException { - String strToRead = readFromFile(fileIn); - String decryptedStringToWrite = cryptor.decrypt(strToRead); - writeToFile(decryptedStringToWrite, fileOut); - } private void writeToFile (String strIn, String fileOut) { try (FileWriter writer = new FileWriter(fileOut)) { diff --git a/src/FileHandlerV2.java b/src/FileHandlerV2.java deleted file mode 100644 index 09bf3f2..0000000 --- a/src/FileHandlerV2.java +++ /dev/null @@ -1,66 +0,0 @@ -import java.io.BufferedReader; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; - -public class FileHandlerV2 { - - String fileIn; - String fileOut; - CryptorV2 cryptorV2; - - - public FileHandlerV2(String fileIn, String fileOut) { - this.fileIn = fileIn; - this.fileOut = fileOut; - cryptorV2 = new CryptorV2(); - - } - - public void cryptV2() throws IOException { - StringBuilder strToRead = readFromFile(fileIn); - StringBuilder cryptedStringToWrite = cryptorV2.crypt(strToRead); - writeToFile(cryptedStringToWrite, fileOut); - - } - - public void decryptV2() throws IOException { - StringBuilder strToRead = readFromFile(fileIn); - StringBuilder decryptedStringToWrite = cryptorV2.decrypt(strToRead); - writeToFile(decryptedStringToWrite, fileOut); - } - - private void writeToFile(StringBuilder strIn, String fileOut) { - try (FileWriter writer = new FileWriter(fileOut)) { - if (Files.exists(Path.of(fileOut))) { - writer.write(String.valueOf(strIn)); - writer.flush(); - } else { - Files.createFile(Path.of(fileOut)); - writer.write(String.valueOf(strIn)); - writer.flush(); - writer.close(); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - private StringBuilder readFromFile(String fileIn) throws IOException { - - BufferedReader reader = new BufferedReader(new FileReader(fileIn)); - String str = ""; - StringBuilder stringBuild = new StringBuilder(); - - try { -// while ((str = reader.readLine()) != null); - str = reader.readLine(); - stringBuild.append(str); - return stringBuild; - } finally { - reader.close(); - } - } -} diff --git a/src/TestClass.java b/src/TestClass.java new file mode 100644 index 0000000..e853d7c --- /dev/null +++ b/src/TestClass.java @@ -0,0 +1,27 @@ +import java.io.IOException; + +public class TestClass implements Crypt { + + public TestClass(CryptorViaString cryptorViaString, CryptorViaStringBuilder cryptorViaStringBuilder){ + + } + + public String crypt(String strToCrypt){ + long m = System.currentTimeMillis(); + String cryptedStringViaString = cryptorViaString.crypt(strToCrypt); + String cryptedStringViaStringBuilder = cryptorViaStringBuilder.crypt(strToCrypt); + double timeResult = (double)(System.currentTimeMillis() - m); + } + + public String decrypt(String strToDecrypt){ + String cryptedStringViaString = decrypt(strToDecrypt); + String cryptedStringViaStringBuilder = decrypt(strToDecrypt); + + } + + + } + + + +} diff --git a/src/main.java b/src/main.java index 8def5e6..769e0b1 100644 --- a/src/main.java +++ b/src/main.java @@ -5,27 +5,33 @@ public class main { public static void main(String[] args) throws IOException { // -// String filePathToCrypt = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file5.txt"; -// String filePathCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file2.txt"; -// String filePathToDeCrypt = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file2.txt"; -// String filePathDeCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\file4.txt"; - - String filePathToCrypt = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\filetoCrypt.txt"; - String filePathCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\filecryptResult.txt"; - String filePathToDeCrypt = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\filecryptResult.txt"; - String filePathDeCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\filedecryptResult.txt"; - - String filePathToCryptV2 = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\fileV2toCrypt.txt"; - String filePathCryptResultV2 = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\fileV2cryptResult.txt"; - String filePathToDeCryptV2 = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\fileV2cryptResult.txt"; - String filePathDeCryptResultV2 = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\fileV2decryptResult.txt"; - - FileHandler fileHandlerCrypt = new FileHandler(filePathToCrypt, filePathCryptResult); - FileHandler fileHandlerDecrypt = new FileHandler(filePathToDeCrypt, filePathDeCryptResult); +// String filePathToCrypt = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\file5.txt"; +// String filePathCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\file2.txt"; +// String filePathToDeCrypt = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\file2.txt"; +// String filePathDeCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\file4.txt"; + + String filePathToCrypt = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\filetoCrypt.txt"; + String filePathCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\filecryptResult.txt"; + String filePathToDeCrypt = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\filecryptResult.txt"; + String filePathDeCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\filedecryptResult.txt"; + + String filePathToCryptV2 = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\fileV2toCrypt.txt"; + String filePathCryptResultV2 = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\fileV2cryptResult.txt"; + String filePathToDeCryptV2 = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\fileV2cryptResult.txt"; + String filePathDeCryptResultV2 = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\fileV2decryptResult.txt"; + +// FileHandler fileHandlerCrypt = new FileHandler(filePathToCrypt, filePathCryptResult); +// FileHandler fileHandlerDecrypt = new FileHandler(filePathToDeCrypt, filePathDeCryptResult); + + CryptorViaString cryptorViaString = new CryptorViaString(); + CryptorViaStringBuilder cryptorViaStringBuilder = new CryptorViaStringBuilder(); + TestClass testClass = new TestClass(cryptorViaString, cryptorViaStringBuilder); + long m = System.currentTimeMillis(); - fileHandlerCrypt.crypt(); - fileHandlerDecrypt.decrypt(); +// fileHandlerCrypt.crypt(); +// fileHandlerDecrypt.decrypt(); + System.out.println("При использывании String программа выполняется: " + (double)(System.currentTimeMillis() - m) + " мс"); From 2585b138f647b5aa4c193ed25ecedc2f87597981 Mon Sep 17 00:00:00 2001 From: robotdorog Date: Mon, 13 Dec 2021 11:24:42 +0800 Subject: [PATCH 16/21] =?UTF-8?q?=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA?= =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Cryptor.java | 40 ++++++++++++++++++++++++++++++++ src/CryptorViaStringBuilder.java | 2 +- src/FileHandler.java | 18 +++----------- src/TestClass.java | 27 --------------------- src/main.java | 28 +--------------------- 5 files changed, 45 insertions(+), 70 deletions(-) create mode 100644 src/Cryptor.java delete mode 100644 src/TestClass.java diff --git a/src/Cryptor.java b/src/Cryptor.java new file mode 100644 index 0000000..39c10ce --- /dev/null +++ b/src/Cryptor.java @@ -0,0 +1,40 @@ +import java.io.IOException; + +public class Cryptor implements Crypt { + + CryptorViaString cryptorViaString; + CryptorViaStringBuilder cryptorViaStringBuilder; + + public Cryptor(CryptorViaString cryptorViaString, CryptorViaStringBuilder cryptorViaStringBuilder) { + this.cryptorViaString = cryptorViaString; + this.cryptorViaStringBuilder = cryptorViaStringBuilder; + + } + + public String crypt(String strToCrypt) { + long m = System.currentTimeMillis(); + String cryptedStringViaString = cryptorViaString.crypt(strToCrypt); + String cryptedStringViaStringBuilder = cryptorViaStringBuilder.crypt(strToCrypt); + double timeResult = (double) (System.currentTimeMillis() - m); + System.out.println("Время выполнения шифрования с ипсользованием StringBuilder: " + timeResult); + + return cryptedStringViaStringBuilder; + } + + public String decrypt(String strToDecrypt) { + long m = System.currentTimeMillis(); + String cryptedStringViaString = cryptorViaString.decrypt(strToDecrypt); + String cryptedStringViaStringBuilder = cryptorViaStringBuilder.decrypt(strToDecrypt); + double timeResult = (double) (System.currentTimeMillis() - m); + System.out.println("Время выполнения шифрования с ипсользованием StringBuilder: " + timeResult); + + return cryptedStringViaStringBuilder; + + } + + +} + + + + diff --git a/src/CryptorViaStringBuilder.java b/src/CryptorViaStringBuilder.java index b45c655..5567a49 100644 --- a/src/CryptorViaStringBuilder.java +++ b/src/CryptorViaStringBuilder.java @@ -1,4 +1,4 @@ -public class CryptorViaStringBuilder implements Crypt, Decrypt { +public class CryptorViaStringBuilder implements Crypt { StringBuilder result = new StringBuilder(); diff --git a/src/FileHandler.java b/src/FileHandler.java index 1adf182..7b01519 100644 --- a/src/FileHandler.java +++ b/src/FileHandler.java @@ -3,25 +3,13 @@ import java.nio.file.Path; public class FileHandler { + Cryptor cryptor; - String fileIn; - String fileOut; - CryptorViaString cryptorViaString; - CryptorViaStringBuilder cryptorViaStringBuilder; - - - - - public FileHandler(String fileIn, String fileOut) { - this.fileIn = fileIn; - this.fileOut = fileOut; - cryptorViaString = new CryptorViaString(); - cryptorViaStringBuilder = new CryptorViaStringBuilder(); + public FileHandler(Cryptor cryptor) { + this.cryptor = cryptor; } - - private void writeToFile (String strIn, String fileOut) { try (FileWriter writer = new FileWriter(fileOut)) { if (Files.exists(Path.of(fileOut))) { diff --git a/src/TestClass.java b/src/TestClass.java deleted file mode 100644 index e853d7c..0000000 --- a/src/TestClass.java +++ /dev/null @@ -1,27 +0,0 @@ -import java.io.IOException; - -public class TestClass implements Crypt { - - public TestClass(CryptorViaString cryptorViaString, CryptorViaStringBuilder cryptorViaStringBuilder){ - - } - - public String crypt(String strToCrypt){ - long m = System.currentTimeMillis(); - String cryptedStringViaString = cryptorViaString.crypt(strToCrypt); - String cryptedStringViaStringBuilder = cryptorViaStringBuilder.crypt(strToCrypt); - double timeResult = (double)(System.currentTimeMillis() - m); - } - - public String decrypt(String strToDecrypt){ - String cryptedStringViaString = decrypt(strToDecrypt); - String cryptedStringViaStringBuilder = decrypt(strToDecrypt); - - } - - - } - - - -} diff --git a/src/main.java b/src/main.java index 769e0b1..4aa5d96 100644 --- a/src/main.java +++ b/src/main.java @@ -4,11 +4,6 @@ public class main { public static void main(String[] args) throws IOException { -// -// String filePathToCrypt = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\file5.txt"; -// String filePathCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\file2.txt"; -// String filePathToDeCrypt = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\file2.txt"; -// String filePathDeCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\file4.txt"; String filePathToCrypt = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\filetoCrypt.txt"; String filePathCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\filecryptResult.txt"; @@ -20,30 +15,9 @@ public static void main(String[] args) throws IOException { String filePathToDeCryptV2 = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\fileV2cryptResult.txt"; String filePathDeCryptResultV2 = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\fileV2decryptResult.txt"; -// FileHandler fileHandlerCrypt = new FileHandler(filePathToCrypt, filePathCryptResult); -// FileHandler fileHandlerDecrypt = new FileHandler(filePathToDeCrypt, filePathDeCryptResult); + FileHandler fileHandlerCrypt = new FileHandler(Cryptor cryptor); - CryptorViaString cryptorViaString = new CryptorViaString(); - CryptorViaStringBuilder cryptorViaStringBuilder = new CryptorViaStringBuilder(); - TestClass testClass = new TestClass(cryptorViaString, cryptorViaStringBuilder); - long m = System.currentTimeMillis(); - -// fileHandlerCrypt.crypt(); -// fileHandlerDecrypt.decrypt(); - - - System.out.println("При использывании String программа выполняется: " + (double)(System.currentTimeMillis() - m) + " мс"); - - - FileHandlerV2 fileHandlerCryptV2 = new FileHandlerV2(filePathToCryptV2, filePathCryptResultV2); - FileHandlerV2 fileHandlerDecryptV2 = new FileHandlerV2(filePathToDeCryptV2, filePathDeCryptResultV2); - long mV2 = System.currentTimeMillis(); - - fileHandlerCryptV2.cryptV2(); - fileHandlerDecryptV2.decryptV2(); - - System.out.println("При использывании StringBuilder программа выполняется: " + (double)(System.currentTimeMillis() - mV2) + " мс"); } } From 786fb4d08ea849cfda867ecaa5b9a91d84df75ab Mon Sep 17 00:00:00 2001 From: robotdorog Date: Mon, 13 Dec 2021 11:42:49 +0800 Subject: [PATCH 17/21] =?UTF-8?q?=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA?= =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=202=20main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/FileHandler.java | 4 ++-- src/main.java | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/FileHandler.java b/src/FileHandler.java index 7b01519..7a2aaaa 100644 --- a/src/FileHandler.java +++ b/src/FileHandler.java @@ -10,7 +10,7 @@ public FileHandler(Cryptor cryptor) { } - private void writeToFile (String strIn, String fileOut) { + public void writeToFile (String strIn, String fileOut) { try (FileWriter writer = new FileWriter(fileOut)) { if (Files.exists(Path.of(fileOut))) { writer.write(strIn); @@ -26,7 +26,7 @@ private void writeToFile (String strIn, String fileOut) { } } - private String readFromFile (String fileIn) throws IOException { + public String readFromFile (String fileIn) throws IOException { BufferedReader reader; String str; reader = new BufferedReader(new FileReader(fileIn)); diff --git a/src/main.java b/src/main.java index 4aa5d96..cb1f7da 100644 --- a/src/main.java +++ b/src/main.java @@ -15,8 +15,16 @@ public static void main(String[] args) throws IOException { String filePathToDeCryptV2 = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\fileV2cryptResult.txt"; String filePathDeCryptResultV2 = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\fileV2decryptResult.txt"; + Cryptor cryptor = new Cryptor(); FileHandler fileHandlerCrypt = new FileHandler(Cryptor cryptor); + String cryptResult = fileHandlerCrypt.readFromFile(filePathToCrypt); + cryptResult = fileHandlerCrypt.cryptor.crypt(cryptResult); + fileHandlerCrypt.writeToFile(cryptResult, filePathCryptResult); + + String decryptResult = fileHandlerCrypt.readFromFile(filePathToCrypt); + decryptResult = fileHandlerCrypt.cryptor.decrypt(decryptResult); + fileHandlerCrypt.writeToFile(decryptResult, filePathCryptResult); } From 11af72e9f4f0c605efe2cfa22e475f65d9cfad14 Mon Sep 17 00:00:00 2001 From: robotdorog Date: Mon, 13 Dec 2021 11:50:23 +0800 Subject: [PATCH 18/21] =?UTF-8?q?=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA?= =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=203=20main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main.java b/src/main.java index cb1f7da..bdcd1eb 100644 --- a/src/main.java +++ b/src/main.java @@ -15,8 +15,10 @@ public static void main(String[] args) throws IOException { String filePathToDeCryptV2 = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\fileV2cryptResult.txt"; String filePathDeCryptResultV2 = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\fileV2decryptResult.txt"; - Cryptor cryptor = new Cryptor(); - FileHandler fileHandlerCrypt = new FileHandler(Cryptor cryptor); + CryptorViaString cryptorViaString = new CryptorViaString(); + CryptorViaStringBuilder cryptorViaStringBuilder = new CryptorViaStringBuilder(); + Cryptor cryptor = new Cryptor(cryptorViaString, cryptorViaStringBuilder); + FileHandler fileHandlerCrypt = new FileHandler(cryptor); String cryptResult = fileHandlerCrypt.readFromFile(filePathToCrypt); cryptResult = fileHandlerCrypt.cryptor.crypt(cryptResult); From 20302e27badc2c4363aa896a4969c8c274fd4ced Mon Sep 17 00:00:00 2001 From: robotdorog Date: Mon, 13 Dec 2021 12:02:15 +0800 Subject: [PATCH 19/21] =?UTF-8?q?=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA?= =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=204=20main.=20=D0=A3?= =?UTF-8?q?=D0=BA=D0=B0=D0=B7=D0=B0=D0=BB=20=D0=BA=D0=BE=D1=80=D1=80=D0=B5?= =?UTF-8?q?=D0=BA=D1=82=D0=BD=D1=8B=D0=B5=20=D0=BF=D1=83=D1=82=D0=B8=20?= =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D1=87=D1=82=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=BF=D0=B8=D1=81=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.java | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/main.java b/src/main.java index bdcd1eb..ab52b9c 100644 --- a/src/main.java +++ b/src/main.java @@ -5,28 +5,24 @@ public class main { public static void main(String[] args) throws IOException { - String filePathToCrypt = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\filetoCrypt.txt"; - String filePathCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\filecryptResult.txt"; - String filePathToDeCrypt = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\filecryptResult.txt"; - String filePathDeCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\filedecryptResult.txt"; + String filePathToCrypt = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\filetoCrypt.txt"; + + String filePathCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\filecryptResult.txt"; + String filePathDeCryptResult = "C:\\Users\\Usr1\\IdeaProjects\\Cryptor\\src\\tasks\\filedecryptResult.txt"; - String filePathToCryptV2 = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\fileV2toCrypt.txt"; - String filePathCryptResultV2 = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\fileV2cryptResult.txt"; - String filePathToDeCryptV2 = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\fileV2cryptResult.txt"; - String filePathDeCryptResultV2 = "C:\\Users\\Usr1\\IdeaProjects\\CryptorViaString\\src\\tasks\\fileV2decryptResult.txt"; CryptorViaString cryptorViaString = new CryptorViaString(); CryptorViaStringBuilder cryptorViaStringBuilder = new CryptorViaStringBuilder(); Cryptor cryptor = new Cryptor(cryptorViaString, cryptorViaStringBuilder); FileHandler fileHandlerCrypt = new FileHandler(cryptor); - String cryptResult = fileHandlerCrypt.readFromFile(filePathToCrypt); - cryptResult = fileHandlerCrypt.cryptor.crypt(cryptResult); + String cryptResult = fileHandlerCrypt.readFromFile(filePathToCrypt); + cryptResult = fileHandlerCrypt.cryptor.crypt(cryptResult); fileHandlerCrypt.writeToFile(cryptResult, filePathCryptResult); - String decryptResult = fileHandlerCrypt.readFromFile(filePathToCrypt); - decryptResult = fileHandlerCrypt.cryptor.decrypt(decryptResult); - fileHandlerCrypt.writeToFile(decryptResult, filePathCryptResult); + String decryptResult = fileHandlerCrypt.readFromFile(filePathToCrypt); + decryptResult = fileHandlerCrypt.cryptor.decrypt(decryptResult); + fileHandlerCrypt.writeToFile(decryptResult, filePathDeCryptResult); } From f29194e6b0203e5d9f2d4979db15ffcbae9e1c7a Mon Sep 17 00:00:00 2001 From: robotdorog Date: Mon, 13 Dec 2021 12:08:42 +0800 Subject: [PATCH 20/21] =?UTF-8?q?=D0=97=D0=B0=D0=BA=D0=BE=D0=BC=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D1=82=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=BE=20=D1=88?= =?UTF-8?q?=D0=B8=D1=84=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5/=D0=B4?= =?UTF-8?q?=D0=B5=D1=88=D0=B8=D1=84=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D1=81=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=D0=BC=20String?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Cryptor.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Cryptor.java b/src/Cryptor.java index 39c10ce..966978a 100644 --- a/src/Cryptor.java +++ b/src/Cryptor.java @@ -13,7 +13,7 @@ public Cryptor(CryptorViaString cryptorViaString, CryptorViaStringBuilder crypto public String crypt(String strToCrypt) { long m = System.currentTimeMillis(); - String cryptedStringViaString = cryptorViaString.crypt(strToCrypt); +// String cryptedStringViaString = cryptorViaString.crypt(strToCrypt); String cryptedStringViaStringBuilder = cryptorViaStringBuilder.crypt(strToCrypt); double timeResult = (double) (System.currentTimeMillis() - m); System.out.println("Время выполнения шифрования с ипсользованием StringBuilder: " + timeResult); @@ -22,10 +22,10 @@ public String crypt(String strToCrypt) { } public String decrypt(String strToDecrypt) { - long m = System.currentTimeMillis(); - String cryptedStringViaString = cryptorViaString.decrypt(strToDecrypt); + long t = System.currentTimeMillis(); +// String cryptedStringViaString = cryptorViaString.decrypt(strToDecrypt); String cryptedStringViaStringBuilder = cryptorViaStringBuilder.decrypt(strToDecrypt); - double timeResult = (double) (System.currentTimeMillis() - m); + double timeResult = (double) (System.currentTimeMillis() - t); System.out.println("Время выполнения шифрования с ипсользованием StringBuilder: " + timeResult); return cryptedStringViaStringBuilder; From 6595456dc90569553b5dbc14b79e170391ba3cb2 Mon Sep 17 00:00:00 2001 From: robotdorog Date: Mon, 13 Dec 2021 12:29:18 +0800 Subject: [PATCH 21/21] =?UTF-8?q?=D0=9E=D1=82=D0=BA=D0=BE=D1=80=D1=80?= =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D1=8B=20?= =?UTF-8?q?=D1=82=D0=B5=D1=81=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/CryptorTest.java | 10 ++++++---- src/CryptorViaString.java | 3 ++- src/CryptorViaStringBuilder.java | 2 ++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/CryptorTest.java b/src/CryptorTest.java index c2bc1cd..f9e3ada 100644 --- a/src/CryptorTest.java +++ b/src/CryptorTest.java @@ -6,7 +6,7 @@ public class CryptorTest { CryptorViaString cryptorViaString = new CryptorViaString(); CryptorViaStringBuilder cryptorViaStringBuilder = new CryptorViaStringBuilder(); StringBuilder testStringBuilder = new StringBuilder(); - StringBuilder resultSringBuilder = new StringBuilder(); + @Test public void cryptBasicTest() { @@ -25,7 +25,7 @@ public void decryptBasicTest() { @Test public void cryptOneCharTest() { String testString = "a"; - String resultString = cryptorViaString.decrypt("a"); + String resultString = cryptorViaString.crypt("a"); Assert.assertEquals(testString, resultString); } @@ -39,7 +39,7 @@ public void decryptOneCharTest() { @Test public void cryptEmptyStrTest() { String testString = ""; - String resultString = cryptorViaString.decrypt(""); + String resultString = cryptorViaString.crypt(""); Assert.assertEquals(testString, resultString); } @@ -67,7 +67,7 @@ public void decryptOneRepeatTest() { @Test public void cryptNoRepeatTest() { String testString = "abcdef"; - String resultString = cryptorViaString.decrypt("abcdef"); + String resultString = cryptorViaString.crypt("abcdef"); Assert.assertEquals(testString, resultString); } @@ -111,12 +111,14 @@ public void decryptV2OneCharTest() { @Test public void cryptV2EmptyStrTest() { + String testStringBuilder = ""; String resultSringBuilder = cryptorViaStringBuilder.crypt(""); Assert.assertEquals(testStringBuilder, resultSringBuilder); } @Test public void decryptV2EmptyStrTest() { + String testStringBuilder = ""; String resultSringBuilder = cryptorViaStringBuilder.decrypt(""); Assert.assertEquals(testStringBuilder, resultSringBuilder); } diff --git a/src/CryptorViaString.java b/src/CryptorViaString.java index 60ff8c4..3e92812 100644 --- a/src/CryptorViaString.java +++ b/src/CryptorViaString.java @@ -1,7 +1,7 @@ public class CryptorViaString implements Crypt { - + @Override public String crypt(String strToCrypt) { String result = ""; @@ -33,6 +33,7 @@ public String crypt(String strToCrypt) { return result; } + @Override public String decrypt(String strToDecrypt) { String result = ""; diff --git a/src/CryptorViaStringBuilder.java b/src/CryptorViaStringBuilder.java index 5567a49..c62c682 100644 --- a/src/CryptorViaStringBuilder.java +++ b/src/CryptorViaStringBuilder.java @@ -3,6 +3,7 @@ public class CryptorViaStringBuilder implements Crypt { StringBuilder result = new StringBuilder(); + @Override public String crypt(String strToCrypt) { if (strToCrypt != null && !strToCrypt.equals("")) { @@ -32,6 +33,7 @@ public String crypt(String strToCrypt) { return result.toString(); } + @Override public String decrypt(String strToDecrypt) {