diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 2bd394c87..440196e0e 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -39,18 +39,18 @@ jobs: - uses: actionshub/markdownlint@main with: filesToIgnoreRegex: "docs/node_modules\\/.*" - markdown-link-check: - name: Markdown Link Check - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: gaurav-nelson/github-action-markdown-link-check@v1 - with: - use-verbose-mode: "yes" +# markdown-link-check: +# name: Markdown Link Check +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v3 +# - uses: gaurav-nelson/github-action-markdown-link-check@v1 +# with: +# use-verbose-mode: "yes" tests: name: Unit & Integration Tests - needs: [yaml-lint, markdown-lint, markdown-link-check] + needs: [yaml-lint, markdown-lint] runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/Athena-Project-intellij-code-style.xml b/Athena-Project-intellij-code-style.xml index 0373e75ca..c98c9b96c 100644 --- a/Athena-Project-intellij-code-style.xml +++ b/Athena-Project-intellij-code-style.xml @@ -9,7 +9,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/athena-core/pom.xml b/athena-core/pom.xml index 0d53bfa31..188c9b51a 100644 --- a/athena-core/pom.xml +++ b/athena-core/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.qubitpi.athena + org.qubitpi.athena athena-parent-pom 1.0-SNAPSHOT @@ -26,7 +26,7 @@ - com.qubitpi.athena + org.qubitpi.athena athena-system-config diff --git a/athena-core/src/main/java/com/qubitpi/athena/application/AbstractBinderFactory.java b/athena-core/src/main/java/org/qubitpi/athena/application/AbstractBinderFactory.java similarity index 91% rename from athena-core/src/main/java/com/qubitpi/athena/application/AbstractBinderFactory.java rename to athena-core/src/main/java/org/qubitpi/athena/application/AbstractBinderFactory.java index 263f7260d..3f8d1a34c 100644 --- a/athena-core/src/main/java/com/qubitpi/athena/application/AbstractBinderFactory.java +++ b/athena-core/src/main/java/org/qubitpi/athena/application/AbstractBinderFactory.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.application; - -import com.qubitpi.athena.config.SystemConfig; -import com.qubitpi.athena.config.SystemConfigFactory; -import com.qubitpi.athena.file.identifier.FileIdGenerator; -import com.qubitpi.athena.file.identifier.FileNameAndUploadedTimeBasedIdGenerator; -import com.qubitpi.athena.filestore.FileStore; -import com.qubitpi.athena.metadata.MetaData; -import com.qubitpi.athena.metastore.MetaStore; -import com.qubitpi.athena.web.graphql.JacksonParser; -import com.qubitpi.athena.web.graphql.JsonDocumentParser; +package org.qubitpi.athena.application; + +import org.qubitpi.athena.config.SystemConfig; +import org.qubitpi.athena.config.SystemConfigFactory; +import org.qubitpi.athena.file.identifier.FileIdGenerator; +import org.qubitpi.athena.file.identifier.FileNameAndUploadedTimeBasedIdGenerator; +import org.qubitpi.athena.filestore.FileStore; +import org.qubitpi.athena.metadata.MetaData; +import org.qubitpi.athena.metastore.MetaStore; +import org.qubitpi.athena.web.graphql.JacksonParser; +import org.qubitpi.athena.web.graphql.JsonDocumentParser; import org.glassfish.hk2.api.TypeLiteral; import org.glassfish.hk2.utilities.Binder; diff --git a/athena-core/src/main/java/com/qubitpi/athena/application/BinderFactory.java b/athena-core/src/main/java/org/qubitpi/athena/application/BinderFactory.java similarity index 97% rename from athena-core/src/main/java/com/qubitpi/athena/application/BinderFactory.java rename to athena-core/src/main/java/org/qubitpi/athena/application/BinderFactory.java index 2b2227719..6e1c5d21f 100644 --- a/athena-core/src/main/java/com/qubitpi/athena/application/BinderFactory.java +++ b/athena-core/src/main/java/org/qubitpi/athena/application/BinderFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.application; +package org.qubitpi.athena.application; import org.glassfish.hk2.utilities.Binder; diff --git a/athena-core/src/main/java/com/qubitpi/athena/application/ResourceConfig.java b/athena-core/src/main/java/org/qubitpi/athena/application/ResourceConfig.java similarity index 85% rename from athena-core/src/main/java/com/qubitpi/athena/application/ResourceConfig.java rename to athena-core/src/main/java/org/qubitpi/athena/application/ResourceConfig.java index 9f6cb7542..b3abe3ff7 100644 --- a/athena-core/src/main/java/com/qubitpi/athena/application/ResourceConfig.java +++ b/athena-core/src/main/java/org/qubitpi/athena/application/ResourceConfig.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.application; +package org.qubitpi.athena.application; -import com.qubitpi.athena.config.ErrorMessageFormat; -import com.qubitpi.athena.config.SystemConfig; -import com.qubitpi.athena.config.SystemConfigFactory; +import static org.qubitpi.athena.config.ErrorMessageFormat.CONFIG_NOT_FOUND; + +import org.qubitpi.athena.config.SystemConfig; +import org.qubitpi.athena.config.SystemConfigFactory; import org.glassfish.hk2.utilities.Binder; import org.glassfish.jersey.media.multipart.MultiPartFeature; @@ -37,7 +38,7 @@ public class ResourceConfig extends org.glassfish.jersey.server.ResourceConfig { private static final Logger LOG = LoggerFactory.getLogger(ResourceConfig.class); - private static final String ATHENA_ENDPOINT_PACKAGE = "com.qubitpi.athena.web.endpoints"; + private static final String ATHENA_ENDPOINT_PACKAGE = "org.qubitpi.athena.web.endpoints"; private static final String RESOURCE_BINDER_KEY = "resource_binder"; private static final SystemConfig SYSTEM_CONFIG = SystemConfigFactory.getInstance(); @@ -45,8 +46,8 @@ public class ResourceConfig extends org.glassfish.jersey.server.ResourceConfig { private final String bindingFactory = SYSTEM_CONFIG.getStringProperty( SYSTEM_CONFIG.getPackageVariableName(RESOURCE_BINDER_KEY) ).orElseThrow(() -> { - LOG.error(ErrorMessageFormat.CONFIG_NOT_FOUND.logFormat(RESOURCE_BINDER_KEY)); - return new IllegalStateException(ErrorMessageFormat.CONFIG_NOT_FOUND.format()); + LOG.error(CONFIG_NOT_FOUND.logFormat(RESOURCE_BINDER_KEY)); + return new IllegalStateException(CONFIG_NOT_FOUND.format()); }); /** diff --git a/athena-core/src/main/java/com/qubitpi/athena/file/File.java b/athena-core/src/main/java/org/qubitpi/athena/file/File.java similarity index 95% rename from athena-core/src/main/java/com/qubitpi/athena/file/File.java rename to athena-core/src/main/java/org/qubitpi/athena/file/File.java index 922da4dd1..dd0cac69e 100644 --- a/athena-core/src/main/java/com/qubitpi/athena/file/File.java +++ b/athena-core/src/main/java/org/qubitpi/athena/file/File.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.file; +package org.qubitpi.athena.file; -import com.qubitpi.athena.metadata.MetaData; +import org.qubitpi.athena.metadata.MetaData; import jakarta.validation.constraints.NotNull; import net.jcip.annotations.Immutable; diff --git a/athena-core/src/main/java/com/qubitpi/athena/file/identifier/FileIdGenerator.java b/athena-core/src/main/java/org/qubitpi/athena/file/identifier/FileIdGenerator.java similarity index 93% rename from athena-core/src/main/java/com/qubitpi/athena/file/identifier/FileIdGenerator.java rename to athena-core/src/main/java/org/qubitpi/athena/file/identifier/FileIdGenerator.java index d922cb76e..452196c3d 100644 --- a/athena-core/src/main/java/com/qubitpi/athena/file/identifier/FileIdGenerator.java +++ b/athena-core/src/main/java/org/qubitpi/athena/file/identifier/FileIdGenerator.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.file.identifier; +package org.qubitpi.athena.file.identifier; -import com.qubitpi.athena.file.File; +import org.qubitpi.athena.file.File; import java.util.function.Function; diff --git a/athena-core/src/main/java/com/qubitpi/athena/file/identifier/FileNameAndUploadedTimeBasedIdGenerator.java b/athena-core/src/main/java/org/qubitpi/athena/file/identifier/FileNameAndUploadedTimeBasedIdGenerator.java similarity index 97% rename from athena-core/src/main/java/com/qubitpi/athena/file/identifier/FileNameAndUploadedTimeBasedIdGenerator.java rename to athena-core/src/main/java/org/qubitpi/athena/file/identifier/FileNameAndUploadedTimeBasedIdGenerator.java index bdf9ac79a..34b18f996 100644 --- a/athena-core/src/main/java/com/qubitpi/athena/file/identifier/FileNameAndUploadedTimeBasedIdGenerator.java +++ b/athena-core/src/main/java/org/qubitpi/athena/file/identifier/FileNameAndUploadedTimeBasedIdGenerator.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.file.identifier; +package org.qubitpi.athena.file.identifier; -import com.qubitpi.athena.file.File; +import org.qubitpi.athena.file.File; import jakarta.validation.constraints.NotNull; import net.jcip.annotations.Immutable; diff --git a/athena-core/src/main/java/com/qubitpi/athena/filestore/FileStore.java b/athena-core/src/main/java/org/qubitpi/athena/filestore/FileStore.java similarity index 87% rename from athena-core/src/main/java/com/qubitpi/athena/filestore/FileStore.java rename to athena-core/src/main/java/org/qubitpi/athena/filestore/FileStore.java index 577b4db53..82e5c959e 100644 --- a/athena-core/src/main/java/com/qubitpi/athena/filestore/FileStore.java +++ b/athena-core/src/main/java/org/qubitpi/athena/filestore/FileStore.java @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.filestore; +package org.qubitpi.athena.filestore; -import com.qubitpi.athena.file.File; -import com.qubitpi.athena.metadata.MetaData; +import org.qubitpi.athena.file.File; +import org.qubitpi.athena.metadata.MetaData; + +import org.qubitpi.athena.metastore.MetaStore; import jakarta.validation.constraints.NotNull; import net.jcip.annotations.NotThreadSafe; @@ -34,8 +36,8 @@ public interface FileStore { * Persists a file into object storage database. *

* Note that calling this method does NOT automatically update the managed metadata of this file in - * {@link com.qubitpi.athena.metastore.MetaStore}. The metadata must be saved separately using - * {@link com.qubitpi.athena.metastore.MetaStore#saveMetaData(String, MetaData)}. + * {@link MetaStore}. The metadata must be saved separately using + * {@link MetaStore#saveMetaData(String, MetaData)}. *

* The implementation does NOT have to be thread-safe. {@link FileStore} assumes that it is the callers' * responsibilities to implement the thread safety themselves. diff --git a/athena-core/src/main/java/com/qubitpi/athena/metadata/FileType.java b/athena-core/src/main/java/org/qubitpi/athena/metadata/FileType.java similarity index 95% rename from athena-core/src/main/java/com/qubitpi/athena/metadata/FileType.java rename to athena-core/src/main/java/org/qubitpi/athena/metadata/FileType.java index d892b1eb6..68b0283fa 100644 --- a/athena-core/src/main/java/com/qubitpi/athena/metadata/FileType.java +++ b/athena-core/src/main/java/org/qubitpi/athena/metadata/FileType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.metadata; +package org.qubitpi.athena.metadata; /** * The athena representations of the file extension. diff --git a/athena-core/src/main/java/com/qubitpi/athena/metadata/MetaData.java b/athena-core/src/main/java/org/qubitpi/athena/metadata/MetaData.java similarity index 95% rename from athena-core/src/main/java/com/qubitpi/athena/metadata/MetaData.java rename to athena-core/src/main/java/org/qubitpi/athena/metadata/MetaData.java index 540ea635a..bf2ea4d19 100644 --- a/athena-core/src/main/java/com/qubitpi/athena/metadata/MetaData.java +++ b/athena-core/src/main/java/org/qubitpi/athena/metadata/MetaData.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.metadata; +package org.qubitpi.athena.metadata; -import static com.qubitpi.athena.config.ErrorMessageFormat.MISSING_MAP_KEY; +import static org.qubitpi.athena.config.ErrorMessageFormat.MISSING_MAP_KEY; import org.glassfish.jersey.media.multipart.FormDataContentDisposition; +import org.qubitpi.athena.file.File; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +32,7 @@ import java.util.Objects; /** - * {@link MetaData} is provides information about {@link com.qubitpi.athena.file.File}, but not the content of the file. + * {@link MetaData} is provides information about {@link File}, but not the content of the file. *

* {@link MetaData} offers the ability to make uploaded metadata and metadata from GraphQL {@link ExecutionResult} * type-safe. diff --git a/athena-core/src/main/java/com/qubitpi/athena/metastore/MetaStore.java b/athena-core/src/main/java/org/qubitpi/athena/metastore/MetaStore.java similarity index 91% rename from athena-core/src/main/java/com/qubitpi/athena/metastore/MetaStore.java rename to athena-core/src/main/java/org/qubitpi/athena/metastore/MetaStore.java index a47bdcc28..f3b6528b7 100644 --- a/athena-core/src/main/java/com/qubitpi/athena/metastore/MetaStore.java +++ b/athena-core/src/main/java/org/qubitpi/athena/metastore/MetaStore.java @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.metastore; +package org.qubitpi.athena.metastore; -import com.qubitpi.athena.file.File; -import com.qubitpi.athena.metadata.MetaData; +import org.qubitpi.athena.file.File; +import org.qubitpi.athena.metadata.MetaData; + +import org.qubitpi.athena.filestore.FileStore; import graphql.ExecutionResult; import jakarta.validation.constraints.NotNull; @@ -64,7 +66,7 @@ public interface MetaStore { * responsibilities to implement the thread safety themselves. * * @param fileId The ID of the file that has already been uploaded to object storage. The value of the ID must be - * the return value of {@link com.qubitpi.athena.filestore.FileStore#upload(File)} so that the corresponding + * the return value of {@link FileStore#upload(File)} so that the corresponding * metadata can be retrieved later by calling {@link #getMetaData(String, List)} * @param metaData The metadata object that is going to be saved into database * diff --git a/athena-core/src/main/java/com/qubitpi/athena/web/endpoints/FileServlet.java b/athena-core/src/main/java/org/qubitpi/athena/web/endpoints/FileServlet.java similarity index 95% rename from athena-core/src/main/java/com/qubitpi/athena/web/endpoints/FileServlet.java rename to athena-core/src/main/java/org/qubitpi/athena/web/endpoints/FileServlet.java index 8fc231721..e3d51b06d 100755 --- a/athena-core/src/main/java/com/qubitpi/athena/web/endpoints/FileServlet.java +++ b/athena-core/src/main/java/org/qubitpi/athena/web/endpoints/FileServlet.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.web.endpoints; +package org.qubitpi.athena.web.endpoints; -import com.qubitpi.athena.file.File; -import com.qubitpi.athena.filestore.FileStore; -import com.qubitpi.athena.metadata.MetaData; -import com.qubitpi.athena.metastore.MetaStore; +import org.qubitpi.athena.file.File; +import org.qubitpi.athena.filestore.FileStore; +import org.qubitpi.athena.metadata.MetaData; +import org.qubitpi.athena.metastore.MetaStore; import org.glassfish.jersey.media.multipart.FormDataContentDisposition; import org.glassfish.jersey.media.multipart.FormDataParam; diff --git a/athena-core/src/main/java/com/qubitpi/athena/web/endpoints/MetaServlet.java b/athena-core/src/main/java/org/qubitpi/athena/web/endpoints/MetaServlet.java similarity index 96% rename from athena-core/src/main/java/com/qubitpi/athena/web/endpoints/MetaServlet.java rename to athena-core/src/main/java/org/qubitpi/athena/web/endpoints/MetaServlet.java index 620fe156e..820fe5187 100644 --- a/athena-core/src/main/java/com/qubitpi/athena/web/endpoints/MetaServlet.java +++ b/athena-core/src/main/java/org/qubitpi/athena/web/endpoints/MetaServlet.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.web.endpoints; +package org.qubitpi.athena.web.endpoints; -import static com.qubitpi.athena.config.ErrorMessageFormat.INVALID_GRAPHQL_REQUEST; +import static org.qubitpi.athena.config.ErrorMessageFormat.INVALID_GRAPHQL_REQUEST; -import com.qubitpi.athena.metastore.MetaStore; -import com.qubitpi.athena.web.graphql.JsonDocumentParser; +import org.qubitpi.athena.metastore.MetaStore; +import org.qubitpi.athena.web.graphql.JsonDocumentParser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/athena-core/src/main/java/com/qubitpi/athena/web/graphql/JacksonParser.java b/athena-core/src/main/java/org/qubitpi/athena/web/graphql/JacksonParser.java similarity index 95% rename from athena-core/src/main/java/com/qubitpi/athena/web/graphql/JacksonParser.java rename to athena-core/src/main/java/org/qubitpi/athena/web/graphql/JacksonParser.java index 84e2393e4..dc91adf6c 100644 --- a/athena-core/src/main/java/com/qubitpi/athena/web/graphql/JacksonParser.java +++ b/athena-core/src/main/java/org/qubitpi/athena/web/graphql/JacksonParser.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.web.graphql; +package org.qubitpi.athena.web.graphql; -import static com.qubitpi.athena.config.ErrorMessageFormat.INVALID_GRAPHQL_REQUEST; -import static com.qubitpi.athena.config.ErrorMessageFormat.JSON_DESERIALIZATION_ERROR; +import static org.qubitpi.athena.config.ErrorMessageFormat.INVALID_GRAPHQL_REQUEST; +import static org.qubitpi.athena.config.ErrorMessageFormat.JSON_DESERIALIZATION_ERROR; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.qubitpi.athena.metadata.MetaData; +import org.qubitpi.athena.metadata.MetaData; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/athena-core/src/main/java/com/qubitpi/athena/web/graphql/JsonDocumentParser.java b/athena-core/src/main/java/org/qubitpi/athena/web/graphql/JsonDocumentParser.java similarity index 95% rename from athena-core/src/main/java/com/qubitpi/athena/web/graphql/JsonDocumentParser.java rename to athena-core/src/main/java/org/qubitpi/athena/web/graphql/JsonDocumentParser.java index 44d2d943d..9d87295c7 100644 --- a/athena-core/src/main/java/com/qubitpi/athena/web/graphql/JsonDocumentParser.java +++ b/athena-core/src/main/java/org/qubitpi/athena/web/graphql/JsonDocumentParser.java @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.web.graphql; +package org.qubitpi.athena.web.graphql; + +import org.qubitpi.athena.web.endpoints.MetaServlet; import jakarta.validation.constraints.NotNull; @@ -21,7 +23,7 @@ import java.util.List; /** - * {@link JsonDocumentParser} is used exclusively by {@link com.qubitpi.athena.web.endpoints.MetaServlet} and is + * {@link JsonDocumentParser} is used exclusively by {@link MetaServlet} and is * responsible for extracting metadata request info from POST request body, such as file ID and metadata fields that * client is asking for. *

diff --git a/athena-core/src/test/groovy/com/qubitpi/athena/application/AbstractBinderFactorySpec.groovy b/athena-core/src/test/groovy/org/qubitpi/athena/application/AbstractBinderFactorySpec.groovy similarity index 88% rename from athena-core/src/test/groovy/com/qubitpi/athena/application/AbstractBinderFactorySpec.groovy rename to athena-core/src/test/groovy/org/qubitpi/athena/application/AbstractBinderFactorySpec.groovy index 9f2108a30..070f78842 100644 --- a/athena-core/src/test/groovy/com/qubitpi/athena/application/AbstractBinderFactorySpec.groovy +++ b/athena-core/src/test/groovy/org/qubitpi/athena/application/AbstractBinderFactorySpec.groovy @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.application +package org.qubitpi.athena.application -import com.qubitpi.athena.file.identifier.FileIdGenerator -import com.qubitpi.athena.file.identifier.FileNameAndUploadedTimeBasedIdGenerator -import com.qubitpi.athena.filestore.FileStore -import com.qubitpi.athena.filestore.TestFileStore -import com.qubitpi.athena.metastore.MetaStore -import com.qubitpi.athena.metastore.TestMetaStore -import com.qubitpi.athena.web.graphql.JacksonParser -import com.qubitpi.athena.web.graphql.JsonDocumentParser +import org.qubitpi.athena.file.identifier.FileIdGenerator +import org.qubitpi.athena.file.identifier.FileNameAndUploadedTimeBasedIdGenerator +import org.qubitpi.athena.filestore.FileStore +import org.qubitpi.athena.metastore.MetaStore +import org.qubitpi.athena.web.graphql.JacksonParser +import org.qubitpi.athena.web.graphql.JsonDocumentParser import org.glassfish.hk2.api.DynamicConfiguration import org.glassfish.hk2.utilities.Binder +import org.qubitpi.athena.filestore.TestFileStore +import org.qubitpi.athena.metastore.TestMetaStore import graphql.schema.DataFetcher import spock.lang.Shared diff --git a/athena-core/src/test/groovy/com/qubitpi/athena/application/MockingBinderFactory.groovy b/athena-core/src/test/groovy/org/qubitpi/athena/application/MockingBinderFactory.groovy similarity index 85% rename from athena-core/src/test/groovy/com/qubitpi/athena/application/MockingBinderFactory.groovy rename to athena-core/src/test/groovy/org/qubitpi/athena/application/MockingBinderFactory.groovy index 5174b0b33..71d9ce497 100644 --- a/athena-core/src/test/groovy/com/qubitpi/athena/application/MockingBinderFactory.groovy +++ b/athena-core/src/test/groovy/org/qubitpi/athena/application/MockingBinderFactory.groovy @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.application +package org.qubitpi.athena.application -import static com.qubitpi.athena.application.ResourceConfigSpec.getBinder -import static com.qubitpi.athena.application.ResourceConfigSpec.getClicker +import static ResourceConfigSpec.getBinder +import static ResourceConfigSpec.getClicker import org.glassfish.hk2.utilities.Binder diff --git a/athena-core/src/test/groovy/com/qubitpi/athena/application/ResourceConfigSpec.groovy b/athena-core/src/test/groovy/org/qubitpi/athena/application/ResourceConfigSpec.groovy similarity index 94% rename from athena-core/src/test/groovy/com/qubitpi/athena/application/ResourceConfigSpec.groovy rename to athena-core/src/test/groovy/org/qubitpi/athena/application/ResourceConfigSpec.groovy index af819ca0e..7c46f32b8 100644 --- a/athena-core/src/test/groovy/com/qubitpi/athena/application/ResourceConfigSpec.groovy +++ b/athena-core/src/test/groovy/org/qubitpi/athena/application/ResourceConfigSpec.groovy @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.application +package org.qubitpi.athena.application -import com.qubitpi.athena.config.SystemConfig -import com.qubitpi.athena.config.SystemConfigFactory import org.glassfish.hk2.utilities.Binder +import org.qubitpi.athena.config.SystemConfig +import org.qubitpi.athena.config.SystemConfigFactory import spock.lang.Specification diff --git a/athena-core/src/test/groovy/com/qubitpi/athena/file/identifier/FileNameAndUploadedTimeBasedIdGeneratorSpec.groovy b/athena-core/src/test/groovy/org/qubitpi/athena/file/identifier/FileNameAndUploadedTimeBasedIdGeneratorSpec.groovy similarity index 90% rename from athena-core/src/test/groovy/com/qubitpi/athena/file/identifier/FileNameAndUploadedTimeBasedIdGeneratorSpec.groovy rename to athena-core/src/test/groovy/org/qubitpi/athena/file/identifier/FileNameAndUploadedTimeBasedIdGeneratorSpec.groovy index e8e53a63f..2f603e011 100644 --- a/athena-core/src/test/groovy/com/qubitpi/athena/file/identifier/FileNameAndUploadedTimeBasedIdGeneratorSpec.groovy +++ b/athena-core/src/test/groovy/org/qubitpi/athena/file/identifier/FileNameAndUploadedTimeBasedIdGeneratorSpec.groovy @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.file.identifier +package org.qubitpi.athena.file.identifier -import com.qubitpi.athena.file.File -import com.qubitpi.athena.metadata.MetaData +import org.qubitpi.athena.file.File +import org.qubitpi.athena.metadata.MetaData import spock.lang.Specification diff --git a/athena-core/src/test/groovy/com/qubitpi/athena/metadata/FileTypeSpec.groovy b/athena-core/src/test/groovy/org/qubitpi/athena/metadata/FileTypeSpec.groovy similarity index 96% rename from athena-core/src/test/groovy/com/qubitpi/athena/metadata/FileTypeSpec.groovy rename to athena-core/src/test/groovy/org/qubitpi/athena/metadata/FileTypeSpec.groovy index 71f20333b..fc803cc53 100644 --- a/athena-core/src/test/groovy/com/qubitpi/athena/metadata/FileTypeSpec.groovy +++ b/athena-core/src/test/groovy/org/qubitpi/athena/metadata/FileTypeSpec.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.metadata +package org.qubitpi.athena.metadata import spock.lang.Specification import spock.lang.Unroll diff --git a/athena-core/src/test/groovy/com/qubitpi/athena/metadata/MetaDataSpec.groovy b/athena-core/src/test/groovy/org/qubitpi/athena/metadata/MetaDataSpec.groovy similarity index 98% rename from athena-core/src/test/groovy/com/qubitpi/athena/metadata/MetaDataSpec.groovy rename to athena-core/src/test/groovy/org/qubitpi/athena/metadata/MetaDataSpec.groovy index 5b21f825b..70869806f 100644 --- a/athena-core/src/test/groovy/com/qubitpi/athena/metadata/MetaDataSpec.groovy +++ b/athena-core/src/test/groovy/org/qubitpi/athena/metadata/MetaDataSpec.groovy @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.metadata +package org.qubitpi.athena.metadata -import com.qubitpi.athena.config.ErrorMessageFormat import org.glassfish.jersey.media.multipart.FormDataContentDisposition +import org.qubitpi.athena.config.ErrorMessageFormat import graphql.ExecutionResult import spock.lang.Specification diff --git a/athena-core/src/test/groovy/com/qubitpi/athena/web/endpoints/FileServletSpec.groovy b/athena-core/src/test/groovy/org/qubitpi/athena/web/endpoints/FileServletSpec.groovy similarity index 94% rename from athena-core/src/test/groovy/com/qubitpi/athena/web/endpoints/FileServletSpec.groovy rename to athena-core/src/test/groovy/org/qubitpi/athena/web/endpoints/FileServletSpec.groovy index 0d278be15..80c78a2de 100644 --- a/athena-core/src/test/groovy/com/qubitpi/athena/web/endpoints/FileServletSpec.groovy +++ b/athena-core/src/test/groovy/org/qubitpi/athena/web/endpoints/FileServletSpec.groovy @@ -13,18 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.web.endpoints +package org.qubitpi.athena.web.endpoints -import com.qubitpi.athena.application.ApplicationState -import com.qubitpi.athena.application.JerseyTestBinder -import com.qubitpi.athena.metadata.FileType -import com.qubitpi.athena.metadata.MetaData + +import org.qubitpi.athena.metadata.FileType +import org.qubitpi.athena.metadata.MetaData import org.glassfish.jersey.media.multipart.FormDataContentDisposition import org.glassfish.jersey.media.multipart.FormDataMultiPart import org.glassfish.jersey.media.multipart.MultiPart import org.glassfish.jersey.media.multipart.MultiPartFeature import org.glassfish.jersey.media.multipart.file.FileDataBodyPart +import org.qubitpi.athena.application.ApplicationState +import org.qubitpi.athena.application.JerseyTestBinder import jakarta.ws.rs.client.Entity import spock.lang.Specification diff --git a/athena-core/src/test/groovy/com/qubitpi/athena/web/endpoints/MetaServletSpec.groovy b/athena-core/src/test/groovy/org/qubitpi/athena/web/endpoints/MetaServletSpec.groovy similarity index 93% rename from athena-core/src/test/groovy/com/qubitpi/athena/web/endpoints/MetaServletSpec.groovy rename to athena-core/src/test/groovy/org/qubitpi/athena/web/endpoints/MetaServletSpec.groovy index bef7c6169..db0ec1120 100644 --- a/athena-core/src/test/groovy/com/qubitpi/athena/web/endpoints/MetaServletSpec.groovy +++ b/athena-core/src/test/groovy/org/qubitpi/athena/web/endpoints/MetaServletSpec.groovy @@ -13,14 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.web.endpoints - -import com.qubitpi.athena.application.ApplicationState -import com.qubitpi.athena.application.JerseyTestBinder -import com.qubitpi.athena.metadata.FileType -import com.qubitpi.athena.metadata.MetaData -import com.qubitpi.athena.metastore.MetaStore -import com.qubitpi.athena.web.graphql.JsonDocumentParser +package org.qubitpi.athena.web.endpoints + + +import org.qubitpi.athena.metadata.FileType +import org.qubitpi.athena.metadata.MetaData +import org.qubitpi.athena.metastore.MetaStore +import org.qubitpi.athena.web.graphql.JsonDocumentParser + +import org.qubitpi.athena.application.ApplicationState +import org.qubitpi.athena.application.JerseyTestBinder import groovy.json.JsonSlurper import jakarta.ws.rs.client.Entity diff --git a/athena-core/src/test/groovy/com/qubitpi/athena/web/graphql/JacksonParserSpec.groovy b/athena-core/src/test/groovy/org/qubitpi/athena/web/graphql/JacksonParserSpec.groovy similarity index 98% rename from athena-core/src/test/groovy/com/qubitpi/athena/web/graphql/JacksonParserSpec.groovy rename to athena-core/src/test/groovy/org/qubitpi/athena/web/graphql/JacksonParserSpec.groovy index 548636167..9d4a0d7bf 100644 --- a/athena-core/src/test/groovy/com/qubitpi/athena/web/graphql/JacksonParserSpec.groovy +++ b/athena-core/src/test/groovy/org/qubitpi/athena/web/graphql/JacksonParserSpec.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.web.graphql +package org.qubitpi.athena.web.graphql import spock.lang.Unroll diff --git a/athena-core/src/test/groovy/com/qubitpi/athena/web/graphql/JsonDocumentParserSpec.groovy b/athena-core/src/test/groovy/org/qubitpi/athena/web/graphql/JsonDocumentParserSpec.groovy similarity index 95% rename from athena-core/src/test/groovy/com/qubitpi/athena/web/graphql/JsonDocumentParserSpec.groovy rename to athena-core/src/test/groovy/org/qubitpi/athena/web/graphql/JsonDocumentParserSpec.groovy index df457f64d..3b2006bbe 100644 --- a/athena-core/src/test/groovy/com/qubitpi/athena/web/graphql/JsonDocumentParserSpec.groovy +++ b/athena-core/src/test/groovy/org/qubitpi/athena/web/graphql/JsonDocumentParserSpec.groovy @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.web.graphql +package org.qubitpi.athena.web.graphql -import com.qubitpi.athena.metadata.MetaData +import org.qubitpi.athena.metadata.MetaData import spock.lang.Specification import spock.lang.Subject diff --git a/athena-core/src/test/java/com/qubitpi/athena/application/ApplicationState.java b/athena-core/src/test/java/org/qubitpi/athena/application/ApplicationState.java similarity index 66% rename from athena-core/src/test/java/com/qubitpi/athena/application/ApplicationState.java rename to athena-core/src/test/java/org/qubitpi/athena/application/ApplicationState.java index 38a96138c..2abf0d1ca 100644 --- a/athena-core/src/test/java/com/qubitpi/athena/application/ApplicationState.java +++ b/athena-core/src/test/java/org/qubitpi/athena/application/ApplicationState.java @@ -13,11 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.application; +package org.qubitpi.athena.application; -import com.qubitpi.athena.file.File; -import com.qubitpi.athena.file.identifier.FileIdGenerator; -import com.qubitpi.athena.metadata.MetaData; +import org.qubitpi.athena.file.File; +import org.qubitpi.athena.file.identifier.FileIdGenerator; +import org.qubitpi.athena.filestore.FileStore; +import org.qubitpi.athena.metastore.MetaStore; +import org.qubitpi.athena.metastore.TestMetaStore; +import org.qubitpi.athena.metadata.MetaData; import net.jcip.annotations.NotThreadSafe; @@ -33,7 +36,7 @@ public class ApplicationState { /** - * Initial {@link com.qubitpi.athena.metastore.MetaStore} test data during each test def (not per-spec). + * Initial {@link MetaStore} test data during each test def (not per-spec). *

* This map is where {@link graphql.schema.DataFetcher} is going to read test data from and write test data to and * will be initialized in setup() method @@ -44,43 +47,43 @@ public class ApplicationState { public Map metadataByFileId = new HashMap<>(); /** - * Used for stubbing {@link com.qubitpi.athena.metastore.MetaStore#getMetaData(String, List)} method's internal + * Used for stubbing {@link MetaStore#getMetaData(String, List)} method's internal * behavior by manually constructing an overriding GraphQL query regardless of method arguments. *

* Combining with {@link #metadataByFileId}, we can mock - * {@link com.qubitpi.athena.metastore.MetaStore#getMetaData(String, List)} to return any pre-configured file + * {@link MetaStore#getMetaData(String, List)} to return any pre-configured file * metadata during test * - * @see com.qubitpi.athena.metastore.TestMetaStore + * @see TestMetaStore */ public BiFunction, String> queryFormatter = (fileId, fields) -> ""; /** - * Used for stubbing {@link com.qubitpi.athena.metastore.MetaStore#saveMetaData(String, MetaData)} method's internal + * Used for stubbing {@link MetaStore#saveMetaData(String, MetaData)} method's internal * behavior by manually constructing an overriding GraphQL query regardless of method arguments. *

* Combining with {@link #metadataByFileId}, we can mock any behavior of - * {@link com.qubitpi.athena.metastore.MetaStore#saveMetaData(String, MetaData) saving file metadata} + * {@link MetaStore#saveMetaData(String, MetaData) saving file metadata} * - * @see com.qubitpi.athena.metastore.TestMetaStore + * @see TestMetaStore */ public BiFunction mutationFormatter = (fileId, metadata) -> ""; /** - * Initial {@link com.qubitpi.athena.filestore.FileStore} test data during each test def (not per-spec) + * Initial {@link FileStore} test data during each test def (not per-spec) *

- * This map is where {@link com.qubitpi.athena.filestore.FileStore} is going to read test data from and write test + * This map is where {@link FileStore} is going to read test data from and write test * data to and will be initialized in setup() method. */ public Map fileByFileId = new HashMap<>(); /** - * Used for stubbing {@link com.qubitpi.athena.filestore.FileStore#upload(File)} method's internal behavior by + * Used for stubbing {@link FileStore#upload(File)} method's internal behavior by * manually constructing an overriding file ID regardless of method arguments. *

* Combining with {@link #fileByFileId}, we can mock any behavior of - * {@link com.qubitpi.athena.filestore.FileStore#upload(File)} and - * .{@link com.qubitpi.athena.filestore.FileStore#download(String)} + * {@link FileStore#upload(File)} and + * .{@link FileStore#download(String)} */ public FileIdGenerator fileIdGenerator = (it) -> ""; diff --git a/athena-core/src/test/java/com/qubitpi/athena/application/JerseyTestBinder.java b/athena-core/src/test/java/org/qubitpi/athena/application/JerseyTestBinder.java similarity index 99% rename from athena-core/src/test/java/com/qubitpi/athena/application/JerseyTestBinder.java rename to athena-core/src/test/java/org/qubitpi/athena/application/JerseyTestBinder.java index d491ea1b2..b31d01285 100644 --- a/athena-core/src/test/java/com/qubitpi/athena/application/JerseyTestBinder.java +++ b/athena-core/src/test/java/org/qubitpi/athena/application/JerseyTestBinder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.application; +package org.qubitpi.athena.application; import org.glassfish.hk2.utilities.binding.AbstractBinder; import org.glassfish.jersey.client.ClientConfig; diff --git a/athena-core/src/test/java/com/qubitpi/athena/application/TestBinderFactory.java b/athena-core/src/test/java/org/qubitpi/athena/application/TestBinderFactory.java similarity index 87% rename from athena-core/src/test/java/com/qubitpi/athena/application/TestBinderFactory.java rename to athena-core/src/test/java/org/qubitpi/athena/application/TestBinderFactory.java index bc19beb61..889f8b844 100644 --- a/athena-core/src/test/java/com/qubitpi/athena/application/TestBinderFactory.java +++ b/athena-core/src/test/java/org/qubitpi/athena/application/TestBinderFactory.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.application; +package org.qubitpi.athena.application; -import com.qubitpi.athena.file.identifier.FileIdGenerator; -import com.qubitpi.athena.filestore.FileStore; -import com.qubitpi.athena.filestore.TestFileStore; -import com.qubitpi.athena.metadata.MetaData; -import com.qubitpi.athena.metastore.MetaStore; -import com.qubitpi.athena.metastore.TestMetaStore; +import org.qubitpi.athena.file.identifier.FileIdGenerator; +import org.qubitpi.athena.filestore.FileStore; +import org.qubitpi.athena.filestore.TestFileStore; +import org.qubitpi.athena.metadata.MetaData; +import org.qubitpi.athena.metastore.MetaStore; +import org.qubitpi.athena.metastore.TestMetaStore; import org.glassfish.hk2.api.TypeLiteral; import org.glassfish.hk2.utilities.binding.AbstractBinder; @@ -62,9 +62,6 @@ public TestBinderFactory() { * Constructor for servlet testing where JerseyTest harness and relevant DI are involved. * * @param applicationState An entry point for setting up test data - * - * @see com.qubitpi.athena.web.endpoints.MetaServletSpec - * @see com.qubitpi.athena.web.endpoints.FileServletSpec */ public TestBinderFactory(final ApplicationState applicationState) { this.applicationState = applicationState; diff --git a/athena-core/src/test/java/com/qubitpi/athena/application/TestMutationDataFetcher.java b/athena-core/src/test/java/org/qubitpi/athena/application/TestMutationDataFetcher.java similarity index 96% rename from athena-core/src/test/java/com/qubitpi/athena/application/TestMutationDataFetcher.java rename to athena-core/src/test/java/org/qubitpi/athena/application/TestMutationDataFetcher.java index eca15aee8..2af6b7ade 100644 --- a/athena-core/src/test/java/com/qubitpi/athena/application/TestMutationDataFetcher.java +++ b/athena-core/src/test/java/org/qubitpi/athena/application/TestMutationDataFetcher.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.application; +package org.qubitpi.athena.application; import static java.util.AbstractMap.SimpleImmutableEntry; -import com.qubitpi.athena.metadata.MetaData; +import org.qubitpi.athena.metadata.MetaData; import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; diff --git a/athena-core/src/test/java/com/qubitpi/athena/application/TestQueryDataFetcher.java b/athena-core/src/test/java/org/qubitpi/athena/application/TestQueryDataFetcher.java similarity index 95% rename from athena-core/src/test/java/com/qubitpi/athena/application/TestQueryDataFetcher.java rename to athena-core/src/test/java/org/qubitpi/athena/application/TestQueryDataFetcher.java index 56e392c93..507865aa7 100644 --- a/athena-core/src/test/java/com/qubitpi/athena/application/TestQueryDataFetcher.java +++ b/athena-core/src/test/java/org/qubitpi/athena/application/TestQueryDataFetcher.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.application; +package org.qubitpi.athena.application; -import com.qubitpi.athena.metadata.MetaData; +import org.qubitpi.athena.metadata.MetaData; import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; diff --git a/athena-core/src/test/java/com/qubitpi/athena/filestore/TestFileStore.java b/athena-core/src/test/java/org/qubitpi/athena/filestore/TestFileStore.java similarity index 90% rename from athena-core/src/test/java/com/qubitpi/athena/filestore/TestFileStore.java rename to athena-core/src/test/java/org/qubitpi/athena/filestore/TestFileStore.java index 853a35947..93f3ef40c 100644 --- a/athena-core/src/test/java/com/qubitpi/athena/filestore/TestFileStore.java +++ b/athena-core/src/test/java/org/qubitpi/athena/filestore/TestFileStore.java @@ -13,10 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.filestore; +package org.qubitpi.athena.filestore; -import com.qubitpi.athena.file.File; -import com.qubitpi.athena.file.identifier.FileIdGenerator; +import org.qubitpi.athena.file.File; +import org.qubitpi.athena.file.identifier.FileIdGenerator; + +import org.qubitpi.athena.application.JerseyTestBinder; +import org.qubitpi.athena.application.TestBinderFactory; import jakarta.validation.constraints.NotNull; import net.jcip.annotations.GuardedBy; @@ -34,9 +37,8 @@ import jakarta.inject.Named; /** - * A {@link FileStore} test stub that facilitates {@link com.qubitpi.athena.web.endpoints.FileServletSpec} mocking - * through {@link com.qubitpi.athena.application.TestBinderFactory} and - * {@link com.qubitpi.athena.application.JerseyTestBinder}. + * A {@link FileStore} test stub that facilitates FileServletSpec mocking through {@link TestBinderFactory} and + * {@link JerseyTestBinder}. */ @NotThreadSafe public class TestFileStore implements FileStore { diff --git a/athena-core/src/test/java/com/qubitpi/athena/metastore/TestMetaStore.java b/athena-core/src/test/java/org/qubitpi/athena/metastore/TestMetaStore.java similarity index 89% rename from athena-core/src/test/java/com/qubitpi/athena/metastore/TestMetaStore.java rename to athena-core/src/test/java/org/qubitpi/athena/metastore/TestMetaStore.java index 0d707a173..b73dbf326 100644 --- a/athena-core/src/test/java/com/qubitpi/athena/metastore/TestMetaStore.java +++ b/athena-core/src/test/java/org/qubitpi/athena/metastore/TestMetaStore.java @@ -13,11 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.metastore; +package org.qubitpi.athena.metastore; import static graphql.schema.idl.TypeRuntimeWiring.newTypeWiring; -import com.qubitpi.athena.metadata.MetaData; +import org.qubitpi.athena.metadata.MetaData; + +import org.qubitpi.athena.application.JerseyTestBinder; +import org.qubitpi.athena.application.TestBinderFactory; +import org.qubitpi.athena.application.TestMutationDataFetcher; +import org.qubitpi.athena.application.TestQueryDataFetcher; import graphql.ExecutionInput; import graphql.ExecutionResult; @@ -43,13 +48,12 @@ import jakarta.inject.Named; /** - * A {@link MetaStore} test stub that facilitates {@link com.qubitpi.athena.web.endpoints.MetaServletSpec} mocking - * through {@link com.qubitpi.athena.application.TestBinderFactory} and - * {@link com.qubitpi.athena.application.JerseyTestBinder}. + * A {@link MetaStore} test stub that facilitates MetaServletSpec mocking through {@link TestBinderFactory} and + * {@link JerseyTestBinder}. *

* The canned answer to calls made to {@link MetaStore} during the test is defined by - * {@link com.qubitpi.athena.application.TestQueryDataFetcher} and - * {@link com.qubitpi.athena.application.TestMutationDataFetcher} + * {@link TestQueryDataFetcher} and + * {@link TestMutationDataFetcher} */ @NotThreadSafe public class TestMetaStore implements MetaStore { diff --git a/athena-examples/athena-example-books/pom.xml b/athena-examples/athena-example-books/pom.xml index 6ae02e102..f7898fce4 100644 --- a/athena-examples/athena-example-books/pom.xml +++ b/athena-examples/athena-example-books/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.qubitpi.athena + org.qubitpi.athena athena-examples 1.0-SNAPSHOT @@ -27,20 +27,20 @@ - com.qubitpi.athena + org.qubitpi.athena athena-core - com.qubitpi.athena + org.qubitpi.athena athena-core test-jar - com.qubitpi.athena + org.qubitpi.athena athena-filestore-swift - com.qubitpi.athena + org.qubitpi.athena athena-metastore-graphql diff --git a/athena-examples/athena-example-books/src/main/java/com/qubitpi/athena/example/books/application/BooksBinderFactory.java b/athena-examples/athena-example-books/src/main/java/org/qubitpi/athena/example/books/application/BooksBinderFactory.java similarity index 90% rename from athena-examples/athena-example-books/src/main/java/com/qubitpi/athena/example/books/application/BooksBinderFactory.java rename to athena-examples/athena-example-books/src/main/java/org/qubitpi/athena/example/books/application/BooksBinderFactory.java index c5ed5835d..225976ac0 100644 --- a/athena-examples/athena-example-books/src/main/java/com/qubitpi/athena/example/books/application/BooksBinderFactory.java +++ b/athena-examples/athena-example-books/src/main/java/org/qubitpi/athena/example/books/application/BooksBinderFactory.java @@ -13,17 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.example.books.application; - -import com.qubitpi.athena.application.AbstractBinderFactory; -import com.qubitpi.athena.config.ErrorMessageFormat; -import com.qubitpi.athena.config.SystemConfig; -import com.qubitpi.athena.config.SystemConfigFactory; -import com.qubitpi.athena.filestore.FileStore; -import com.qubitpi.athena.filestore.swift.SwiftFileStore; -import com.qubitpi.athena.metadata.MetaData; -import com.qubitpi.athena.metastore.MetaStore; -import com.qubitpi.athena.metastore.graphql.GraphQLMetaStore; +package org.qubitpi.athena.example.books.application; + +import static org.qubitpi.athena.config.ErrorMessageFormat.CONFIG_NOT_FOUND; + +import org.qubitpi.athena.application.AbstractBinderFactory; +import org.qubitpi.athena.config.SystemConfig; +import org.qubitpi.athena.config.SystemConfigFactory; +import org.qubitpi.athena.filestore.FileStore; +import org.qubitpi.athena.filestore.swift.SwiftFileStore; +import org.qubitpi.athena.metadata.MetaData; +import org.qubitpi.athena.metastore.MetaStore; +import org.qubitpi.athena.metastore.graphql.GraphQLMetaStore; import org.apache.commons.dbcp2.BasicDataSource; import org.glassfish.hk2.utilities.binding.AbstractBinder; @@ -111,8 +112,8 @@ public DataSource get() { private final String dataSourceProviderClass = SYSTEM_CONFIG.getStringProperty( SYSTEM_CONFIG.getPackageVariableName(DATA_SOURCE_PROVIDER_KEY) ).orElseThrow(() -> { - LOG.error(ErrorMessageFormat.CONFIG_NOT_FOUND.logFormat(DATA_SOURCE_PROVIDER_KEY)); - return new IllegalStateException(ErrorMessageFormat.CONFIG_NOT_FOUND.format()); + LOG.error(CONFIG_NOT_FOUND.logFormat(DATA_SOURCE_PROVIDER_KEY)); + return new IllegalStateException(CONFIG_NOT_FOUND.format()); }); private final Provider dataSourceProvider = initProvider(dataSourceProviderClass); diff --git a/athena-examples/athena-example-books/src/main/java/com/qubitpi/athena/example/books/application/SQLMutationDataFetcher.java b/athena-examples/athena-example-books/src/main/java/org/qubitpi/athena/example/books/application/SQLMutationDataFetcher.java similarity index 96% rename from athena-examples/athena-example-books/src/main/java/com/qubitpi/athena/example/books/application/SQLMutationDataFetcher.java rename to athena-examples/athena-example-books/src/main/java/org/qubitpi/athena/example/books/application/SQLMutationDataFetcher.java index 942ded484..cc191c4aa 100644 --- a/athena-examples/athena-example-books/src/main/java/com/qubitpi/athena/example/books/application/SQLMutationDataFetcher.java +++ b/athena-examples/athena-example-books/src/main/java/org/qubitpi/athena/example/books/application/SQLMutationDataFetcher.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.example.books.application; +package org.qubitpi.athena.example.books.application; -import com.qubitpi.athena.metadata.MetaData; +import org.qubitpi.athena.metadata.MetaData; import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; diff --git a/athena-examples/athena-example-books/src/main/java/com/qubitpi/athena/example/books/application/SQLQueryDataFetcher.java b/athena-examples/athena-example-books/src/main/java/org/qubitpi/athena/example/books/application/SQLQueryDataFetcher.java similarity index 95% rename from athena-examples/athena-example-books/src/main/java/com/qubitpi/athena/example/books/application/SQLQueryDataFetcher.java rename to athena-examples/athena-example-books/src/main/java/org/qubitpi/athena/example/books/application/SQLQueryDataFetcher.java index 9bc5ca258..9b095bc5f 100644 --- a/athena-examples/athena-example-books/src/main/java/com/qubitpi/athena/example/books/application/SQLQueryDataFetcher.java +++ b/athena-examples/athena-example-books/src/main/java/org/qubitpi/athena/example/books/application/SQLQueryDataFetcher.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.example.books.application; +package org.qubitpi.athena.example.books.application; -import static com.qubitpi.athena.config.ErrorMessageFormat.META_DATA_NOT_FOUND; +import static org.qubitpi.athena.config.ErrorMessageFormat.META_DATA_NOT_FOUND; -import com.qubitpi.athena.metadata.MetaData; +import org.qubitpi.athena.metadata.MetaData; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/athena-examples/athena-example-books/src/main/resources/applicationConfig.properties b/athena-examples/athena-example-books/src/main/resources/applicationConfig.properties index ef5ae5cdc..1e0b465f2 100644 --- a/athena-examples/athena-example-books/src/main/resources/applicationConfig.properties +++ b/athena-examples/athena-example-books/src/main/resources/applicationConfig.properties @@ -1,2 +1,2 @@ athena__example_config_key="example-value" -athena__data_source_provider=com.qubitpi.athena.example.books.application.BooksBinderFactory$MySQLDataSourceProvider +athena__data_source_provider=org.qubitpi.athena.example.books.application.BooksBinderFactory$MySQLDataSourceProvider diff --git a/athena-examples/athena-example-books/src/test/groovy/com/qubitpi/athena/example/books/application/BooksBinderFactorySpec.groovy b/athena-examples/athena-example-books/src/test/groovy/org/qubitpi/athena/example/books/application/BooksBinderFactorySpec.groovy similarity index 92% rename from athena-examples/athena-example-books/src/test/groovy/com/qubitpi/athena/example/books/application/BooksBinderFactorySpec.groovy rename to athena-examples/athena-example-books/src/test/groovy/org/qubitpi/athena/example/books/application/BooksBinderFactorySpec.groovy index 9456212fc..b26432f92 100644 --- a/athena-examples/athena-example-books/src/test/groovy/com/qubitpi/athena/example/books/application/BooksBinderFactorySpec.groovy +++ b/athena-examples/athena-example-books/src/test/groovy/org/qubitpi/athena/example/books/application/BooksBinderFactorySpec.groovy @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.example.books.application +package org.qubitpi.athena.example.books.application -import com.qubitpi.athena.config.SystemConfig -import com.qubitpi.athena.config.SystemConfigFactory + +import org.qubitpi.athena.config.SystemConfig +import org.qubitpi.athena.config.SystemConfigFactory import spock.lang.Specification import spock.lang.Unroll @@ -97,8 +98,8 @@ class BooksBinderFactorySpec extends Specification { */ def getTestIterationData() { [ - ['com.qubitpi.athena.example.books.application.BooksBinderFactory$DerbyDataSourceProvider', "Derby"], - ['com.qubitpi.athena.example.books.application.BooksBinderFactory$MySQLDataSourceProvider', "MySQL"] + ['org.qubitpi.athena.example.books.application.BooksBinderFactory$DerbyDataSourceProvider', "Derby"], + ['org.qubitpi.athena.example.books.application.BooksBinderFactory$MySQLDataSourceProvider', "MySQL"] ] } } diff --git a/athena-examples/athena-example-books/src/test/groovy/com/qubitpi/athena/example/books/application/SQLDBResourceManager.groovy b/athena-examples/athena-example-books/src/test/groovy/org/qubitpi/athena/example/books/application/SQLDBResourceManager.groovy similarity index 97% rename from athena-examples/athena-example-books/src/test/groovy/com/qubitpi/athena/example/books/application/SQLDBResourceManager.groovy rename to athena-examples/athena-example-books/src/test/groovy/org/qubitpi/athena/example/books/application/SQLDBResourceManager.groovy index b7a941244..10f757144 100644 --- a/athena-examples/athena-example-books/src/test/groovy/com/qubitpi/athena/example/books/application/SQLDBResourceManager.groovy +++ b/athena-examples/athena-example-books/src/test/groovy/org/qubitpi/athena/example/books/application/SQLDBResourceManager.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.example.books.application +package org.qubitpi.athena.example.books.application import org.flywaydb.core.Flyway diff --git a/athena-examples/athena-example-books/src/test/groovy/com/qubitpi/athena/example/books/application/SQLMutationDataFetcherSpec.groovy b/athena-examples/athena-example-books/src/test/groovy/org/qubitpi/athena/example/books/application/SQLMutationDataFetcherSpec.groovy similarity index 95% rename from athena-examples/athena-example-books/src/test/groovy/com/qubitpi/athena/example/books/application/SQLMutationDataFetcherSpec.groovy rename to athena-examples/athena-example-books/src/test/groovy/org/qubitpi/athena/example/books/application/SQLMutationDataFetcherSpec.groovy index 97ac802b4..f62be09d7 100644 --- a/athena-examples/athena-example-books/src/test/groovy/com/qubitpi/athena/example/books/application/SQLMutationDataFetcherSpec.groovy +++ b/athena-examples/athena-example-books/src/test/groovy/org/qubitpi/athena/example/books/application/SQLMutationDataFetcherSpec.groovy @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.example.books.application +package org.qubitpi.athena.example.books.application -import com.qubitpi.athena.metadata.MetaData + +import org.qubitpi.athena.metadata.MetaData import graphql.schema.DataFetchingEnvironment import spock.lang.Specification diff --git a/athena-examples/athena-example-books/src/test/groovy/com/qubitpi/athena/example/books/application/SQLQueryDataFetcherSpec.groovy b/athena-examples/athena-example-books/src/test/groovy/org/qubitpi/athena/example/books/application/SQLQueryDataFetcherSpec.groovy similarity index 96% rename from athena-examples/athena-example-books/src/test/groovy/com/qubitpi/athena/example/books/application/SQLQueryDataFetcherSpec.groovy rename to athena-examples/athena-example-books/src/test/groovy/org/qubitpi/athena/example/books/application/SQLQueryDataFetcherSpec.groovy index 857ac5c01..93f55484d 100644 --- a/athena-examples/athena-example-books/src/test/groovy/com/qubitpi/athena/example/books/application/SQLQueryDataFetcherSpec.groovy +++ b/athena-examples/athena-example-books/src/test/groovy/org/qubitpi/athena/example/books/application/SQLQueryDataFetcherSpec.groovy @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.example.books.application +package org.qubitpi.athena.example.books.application -import com.qubitpi.athena.metadata.FileType -import com.qubitpi.athena.metadata.MetaData + +import org.qubitpi.athena.metadata.FileType +import org.qubitpi.athena.metadata.MetaData import graphql.schema.DataFetchingEnvironment import spock.lang.Specification diff --git a/athena-examples/athena-example-books/src/test/groovy/com/qubitpi/athena/example/books/web/endpoints/AbstractServletSpec.groovy b/athena-examples/athena-example-books/src/test/groovy/org/qubitpi/athena/example/books/web/endpoints/AbstractServletSpec.groovy similarity index 75% rename from athena-examples/athena-example-books/src/test/groovy/com/qubitpi/athena/example/books/web/endpoints/AbstractServletSpec.groovy rename to athena-examples/athena-example-books/src/test/groovy/org/qubitpi/athena/example/books/web/endpoints/AbstractServletSpec.groovy index 15168576b..208e60ad5 100644 --- a/athena-examples/athena-example-books/src/test/groovy/com/qubitpi/athena/example/books/web/endpoints/AbstractServletSpec.groovy +++ b/athena-examples/athena-example-books/src/test/groovy/org/qubitpi/athena/example/books/web/endpoints/AbstractServletSpec.groovy @@ -13,12 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.example.books.web.endpoints +package org.qubitpi.athena.example.books.web.endpoints -import com.qubitpi.athena.application.JerseyTestBinder -import com.qubitpi.athena.config.SystemConfig -import com.qubitpi.athena.config.SystemConfigFactory -import com.qubitpi.athena.example.books.application.SQLDBResourceManager + +import org.qubitpi.athena.example.books.application.SQLDBResourceManager + +import org.qubitpi.athena.application.JerseyTestBinder +import org.qubitpi.athena.config.SystemConfig +import org.qubitpi.athena.config.SystemConfigFactory import spock.lang.Specification @@ -33,7 +35,7 @@ abstract class AbstractServletSpec extends Specification { } def setup() { - SYSTEM_CONFIG.setProperty('athena__data_source_provider', 'com.qubitpi.athena.example.books.application.BooksBinderFactory$DerbyDataSourceProvider') + SYSTEM_CONFIG.setProperty('athena__data_source_provider', 'org.qubitpi.athena.example.books.application.BooksBinderFactory$DerbyDataSourceProvider') SQLDBResourceManager.migrateDatabase() childSetup() } diff --git a/athena-examples/athena-example-books/src/test/groovy/com/qubitpi/athena/example/books/web/endpoints/FileServletSpec.groovy b/athena-examples/athena-example-books/src/test/groovy/org/qubitpi/athena/example/books/web/endpoints/FileServletSpec.groovy similarity index 93% rename from athena-examples/athena-example-books/src/test/groovy/com/qubitpi/athena/example/books/web/endpoints/FileServletSpec.groovy rename to athena-examples/athena-example-books/src/test/groovy/org/qubitpi/athena/example/books/web/endpoints/FileServletSpec.groovy index aeb35683a..0a50d32b5 100644 --- a/athena-examples/athena-example-books/src/test/groovy/com/qubitpi/athena/example/books/web/endpoints/FileServletSpec.groovy +++ b/athena-examples/athena-example-books/src/test/groovy/org/qubitpi/athena/example/books/web/endpoints/FileServletSpec.groovy @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.example.books.web.endpoints +package org.qubitpi.athena.example.books.web.endpoints -import com.qubitpi.athena.example.books.application.BookJerseyTestBinder -import com.qubitpi.athena.web.endpoints.FileServlet import org.glassfish.jersey.media.multipart.FormDataContentDisposition import org.glassfish.jersey.media.multipart.FormDataMultiPart import org.glassfish.jersey.media.multipart.MultiPart import org.glassfish.jersey.media.multipart.MultiPartFeature import org.glassfish.jersey.media.multipart.file.FileDataBodyPart +import org.qubitpi.athena.example.books.application.BookJerseyTestBinder +import org.qubitpi.athena.web.endpoints.FileServlet import groovy.json.JsonSlurper import jakarta.ws.rs.client.Entity diff --git a/athena-examples/athena-example-books/src/test/groovy/com/qubitpi/athena/example/books/web/endpoints/MetaServletSpec.groovy b/athena-examples/athena-example-books/src/test/groovy/org/qubitpi/athena/example/books/web/endpoints/MetaServletSpec.groovy similarity index 93% rename from athena-examples/athena-example-books/src/test/groovy/com/qubitpi/athena/example/books/web/endpoints/MetaServletSpec.groovy rename to athena-examples/athena-example-books/src/test/groovy/org/qubitpi/athena/example/books/web/endpoints/MetaServletSpec.groovy index a530e2736..c55d07eef 100644 --- a/athena-examples/athena-example-books/src/test/groovy/com/qubitpi/athena/example/books/web/endpoints/MetaServletSpec.groovy +++ b/athena-examples/athena-example-books/src/test/groovy/org/qubitpi/athena/example/books/web/endpoints/MetaServletSpec.groovy @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.example.books.web.endpoints +package org.qubitpi.athena.example.books.web.endpoints -import com.qubitpi.athena.example.books.application.BookJerseyTestBinder -import com.qubitpi.athena.web.endpoints.MetaServlet + +import org.qubitpi.athena.example.books.application.BookJerseyTestBinder +import org.qubitpi.athena.web.endpoints.MetaServlet import groovy.json.JsonSlurper import jakarta.ws.rs.client.Entity diff --git a/athena-examples/athena-example-books/src/test/java/com/qubitpi/athena/example/books/application/BookJerseyTestBinder.java b/athena-examples/athena-example-books/src/test/java/org/qubitpi/athena/example/books/application/BookJerseyTestBinder.java similarity index 89% rename from athena-examples/athena-example-books/src/test/java/com/qubitpi/athena/example/books/application/BookJerseyTestBinder.java rename to athena-examples/athena-example-books/src/test/java/org/qubitpi/athena/example/books/application/BookJerseyTestBinder.java index 0bbe78e1e..332a61845 100644 --- a/athena-examples/athena-example-books/src/test/java/com/qubitpi/athena/example/books/application/BookJerseyTestBinder.java +++ b/athena-examples/athena-example-books/src/test/java/org/qubitpi/athena/example/books/application/BookJerseyTestBinder.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.example.books.application; +package org.qubitpi.athena.example.books.application; -import com.qubitpi.athena.application.ApplicationState; -import com.qubitpi.athena.application.BinderFactory; -import com.qubitpi.athena.application.JerseyTestBinder; +import org.qubitpi.athena.application.ApplicationState; +import org.qubitpi.athena.application.BinderFactory; +import org.qubitpi.athena.application.JerseyTestBinder; /** * TestBinder with Book application configuration specializaation. diff --git a/athena-examples/athena-examples-acceptance-tests/pom.xml b/athena-examples/athena-examples-acceptance-tests/pom.xml index 93bd22169..ec6e1ee77 100644 --- a/athena-examples/athena-examples-acceptance-tests/pom.xml +++ b/athena-examples/athena-examples-acceptance-tests/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.qubitpi.athena + org.qubitpi.athena athena-examples 1.0-SNAPSHOT diff --git a/athena-examples/athena-examples-acceptance-tests/src/test/java/com/qubitpi/athena/test/acceptance/AbstractStepDefinitions.java b/athena-examples/athena-examples-acceptance-tests/src/test/java/org/qubitpi/athena/test/acceptance/AbstractStepDefinitions.java similarity index 99% rename from athena-examples/athena-examples-acceptance-tests/src/test/java/com/qubitpi/athena/test/acceptance/AbstractStepDefinitions.java rename to athena-examples/athena-examples-acceptance-tests/src/test/java/org/qubitpi/athena/test/acceptance/AbstractStepDefinitions.java index 17936739b..bfbbfac10 100644 --- a/athena-examples/athena-examples-acceptance-tests/src/test/java/com/qubitpi/athena/test/acceptance/AbstractStepDefinitions.java +++ b/athena-examples/athena-examples-acceptance-tests/src/test/java/org/qubitpi/athena/test/acceptance/AbstractStepDefinitions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.test.acceptance; +package org.qubitpi.athena.test.acceptance; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/athena-examples/athena-examples-acceptance-tests/src/test/java/com/qubitpi/athena/test/acceptance/FileStepDefinitions.java b/athena-examples/athena-examples-acceptance-tests/src/test/java/org/qubitpi/athena/test/acceptance/FileStepDefinitions.java similarity index 98% rename from athena-examples/athena-examples-acceptance-tests/src/test/java/com/qubitpi/athena/test/acceptance/FileStepDefinitions.java rename to athena-examples/athena-examples-acceptance-tests/src/test/java/org/qubitpi/athena/test/acceptance/FileStepDefinitions.java index fe943dd2c..2f3c801d6 100644 --- a/athena-examples/athena-examples-acceptance-tests/src/test/java/com/qubitpi/athena/test/acceptance/FileStepDefinitions.java +++ b/athena-examples/athena-examples-acceptance-tests/src/test/java/org/qubitpi/athena/test/acceptance/FileStepDefinitions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.test.acceptance; +package org.qubitpi.athena.test.acceptance; import static org.hamcrest.Matchers.equalTo; diff --git a/athena-examples/athena-examples-acceptance-tests/src/test/java/com/qubitpi/athena/test/acceptance/InitStepDefinitions.java b/athena-examples/athena-examples-acceptance-tests/src/test/java/org/qubitpi/athena/test/acceptance/InitStepDefinitions.java similarity index 96% rename from athena-examples/athena-examples-acceptance-tests/src/test/java/com/qubitpi/athena/test/acceptance/InitStepDefinitions.java rename to athena-examples/athena-examples-acceptance-tests/src/test/java/org/qubitpi/athena/test/acceptance/InitStepDefinitions.java index 334db6cb8..5eac9c486 100644 --- a/athena-examples/athena-examples-acceptance-tests/src/test/java/com/qubitpi/athena/test/acceptance/InitStepDefinitions.java +++ b/athena-examples/athena-examples-acceptance-tests/src/test/java/org/qubitpi/athena/test/acceptance/InitStepDefinitions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.test.acceptance; +package org.qubitpi.athena.test.acceptance; import io.cucumber.java.BeforeAll; import io.restassured.RestAssured; diff --git a/athena-examples/athena-examples-acceptance-tests/src/test/java/com/qubitpi/athena/test/acceptance/MetadataStepDefinitions.java b/athena-examples/athena-examples-acceptance-tests/src/test/java/org/qubitpi/athena/test/acceptance/MetadataStepDefinitions.java similarity index 98% rename from athena-examples/athena-examples-acceptance-tests/src/test/java/com/qubitpi/athena/test/acceptance/MetadataStepDefinitions.java rename to athena-examples/athena-examples-acceptance-tests/src/test/java/org/qubitpi/athena/test/acceptance/MetadataStepDefinitions.java index 07bf8bcd8..9356f08a8 100644 --- a/athena-examples/athena-examples-acceptance-tests/src/test/java/com/qubitpi/athena/test/acceptance/MetadataStepDefinitions.java +++ b/athena-examples/athena-examples-acceptance-tests/src/test/java/org/qubitpi/athena/test/acceptance/MetadataStepDefinitions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.test.acceptance; +package org.qubitpi.athena.test.acceptance; import static org.hamcrest.Matchers.equalTo; diff --git a/athena-examples/athena-examples-acceptance-tests/src/test/java/com/qubitpi/athena/test/acceptance/RunCucumberTest.java b/athena-examples/athena-examples-acceptance-tests/src/test/java/org/qubitpi/athena/test/acceptance/RunCucumberTest.java similarity index 96% rename from athena-examples/athena-examples-acceptance-tests/src/test/java/com/qubitpi/athena/test/acceptance/RunCucumberTest.java rename to athena-examples/athena-examples-acceptance-tests/src/test/java/org/qubitpi/athena/test/acceptance/RunCucumberTest.java index 5abbea08b..8ede70a08 100644 --- a/athena-examples/athena-examples-acceptance-tests/src/test/java/com/qubitpi/athena/test/acceptance/RunCucumberTest.java +++ b/athena-examples/athena-examples-acceptance-tests/src/test/java/org/qubitpi/athena/test/acceptance/RunCucumberTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.test.acceptance; +package org.qubitpi.athena.test.acceptance; import static io.cucumber.junit.platform.engine.Constants.PLUGIN_PROPERTY_NAME; diff --git a/athena-examples/athena-examples-acceptance-tests/src/test/resources/com/qubitpi/athena/test/acceptance/file.feature b/athena-examples/athena-examples-acceptance-tests/src/test/resources/org/qubitpi/athena/test/acceptance/file.feature similarity index 100% rename from athena-examples/athena-examples-acceptance-tests/src/test/resources/com/qubitpi/athena/test/acceptance/file.feature rename to athena-examples/athena-examples-acceptance-tests/src/test/resources/org/qubitpi/athena/test/acceptance/file.feature diff --git a/athena-examples/athena-examples-acceptance-tests/src/test/resources/com/qubitpi/athena/test/acceptance/metadata.feature b/athena-examples/athena-examples-acceptance-tests/src/test/resources/org/qubitpi/athena/test/acceptance/metadata.feature similarity index 100% rename from athena-examples/athena-examples-acceptance-tests/src/test/resources/com/qubitpi/athena/test/acceptance/metadata.feature rename to athena-examples/athena-examples-acceptance-tests/src/test/resources/org/qubitpi/athena/test/acceptance/metadata.feature diff --git a/athena-examples/pom.xml b/athena-examples/pom.xml index 1545e1971..42e4b6b79 100644 --- a/athena-examples/pom.xml +++ b/athena-examples/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.qubitpi.athena + org.qubitpi.athena athena-parent-pom 1.0-SNAPSHOT diff --git a/athena-filestore/README.md b/athena-filestore/README.md index 0f5c4c43d..f3e6ecfac 100644 --- a/athena-filestore/README.md +++ b/athena-filestore/README.md @@ -2,7 +2,7 @@ Athena FileStore Implementations ================================ athena-filestore contains sub-modules, each of which implements -[Athena FileStore](../athena-core/src/main/java/com/qubitpi/athena/filestore/FileStore.java). +[Athena FileStore](../athena-core/src/main/java/org/qubitpi/athena/filestore/FileStore.java). * [OpenStack Swift](./athena-filestore-swift) * HDFS (WIP) diff --git a/athena-filestore/athena-filestore-swift/README.md b/athena-filestore/athena-filestore-swift/README.md index f58cbdc36..a4306851e 100644 --- a/athena-filestore/athena-filestore-swift/README.md +++ b/athena-filestore/athena-filestore-swift/README.md @@ -2,5 +2,5 @@ Athena: File Store - Swift ========================== athena-filestore-swift is an [OpenStack Swift](https://wiki.openstack.org/wiki/SDKs#Java_2) implementation of -[Athena FileStore](../../athena-core/src/main/java/com/qubitpi/athena/filestore/FileStore.java) using +[Athena FileStore](../../athena-core/src/main/java/org/qubitpi/athena/filestore/FileStore.java) using [JOSS](http://joss.javaswift.org/) API. diff --git a/athena-filestore/athena-filestore-swift/pom.xml b/athena-filestore/athena-filestore-swift/pom.xml index 9bd22205b..d4c20cb57 100644 --- a/athena-filestore/athena-filestore-swift/pom.xml +++ b/athena-filestore/athena-filestore-swift/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.qubitpi.athena + org.qubitpi.athena athena-filestore 1.0-SNAPSHOT diff --git a/athena-filestore/athena-filestore-swift/src/main/java/com/qubitpi/athena/filestore/swift/SwiftFileStore.java b/athena-filestore/athena-filestore-swift/src/main/java/org/qubitpi/athena/filestore/swift/SwiftFileStore.java similarity index 94% rename from athena-filestore/athena-filestore-swift/src/main/java/com/qubitpi/athena/filestore/swift/SwiftFileStore.java rename to athena-filestore/athena-filestore-swift/src/main/java/org/qubitpi/athena/filestore/swift/SwiftFileStore.java index 108253b53..4bb73a64d 100644 --- a/athena-filestore/athena-filestore-swift/src/main/java/com/qubitpi/athena/filestore/swift/SwiftFileStore.java +++ b/athena-filestore/athena-filestore-swift/src/main/java/org/qubitpi/athena/filestore/swift/SwiftFileStore.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.filestore.swift; +package org.qubitpi.athena.filestore.swift; -import com.qubitpi.athena.file.File; -import com.qubitpi.athena.file.identifier.FileIdGenerator; -import com.qubitpi.athena.filestore.FileStore; +import org.qubitpi.athena.file.File; +import org.qubitpi.athena.file.identifier.FileIdGenerator; +import org.qubitpi.athena.filestore.FileStore; import org.javaswift.joss.model.Account; import org.javaswift.joss.model.Container; diff --git a/athena-filestore/athena-filestore-swift/src/test/groovy/com/qubitpi/athena/filestore/swift/SwiftFileStoreITSpec.groovy b/athena-filestore/athena-filestore-swift/src/test/groovy/org/qubitpi/athena/filestore/swift/SwiftFileStoreITSpec.groovy similarity index 90% rename from athena-filestore/athena-filestore-swift/src/test/groovy/com/qubitpi/athena/filestore/swift/SwiftFileStoreITSpec.groovy rename to athena-filestore/athena-filestore-swift/src/test/groovy/org/qubitpi/athena/filestore/swift/SwiftFileStoreITSpec.groovy index 3cc3ffc18..dee96577c 100644 --- a/athena-filestore/athena-filestore-swift/src/test/groovy/com/qubitpi/athena/filestore/swift/SwiftFileStoreITSpec.groovy +++ b/athena-filestore/athena-filestore-swift/src/test/groovy/org/qubitpi/athena/filestore/swift/SwiftFileStoreITSpec.groovy @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.filestore.swift +package org.qubitpi.athena.filestore.swift -import com.qubitpi.athena.file.File -import com.qubitpi.athena.file.identifier.FileIdGenerator -import com.qubitpi.athena.filestore.FileStore -import com.qubitpi.athena.metadata.FileType -import com.qubitpi.athena.metadata.MetaData +import org.qubitpi.athena.file.File +import org.qubitpi.athena.file.identifier.FileIdGenerator +import org.qubitpi.athena.filestore.FileStore +import org.qubitpi.athena.metadata.FileType +import org.qubitpi.athena.metadata.MetaData import org.javaswift.joss.client.factory.AccountFactory import org.javaswift.joss.client.factory.AuthenticationMethod diff --git a/athena-filestore/athena-filestore-swift/src/test/groovy/com/qubitpi/athena/filestore/swift/SwiftFileStoreSpec.groovy b/athena-filestore/athena-filestore-swift/src/test/groovy/org/qubitpi/athena/filestore/swift/SwiftFileStoreSpec.groovy similarity index 91% rename from athena-filestore/athena-filestore-swift/src/test/groovy/com/qubitpi/athena/filestore/swift/SwiftFileStoreSpec.groovy rename to athena-filestore/athena-filestore-swift/src/test/groovy/org/qubitpi/athena/filestore/swift/SwiftFileStoreSpec.groovy index ab09c4f90..b483d0538 100644 --- a/athena-filestore/athena-filestore-swift/src/test/groovy/com/qubitpi/athena/filestore/swift/SwiftFileStoreSpec.groovy +++ b/athena-filestore/athena-filestore-swift/src/test/groovy/org/qubitpi/athena/filestore/swift/SwiftFileStoreSpec.groovy @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.filestore.swift +package org.qubitpi.athena.filestore.swift -import com.qubitpi.athena.file.File -import com.qubitpi.athena.file.identifier.FileIdGenerator +import org.qubitpi.athena.file.File +import org.qubitpi.athena.file.identifier.FileIdGenerator import org.javaswift.joss.model.Account import org.javaswift.joss.model.Container diff --git a/athena-filestore/pom.xml b/athena-filestore/pom.xml index fee435419..369d8b2ad 100644 --- a/athena-filestore/pom.xml +++ b/athena-filestore/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.qubitpi.athena + org.qubitpi.athena athena-parent-pom 1.0-SNAPSHOT @@ -28,7 +28,7 @@ - com.qubitpi.athena + org.qubitpi.athena athena-core diff --git a/athena-metastore/athena-metastore-graphql/pom.xml b/athena-metastore/athena-metastore-graphql/pom.xml index 6de5d79a1..4ac98625c 100644 --- a/athena-metastore/athena-metastore-graphql/pom.xml +++ b/athena-metastore/athena-metastore-graphql/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.qubitpi.athena + org.qubitpi.athena athena-metastore 1.0-SNAPSHOT diff --git a/athena-metastore/athena-metastore-graphql/src/main/java/com/qubitpi/athena/metastore/graphql/GraphQLFactory.java b/athena-metastore/athena-metastore-graphql/src/main/java/org/qubitpi/athena/metastore/graphql/GraphQLFactory.java similarity index 98% rename from athena-metastore/athena-metastore-graphql/src/main/java/com/qubitpi/athena/metastore/graphql/GraphQLFactory.java rename to athena-metastore/athena-metastore-graphql/src/main/java/org/qubitpi/athena/metastore/graphql/GraphQLFactory.java index 58d8ab3b2..9789ce85b 100644 --- a/athena-metastore/athena-metastore-graphql/src/main/java/com/qubitpi/athena/metastore/graphql/GraphQLFactory.java +++ b/athena-metastore/athena-metastore-graphql/src/main/java/org/qubitpi/athena/metastore/graphql/GraphQLFactory.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.metastore.graphql; +package org.qubitpi.athena.metastore.graphql; import static graphql.schema.idl.TypeRuntimeWiring.newTypeWiring; -import com.qubitpi.athena.metadata.MetaData; +import org.qubitpi.athena.metadata.MetaData; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/athena-metastore/athena-metastore-graphql/src/main/java/com/qubitpi/athena/metastore/graphql/GraphQLMetaStore.java b/athena-metastore/athena-metastore-graphql/src/main/java/org/qubitpi/athena/metastore/graphql/GraphQLMetaStore.java similarity index 92% rename from athena-metastore/athena-metastore-graphql/src/main/java/com/qubitpi/athena/metastore/graphql/GraphQLMetaStore.java rename to athena-metastore/athena-metastore-graphql/src/main/java/org/qubitpi/athena/metastore/graphql/GraphQLMetaStore.java index 0675a0952..5471d3cb1 100644 --- a/athena-metastore/athena-metastore-graphql/src/main/java/com/qubitpi/athena/metastore/graphql/GraphQLMetaStore.java +++ b/athena-metastore/athena-metastore-graphql/src/main/java/org/qubitpi/athena/metastore/graphql/GraphQLMetaStore.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.metastore.graphql; +package org.qubitpi.athena.metastore.graphql; -import static com.qubitpi.athena.config.ErrorMessageFormat.EMPTY_LIST; +import static org.qubitpi.athena.config.ErrorMessageFormat.EMPTY_LIST; -import com.qubitpi.athena.metadata.MetaData; -import com.qubitpi.athena.metastore.MetaStore; -import com.qubitpi.athena.metastore.graphql.query.GraphQLQueryProvider; -import com.qubitpi.athena.metastore.graphql.query.GraphQLQueryProviderFactory; +import org.qubitpi.athena.metadata.MetaData; +import org.qubitpi.athena.metastore.MetaStore; +import org.qubitpi.athena.metastore.graphql.query.GraphQLQueryProvider; +import org.qubitpi.athena.metastore.graphql.query.GraphQLQueryProviderFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/athena-metastore/athena-metastore-graphql/src/main/java/com/qubitpi/athena/metastore/graphql/query/GraphQLQueryProvider.java b/athena-metastore/athena-metastore-graphql/src/main/java/org/qubitpi/athena/metastore/graphql/query/GraphQLQueryProvider.java similarity index 96% rename from athena-metastore/athena-metastore-graphql/src/main/java/com/qubitpi/athena/metastore/graphql/query/GraphQLQueryProvider.java rename to athena-metastore/athena-metastore-graphql/src/main/java/org/qubitpi/athena/metastore/graphql/query/GraphQLQueryProvider.java index 4f2d3ecf3..8ba117273 100644 --- a/athena-metastore/athena-metastore-graphql/src/main/java/com/qubitpi/athena/metastore/graphql/query/GraphQLQueryProvider.java +++ b/athena-metastore/athena-metastore-graphql/src/main/java/org/qubitpi/athena/metastore/graphql/query/GraphQLQueryProvider.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.metastore.graphql.query; +package org.qubitpi.athena.metastore.graphql.query; -import com.qubitpi.athena.metadata.MetaData; +import org.qubitpi.athena.metadata.MetaData; import jakarta.validation.constraints.NotNull; diff --git a/athena-metastore/athena-metastore-graphql/src/main/java/com/qubitpi/athena/metastore/graphql/query/GraphQLQueryProviderFactory.java b/athena-metastore/athena-metastore-graphql/src/main/java/org/qubitpi/athena/metastore/graphql/query/GraphQLQueryProviderFactory.java similarity index 88% rename from athena-metastore/athena-metastore-graphql/src/main/java/com/qubitpi/athena/metastore/graphql/query/GraphQLQueryProviderFactory.java rename to athena-metastore/athena-metastore-graphql/src/main/java/org/qubitpi/athena/metastore/graphql/query/GraphQLQueryProviderFactory.java index 5f716c156..ea4ed6b83 100644 --- a/athena-metastore/athena-metastore-graphql/src/main/java/com/qubitpi/athena/metastore/graphql/query/GraphQLQueryProviderFactory.java +++ b/athena-metastore/athena-metastore-graphql/src/main/java/org/qubitpi/athena/metastore/graphql/query/GraphQLQueryProviderFactory.java @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.metastore.graphql.query; +package org.qubitpi.athena.metastore.graphql.query; + +import org.qubitpi.athena.metastore.MetaStore; import jakarta.validation.constraints.NotNull; import net.jcip.annotations.Immutable; @@ -21,7 +23,7 @@ /** * {@link GraphQLQueryProviderFactory} is a design pattern that abstracts away from - * {@link com.qubitpi.athena.metastore.MetaStore} the {@link GraphQLQueryProvider} implementation choices. + * {@link MetaStore} the {@link GraphQLQueryProvider} implementation choices. */ @Immutable @ThreadSafe diff --git a/athena-metastore/athena-metastore-graphql/src/main/java/com/qubitpi/athena/metastore/graphql/query/TemplateBasedGraphQLQueryProvider.java b/athena-metastore/athena-metastore-graphql/src/main/java/org/qubitpi/athena/metastore/graphql/query/TemplateBasedGraphQLQueryProvider.java similarity index 93% rename from athena-metastore/athena-metastore-graphql/src/main/java/com/qubitpi/athena/metastore/graphql/query/TemplateBasedGraphQLQueryProvider.java rename to athena-metastore/athena-metastore-graphql/src/main/java/org/qubitpi/athena/metastore/graphql/query/TemplateBasedGraphQLQueryProvider.java index de3213d15..c4ea584eb 100644 --- a/athena-metastore/athena-metastore-graphql/src/main/java/com/qubitpi/athena/metastore/graphql/query/TemplateBasedGraphQLQueryProvider.java +++ b/athena-metastore/athena-metastore-graphql/src/main/java/org/qubitpi/athena/metastore/graphql/query/TemplateBasedGraphQLQueryProvider.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.metastore.graphql.query; +package org.qubitpi.athena.metastore.graphql.query; -import static com.qubitpi.athena.config.ErrorMessageFormat.EMPTY_LIST; +import static org.qubitpi.athena.config.ErrorMessageFormat.EMPTY_LIST; -import com.qubitpi.athena.metadata.MetaData; -import com.qubitpi.athena.metastore.graphql.GraphQLFactory; +import org.qubitpi.athena.metadata.MetaData; +import org.qubitpi.athena.metastore.graphql.GraphQLFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/athena-metastore/athena-metastore-graphql/src/test/groovy/com/qubitpi/athena/metastore/graphql/GraphQLMetaStoreSpec.groovy b/athena-metastore/athena-metastore-graphql/src/test/groovy/org/qubitpi/athena/metastore/graphql/GraphQLMetaStoreSpec.groovy similarity index 97% rename from athena-metastore/athena-metastore-graphql/src/test/groovy/com/qubitpi/athena/metastore/graphql/GraphQLMetaStoreSpec.groovy rename to athena-metastore/athena-metastore-graphql/src/test/groovy/org/qubitpi/athena/metastore/graphql/GraphQLMetaStoreSpec.groovy index 22a35fe9a..98cd09569 100644 --- a/athena-metastore/athena-metastore-graphql/src/test/groovy/com/qubitpi/athena/metastore/graphql/GraphQLMetaStoreSpec.groovy +++ b/athena-metastore/athena-metastore-graphql/src/test/groovy/org/qubitpi/athena/metastore/graphql/GraphQLMetaStoreSpec.groovy @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.metastore.graphql +package org.qubitpi.athena.metastore.graphql -import com.qubitpi.athena.metadata.FileType -import com.qubitpi.athena.metadata.MetaData -import com.qubitpi.athena.metastore.graphql.query.GraphQLQueryProvider +import org.qubitpi.athena.metadata.FileType +import org.qubitpi.athena.metadata.MetaData +import org.qubitpi.athena.metastore.graphql.query.GraphQLQueryProvider import graphql.ExecutionInput import graphql.GraphQL diff --git a/athena-metastore/athena-metastore-graphql/src/test/groovy/com/qubitpi/athena/metastore/graphql/query/GraphQLQueryProviderFactorySpec.groovy b/athena-metastore/athena-metastore-graphql/src/test/groovy/org/qubitpi/athena/metastore/graphql/query/GraphQLQueryProviderFactorySpec.groovy similarity index 93% rename from athena-metastore/athena-metastore-graphql/src/test/groovy/com/qubitpi/athena/metastore/graphql/query/GraphQLQueryProviderFactorySpec.groovy rename to athena-metastore/athena-metastore-graphql/src/test/groovy/org/qubitpi/athena/metastore/graphql/query/GraphQLQueryProviderFactorySpec.groovy index 996ea3ded..b4f09e12b 100644 --- a/athena-metastore/athena-metastore-graphql/src/test/groovy/com/qubitpi/athena/metastore/graphql/query/GraphQLQueryProviderFactorySpec.groovy +++ b/athena-metastore/athena-metastore-graphql/src/test/groovy/org/qubitpi/athena/metastore/graphql/query/GraphQLQueryProviderFactorySpec.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.metastore.graphql.query +package org.qubitpi.athena.metastore.graphql.query class GraphQLQueryProviderFactorySpec extends GraphQLQueryProviderSpec { diff --git a/athena-metastore/athena-metastore-graphql/src/test/groovy/com/qubitpi/athena/metastore/graphql/query/GraphQLQueryProviderSpec.groovy b/athena-metastore/athena-metastore-graphql/src/test/groovy/org/qubitpi/athena/metastore/graphql/query/GraphQLQueryProviderSpec.groovy similarity index 94% rename from athena-metastore/athena-metastore-graphql/src/test/groovy/com/qubitpi/athena/metastore/graphql/query/GraphQLQueryProviderSpec.groovy rename to athena-metastore/athena-metastore-graphql/src/test/groovy/org/qubitpi/athena/metastore/graphql/query/GraphQLQueryProviderSpec.groovy index 7d8f4c796..f02d7ddda 100644 --- a/athena-metastore/athena-metastore-graphql/src/test/groovy/com/qubitpi/athena/metastore/graphql/query/GraphQLQueryProviderSpec.groovy +++ b/athena-metastore/athena-metastore-graphql/src/test/groovy/org/qubitpi/athena/metastore/graphql/query/GraphQLQueryProviderSpec.groovy @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.metastore.graphql.query +package org.qubitpi.athena.metastore.graphql.query -import com.qubitpi.athena.metadata.FileType -import com.qubitpi.athena.metadata.MetaData -import com.qubitpi.athena.metastore.graphql.GraphQLFactory +import org.qubitpi.athena.metadata.FileType +import org.qubitpi.athena.metadata.MetaData +import org.qubitpi.athena.metastore.graphql.GraphQLFactory import spock.lang.Shared import spock.lang.Specification diff --git a/athena-metastore/athena-metastore-graphql/src/test/groovy/com/qubitpi/athena/metastore/graphql/query/TemplateBasedGraphQLQueryProviderSpec.groovy b/athena-metastore/athena-metastore-graphql/src/test/groovy/org/qubitpi/athena/metastore/graphql/query/TemplateBasedGraphQLQueryProviderSpec.groovy similarity index 93% rename from athena-metastore/athena-metastore-graphql/src/test/groovy/com/qubitpi/athena/metastore/graphql/query/TemplateBasedGraphQLQueryProviderSpec.groovy rename to athena-metastore/athena-metastore-graphql/src/test/groovy/org/qubitpi/athena/metastore/graphql/query/TemplateBasedGraphQLQueryProviderSpec.groovy index 7d7423b3b..f95fb7f49 100644 --- a/athena-metastore/athena-metastore-graphql/src/test/groovy/com/qubitpi/athena/metastore/graphql/query/TemplateBasedGraphQLQueryProviderSpec.groovy +++ b/athena-metastore/athena-metastore-graphql/src/test/groovy/org/qubitpi/athena/metastore/graphql/query/TemplateBasedGraphQLQueryProviderSpec.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.metastore.graphql.query +package org.qubitpi.athena.metastore.graphql.query class TemplateBasedGraphQLQueryProviderSpec extends GraphQLQueryProviderSpec { diff --git a/athena-metastore/pom.xml b/athena-metastore/pom.xml index 575914130..1e95d051b 100644 --- a/athena-metastore/pom.xml +++ b/athena-metastore/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.qubitpi.athena + org.qubitpi.athena athena-parent-pom 1.0-SNAPSHOT @@ -28,7 +28,7 @@ - com.qubitpi.athena + org.qubitpi.athena athena-core diff --git a/athena-system-config/pom.xml b/athena-system-config/pom.xml index 1b2243c7f..d017a1006 100644 --- a/athena-system-config/pom.xml +++ b/athena-system-config/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.qubitpi.athena + org.qubitpi.athena athena-parent-pom 1.0-SNAPSHOT diff --git a/athena-system-config/src/main/java/com/qubitpi/athena/config/ConfigResourceLoader.java b/athena-system-config/src/main/java/org/qubitpi/athena/config/ConfigResourceLoader.java similarity index 98% rename from athena-system-config/src/main/java/com/qubitpi/athena/config/ConfigResourceLoader.java rename to athena-system-config/src/main/java/org/qubitpi/athena/config/ConfigResourceLoader.java index 5e30f2adb..714c514f7 100644 --- a/athena-system-config/src/main/java/com/qubitpi/athena/config/ConfigResourceLoader.java +++ b/athena-system-config/src/main/java/org/qubitpi/athena/config/ConfigResourceLoader.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.config; +package org.qubitpi.athena.config; import org.apache.commons.configuration2.Configuration; import org.apache.commons.configuration2.PropertiesConfiguration; diff --git a/athena-system-config/src/main/java/com/qubitpi/athena/config/ErrorMessageFormat.java b/athena-system-config/src/main/java/org/qubitpi/athena/config/ErrorMessageFormat.java similarity index 98% rename from athena-system-config/src/main/java/com/qubitpi/athena/config/ErrorMessageFormat.java rename to athena-system-config/src/main/java/org/qubitpi/athena/config/ErrorMessageFormat.java index 57d67e1ac..2dc8fb5e0 100644 --- a/athena-system-config/src/main/java/com/qubitpi/athena/config/ErrorMessageFormat.java +++ b/athena-system-config/src/main/java/org/qubitpi/athena/config/ErrorMessageFormat.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.config; +package org.qubitpi.athena.config; import jakarta.validation.constraints.NotNull; diff --git a/athena-system-config/src/main/java/com/qubitpi/athena/config/LayeredFileSystemConfig.java b/athena-system-config/src/main/java/org/qubitpi/athena/config/LayeredFileSystemConfig.java similarity index 99% rename from athena-system-config/src/main/java/com/qubitpi/athena/config/LayeredFileSystemConfig.java rename to athena-system-config/src/main/java/org/qubitpi/athena/config/LayeredFileSystemConfig.java index 3384644b8..fa8183d91 100644 --- a/athena-system-config/src/main/java/com/qubitpi/athena/config/LayeredFileSystemConfig.java +++ b/athena-system-config/src/main/java/org/qubitpi/athena/config/LayeredFileSystemConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.config; +package org.qubitpi.athena.config; import org.apache.commons.configuration2.CompositeConfiguration; import org.apache.commons.configuration2.Configuration; diff --git a/athena-system-config/src/main/java/com/qubitpi/athena/config/MessageFormatter.java b/athena-system-config/src/main/java/org/qubitpi/athena/config/MessageFormatter.java similarity index 99% rename from athena-system-config/src/main/java/com/qubitpi/athena/config/MessageFormatter.java rename to athena-system-config/src/main/java/org/qubitpi/athena/config/MessageFormatter.java index f5467d072..723b550c1 100644 --- a/athena-system-config/src/main/java/com/qubitpi/athena/config/MessageFormatter.java +++ b/athena-system-config/src/main/java/org/qubitpi/athena/config/MessageFormatter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.config; +package org.qubitpi.athena.config; import jakarta.validation.constraints.NotNull; diff --git a/athena-system-config/src/main/java/com/qubitpi/athena/config/SystemConfig.java b/athena-system-config/src/main/java/org/qubitpi/athena/config/SystemConfig.java similarity index 99% rename from athena-system-config/src/main/java/com/qubitpi/athena/config/SystemConfig.java rename to athena-system-config/src/main/java/org/qubitpi/athena/config/SystemConfig.java index 2f9e267c7..7723e9385 100644 --- a/athena-system-config/src/main/java/com/qubitpi/athena/config/SystemConfig.java +++ b/athena-system-config/src/main/java/org/qubitpi/athena/config/SystemConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.config; +package org.qubitpi.athena.config; import jakarta.validation.constraints.NotNull; diff --git a/athena-system-config/src/main/java/com/qubitpi/athena/config/SystemConfigFactory.java b/athena-system-config/src/main/java/org/qubitpi/athena/config/SystemConfigFactory.java similarity index 98% rename from athena-system-config/src/main/java/com/qubitpi/athena/config/SystemConfigFactory.java rename to athena-system-config/src/main/java/org/qubitpi/athena/config/SystemConfigFactory.java index 5672b594f..fe3cd0b4c 100644 --- a/athena-system-config/src/main/java/com/qubitpi/athena/config/SystemConfigFactory.java +++ b/athena-system-config/src/main/java/org/qubitpi/athena/config/SystemConfigFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.config; +package org.qubitpi.athena.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/athena-system-config/src/test/groovy/com/qubitpi/athena/config/ConfigResourceLoaderSpec.groovy b/athena-system-config/src/test/groovy/org/qubitpi/athena/config/ConfigResourceLoaderSpec.groovy similarity index 93% rename from athena-system-config/src/test/groovy/com/qubitpi/athena/config/ConfigResourceLoaderSpec.groovy rename to athena-system-config/src/test/groovy/org/qubitpi/athena/config/ConfigResourceLoaderSpec.groovy index 73e74f15b..16d4c7451 100644 --- a/athena-system-config/src/test/groovy/com/qubitpi/athena/config/ConfigResourceLoaderSpec.groovy +++ b/athena-system-config/src/test/groovy/org/qubitpi/athena/config/ConfigResourceLoaderSpec.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.config +package org.qubitpi.athena.config import org.apache.commons.configuration2.Configuration @@ -40,6 +40,6 @@ class ConfigResourceLoaderSpec extends Specification { then: configurations.collect{ it.getString("athena__resource_binder") } as Set == - ["com.qubitpi.athena.example.books.application.BooksBinderFactory"] as Set + ["org.qubitpi.athena.example.books.application.BooksBinderFactory"] as Set } } diff --git a/athena-system-config/src/test/groovy/com/qubitpi/athena/config/LayeredFileSystemConfigSpec.groovy b/athena-system-config/src/test/groovy/org/qubitpi/athena/config/LayeredFileSystemConfigSpec.groovy similarity index 95% rename from athena-system-config/src/test/groovy/com/qubitpi/athena/config/LayeredFileSystemConfigSpec.groovy rename to athena-system-config/src/test/groovy/org/qubitpi/athena/config/LayeredFileSystemConfigSpec.groovy index 8549a4a25..89fbe8e31 100644 --- a/athena-system-config/src/test/groovy/com/qubitpi/athena/config/LayeredFileSystemConfigSpec.groovy +++ b/athena-system-config/src/test/groovy/org/qubitpi/athena/config/LayeredFileSystemConfigSpec.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.config +package org.qubitpi.athena.config class LayeredFileSystemConfigSpec extends SystemConfigSpec { diff --git a/athena-system-config/src/test/groovy/com/qubitpi/athena/config/SystemConfigFactorySpec.groovy b/athena-system-config/src/test/groovy/org/qubitpi/athena/config/SystemConfigFactorySpec.groovy similarity index 95% rename from athena-system-config/src/test/groovy/com/qubitpi/athena/config/SystemConfigFactorySpec.groovy rename to athena-system-config/src/test/groovy/org/qubitpi/athena/config/SystemConfigFactorySpec.groovy index fe8b98e48..7e4ca6798 100644 --- a/athena-system-config/src/test/groovy/com/qubitpi/athena/config/SystemConfigFactorySpec.groovy +++ b/athena-system-config/src/test/groovy/org/qubitpi/athena/config/SystemConfigFactorySpec.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.config +package org.qubitpi.athena.config class SystemConfigFactorySpec extends SystemConfigSpec { diff --git a/athena-system-config/src/test/groovy/com/qubitpi/athena/config/SystemConfigSpec.groovy b/athena-system-config/src/test/groovy/org/qubitpi/athena/config/SystemConfigSpec.groovy similarity index 99% rename from athena-system-config/src/test/groovy/com/qubitpi/athena/config/SystemConfigSpec.groovy rename to athena-system-config/src/test/groovy/org/qubitpi/athena/config/SystemConfigSpec.groovy index 965ee0bbb..06f451a40 100644 --- a/athena-system-config/src/test/groovy/com/qubitpi/athena/config/SystemConfigSpec.groovy +++ b/athena-system-config/src/test/groovy/org/qubitpi/athena/config/SystemConfigSpec.groovy @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.qubitpi.athena.config +package org.qubitpi.athena.config import spock.lang.Shared import spock.lang.Specification diff --git a/athena-system-config/src/test/resources/sysConfigTestApplication.properties b/athena-system-config/src/test/resources/sysConfigTestApplication.properties index c3e450508..c993daaea 100644 --- a/athena-system-config/src/test/resources/sysConfigTestApplication.properties +++ b/athena-system-config/src/test/resources/sysConfigTestApplication.properties @@ -1 +1 @@ -athena__resource_binder=com.qubitpi.athena.example.books.application.BooksBinderFactory +athena__resource_binder=org.qubitpi.athena.example.books.application.BooksBinderFactory diff --git a/docs/pages/apidocs/allclasses-frame.html b/docs/pages/apidocs/allclasses-frame.html index dced7acb4..c3f30f08c 100644 --- a/docs/pages/apidocs/allclasses-frame.html +++ b/docs/pages/apidocs/allclasses-frame.html @@ -13,31 +13,31 @@

All Classes

diff --git a/docs/pages/apidocs/allclasses-noframe.html b/docs/pages/apidocs/allclasses-noframe.html index d1cf0cb57..afb28d80b 100644 --- a/docs/pages/apidocs/allclasses-noframe.html +++ b/docs/pages/apidocs/allclasses-noframe.html @@ -13,31 +13,31 @@

All Classes

diff --git a/docs/pages/apidocs/com/qubitpi/athena/application/AbstractBinderFactory.html b/docs/pages/apidocs/com/qubitpi/athena/application/AbstractBinderFactory.html index 4eea5fdda..45816222a 100644 --- a/docs/pages/apidocs/com/qubitpi/athena/application/AbstractBinderFactory.html +++ b/docs/pages/apidocs/com/qubitpi/athena/application/AbstractBinderFactory.html @@ -51,7 +51,7 @@
  • Frames
    • @@ -93,7 +93,7 @@
    -
    com.qubitpi.athena.application
    +
    org.qubitpi.athena.application

    Class AbstractBinderFactory

    @@ -101,7 +101,7 @@

    Class AbstractBinderFactor
  • java.lang.Object
    • -
    • com.qubitpi.athena.application.AbstractBinderFactory
      • +
    • application.org.qubitpi.athena.AbstractBinderFactory

@@ -110,16 +110,16 @@

Class AbstractBinderFactor
  • All Implemented Interfaces:
    -
    BinderFactory
    +
    BinderFactory

    public abstract class AbstractBinderFactory
 extends Object
-implements BinderFactory
    -
    AbstractBinderFactory implements standard buildBinder functionality. +implements BinderFactory +
    AbstractBinderFactory implements standard buildBinder functionality.

    - It is left to individual projects to subclass, providing FileStore and MetaStore classes, etc.

    + It is left to individual projects to subclass, providing FileStore and MetaStore classes, etc.

    • @@ -163,7 +163,7 @@

    Method Summary

    void -afterRegistration(ResourceConfig resourceConfig) +afterRegistration(ResourceConfig resourceConfig)
    Allows additional app-specific Jersey feature registration and config.
    @@ -174,38 +174,38 @@

    Method Summary

    -protected @NotNull FileIdGenerator +protected @NotNull FileIdGenerator buildFileIdGenerator()
    Initializes service for generating file ID's.
    -protected abstract @NotNull Class<? extends FileStore> +protected abstract @NotNull Class<? extends FileStore> buildFileStore()
    Registers file data storage.
    -protected @NotNull JsonDocumentParser +protected @NotNull JsonDocumentParser buildJsonDocumentParser()
    Initializes service for parsing client GraphQL request JSON.
    -protected abstract @NotNull Class<? extends MetaStore> +protected abstract @NotNull Class<? extends MetaStore> buildMetaStore()
    Registers GraphQL service that provides file metadata read/write API.
    -protected abstract @NotNull graphql.schema.DataFetcher<MetaData> +protected abstract @NotNull graphql.schema.DataFetcher<MetaData> buildMutationDataFetcher()
    Similar to buildQueryDataFetcher(), this method binds an object responsible for executing the mutation - and returning some sensible output values of MetaData.
    + and returning some sensible output values of MetaData. -protected abstract @NotNull graphql.schema.DataFetcher<MetaData> +protected abstract @NotNull graphql.schema.DataFetcher<MetaData> buildQueryDataFetcher()
    Registers an object responsible for retrieving, from metadata database, a data value back for a given graphql field, i.e.
    @@ -264,24 +264,24 @@

    buildBinder

    Check metrics
    Specified by:
    -
    buildBinder in interface BinderFactory
    +
    buildBinder in interface BinderFactory
    Returns:
    a binder instance
    - +

    • afterRegistration

      -
      public void afterRegistration(ResourceConfig resourceConfig)
      -
      Description copied from interface: BinderFactory
      +
      public void afterRegistration(ResourceConfig resourceConfig)
      +
      Description copied from interface: BinderFactory
      Allows additional app-specific Jersey feature registration and config.
      Specified by:
      -
      afterRegistration in interface BinderFactory
      +
      afterRegistration in interface BinderFactory
      Parameters:
      resourceConfig - Resource config to use for accessing the configuration
      @@ -294,7 +294,7 @@

      afterRegistration

    • buildFileStore

      @NotNull
-protected abstract @NotNull Class<? extends FileStore> buildFileStore()
      +protected abstract @NotNull Class<? extends FileStore> buildFileStore()
      Registers file data storage.
      Returns:
      @@ -309,7 +309,7 @@

      buildFileStore

    • buildMetaStore

      @NotNull
-protected abstract @NotNull Class<? extends MetaStore> buildMetaStore()
      +protected abstract @NotNull Class<? extends MetaStore> buildMetaStore()
      Registers GraphQL service that provides file metadata read/write API.
      Returns:
      @@ -324,10 +324,10 @@

      buildMetaStore

    • buildQueryDataFetcher

      @NotNull
-protected abstract @NotNull graphql.schema.DataFetcher<MetaData> buildQueryDataFetcher()
      +protected abstract @NotNull graphql.schema.DataFetcher<MetaData> buildQueryDataFetcher()
      Registers an object responsible for retrieving, from metadata database, a data value back for a given graphql - field, i.e. MetaData object; the graphql engine uses this data fetcher to resolve/fetch a - MetaData into a runtime object that will be sent back as part of the overall graphql + field, i.e. MetaData object; the graphql engine uses this data fetcher to resolve/fetch a + MetaData into a runtime object that will be sent back as part of the overall graphql ExecutionResult
      Returns:
      @@ -342,9 +342,9 @@

      buildQueryDataFetcher

    • buildMutationDataFetcher

      @NotNull
-protected abstract @NotNull graphql.schema.DataFetcher<MetaData> buildMutationDataFetcher()
      +protected abstract @NotNull graphql.schema.DataFetcher<MetaData> buildMutationDataFetcher()
      Similar to buildQueryDataFetcher(), this method binds an object responsible for executing the mutation - and returning some sensible output values of MetaData.
      + and returning some sensible output values of MetaData.
      Returns:
      a native GraphQL DataFetcher instance
      @@ -360,11 +360,11 @@

      buildMutationDataFetcher

    • buildFileIdGenerator

      @NotNull
-protected @NotNull FileIdGenerator buildFileIdGenerator()
      +protected @NotNull FileIdGenerator buildFileIdGenerator()
      Initializes service for generating file ID's.
      Returns:
      -
      a new instance of FileIdGenerator
      +
      a new instance of FileIdGenerator
    @@ -375,7 +375,7 @@

    buildFileIdGenerator

  • buildJsonDocumentParser

    @NotNull
-protected @NotNull JsonDocumentParser buildJsonDocumentParser()
    +protected @NotNull JsonDocumentParser buildJsonDocumentParser()
    Initializes service for parsing client GraphQL request JSON.
    Returns:
    @@ -427,7 +427,7 @@

    afterBinding

    • Frames
      • diff --git a/docs/pages/apidocs/com/qubitpi/athena/application/BinderFactory.html b/docs/pages/apidocs/com/qubitpi/athena/application/BinderFactory.html index e3b9f20c4..dd56fe56c 100644 --- a/docs/pages/apidocs/com/qubitpi/athena/application/BinderFactory.html +++ b/docs/pages/apidocs/com/qubitpi/athena/application/BinderFactory.html @@ -50,8 +50,8 @@
    • - +

    • afterRegistration

      void afterRegistration(@NotNull
-                       @NotNull ResourceConfig resourceConfig)
      + @NotNull ResourceConfig resourceConfig)
      Allows additional app-specific Jersey feature registration and config.
      Parameters:
      @@ -214,8 +214,8 @@

      afterRegistration

      • Frames
        • diff --git a/docs/pages/apidocs/com/qubitpi/athena/application/ResourceConfig.html b/docs/pages/apidocs/com/qubitpi/athena/application/ResourceConfig.html index 09c0aaef5..162ee8a6f 100644 --- a/docs/pages/apidocs/com/qubitpi/athena/application/ResourceConfig.html +++ b/docs/pages/apidocs/com/qubitpi/athena/application/ResourceConfig.html @@ -44,7 +44,7 @@
        @@ -87,7 +87,7 @@
        -
        com.qubitpi.athena.application
        +
        org.qubitpi.athena.application

        Class ResourceConfig

        @@ -101,7 +101,7 @@

        Class ResourceConfig

      • org.glassfish.jersey.server.ResourceConfig
        • -
        • com.qubitpi.athena.application.ResourceConfig
          • +
        • application.org.qubitpi.athena.ResourceConfig
      @@ -229,7 +229,7 @@

      ResourceConfig

        diff --git a/docs/pages/apidocs/com/qubitpi/athena/application/class-use/AbstractBinderFactory.html b/docs/pages/apidocs/com/qubitpi/athena/application/class-use/AbstractBinderFactory.html index 5077f67f2..739010e55 100644 --- a/docs/pages/apidocs/com/qubitpi/athena/application/class-use/AbstractBinderFactory.html +++ b/docs/pages/apidocs/com/qubitpi/athena/application/class-use/AbstractBinderFactory.html @@ -4,7 +4,7 @@ -Uses of Class com.qubitpi.athena.application.AbstractBinderFactory (Athena: Parent POM 1.0.3 API) +Uses of Class application.org.qubitpi.athena.AbstractBinderFactory (Athena: Parent POM 1.0.3 API) @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ -

        com.qubitpi.athena.application

        +

        org.qubitpi.athena.application

        Interfaces

        Classes

        diff --git a/docs/pages/apidocs/com/qubitpi/athena/application/package-summary.html b/docs/pages/apidocs/com/qubitpi/athena/application/package-summary.html index 2a46b5469..03d01ab7d 100644 --- a/docs/pages/apidocs/com/qubitpi/athena/application/package-summary.html +++ b/docs/pages/apidocs/com/qubitpi/athena/application/package-summary.html @@ -4,7 +4,7 @@ -com.qubitpi.athena.application (Athena: Parent POM 1.0.3 API) +org.qubitpi.athena.application (Athena: Parent POM 1.0.3 API) @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ -

        com.qubitpi.athena.config

        +

        org.qubitpi.athena.config

        Interfaces

        Classes

        Enums

        diff --git a/docs/pages/apidocs/com/qubitpi/athena/config/package-summary.html b/docs/pages/apidocs/com/qubitpi/athena/config/package-summary.html index 684ffaddd..583163e93 100644 --- a/docs/pages/apidocs/com/qubitpi/athena/config/package-summary.html +++ b/docs/pages/apidocs/com/qubitpi/athena/config/package-summary.html @@ -4,7 +4,7 @@ -com.qubitpi.athena.config (Athena: Parent POM 1.0.3 API) +org.qubitpi.athena.config (Athena: Parent POM 1.0.3 API) @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ -

        com.qubitpi.athena.file.identifier

        +

        org.qubitpi.athena.file.identifier

        Interfaces

        Classes

        diff --git a/docs/pages/apidocs/com/qubitpi/athena/file/identifier/package-summary.html b/docs/pages/apidocs/com/qubitpi/athena/file/identifier/package-summary.html index 55e1bb64c..4b52fa585 100644 --- a/docs/pages/apidocs/com/qubitpi/athena/file/identifier/package-summary.html +++ b/docs/pages/apidocs/com/qubitpi/athena/file/identifier/package-summary.html @@ -4,7 +4,7 @@ -com.qubitpi.athena.file.identifier (Athena: Parent POM 1.0.3 API) +org.qubitpi.athena.file.identifier (Athena: Parent POM 1.0.3 API) @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ -

        com.qubitpi.athena.file

        +

        org.qubitpi.athena.file

        Classes

        diff --git a/docs/pages/apidocs/com/qubitpi/athena/file/package-summary.html b/docs/pages/apidocs/com/qubitpi/athena/file/package-summary.html index b38e15836..a0de5b14c 100644 --- a/docs/pages/apidocs/com/qubitpi/athena/file/package-summary.html +++ b/docs/pages/apidocs/com/qubitpi/athena/file/package-summary.html @@ -4,7 +4,7 @@ -com.qubitpi.athena.file (Athena: Parent POM 1.0.3 API) +org.qubitpi.athena.file (Athena: Parent POM 1.0.3 API) @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ -

        com.qubitpi.athena.filestore

        +

        org.qubitpi.athena.filestore

        Interfaces

        diff --git a/docs/pages/apidocs/com/qubitpi/athena/filestore/package-summary.html b/docs/pages/apidocs/com/qubitpi/athena/filestore/package-summary.html index b5ea8436e..4ab96f342 100644 --- a/docs/pages/apidocs/com/qubitpi/athena/filestore/package-summary.html +++ b/docs/pages/apidocs/com/qubitpi/athena/filestore/package-summary.html @@ -4,7 +4,7 @@ -com.qubitpi.athena.filestore (Athena: Parent POM 1.0.3 API) +org.qubitpi.athena.filestore (Athena: Parent POM 1.0.3 API) @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ -

        com.qubitpi.athena.filestore.swift

        +

        org.qubitpi.athena.filestore.swift

        Classes

        diff --git a/docs/pages/apidocs/com/qubitpi/athena/filestore/swift/package-summary.html b/docs/pages/apidocs/com/qubitpi/athena/filestore/swift/package-summary.html index af4064b0e..eaeb4ac89 100644 --- a/docs/pages/apidocs/com/qubitpi/athena/filestore/swift/package-summary.html +++ b/docs/pages/apidocs/com/qubitpi/athena/filestore/swift/package-summary.html @@ -4,7 +4,7 @@ -com.qubitpi.athena.filestore.swift (Athena: Parent POM 1.0.3 API) +org.qubitpi.athena.filestore.swift (Athena: Parent POM 1.0.3 API) @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ -

        com.qubitpi.athena.metadata

        +

        org.qubitpi.athena.metadata

        Classes

        Enums

        diff --git a/docs/pages/apidocs/com/qubitpi/athena/metadata/package-summary.html b/docs/pages/apidocs/com/qubitpi/athena/metadata/package-summary.html index 7a043b447..7643bbfd5 100644 --- a/docs/pages/apidocs/com/qubitpi/athena/metadata/package-summary.html +++ b/docs/pages/apidocs/com/qubitpi/athena/metadata/package-summary.html @@ -4,7 +4,7 @@ -com.qubitpi.athena.metadata (Athena: Parent POM 1.0.3 API) +org.qubitpi.athena.metadata (Athena: Parent POM 1.0.3 API) @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ -

        com.qubitpi.athena.metastore.graphql

        +

        org.qubitpi.athena.metastore.graphql

        Classes

        diff --git a/docs/pages/apidocs/com/qubitpi/athena/metastore/graphql/package-summary.html b/docs/pages/apidocs/com/qubitpi/athena/metastore/graphql/package-summary.html index 87d9d8538..7dbe3205a 100644 --- a/docs/pages/apidocs/com/qubitpi/athena/metastore/graphql/package-summary.html +++ b/docs/pages/apidocs/com/qubitpi/athena/metastore/graphql/package-summary.html @@ -4,7 +4,7 @@ -com.qubitpi.athena.metastore.graphql (Athena: Parent POM 1.0.3 API) +org.qubitpi.athena.metastore.graphql (Athena: Parent POM 1.0.3 API) @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ -

        com.qubitpi.athena.metastore.graphql.query

        +

        org.qubitpi.athena.metastore.graphql.query

        Interfaces

        Classes

        diff --git a/docs/pages/apidocs/com/qubitpi/athena/metastore/graphql/query/package-summary.html b/docs/pages/apidocs/com/qubitpi/athena/metastore/graphql/query/package-summary.html index d5c7e8b9c..c642712aa 100644 --- a/docs/pages/apidocs/com/qubitpi/athena/metastore/graphql/query/package-summary.html +++ b/docs/pages/apidocs/com/qubitpi/athena/metastore/graphql/query/package-summary.html @@ -4,7 +4,7 @@ -com.qubitpi.athena.metastore.graphql.query (Athena: Parent POM 1.0.3 API) +org.qubitpi.athena.metastore.graphql.query (Athena: Parent POM 1.0.3 API) @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ -

        com.qubitpi.athena.metastore

        +

        org.qubitpi.athena.metastore

        Interfaces

        diff --git a/docs/pages/apidocs/com/qubitpi/athena/metastore/package-summary.html b/docs/pages/apidocs/com/qubitpi/athena/metastore/package-summary.html index 303b5eaf6..8f1596933 100644 --- a/docs/pages/apidocs/com/qubitpi/athena/metastore/package-summary.html +++ b/docs/pages/apidocs/com/qubitpi/athena/metastore/package-summary.html @@ -4,7 +4,7 @@ -com.qubitpi.athena.metastore (Athena: Parent POM 1.0.3 API) +org.qubitpi.athena.metastore (Athena: Parent POM 1.0.3 API) @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ -

        com.qubitpi.athena.web.endpoints

        +

        org.qubitpi.athena.web.endpoints

        Classes

        diff --git a/docs/pages/apidocs/com/qubitpi/athena/web/endpoints/package-summary.html b/docs/pages/apidocs/com/qubitpi/athena/web/endpoints/package-summary.html index 8d4b662af..6a7d0b0cd 100644 --- a/docs/pages/apidocs/com/qubitpi/athena/web/endpoints/package-summary.html +++ b/docs/pages/apidocs/com/qubitpi/athena/web/endpoints/package-summary.html @@ -4,7 +4,7 @@ -com.qubitpi.athena.web.endpoints (Athena: Parent POM 1.0.3 API) +org.qubitpi.athena.web.endpoints (Athena: Parent POM 1.0.3 API) @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ -

        com.qubitpi.athena.web.graphql

        +

        org.qubitpi.athena.web.graphql

        Interfaces

        Classes

        diff --git a/docs/pages/apidocs/com/qubitpi/athena/web/graphql/package-summary.html b/docs/pages/apidocs/com/qubitpi/athena/web/graphql/package-summary.html index 999f4e9d2..045130e85 100644 --- a/docs/pages/apidocs/com/qubitpi/athena/web/graphql/package-summary.html +++ b/docs/pages/apidocs/com/qubitpi/athena/web/graphql/package-summary.html @@ -4,7 +4,7 @@ -com.qubitpi.athena.web.graphql (Athena: Parent POM 1.0.3 API) +org.qubitpi.athena.web.graphql (Athena: Parent POM 1.0.3 API) @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@