refactor project

Author: GreenBloodDev

src/main/java/pl/nightdev701/OpenAPI.java

@@ -11,15 +11,17 @@
 */
 
 import pl.nightdev701.base.BaseKey;
-import pl.nightdev701.crypto.CryptoManager;
 import pl.nightdev701.database.DatabaseConnector;
 import pl.nightdev701.database.formular.DatabaseFormular;
 import pl.nightdev701.database.type.DatabaseType;
 import pl.nightdev701.key.UniqueValueKey;
 import pl.nightdev701.key.ValueKey;
 import pl.nightdev701.logger.AbstractLogger;
+import pl.nightdev701.logger.standard.DefaultLogger;
+import pl.nightdev701.manager.CryptManager;
 import pl.nightdev701.network.http.HttpRequestHandler;
 import pl.nightdev701.network.tcp.ProxyAdapter;
+import pl.nightdev701.util.crypto.CryptType;
 import pl.nightdev701.util.stream.OpenPrintStream;
 
 import java.io.FileNotFoundException;
@@ -34,20 +36,43 @@ public class OpenAPI {
     /**
      * encrypt and decrypt strings
      *
-     * @param value
+     * @param key
+     * @param type
      */
-    public static CryptoManager getCryptoManager(String value) {
-        return new CryptoManager(value);
+    public static CryptManager getCryptManager(String key, CryptType type) {
+        return getCryptManager(key, type, new DefaultLogger());
     }
 
     /**
-     * encrypt and decrypt strings with logger implementation
+     * encrypt and decrypt strings
      *
+     * @param key
+     * @param type
      * @param logger
-     * @param value
      */
-    public static CryptoManager getCryptoManager(String value, AbstractLogger logger) {
-        return new CryptoManager(value, logger);
+    public static CryptManager getCryptManager(String key, CryptType type, AbstractLogger logger) {
+        return new CryptManager(key, type, logger);
+    }
+
+    /**
+     * manage database connections and command easy
+     *
+     * @param formular
+     * @param type
+     */
+    public static DatabaseConnector getDatabaseManager(DatabaseFormular formular, DatabaseType type, int port) {
+        return getDatabaseManager(formular, type, port, new DefaultLogger());
+    }
+
+    /**
+     * manage database connections and command easy with logger implementation
+     *
+     * @param logger
+     * @param formular
+     * @param type
+     */
+    public static DatabaseConnector getDatabaseManager(DatabaseFormular formular, DatabaseType type, int port, AbstractLogger logger) {
+        return new DatabaseConnector(formular, type, port, logger);
     }
 
     /**
@@ -57,7 +82,7 @@ public static CryptoManager getCryptoManager(String value, AbstractLogger logger
      * @param type
      */
     public static DatabaseConnector getDatabaseManager(DatabaseFormular formular, DatabaseType type) {
-        return new DatabaseConnector(formular, type);
+        return getDatabaseManager(formular, type, new DefaultLogger());
     }
 
     /**
@@ -79,7 +104,7 @@ public static DatabaseConnector getDatabaseManager(DatabaseFormular formular, Da
      * @param remotePort
      */
     public static ProxyAdapter getProxy(int localPort, String remoteHost, int remotePort) {
-        return new ProxyAdapter(localPort, remoteHost, remotePort);
+        return getProxy(localPort, remoteHost, remotePort, new DefaultLogger());
     }
 
     /**
@@ -100,7 +125,7 @@ public static ProxyAdapter getProxy(int localPort, String remoteHost, int remote
      * @param url
      */
     public static HttpRequestHandler getRequestHandler(String url) {
-        return new HttpRequestHandler(url);
+        return getRequestHandler(url, new DefaultLogger());
     }
 
     /**
@@ -135,7 +160,7 @@ public static BaseKey getValueKey(UUID value) {
      * manipulate System.out
      */
     public static OpenPrintStream getPrintStream() throws FileNotFoundException {
-        return new OpenPrintStream();
+        return getPrintStream(new DefaultLogger());
     }
 
     /**

src/main/java/pl/nightdev701/crypto/BlowFishCrypto.java

@@ -0,0 +1,52 @@
+package pl.nightdev701.crypto;
+
+import pl.nightdev701.logger.AbstractLogger;
+import pl.nightdev701.logger.standard.DefaultLogger;
+import pl.nightdev701.util.crypto.CryptoForm;
+
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.logging.Level;
+
+public class BlowFishCrypto implements CryptoForm {
+
+    private final String encryptionKey;
+    private final AbstractLogger logger;
+
+    public BlowFishCrypto(String encryptionKey) {
+        this(encryptionKey, new DefaultLogger());
+    }
+
+    public BlowFishCrypto(String encryptionKey, AbstractLogger logger) {
+        this.encryptionKey = encryptionKey;
+        this.logger = logger;
+    }
+
+    @Override
+    public String encrypt(String plainText) throws Exception {
+        Cipher cipher = Cipher.getInstance("Blowfish");
+        SecretKey secretKey = new SecretKeySpec(encryptionKey.getBytes(StandardCharsets.UTF_8), "Blowfish");
+        cipher.init(Cipher.ENCRYPT_MODE, secretKey);
+
+        logger.log(Level.INFO, "String encrypted");
+
+        return Base64.getEncoder().encodeToString(cipher.doFinal(plainText.getBytes(StandardCharsets.UTF_8)));
+    }
+
+    @Override
+    public String decrypt(String encryptedText) throws Exception {
+        Cipher cipher = Cipher.getInstance("Blowfish");
+        SecretKey secretKey = new SecretKeySpec(encryptionKey.getBytes(StandardCharsets.UTF_8), "Blowfish");
+        cipher.init(Cipher.DECRYPT_MODE, secretKey);
+        byte[] encryptedBytes = Base64.getDecoder().decode(encryptedText);
+        byte[] decryptedBytes = cipher.doFinal(encryptedBytes);
+
+        logger.log(Level.INFO, "String decrypted");
+
+        return new String(decryptedBytes, StandardCharsets.UTF_8);
+    }
+
+}

src/main/java/pl/nightdev701/crypto/CryptoManager.java src/main/java/pl/nightdev701/crypto/CryptoAes.java

@@ -12,30 +12,32 @@
 
 import pl.nightdev701.logger.AbstractLogger;
 import pl.nightdev701.logger.standard.DefaultLogger;
+import pl.nightdev701.util.crypto.CryptoForm;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.SecretKeySpec;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.logging.Level;
 
-public class CryptoManager {
+public class CryptoAes implements CryptoForm {
 
     private final String encryptionKey;
     private final AbstractLogger logger;
 
-    public CryptoManager(String encryptionKey) {
+    public CryptoAes(String encryptionKey) {
         this(encryptionKey, new DefaultLogger());
     }
 
-    public CryptoManager(String encryptionKey, AbstractLogger logger) {
+    public CryptoAes(String encryptionKey, AbstractLogger logger) {
         this.encryptionKey = encryptionKey;
         this.logger = logger;
     }
 
     /**
      * encrypt data
      */
+    @Override
     public String encrypt(String plainText) throws Exception {
         SecretKeySpec secretKey = new SecretKeySpec(this.encryptionKey.getBytes(StandardCharsets.UTF_8), "AES");
         Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
@@ -50,6 +52,7 @@ public String encrypt(String plainText) throws Exception {
     /**
      * decrypt data
      */
+    @Override
     public String decrypt(String encryptedText) throws Exception {
         SecretKeySpec secretKey = new SecretKeySpec(this.encryptionKey.getBytes(StandardCharsets.UTF_8), "AES");
         Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");

src/main/java/pl/nightdev701/database/DatabaseConnector.java

@@ -17,7 +17,6 @@
 import pl.nightdev701.database.formular.DatabaseFormular;
 import pl.nightdev701.database.type.DatabaseType;
 import pl.nightdev701.logger.AbstractLogger;
-import pl.nightdev701.logger.standard.DefaultLogger;
 
 import java.sql.SQLException;
 import java.util.logging.Level;
@@ -31,27 +30,6 @@ public class DatabaseConnector {
     private final String connectionURL;
     private JdbcPooledConnectionSource connectionSource;
 
-    /**
-     * Creates a new instance of the DatabaseConnector
-     *
-     * @param formular
-     * @param databaseType
-     */
-    public DatabaseConnector(DatabaseFormular formular, DatabaseType databaseType) {
-        this(formular, databaseType, new DefaultLogger());
-    }
-
-    /**
-     * Creates a new instance of the DatabaseConnector with a custom port
-     *
-     * @param formular
-     * @param databaseType
-     * @param port
-     */
-    public DatabaseConnector(DatabaseFormular formular, DatabaseType databaseType, int port) {
-        this(formular, databaseType, port, new DefaultLogger());
-    }
-
     /**
      * Creates a new instance of the DatabaseConnector with a custom logger
      *
@@ -135,6 +113,7 @@ public <T> int createTableIfNotExists(Class<T> dataClass) throws SQLException {
 
     /**
      * get connection
+     *
      * @return connectionSource
      */
     public JdbcPooledConnectionSource getConnectionSource() {

src/main/java/pl/nightdev701/manager/CryptManager.java

@@ -0,0 +1,41 @@
+package pl.nightdev701.manager;
+
+import pl.nightdev701.crypto.BlowFishCrypto;
+import pl.nightdev701.crypto.CryptoAes;
+import pl.nightdev701.logger.AbstractLogger;
+import pl.nightdev701.util.crypto.CryptType;
+import pl.nightdev701.util.crypto.CryptoForm;
+
+public class CryptManager {
+
+    private CryptoForm crypt;
+
+    public CryptManager(String key, CryptType type, AbstractLogger logger) {
+        if (type == CryptType.AES) {
+            this.crypt = new CryptoAes(key);
+        }
+        if (type == CryptType.BLOWFISH) {
+            this.crypt = new BlowFishCrypto(key);
+        }
+    }
+
+    public String encrypt(String text) {
+        try {
+            return getCrypt().encrypt(text);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public String decrypt(String text) {
+        try {
+            return getCrypt().decrypt(text);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public CryptoForm getCrypt() {
+        return crypt;
+    }
+}

src/main/java/pl/nightdev701/network/http/HttpRequestHandler.java

@@ -1,7 +1,6 @@
 package pl.nightdev701.network.http;
 
 import pl.nightdev701.logger.AbstractLogger;
-import pl.nightdev701.logger.standard.DefaultLogger;
 
 import java.io.*;
 import java.net.MalformedURLException;
@@ -20,10 +19,6 @@ public class HttpRequestHandler {
     private final AbstractLogger logger;
     private String body;
 
-    public HttpRequestHandler(String url) {
-        this(url, new DefaultLogger());
-    }
-
     public HttpRequestHandler(String url, AbstractLogger logger) {
         this.url = url;
         this.logger = logger;

src/main/java/pl/nightdev701/network/tcp/ProxyAdapter.java

@@ -1,7 +1,6 @@
 package pl.nightdev701.network.tcp;
 
 import pl.nightdev701.logger.AbstractLogger;
-import pl.nightdev701.logger.standard.DefaultLogger;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -17,10 +16,6 @@ public class ProxyAdapter {
     String remoteHost;
     int remotePort;
 
-    public ProxyAdapter(int localPort, String remoteHost, int remotePort) {
-        this(localPort, remoteHost, remotePort, new DefaultLogger());
-    }
-
     public ProxyAdapter(int localPort, String remoteHost, int remotePort, AbstractLogger logger) {
         this.localPort = localPort;
         this.remoteHost = remoteHost;

src/main/java/pl/nightdev701/util/crypto/CryptType.java

@@ -0,0 +1,8 @@
+package pl.nightdev701.util.crypto;
+
+public enum CryptType {
+
+    AES,
+    BLOWFISH,
+
+}

src/main/java/pl/nightdev701/util/crypto/CryptoForm.java

@@ -0,0 +1,9 @@
+package pl.nightdev701.util.crypto;
+
+public interface CryptoForm {
+
+    String encrypt(String plainText) throws Exception;
+
+    String decrypt(String encryptedText) throws Exception;
+
+}

src/main/java/pl/nightdev701/util/stream/OpenPrintStream.java

@@ -1,7 +1,6 @@
 package pl.nightdev701.util.stream;
 
 import pl.nightdev701.logger.AbstractLogger;
-import pl.nightdev701.logger.standard.DefaultLogger;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -16,11 +15,6 @@ private OpenPrintStream(String fileName) throws FileNotFoundException {
         super(fileName);
     }
 
-    public OpenPrintStream() throws FileNotFoundException {
-        super("alternative_log.txt");
-        this.logger = new DefaultLogger();
-    }
-
     public OpenPrintStream(AbstractLogger logger) throws FileNotFoundException {
         super("alternative_log.txt");
         this.logger = logger;