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 79f40bb26b6ad5d357de400ddd16e26caef58460..f19c3d10434c5e8f31d924d56ebdc731fec98c02 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 aa644211a11622519d9923e4f344404f7327ef34..90c66ea3fcbb7e071eeb6e8a340d396d7bd55def 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 edcda5f38d578702b9e852ed0d257e5ec18350f2..cccc9de5563e1c3ec5a1e8c306bc951cc7393168 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 0aad4ca65db9edfde8038d258ec8a31f8e2449b8..0c5a2f2a4bf215870e945582db7f45096d511096 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 a20f92095717ceba9f0ef45fb12b3a20b5a8b6a5..a7c9dcf94f77305ec57615c9e098a8eda74ac8a3 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 415fc55e4edf03a6c707fcec9d0f315f9bfe498c..0c44ff73f865b4e729a4a49c8feae5bc451928de 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 5c4768057ffea96ad21a2778aec4ff527c609c6e..a6354f5922258825336faa3a032998bba158a45f 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 dc8abfd2f674e055693cbe294a78a22fcf093991..def5fe0ff320e61283bdcd514c08924d86f61a24 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 a4a1346387687065edf61624dd829c9435811155..3a2eace75b3ae5d392d88f2743088d15dac20a36 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 0aaa9e3fdb72ce5ccd7143e2cfd10bd4d468a2dc..8414d463cdf1703339b9450af9c3c8c419a09b44 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 a0bb463de10ea787be146f08c9edaed5065dbf23..5f95c671517d0717ae7dea9ef1e632618fff25d9 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 2ef9957d1193cae870d7fab14f20b4321e0817b5..d29d961b79650050378d66e95c1b53c7cb53ab53 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 0558a4ab463948580549330294f59ced2c0718da..fee3e5cf6e614db542c9cf7438757d3aaf311fd6 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 027a6522a269bbc764b076edb2ea784be78f6b5f..b5337df327f6dbf633b7a8068bd2d9a4b91c3c62 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 bbdf0000b2ed66f56075ff091e16c45b4c2eb323..9a2a9b0225fde6de0fcc78fe09dd17b8b33a3474 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 5b80bd4f3dd2e893148c01b3b23abf3984683224..0fefda5ad5239d76f5fe30976054d4e5a3563f3c 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 2b22a752a76ff60399384858a6345b58086ba5d5..726ee30f573589f1c13860cb041232797a0fbf68 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 2b2ae6ca830e18af0eb533d322b22d870c370325..bd96fcb5e1ce58f84f4939e27297c963e825c7f5 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 638ba37220655d92c61ff3c57d90f0c5a0ec64de..6cc2785f18d5ce20e3b6b556c421ad477f18af34 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 058aaddda6896547b46dd82e66067f7666d00630..783be8f098ad368dc698e8d6c6fcb91d9de2a327 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 6fe0e52c1905a1de95b04b979671ae0db2a6c2e0..4bd825266e0aa540c54004342d0d687072c65851 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 191e9268b6178eb6504681191aa5d713eb21ebb4..b9f54222ac404eac18ef952f6a4a5cc2380954dd 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 ac63c8ae305967fa029871457d9f304feacf1746..bb89aeed3090b9cab41f7c13db66c5ddd4280985 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 45df8984a9ff62cf977ecc35a7437576e115b2bf..05f8048c96a692448fa46156959080d284770cfa 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 88f4336b0c19af5c1c5c7061b4014da9c6e89582..9f1dcf28ab7f9d398e0d126a2ea0f99a397c0828 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 56acce7a002651cf0b628546f2a0ae1794ed7824..92630e61950180839f56dcf9c904b338cd226ab7 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 a05e46efd53f6216bc673083c2bc2029a532ac83..172f5ce188511e6c02ada6b064d7923f88fab1ea 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 32f381e8620b1a9c5d1f4ea38a4f8649f2b37b10..6abe3ef7e3b550608795befdce4ae2071a4705e5 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 550cac25f335eb902b07de4d214bd61a4a8b4343..a089409f3946176acf41208e5436e61f015706a9 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 46588004555743a791132736612d5014e4b0d8e2..9cf8573f84354c7f601f0bef30fd70ef0f00abff 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 0c31adf5206036bac4a97a981f495bf4ed59a640..23ac7dfd4ae7ae587268a2ab13008c60ead8b627 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 480021008521c9dff64f2fe651b3729db4cd4679..522a0ba2b6b58106f46b1aaf94f1ef02f49d5615 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 a7a6820ae5b7aa55b259e779d7dab434ee34d678..5b231fe96d6b75c8686e3ffd61912c51b2239ae2 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 2db24e8e84fc0e00ba779640319daf3972bfb0e4..e5e98cd59f919db81875a1112b1de81acde52d0c 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 8d87038d7907638ed83d9fe8f440a78532d37276..6254fa38fc0dd39e5c94bc637e129e09376328bf 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.