From e55dde09fdef78dbcc4da9bd5dacb191d5bc0a18 Mon Sep 17 00:00:00 2001 From: LamGC Date: Tue, 5 Oct 2021 15:37:13 +0800 Subject: [PATCH] =?UTF-8?q?refactor(oci):=20=E8=B0=83=E6=95=B4=20ComputeIn?= =?UTF-8?q?stanceManager=20=E7=9A=84=E5=8C=85=E4=BD=8D=E7=BD=AE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 调整包位置以更好的区分功能部分. --- .../java/net/lamgc/oracle/sentry/ApplicationInitiation.java | 1 + .../net/lamgc/oracle/sentry/oci/compute/ComputeInstance.java | 1 - .../sentry/{ => oci/compute}/ComputeInstanceManager.java | 3 +-- .../oracle/sentry/oci/compute/ssh/SshAuthIdentityProvider.java | 2 +- .../java/net/lamgc/oracle/sentry/script/ScriptComponents.java | 2 +- .../script/groovy/trigger/InstanceStateWatchTrigger.java | 2 +- .../java/net/lamgc/oracle/sentry/script/ScriptManagerTest.java | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) rename src/main/java/net/lamgc/oracle/sentry/{ => oci/compute}/ComputeInstanceManager.java (98%) diff --git a/src/main/java/net/lamgc/oracle/sentry/ApplicationInitiation.java b/src/main/java/net/lamgc/oracle/sentry/ApplicationInitiation.java index 913a130..ef55e93 100644 --- a/src/main/java/net/lamgc/oracle/sentry/ApplicationInitiation.java +++ b/src/main/java/net/lamgc/oracle/sentry/ApplicationInitiation.java @@ -3,6 +3,7 @@ package net.lamgc.oracle.sentry; import com.google.common.base.Throwables; import net.lamgc.oracle.sentry.oci.account.OracleAccount; import net.lamgc.oracle.sentry.oci.account.OracleAccountManager; +import net.lamgc.oracle.sentry.oci.compute.ComputeInstanceManager; import net.lamgc.oracle.sentry.script.ScriptComponents; import net.lamgc.oracle.sentry.script.ScriptLoggerFactory; import net.lamgc.oracle.sentry.script.ScriptManager; diff --git a/src/main/java/net/lamgc/oracle/sentry/oci/compute/ComputeInstance.java b/src/main/java/net/lamgc/oracle/sentry/oci/compute/ComputeInstance.java index d2b6181..2d2571c 100644 --- a/src/main/java/net/lamgc/oracle/sentry/oci/compute/ComputeInstance.java +++ b/src/main/java/net/lamgc/oracle/sentry/oci/compute/ComputeInstance.java @@ -8,7 +8,6 @@ import com.oracle.bmc.core.requests.InstanceActionRequest; import com.oracle.bmc.core.responses.GetImageResponse; import com.oracle.bmc.core.responses.GetInstanceResponse; import com.oracle.bmc.core.responses.InstanceActionResponse; -import net.lamgc.oracle.sentry.ComputeInstanceManager; import net.lamgc.oracle.sentry.oci.account.OracleAccount; import net.lamgc.oracle.sentry.oci.compute.ssh.InstanceSsh; import net.lamgc.oracle.sentry.oci.compute.ssh.SshAuthInfo; diff --git a/src/main/java/net/lamgc/oracle/sentry/ComputeInstanceManager.java b/src/main/java/net/lamgc/oracle/sentry/oci/compute/ComputeInstanceManager.java similarity index 98% rename from src/main/java/net/lamgc/oracle/sentry/ComputeInstanceManager.java rename to src/main/java/net/lamgc/oracle/sentry/oci/compute/ComputeInstanceManager.java index 58437f3..a9f7609 100644 --- a/src/main/java/net/lamgc/oracle/sentry/ComputeInstanceManager.java +++ b/src/main/java/net/lamgc/oracle/sentry/oci/compute/ComputeInstanceManager.java @@ -1,4 +1,4 @@ -package net.lamgc.oracle.sentry; +package net.lamgc.oracle.sentry.oci.compute; import com.oracle.bmc.core.model.Instance; import com.oracle.bmc.core.requests.ListInstancesRequest; @@ -7,7 +7,6 @@ import com.oracle.bmc.identity.model.Compartment; import com.oracle.bmc.identity.requests.ListCompartmentsRequest; import com.oracle.bmc.identity.responses.ListCompartmentsResponse; import net.lamgc.oracle.sentry.oci.account.OracleAccount; -import net.lamgc.oracle.sentry.oci.compute.ComputeInstance; import net.lamgc.oracle.sentry.oci.compute.ssh.SshAuthIdentityProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/lamgc/oracle/sentry/oci/compute/ssh/SshAuthIdentityProvider.java b/src/main/java/net/lamgc/oracle/sentry/oci/compute/ssh/SshAuthIdentityProvider.java index 0db9ba9..0742964 100644 --- a/src/main/java/net/lamgc/oracle/sentry/oci/compute/ssh/SshAuthIdentityProvider.java +++ b/src/main/java/net/lamgc/oracle/sentry/oci/compute/ssh/SshAuthIdentityProvider.java @@ -4,7 +4,7 @@ import com.google.common.reflect.TypeToken; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import net.lamgc.oracle.sentry.ComputeInstanceManager; +import net.lamgc.oracle.sentry.oci.compute.ComputeInstanceManager; import net.lamgc.oracle.sentry.oci.compute.ComputeInstance; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/lamgc/oracle/sentry/script/ScriptComponents.java b/src/main/java/net/lamgc/oracle/sentry/script/ScriptComponents.java index abee22f..e313a2b 100644 --- a/src/main/java/net/lamgc/oracle/sentry/script/ScriptComponents.java +++ b/src/main/java/net/lamgc/oracle/sentry/script/ScriptComponents.java @@ -1,6 +1,6 @@ package net.lamgc.oracle.sentry.script; -import net.lamgc.oracle.sentry.ComputeInstanceManager; +import net.lamgc.oracle.sentry.oci.compute.ComputeInstanceManager; import net.lamgc.oracle.sentry.oci.account.OracleAccountManager; import net.lamgc.oracle.sentry.script.tools.http.ScriptHttpClient; diff --git a/src/main/java/net/lamgc/oracle/sentry/script/groovy/trigger/InstanceStateWatchTrigger.java b/src/main/java/net/lamgc/oracle/sentry/script/groovy/trigger/InstanceStateWatchTrigger.java index c7f65e0..35b5f02 100644 --- a/src/main/java/net/lamgc/oracle/sentry/script/groovy/trigger/InstanceStateWatchTrigger.java +++ b/src/main/java/net/lamgc/oracle/sentry/script/groovy/trigger/InstanceStateWatchTrigger.java @@ -5,7 +5,7 @@ import com.oracle.bmc.core.ComputeClient; import com.oracle.bmc.core.model.Instance; import com.oracle.bmc.core.requests.GetInstanceRequest; import groovy.lang.Closure; -import net.lamgc.oracle.sentry.ComputeInstanceManager; +import net.lamgc.oracle.sentry.oci.compute.ComputeInstanceManager; import net.lamgc.oracle.sentry.oci.compute.ComputeInstance; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/net/lamgc/oracle/sentry/script/ScriptManagerTest.java b/src/test/java/net/lamgc/oracle/sentry/script/ScriptManagerTest.java index 911935f..a419dad 100644 --- a/src/test/java/net/lamgc/oracle/sentry/script/ScriptManagerTest.java +++ b/src/test/java/net/lamgc/oracle/sentry/script/ScriptManagerTest.java @@ -1,6 +1,6 @@ package net.lamgc.oracle.sentry.script; -import net.lamgc.oracle.sentry.ComputeInstanceManager; +import net.lamgc.oracle.sentry.oci.compute.ComputeInstanceManager; import net.lamgc.oracle.sentry.oci.account.OracleAccountManager; import net.lamgc.oracle.sentry.script.tools.http.ScriptHttpClient; import org.apache.http.impl.client.HttpClientBuilder;