moved packages

BFergerson · BFergerson · commit 70ed97ebefb3 · 2022-02-04T22:39:56.000-05:00
diff --git a/src/commonMain/kotlin/spp.protocol/artifact/ArtifactNameUtils.kt b/src/commonMain/kotlin/spp.protocol/artifact/ArtifactNameUtils.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package spp.protocol.utils
+package spp.protocol.artifact
 
 /**
  * Useful methods for formatting artifact names.
diff --git a/src/commonMain/kotlin/spp.protocol/artifact/exception/LiveStackTraceElement.kt b/src/commonMain/kotlin/spp.protocol/artifact/exception/LiveStackTraceElement.kt
@@ -18,8 +18,8 @@
 package spp.protocol.artifact.exception
 
 import kotlinx.serialization.Serializable
+import spp.protocol.artifact.ArtifactNameUtils.getShortQualifiedClassName
 import spp.protocol.instrument.variable.LiveVariable
-import spp.protocol.utils.ArtifactNameUtils.getShortQualifiedClassName
 
 /**
  * todo: description.
diff --git a/src/commonMain/kotlin/spp.protocol/instrument/command/CommandType.kt b/src/commonMain/kotlin/spp.protocol/instrument/command/CommandType.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package spp.protocol.probe.command
+package spp.protocol.instrument.command
 
 enum class CommandType {
     ADD_LIVE_INSTRUMENT,
diff --git a/src/commonMain/kotlin/spp.protocol/instrument/command/LiveInstrumentCommand.kt b/src/commonMain/kotlin/spp.protocol/instrument/command/LiveInstrumentCommand.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package spp.protocol.probe.command
+package spp.protocol.instrument.command
 
 import kotlinx.serialization.Serializable
 
diff --git a/src/commonMain/kotlin/spp.protocol/instrument/command/LiveInstrumentContext.kt b/src/commonMain/kotlin/spp.protocol/instrument/command/LiveInstrumentContext.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package spp.protocol.probe.command
+package spp.protocol.instrument.command
 
 import kotlinx.serialization.Serializable
 import spp.protocol.instrument.LiveInstrument
diff --git a/src/commonMain/kotlin/spp.protocol/platform/ProbeAddress.kt b/src/commonMain/kotlin/spp.protocol/platform/ProbeAddress.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package spp.protocol.probe
+package spp.protocol.platform
 
 enum class ProbeAddress(val address: String) {
     REMOTE_REGISTERED("spp.probe.status.remote-registered"),
diff --git a/src/commonMain/kotlin/spp.protocol/platform/ProcessorAddress.kt b/src/commonMain/kotlin/spp.protocol/platform/ProcessorAddress.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package spp.protocol.processor
+package spp.protocol.platform
 
 enum class ProcessorAddress(val address: String) {
     SET_LOG_PUBLISH_RATE_LIMIT("spp.provider.setting.log-publish-rate-limit");
diff --git a/src/commonMain/kotlin/spp.protocol/platform/auth/AccessChecker.kt b/src/commonMain/kotlin/spp.protocol/platform/auth/AccessChecker.kt
@@ -15,10 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package spp.protocol.utils
-
-import spp.protocol.auth.AccessPermission
-import spp.protocol.auth.AccessType
+package spp.protocol.platform.auth
 
 object AccessChecker {
 
diff --git a/src/commonMain/kotlin/spp.protocol/platform/auth/AccessPermission.kt b/src/commonMain/kotlin/spp.protocol/platform/auth/AccessPermission.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package spp.protocol.auth
+package spp.protocol.platform.auth
 
 import kotlinx.serialization.Serializable
 
diff --git a/src/commonMain/kotlin/spp.protocol/platform/auth/AccessType.kt b/src/commonMain/kotlin/spp.protocol/platform/auth/AccessType.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package spp.protocol.auth
+package spp.protocol.platform.auth
 
 enum class AccessType {
     BLACK_LIST,
diff --git a/src/commonMain/kotlin/spp.protocol/platform/auth/DataRedaction.kt b/src/commonMain/kotlin/spp.protocol/platform/auth/DataRedaction.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package spp.protocol.auth
+package spp.protocol.platform.auth
 
 data class DataRedaction(
     val id: String,
diff --git a/src/commonMain/kotlin/spp.protocol/platform/auth/DeveloperRole.kt b/src/commonMain/kotlin/spp.protocol/platform/auth/DeveloperRole.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package spp.protocol.auth
+package spp.protocol.platform.auth
 
 enum class DeveloperRole(var roleName: String, var nativeRole: Boolean) {
     ROLE_MANAGER("role_manager", true),
diff --git a/src/commonMain/kotlin/spp.protocol/platform/auth/RolePermission.kt b/src/commonMain/kotlin/spp.protocol/platform/auth/RolePermission.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package spp.protocol.auth
+package spp.protocol.platform.auth
 
 enum class RolePermission(val manager: Boolean = true) {
     RESET(true),
diff --git a/src/commonMain/kotlin/spp.protocol/platform/developer/Developer.kt b/src/commonMain/kotlin/spp.protocol/platform/developer/Developer.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package spp.protocol.developer
+package spp.protocol.platform.developer
 
 import kotlinx.serialization.Serializable
 
diff --git a/src/commonMain/kotlin/spp.protocol/platform/developer/SelfInfo.kt b/src/commonMain/kotlin/spp.protocol/platform/developer/SelfInfo.kt
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package spp.protocol.developer
+package spp.protocol.platform.developer
 
 import kotlinx.serialization.Serializable
-import spp.protocol.auth.AccessPermission
-import spp.protocol.auth.DeveloperRole
-import spp.protocol.auth.RolePermission
+import spp.protocol.platform.auth.AccessPermission
+import spp.protocol.platform.auth.DeveloperRole
+import spp.protocol.platform.auth.RolePermission
 
 @Serializable
 data class SelfInfo(
diff --git a/src/commonMain/kotlin/spp.protocol/platform/error/JWTVerificationException.kt b/src/commonMain/kotlin/spp.protocol/platform/error/JWTVerificationException.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package spp.protocol.error
+package spp.protocol.platform.error
 
 /**
  * todo: description.
diff --git a/src/commonMain/kotlin/spp.protocol/platform/error/MissingRemoteException.kt b/src/commonMain/kotlin/spp.protocol/platform/error/MissingRemoteException.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package spp.protocol.error
+package spp.protocol.platform.error
 
 /**
  * todo: description.
diff --git a/src/commonMain/kotlin/spp.protocol/platform/general/Service.kt b/src/commonMain/kotlin/spp.protocol/platform/general/Service.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package spp.protocol.general
+package spp.protocol.platform.general
 
 import kotlinx.serialization.Serializable
 
diff --git a/src/commonMain/kotlin/spp.protocol/platform/status/ActiveInstance.kt b/src/commonMain/kotlin/spp.protocol/platform/status/ActiveInstance.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package spp.protocol.status
+package spp.protocol.platform.status
 
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.Serializable
diff --git a/src/commonMain/kotlin/spp.protocol/platform/status/InstanceConnection.kt b/src/commonMain/kotlin/spp.protocol/platform/status/InstanceConnection.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package spp.protocol.status
+package spp.protocol.platform.status
 
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.Serializable
diff --git a/src/jvmMain/kotlin/spp/protocol/ProtocolMarshaller.kt b/src/jvmMain/kotlin/spp/protocol/ProtocolMarshaller.kt
@@ -34,15 +34,15 @@ import spp.protocol.artifact.ArtifactQualifiedName
 import spp.protocol.artifact.exception.LiveStackTrace
 import spp.protocol.artifact.log.LogCountSummary
 import spp.protocol.artifact.trace.TraceResult
-import spp.protocol.developer.SelfInfo
-import spp.protocol.general.Service
 import spp.protocol.instrument.*
+import spp.protocol.instrument.command.CommandType
+import spp.protocol.instrument.command.LiveInstrumentCommand
+import spp.protocol.instrument.command.LiveInstrumentContext
 import spp.protocol.instrument.event.LiveBreakpointHit
 import spp.protocol.instrument.event.LiveInstrumentRemoved
-import spp.protocol.probe.command.CommandType
-import spp.protocol.probe.command.LiveInstrumentCommand
-import spp.protocol.probe.command.LiveInstrumentContext
-import spp.protocol.status.ActiveInstance
+import spp.protocol.platform.developer.SelfInfo
+import spp.protocol.platform.general.Service
+import spp.protocol.platform.status.ActiveInstance
 import spp.protocol.view.LiveViewSubscription
 import java.util.*
 
diff --git a/src/jvmMain/kotlin/spp/protocol/extend/TCPServiceFrameParser.kt b/src/jvmMain/kotlin/spp/protocol/extend/TCPServiceFrameParser.kt
@@ -28,9 +28,9 @@ import io.vertx.core.net.NetSocket
 import io.vertx.ext.bridge.BridgeEventType
 import io.vertx.ext.eventbus.bridge.tcp.impl.protocol.FrameHelper
 import org.slf4j.LoggerFactory
-import spp.protocol.auth.RolePermission
-import spp.protocol.error.JWTVerificationException
-import spp.protocol.error.MissingRemoteException
+import spp.protocol.platform.auth.RolePermission
+import spp.protocol.platform.error.JWTVerificationException
+import spp.protocol.platform.error.MissingRemoteException
 import spp.protocol.service.error.InstrumentAccessDenied
 import spp.protocol.service.error.LiveInstrumentException
 import spp.protocol.service.error.LiveInstrumentException.ErrorType
diff --git a/src/jvmMain/kotlin/spp/protocol/service/LiveService.kt b/src/jvmMain/kotlin/spp/protocol/service/LiveService.kt
@@ -20,9 +20,9 @@ package spp.protocol.service
 import io.vertx.codegen.annotations.ProxyGen
 import io.vertx.codegen.annotations.VertxGen
 import io.vertx.core.Future
-import spp.protocol.developer.SelfInfo
-import spp.protocol.general.Service
-import spp.protocol.status.ActiveInstance
+import spp.protocol.platform.developer.SelfInfo
+import spp.protocol.platform.general.Service
+import spp.protocol.platform.status.ActiveInstance
 
 /**
  * todo: description.
diff --git a/src/jvmMain/kotlin/spp/protocol/service/error/PermissionAccessDenied.kt b/src/jvmMain/kotlin/spp/protocol/service/error/PermissionAccessDenied.kt
@@ -18,7 +18,7 @@
 package spp.protocol.service.error
 
 import io.vertx.serviceproxy.ServiceException
-import spp.protocol.auth.RolePermission
+import spp.protocol.platform.auth.RolePermission
 
 /**
  * todo: description.
diff --git a/src/jvmMain/resources/META-INF/vertx/json-mappers.properties b/src/jvmMain/resources/META-INF/vertx/json-mappers.properties
@@ -20,9 +20,9 @@ spp.protocol.instrument.LiveSpan.serializer=spp.protocol.ProtocolMarshaller#seri
 spp.protocol.instrument.LiveSpan.deserializer=spp.protocol.ProtocolMarshaller#deserializeLiveSpan
 spp.protocol.view.LiveViewSubscription.serializer=spp.protocol.ProtocolMarshaller#serializeLiveViewSubscription
 spp.protocol.view.LiveViewSubscription.deserializer=spp.protocol.ProtocolMarshaller#deserializeLiveViewSubscription
-spp.protocol.developer.SelfInfo.serializer=spp.protocol.ProtocolMarshaller#serializeSelfInfo
-spp.protocol.developer.SelfInfo.deserializer=spp.protocol.ProtocolMarshaller#deserializeSelfInfo
-spp.protocol.general.Service.serializer=spp.protocol.ProtocolMarshaller#serializeService
-spp.protocol.general.Service.deserializer=spp.protocol.ProtocolMarshaller#deserializeService
-spp.protocol.status.ActiveInstance.serializer=spp.protocol.ProtocolMarshaller#serializeActiveInstance
-spp.protocol.status.ActiveInstance.deserializer=spp.protocol.ProtocolMarshaller#deserializeActiveInstance
+spp.protocol.platform.developer.SelfInfo.serializer=spp.protocol.ProtocolMarshaller#serializeSelfInfo
+spp.protocol.platform.developer.SelfInfo.deserializer=spp.protocol.ProtocolMarshaller#deserializeSelfInfo
+spp.protocol.platform.general.Service.serializer=spp.protocol.ProtocolMarshaller#serializeService
+spp.protocol.platform.general.Service.deserializer=spp.protocol.ProtocolMarshaller#deserializeService
+spp.protocol.platform.status.ActiveInstance.serializer=spp.protocol.ProtocolMarshaller#serializeActiveInstance
+spp.protocol.platform.status.ActiveInstance.deserializer=spp.protocol.ProtocolMarshaller#deserializeActiveInstance
