This is an automated email from the ASF dual-hosted git repository. lahirujayathilake pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/airavata-custos.git
commit ed5c1c20fde6f45b2c7c430ae90fee091401d409 Author: lahiruj <[email protected]> AuthorDate: Fri Oct 17 12:57:58 2025 -0400 Rename amie-decoder to access-ci-service with restructured package organization --- {amie-decoder => access-ci-service}/pom.xml | 6 +- .../assembly/access-ci-service-bin-assembly.xml | 0 .../access/ci/service/AccessCiApplication.java | 6 +- .../custos/access/ci/service}/AmiePoller.java | 24 ++++---- .../access/ci/service/client/amie}/AmieClient.java | 4 +- .../access/ci/service}/config/AmieProperties.java | 71 ++++++++++------------ .../access/ci/service}/config/AppConfig.java | 2 +- .../handler/amie}/DataAccountCreateHandler.java | 6 +- .../handler/amie}/DataProjectCreateHandler.java | 6 +- .../amie}/InformTransactionCompleteHandler.java | 4 +- .../ci/service/handler/amie}/NoOpHandler.java | 4 +- .../ci/service/handler/amie}/PacketHandler.java | 4 +- .../ci/service/handler/amie}/PacketRouter.java | 4 +- .../handler/amie}/RequestAccountCreateHandler.java | 18 +++--- .../amie}/RequestAccountInactivateHandler.java | 8 +-- .../amie}/RequestAccountReactivateHandler.java | 8 +-- .../handler/amie}/RequestPersonMergeHandler.java | 8 +-- .../handler/amie}/RequestProjectCreateHandler.java | 20 +++--- .../amie}/RequestProjectInactivateHandler.java | 10 +-- .../amie}/RequestProjectReactivateHandler.java | 10 +-- .../handler/amie}/RequestUserModifyHandler.java | 8 +-- .../ci/service}/model/ClusterAccountEntity.java | 2 +- .../access/ci/service}/model/PersonDnsEntity.java | 2 +- .../access/ci/service}/model/PersonEntity.java | 2 +- .../access/ci/service}/model/ProjectEntity.java | 2 +- .../ci/service}/model/ProjectMembershipEntity.java | 2 +- .../ci/service/model/amie}/PacketEntity.java | 4 +- .../ci/service/model/amie}/PacketStatus.java | 2 +- .../service/model/amie}/ProcessingErrorEntity.java | 4 +- .../service/model/amie}/ProcessingEventEntity.java | 4 +- .../service/model/amie}/ProcessingEventType.java | 2 +- .../ci/service/model/amie}/ProcessingStatus.java | 2 +- .../ci/service}/repo/ClusterAccountRepository.java | 4 +- .../ci/service}/repo/PersonDnsRepository.java | 4 +- .../access/ci/service}/repo/PersonRepository.java | 4 +- .../service}/repo/ProjectMembershipRepository.java | 4 +- .../access/ci/service}/repo/ProjectRepository.java | 4 +- .../ci/service/repo/amie}/PacketRepository.java | 6 +- .../repo/amie}/ProcessingErrorRepository.java | 4 +- .../repo/amie}/ProcessingEventRepository.java | 8 +-- .../access/ci/service}/service/PersonService.java | 14 ++--- .../service}/service/ProjectMembershipService.java | 16 ++--- .../access/ci/service}/service/ProjectService.java | 6 +- .../ci/service}/service/UserAccountService.java | 8 +-- .../custos/access/ci/service}/util/ProtoUtils.java | 10 +-- .../worker/amie}/ProcessingEventWorker.java | 24 ++++---- .../src/main/proto/amie_packets.proto | 2 +- .../src/main/proto/internal_events.proto | 4 +- .../src/main/resources/application.yml | 6 +- .../db/migration/V1__initial_migration.sql | 34 +++++------ .../resources/distribution/bin/amie-decoder.sh | 0 .../resources/distribution/bin/custos-daemon.sh | 0 .../src/main/resources/distribution/bin/setenv.sh | 0 .../resources/distribution/conf/application.yml | 12 ++-- .../distribution/conf}/logback-spring.xml | 4 +- .../src/main/resources}/logback-spring.xml | 4 +- .../amie}/DataAccountCreateHandlerTest.java | 8 +-- .../amie}/DataProjectCreateHandlerTest.java | 14 ++--- .../InformTransactionCompleteHandlerTest.java | 12 ++-- .../ci/service/handler/amie}/NoOpHandlerTest.java | 4 +- .../ci/service/handler/amie}/PacketRouterTest.java | 4 +- .../amie}/RequestAccountCreateHandlerTest.java | 20 +++--- .../amie}/RequestAccountInactivateHandlerTest.java | 10 +-- .../amie}/RequestAccountReactivateHandlerTest.java | 10 +-- .../amie}/RequestPersonMergeHandlerTest.java | 10 +-- .../amie}/RequestProjectCreateHandlerTest.java | 22 +++---- .../amie}/RequestProjectInactivateHandlerTest.java | 12 ++-- .../amie}/RequestProjectReactivateHandlerTest.java | 12 ++-- .../amie}/RequestUserModifyHandlerTest.java | 10 +-- .../ci/service}/service/PersonServiceTest.java | 14 ++--- .../service/ProjectMembershipServiceTest.java | 16 ++--- .../ci/service}/service/ProjectServiceTest.java | 6 +- .../service}/service/UserAccountServiceTest.java | 8 +-- .../access/ci/service}/util/JsonTestUtils.java | 2 +- .../access/ci/service}/util/ProtoUtilsTest.java | 10 +-- .../src/test/resources/application-test.yml | 7 ++- .../src/test/resources/logback-test.xml | 0 .../data_account_create/incoming-data.json | 0 .../data_account_create/outgoing-inform.json | 0 .../data_project_create/incoming-data.json | 0 .../data_project_create/outgoing-inform.json | 0 .../incoming-inform.json | 0 .../request_account_create/incoming-request.json | 0 .../request_account_create/outgoing-notify.json | 0 .../incoming-request.json | 0 .../outgoing-notify.json | 0 .../incoming-request.json | 0 .../outgoing-notify.json | 0 .../request_person_merge/incoming-request.json | 0 .../request_person_merge/outgoing-inform.json | 0 .../request_project_create/incoming-request.json | 0 .../request_project_create/outgoing-notify.json | 0 .../incoming-request.json | 0 .../outgoing-notify.json | 0 .../incoming-request.json | 0 .../outgoing-notify.json | 0 .../incoming-request.json | 0 .../outgoing-inform.json | 0 .../incoming-request.json | 0 .../outgoing-inform.json | 0 pom.xml | 4 +- 101 files changed, 329 insertions(+), 327 deletions(-) diff --git a/amie-decoder/pom.xml b/access-ci-service/pom.xml similarity index 96% rename from amie-decoder/pom.xml rename to access-ci-service/pom.xml index af78ecb9f..1dcf9852f 100644 --- a/amie-decoder/pom.xml +++ b/access-ci-service/pom.xml @@ -27,7 +27,7 @@ <version>1.2-SNAPSHOT</version> </parent> - <artifactId>amie-decoder-service</artifactId> + <artifactId>access-ci-service</artifactId> <dependencies> <dependency> @@ -128,9 +128,9 @@ </goals> <configuration> <tarLongFileMode>posix</tarLongFileMode> - <finalName>${amie.service.dist.name}</finalName> + <finalName>${access.service.dist.name}</finalName> <descriptors> - <descriptor>src/main/assembly/amie-decoder-bin-assembly.xml</descriptor> + <descriptor>src/main/assembly/access-ci-service-bin-assembly.xml</descriptor> </descriptors> <attach>false</attach> </configuration> diff --git a/amie-decoder/src/main/assembly/amie-decoder-bin-assembly.xml b/access-ci-service/src/main/assembly/access-ci-service-bin-assembly.xml similarity index 100% rename from amie-decoder/src/main/assembly/amie-decoder-bin-assembly.xml rename to access-ci-service/src/main/assembly/access-ci-service-bin-assembly.xml diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/AmieDecoderApplication.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/AccessCiApplication.java similarity index 89% rename from amie-decoder/src/main/java/org/apache/custos/amie/AmieDecoderApplication.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/AccessCiApplication.java index 6dffe2d0f..9f2b70428 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/AmieDecoderApplication.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/AccessCiApplication.java @@ -17,7 +17,7 @@ * under the License. * */ -package org.apache.custos.amie; +package org.apache.custos.access.ci.service; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -27,8 +27,8 @@ import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication @EnableJpaAuditing @EnableScheduling -public class AmieDecoderApplication { +public class AccessCiApplication { public static void main(String[] args) { - SpringApplication.run(AmieDecoderApplication.class, args); + SpringApplication.run(AccessCiApplication.class, args); } } diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/AmiePoller.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/AmiePoller.java similarity index 84% rename from amie-decoder/src/main/java/org/apache/custos/amie/AmiePoller.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/AmiePoller.java index c4626595b..7a179aff8 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/AmiePoller.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/AmiePoller.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie; +package org.apache.custos.access.ci.service; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.custos.amie.client.AmieClient; -import org.apache.custos.amie.model.PacketEntity; -import org.apache.custos.amie.model.PacketStatus; -import org.apache.custos.amie.model.ProcessingEventEntity; -import org.apache.custos.amie.model.ProcessingEventType; -import org.apache.custos.amie.model.ProcessingStatus; -import org.apache.custos.amie.repo.PacketRepository; -import org.apache.custos.amie.repo.ProcessingEventRepository; -import org.apache.custos.amie.util.ProtoUtils; +import org.apache.custos.access.ci.service.client.amie.AmieClient; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; +import org.apache.custos.access.ci.service.model.amie.PacketStatus; +import org.apache.custos.access.ci.service.model.amie.ProcessingEventEntity; +import org.apache.custos.access.ci.service.model.amie.ProcessingEventType; +import org.apache.custos.access.ci.service.model.amie.ProcessingStatus; +import org.apache.custos.access.ci.service.repo.amie.PacketRepository; +import org.apache.custos.access.ci.service.repo.amie.ProcessingEventRepository; +import org.apache.custos.access.ci.service.util.ProtoUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -43,7 +43,7 @@ import java.util.List; * persists them to the database, and later for processing. */ @Component -@ConditionalOnProperty(name = "amie.poller.enabled", havingValue = "true", matchIfMissing = true) +@ConditionalOnProperty(name = "access.amie.poller.enabled", havingValue = "true", matchIfMissing = true) public class AmiePoller { private static final Logger LOGGER = LoggerFactory.getLogger(AmiePoller.class); @@ -59,7 +59,7 @@ public class AmiePoller { } - @Scheduled(fixedDelayString = "#{T(org.springframework.boot.convert.DurationStyle).detectAndParse('${app.amie.scheduler.poll-delay}').toMillis()}") + @Scheduled(fixedDelayString = "#{T(org.springframework.boot.convert.DurationStyle).detectAndParse('${access.amie.scheduler.poll-delay}').toMillis()}") @Transactional public void pollForPackets() { LOGGER.info("Polling for new AMIE packets..."); diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/client/AmieClient.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/client/amie/AmieClient.java similarity index 98% rename from amie-decoder/src/main/java/org/apache/custos/amie/client/AmieClient.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/client/amie/AmieClient.java index f025c82fa..8634524c7 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/client/AmieClient.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/client/amie/AmieClient.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.client; +package org.apache.custos.access.ci.service.client.amie; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.custos.amie.config.AmieProperties; +import org.apache.custos.access.ci.service.config.AmieProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/config/AmieProperties.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/config/AmieProperties.java similarity index 96% rename from amie-decoder/src/main/java/org/apache/custos/amie/config/AmieProperties.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/config/AmieProperties.java index a4daac8ae..d4e08eee9 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/config/AmieProperties.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/config/AmieProperties.java @@ -16,34 +16,61 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.config; +package org.apache.custos.access.ci.service.config; import org.springframework.boot.context.properties.ConfigurationProperties; import java.time.Duration; -@ConfigurationProperties(prefix = "app.amie") +@ConfigurationProperties(prefix = "access.amie") public class AmieProperties { + private final Scheduler scheduler = new Scheduler(); + private final Client client = new Client(); /** * The base URL for the AMIE Client API. */ private String baseUrl; - /** * ACCESS CI provided site code (e.g., "NEXUS") for the XA-SITE header */ private String siteCode; - /** * ACCESS CI provided API key for the XA-API-KEY header */ private String apiKey; + public String getBaseUrl() { + return baseUrl; + } - private final Scheduler scheduler = new Scheduler(); + public void setBaseUrl(String baseUrl) { + this.baseUrl = baseUrl; + } - private final Client client = new Client(); + public String getSiteCode() { + return siteCode; + } + + public void setSiteCode(String siteCode) { + this.siteCode = siteCode; + } + + public String getApiKey() { + return apiKey; + } + + public void setApiKey(String apiKey) { + this.apiKey = apiKey; + } + + public Scheduler getScheduler() { + return scheduler; + } + + public Client getClient() { + return client; + } public static class Scheduler { private Duration pollDelay = Duration.ofSeconds(30); @@ -86,36 +113,4 @@ public class AmieProperties { this.readTimeout = readTimeout; } } - - public String getBaseUrl() { - return baseUrl; - } - - public void setBaseUrl(String baseUrl) { - this.baseUrl = baseUrl; - } - - public String getSiteCode() { - return siteCode; - } - - public void setSiteCode(String siteCode) { - this.siteCode = siteCode; - } - - public String getApiKey() { - return apiKey; - } - - public void setApiKey(String apiKey) { - this.apiKey = apiKey; - } - - public Scheduler getScheduler() { - return scheduler; - } - - public Client getClient() { - return client; - } } diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/config/AppConfig.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/config/AppConfig.java similarity index 96% rename from amie-decoder/src/main/java/org/apache/custos/amie/config/AppConfig.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/config/AppConfig.java index a56fb6b01..740890ac2 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/config/AppConfig.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/config/AppConfig.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.config; +package org.apache.custos.access.ci.service.config; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.web.client.RestTemplateBuilder; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/handler/DataAccountCreateHandler.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/DataAccountCreateHandler.java similarity index 94% rename from amie-decoder/src/main/java/org/apache/custos/amie/handler/DataAccountCreateHandler.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/DataAccountCreateHandler.java index 305629bfd..4a1165e62 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/handler/DataAccountCreateHandler.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/DataAccountCreateHandler.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.custos.amie.client.AmieClient; -import org.apache.custos.amie.model.PacketEntity; +import org.apache.custos.access.ci.service.client.amie.AmieClient; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/handler/DataProjectCreateHandler.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/DataProjectCreateHandler.java similarity index 94% rename from amie-decoder/src/main/java/org/apache/custos/amie/handler/DataProjectCreateHandler.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/DataProjectCreateHandler.java index 0d30d7451..0ca934b92 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/handler/DataProjectCreateHandler.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/DataProjectCreateHandler.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.custos.amie.client.AmieClient; -import org.apache.custos.amie.model.PacketEntity; +import org.apache.custos.access.ci.service.client.amie.AmieClient; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/handler/InformTransactionCompleteHandler.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/InformTransactionCompleteHandler.java similarity index 93% rename from amie-decoder/src/main/java/org/apache/custos/amie/handler/InformTransactionCompleteHandler.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/InformTransactionCompleteHandler.java index 5fbb37cb8..e9b5b555c 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/handler/InformTransactionCompleteHandler.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/InformTransactionCompleteHandler.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.custos.amie.model.PacketEntity; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/handler/NoOpHandler.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/NoOpHandler.java similarity index 92% rename from amie-decoder/src/main/java/org/apache/custos/amie/handler/NoOpHandler.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/NoOpHandler.java index c009734c9..d391c9fb8 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/handler/NoOpHandler.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/NoOpHandler.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.custos.amie.model.PacketEntity; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/handler/PacketHandler.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/PacketHandler.java similarity index 92% rename from amie-decoder/src/main/java/org/apache/custos/amie/handler/PacketHandler.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/PacketHandler.java index 9e763b516..16ef89cf9 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/handler/PacketHandler.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/PacketHandler.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.custos.amie.model.PacketEntity; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; public interface PacketHandler { diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/handler/PacketRouter.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/PacketRouter.java similarity index 94% rename from amie-decoder/src/main/java/org/apache/custos/amie/handler/PacketRouter.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/PacketRouter.java index 50af2c1cd..8b7716d88 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/handler/PacketRouter.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/PacketRouter.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.custos.amie.model.PacketEntity; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; import org.springframework.stereotype.Component; import java.util.List; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestAccountCreateHandler.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestAccountCreateHandler.java similarity index 89% rename from amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestAccountCreateHandler.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestAccountCreateHandler.java index be44aab0b..3aa10ea3b 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestAccountCreateHandler.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestAccountCreateHandler.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.custos.amie.client.AmieClient; -import org.apache.custos.amie.model.ClusterAccountEntity; -import org.apache.custos.amie.model.PacketEntity; -import org.apache.custos.amie.model.PersonEntity; -import org.apache.custos.amie.service.PersonService; -import org.apache.custos.amie.service.ProjectMembershipService; -import org.apache.custos.amie.service.ProjectService; -import org.apache.custos.amie.service.UserAccountService; +import org.apache.custos.access.ci.service.client.amie.AmieClient; +import org.apache.custos.access.ci.service.model.ClusterAccountEntity; +import org.apache.custos.access.ci.service.model.PersonEntity; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; +import org.apache.custos.access.ci.service.service.PersonService; +import org.apache.custos.access.ci.service.service.ProjectMembershipService; +import org.apache.custos.access.ci.service.service.ProjectService; +import org.apache.custos.access.ci.service.service.UserAccountService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestAccountInactivateHandler.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestAccountInactivateHandler.java similarity index 93% rename from amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestAccountInactivateHandler.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestAccountInactivateHandler.java index eadfbda24..03dffbf53 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestAccountInactivateHandler.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestAccountInactivateHandler.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.custos.amie.client.AmieClient; -import org.apache.custos.amie.model.PacketEntity; -import org.apache.custos.amie.service.ProjectMembershipService; +import org.apache.custos.access.ci.service.client.amie.AmieClient; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; +import org.apache.custos.access.ci.service.service.ProjectMembershipService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestAccountReactivateHandler.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestAccountReactivateHandler.java similarity index 93% rename from amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestAccountReactivateHandler.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestAccountReactivateHandler.java index 4403cf82b..28103a5a2 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestAccountReactivateHandler.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestAccountReactivateHandler.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.custos.amie.client.AmieClient; -import org.apache.custos.amie.model.PacketEntity; -import org.apache.custos.amie.service.ProjectMembershipService; +import org.apache.custos.access.ci.service.client.amie.AmieClient; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; +import org.apache.custos.access.ci.service.service.ProjectMembershipService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestPersonMergeHandler.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestPersonMergeHandler.java similarity index 93% rename from amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestPersonMergeHandler.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestPersonMergeHandler.java index 6feda885b..3f539e2c5 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestPersonMergeHandler.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestPersonMergeHandler.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.custos.amie.client.AmieClient; -import org.apache.custos.amie.model.PacketEntity; -import org.apache.custos.amie.service.PersonService; +import org.apache.custos.access.ci.service.client.amie.AmieClient; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; +import org.apache.custos.access.ci.service.service.PersonService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestProjectCreateHandler.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestProjectCreateHandler.java similarity index 90% rename from amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestProjectCreateHandler.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestProjectCreateHandler.java index 66d109b13..a2fb6d8b9 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestProjectCreateHandler.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestProjectCreateHandler.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.custos.amie.client.AmieClient; -import org.apache.custos.amie.model.ClusterAccountEntity; -import org.apache.custos.amie.model.PacketEntity; -import org.apache.custos.amie.model.PersonEntity; -import org.apache.custos.amie.model.ProjectEntity; -import org.apache.custos.amie.service.PersonService; -import org.apache.custos.amie.service.ProjectMembershipService; -import org.apache.custos.amie.service.ProjectService; -import org.apache.custos.amie.service.UserAccountService; +import org.apache.custos.access.ci.service.client.amie.AmieClient; +import org.apache.custos.access.ci.service.model.ClusterAccountEntity; +import org.apache.custos.access.ci.service.model.PersonEntity; +import org.apache.custos.access.ci.service.model.ProjectEntity; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; +import org.apache.custos.access.ci.service.service.PersonService; +import org.apache.custos.access.ci.service.service.ProjectMembershipService; +import org.apache.custos.access.ci.service.service.ProjectService; +import org.apache.custos.access.ci.service.service.UserAccountService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestProjectInactivateHandler.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestProjectInactivateHandler.java similarity index 90% rename from amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestProjectInactivateHandler.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestProjectInactivateHandler.java index 38b980856..542418f83 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestProjectInactivateHandler.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestProjectInactivateHandler.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.custos.amie.client.AmieClient; -import org.apache.custos.amie.model.PacketEntity; -import org.apache.custos.amie.service.ProjectMembershipService; -import org.apache.custos.amie.service.ProjectService; +import org.apache.custos.access.ci.service.client.amie.AmieClient; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; +import org.apache.custos.access.ci.service.service.ProjectMembershipService; +import org.apache.custos.access.ci.service.service.ProjectService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestProjectReactivateHandler.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestProjectReactivateHandler.java similarity index 91% rename from amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestProjectReactivateHandler.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestProjectReactivateHandler.java index 0acd38992..e842418a8 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestProjectReactivateHandler.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestProjectReactivateHandler.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.custos.amie.client.AmieClient; -import org.apache.custos.amie.model.PacketEntity; -import org.apache.custos.amie.service.ProjectMembershipService; -import org.apache.custos.amie.service.ProjectService; +import org.apache.custos.access.ci.service.client.amie.AmieClient; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; +import org.apache.custos.access.ci.service.service.ProjectMembershipService; +import org.apache.custos.access.ci.service.service.ProjectService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestUserModifyHandler.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestUserModifyHandler.java similarity index 92% rename from amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestUserModifyHandler.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestUserModifyHandler.java index 05f32ddbc..8c04270e4 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/handler/RequestUserModifyHandler.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/handler/amie/RequestUserModifyHandler.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.custos.amie.client.AmieClient; -import org.apache.custos.amie.model.PacketEntity; -import org.apache.custos.amie.service.PersonService; +import org.apache.custos.access.ci.service.client.amie.AmieClient; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; +import org.apache.custos.access.ci.service.service.PersonService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/model/ClusterAccountEntity.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/ClusterAccountEntity.java similarity index 98% rename from amie-decoder/src/main/java/org/apache/custos/amie/model/ClusterAccountEntity.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/ClusterAccountEntity.java index 4d7b834dc..81d906d5e 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/model/ClusterAccountEntity.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/ClusterAccountEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.model; +package org.apache.custos.access.ci.service.model; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/model/PersonDnsEntity.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/PersonDnsEntity.java similarity index 97% rename from amie-decoder/src/main/java/org/apache/custos/amie/model/PersonDnsEntity.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/PersonDnsEntity.java index 911d61ba5..ef4f61297 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/model/PersonDnsEntity.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/PersonDnsEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.model; +package org.apache.custos.access.ci.service.model; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/model/PersonEntity.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/PersonEntity.java similarity index 99% rename from amie-decoder/src/main/java/org/apache/custos/amie/model/PersonEntity.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/PersonEntity.java index 1603cfcf9..ab8642f46 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/model/PersonEntity.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/PersonEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.model; +package org.apache.custos.access.ci.service.model; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/model/ProjectEntity.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/ProjectEntity.java similarity index 98% rename from amie-decoder/src/main/java/org/apache/custos/amie/model/ProjectEntity.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/ProjectEntity.java index 9d7a60723..e5c52dd44 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/model/ProjectEntity.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/ProjectEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.model; +package org.apache.custos.access.ci.service.model; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/model/ProjectMembershipEntity.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/ProjectMembershipEntity.java similarity index 98% rename from amie-decoder/src/main/java/org/apache/custos/amie/model/ProjectMembershipEntity.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/ProjectMembershipEntity.java index 7f71896c9..a64e6faa8 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/model/ProjectMembershipEntity.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/ProjectMembershipEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.model; +package org.apache.custos.access.ci.service.model; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/model/PacketEntity.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/amie/PacketEntity.java similarity index 97% rename from amie-decoder/src/main/java/org/apache/custos/amie/model/PacketEntity.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/amie/PacketEntity.java index d0aeb0234..0cdad79e0 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/model/PacketEntity.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/amie/PacketEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.model; +package org.apache.custos.access.ci.service.model.amie; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -30,7 +30,7 @@ import java.time.Instant; import java.util.UUID; @Entity -@Table(name = "packets") +@Table(name = "amie_packets") public class PacketEntity { @Id diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/model/PacketStatus.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/amie/PacketStatus.java similarity index 95% rename from amie-decoder/src/main/java/org/apache/custos/amie/model/PacketStatus.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/amie/PacketStatus.java index a35680243..079bb1fb1 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/model/PacketStatus.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/amie/PacketStatus.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.model; +package org.apache.custos.access.ci.service.model.amie; public enum PacketStatus { diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/model/ProcessingErrorEntity.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/amie/ProcessingErrorEntity.java similarity index 96% rename from amie-decoder/src/main/java/org/apache/custos/amie/model/ProcessingErrorEntity.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/amie/ProcessingErrorEntity.java index c268e5c0c..abb5b8002 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/model/ProcessingErrorEntity.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/amie/ProcessingErrorEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.model; +package org.apache.custos.access.ci.service.model.amie; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -32,7 +32,7 @@ import jakarta.persistence.Table; import java.time.Instant; @Entity -@Table(name = "processing_errors") +@Table(name = "amie_processing_errors") public class ProcessingErrorEntity { @Id diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/model/ProcessingEventEntity.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/amie/ProcessingEventEntity.java similarity index 97% rename from amie-decoder/src/main/java/org/apache/custos/amie/model/ProcessingEventEntity.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/amie/ProcessingEventEntity.java index 4056519b3..e03d04d17 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/model/ProcessingEventEntity.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/amie/ProcessingEventEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.model; +package org.apache.custos.access.ci.service.model.amie; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -33,7 +33,7 @@ import java.time.Instant; import java.util.UUID; @Entity -@Table(name = "processing_events") +@Table(name = "amie_processing_events") public class ProcessingEventEntity { @Id diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/model/ProcessingEventType.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/amie/ProcessingEventType.java similarity index 93% rename from amie-decoder/src/main/java/org/apache/custos/amie/model/ProcessingEventType.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/amie/ProcessingEventType.java index e798d5b34..63b005e76 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/model/ProcessingEventType.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/amie/ProcessingEventType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.model; +package org.apache.custos.access.ci.service.model.amie; public enum ProcessingEventType { DECODE_PACKET diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/model/ProcessingStatus.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/amie/ProcessingStatus.java similarity index 95% rename from amie-decoder/src/main/java/org/apache/custos/amie/model/ProcessingStatus.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/amie/ProcessingStatus.java index 7babbfecd..14229c4e6 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/model/ProcessingStatus.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/model/amie/ProcessingStatus.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.model; +package org.apache.custos.access.ci.service.model.amie; public enum ProcessingStatus { diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/repo/ClusterAccountRepository.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/ClusterAccountRepository.java similarity index 90% rename from amie-decoder/src/main/java/org/apache/custos/amie/repo/ClusterAccountRepository.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/ClusterAccountRepository.java index 05b8b2aca..88b9463c0 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/repo/ClusterAccountRepository.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/ClusterAccountRepository.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.repo; +package org.apache.custos.access.ci.service.repo; -import org.apache.custos.amie.model.ClusterAccountEntity; +import org.apache.custos.access.ci.service.model.ClusterAccountEntity; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/repo/PersonDnsRepository.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/PersonDnsRepository.java similarity index 91% rename from amie-decoder/src/main/java/org/apache/custos/amie/repo/PersonDnsRepository.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/PersonDnsRepository.java index 21a71194c..eda7b5125 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/repo/PersonDnsRepository.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/PersonDnsRepository.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.repo; +package org.apache.custos.access.ci.service.repo; -import org.apache.custos.amie.model.PersonDnsEntity; +import org.apache.custos.access.ci.service.model.PersonDnsEntity; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/repo/PersonRepository.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/PersonRepository.java similarity index 92% rename from amie-decoder/src/main/java/org/apache/custos/amie/repo/PersonRepository.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/PersonRepository.java index 1f8254162..d9dacb723 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/repo/PersonRepository.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/PersonRepository.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.repo; +package org.apache.custos.access.ci.service.repo; -import org.apache.custos.amie.model.PersonEntity; +import org.apache.custos.access.ci.service.model.PersonEntity; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/repo/ProjectMembershipRepository.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/ProjectMembershipRepository.java similarity index 92% rename from amie-decoder/src/main/java/org/apache/custos/amie/repo/ProjectMembershipRepository.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/ProjectMembershipRepository.java index 9410c2298..930f350c4 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/repo/ProjectMembershipRepository.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/ProjectMembershipRepository.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.repo; +package org.apache.custos.access.ci.service.repo; -import org.apache.custos.amie.model.ProjectMembershipEntity; +import org.apache.custos.access.ci.service.model.ProjectMembershipEntity; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/repo/ProjectRepository.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/ProjectRepository.java similarity index 89% rename from amie-decoder/src/main/java/org/apache/custos/amie/repo/ProjectRepository.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/ProjectRepository.java index 3c79fb3c7..eb4b3a928 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/repo/ProjectRepository.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/ProjectRepository.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.repo; +package org.apache.custos.access.ci.service.repo; -import org.apache.custos.amie.model.ProjectEntity; +import org.apache.custos.access.ci.service.model.ProjectEntity; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/repo/PacketRepository.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/amie/PacketRepository.java similarity index 86% rename from amie-decoder/src/main/java/org/apache/custos/amie/repo/PacketRepository.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/amie/PacketRepository.java index 5929f0543..58bdacf79 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/repo/PacketRepository.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/amie/PacketRepository.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.repo; +package org.apache.custos.access.ci.service.repo.amie; -import org.apache.custos.amie.model.PacketEntity; -import org.apache.custos.amie.model.PacketStatus; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; +import org.apache.custos.access.ci.service.model.amie.PacketStatus; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/repo/ProcessingErrorRepository.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/amie/ProcessingErrorRepository.java similarity index 88% rename from amie-decoder/src/main/java/org/apache/custos/amie/repo/ProcessingErrorRepository.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/amie/ProcessingErrorRepository.java index a5e76e870..407c287f6 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/repo/ProcessingErrorRepository.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/amie/ProcessingErrorRepository.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.repo; +package org.apache.custos.access.ci.service.repo.amie; -import org.apache.custos.amie.model.ProcessingErrorEntity; +import org.apache.custos.access.ci.service.model.amie.ProcessingErrorEntity; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/repo/ProcessingEventRepository.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/amie/ProcessingEventRepository.java similarity index 84% rename from amie-decoder/src/main/java/org/apache/custos/amie/repo/ProcessingEventRepository.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/amie/ProcessingEventRepository.java index a58b8b2d6..3facb704a 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/repo/ProcessingEventRepository.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/repo/amie/ProcessingEventRepository.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.repo; +package org.apache.custos.access.ci.service.repo.amie; -import org.apache.custos.amie.model.ProcessingEventEntity; -import org.apache.custos.amie.model.ProcessingStatus; +import org.apache.custos.access.ci.service.model.amie.ProcessingEventEntity; +import org.apache.custos.access.ci.service.model.amie.ProcessingStatus; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -32,5 +32,5 @@ import java.util.List; public interface ProcessingEventRepository extends JpaRepository<ProcessingEventEntity, String> { @Query("SELECT e FROM ProcessingEventEntity e JOIN FETCH e.packet WHERE e.status IN :statuses ORDER BY e.createdAt ASC") - List<ProcessingEventEntity> findTop50EventsToProcess(@Param("statuses") Collection<ProcessingStatus> statuses); + List<ProcessingEventEntity> findTop50EventsToProcess(@Param("statuses") Collection<ProcessingStatus> statuses); } diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/service/PersonService.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/service/PersonService.java similarity index 94% rename from amie-decoder/src/main/java/org/apache/custos/amie/service/PersonService.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/service/PersonService.java index 309371432..f5d9a62c5 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/service/PersonService.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/service/PersonService.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.service; +package org.apache.custos.access.ci.service.service; import com.fasterxml.jackson.databind.JsonNode; -import org.apache.custos.amie.model.ClusterAccountEntity; -import org.apache.custos.amie.model.PersonDnsEntity; -import org.apache.custos.amie.model.PersonEntity; -import org.apache.custos.amie.repo.ClusterAccountRepository; -import org.apache.custos.amie.repo.PersonDnsRepository; -import org.apache.custos.amie.repo.PersonRepository; +import org.apache.custos.access.ci.service.model.ClusterAccountEntity; +import org.apache.custos.access.ci.service.model.PersonDnsEntity; +import org.apache.custos.access.ci.service.model.PersonEntity; +import org.apache.custos.access.ci.service.repo.ClusterAccountRepository; +import org.apache.custos.access.ci.service.repo.PersonDnsRepository; +import org.apache.custos.access.ci.service.repo.PersonRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/service/ProjectMembershipService.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/service/ProjectMembershipService.java similarity index 93% rename from amie-decoder/src/main/java/org/apache/custos/amie/service/ProjectMembershipService.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/service/ProjectMembershipService.java index df2ef664b..12471cf95 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/service/ProjectMembershipService.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/service/ProjectMembershipService.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.service; - -import org.apache.custos.amie.model.ClusterAccountEntity; -import org.apache.custos.amie.model.ProjectEntity; -import org.apache.custos.amie.model.ProjectMembershipEntity; -import org.apache.custos.amie.repo.ClusterAccountRepository; -import org.apache.custos.amie.repo.ProjectMembershipRepository; -import org.apache.custos.amie.repo.ProjectRepository; +package org.apache.custos.access.ci.service.service; + +import org.apache.custos.access.ci.service.model.ClusterAccountEntity; +import org.apache.custos.access.ci.service.model.ProjectEntity; +import org.apache.custos.access.ci.service.model.ProjectMembershipEntity; +import org.apache.custos.access.ci.service.repo.ClusterAccountRepository; +import org.apache.custos.access.ci.service.repo.ProjectMembershipRepository; +import org.apache.custos.access.ci.service.repo.ProjectRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/service/ProjectService.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/service/ProjectService.java similarity index 94% rename from amie-decoder/src/main/java/org/apache/custos/amie/service/ProjectService.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/service/ProjectService.java index dad06c9e5..03d9f3c33 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/service/ProjectService.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/service/ProjectService.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.service; +package org.apache.custos.access.ci.service.service; -import org.apache.custos.amie.model.ProjectEntity; -import org.apache.custos.amie.repo.ProjectRepository; +import org.apache.custos.access.ci.service.model.ProjectEntity; +import org.apache.custos.access.ci.service.repo.ProjectRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/service/UserAccountService.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/service/UserAccountService.java similarity index 92% rename from amie-decoder/src/main/java/org/apache/custos/amie/service/UserAccountService.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/service/UserAccountService.java index d1db2f541..c50ba715b 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/service/UserAccountService.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/service/UserAccountService.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.service; +package org.apache.custos.access.ci.service.service; -import org.apache.custos.amie.model.ClusterAccountEntity; -import org.apache.custos.amie.model.PersonEntity; -import org.apache.custos.amie.repo.ClusterAccountRepository; +import org.apache.custos.access.ci.service.model.ClusterAccountEntity; +import org.apache.custos.access.ci.service.model.PersonEntity; +import org.apache.custos.access.ci.service.repo.ClusterAccountRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/util/ProtoUtils.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/util/ProtoUtils.java similarity index 88% rename from amie-decoder/src/main/java/org/apache/custos/amie/util/ProtoUtils.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/util/ProtoUtils.java index b16f27046..ef0689397 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/util/ProtoUtils.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/util/ProtoUtils.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.util; +package org.apache.custos.access.ci.service.util; import com.google.protobuf.Timestamp; -import org.apache.custos.amie.internal.events.v1.DecodeStartedPayload; -import org.apache.custos.amie.internal.events.v1.EventType; -import org.apache.custos.amie.internal.events.v1.ProcessingEvent; -import org.apache.custos.amie.internal.events.v1.ProcessingStatus; +import org.apache.custos.access.ci.service.internal.events.v1.DecodeStartedPayload; +import org.apache.custos.access.ci.service.internal.events.v1.EventType; +import org.apache.custos.access.ci.service.internal.events.v1.ProcessingEvent; +import org.apache.custos.access.ci.service.internal.events.v1.ProcessingStatus; import java.time.Instant; diff --git a/amie-decoder/src/main/java/org/apache/custos/amie/worker/ProcessingEventWorker.java b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/worker/amie/ProcessingEventWorker.java similarity index 87% rename from amie-decoder/src/main/java/org/apache/custos/amie/worker/ProcessingEventWorker.java rename to access-ci-service/src/main/java/org/apache/custos/access/ci/service/worker/amie/ProcessingEventWorker.java index d8a0c7ff8..89e5292ea 100644 --- a/amie-decoder/src/main/java/org/apache/custos/amie/worker/ProcessingEventWorker.java +++ b/access-ci-service/src/main/java/org/apache/custos/access/ci/service/worker/amie/ProcessingEventWorker.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.worker; +package org.apache.custos.access.ci.service.worker.amie; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.custos.amie.handler.PacketRouter; -import org.apache.custos.amie.model.PacketEntity; -import org.apache.custos.amie.model.PacketStatus; -import org.apache.custos.amie.model.ProcessingErrorEntity; -import org.apache.custos.amie.model.ProcessingEventEntity; -import org.apache.custos.amie.model.ProcessingEventType; -import org.apache.custos.amie.model.ProcessingStatus; -import org.apache.custos.amie.repo.PacketRepository; -import org.apache.custos.amie.repo.ProcessingErrorRepository; -import org.apache.custos.amie.repo.ProcessingEventRepository; +import org.apache.custos.access.ci.service.handler.amie.PacketRouter; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; +import org.apache.custos.access.ci.service.model.amie.PacketStatus; +import org.apache.custos.access.ci.service.model.amie.ProcessingErrorEntity; +import org.apache.custos.access.ci.service.model.amie.ProcessingEventEntity; +import org.apache.custos.access.ci.service.model.amie.ProcessingEventType; +import org.apache.custos.access.ci.service.model.amie.ProcessingStatus; +import org.apache.custos.access.ci.service.repo.amie.PacketRepository; +import org.apache.custos.access.ci.service.repo.amie.ProcessingErrorRepository; +import org.apache.custos.access.ci.service.repo.amie.ProcessingEventRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Lazy; @@ -71,7 +71,7 @@ public class ProcessingEventWorker { /** * Runs on a fixed delay, checks for NEW/RETRY_SCHEDULED events, and processes them one by one on a separate transaction. */ - @Scheduled(fixedDelayString = "#{T(org.springframework.boot.convert.DurationStyle).detectAndParse('${app.amie.scheduler.worker-delay}').toMillis()}") + @Scheduled(fixedDelayString = "#{T(org.springframework.boot.convert.DurationStyle).detectAndParse('${access.amie.scheduler.worker-delay}').toMillis()}") public void processPendingEvents() { List<ProcessingEventEntity> eventsToProcess = eventRepo.findTop50EventsToProcess(List.of(ProcessingStatus.NEW, ProcessingStatus.RETRY_SCHEDULED)); diff --git a/amie-decoder/src/main/proto/amie_packets.proto b/access-ci-service/src/main/proto/amie_packets.proto similarity index 99% rename from amie-decoder/src/main/proto/amie_packets.proto rename to access-ci-service/src/main/proto/amie_packets.proto index 760273203..bfbb98758 100644 --- a/amie-decoder/src/main/proto/amie_packets.proto +++ b/access-ci-service/src/main/proto/amie_packets.proto @@ -1,7 +1,7 @@ syntax = "proto3"; option java_multiple_files = true; -package org.apache.custos.amie.v1; +package org.apache.custos.access.ci.service.v1; import "google/protobuf/struct.proto"; import "google/protobuf/timestamp.proto"; diff --git a/amie-decoder/src/main/proto/internal_events.proto b/access-ci-service/src/main/proto/internal_events.proto similarity index 97% rename from amie-decoder/src/main/proto/internal_events.proto rename to access-ci-service/src/main/proto/internal_events.proto index 9efbca89d..3e9f7e72d 100644 --- a/amie-decoder/src/main/proto/internal_events.proto +++ b/access-ci-service/src/main/proto/internal_events.proto @@ -1,7 +1,7 @@ syntax = "proto3"; option java_multiple_files = true; -package org.apache.custos.amie.internal.events.v1; +package org.apache.custos.access.ci.service.internal.events.v1; import "google/protobuf/timestamp.proto"; import "google/protobuf/struct.proto"; @@ -69,7 +69,7 @@ message DecodeSucceededPayload { string packet_db_id = 1; int64 amie_packet_rec_id = 2; - org.apache.custos.amie.v1.Packet packet = 3; + org.apache.custos.access.ci.service.v1.Packet packet = 3; } message DecodeFailedPayload { diff --git a/amie-decoder/src/main/resources/application.yml b/access-ci-service/src/main/resources/application.yml similarity index 93% rename from amie-decoder/src/main/resources/application.yml rename to access-ci-service/src/main/resources/application.yml index 77f2a4a79..49506f8c6 100644 --- a/amie-decoder/src/main/resources/application.yml +++ b/access-ci-service/src/main/resources/application.yml @@ -19,7 +19,7 @@ server: spring: application: - name: amie-decoder-service + name: access-ci-service datasource: url: "jdbc:mariadb://localhost:3306/access_ci" username: admin @@ -37,7 +37,7 @@ spring: enabled: true locations: classpath:db/migration -app: +access: amie: base-url: https://a3mdev.xsede.org/amie-api-test site-code: ${AMIE_SITE_CODE} @@ -57,6 +57,6 @@ logging: springdoc: swagger-ui: - title: CUSTOS AMIE DECODER API + title: CUSTOS ACCESS CI SERVICE API oauth: use-pkce-with-authorization-code-grant: true \ No newline at end of file diff --git a/amie-decoder/src/main/resources/db/migration/V1__initial_migration.sql b/access-ci-service/src/main/resources/db/migration/V1__initial_migration.sql similarity index 87% rename from amie-decoder/src/main/resources/db/migration/V1__initial_migration.sql rename to access-ci-service/src/main/resources/db/migration/V1__initial_migration.sql index 8ab97c78a..57f73937a 100644 --- a/amie-decoder/src/main/resources/db/migration/V1__initial_migration.sql +++ b/access-ci-service/src/main/resources/db/migration/V1__initial_migration.sql @@ -121,7 +121,7 @@ CREATE TABLE project_memberships -- Stores each unique AMIE packet received from the polling endpoint -- ----------------------------- -CREATE TABLE packets +CREATE TABLE amie_packets ( id VARCHAR(255) NOT NULL, amie_id BIGINT NOT NULL, -- packet_rec_id from AMIE @@ -136,8 +136,8 @@ CREATE TABLE packets PRIMARY KEY (id), UNIQUE KEY uq_packets_amie_id (amie_id), - KEY idx_packets_status (status), - KEY idx_packets_received_at (received_at) + KEY idx_amie_packets_status (status), + KEY idx_amie_packets_received_at (received_at) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 @@ -145,10 +145,10 @@ CREATE TABLE packets -- ----------------------------- --- TABLE: processing_events +-- TABLE: amie_processing_events -- Individual processing steps for a given packet -- ----------------------------- -CREATE TABLE processing_events +CREATE TABLE amie_processing_events ( id VARCHAR(255) NOT NULL, packet_id VARCHAR(255) NOT NULL, @@ -162,12 +162,12 @@ CREATE TABLE processing_events last_error TEXT NULL, PRIMARY KEY (id), - CONSTRAINT fk_events_packet FOREIGN KEY (packet_id) REFERENCES packets (id) ON DELETE CASCADE, - UNIQUE KEY uq_events_packet_type (packet_id, type), + CONSTRAINT fk_amie_events_packet FOREIGN KEY (packet_id) REFERENCES amie_packets (id) ON DELETE CASCADE, + UNIQUE KEY uq_amie_events_packet_type (packet_id, type), - KEY idx_events_status (status), - KEY idx_events_packet_id (packet_id), - KEY idx_events_type (type) + KEY idx_amie_events_status (status), + KEY idx_amie_events_packet_id (packet_id), + KEY idx_amie_events_type (type) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 @@ -175,10 +175,10 @@ CREATE TABLE processing_events -- ----------------------------- --- TABLE: processing_errors +-- TABLE: amie_processing_errors -- Processing error logs -- ----------------------------- -CREATE TABLE processing_errors +CREATE TABLE amie_processing_errors ( id BIGINT NOT NULL AUTO_INCREMENT, packet_id VARCHAR(255) NULL, @@ -188,12 +188,12 @@ CREATE TABLE processing_errors detail TEXT NULL, PRIMARY KEY (id), - CONSTRAINT fk_errors_packet FOREIGN KEY (packet_id) REFERENCES packets (id) ON DELETE SET NULL, - CONSTRAINT fk_errors_event FOREIGN KEY (event_id) REFERENCES processing_events (id) ON DELETE SET NULL, + CONSTRAINT fk_errors_amie_packet FOREIGN KEY (packet_id) REFERENCES amie_packets (id) ON DELETE SET NULL, + CONSTRAINT fk_errors_amie_event FOREIGN KEY (event_id) REFERENCES amie_processing_events (id) ON DELETE SET NULL, - KEY idx_errors_packet_id (packet_id), - KEY idx_errors_event_id (event_id), - KEY idx_errors_occurred_at (occurred_at) + KEY idx_errors_amie_packet_id (packet_id), + KEY idx_errors_amie_event_id (event_id), + KEY idx_errors_amie_occurred_at (occurred_at) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 diff --git a/amie-decoder/src/main/resources/distribution/bin/amie-decoder.sh b/access-ci-service/src/main/resources/distribution/bin/amie-decoder.sh similarity index 100% rename from amie-decoder/src/main/resources/distribution/bin/amie-decoder.sh rename to access-ci-service/src/main/resources/distribution/bin/amie-decoder.sh diff --git a/amie-decoder/src/main/resources/distribution/bin/custos-daemon.sh b/access-ci-service/src/main/resources/distribution/bin/custos-daemon.sh similarity index 100% rename from amie-decoder/src/main/resources/distribution/bin/custos-daemon.sh rename to access-ci-service/src/main/resources/distribution/bin/custos-daemon.sh diff --git a/amie-decoder/src/main/resources/distribution/bin/setenv.sh b/access-ci-service/src/main/resources/distribution/bin/setenv.sh similarity index 100% rename from amie-decoder/src/main/resources/distribution/bin/setenv.sh rename to access-ci-service/src/main/resources/distribution/bin/setenv.sh diff --git a/amie-decoder/src/main/resources/distribution/conf/application.yml b/access-ci-service/src/main/resources/distribution/conf/application.yml similarity index 84% rename from amie-decoder/src/main/resources/distribution/conf/application.yml rename to access-ci-service/src/main/resources/distribution/conf/application.yml index 396f36ad4..49506f8c6 100644 --- a/amie-decoder/src/main/resources/distribution/conf/application.yml +++ b/access-ci-service/src/main/resources/distribution/conf/application.yml @@ -19,23 +19,25 @@ server: spring: application: - name: amie-decoder-service + name: access-ci-service datasource: - url: "jdbc:mariadb://localhost:3306/amie_decoder" + url: "jdbc:mariadb://localhost:3306/access_ci" username: admin password: admin driver-class-name: org.mariadb.jdbc.Driver jpa: hibernate: - ddl-auto: update + ddl-auto: validate properties: hibernate.jdbc.time_zone: UTC + hibernate.type.preferred_enum_jdbc_type: VARCHAR show-sql: false database-platform: org.hibernate.dialect.MariaDBDialect flyway: + enabled: true locations: classpath:db/migration -app: +access: amie: base-url: https://a3mdev.xsede.org/amie-api-test site-code: ${AMIE_SITE_CODE} @@ -55,6 +57,6 @@ logging: springdoc: swagger-ui: - title: CUSTOS AMIE DECODER API + title: CUSTOS ACCESS CI SERVICE API oauth: use-pkce-with-authorization-code-grant: true \ No newline at end of file diff --git a/amie-decoder/src/main/resources/logback-spring.xml b/access-ci-service/src/main/resources/distribution/conf/logback-spring.xml similarity index 93% rename from amie-decoder/src/main/resources/logback-spring.xml rename to access-ci-service/src/main/resources/distribution/conf/logback-spring.xml index 68c977528..295c31dae 100644 --- a/amie-decoder/src/main/resources/logback-spring.xml +++ b/access-ci-service/src/main/resources/distribution/conf/logback-spring.xml @@ -27,7 +27,9 @@ <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <file>logs/custos-amie-decoder.log</file> <encoder> - <pattern>%date{YYYY-MM-dd HH:mm:ss.SSS} app=${appName}, host=${HOSTNAME}, traceID=%X{traceId:-NONE}, level=%-5level, [%thread] %logger{36} - %msg%n</pattern> + <pattern>%date{YYYY-MM-dd HH:mm:ss.SSS} app=${appName}, host=${HOSTNAME}, traceID=%X{traceId:-NONE}, + level=%-5level, [%thread] %logger{36} - %msg%n + </pattern> </encoder> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <fileNamePattern>logs/%d{yyyy-MM}/custos-amie-decoder-%d{MM-dd-yyyy}-%i.log.gz</fileNamePattern> diff --git a/amie-decoder/src/main/resources/distribution/conf/logback-spring.xml b/access-ci-service/src/main/resources/logback-spring.xml similarity index 93% rename from amie-decoder/src/main/resources/distribution/conf/logback-spring.xml rename to access-ci-service/src/main/resources/logback-spring.xml index 68c977528..295c31dae 100644 --- a/amie-decoder/src/main/resources/distribution/conf/logback-spring.xml +++ b/access-ci-service/src/main/resources/logback-spring.xml @@ -27,7 +27,9 @@ <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <file>logs/custos-amie-decoder.log</file> <encoder> - <pattern>%date{YYYY-MM-dd HH:mm:ss.SSS} app=${appName}, host=${HOSTNAME}, traceID=%X{traceId:-NONE}, level=%-5level, [%thread] %logger{36} - %msg%n</pattern> + <pattern>%date{YYYY-MM-dd HH:mm:ss.SSS} app=${appName}, host=${HOSTNAME}, traceID=%X{traceId:-NONE}, + level=%-5level, [%thread] %logger{36} - %msg%n + </pattern> </encoder> <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"> <fileNamePattern>logs/%d{yyyy-MM}/custos-amie-decoder-%d{MM-dd-yyyy}-%i.log.gz</fileNamePattern> diff --git a/amie-decoder/src/test/java/org/apache/custos/amie/handler/DataAccountCreateHandlerTest.java b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/DataAccountCreateHandlerTest.java similarity index 96% rename from amie-decoder/src/test/java/org/apache/custos/amie/handler/DataAccountCreateHandlerTest.java rename to access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/DataAccountCreateHandlerTest.java index d35e3ad1a..9ea46c424 100644 --- a/amie-decoder/src/test/java/org/apache/custos/amie/handler/DataAccountCreateHandlerTest.java +++ b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/DataAccountCreateHandlerTest.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.custos.amie.client.AmieClient; -import org.apache.custos.amie.model.PacketEntity; -import org.apache.custos.amie.util.JsonTestUtils; +import org.apache.custos.access.ci.service.client.amie.AmieClient; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; +import org.apache.custos.access.ci.service.util.JsonTestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/amie-decoder/src/test/java/org/apache/custos/amie/handler/DataProjectCreateHandlerTest.java b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/DataProjectCreateHandlerTest.java similarity index 93% rename from amie-decoder/src/test/java/org/apache/custos/amie/handler/DataProjectCreateHandlerTest.java rename to access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/DataProjectCreateHandlerTest.java index 6ee903614..5e5dc844c 100644 --- a/amie-decoder/src/test/java/org/apache/custos/amie/handler/DataProjectCreateHandlerTest.java +++ b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/DataProjectCreateHandlerTest.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.custos.amie.client.AmieClient; -import org.apache.custos.amie.model.PacketEntity; -import org.apache.custos.amie.util.JsonTestUtils; +import org.apache.custos.access.ci.service.client.amie.AmieClient; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; +import org.apache.custos.access.ci.service.util.JsonTestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -138,9 +138,9 @@ class DataProjectCreateHandlerTest { private JsonNode createValidPacketJson() { return objectMapper.createObjectNode().set("body", objectMapper.createObjectNode() - .put("ProjectID", "PRJ-TEST123") - .put("PersonID", "person-123") - .set("DnList", objectMapper.createArrayNode())); + .put("ProjectID", "PRJ-TEST123") + .put("PersonID", "person-123") + .set("DnList", objectMapper.createArrayNode())); } private JsonNode createPacketJsonWithMissingField(String missingField) { diff --git a/amie-decoder/src/test/java/org/apache/custos/amie/handler/InformTransactionCompleteHandlerTest.java b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/InformTransactionCompleteHandlerTest.java similarity index 90% rename from amie-decoder/src/test/java/org/apache/custos/amie/handler/InformTransactionCompleteHandlerTest.java rename to access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/InformTransactionCompleteHandlerTest.java index 23d7c23a9..6abb349dc 100644 --- a/amie-decoder/src/test/java/org/apache/custos/amie/handler/InformTransactionCompleteHandlerTest.java +++ b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/InformTransactionCompleteHandlerTest.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.custos.amie.model.PacketEntity; -import org.apache.custos.amie.util.JsonTestUtils; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; +import org.apache.custos.access.ci.service.util.JsonTestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -86,9 +86,9 @@ class InformTransactionCompleteHandlerTest { private JsonNode createValidPacketJson() { return objectMapper.createObjectNode().set("body", objectMapper.createObjectNode() - .put("StatusCode", "Success") - .put("DetailCode", 1) - .put("Message", "Transaction completed successfully")); + .put("StatusCode", "Success") + .put("DetailCode", 1) + .put("Message", "Transaction completed successfully")); } private JsonNode createMinimalPacketJson() { diff --git a/amie-decoder/src/test/java/org/apache/custos/amie/handler/NoOpHandlerTest.java b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/NoOpHandlerTest.java similarity index 95% rename from amie-decoder/src/test/java/org/apache/custos/amie/handler/NoOpHandlerTest.java rename to access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/NoOpHandlerTest.java index 3289d982d..e91572e6d 100644 --- a/amie-decoder/src/test/java/org/apache/custos/amie/handler/NoOpHandlerTest.java +++ b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/NoOpHandlerTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.custos.amie.model.PacketEntity; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/amie-decoder/src/test/java/org/apache/custos/amie/handler/PacketRouterTest.java b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/PacketRouterTest.java similarity index 96% rename from amie-decoder/src/test/java/org/apache/custos/amie/handler/PacketRouterTest.java rename to access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/PacketRouterTest.java index f37383a70..c1d788bee 100644 --- a/amie-decoder/src/test/java/org/apache/custos/amie/handler/PacketRouterTest.java +++ b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/PacketRouterTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.custos.amie.model.PacketEntity; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestAccountCreateHandlerTest.java b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestAccountCreateHandlerTest.java similarity index 92% rename from amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestAccountCreateHandlerTest.java rename to access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestAccountCreateHandlerTest.java index 7ae81593b..9e6da05f0 100644 --- a/amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestAccountCreateHandlerTest.java +++ b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestAccountCreateHandlerTest.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.custos.amie.client.AmieClient; -import org.apache.custos.amie.model.ClusterAccountEntity; -import org.apache.custos.amie.model.PacketEntity; -import org.apache.custos.amie.model.PersonEntity; -import org.apache.custos.amie.service.PersonService; -import org.apache.custos.amie.service.ProjectMembershipService; -import org.apache.custos.amie.service.ProjectService; -import org.apache.custos.amie.service.UserAccountService; -import org.apache.custos.amie.util.JsonTestUtils; +import org.apache.custos.access.ci.service.client.amie.AmieClient; +import org.apache.custos.access.ci.service.model.ClusterAccountEntity; +import org.apache.custos.access.ci.service.model.PersonEntity; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; +import org.apache.custos.access.ci.service.service.PersonService; +import org.apache.custos.access.ci.service.service.ProjectMembershipService; +import org.apache.custos.access.ci.service.service.ProjectService; +import org.apache.custos.access.ci.service.service.UserAccountService; +import org.apache.custos.access.ci.service.util.JsonTestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestAccountInactivateHandlerTest.java b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestAccountInactivateHandlerTest.java similarity index 95% rename from amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestAccountInactivateHandlerTest.java rename to access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestAccountInactivateHandlerTest.java index 1252e0c69..fe96a2aa6 100644 --- a/amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestAccountInactivateHandlerTest.java +++ b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestAccountInactivateHandlerTest.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.custos.amie.client.AmieClient; -import org.apache.custos.amie.model.PacketEntity; -import org.apache.custos.amie.service.ProjectMembershipService; -import org.apache.custos.amie.util.JsonTestUtils; +import org.apache.custos.access.ci.service.client.amie.AmieClient; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; +import org.apache.custos.access.ci.service.service.ProjectMembershipService; +import org.apache.custos.access.ci.service.util.JsonTestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestAccountReactivateHandlerTest.java b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestAccountReactivateHandlerTest.java similarity index 95% rename from amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestAccountReactivateHandlerTest.java rename to access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestAccountReactivateHandlerTest.java index 52967841e..38be5ac0b 100644 --- a/amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestAccountReactivateHandlerTest.java +++ b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestAccountReactivateHandlerTest.java @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.custos.amie.client.AmieClient; -import org.apache.custos.amie.model.PacketEntity; -import org.apache.custos.amie.service.ProjectMembershipService; -import org.apache.custos.amie.util.JsonTestUtils; +import org.apache.custos.access.ci.service.client.amie.AmieClient; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; +import org.apache.custos.access.ci.service.service.ProjectMembershipService; +import org.apache.custos.access.ci.service.util.JsonTestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestPersonMergeHandlerTest.java b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestPersonMergeHandlerTest.java similarity index 95% rename from amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestPersonMergeHandlerTest.java rename to access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestPersonMergeHandlerTest.java index 7d61a1e9f..3bb6e9df6 100644 --- a/amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestPersonMergeHandlerTest.java +++ b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestPersonMergeHandlerTest.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.custos.amie.client.AmieClient; -import org.apache.custos.amie.model.PacketEntity; -import org.apache.custos.amie.service.PersonService; -import org.apache.custos.amie.util.JsonTestUtils; +import org.apache.custos.access.ci.service.client.amie.AmieClient; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; +import org.apache.custos.access.ci.service.service.PersonService; +import org.apache.custos.access.ci.service.util.JsonTestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestProjectCreateHandlerTest.java b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestProjectCreateHandlerTest.java similarity index 92% rename from amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestProjectCreateHandlerTest.java rename to access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestProjectCreateHandlerTest.java index 5d4e77997..18d47cd3a 100644 --- a/amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestProjectCreateHandlerTest.java +++ b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestProjectCreateHandlerTest.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.custos.amie.client.AmieClient; -import org.apache.custos.amie.model.ClusterAccountEntity; -import org.apache.custos.amie.model.PacketEntity; -import org.apache.custos.amie.model.PersonEntity; -import org.apache.custos.amie.model.ProjectEntity; -import org.apache.custos.amie.service.PersonService; -import org.apache.custos.amie.service.ProjectMembershipService; -import org.apache.custos.amie.service.ProjectService; -import org.apache.custos.amie.service.UserAccountService; -import org.apache.custos.amie.util.JsonTestUtils; +import org.apache.custos.access.ci.service.client.amie.AmieClient; +import org.apache.custos.access.ci.service.model.ClusterAccountEntity; +import org.apache.custos.access.ci.service.model.PersonEntity; +import org.apache.custos.access.ci.service.model.ProjectEntity; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; +import org.apache.custos.access.ci.service.service.PersonService; +import org.apache.custos.access.ci.service.service.ProjectMembershipService; +import org.apache.custos.access.ci.service.service.ProjectService; +import org.apache.custos.access.ci.service.service.UserAccountService; +import org.apache.custos.access.ci.service.util.JsonTestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestProjectInactivateHandlerTest.java b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestProjectInactivateHandlerTest.java similarity index 94% rename from amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestProjectInactivateHandlerTest.java rename to access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestProjectInactivateHandlerTest.java index d091e4b72..4fd32379c 100644 --- a/amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestProjectInactivateHandlerTest.java +++ b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestProjectInactivateHandlerTest.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.custos.amie.client.AmieClient; -import org.apache.custos.amie.model.PacketEntity; -import org.apache.custos.amie.service.ProjectMembershipService; -import org.apache.custos.amie.service.ProjectService; -import org.apache.custos.amie.util.JsonTestUtils; +import org.apache.custos.access.ci.service.client.amie.AmieClient; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; +import org.apache.custos.access.ci.service.service.ProjectMembershipService; +import org.apache.custos.access.ci.service.service.ProjectService; +import org.apache.custos.access.ci.service.util.JsonTestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestProjectReactivateHandlerTest.java b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestProjectReactivateHandlerTest.java similarity index 94% rename from amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestProjectReactivateHandlerTest.java rename to access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestProjectReactivateHandlerTest.java index fa9668880..2a5fddc02 100644 --- a/amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestProjectReactivateHandlerTest.java +++ b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestProjectReactivateHandlerTest.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.custos.amie.client.AmieClient; -import org.apache.custos.amie.model.PacketEntity; -import org.apache.custos.amie.service.ProjectMembershipService; -import org.apache.custos.amie.service.ProjectService; -import org.apache.custos.amie.util.JsonTestUtils; +import org.apache.custos.access.ci.service.client.amie.AmieClient; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; +import org.apache.custos.access.ci.service.service.ProjectMembershipService; +import org.apache.custos.access.ci.service.service.ProjectService; +import org.apache.custos.access.ci.service.util.JsonTestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestUserModifyHandlerTest.java b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestUserModifyHandlerTest.java similarity index 96% rename from amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestUserModifyHandlerTest.java rename to access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestUserModifyHandlerTest.java index da1198594..a992b4543 100644 --- a/amie-decoder/src/test/java/org/apache/custos/amie/handler/RequestUserModifyHandlerTest.java +++ b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/handler/amie/RequestUserModifyHandlerTest.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.handler; +package org.apache.custos.access.ci.service.handler.amie; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.custos.amie.client.AmieClient; -import org.apache.custos.amie.model.PacketEntity; -import org.apache.custos.amie.service.PersonService; -import org.apache.custos.amie.util.JsonTestUtils; +import org.apache.custos.access.ci.service.client.amie.AmieClient; +import org.apache.custos.access.ci.service.model.amie.PacketEntity; +import org.apache.custos.access.ci.service.service.PersonService; +import org.apache.custos.access.ci.service.util.JsonTestUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/amie-decoder/src/test/java/org/apache/custos/amie/service/PersonServiceTest.java b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/service/PersonServiceTest.java similarity index 96% rename from amie-decoder/src/test/java/org/apache/custos/amie/service/PersonServiceTest.java rename to access-ci-service/src/test/java/org/apache/custos/access/ci/service/service/PersonServiceTest.java index 11806e3e3..23371afcb 100644 --- a/amie-decoder/src/test/java/org/apache/custos/amie/service/PersonServiceTest.java +++ b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/service/PersonServiceTest.java @@ -1,14 +1,14 @@ -package org.apache.custos.amie.service; +package org.apache.custos.access.ci.service.service; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.custos.amie.model.ClusterAccountEntity; -import org.apache.custos.amie.model.PersonDnsEntity; -import org.apache.custos.amie.model.PersonEntity; -import org.apache.custos.amie.repo.ClusterAccountRepository; -import org.apache.custos.amie.repo.PersonDnsRepository; -import org.apache.custos.amie.repo.PersonRepository; +import org.apache.custos.access.ci.service.model.ClusterAccountEntity; +import org.apache.custos.access.ci.service.model.PersonDnsEntity; +import org.apache.custos.access.ci.service.model.PersonEntity; +import org.apache.custos.access.ci.service.repo.ClusterAccountRepository; +import org.apache.custos.access.ci.service.repo.PersonDnsRepository; +import org.apache.custos.access.ci.service.repo.PersonRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/amie-decoder/src/test/java/org/apache/custos/amie/service/ProjectMembershipServiceTest.java b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/service/ProjectMembershipServiceTest.java similarity index 94% rename from amie-decoder/src/test/java/org/apache/custos/amie/service/ProjectMembershipServiceTest.java rename to access-ci-service/src/test/java/org/apache/custos/access/ci/service/service/ProjectMembershipServiceTest.java index 96246de16..b089a8bee 100644 --- a/amie-decoder/src/test/java/org/apache/custos/amie/service/ProjectMembershipServiceTest.java +++ b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/service/ProjectMembershipServiceTest.java @@ -1,11 +1,11 @@ -package org.apache.custos.amie.service; - -import org.apache.custos.amie.model.ClusterAccountEntity; -import org.apache.custos.amie.model.ProjectEntity; -import org.apache.custos.amie.model.ProjectMembershipEntity; -import org.apache.custos.amie.repo.ClusterAccountRepository; -import org.apache.custos.amie.repo.ProjectMembershipRepository; -import org.apache.custos.amie.repo.ProjectRepository; +package org.apache.custos.access.ci.service.service; + +import org.apache.custos.access.ci.service.model.ClusterAccountEntity; +import org.apache.custos.access.ci.service.model.ProjectEntity; +import org.apache.custos.access.ci.service.model.ProjectMembershipEntity; +import org.apache.custos.access.ci.service.repo.ClusterAccountRepository; +import org.apache.custos.access.ci.service.repo.ProjectMembershipRepository; +import org.apache.custos.access.ci.service.repo.ProjectRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/amie-decoder/src/test/java/org/apache/custos/amie/service/ProjectServiceTest.java b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/service/ProjectServiceTest.java similarity index 95% rename from amie-decoder/src/test/java/org/apache/custos/amie/service/ProjectServiceTest.java rename to access-ci-service/src/test/java/org/apache/custos/access/ci/service/service/ProjectServiceTest.java index f9b5c4dde..ef8e4f61e 100644 --- a/amie-decoder/src/test/java/org/apache/custos/amie/service/ProjectServiceTest.java +++ b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/service/ProjectServiceTest.java @@ -1,7 +1,7 @@ -package org.apache.custos.amie.service; +package org.apache.custos.access.ci.service.service; -import org.apache.custos.amie.model.ProjectEntity; -import org.apache.custos.amie.repo.ProjectRepository; +import org.apache.custos.access.ci.service.model.ProjectEntity; +import org.apache.custos.access.ci.service.repo.ProjectRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/amie-decoder/src/test/java/org/apache/custos/amie/service/UserAccountServiceTest.java b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/service/UserAccountServiceTest.java similarity index 94% rename from amie-decoder/src/test/java/org/apache/custos/amie/service/UserAccountServiceTest.java rename to access-ci-service/src/test/java/org/apache/custos/access/ci/service/service/UserAccountServiceTest.java index 6fbe44d07..38119a10a 100644 --- a/amie-decoder/src/test/java/org/apache/custos/amie/service/UserAccountServiceTest.java +++ b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/service/UserAccountServiceTest.java @@ -1,8 +1,8 @@ -package org.apache.custos.amie.service; +package org.apache.custos.access.ci.service.service; -import org.apache.custos.amie.model.ClusterAccountEntity; -import org.apache.custos.amie.model.PersonEntity; -import org.apache.custos.amie.repo.ClusterAccountRepository; +import org.apache.custos.access.ci.service.model.ClusterAccountEntity; +import org.apache.custos.access.ci.service.model.PersonEntity; +import org.apache.custos.access.ci.service.repo.ClusterAccountRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; diff --git a/amie-decoder/src/test/java/org/apache/custos/amie/util/JsonTestUtils.java b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/util/JsonTestUtils.java similarity index 97% rename from amie-decoder/src/test/java/org/apache/custos/amie/util/JsonTestUtils.java rename to access-ci-service/src/test/java/org/apache/custos/access/ci/service/util/JsonTestUtils.java index 18cc5ca2f..68cb1a868 100644 --- a/amie-decoder/src/test/java/org/apache/custos/amie/util/JsonTestUtils.java +++ b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/util/JsonTestUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.util; +package org.apache.custos.access.ci.service.util; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/amie-decoder/src/test/java/org/apache/custos/amie/util/ProtoUtilsTest.java b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/util/ProtoUtilsTest.java similarity index 93% rename from amie-decoder/src/test/java/org/apache/custos/amie/util/ProtoUtilsTest.java rename to access-ci-service/src/test/java/org/apache/custos/access/ci/service/util/ProtoUtilsTest.java index e6b7699be..303acfc67 100644 --- a/amie-decoder/src/test/java/org/apache/custos/amie/util/ProtoUtilsTest.java +++ b/access-ci-service/src/test/java/org/apache/custos/access/ci/service/util/ProtoUtilsTest.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.custos.amie.util; +package org.apache.custos.access.ci.service.util; -import org.apache.custos.amie.internal.events.v1.DecodeStartedPayload; -import org.apache.custos.amie.internal.events.v1.EventType; -import org.apache.custos.amie.internal.events.v1.ProcessingEvent; -import org.apache.custos.amie.internal.events.v1.ProcessingStatus; +import org.apache.custos.access.ci.service.internal.events.v1.DecodeStartedPayload; +import org.apache.custos.access.ci.service.internal.events.v1.EventType; +import org.apache.custos.access.ci.service.internal.events.v1.ProcessingEvent; +import org.apache.custos.access.ci.service.internal.events.v1.ProcessingStatus; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/amie-decoder/src/test/resources/application-test.yml b/access-ci-service/src/test/resources/application-test.yml similarity index 92% rename from amie-decoder/src/test/resources/application-test.yml rename to access-ci-service/src/test/resources/application-test.yml index a33dbe66c..1116c791f 100644 --- a/amie-decoder/src/test/resources/application-test.yml +++ b/access-ci-service/src/test/resources/application-test.yml @@ -18,9 +18,10 @@ spring: scheduling: enabled: false -amie: - poller: - enabled: false +access: + amie: + poller: + enabled: false logging: pattern: diff --git a/amie-decoder/src/test/resources/logback-test.xml b/access-ci-service/src/test/resources/logback-test.xml similarity index 100% rename from amie-decoder/src/test/resources/logback-test.xml rename to access-ci-service/src/test/resources/logback-test.xml diff --git a/amie-decoder/src/test/resources/mock-data/data_account_create/incoming-data.json b/access-ci-service/src/test/resources/mock-data/data_account_create/incoming-data.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/data_account_create/incoming-data.json rename to access-ci-service/src/test/resources/mock-data/data_account_create/incoming-data.json diff --git a/amie-decoder/src/test/resources/mock-data/data_account_create/outgoing-inform.json b/access-ci-service/src/test/resources/mock-data/data_account_create/outgoing-inform.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/data_account_create/outgoing-inform.json rename to access-ci-service/src/test/resources/mock-data/data_account_create/outgoing-inform.json diff --git a/amie-decoder/src/test/resources/mock-data/data_project_create/incoming-data.json b/access-ci-service/src/test/resources/mock-data/data_project_create/incoming-data.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/data_project_create/incoming-data.json rename to access-ci-service/src/test/resources/mock-data/data_project_create/incoming-data.json diff --git a/amie-decoder/src/test/resources/mock-data/data_project_create/outgoing-inform.json b/access-ci-service/src/test/resources/mock-data/data_project_create/outgoing-inform.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/data_project_create/outgoing-inform.json rename to access-ci-service/src/test/resources/mock-data/data_project_create/outgoing-inform.json diff --git a/amie-decoder/src/test/resources/mock-data/inform_transaction_complete/incoming-inform.json b/access-ci-service/src/test/resources/mock-data/inform_transaction_complete/incoming-inform.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/inform_transaction_complete/incoming-inform.json rename to access-ci-service/src/test/resources/mock-data/inform_transaction_complete/incoming-inform.json diff --git a/amie-decoder/src/test/resources/mock-data/request_account_create/incoming-request.json b/access-ci-service/src/test/resources/mock-data/request_account_create/incoming-request.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/request_account_create/incoming-request.json rename to access-ci-service/src/test/resources/mock-data/request_account_create/incoming-request.json diff --git a/amie-decoder/src/test/resources/mock-data/request_account_create/outgoing-notify.json b/access-ci-service/src/test/resources/mock-data/request_account_create/outgoing-notify.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/request_account_create/outgoing-notify.json rename to access-ci-service/src/test/resources/mock-data/request_account_create/outgoing-notify.json diff --git a/amie-decoder/src/test/resources/mock-data/request_account_inactivate/incoming-request.json b/access-ci-service/src/test/resources/mock-data/request_account_inactivate/incoming-request.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/request_account_inactivate/incoming-request.json rename to access-ci-service/src/test/resources/mock-data/request_account_inactivate/incoming-request.json diff --git a/amie-decoder/src/test/resources/mock-data/request_account_inactivate/outgoing-notify.json b/access-ci-service/src/test/resources/mock-data/request_account_inactivate/outgoing-notify.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/request_account_inactivate/outgoing-notify.json rename to access-ci-service/src/test/resources/mock-data/request_account_inactivate/outgoing-notify.json diff --git a/amie-decoder/src/test/resources/mock-data/request_account_reactivate/incoming-request.json b/access-ci-service/src/test/resources/mock-data/request_account_reactivate/incoming-request.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/request_account_reactivate/incoming-request.json rename to access-ci-service/src/test/resources/mock-data/request_account_reactivate/incoming-request.json diff --git a/amie-decoder/src/test/resources/mock-data/request_account_reactivate/outgoing-notify.json b/access-ci-service/src/test/resources/mock-data/request_account_reactivate/outgoing-notify.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/request_account_reactivate/outgoing-notify.json rename to access-ci-service/src/test/resources/mock-data/request_account_reactivate/outgoing-notify.json diff --git a/amie-decoder/src/test/resources/mock-data/request_person_merge/incoming-request.json b/access-ci-service/src/test/resources/mock-data/request_person_merge/incoming-request.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/request_person_merge/incoming-request.json rename to access-ci-service/src/test/resources/mock-data/request_person_merge/incoming-request.json diff --git a/amie-decoder/src/test/resources/mock-data/request_person_merge/outgoing-inform.json b/access-ci-service/src/test/resources/mock-data/request_person_merge/outgoing-inform.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/request_person_merge/outgoing-inform.json rename to access-ci-service/src/test/resources/mock-data/request_person_merge/outgoing-inform.json diff --git a/amie-decoder/src/test/resources/mock-data/request_project_create/incoming-request.json b/access-ci-service/src/test/resources/mock-data/request_project_create/incoming-request.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/request_project_create/incoming-request.json rename to access-ci-service/src/test/resources/mock-data/request_project_create/incoming-request.json diff --git a/amie-decoder/src/test/resources/mock-data/request_project_create/outgoing-notify.json b/access-ci-service/src/test/resources/mock-data/request_project_create/outgoing-notify.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/request_project_create/outgoing-notify.json rename to access-ci-service/src/test/resources/mock-data/request_project_create/outgoing-notify.json diff --git a/amie-decoder/src/test/resources/mock-data/request_project_inactivate/incoming-request.json b/access-ci-service/src/test/resources/mock-data/request_project_inactivate/incoming-request.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/request_project_inactivate/incoming-request.json rename to access-ci-service/src/test/resources/mock-data/request_project_inactivate/incoming-request.json diff --git a/amie-decoder/src/test/resources/mock-data/request_project_inactivate/outgoing-notify.json b/access-ci-service/src/test/resources/mock-data/request_project_inactivate/outgoing-notify.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/request_project_inactivate/outgoing-notify.json rename to access-ci-service/src/test/resources/mock-data/request_project_inactivate/outgoing-notify.json diff --git a/amie-decoder/src/test/resources/mock-data/request_project_reactivate/incoming-request.json b/access-ci-service/src/test/resources/mock-data/request_project_reactivate/incoming-request.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/request_project_reactivate/incoming-request.json rename to access-ci-service/src/test/resources/mock-data/request_project_reactivate/incoming-request.json diff --git a/amie-decoder/src/test/resources/mock-data/request_project_reactivate/outgoing-notify.json b/access-ci-service/src/test/resources/mock-data/request_project_reactivate/outgoing-notify.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/request_project_reactivate/outgoing-notify.json rename to access-ci-service/src/test/resources/mock-data/request_project_reactivate/outgoing-notify.json diff --git a/amie-decoder/src/test/resources/mock-data/request_user_modify_delete/incoming-request.json b/access-ci-service/src/test/resources/mock-data/request_user_modify_delete/incoming-request.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/request_user_modify_delete/incoming-request.json rename to access-ci-service/src/test/resources/mock-data/request_user_modify_delete/incoming-request.json diff --git a/amie-decoder/src/test/resources/mock-data/request_user_modify_delete/outgoing-inform.json b/access-ci-service/src/test/resources/mock-data/request_user_modify_delete/outgoing-inform.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/request_user_modify_delete/outgoing-inform.json rename to access-ci-service/src/test/resources/mock-data/request_user_modify_delete/outgoing-inform.json diff --git a/amie-decoder/src/test/resources/mock-data/request_user_modify_replace/incoming-request.json b/access-ci-service/src/test/resources/mock-data/request_user_modify_replace/incoming-request.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/request_user_modify_replace/incoming-request.json rename to access-ci-service/src/test/resources/mock-data/request_user_modify_replace/incoming-request.json diff --git a/amie-decoder/src/test/resources/mock-data/request_user_modify_replace/outgoing-inform.json b/access-ci-service/src/test/resources/mock-data/request_user_modify_replace/outgoing-inform.json similarity index 100% rename from amie-decoder/src/test/resources/mock-data/request_user_modify_replace/outgoing-inform.json rename to access-ci-service/src/test/resources/mock-data/request_user_modify_replace/outgoing-inform.json diff --git a/pom.xml b/pom.xml index ddb61c7d2..0b4151446 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ <module>services</module> <module>api</module> <module>application</module> - <module>amie-decoder</module> + <module>access-ci-service</module> </modules> <dependencyManagement> @@ -208,7 +208,7 @@ <ssh.username>ubuntu</ssh.username> <jakarta.ws.version>4.0.0</jakarta.ws.version> <custos.dist.name>apache-airavata-custos-${project.version}</custos.dist.name> - <amie.service.dist.name>apache-airavata-custos-amie-decoder-${project.version}</amie.service.dist.name> + <access.service.dist.name>apache-airavata-custos-access-ci-service-${project.version}</access.service.dist.name> </properties> <repositories>
