From f78931a859bca4c76ff411285884878be6316f62 Mon Sep 17 00:00:00 2001 From: Ralitsa Todorova Date: Wed, 29 Aug 2018 17:31:55 +0300 Subject: [PATCH] Rename all packages (remove "grpc" from package name) Signed-off-by: Ralitsa Todorova --- .../nynja/account/{grpc => }/Application.java | 2 +- .../{grpc => }/StartupScriptsListener.java | 4 +-- .../{grpc => }/components/Validator.java | 10 +++--- .../configuration/CassandraConfig.java | 14 ++++---- .../GrpcServerHealthIndicator.java | 4 +-- .../account/{grpc => }/models/Account.java | 2 +- .../AccountByCommunicationProvider.java | 2 +- .../{grpc => }/models/AccountByProfileId.java | 2 +- .../models/AuthenticationProvider.java | 2 +- .../{grpc => }/models/CountryInfo.java | 2 +- .../{grpc => }/models/PendingAccount.java | 2 +- .../account/{grpc => }/models/Profile.java | 2 +- .../ProfileByAuthenticationProvider.java | 2 +- .../account/{grpc => }/models/UserInfo.java | 2 +- .../{grpc => }/models/UserInfoByEmail.java | 2 +- .../{grpc => }/models/UserInfoByPhone.java | 2 +- .../{grpc => }/models/UserInfoByUsername.java | 2 +- ...ountByCommunicationProviderRepository.java | 4 +-- .../AccountByProfileIdRepository.java | 4 +-- .../repositories/AccountRepository.java | 4 +-- .../AccountRepositoryAdditional.java | 6 ++-- .../AccountRepositoryAdditionalImpl.java | 12 +++---- .../PendingAccountRepository.java | 6 ++-- ...ileByAuthenticationProviderRepository.java | 4 +-- .../repositories/ProfileRepository.java | 4 +-- .../UserInfoByEmailRepository.java | 4 +-- .../UserInfoByPhoneRepository.java | 4 +-- .../UserInfoByUsernameRepository.java | 4 +-- .../repositories/UserInfoRepository.java | 4 +-- .../services/AccountServiceImpl.java | 33 +++++++++---------- .../account/{grpc => }/ApplicationTests.java | 4 +-- .../{grpc => }/components/ValidatorTests.java | 9 ++--- .../services/AccountServiceTests.java | 24 +++++++------- .../{grpc => }/utils/GrpcServerTestBase.java | 2 +- .../nynja/account/{grpc => }/utils/Util.java | 8 ++--- 35 files changed, 99 insertions(+), 99 deletions(-) rename src/main/java/biz/nynja/account/{grpc => }/Application.java (92%) rename src/main/java/biz/nynja/account/{grpc => }/StartupScriptsListener.java (95%) rename src/main/java/biz/nynja/account/{grpc => }/components/Validator.java (96%) rename src/main/java/biz/nynja/account/{grpc => }/configuration/CassandraConfig.java (86%) rename src/main/java/biz/nynja/account/{grpc => }/healthindicators/GrpcServerHealthIndicator.java (93%) rename src/main/java/biz/nynja/account/{grpc => }/models/Account.java (96%) rename src/main/java/biz/nynja/account/{grpc => }/models/AccountByCommunicationProvider.java (99%) rename src/main/java/biz/nynja/account/{grpc => }/models/AccountByProfileId.java (99%) rename src/main/java/biz/nynja/account/{grpc => }/models/AuthenticationProvider.java (95%) rename src/main/java/biz/nynja/account/{grpc => }/models/CountryInfo.java (98%) rename src/main/java/biz/nynja/account/{grpc => }/models/PendingAccount.java (99%) rename src/main/java/biz/nynja/account/{grpc => }/models/Profile.java (96%) rename src/main/java/biz/nynja/account/{grpc => }/models/ProfileByAuthenticationProvider.java (96%) rename src/main/java/biz/nynja/account/{grpc => }/models/UserInfo.java (96%) rename src/main/java/biz/nynja/account/{grpc => }/models/UserInfoByEmail.java (96%) rename src/main/java/biz/nynja/account/{grpc => }/models/UserInfoByPhone.java (99%) rename src/main/java/biz/nynja/account/{grpc => }/models/UserInfoByUsername.java (99%) rename src/main/java/biz/nynja/account/{grpc => }/repositories/AccountByCommunicationProviderRepository.java (75%) rename src/main/java/biz/nynja/account/{grpc => }/repositories/AccountByProfileIdRepository.java (80%) rename src/main/java/biz/nynja/account/{grpc => }/repositories/AccountRepository.java (79%) rename src/main/java/biz/nynja/account/{grpc => }/repositories/AccountRepositoryAdditional.java (76%) rename src/main/java/biz/nynja/account/{grpc => }/repositories/AccountRepositoryAdditionalImpl.java (95%) rename src/main/java/biz/nynja/account/{grpc => }/repositories/PendingAccountRepository.java (72%) rename src/main/java/biz/nynja/account/{grpc => }/repositories/ProfileByAuthenticationProviderRepository.java (74%) rename src/main/java/biz/nynja/account/{grpc => }/repositories/ProfileRepository.java (79%) rename src/main/java/biz/nynja/account/{grpc => }/repositories/UserInfoByEmailRepository.java (76%) rename src/main/java/biz/nynja/account/{grpc => }/repositories/UserInfoByPhoneRepository.java (76%) rename src/main/java/biz/nynja/account/{grpc => }/repositories/UserInfoByUsernameRepository.java (76%) rename src/main/java/biz/nynja/account/{grpc => }/repositories/UserInfoRepository.java (75%) rename src/main/java/biz/nynja/account/{grpc => }/services/AccountServiceImpl.java (91%) rename src/test/java/biz/nynja/account/{grpc => }/ApplicationTests.java (81%) rename src/test/java/biz/nynja/account/{grpc => }/components/ValidatorTests.java (93%) rename src/test/java/biz/nynja/account/{grpc => }/services/AccountServiceTests.java (97%) rename src/test/java/biz/nynja/account/{grpc => }/utils/GrpcServerTestBase.java (98%) rename src/test/java/biz/nynja/account/{grpc => }/utils/Util.java (94%) diff --git a/src/main/java/biz/nynja/account/grpc/Application.java b/src/main/java/biz/nynja/account/Application.java similarity index 92% rename from src/main/java/biz/nynja/account/grpc/Application.java rename to src/main/java/biz/nynja/account/Application.java index 79f40bb..f19c3d1 100644 --- a/src/main/java/biz/nynja/account/grpc/Application.java +++ b/src/main/java/biz/nynja/account/Application.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc; +package biz.nynja.account; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/biz/nynja/account/grpc/StartupScriptsListener.java b/src/main/java/biz/nynja/account/StartupScriptsListener.java similarity index 95% rename from src/main/java/biz/nynja/account/grpc/StartupScriptsListener.java rename to src/main/java/biz/nynja/account/StartupScriptsListener.java index aa64421..90c66ea 100644 --- a/src/main/java/biz/nynja/account/grpc/StartupScriptsListener.java +++ b/src/main/java/biz/nynja/account/StartupScriptsListener.java @@ -1,4 +1,4 @@ -package biz.nynja.account.grpc; +package biz.nynja.account; import java.util.Arrays; import java.util.List; @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; import com.datastax.driver.core.Session; -import biz.nynja.account.grpc.configuration.CassandraConfig; +import biz.nynja.account.configuration.CassandraConfig; /** * This acts as {@link CassandraConfig} startupScripts executor diff --git a/src/main/java/biz/nynja/account/grpc/components/Validator.java b/src/main/java/biz/nynja/account/components/Validator.java similarity index 96% rename from src/main/java/biz/nynja/account/grpc/components/Validator.java rename to src/main/java/biz/nynja/account/components/Validator.java index edcda5f..cccc9de 100644 --- a/src/main/java/biz/nynja/account/grpc/components/Validator.java +++ b/src/main/java/biz/nynja/account/components/Validator.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.components; +package biz.nynja.account.components; import java.io.BufferedReader; import java.io.IOException; @@ -22,10 +22,10 @@ import org.springframework.stereotype.Component; import biz.nynja.account.grpc.CreateAccountRequest; import biz.nynja.account.grpc.ErrorResponse.Cause; -import biz.nynja.account.grpc.models.CountryInfo; -import biz.nynja.account.grpc.repositories.UserInfoByEmailRepository; -import biz.nynja.account.grpc.repositories.UserInfoByPhoneRepository; -import biz.nynja.account.grpc.repositories.UserInfoByUsernameRepository; +import biz.nynja.account.models.CountryInfo; +import biz.nynja.account.repositories.UserInfoByEmailRepository; +import biz.nynja.account.repositories.UserInfoByPhoneRepository; +import biz.nynja.account.repositories.UserInfoByUsernameRepository; /** * Component which contains all validation methods. diff --git a/src/main/java/biz/nynja/account/grpc/configuration/CassandraConfig.java b/src/main/java/biz/nynja/account/configuration/CassandraConfig.java similarity index 86% rename from src/main/java/biz/nynja/account/grpc/configuration/CassandraConfig.java rename to src/main/java/biz/nynja/account/configuration/CassandraConfig.java index 0aad4ca..0c5a2f2 100644 --- a/src/main/java/biz/nynja/account/grpc/configuration/CassandraConfig.java +++ b/src/main/java/biz/nynja/account/configuration/CassandraConfig.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.configuration; +package biz.nynja.account.configuration; import java.util.Arrays; import java.util.List; @@ -14,7 +14,7 @@ import org.springframework.data.cassandra.config.SchemaAction; import org.springframework.data.cassandra.core.cql.keyspace.CreateKeyspaceSpecification; import org.springframework.data.cassandra.repository.config.EnableCassandraRepositories; -import biz.nynja.account.grpc.StartupScriptsListener; +import biz.nynja.account.StartupScriptsListener; @Configuration @EnableCassandraRepositories @@ -28,7 +28,7 @@ public class CassandraConfig extends AbstractCassandraConfiguration { protected String getKeyspaceName() { return keyspace; } - + @Override public SchemaAction getSchemaAction() { return SchemaAction.CREATE_IF_NOT_EXISTS; @@ -40,18 +40,18 @@ public class CassandraConfig extends AbstractCassandraConfiguration { .ifNotExists().withSimpleReplication(); return Arrays.asList(specification); } - + @Override public String[] getEntityBasePackages() { return new String[] { "biz.nynja.account.grpc.models" }; } - + /** - * See {@link StartupScriptsListener} for scripts + * See {@link StartupScriptsListener} for scripts * that require JPA annotated tables */ @Override protected List getStartupScripts() { - return super.getStartupScripts(); + return super.getStartupScripts(); } } \ No newline at end of file diff --git a/src/main/java/biz/nynja/account/grpc/healthindicators/GrpcServerHealthIndicator.java b/src/main/java/biz/nynja/account/healthindicators/GrpcServerHealthIndicator.java similarity index 93% rename from src/main/java/biz/nynja/account/grpc/healthindicators/GrpcServerHealthIndicator.java rename to src/main/java/biz/nynja/account/healthindicators/GrpcServerHealthIndicator.java index a20f920..a7c9dcf 100644 --- a/src/main/java/biz/nynja/account/grpc/healthindicators/GrpcServerHealthIndicator.java +++ b/src/main/java/biz/nynja/account/healthindicators/GrpcServerHealthIndicator.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.healthindicators; +package biz.nynja.account.healthindicators; import java.util.concurrent.ExecutionException; @@ -13,8 +13,8 @@ import org.springframework.boot.actuate.health.Health; import org.springframework.boot.actuate.health.HealthIndicator; import org.springframework.stereotype.Component; -import biz.nynja.account.grpc.services.AccountServiceImpl; import biz.nynja.account.grpc.AccountServiceGrpc; +import biz.nynja.account.services.AccountServiceImpl; import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; import io.grpc.health.v1.HealthCheckRequest; diff --git a/src/main/java/biz/nynja/account/grpc/models/Account.java b/src/main/java/biz/nynja/account/models/Account.java similarity index 96% rename from src/main/java/biz/nynja/account/grpc/models/Account.java rename to src/main/java/biz/nynja/account/models/Account.java index 415fc55..0c44ff7 100644 --- a/src/main/java/biz/nynja/account/grpc/models/Account.java +++ b/src/main/java/biz/nynja/account/models/Account.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.models; +package biz.nynja.account.models; import java.nio.ByteBuffer; import java.util.Set; diff --git a/src/main/java/biz/nynja/account/grpc/models/AccountByCommunicationProvider.java b/src/main/java/biz/nynja/account/models/AccountByCommunicationProvider.java similarity index 99% rename from src/main/java/biz/nynja/account/grpc/models/AccountByCommunicationProvider.java rename to src/main/java/biz/nynja/account/models/AccountByCommunicationProvider.java index 5c47680..a6354f5 100644 --- a/src/main/java/biz/nynja/account/grpc/models/AccountByCommunicationProvider.java +++ b/src/main/java/biz/nynja/account/models/AccountByCommunicationProvider.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.models; +package biz.nynja.account.models; import java.nio.ByteBuffer; import java.util.UUID; diff --git a/src/main/java/biz/nynja/account/grpc/models/AccountByProfileId.java b/src/main/java/biz/nynja/account/models/AccountByProfileId.java similarity index 99% rename from src/main/java/biz/nynja/account/grpc/models/AccountByProfileId.java rename to src/main/java/biz/nynja/account/models/AccountByProfileId.java index dc8abfd..def5fe0 100644 --- a/src/main/java/biz/nynja/account/grpc/models/AccountByProfileId.java +++ b/src/main/java/biz/nynja/account/models/AccountByProfileId.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.models; +package biz.nynja.account.models; import java.nio.ByteBuffer; import java.util.Set; diff --git a/src/main/java/biz/nynja/account/grpc/models/AuthenticationProvider.java b/src/main/java/biz/nynja/account/models/AuthenticationProvider.java similarity index 95% rename from src/main/java/biz/nynja/account/grpc/models/AuthenticationProvider.java rename to src/main/java/biz/nynja/account/models/AuthenticationProvider.java index a4a1346..3a2eace 100644 --- a/src/main/java/biz/nynja/account/grpc/models/AuthenticationProvider.java +++ b/src/main/java/biz/nynja/account/models/AuthenticationProvider.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.models; +package biz.nynja.account.models; import org.springframework.data.cassandra.core.mapping.UserDefinedType; diff --git a/src/main/java/biz/nynja/account/grpc/models/CountryInfo.java b/src/main/java/biz/nynja/account/models/CountryInfo.java similarity index 98% rename from src/main/java/biz/nynja/account/grpc/models/CountryInfo.java rename to src/main/java/biz/nynja/account/models/CountryInfo.java index 0aaa9e3..8414d46 100644 --- a/src/main/java/biz/nynja/account/grpc/models/CountryInfo.java +++ b/src/main/java/biz/nynja/account/models/CountryInfo.java @@ -1,4 +1,4 @@ -package biz.nynja.account.grpc.models; +package biz.nynja.account.models; public class CountryInfo { diff --git a/src/main/java/biz/nynja/account/grpc/models/PendingAccount.java b/src/main/java/biz/nynja/account/models/PendingAccount.java similarity index 99% rename from src/main/java/biz/nynja/account/grpc/models/PendingAccount.java rename to src/main/java/biz/nynja/account/models/PendingAccount.java index a0bb463..5f95c67 100644 --- a/src/main/java/biz/nynja/account/grpc/models/PendingAccount.java +++ b/src/main/java/biz/nynja/account/models/PendingAccount.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.models; +package biz.nynja.account.models; import java.util.Date; import java.util.UUID; diff --git a/src/main/java/biz/nynja/account/grpc/models/Profile.java b/src/main/java/biz/nynja/account/models/Profile.java similarity index 96% rename from src/main/java/biz/nynja/account/grpc/models/Profile.java rename to src/main/java/biz/nynja/account/models/Profile.java index 2ef9957..d29d961 100644 --- a/src/main/java/biz/nynja/account/grpc/models/Profile.java +++ b/src/main/java/biz/nynja/account/models/Profile.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.models; +package biz.nynja.account.models; import java.util.Set; import java.util.UUID; diff --git a/src/main/java/biz/nynja/account/grpc/models/ProfileByAuthenticationProvider.java b/src/main/java/biz/nynja/account/models/ProfileByAuthenticationProvider.java similarity index 96% rename from src/main/java/biz/nynja/account/grpc/models/ProfileByAuthenticationProvider.java rename to src/main/java/biz/nynja/account/models/ProfileByAuthenticationProvider.java index 0558a4a..fee3e5c 100644 --- a/src/main/java/biz/nynja/account/grpc/models/ProfileByAuthenticationProvider.java +++ b/src/main/java/biz/nynja/account/models/ProfileByAuthenticationProvider.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.models; +package biz.nynja.account.models; import java.util.UUID; diff --git a/src/main/java/biz/nynja/account/grpc/models/UserInfo.java b/src/main/java/biz/nynja/account/models/UserInfo.java similarity index 96% rename from src/main/java/biz/nynja/account/grpc/models/UserInfo.java rename to src/main/java/biz/nynja/account/models/UserInfo.java index 027a652..b5337df 100644 --- a/src/main/java/biz/nynja/account/grpc/models/UserInfo.java +++ b/src/main/java/biz/nynja/account/models/UserInfo.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.models; +package biz.nynja.account.models; import java.util.UUID; diff --git a/src/main/java/biz/nynja/account/grpc/models/UserInfoByEmail.java b/src/main/java/biz/nynja/account/models/UserInfoByEmail.java similarity index 96% rename from src/main/java/biz/nynja/account/grpc/models/UserInfoByEmail.java rename to src/main/java/biz/nynja/account/models/UserInfoByEmail.java index bbdf000..9a2a9b0 100644 --- a/src/main/java/biz/nynja/account/grpc/models/UserInfoByEmail.java +++ b/src/main/java/biz/nynja/account/models/UserInfoByEmail.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.models; +package biz.nynja.account.models; import java.util.UUID; diff --git a/src/main/java/biz/nynja/account/grpc/models/UserInfoByPhone.java b/src/main/java/biz/nynja/account/models/UserInfoByPhone.java similarity index 99% rename from src/main/java/biz/nynja/account/grpc/models/UserInfoByPhone.java rename to src/main/java/biz/nynja/account/models/UserInfoByPhone.java index 5b80bd4..0fefda5 100644 --- a/src/main/java/biz/nynja/account/grpc/models/UserInfoByPhone.java +++ b/src/main/java/biz/nynja/account/models/UserInfoByPhone.java @@ -1,4 +1,4 @@ -package biz.nynja.account.grpc.models; +package biz.nynja.account.models; import java.util.UUID; diff --git a/src/main/java/biz/nynja/account/grpc/models/UserInfoByUsername.java b/src/main/java/biz/nynja/account/models/UserInfoByUsername.java similarity index 99% rename from src/main/java/biz/nynja/account/grpc/models/UserInfoByUsername.java rename to src/main/java/biz/nynja/account/models/UserInfoByUsername.java index 2b22a75..726ee30 100644 --- a/src/main/java/biz/nynja/account/grpc/models/UserInfoByUsername.java +++ b/src/main/java/biz/nynja/account/models/UserInfoByUsername.java @@ -1,4 +1,4 @@ -package biz.nynja.account.grpc.models; +package biz.nynja.account.models; import java.util.UUID; diff --git a/src/main/java/biz/nynja/account/grpc/repositories/AccountByCommunicationProviderRepository.java b/src/main/java/biz/nynja/account/repositories/AccountByCommunicationProviderRepository.java similarity index 75% rename from src/main/java/biz/nynja/account/grpc/repositories/AccountByCommunicationProviderRepository.java rename to src/main/java/biz/nynja/account/repositories/AccountByCommunicationProviderRepository.java index 2b2ae6c..bd96fcb 100644 --- a/src/main/java/biz/nynja/account/grpc/repositories/AccountByCommunicationProviderRepository.java +++ b/src/main/java/biz/nynja/account/repositories/AccountByCommunicationProviderRepository.java @@ -1,14 +1,14 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.repositories; +package biz.nynja.account.repositories; import java.util.UUID; import org.springframework.data.cassandra.repository.CassandraRepository; import org.springframework.stereotype.Repository; -import biz.nynja.account.grpc.models.AccountByCommunicationProvider; +import biz.nynja.account.models.AccountByCommunicationProvider; @Repository public interface AccountByCommunicationProviderRepository extends CassandraRepository { diff --git a/src/main/java/biz/nynja/account/grpc/repositories/AccountByProfileIdRepository.java b/src/main/java/biz/nynja/account/repositories/AccountByProfileIdRepository.java similarity index 80% rename from src/main/java/biz/nynja/account/grpc/repositories/AccountByProfileIdRepository.java rename to src/main/java/biz/nynja/account/repositories/AccountByProfileIdRepository.java index 638ba37..6cc2785 100644 --- a/src/main/java/biz/nynja/account/grpc/repositories/AccountByProfileIdRepository.java +++ b/src/main/java/biz/nynja/account/repositories/AccountByProfileIdRepository.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.repositories; +package biz.nynja.account.repositories; import java.util.List; import java.util.UUID; @@ -9,7 +9,7 @@ import java.util.UUID; import org.springframework.data.cassandra.repository.CassandraRepository; import org.springframework.stereotype.Repository; -import biz.nynja.account.grpc.models.AccountByProfileId; +import biz.nynja.account.models.AccountByProfileId; @Repository public interface AccountByProfileIdRepository extends CassandraRepository { diff --git a/src/main/java/biz/nynja/account/grpc/repositories/AccountRepository.java b/src/main/java/biz/nynja/account/repositories/AccountRepository.java similarity index 79% rename from src/main/java/biz/nynja/account/grpc/repositories/AccountRepository.java rename to src/main/java/biz/nynja/account/repositories/AccountRepository.java index 058aadd..783be8f 100644 --- a/src/main/java/biz/nynja/account/grpc/repositories/AccountRepository.java +++ b/src/main/java/biz/nynja/account/repositories/AccountRepository.java @@ -1,14 +1,14 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.repositories; +package biz.nynja.account.repositories; import java.util.UUID; import org.springframework.data.cassandra.repository.CassandraRepository; import org.springframework.stereotype.Repository; -import biz.nynja.account.grpc.models.Account; +import biz.nynja.account.models.Account; @Repository public interface AccountRepository extends CassandraRepository { diff --git a/src/main/java/biz/nynja/account/grpc/repositories/AccountRepositoryAdditional.java b/src/main/java/biz/nynja/account/repositories/AccountRepositoryAdditional.java similarity index 76% rename from src/main/java/biz/nynja/account/grpc/repositories/AccountRepositoryAdditional.java rename to src/main/java/biz/nynja/account/repositories/AccountRepositoryAdditional.java index 6fe0e52..4bd8252 100644 --- a/src/main/java/biz/nynja/account/grpc/repositories/AccountRepositoryAdditional.java +++ b/src/main/java/biz/nynja/account/repositories/AccountRepositoryAdditional.java @@ -1,15 +1,15 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.repositories; +package biz.nynja.account.repositories; import org.springframework.stereotype.Repository; import biz.nynja.account.grpc.CompletePendingAccountCreationRequest; import biz.nynja.account.grpc.CreateAccountRequest; import biz.nynja.account.grpc.CreatePendingAccountRequest; -import biz.nynja.account.grpc.models.Account; -import biz.nynja.account.grpc.models.PendingAccount; +import biz.nynja.account.models.Account; +import biz.nynja.account.models.PendingAccount; @Repository public interface AccountRepositoryAdditional { diff --git a/src/main/java/biz/nynja/account/grpc/repositories/AccountRepositoryAdditionalImpl.java b/src/main/java/biz/nynja/account/repositories/AccountRepositoryAdditionalImpl.java similarity index 95% rename from src/main/java/biz/nynja/account/grpc/repositories/AccountRepositoryAdditionalImpl.java rename to src/main/java/biz/nynja/account/repositories/AccountRepositoryAdditionalImpl.java index 191e926..b9f5422 100644 --- a/src/main/java/biz/nynja/account/grpc/repositories/AccountRepositoryAdditionalImpl.java +++ b/src/main/java/biz/nynja/account/repositories/AccountRepositoryAdditionalImpl.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.repositories; +package biz.nynja.account.repositories; import java.util.Date; import java.util.HashSet; @@ -17,11 +17,11 @@ import org.springframework.data.cassandra.core.WriteResult; import org.springframework.stereotype.Service; import biz.nynja.account.grpc.CompletePendingAccountCreationRequest; -import biz.nynja.account.grpc.models.Account; -import biz.nynja.account.grpc.models.AuthenticationProvider; -import biz.nynja.account.grpc.models.PendingAccount; -import biz.nynja.account.grpc.models.Profile; -import biz.nynja.account.grpc.models.ProfileByAuthenticationProvider; +import biz.nynja.account.models.Account; +import biz.nynja.account.models.AuthenticationProvider; +import biz.nynja.account.models.PendingAccount; +import biz.nynja.account.models.Profile; +import biz.nynja.account.models.ProfileByAuthenticationProvider; @Service public class AccountRepositoryAdditionalImpl implements AccountRepositoryAdditional { diff --git a/src/main/java/biz/nynja/account/grpc/repositories/PendingAccountRepository.java b/src/main/java/biz/nynja/account/repositories/PendingAccountRepository.java similarity index 72% rename from src/main/java/biz/nynja/account/grpc/repositories/PendingAccountRepository.java rename to src/main/java/biz/nynja/account/repositories/PendingAccountRepository.java index ac63c8a..bb89aee 100644 --- a/src/main/java/biz/nynja/account/grpc/repositories/PendingAccountRepository.java +++ b/src/main/java/biz/nynja/account/repositories/PendingAccountRepository.java @@ -1,15 +1,15 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.repositories; +package biz.nynja.account.repositories; import java.util.UUID; import org.springframework.data.cassandra.repository.CassandraRepository; import org.springframework.stereotype.Repository; -import biz.nynja.account.grpc.models.Account; -import biz.nynja.account.grpc.models.PendingAccount; +import biz.nynja.account.models.Account; +import biz.nynja.account.models.PendingAccount; @Repository public interface PendingAccountRepository extends CassandraRepository { diff --git a/src/main/java/biz/nynja/account/grpc/repositories/ProfileByAuthenticationProviderRepository.java b/src/main/java/biz/nynja/account/repositories/ProfileByAuthenticationProviderRepository.java similarity index 74% rename from src/main/java/biz/nynja/account/grpc/repositories/ProfileByAuthenticationProviderRepository.java rename to src/main/java/biz/nynja/account/repositories/ProfileByAuthenticationProviderRepository.java index 45df898..05f8048 100644 --- a/src/main/java/biz/nynja/account/grpc/repositories/ProfileByAuthenticationProviderRepository.java +++ b/src/main/java/biz/nynja/account/repositories/ProfileByAuthenticationProviderRepository.java @@ -1,12 +1,12 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.repositories; +package biz.nynja.account.repositories; import org.springframework.data.cassandra.repository.CassandraRepository; import org.springframework.stereotype.Repository; -import biz.nynja.account.grpc.models.ProfileByAuthenticationProvider; +import biz.nynja.account.models.ProfileByAuthenticationProvider; @Repository public interface ProfileByAuthenticationProviderRepository extends CassandraRepository{ diff --git a/src/main/java/biz/nynja/account/grpc/repositories/ProfileRepository.java b/src/main/java/biz/nynja/account/repositories/ProfileRepository.java similarity index 79% rename from src/main/java/biz/nynja/account/grpc/repositories/ProfileRepository.java rename to src/main/java/biz/nynja/account/repositories/ProfileRepository.java index 88f4336..9f1dcf2 100644 --- a/src/main/java/biz/nynja/account/grpc/repositories/ProfileRepository.java +++ b/src/main/java/biz/nynja/account/repositories/ProfileRepository.java @@ -1,14 +1,14 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.repositories; +package biz.nynja.account.repositories; import java.util.UUID; import org.springframework.data.cassandra.repository.CassandraRepository; import org.springframework.stereotype.Repository; -import biz.nynja.account.grpc.models.Profile; +import biz.nynja.account.models.Profile; @Repository public interface ProfileRepository extends CassandraRepository { diff --git a/src/main/java/biz/nynja/account/grpc/repositories/UserInfoByEmailRepository.java b/src/main/java/biz/nynja/account/repositories/UserInfoByEmailRepository.java similarity index 76% rename from src/main/java/biz/nynja/account/grpc/repositories/UserInfoByEmailRepository.java rename to src/main/java/biz/nynja/account/repositories/UserInfoByEmailRepository.java index 56acce7..92630e6 100644 --- a/src/main/java/biz/nynja/account/grpc/repositories/UserInfoByEmailRepository.java +++ b/src/main/java/biz/nynja/account/repositories/UserInfoByEmailRepository.java @@ -1,14 +1,14 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.repositories; +package biz.nynja.account.repositories; import java.util.List; import org.springframework.data.cassandra.repository.CassandraRepository; import org.springframework.stereotype.Repository; -import biz.nynja.account.grpc.models.UserInfoByEmail; +import biz.nynja.account.models.UserInfoByEmail; @Repository public interface UserInfoByEmailRepository extends CassandraRepository { diff --git a/src/main/java/biz/nynja/account/grpc/repositories/UserInfoByPhoneRepository.java b/src/main/java/biz/nynja/account/repositories/UserInfoByPhoneRepository.java similarity index 76% rename from src/main/java/biz/nynja/account/grpc/repositories/UserInfoByPhoneRepository.java rename to src/main/java/biz/nynja/account/repositories/UserInfoByPhoneRepository.java index a05e46e..172f5ce 100644 --- a/src/main/java/biz/nynja/account/grpc/repositories/UserInfoByPhoneRepository.java +++ b/src/main/java/biz/nynja/account/repositories/UserInfoByPhoneRepository.java @@ -1,11 +1,11 @@ -package biz.nynja.account.grpc.repositories; +package biz.nynja.account.repositories; import java.util.List; import org.springframework.data.cassandra.repository.CassandraRepository; import org.springframework.stereotype.Repository; -import biz.nynja.account.grpc.models.UserInfoByPhone; +import biz.nynja.account.models.UserInfoByPhone; @Repository public interface UserInfoByPhoneRepository extends CassandraRepository{ diff --git a/src/main/java/biz/nynja/account/grpc/repositories/UserInfoByUsernameRepository.java b/src/main/java/biz/nynja/account/repositories/UserInfoByUsernameRepository.java similarity index 76% rename from src/main/java/biz/nynja/account/grpc/repositories/UserInfoByUsernameRepository.java rename to src/main/java/biz/nynja/account/repositories/UserInfoByUsernameRepository.java index 32f381e..6abe3ef 100644 --- a/src/main/java/biz/nynja/account/grpc/repositories/UserInfoByUsernameRepository.java +++ b/src/main/java/biz/nynja/account/repositories/UserInfoByUsernameRepository.java @@ -1,11 +1,11 @@ -package biz.nynja.account.grpc.repositories; +package biz.nynja.account.repositories; import java.util.List; import org.springframework.data.cassandra.repository.CassandraRepository; import org.springframework.stereotype.Repository; -import biz.nynja.account.grpc.models.UserInfoByUsername; +import biz.nynja.account.models.UserInfoByUsername; @Repository public interface UserInfoByUsernameRepository extends CassandraRepository { diff --git a/src/main/java/biz/nynja/account/grpc/repositories/UserInfoRepository.java b/src/main/java/biz/nynja/account/repositories/UserInfoRepository.java similarity index 75% rename from src/main/java/biz/nynja/account/grpc/repositories/UserInfoRepository.java rename to src/main/java/biz/nynja/account/repositories/UserInfoRepository.java index 550cac2..a089409 100644 --- a/src/main/java/biz/nynja/account/grpc/repositories/UserInfoRepository.java +++ b/src/main/java/biz/nynja/account/repositories/UserInfoRepository.java @@ -1,14 +1,14 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.repositories; +package biz.nynja.account.repositories; import java.util.List; import java.util.UUID; import org.springframework.data.cassandra.repository.CassandraRepository; -import biz.nynja.account.grpc.models.UserInfo; +import biz.nynja.account.models.UserInfo; public interface UserInfoRepository extends CassandraRepository { diff --git a/src/main/java/biz/nynja/account/grpc/services/AccountServiceImpl.java b/src/main/java/biz/nynja/account/services/AccountServiceImpl.java similarity index 91% rename from src/main/java/biz/nynja/account/grpc/services/AccountServiceImpl.java rename to src/main/java/biz/nynja/account/services/AccountServiceImpl.java index 4658800..9cf8573 100644 --- a/src/main/java/biz/nynja/account/grpc/services/AccountServiceImpl.java +++ b/src/main/java/biz/nynja/account/services/AccountServiceImpl.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.services; +package biz.nynja.account.services; import java.util.ArrayList; import java.util.Date; @@ -13,6 +13,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import biz.nynja.account.components.Validator; import biz.nynja.account.grpc.AccountDetails; import biz.nynja.account.grpc.AccountServiceGrpc; import biz.nynja.account.grpc.AccountsByAuthenticationProviderRequest; @@ -26,23 +27,21 @@ import biz.nynja.account.grpc.CreatePendingAccountRequest; import biz.nynja.account.grpc.CreatePendingAccountResponse; import biz.nynja.account.grpc.ErrorResponse; import biz.nynja.account.grpc.ErrorResponse.Cause; +import biz.nynja.account.models.Account; +import biz.nynja.account.models.AccountByProfileId; +import biz.nynja.account.models.AuthenticationProvider; +import biz.nynja.account.models.PendingAccount; +import biz.nynja.account.models.UserInfo; +import biz.nynja.account.models.UserInfoByEmail; +import biz.nynja.account.models.UserInfoByPhone; +import biz.nynja.account.repositories.AccountByProfileIdRepository; +import biz.nynja.account.repositories.AccountRepository; +import biz.nynja.account.repositories.AccountRepositoryAdditional; +import biz.nynja.account.repositories.PendingAccountRepository; +import biz.nynja.account.repositories.UserInfoByEmailRepository; +import biz.nynja.account.repositories.UserInfoByPhoneRepository; +import biz.nynja.account.repositories.UserInfoRepository; import biz.nynja.account.grpc.GetAccountsResponse; -import biz.nynja.account.grpc.components.Validator; -import biz.nynja.account.grpc.models.Account; -import biz.nynja.account.grpc.models.PendingAccount; -import biz.nynja.account.grpc.models.UserInfo; -import biz.nynja.account.grpc.models.UserInfoByEmail; -import biz.nynja.account.grpc.models.UserInfoByPhone; -import biz.nynja.account.grpc.repositories.AccountRepositoryAdditional; -import biz.nynja.account.grpc.repositories.PendingAccountRepository; -import biz.nynja.account.grpc.models.AccountByProfileId; -import biz.nynja.account.grpc.models.AuthenticationProvider; -import biz.nynja.account.grpc.models.UserInfoByPhone; -import biz.nynja.account.grpc.repositories.AccountByProfileIdRepository; -import biz.nynja.account.grpc.repositories.AccountRepository; -import biz.nynja.account.grpc.repositories.UserInfoByEmailRepository; -import biz.nynja.account.grpc.repositories.UserInfoByPhoneRepository; -import biz.nynja.account.grpc.repositories.UserInfoRepository; import io.grpc.stub.StreamObserver; /** diff --git a/src/test/java/biz/nynja/account/grpc/ApplicationTests.java b/src/test/java/biz/nynja/account/ApplicationTests.java similarity index 81% rename from src/test/java/biz/nynja/account/grpc/ApplicationTests.java rename to src/test/java/biz/nynja/account/ApplicationTests.java index 0c31adf..23ac7df 100644 --- a/src/test/java/biz/nynja/account/grpc/ApplicationTests.java +++ b/src/test/java/biz/nynja/account/ApplicationTests.java @@ -2,7 +2,7 @@ * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc; +package biz.nynja.account; import org.junit.Test; import org.junit.runner.RunWith; @@ -14,7 +14,7 @@ import org.springframework.test.context.junit4.SpringRunner; */ @RunWith(SpringRunner.class) -@ContextConfiguration(classes = { Application.class }) +@ContextConfiguration(classes = { ApplicationTests.class }) public class ApplicationTests { @Test diff --git a/src/test/java/biz/nynja/account/grpc/components/ValidatorTests.java b/src/test/java/biz/nynja/account/components/ValidatorTests.java similarity index 93% rename from src/test/java/biz/nynja/account/grpc/components/ValidatorTests.java rename to src/test/java/biz/nynja/account/components/ValidatorTests.java index 4800210..522a0ba 100644 --- a/src/test/java/biz/nynja/account/grpc/components/ValidatorTests.java +++ b/src/test/java/biz/nynja/account/components/ValidatorTests.java @@ -2,7 +2,7 @@ * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.components; +package biz.nynja.account.components; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -14,9 +14,10 @@ import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import biz.nynja.account.grpc.repositories.UserInfoByEmailRepository; -import biz.nynja.account.grpc.repositories.UserInfoByPhoneRepository; -import biz.nynja.account.grpc.repositories.UserInfoByUsernameRepository; +import biz.nynja.account.components.Validator; +import biz.nynja.account.repositories.UserInfoByEmailRepository; +import biz.nynja.account.repositories.UserInfoByPhoneRepository; +import biz.nynja.account.repositories.UserInfoByUsernameRepository; /** * Components unit tests. diff --git a/src/test/java/biz/nynja/account/grpc/services/AccountServiceTests.java b/src/test/java/biz/nynja/account/services/AccountServiceTests.java similarity index 97% rename from src/test/java/biz/nynja/account/grpc/services/AccountServiceTests.java rename to src/test/java/biz/nynja/account/services/AccountServiceTests.java index a7a6820..5b231fe 100644 --- a/src/test/java/biz/nynja/account/grpc/services/AccountServiceTests.java +++ b/src/test/java/biz/nynja/account/services/AccountServiceTests.java @@ -1,7 +1,7 @@ /** * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.services; +package biz.nynja.account.services; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -35,16 +35,16 @@ import biz.nynja.account.grpc.CreateAccountResponse; import biz.nynja.account.grpc.ErrorResponse.Cause; import biz.nynja.account.grpc.GetAccountsResponse; import biz.nynja.account.grpc.Status; -import biz.nynja.account.grpc.models.UserInfo; -import biz.nynja.account.grpc.models.UserInfoByEmail; -import biz.nynja.account.grpc.models.UserInfoByPhone; -import biz.nynja.account.grpc.models.UserInfoByUsername; -import biz.nynja.account.grpc.repositories.UserInfoByEmailRepository; -import biz.nynja.account.grpc.repositories.UserInfoByPhoneRepository; -import biz.nynja.account.grpc.repositories.UserInfoByUsernameRepository; -import biz.nynja.account.grpc.repositories.UserInfoRepository; -import biz.nynja.account.grpc.utils.GrpcServerTestBase; -import biz.nynja.account.grpc.utils.Util; +import biz.nynja.account.models.UserInfo; +import biz.nynja.account.models.UserInfoByEmail; +import biz.nynja.account.models.UserInfoByPhone; +import biz.nynja.account.models.UserInfoByUsername; +import biz.nynja.account.repositories.UserInfoByEmailRepository; +import biz.nynja.account.repositories.UserInfoByPhoneRepository; +import biz.nynja.account.repositories.UserInfoByUsernameRepository; +import biz.nynja.account.repositories.UserInfoRepository; +import biz.nynja.account.utils.GrpcServerTestBase; +import biz.nynja.account.utils.Util; /** * AccountService unit tests. @@ -70,7 +70,7 @@ public class AccountServiceTests extends GrpcServerTestBase { @MockBean private Session session; - + @MockBean private UserInfoByUsernameRepository userInfoByUsernameRepository; diff --git a/src/test/java/biz/nynja/account/grpc/utils/GrpcServerTestBase.java b/src/test/java/biz/nynja/account/utils/GrpcServerTestBase.java similarity index 98% rename from src/test/java/biz/nynja/account/grpc/utils/GrpcServerTestBase.java rename to src/test/java/biz/nynja/account/utils/GrpcServerTestBase.java index 2db24e8..e5e98cd 100644 --- a/src/test/java/biz/nynja/account/grpc/utils/GrpcServerTestBase.java +++ b/src/test/java/biz/nynja/account/utils/GrpcServerTestBase.java @@ -2,7 +2,7 @@ * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.utils; +package biz.nynja.account.utils; import java.util.Optional; diff --git a/src/test/java/biz/nynja/account/grpc/utils/Util.java b/src/test/java/biz/nynja/account/utils/Util.java similarity index 94% rename from src/test/java/biz/nynja/account/grpc/utils/Util.java rename to src/test/java/biz/nynja/account/utils/Util.java index 8d87038..6254fa3 100644 --- a/src/test/java/biz/nynja/account/grpc/utils/Util.java +++ b/src/test/java/biz/nynja/account/utils/Util.java @@ -2,7 +2,7 @@ * Copyright (C) 2018 Nynja Inc. All rights reserved. */ -package biz.nynja.account.grpc.utils; +package biz.nynja.account.utils; import java.util.UUID; @@ -11,9 +11,9 @@ import org.springframework.context.annotation.Bean; import biz.nynja.account.grpc.AuthenticationType; import biz.nynja.account.grpc.Status; -import biz.nynja.account.grpc.models.UserInfo; -import biz.nynja.account.grpc.models.UserInfoByEmail; -import biz.nynja.account.grpc.models.UserInfoByPhone;; +import biz.nynja.account.models.UserInfo; +import biz.nynja.account.models.UserInfoByEmail; +import biz.nynja.account.models.UserInfoByPhone;; /** * Unit tests variables, beans and help methods. -- GitLab