From 0db33b3e0d937ab618921fc235545baeabfe093d Mon Sep 17 00:00:00 2001
From: fabiovandewaeter <vandewaeter.fabio@gmail.com>
Date: Sun, 23 Mar 2025 12:40:15 +0100
Subject: [PATCH] refactoring

---
 src/main/java/fil/sr2/flopbox/FTPResource.java                | 3 +++
 src/main/java/fil/sr2/flopbox/FTPServerRepository.java        | 2 ++
 src/main/java/fil/sr2/flopbox/FTPService.java                 | 2 ++
 src/main/java/fil/sr2/flopbox/{ => utils}/AuthFilter.java     | 2 +-
 .../java/fil/sr2/flopbox/{ => utils}/FTPClientFactory.java    | 4 +++-
 src/main/java/fil/sr2/flopbox/{ => utils}/FTPException.java   | 2 +-
 .../java/fil/sr2/flopbox/{ => utils}/FTPServerConfig.java     | 2 +-
 7 files changed, 13 insertions(+), 4 deletions(-)
 rename src/main/java/fil/sr2/flopbox/{ => utils}/AuthFilter.java (98%)
 rename src/main/java/fil/sr2/flopbox/{ => utils}/FTPClientFactory.java (89%)
 rename src/main/java/fil/sr2/flopbox/{ => utils}/FTPException.java (84%)
 rename src/main/java/fil/sr2/flopbox/{ => utils}/FTPServerConfig.java (95%)

diff --git a/src/main/java/fil/sr2/flopbox/FTPResource.java b/src/main/java/fil/sr2/flopbox/FTPResource.java
index 480ac5f..2d857c3 100644
--- a/src/main/java/fil/sr2/flopbox/FTPResource.java
+++ b/src/main/java/fil/sr2/flopbox/FTPResource.java
@@ -10,6 +10,8 @@ import java.util.Map;
 import java.util.HashMap;
 import java.util.ArrayList;
 
+import fil.sr2.flopbox.utils.*;
+
 @Path("/ftps")
 public class FTPResource {
 
@@ -54,6 +56,7 @@ public class FTPResource {
             @PathParam("path") String searchTerm,
             @HeaderParam("X-FTP-User") String user,
             @HeaderParam("X-FTP-Pass") String pass) {
+
         System.out.println("searchFiles()");
         List<FTPServerConfig> servers = FTPServerRepository.getInstance().getAllServers();
         Map<String, List<String>> results = new HashMap<>();
diff --git a/src/main/java/fil/sr2/flopbox/FTPServerRepository.java b/src/main/java/fil/sr2/flopbox/FTPServerRepository.java
index afe3c06..73cd3b8 100644
--- a/src/main/java/fil/sr2/flopbox/FTPServerRepository.java
+++ b/src/main/java/fil/sr2/flopbox/FTPServerRepository.java
@@ -2,6 +2,8 @@ package fil.sr2.flopbox;
 
 import java.util.*;
 
+import fil.sr2.flopbox.utils.*;
+
 public class FTPServerRepository {
     private static FTPServerRepository instance = new FTPServerRepository();
     private Map<String, FTPServerConfig> serverMap = new HashMap<>();
diff --git a/src/main/java/fil/sr2/flopbox/FTPService.java b/src/main/java/fil/sr2/flopbox/FTPService.java
index fa337b7..82e6cf0 100644
--- a/src/main/java/fil/sr2/flopbox/FTPService.java
+++ b/src/main/java/fil/sr2/flopbox/FTPService.java
@@ -15,6 +15,8 @@ import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.io.ByteArrayInputStream;
 
+import fil.sr2.flopbox.utils.*;
+
 public class FTPService {
 
     public FtpNode getResourceTree(String alias, String path, String user, String pass)
diff --git a/src/main/java/fil/sr2/flopbox/AuthFilter.java b/src/main/java/fil/sr2/flopbox/utils/AuthFilter.java
similarity index 98%
rename from src/main/java/fil/sr2/flopbox/AuthFilter.java
rename to src/main/java/fil/sr2/flopbox/utils/AuthFilter.java
index 9582c95..2d28ee5 100644
--- a/src/main/java/fil/sr2/flopbox/AuthFilter.java
+++ b/src/main/java/fil/sr2/flopbox/utils/AuthFilter.java
@@ -1,4 +1,4 @@
-package fil.sr2.flopbox;
+package fil.sr2.flopbox.utils;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/src/main/java/fil/sr2/flopbox/FTPClientFactory.java b/src/main/java/fil/sr2/flopbox/utils/FTPClientFactory.java
similarity index 89%
rename from src/main/java/fil/sr2/flopbox/FTPClientFactory.java
rename to src/main/java/fil/sr2/flopbox/utils/FTPClientFactory.java
index f9c0b92..232fbbf 100644
--- a/src/main/java/fil/sr2/flopbox/FTPClientFactory.java
+++ b/src/main/java/fil/sr2/flopbox/utils/FTPClientFactory.java
@@ -1,8 +1,10 @@
-package fil.sr2.flopbox;
+package fil.sr2.flopbox.utils;
 
 import org.apache.commons.net.ftp.FTPClient;
 import java.io.IOException;
 
+import fil.sr2.flopbox.FTPServerRepository;
+
 public class FTPClientFactory {
 
     public static FTPClient createClient(String alias) throws FTPException {
diff --git a/src/main/java/fil/sr2/flopbox/FTPException.java b/src/main/java/fil/sr2/flopbox/utils/FTPException.java
similarity index 84%
rename from src/main/java/fil/sr2/flopbox/FTPException.java
rename to src/main/java/fil/sr2/flopbox/utils/FTPException.java
index 42e6f38..de05f07 100644
--- a/src/main/java/fil/sr2/flopbox/FTPException.java
+++ b/src/main/java/fil/sr2/flopbox/utils/FTPException.java
@@ -1,4 +1,4 @@
-package fil.sr2.flopbox;
+package fil.sr2.flopbox.utils;
 
 public class FTPException extends Exception {
     private final int status;
diff --git a/src/main/java/fil/sr2/flopbox/FTPServerConfig.java b/src/main/java/fil/sr2/flopbox/utils/FTPServerConfig.java
similarity index 95%
rename from src/main/java/fil/sr2/flopbox/FTPServerConfig.java
rename to src/main/java/fil/sr2/flopbox/utils/FTPServerConfig.java
index 5a1ea89..7e95f47 100644
--- a/src/main/java/fil/sr2/flopbox/FTPServerConfig.java
+++ b/src/main/java/fil/sr2/flopbox/utils/FTPServerConfig.java
@@ -1,4 +1,4 @@
-package fil.sr2.flopbox;
+package fil.sr2.flopbox.utils;
 
 public class FTPServerConfig {
     private String alias;
-- 
GitLab