Move a number of internal use plugin classes into the services package

Col-E · Oct 14, 2024 · d5898f5 · d5898f5
1 parent 50bd056
commit d5898f5
Show file tree

Hide file tree

Showing 19 changed files with 24 additions and 29 deletions.
diff --git a/...ley/recaf/plugin/AllocationException.java → .../services/plugin/AllocationException.java b/...ley/recaf/plugin/AllocationException.java → .../services/plugin/AllocationException.java
@@ -1,4 +1,4 @@
-package software.coley.recaf.plugin;
+package software.coley.recaf.services.plugin;
 
 import jakarta.annotation.Nonnull;
 

diff --git a/recaf-core/src/main/java/software/coley/recaf/services/plugin/CdiClassAllocator.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/CdiClassAllocator.java
@@ -5,8 +5,6 @@
 import jakarta.enterprise.context.spi.CreationalContext;
 import jakarta.enterprise.inject.spi.*;
 import jakarta.inject.Inject;
-import software.coley.recaf.plugin.AllocationException;
-import software.coley.recaf.plugin.ClassAllocator;
 
 import java.util.IdentityHashMap;
 import java.util.Map;

diff --git a/...re/coley/recaf/plugin/ClassAllocator.java → ...recaf/services/plugin/ClassAllocator.java b/...re/coley/recaf/plugin/ClassAllocator.java → ...recaf/services/plugin/ClassAllocator.java
@@ -1,4 +1,4 @@
-package software.coley.recaf.plugin;
+package software.coley.recaf.services.plugin;
 
 import jakarta.annotation.Nonnull;
 

diff --git a/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginClassLoaderImpl.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginClassLoaderImpl.java
@@ -2,7 +2,6 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
-import software.coley.recaf.plugin.PluginSource;
 import software.coley.recaf.util.io.ByteSource;
 
 import java.io.IOException;

diff --git a/...e/coley/recaf/plugin/PluginContainer.java → ...ecaf/services/plugin/PluginContainer.java b/...e/coley/recaf/plugin/PluginContainer.java → ...ecaf/services/plugin/PluginContainer.java
@@ -1,6 +1,7 @@
-package software.coley.recaf.plugin;
+package software.coley.recaf.services.plugin;
 
 import jakarta.annotation.Nonnull;
+import software.coley.recaf.plugin.Plugin;
 
 /**
  * Object that holds reference to a plugin and it's information.

diff --git a/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginContainerImpl.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginContainerImpl.java
@@ -2,8 +2,6 @@
 
 import jakarta.annotation.Nonnull;
 import software.coley.recaf.plugin.Plugin;
-import software.coley.recaf.plugin.PluginContainer;
-import software.coley.recaf.plugin.PluginInfo;
 
 /**
  * Plugin container implementation.

diff --git a/...e/coley/recaf/plugin/PluginException.java → ...ecaf/services/plugin/PluginException.java b/...e/coley/recaf/plugin/PluginException.java → ...ecaf/services/plugin/PluginException.java
@@ -1,4 +1,4 @@
-package software.coley.recaf.plugin;
+package software.coley.recaf.services.plugin;
 
 /**
  * Exception thrown when action involving plugins fail.

diff --git a/...ftware/coley/recaf/plugin/PluginInfo.java → ...ley/recaf/services/plugin/PluginInfo.java b/...ftware/coley/recaf/plugin/PluginInfo.java → ...ley/recaf/services/plugin/PluginInfo.java
@@ -1,6 +1,8 @@
-package software.coley.recaf.plugin;
+package software.coley.recaf.services.plugin;
 
 import jakarta.annotation.Nonnull;
+import software.coley.recaf.plugin.Plugin;
+import software.coley.recaf.plugin.PluginInformation;
 
 import java.util.Set;
 

diff --git a/...ware/coley/recaf/plugin/PluginLoader.java → ...y/recaf/services/plugin/PluginLoader.java b/...ware/coley/recaf/plugin/PluginLoader.java → ...y/recaf/services/plugin/PluginLoader.java
@@ -1,13 +1,13 @@
-package software.coley.recaf.plugin;
+package software.coley.recaf.services.plugin;
 
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+import software.coley.recaf.services.plugin.PluginException;
 import software.coley.recaf.services.plugin.PreparedPlugin;
 import software.coley.recaf.util.io.ByteSource;
 
 /**
- * The plugin loader.
- * This interface is responsible for loading plugins from different sources.
+ * The plugin loader is responsible for loading plugins from different sources.
  *
  * @author xDark
  */

diff --git a/...ware/coley/recaf/plugin/PluginSource.java → ...y/recaf/services/plugin/PluginSource.java b/...ware/coley/recaf/plugin/PluginSource.java → ...y/recaf/services/plugin/PluginSource.java
@@ -1,4 +1,4 @@
-package software.coley.recaf.plugin;
+package software.coley.recaf.services.plugin;
 
 import jakarta.annotation.Nullable;
 import software.coley.recaf.util.io.ByteSource;

diff --git a/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginUnloader.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PluginUnloader.java
@@ -1,8 +1,6 @@
 package software.coley.recaf.services.plugin;
 
 import jakarta.annotation.Nonnull;
-import software.coley.recaf.plugin.PluginException;
-import software.coley.recaf.plugin.PluginInfo;
 
 import java.util.stream.Stream;
 

diff --git a/recaf-core/src/main/java/software/coley/recaf/services/plugin/PreparedPlugin.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/PreparedPlugin.java
@@ -1,10 +1,6 @@
 package software.coley.recaf.services.plugin;
 
 import jakarta.annotation.Nonnull;
-import software.coley.recaf.plugin.PluginContainer;
-import software.coley.recaf.plugin.PluginException;
-import software.coley.recaf.plugin.PluginInfo;
-import software.coley.recaf.plugin.PluginSource;
 import software.coley.recaf.services.plugin.discovery.DiscoveredPluginSource;
 import software.coley.recaf.services.plugin.discovery.PluginDiscoverer;
 

diff --git a/...c/main/java/software/coley/recaf/services/plugin/discovery/DirectoryPluginDiscoverer.java b/...c/main/java/software/coley/recaf/services/plugin/discovery/DirectoryPluginDiscoverer.java
@@ -1,7 +1,7 @@
 package software.coley.recaf.services.plugin.discovery;
 
 import jakarta.annotation.Nonnull;
-import software.coley.recaf.plugin.PluginException;
+import software.coley.recaf.services.plugin.PluginException;
 
 import java.io.IOException;
 import java.nio.file.Files;

diff --git a/...re/src/main/java/software/coley/recaf/services/plugin/discovery/PathPluginDiscoverer.java b/...re/src/main/java/software/coley/recaf/services/plugin/discovery/PathPluginDiscoverer.java
@@ -1,7 +1,7 @@
 package software.coley.recaf.services.plugin.discovery;
 
 import jakarta.annotation.Nonnull;
-import software.coley.recaf.plugin.PluginException;
+import software.coley.recaf.services.plugin.PluginException;
 import software.coley.recaf.util.io.ByteSources;
 
 import java.nio.file.Path;

diff --git a/...f-core/src/main/java/software/coley/recaf/services/plugin/discovery/PluginDiscoverer.java b/...f-core/src/main/java/software/coley/recaf/services/plugin/discovery/PluginDiscoverer.java
@@ -1,7 +1,7 @@
 package software.coley.recaf.services.plugin.discovery;
 
 import jakarta.annotation.Nonnull;
-import software.coley.recaf.plugin.PluginException;
+import software.coley.recaf.services.plugin.PluginException;
 
 import java.util.List;
 

diff --git a/recaf-core/src/main/java/software/coley/recaf/services/plugin/zip/ZipPluginLoader.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/zip/ZipPluginLoader.java
@@ -16,6 +16,9 @@
 import software.coley.lljzip.ZipIO;
 import software.coley.lljzip.format.model.ZipArchive;
 import software.coley.recaf.plugin.*;
+import software.coley.recaf.services.plugin.PluginException;
+import software.coley.recaf.services.plugin.PluginInfo;
+import software.coley.recaf.services.plugin.PluginLoader;
 import software.coley.recaf.services.plugin.PreparedPlugin;
 import software.coley.recaf.util.IOUtil;
 import software.coley.recaf.util.io.ByteSource;

diff --git a/recaf-core/src/main/java/software/coley/recaf/services/plugin/zip/ZipPreparedPlugin.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/zip/ZipPreparedPlugin.java
@@ -1,9 +1,9 @@
 package software.coley.recaf.services.plugin.zip;
 
 import jakarta.annotation.Nonnull;
-import software.coley.recaf.plugin.PluginException;
-import software.coley.recaf.plugin.PluginInfo;
-import software.coley.recaf.plugin.PluginSource;
+import software.coley.recaf.services.plugin.PluginException;
+import software.coley.recaf.services.plugin.PluginInfo;
+import software.coley.recaf.services.plugin.PluginSource;
 import software.coley.recaf.services.plugin.PreparedPlugin;
 
 import java.io.IOException;

diff --git a/recaf-core/src/main/java/software/coley/recaf/services/plugin/zip/ZipSource.java b/recaf-core/src/main/java/software/coley/recaf/services/plugin/zip/ZipSource.java
@@ -2,7 +2,7 @@
 
 import jakarta.annotation.Nonnull;
 import software.coley.lljzip.format.model.LocalFileHeader;
-import software.coley.recaf.plugin.PluginSource;
+import software.coley.recaf.services.plugin.PluginSource;
 import software.coley.recaf.util.io.ByteSource;
 import software.coley.recaf.util.io.LocalFileHeaderSource;
 

diff --git a/recaf-ui/src/main/java/software/coley/recaf/Main.java b/recaf-ui/src/main/java/software/coley/recaf/Main.java
@@ -11,8 +11,8 @@
 import software.coley.recaf.launch.LaunchArguments;
 import software.coley.recaf.launch.LaunchCommand;
 import software.coley.recaf.launch.LaunchHandler;
-import software.coley.recaf.plugin.PluginContainer;
-import software.coley.recaf.plugin.PluginException;
+import software.coley.recaf.services.plugin.PluginContainer;
+import software.coley.recaf.services.plugin.PluginException;
 import software.coley.recaf.services.file.RecafDirectoriesConfig;
 import software.coley.recaf.services.plugin.PluginManager;
 import software.coley.recaf.services.plugin.discovery.DirectoryPluginDiscoverer;