refactor: rdfc-orchestrator uses correct package name

rdf-connect · Oct 29, 2024 · 8956747 · 8956747
1 parent ccbcdd2
commit 8956747
Show file tree

Hide file tree

Showing 34 changed files with 73 additions and 82 deletions.
diff --git a/orchestrator/rdfc-cli/src/main/kotlin/Exec.kt b/orchestrator/rdfc-cli/src/main/kotlin/Exec.kt
@@ -1,10 +1,10 @@
 package technology.idlab.rdfc.cli
 
 import java.io.File
-import technology.idlab.orchestrator.impl.SimpleOrchestrator
 import technology.idlab.rdfc.core.log.Log
+import technology.idlab.rdfc.orchestrator.orchestrator.impl.SimpleOrchestrator
+import technology.idlab.rdfc.orchestrator.resolver.impl.GenericResolver
 import technology.idlab.rdfc.parser.impl.JenaParser
-import technology.idlab.resolver.impl.GenericResolver
 
 /**
  * Execute a pipeline at a given path.

diff --git a/orchestrator/rdfc-cli/src/main/kotlin/Install.kt b/orchestrator/rdfc-cli/src/main/kotlin/Install.kt
@@ -3,8 +3,8 @@ package technology.idlab.rdfc.cli
 import java.io.File
 import technology.idlab.rdfc.core.intermediate.IRPackage
 import technology.idlab.rdfc.core.process.ProcessManager
+import technology.idlab.rdfc.orchestrator.resolver.impl.GenericResolver
 import technology.idlab.rdfc.parser.impl.JenaParser
-import technology.idlab.resolver.impl.GenericResolver
 
 /**
  * Resolve, prepare and install all dependencies in the configuration file.

diff --git a/orchestrator/rdfc-orchestrator/src/main/kotlin/broker/Broker.kt b/orchestrator/rdfc-orchestrator/src/main/kotlin/broker/Broker.kt
@@ -1,4 +1,4 @@
-package technology.idlab.broker
+package technology.idlab.rdfc.orchestrator.broker
 
 /**
  * A broker is a simple class which takes in messages targeting a specific URI, and routes them to

diff --git a/orchestrator/rdfc-orchestrator/src/main/kotlin/broker/BrokerClient.kt b/orchestrator/rdfc-orchestrator/src/main/kotlin/broker/BrokerClient.kt
@@ -1,4 +1,4 @@
-package technology.idlab.broker
+package technology.idlab.rdfc.orchestrator.broker
 
 /**
  * In order to interact with a broker, an object must implement this interface. It must list all the

diff --git a/orchestrator/rdfc-orchestrator/src/main/kotlin/broker/BrokerException.kt b/orchestrator/rdfc-orchestrator/src/main/kotlin/broker/BrokerException.kt
@@ -1,4 +1,4 @@
-package technology.idlab.broker
+package technology.idlab.rdfc.orchestrator.broker
 
 import technology.idlab.rdfc.core.RDFCException
 

diff --git a/orchestrator/rdfc-orchestrator/src/main/kotlin/broker/exception/DeadChannelException.kt b/orchestrator/rdfc-orchestrator/src/main/kotlin/broker/exception/DeadChannelException.kt
@@ -1,6 +1,6 @@
-package technology.idlab.broker.exception
+package technology.idlab.rdfc.orchestrator.broker.exception
 
-import technology.idlab.broker.BrokerException
+import technology.idlab.rdfc.orchestrator.broker.BrokerException
 
 /**
  * An interaction with a dead channel was requested.

diff --git a/...strator/rdfc-orchestrator/src/main/kotlin/broker/exception/NoRegisteredSenderException.kt b/...strator/rdfc-orchestrator/src/main/kotlin/broker/exception/NoRegisteredSenderException.kt
@@ -1,6 +1,6 @@
-package technology.idlab.broker.exception
+package technology.idlab.rdfc.orchestrator.broker.exception
 
-import technology.idlab.broker.BrokerException
+import technology.idlab.rdfc.orchestrator.broker.BrokerException
 
 /**
  * An attempt was made to send a message into a channel where there are no known senders remaining.

diff --git a/orchestrator/rdfc-orchestrator/src/main/kotlin/broker/exception/UnknownChannelException.kt b/orchestrator/rdfc-orchestrator/src/main/kotlin/broker/exception/UnknownChannelException.kt
@@ -1,6 +1,6 @@
-package technology.idlab.broker.exception
+package technology.idlab.rdfc.orchestrator.broker.exception
 
-import technology.idlab.broker.BrokerException
+import technology.idlab.rdfc.orchestrator.broker.BrokerException
 
 /**
  * An interaction with an unknown channel was requested.

diff --git a/orchestrator/rdfc-orchestrator/src/main/kotlin/broker/simple/SimpleBroker.kt b/orchestrator/rdfc-orchestrator/src/main/kotlin/broker/simple/SimpleBroker.kt
@@ -1,10 +1,10 @@
-package technology.idlab.broker.simple
+package technology.idlab.rdfc.orchestrator.broker.simple
 
-import technology.idlab.broker.Broker
-import technology.idlab.broker.BrokerClient
-import technology.idlab.broker.exception.DeadChannelException
-import technology.idlab.broker.exception.NoRegisteredSenderException
-import technology.idlab.broker.exception.UnknownChannelException
+import technology.idlab.rdfc.orchestrator.broker.Broker
+import technology.idlab.rdfc.orchestrator.broker.BrokerClient
+import technology.idlab.rdfc.orchestrator.broker.exception.DeadChannelException
+import technology.idlab.rdfc.orchestrator.broker.exception.NoRegisteredSenderException
+import technology.idlab.rdfc.orchestrator.broker.exception.UnknownChannelException
 
 /**
  * A simple data class which keeps track of the senders and receivers of a given channel. Note that

diff --git a/orchestrator/rdfc-orchestrator/src/main/kotlin/orchestrator/Orchestrator.kt b/orchestrator/rdfc-orchestrator/src/main/kotlin/orchestrator/Orchestrator.kt
@@ -1,4 +1,4 @@
-package technology.idlab.orchestrator
+package technology.idlab.rdfc.orchestrator.orchestrator
 
 /** The orchestrator handles inter-runner communication and the execution of the pipeline. */
 interface Orchestrator {

diff --git a/orchestrator/rdfc-orchestrator/src/main/kotlin/orchestrator/impl/SimpleOrchestrator.kt b/orchestrator/rdfc-orchestrator/src/main/kotlin/orchestrator/impl/SimpleOrchestrator.kt
@@ -1,14 +1,14 @@
-package technology.idlab.orchestrator.impl
+package technology.idlab.rdfc.orchestrator.orchestrator.impl
 
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
-import technology.idlab.broker.Broker
-import technology.idlab.broker.simple.SimpleBroker
-import technology.idlab.orchestrator.Orchestrator
+import technology.idlab.rdfc.orchestrator.broker.Broker
+import technology.idlab.rdfc.orchestrator.broker.simple.SimpleBroker
+import technology.idlab.rdfc.orchestrator.orchestrator.Orchestrator
+import technology.idlab.rdfc.orchestrator.runner.Runner
 import technology.idlab.rdfc.parser.Parser
-import technology.idlab.runner.Runner
 
 /**
  * A simple implementation of an orchestrator which only succeeds if all runners succeed without

diff --git a/orchestrator/rdfc-orchestrator/src/main/kotlin/resolver/Resolver.kt b/orchestrator/rdfc-orchestrator/src/main/kotlin/resolver/Resolver.kt
@@ -1,4 +1,4 @@
-package technology.idlab.resolver
+package technology.idlab.rdfc.orchestrator.resolver
 
 import java.io.File
 import technology.idlab.rdfc.core.intermediate.IRDependency

diff --git a/orchestrator/rdfc-orchestrator/src/main/kotlin/resolver/ResolverException.kt b/orchestrator/rdfc-orchestrator/src/main/kotlin/resolver/ResolverException.kt
@@ -1,4 +1,4 @@
-package technology.idlab.resolver
+package technology.idlab.rdfc.orchestrator.resolver
 
 import technology.idlab.rdfc.core.RDFCException
 

diff --git a/orchestrator/rdfc-orchestrator/src/main/kotlin/resolver/exception/UnresolvableException.kt b/orchestrator/rdfc-orchestrator/src/main/kotlin/resolver/exception/UnresolvableException.kt
@@ -1,6 +1,6 @@
-package technology.idlab.resolver.exception
+package technology.idlab.rdfc.orchestrator.resolver.exception
 
-import technology.idlab.resolver.ResolverException
+import technology.idlab.rdfc.orchestrator.resolver.ResolverException
 
 /**
  * The dependency type is not recognized.

diff --git a/orchestrator/rdfc-orchestrator/src/main/kotlin/resolver/impl/GenericResolver.kt b/orchestrator/rdfc-orchestrator/src/main/kotlin/resolver/impl/GenericResolver.kt
@@ -1,9 +1,9 @@
-package technology.idlab.resolver.impl
+package technology.idlab.rdfc.orchestrator.resolver.impl
 
 import java.io.File
 import technology.idlab.rdfc.core.intermediate.IRDependency
-import technology.idlab.resolver.Resolver
-import technology.idlab.resolver.exception.UnresolvableException
+import technology.idlab.rdfc.orchestrator.resolver.Resolver
+import technology.idlab.rdfc.orchestrator.resolver.exception.UnresolvableException
 
 class GenericResolver : Resolver {
   override fun resolve(dependency: IRDependency): File {

diff --git a/orchestrator/rdfc-orchestrator/src/main/kotlin/resolver/impl/GitResolver.kt b/orchestrator/rdfc-orchestrator/src/main/kotlin/resolver/impl/GitResolver.kt
@@ -1,9 +1,9 @@
-package technology.idlab.resolver.impl
+package technology.idlab.rdfc.orchestrator.resolver.impl
 
 import java.io.File
 import org.eclipse.jgit.api.Git
 import technology.idlab.rdfc.core.intermediate.IRDependency
-import technology.idlab.resolver.Resolver
+import technology.idlab.rdfc.orchestrator.resolver.Resolver
 
 /** Resolve a Git repository by cloning it locally and reading its configuration file. */
 class GitResolver : Resolver {

diff --git a/orchestrator/rdfc-orchestrator/src/main/kotlin/resolver/impl/LocalResolver.kt b/orchestrator/rdfc-orchestrator/src/main/kotlin/resolver/impl/LocalResolver.kt
@@ -1,12 +1,12 @@
-package technology.idlab.resolver.impl
+package technology.idlab.rdfc.orchestrator.resolver.impl
 
 import java.io.File
 import kotlin.io.path.Path
 import kotlin.io.path.createSymbolicLinkPointingTo
 import kotlin.io.path.isSymbolicLink
 import kotlin.io.path.readSymbolicLink
 import technology.idlab.rdfc.core.intermediate.IRDependency
-import technology.idlab.resolver.Resolver
+import technology.idlab.rdfc.orchestrator.resolver.Resolver
 
 /** Resolve a file on the local file system. */
 class LocalResolver : Resolver {

diff --git a/orchestrator/rdfc-orchestrator/src/main/kotlin/runner/Runner.kt b/orchestrator/rdfc-orchestrator/src/main/kotlin/runner/Runner.kt
@@ -1,19 +1,19 @@
-package technology.idlab.runner
+package technology.idlab.rdfc.orchestrator.runner
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
-import technology.idlab.broker.Broker
-import technology.idlab.broker.BrokerClient
 import technology.idlab.rdfc.core.intermediate.IRRunner
 import technology.idlab.rdfc.core.intermediate.IRStage
 import technology.idlab.rdfc.core.intermediate.runner.RunnerType
-import technology.idlab.runner.exception.NoSuchRunnerException
-import technology.idlab.runner.exception.UnsupportedRunnerTypeException
-import technology.idlab.runner.grpc.GRPCRunner
-import technology.idlab.runner.jvm.JVMRunner
+import technology.idlab.rdfc.orchestrator.broker.Broker
+import technology.idlab.rdfc.orchestrator.broker.BrokerClient
+import technology.idlab.rdfc.orchestrator.runner.exception.NoSuchRunnerException
+import technology.idlab.rdfc.orchestrator.runner.exception.UnsupportedRunnerTypeException
+import technology.idlab.rdfc.orchestrator.runner.grpc.GRPCRunner
+import technology.idlab.rdfc.orchestrator.runner.jvm.JVMRunner
 
 /**
  * A runner is responsible for executing a set of stages concurrently. A concrete implementation

diff --git a/orchestrator/rdfc-orchestrator/src/main/kotlin/runner/RunnerException.kt b/orchestrator/rdfc-orchestrator/src/main/kotlin/runner/RunnerException.kt
@@ -1,4 +1,4 @@
-package technology.idlab.runner
+package technology.idlab.rdfc.orchestrator.runner
 
 import technology.idlab.rdfc.core.RDFCException
 

diff --git a/...ator/rdfc-orchestrator/src/main/kotlin/runner/exception/InvalidArgumentAccessException.kt b/...ator/rdfc-orchestrator/src/main/kotlin/runner/exception/InvalidArgumentAccessException.kt
@@ -1,6 +1,6 @@
-package technology.idlab.runner.exception
+package technology.idlab.rdfc.orchestrator.runner.exception
 
-import technology.idlab.runner.RunnerException
+import technology.idlab.rdfc.orchestrator.runner.RunnerException
 
 /**
  * Attempted to access an argument which does not exist.

diff --git a/orchestrator/rdfc-orchestrator/src/main/kotlin/runner/exception/NoSuchRunnerException.kt b/orchestrator/rdfc-orchestrator/src/main/kotlin/runner/exception/NoSuchRunnerException.kt
@@ -1,6 +1,6 @@
-package technology.idlab.runner.exception
+package technology.idlab.rdfc.orchestrator.runner.exception
 
-import technology.idlab.runner.RunnerException
+import technology.idlab.rdfc.orchestrator.runner.RunnerException
 
 /**
  * A runner was referenced by a stage, but no such runner was found.

diff --git a/orchestrator/rdfc-orchestrator/src/main/kotlin/runner/exception/NotAProcessorException.kt b/orchestrator/rdfc-orchestrator/src/main/kotlin/runner/exception/NotAProcessorException.kt
@@ -1,6 +1,6 @@
-package technology.idlab.runner.exception
+package technology.idlab.rdfc.orchestrator.runner.exception
 
-import technology.idlab.runner.RunnerException
+import technology.idlab.rdfc.orchestrator.runner.RunnerException
 
 /**
  * Thrown if the implementation of a processor is invalid.

diff --git a/...trator/rdfc-orchestrator/src/main/kotlin/runner/exception/UnrecognizedRequestException.kt b/...trator/rdfc-orchestrator/src/main/kotlin/runner/exception/UnrecognizedRequestException.kt
@@ -1,4 +1,4 @@
-package technology.idlab.runner.exception
+package technology.idlab.rdfc.orchestrator.runner.exception
 
 import technology.idlab.rdfc.core.RDFCException
 

diff --git a/...ator/rdfc-orchestrator/src/main/kotlin/runner/exception/UnsupportedRunnerTypeException.kt b/...ator/rdfc-orchestrator/src/main/kotlin/runner/exception/UnsupportedRunnerTypeException.kt
@@ -1,4 +1,4 @@
-package technology.idlab.runner.exception
+package technology.idlab.rdfc.orchestrator.runner.exception
 
 import technology.idlab.rdfc.core.RDFCException
 import technology.idlab.rdfc.core.intermediate.runner.RunnerType

diff --git a/orchestrator/rdfc-orchestrator/src/main/kotlin/runner/grpc/GRPCConfig.kt b/orchestrator/rdfc-orchestrator/src/main/kotlin/runner/grpc/GRPCConfig.kt
@@ -1,4 +1,4 @@
-package technology.idlab.runner.grpc
+package technology.idlab.rdfc.orchestrator.runner.grpc
 
 import io.grpc.ManagedChannel
 import io.grpc.ManagedChannelBuilder

diff --git a/orchestrator/rdfc-orchestrator/src/main/kotlin/runner/grpc/GRPCRunner.kt b/orchestrator/rdfc-orchestrator/src/main/kotlin/runner/grpc/GRPCRunner.kt
@@ -1,4 +1,4 @@
-package technology.idlab.runner.grpc
+package technology.idlab.rdfc.orchestrator.runner.grpc
 
 import com.google.protobuf.ByteString
 import io.grpc.ConnectivityState
@@ -21,8 +21,8 @@ import technology.idlab.rdfc.core.intermediate.IRStage
 import technology.idlab.rdfc.core.intermediate.runner.RunnerType
 import technology.idlab.rdfc.core.process.ProcessManager
 import technology.idlab.rdfc.core.util.retries
-import technology.idlab.runner.Runner
-import technology.idlab.runner.exception.UnrecognizedRequestException
+import technology.idlab.rdfc.orchestrator.runner.Runner
+import technology.idlab.rdfc.orchestrator.runner.exception.UnrecognizedRequestException
 
 /**
  * Attempt to connect to a gRPC server. `attempts` indicates the number of retries before throwing

diff --git a/orchestrator/rdfc-orchestrator/src/main/kotlin/runner/grpc/Serialize.kt b/orchestrator/rdfc-orchestrator/src/main/kotlin/runner/grpc/Serialize.kt
@@ -1,4 +1,4 @@
-package technology.idlab.runner.grpc
+package technology.idlab.rdfc.orchestrator.runner.grpc
 
 import com.google.protobuf.Timestamp
 import com.google.protobuf.kotlin.toByteStringUtf8

diff --git a/orchestrator/rdfc-orchestrator/src/main/kotlin/runner/jvm/JVMRunner.kt b/orchestrator/rdfc-orchestrator/src/main/kotlin/runner/jvm/JVMRunner.kt
@@ -1,4 +1,4 @@
-package technology.idlab.runner.jvm
+package technology.idlab.rdfc.orchestrator.runner.jvm
 
 import java.net.URI
 import java.net.URLClassLoader
@@ -12,9 +12,9 @@ import technology.idlab.rdfc.core.intermediate.argument.LiteralArgument
 import technology.idlab.rdfc.core.intermediate.argument.NestedArgument
 import technology.idlab.rdfc.core.intermediate.parameter.LiteralParameterType
 import technology.idlab.rdfc.core.log.Log
+import technology.idlab.rdfc.orchestrator.runner.Runner
 import technology.idlab.rdfc.processor.Arguments
 import technology.idlab.rdfc.processor.Processor
-import technology.idlab.runner.Runner
 
 /**
  * Return a class loader. If a path is given, return a URLClassLoader which loads the JAR file at

diff --git a/orchestrator/rdfc-orchestrator/src/test/kotlin/broker/BrokerClientMock.kt b/orchestrator/rdfc-orchestrator/src/test/kotlin/broker/BrokerClientMock.kt
@@ -1,7 +1,4 @@
-package broker
-
-import technology.idlab.broker.Broker
-import technology.idlab.broker.BrokerClient
+package technology.idlab.rdfc.orchestrator.broker
 
 /**
  * A broker client which registers all collects all calls in collections for testing purposes only.

diff --git a/orchestrator/rdfc-orchestrator/src/test/kotlin/broker/BrokerTest.kt b/orchestrator/rdfc-orchestrator/src/test/kotlin/broker/BrokerTest.kt
@@ -1,14 +1,12 @@
-package broker
+package technology.idlab.rdfc.orchestrator.broker
 
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import org.junit.jupiter.api.assertThrows
-import technology.idlab.broker.Broker
-import technology.idlab.broker.BrokerClient
-import technology.idlab.broker.exception.DeadChannelException
-import technology.idlab.broker.exception.NoRegisteredSenderException
-import technology.idlab.broker.exception.UnknownChannelException
-import technology.idlab.broker.simple.SimpleBroker
+import technology.idlab.rdfc.orchestrator.broker.exception.DeadChannelException
+import technology.idlab.rdfc.orchestrator.broker.exception.NoRegisteredSenderException
+import technology.idlab.rdfc.orchestrator.broker.exception.UnknownChannelException
+import technology.idlab.rdfc.orchestrator.broker.simple.SimpleBroker
 
 /** This abstract class provides some simple tests for concrete broker implementations. */
 abstract class BrokerTest {

diff --git a/orchestrator/rdfc-orchestrator/src/test/kotlin/broker/simple/SimpleBrokerTest.kt b/orchestrator/rdfc-orchestrator/src/test/kotlin/broker/simple/SimpleBrokerTest.kt
@@ -1,9 +1,8 @@
-package broker.simple
+package technology.idlab.rdfc.orchestrator.broker.simple
 
-import broker.BrokerTest
-import technology.idlab.broker.Broker
-import technology.idlab.broker.BrokerClient
-import technology.idlab.broker.simple.SimpleBroker
+import technology.idlab.rdfc.orchestrator.broker.Broker
+import technology.idlab.rdfc.orchestrator.broker.BrokerClient
+import technology.idlab.rdfc.orchestrator.broker.BrokerTest
 
 class SimpleBrokerTest : BrokerTest() {
   override fun setup(clients: Collection<BrokerClient<Int>>): Broker<Int> {

diff --git a/orchestrator/rdfc-orchestrator/src/test/kotlin/resolver/ResolverTest.kt b/orchestrator/rdfc-orchestrator/src/test/kotlin/resolver/ResolverTest.kt
@@ -1,9 +1,8 @@
-package resolver
+package technology.idlab.rdfc.orchestrator.resolver
 
 import java.nio.file.Files
 import kotlin.test.Test
 import technology.idlab.rdfc.core.intermediate.IRDependency
-import technology.idlab.resolver.Resolver
 
 abstract class ResolverTest {
   /** The URI of a dependency which must be handled successfully. */

diff --git a/orchestrator/rdfc-orchestrator/src/test/kotlin/resolver/impl/GitResolverTest.kt b/orchestrator/rdfc-orchestrator/src/test/kotlin/resolver/impl/GitResolverTest.kt
@@ -1,7 +1,6 @@
-package resolver.impl
+package technology.idlab.rdfc.orchestrator.resolver.impl
 
-import resolver.ResolverTest
-import technology.idlab.resolver.impl.GitResolver
+import technology.idlab.rdfc.orchestrator.resolver.ResolverTest
 
 class GitResolverTest : ResolverTest() {
   override val uri: String = "https://github.com/jenspots/rdfc-template-kt.git"

diff --git a/orchestrator/rdfc-orchestrator/src/test/kotlin/resolver/impl/LocalResolverTest.kt b/orchestrator/rdfc-orchestrator/src/test/kotlin/resolver/impl/LocalResolverTest.kt
@@ -1,8 +1,7 @@
-package resolver.impl
+package technology.idlab.rdfc.orchestrator.resolver.impl
 
 import java.io.File
-import resolver.ResolverTest
-import technology.idlab.resolver.impl.LocalResolver
+import technology.idlab.rdfc.orchestrator.resolver.ResolverTest
 
 class LocalResolverTest : ResolverTest() {
   override val uri: String = File("../..").canonicalPath + "/packages/shacl-validator-kt"