From 1c9fe51a535b3598e0a63f359032fe14b03ebc9e Mon Sep 17 00:00:00 2001 From: Thomas Rubini <74205383+ThomasRubini@users.noreply.github.com> Date: Mon, 12 Dec 2022 16:54:32 +0100 Subject: [PATCH] Refactored project --- .../ArchDistribution.java} | 8 ++++---- .../fr/packageviewer/distribution/Distribution.java | 12 ++++++++++++ .../packageviewer/{ArchParser => pack}/Package.java | 2 +- .../{ArchParser => pack}/SearchedPackage.java | 2 +- 4 files changed, 18 insertions(+), 6 deletions(-) rename src/main/java/fr/packageviewer/{ArchParser/ArchParser.java => distribution/ArchDistribution.java} (97%) create mode 100644 src/main/java/fr/packageviewer/distribution/Distribution.java rename src/main/java/fr/packageviewer/{ArchParser => pack}/Package.java (93%) rename src/main/java/fr/packageviewer/{ArchParser => pack}/SearchedPackage.java (95%) diff --git a/src/main/java/fr/packageviewer/ArchParser/ArchParser.java b/src/main/java/fr/packageviewer/distribution/ArchDistribution.java similarity index 97% rename from src/main/java/fr/packageviewer/ArchParser/ArchParser.java rename to src/main/java/fr/packageviewer/distribution/ArchDistribution.java index 26262af..a6203b5 100644 --- a/src/main/java/fr/packageviewer/ArchParser/ArchParser.java +++ b/src/main/java/fr/packageviewer/distribution/ArchDistribution.java @@ -1,8 +1,7 @@ -package fr.packageviewer.ArchParser; +package fr.packageviewer.distribution; import java.io.IOException; import java.net.URI; -import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -10,13 +9,14 @@ import java.util.List; import java.net.http.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; -import java.util.logging.Level; import java.util.logging.Logger; import fr.packageviewer.LoggerManager; +import fr.packageviewer.pack.Package; +import fr.packageviewer.pack.SearchedPackage; import org.json.*; -public class ArchParser { +public class ArchDistribution implements Distribution { private static final Logger logger = LoggerManager.getLogger("ArchParser"); diff --git a/src/main/java/fr/packageviewer/distribution/Distribution.java b/src/main/java/fr/packageviewer/distribution/Distribution.java new file mode 100644 index 0000000..33d6d47 --- /dev/null +++ b/src/main/java/fr/packageviewer/distribution/Distribution.java @@ -0,0 +1,12 @@ +package fr.packageviewer.distribution; + +import fr.packageviewer.pack.Package; +import fr.packageviewer.pack.SearchedPackage; + +import java.util.List; +import java.util.concurrent.CompletableFuture; + +public interface Distribution { + List searchPackage(String packageName); + CompletableFuture getPackageTree(String packageName, int depth); +} diff --git a/src/main/java/fr/packageviewer/ArchParser/Package.java b/src/main/java/fr/packageviewer/pack/Package.java similarity index 93% rename from src/main/java/fr/packageviewer/ArchParser/Package.java rename to src/main/java/fr/packageviewer/pack/Package.java index b3deb96..cc0cf3a 100644 --- a/src/main/java/fr/packageviewer/ArchParser/Package.java +++ b/src/main/java/fr/packageviewer/pack/Package.java @@ -1,4 +1,4 @@ -package fr.packageviewer.ArchParser; +package fr.packageviewer.pack; import java.util.List; diff --git a/src/main/java/fr/packageviewer/ArchParser/SearchedPackage.java b/src/main/java/fr/packageviewer/pack/SearchedPackage.java similarity index 95% rename from src/main/java/fr/packageviewer/ArchParser/SearchedPackage.java rename to src/main/java/fr/packageviewer/pack/SearchedPackage.java index b02ba94..868801e 100644 --- a/src/main/java/fr/packageviewer/ArchParser/SearchedPackage.java +++ b/src/main/java/fr/packageviewer/pack/SearchedPackage.java @@ -1,4 +1,4 @@ -package fr.packageviewer.ArchParser; +package fr.packageviewer.pack; public class SearchedPackage { private final String name;