From fabe46dbf0761cd66f0c042d40ae2d32648a1bf8 Mon Sep 17 00:00:00 2001 From: Miguel Date: Fri, 8 Jun 2018 13:54:49 -0300 Subject: [PATCH 01/23] =?UTF-8?q?renomea=C3=A7=C3=A3o=20de=20projeto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CadworkapiApplication.java} | 6 +++--- .../core/config/DetalheError.java | 2 +- .../core/config/ResponseMessagesConfig.java | 2 +- .../core/config/SwaggerConfig.java | 4 ++-- .../{cadeduc => cadwork}/core/dao/GenericDAO.java | 2 +- .../core/dao/GerericDomainException.java | 2 +- .../core/exception/ManipuladorException.java | 14 +++++++------- .../core/resources/CadeducResources.java | 2 +- .../core/service/GenericService.java | 12 ++++++------ .../service/exception/GenericServiceException.java | 2 +- .../exception/ResourceConflictException.java | 2 +- .../service/exception/ResourceEmptyException.java | 2 +- .../exception/ResourceNotFoundException.java | 2 +- .../ensino/dao/EtapaEnsinoDAO.java | 6 +++--- .../{cadeduc => cadwork}/ensino/dao/SerieDAO.java | 6 +++--- .../ensino/domain/EtapaEnsino.java | 2 +- .../{cadeduc => cadwork}/ensino/domain/Serie.java | 4 ++-- .../ensino/domain/TipoEtapaEnsinoEnum.java | 2 +- .../ensino/resources/EtapaEnsinoResources.java | 8 ++++---- .../ensino/resources/SerieResources.java | 8 ++++---- .../ensino/service/EtapaEnsinoService.java | 14 +++++++------- .../ensino/service/SerieService.java | 14 +++++++------- .../{cadeduc => cadwork}/escola/dao/EscolaDAO.java | 6 +++--- .../{cadeduc => cadwork}/escola/domain/Escola.java | 6 +++--- .../escola/resources/EscolaReportController.java | 6 +++--- .../escola/resources/EscolaResources.java | 8 ++++---- .../escola/service/EscolaService.java | 14 +++++++------- .../localizacao/dao/EnderecoDAO.java | 6 +++--- .../localizacao/dao/MunicipioDAO.java | 6 +++--- .../localizacao/domain/Endereco.java | 2 +- .../localizacao/domain/EstadosEnum.java | 2 +- .../localizacao/domain/Municipio.java | 2 +- .../localizacao/domain/TipoLocalizacaoEnum.java | 2 +- .../localizacao/resources/EnderecoResources.java | 8 ++++---- .../localizacao/resources/MunicipioResources.java | 8 ++++---- .../localizacao/service/EnderecoService.java | 14 +++++++------- .../localizacao/service/MunicipioService.java | 14 +++++++------- .../{cadeduc => cadwork}/util/ValidatorUtil.java | 2 +- 38 files changed, 112 insertions(+), 112 deletions(-) rename src/main/java/br/com/imd/{cadeduc/CadeducapiApplication.java => cadwork/CadworkapiApplication.java} (69%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/core/config/DetalheError.java (94%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/core/config/ResponseMessagesConfig.java (98%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/core/config/SwaggerConfig.java (98%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/core/dao/GenericDAO.java (85%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/core/dao/GerericDomainException.java (83%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/core/exception/ManipuladorException.java (80%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/core/resources/CadeducResources.java (92%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/core/service/GenericService.java (78%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/core/service/exception/GenericServiceException.java (78%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/core/service/exception/ResourceConflictException.java (84%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/core/service/exception/ResourceEmptyException.java (79%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/core/service/exception/ResourceNotFoundException.java (84%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/ensino/dao/EtapaEnsinoDAO.java (68%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/ensino/dao/SerieDAO.java (66%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/ensino/domain/EtapaEnsino.java (98%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/ensino/domain/Serie.java (95%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/ensino/domain/TipoEtapaEnsinoEnum.java (91%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/ensino/resources/EtapaEnsinoResources.java (90%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/ensino/resources/SerieResources.java (90%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/ensino/service/EtapaEnsinoService.java (74%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/ensino/service/SerieService.java (73%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/escola/dao/EscolaDAO.java (75%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/escola/domain/Escola.java (95%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/escola/resources/EscolaReportController.java (85%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/escola/resources/EscolaResources.java (89%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/escola/service/EscolaService.java (74%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/localizacao/dao/EnderecoDAO.java (71%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/localizacao/dao/MunicipioDAO.java (77%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/localizacao/domain/Endereco.java (99%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/localizacao/domain/EstadosEnum.java (96%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/localizacao/domain/Municipio.java (98%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/localizacao/domain/TipoLocalizacaoEnum.java (86%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/localizacao/resources/EnderecoResources.java (88%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/localizacao/resources/MunicipioResources.java (88%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/localizacao/service/EnderecoService.java (74%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/localizacao/service/MunicipioService.java (74%) rename src/main/java/br/com/imd/{cadeduc => cadwork}/util/ValidatorUtil.java (96%) diff --git a/src/main/java/br/com/imd/cadeduc/CadeducapiApplication.java b/src/main/java/br/com/imd/cadwork/CadworkapiApplication.java similarity index 69% rename from src/main/java/br/com/imd/cadeduc/CadeducapiApplication.java rename to src/main/java/br/com/imd/cadwork/CadworkapiApplication.java index 9486edc..b6e3df0 100644 --- a/src/main/java/br/com/imd/cadeduc/CadeducapiApplication.java +++ b/src/main/java/br/com/imd/cadwork/CadworkapiApplication.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc; +package br.com.imd.cadwork; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -7,10 +7,10 @@ @EnableSwagger2 @SpringBootApplication -public class CadeducapiApplication { +public class CadworkapiApplication { public static void main(String[] args) { - SpringApplication.run(CadeducapiApplication.class, args); + SpringApplication.run(CadworkapiApplication.class, args); } } diff --git a/src/main/java/br/com/imd/cadeduc/core/config/DetalheError.java b/src/main/java/br/com/imd/cadwork/core/config/DetalheError.java similarity index 94% rename from src/main/java/br/com/imd/cadeduc/core/config/DetalheError.java rename to src/main/java/br/com/imd/cadwork/core/config/DetalheError.java index c68209f..9af4b97 100644 --- a/src/main/java/br/com/imd/cadeduc/core/config/DetalheError.java +++ b/src/main/java/br/com/imd/cadwork/core/config/DetalheError.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.core.config; +package br.com.imd.cadwork.core.config; import org.springframework.http.HttpStatus; diff --git a/src/main/java/br/com/imd/cadeduc/core/config/ResponseMessagesConfig.java b/src/main/java/br/com/imd/cadwork/core/config/ResponseMessagesConfig.java similarity index 98% rename from src/main/java/br/com/imd/cadeduc/core/config/ResponseMessagesConfig.java rename to src/main/java/br/com/imd/cadwork/core/config/ResponseMessagesConfig.java index a7adb93..34fe549 100644 --- a/src/main/java/br/com/imd/cadeduc/core/config/ResponseMessagesConfig.java +++ b/src/main/java/br/com/imd/cadwork/core/config/ResponseMessagesConfig.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.core.config; +package br.com.imd.cadwork.core.config; import static com.google.common.collect.Lists.newArrayList; diff --git a/src/main/java/br/com/imd/cadeduc/core/config/SwaggerConfig.java b/src/main/java/br/com/imd/cadwork/core/config/SwaggerConfig.java similarity index 98% rename from src/main/java/br/com/imd/cadeduc/core/config/SwaggerConfig.java rename to src/main/java/br/com/imd/cadwork/core/config/SwaggerConfig.java index 69237f0..109c235 100644 --- a/src/main/java/br/com/imd/cadeduc/core/config/SwaggerConfig.java +++ b/src/main/java/br/com/imd/cadwork/core/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.core.config; +package br.com.imd.cadwork.core.config; @@ -40,7 +40,7 @@ public class SwaggerConfig extends WebMvcConfigurationSupport{ public Docket api() { return new Docket(DocumentationType.SWAGGER_2) .select() - .apis(RequestHandlerSelectors.basePackage("br.com.imd.cadeduc")) + .apis(RequestHandlerSelectors.basePackage("br.com.imd.cadwork")) .paths(PathSelectors.any()) .build() .pathMapping("/") diff --git a/src/main/java/br/com/imd/cadeduc/core/dao/GenericDAO.java b/src/main/java/br/com/imd/cadwork/core/dao/GenericDAO.java similarity index 85% rename from src/main/java/br/com/imd/cadeduc/core/dao/GenericDAO.java rename to src/main/java/br/com/imd/cadwork/core/dao/GenericDAO.java index 18b5b33..01cdf0c 100644 --- a/src/main/java/br/com/imd/cadeduc/core/dao/GenericDAO.java +++ b/src/main/java/br/com/imd/cadwork/core/dao/GenericDAO.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.core.dao; +package br.com.imd.cadwork.core.dao; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.repository.NoRepositoryBean; diff --git a/src/main/java/br/com/imd/cadeduc/core/dao/GerericDomainException.java b/src/main/java/br/com/imd/cadwork/core/dao/GerericDomainException.java similarity index 83% rename from src/main/java/br/com/imd/cadeduc/core/dao/GerericDomainException.java rename to src/main/java/br/com/imd/cadwork/core/dao/GerericDomainException.java index 43cc1b2..84cc84e 100644 --- a/src/main/java/br/com/imd/cadeduc/core/dao/GerericDomainException.java +++ b/src/main/java/br/com/imd/cadwork/core/dao/GerericDomainException.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.core.dao; +package br.com.imd.cadwork.core.dao; public class GerericDomainException extends Exception { diff --git a/src/main/java/br/com/imd/cadeduc/core/exception/ManipuladorException.java b/src/main/java/br/com/imd/cadwork/core/exception/ManipuladorException.java similarity index 80% rename from src/main/java/br/com/imd/cadeduc/core/exception/ManipuladorException.java rename to src/main/java/br/com/imd/cadwork/core/exception/ManipuladorException.java index 7b00e51..31b547a 100644 --- a/src/main/java/br/com/imd/cadeduc/core/exception/ManipuladorException.java +++ b/src/main/java/br/com/imd/cadwork/core/exception/ManipuladorException.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.core.exception; +package br.com.imd.cadwork.core.exception; import javax.servlet.http.HttpServletRequest; @@ -7,12 +7,12 @@ import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; -import br.com.imd.cadeduc.core.config.DetalheError; -import br.com.imd.cadeduc.core.config.ResponseMessagesConfig; -import br.com.imd.cadeduc.core.service.exception.GenericServiceException; -import br.com.imd.cadeduc.core.service.exception.ResourceConflictException; -import br.com.imd.cadeduc.core.service.exception.ResourceEmptyException; -import br.com.imd.cadeduc.core.service.exception.ResourceNotFoundException; +import br.com.imd.cadwork.core.config.DetalheError; +import br.com.imd.cadwork.core.config.ResponseMessagesConfig; +import br.com.imd.cadwork.core.service.exception.GenericServiceException; +import br.com.imd.cadwork.core.service.exception.ResourceConflictException; +import br.com.imd.cadwork.core.service.exception.ResourceEmptyException; +import br.com.imd.cadwork.core.service.exception.ResourceNotFoundException; @ControllerAdvice public class ManipuladorException { diff --git a/src/main/java/br/com/imd/cadeduc/core/resources/CadeducResources.java b/src/main/java/br/com/imd/cadwork/core/resources/CadeducResources.java similarity index 92% rename from src/main/java/br/com/imd/cadeduc/core/resources/CadeducResources.java rename to src/main/java/br/com/imd/cadwork/core/resources/CadeducResources.java index 45142db..a9a41a3 100644 --- a/src/main/java/br/com/imd/cadeduc/core/resources/CadeducResources.java +++ b/src/main/java/br/com/imd/cadwork/core/resources/CadeducResources.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.core.resources; +package br.com.imd.cadwork.core.resources; import javax.servlet.http.HttpServletResponse; diff --git a/src/main/java/br/com/imd/cadeduc/core/service/GenericService.java b/src/main/java/br/com/imd/cadwork/core/service/GenericService.java similarity index 78% rename from src/main/java/br/com/imd/cadeduc/core/service/GenericService.java rename to src/main/java/br/com/imd/cadwork/core/service/GenericService.java index a0f5382..1fe1cf7 100644 --- a/src/main/java/br/com/imd/cadeduc/core/service/GenericService.java +++ b/src/main/java/br/com/imd/cadwork/core/service/GenericService.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.core.service; +package br.com.imd.cadwork.core.service; import java.util.List; import java.util.Optional; @@ -6,11 +6,11 @@ import org.springframework.stereotype.Service; import org.springframework.validation.BindingResult; -import br.com.imd.cadeduc.core.dao.GenericDAO; -import br.com.imd.cadeduc.core.service.exception.GenericServiceException; -import br.com.imd.cadeduc.core.service.exception.ResourceEmptyException; -import br.com.imd.cadeduc.core.service.exception.ResourceNotFoundException; -import br.com.imd.cadeduc.util.ValidatorUtil; +import br.com.imd.cadwork.core.dao.GenericDAO; +import br.com.imd.cadwork.core.service.exception.GenericServiceException; +import br.com.imd.cadwork.core.service.exception.ResourceEmptyException; +import br.com.imd.cadwork.core.service.exception.ResourceNotFoundException; +import br.com.imd.cadwork.util.ValidatorUtil; @Service public abstract class GenericService { diff --git a/src/main/java/br/com/imd/cadeduc/core/service/exception/GenericServiceException.java b/src/main/java/br/com/imd/cadwork/core/service/exception/GenericServiceException.java similarity index 78% rename from src/main/java/br/com/imd/cadeduc/core/service/exception/GenericServiceException.java rename to src/main/java/br/com/imd/cadwork/core/service/exception/GenericServiceException.java index fd5899a..901ee82 100644 --- a/src/main/java/br/com/imd/cadeduc/core/service/exception/GenericServiceException.java +++ b/src/main/java/br/com/imd/cadwork/core/service/exception/GenericServiceException.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.core.service.exception; +package br.com.imd.cadwork.core.service.exception; public class GenericServiceException extends Exception { private static final long serialVersionUID = 1L; diff --git a/src/main/java/br/com/imd/cadeduc/core/service/exception/ResourceConflictException.java b/src/main/java/br/com/imd/cadwork/core/service/exception/ResourceConflictException.java similarity index 84% rename from src/main/java/br/com/imd/cadeduc/core/service/exception/ResourceConflictException.java rename to src/main/java/br/com/imd/cadwork/core/service/exception/ResourceConflictException.java index 98932fe..744237a 100644 --- a/src/main/java/br/com/imd/cadeduc/core/service/exception/ResourceConflictException.java +++ b/src/main/java/br/com/imd/cadwork/core/service/exception/ResourceConflictException.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.core.service.exception; +package br.com.imd.cadwork.core.service.exception; public class ResourceConflictException extends GenericServiceException { diff --git a/src/main/java/br/com/imd/cadeduc/core/service/exception/ResourceEmptyException.java b/src/main/java/br/com/imd/cadwork/core/service/exception/ResourceEmptyException.java similarity index 79% rename from src/main/java/br/com/imd/cadeduc/core/service/exception/ResourceEmptyException.java rename to src/main/java/br/com/imd/cadwork/core/service/exception/ResourceEmptyException.java index 477dffb..4663558 100644 --- a/src/main/java/br/com/imd/cadeduc/core/service/exception/ResourceEmptyException.java +++ b/src/main/java/br/com/imd/cadwork/core/service/exception/ResourceEmptyException.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.core.service.exception; +package br.com.imd.cadwork.core.service.exception; public class ResourceEmptyException extends GenericServiceException { diff --git a/src/main/java/br/com/imd/cadeduc/core/service/exception/ResourceNotFoundException.java b/src/main/java/br/com/imd/cadwork/core/service/exception/ResourceNotFoundException.java similarity index 84% rename from src/main/java/br/com/imd/cadeduc/core/service/exception/ResourceNotFoundException.java rename to src/main/java/br/com/imd/cadwork/core/service/exception/ResourceNotFoundException.java index 43f7faf..978a827 100644 --- a/src/main/java/br/com/imd/cadeduc/core/service/exception/ResourceNotFoundException.java +++ b/src/main/java/br/com/imd/cadwork/core/service/exception/ResourceNotFoundException.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.core.service.exception; +package br.com.imd.cadwork.core.service.exception; public class ResourceNotFoundException extends GenericServiceException { diff --git a/src/main/java/br/com/imd/cadeduc/ensino/dao/EtapaEnsinoDAO.java b/src/main/java/br/com/imd/cadwork/ensino/dao/EtapaEnsinoDAO.java similarity index 68% rename from src/main/java/br/com/imd/cadeduc/ensino/dao/EtapaEnsinoDAO.java rename to src/main/java/br/com/imd/cadwork/ensino/dao/EtapaEnsinoDAO.java index 6646cec..126e49c 100644 --- a/src/main/java/br/com/imd/cadeduc/ensino/dao/EtapaEnsinoDAO.java +++ b/src/main/java/br/com/imd/cadwork/ensino/dao/EtapaEnsinoDAO.java @@ -1,12 +1,12 @@ -package br.com.imd.cadeduc.ensino.dao; +package br.com.imd.cadwork.ensino.dao; import java.util.Optional; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import br.com.imd.cadeduc.core.dao.GenericDAO; -import br.com.imd.cadeduc.ensino.domain.EtapaEnsino; +import br.com.imd.cadwork.core.dao.GenericDAO; +import br.com.imd.cadwork.ensino.domain.EtapaEnsino; @Repository public interface EtapaEnsinoDAO extends GenericDAO { diff --git a/src/main/java/br/com/imd/cadeduc/ensino/dao/SerieDAO.java b/src/main/java/br/com/imd/cadwork/ensino/dao/SerieDAO.java similarity index 66% rename from src/main/java/br/com/imd/cadeduc/ensino/dao/SerieDAO.java rename to src/main/java/br/com/imd/cadwork/ensino/dao/SerieDAO.java index 089e071..44000f1 100644 --- a/src/main/java/br/com/imd/cadeduc/ensino/dao/SerieDAO.java +++ b/src/main/java/br/com/imd/cadwork/ensino/dao/SerieDAO.java @@ -1,12 +1,12 @@ -package br.com.imd.cadeduc.ensino.dao; +package br.com.imd.cadwork.ensino.dao; import java.util.Optional; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import br.com.imd.cadeduc.core.dao.GenericDAO; -import br.com.imd.cadeduc.ensino.domain.Serie; +import br.com.imd.cadwork.core.dao.GenericDAO; +import br.com.imd.cadwork.ensino.domain.Serie; @Repository public interface SerieDAO extends GenericDAO { diff --git a/src/main/java/br/com/imd/cadeduc/ensino/domain/EtapaEnsino.java b/src/main/java/br/com/imd/cadwork/ensino/domain/EtapaEnsino.java similarity index 98% rename from src/main/java/br/com/imd/cadeduc/ensino/domain/EtapaEnsino.java rename to src/main/java/br/com/imd/cadwork/ensino/domain/EtapaEnsino.java index 9bb2c30..6ac08e9 100644 --- a/src/main/java/br/com/imd/cadeduc/ensino/domain/EtapaEnsino.java +++ b/src/main/java/br/com/imd/cadwork/ensino/domain/EtapaEnsino.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.ensino.domain; +package br.com.imd.cadwork.ensino.domain; import java.util.List; diff --git a/src/main/java/br/com/imd/cadeduc/ensino/domain/Serie.java b/src/main/java/br/com/imd/cadwork/ensino/domain/Serie.java similarity index 95% rename from src/main/java/br/com/imd/cadeduc/ensino/domain/Serie.java rename to src/main/java/br/com/imd/cadwork/ensino/domain/Serie.java index 0c59d6a..7d07974 100644 --- a/src/main/java/br/com/imd/cadeduc/ensino/domain/Serie.java +++ b/src/main/java/br/com/imd/cadwork/ensino/domain/Serie.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.ensino.domain; +package br.com.imd.cadwork.ensino.domain; import java.util.List; @@ -13,7 +13,7 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import br.com.imd.cadeduc.escola.domain.Escola; +import br.com.imd.cadwork.escola.domain.Escola; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/br/com/imd/cadeduc/ensino/domain/TipoEtapaEnsinoEnum.java b/src/main/java/br/com/imd/cadwork/ensino/domain/TipoEtapaEnsinoEnum.java similarity index 91% rename from src/main/java/br/com/imd/cadeduc/ensino/domain/TipoEtapaEnsinoEnum.java rename to src/main/java/br/com/imd/cadwork/ensino/domain/TipoEtapaEnsinoEnum.java index 6fba864..e3c93be 100644 --- a/src/main/java/br/com/imd/cadeduc/ensino/domain/TipoEtapaEnsinoEnum.java +++ b/src/main/java/br/com/imd/cadwork/ensino/domain/TipoEtapaEnsinoEnum.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.ensino.domain; +package br.com.imd.cadwork.ensino.domain; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/br/com/imd/cadeduc/ensino/resources/EtapaEnsinoResources.java b/src/main/java/br/com/imd/cadwork/ensino/resources/EtapaEnsinoResources.java similarity index 90% rename from src/main/java/br/com/imd/cadeduc/ensino/resources/EtapaEnsinoResources.java rename to src/main/java/br/com/imd/cadwork/ensino/resources/EtapaEnsinoResources.java index b404539..ad7241b 100644 --- a/src/main/java/br/com/imd/cadeduc/ensino/resources/EtapaEnsinoResources.java +++ b/src/main/java/br/com/imd/cadwork/ensino/resources/EtapaEnsinoResources.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.ensino.resources; +package br.com.imd.cadwork.ensino.resources; import java.net.URI; import java.util.List; @@ -19,9 +19,9 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import br.com.imd.cadeduc.core.service.exception.GenericServiceException; -import br.com.imd.cadeduc.ensino.domain.EtapaEnsino; -import br.com.imd.cadeduc.ensino.service.EtapaEnsinoService; +import br.com.imd.cadwork.core.service.exception.GenericServiceException; +import br.com.imd.cadwork.ensino.domain.EtapaEnsino; +import br.com.imd.cadwork.ensino.service.EtapaEnsinoService; import io.swagger.annotations.Api; @CrossOrigin(origins = "http://localhost:4200", maxAge = 3600) diff --git a/src/main/java/br/com/imd/cadeduc/ensino/resources/SerieResources.java b/src/main/java/br/com/imd/cadwork/ensino/resources/SerieResources.java similarity index 90% rename from src/main/java/br/com/imd/cadeduc/ensino/resources/SerieResources.java rename to src/main/java/br/com/imd/cadwork/ensino/resources/SerieResources.java index 93e7a59..58e0733 100644 --- a/src/main/java/br/com/imd/cadeduc/ensino/resources/SerieResources.java +++ b/src/main/java/br/com/imd/cadwork/ensino/resources/SerieResources.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.ensino.resources; +package br.com.imd.cadwork.ensino.resources; import java.net.URI; import java.util.List; @@ -19,9 +19,9 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import br.com.imd.cadeduc.core.service.exception.GenericServiceException; -import br.com.imd.cadeduc.ensino.domain.Serie; -import br.com.imd.cadeduc.ensino.service.SerieService; +import br.com.imd.cadwork.core.service.exception.GenericServiceException; +import br.com.imd.cadwork.ensino.domain.Serie; +import br.com.imd.cadwork.ensino.service.SerieService; import io.swagger.annotations.Api; @CrossOrigin(origins = "http://localhost:4200", maxAge = 3600) diff --git a/src/main/java/br/com/imd/cadeduc/ensino/service/EtapaEnsinoService.java b/src/main/java/br/com/imd/cadwork/ensino/service/EtapaEnsinoService.java similarity index 74% rename from src/main/java/br/com/imd/cadeduc/ensino/service/EtapaEnsinoService.java rename to src/main/java/br/com/imd/cadwork/ensino/service/EtapaEnsinoService.java index c3dcb11..8ab71b0 100644 --- a/src/main/java/br/com/imd/cadeduc/ensino/service/EtapaEnsinoService.java +++ b/src/main/java/br/com/imd/cadwork/ensino/service/EtapaEnsinoService.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.ensino.service; +package br.com.imd.cadwork.ensino.service; import java.util.List; import java.util.Optional; @@ -7,12 +7,12 @@ import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; -import br.com.imd.cadeduc.core.dao.GenericDAO; -import br.com.imd.cadeduc.core.service.GenericService; -import br.com.imd.cadeduc.core.service.exception.GenericServiceException; -import br.com.imd.cadeduc.core.service.exception.ResourceConflictException; -import br.com.imd.cadeduc.ensino.dao.EtapaEnsinoDAO; -import br.com.imd.cadeduc.ensino.domain.EtapaEnsino; +import br.com.imd.cadwork.core.dao.GenericDAO; +import br.com.imd.cadwork.core.service.GenericService; +import br.com.imd.cadwork.core.service.exception.GenericServiceException; +import br.com.imd.cadwork.core.service.exception.ResourceConflictException; +import br.com.imd.cadwork.ensino.dao.EtapaEnsinoDAO; +import br.com.imd.cadwork.ensino.domain.EtapaEnsino; @Component public class EtapaEnsinoService extends GenericService { diff --git a/src/main/java/br/com/imd/cadeduc/ensino/service/SerieService.java b/src/main/java/br/com/imd/cadwork/ensino/service/SerieService.java similarity index 73% rename from src/main/java/br/com/imd/cadeduc/ensino/service/SerieService.java rename to src/main/java/br/com/imd/cadwork/ensino/service/SerieService.java index 0097300..9fe86e7 100644 --- a/src/main/java/br/com/imd/cadeduc/ensino/service/SerieService.java +++ b/src/main/java/br/com/imd/cadwork/ensino/service/SerieService.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.ensino.service; +package br.com.imd.cadwork.ensino.service; import java.util.List; import java.util.Optional; @@ -7,12 +7,12 @@ import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; -import br.com.imd.cadeduc.core.dao.GenericDAO; -import br.com.imd.cadeduc.core.service.GenericService; -import br.com.imd.cadeduc.core.service.exception.GenericServiceException; -import br.com.imd.cadeduc.core.service.exception.ResourceConflictException; -import br.com.imd.cadeduc.ensino.dao.SerieDAO; -import br.com.imd.cadeduc.ensino.domain.Serie; +import br.com.imd.cadwork.core.dao.GenericDAO; +import br.com.imd.cadwork.core.service.GenericService; +import br.com.imd.cadwork.core.service.exception.GenericServiceException; +import br.com.imd.cadwork.core.service.exception.ResourceConflictException; +import br.com.imd.cadwork.ensino.dao.SerieDAO; +import br.com.imd.cadwork.ensino.domain.Serie; @Component public class SerieService extends GenericService { diff --git a/src/main/java/br/com/imd/cadeduc/escola/dao/EscolaDAO.java b/src/main/java/br/com/imd/cadwork/escola/dao/EscolaDAO.java similarity index 75% rename from src/main/java/br/com/imd/cadeduc/escola/dao/EscolaDAO.java rename to src/main/java/br/com/imd/cadwork/escola/dao/EscolaDAO.java index a993c0d..38f1bd6 100644 --- a/src/main/java/br/com/imd/cadeduc/escola/dao/EscolaDAO.java +++ b/src/main/java/br/com/imd/cadwork/escola/dao/EscolaDAO.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.escola.dao; +package br.com.imd.cadwork.escola.dao; import java.util.Optional; @@ -6,8 +6,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import br.com.imd.cadeduc.core.dao.GenericDAO; -import br.com.imd.cadeduc.escola.domain.Escola; +import br.com.imd.cadwork.core.dao.GenericDAO; +import br.com.imd.cadwork.escola.domain.Escola; @Repository public interface EscolaDAO extends GenericDAO { diff --git a/src/main/java/br/com/imd/cadeduc/escola/domain/Escola.java b/src/main/java/br/com/imd/cadwork/escola/domain/Escola.java similarity index 95% rename from src/main/java/br/com/imd/cadeduc/escola/domain/Escola.java rename to src/main/java/br/com/imd/cadwork/escola/domain/Escola.java index 1d3d36e..ce5a77a 100644 --- a/src/main/java/br/com/imd/cadeduc/escola/domain/Escola.java +++ b/src/main/java/br/com/imd/cadwork/escola/domain/Escola.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.escola.domain; +package br.com.imd.cadwork.escola.domain; import java.util.List; @@ -16,8 +16,8 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import br.com.imd.cadeduc.ensino.domain.Serie; -import br.com.imd.cadeduc.localizacao.domain.Endereco; +import br.com.imd.cadwork.ensino.domain.Serie; +import br.com.imd.cadwork.localizacao.domain.Endereco; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/br/com/imd/cadeduc/escola/resources/EscolaReportController.java b/src/main/java/br/com/imd/cadwork/escola/resources/EscolaReportController.java similarity index 85% rename from src/main/java/br/com/imd/cadeduc/escola/resources/EscolaReportController.java rename to src/main/java/br/com/imd/cadwork/escola/resources/EscolaReportController.java index 31f4a9d..e98dd2f 100644 --- a/src/main/java/br/com/imd/cadeduc/escola/resources/EscolaReportController.java +++ b/src/main/java/br/com/imd/cadwork/escola/resources/EscolaReportController.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.escola.resources; +package br.com.imd.cadwork.escola.resources; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; -import br.com.imd.cadeduc.core.service.exception.GenericServiceException; -import br.com.imd.cadeduc.escola.service.EscolaService; +import br.com.imd.cadwork.core.service.exception.GenericServiceException; +import br.com.imd.cadwork.escola.service.EscolaService; @Controller @RequestMapping("/reports") diff --git a/src/main/java/br/com/imd/cadeduc/escola/resources/EscolaResources.java b/src/main/java/br/com/imd/cadwork/escola/resources/EscolaResources.java similarity index 89% rename from src/main/java/br/com/imd/cadeduc/escola/resources/EscolaResources.java rename to src/main/java/br/com/imd/cadwork/escola/resources/EscolaResources.java index c0172ab..e25ec6b 100644 --- a/src/main/java/br/com/imd/cadeduc/escola/resources/EscolaResources.java +++ b/src/main/java/br/com/imd/cadwork/escola/resources/EscolaResources.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.escola.resources; +package br.com.imd.cadwork.escola.resources; import java.net.URI; import java.util.List; @@ -17,9 +17,9 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import br.com.imd.cadeduc.core.service.exception.GenericServiceException; -import br.com.imd.cadeduc.escola.domain.Escola; -import br.com.imd.cadeduc.escola.service.EscolaService; +import br.com.imd.cadwork.core.service.exception.GenericServiceException; +import br.com.imd.cadwork.escola.domain.Escola; +import br.com.imd.cadwork.escola.service.EscolaService; import io.swagger.annotations.Api; @CrossOrigin(origins = "http://localhost:4200", maxAge = 3600) diff --git a/src/main/java/br/com/imd/cadeduc/escola/service/EscolaService.java b/src/main/java/br/com/imd/cadwork/escola/service/EscolaService.java similarity index 74% rename from src/main/java/br/com/imd/cadeduc/escola/service/EscolaService.java rename to src/main/java/br/com/imd/cadwork/escola/service/EscolaService.java index 9723c47..21c5c8f 100644 --- a/src/main/java/br/com/imd/cadeduc/escola/service/EscolaService.java +++ b/src/main/java/br/com/imd/cadwork/escola/service/EscolaService.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.escola.service; +package br.com.imd.cadwork.escola.service; import java.util.List; import java.util.Optional; @@ -7,12 +7,12 @@ import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; -import br.com.imd.cadeduc.core.dao.GenericDAO; -import br.com.imd.cadeduc.core.service.GenericService; -import br.com.imd.cadeduc.core.service.exception.GenericServiceException; -import br.com.imd.cadeduc.core.service.exception.ResourceConflictException; -import br.com.imd.cadeduc.escola.dao.EscolaDAO; -import br.com.imd.cadeduc.escola.domain.Escola; +import br.com.imd.cadwork.core.dao.GenericDAO; +import br.com.imd.cadwork.core.service.GenericService; +import br.com.imd.cadwork.core.service.exception.GenericServiceException; +import br.com.imd.cadwork.core.service.exception.ResourceConflictException; +import br.com.imd.cadwork.escola.dao.EscolaDAO; +import br.com.imd.cadwork.escola.domain.Escola; @Component public class EscolaService extends GenericService { diff --git a/src/main/java/br/com/imd/cadeduc/localizacao/dao/EnderecoDAO.java b/src/main/java/br/com/imd/cadwork/localizacao/dao/EnderecoDAO.java similarity index 71% rename from src/main/java/br/com/imd/cadeduc/localizacao/dao/EnderecoDAO.java rename to src/main/java/br/com/imd/cadwork/localizacao/dao/EnderecoDAO.java index 2d3bbb3..a5f14e8 100644 --- a/src/main/java/br/com/imd/cadeduc/localizacao/dao/EnderecoDAO.java +++ b/src/main/java/br/com/imd/cadwork/localizacao/dao/EnderecoDAO.java @@ -1,12 +1,12 @@ -package br.com.imd.cadeduc.localizacao.dao; +package br.com.imd.cadwork.localizacao.dao; import java.util.Optional; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import br.com.imd.cadeduc.core.dao.GenericDAO; -import br.com.imd.cadeduc.localizacao.domain.Endereco; +import br.com.imd.cadwork.core.dao.GenericDAO; +import br.com.imd.cadwork.localizacao.domain.Endereco; @Repository public interface EnderecoDAO extends GenericDAO { diff --git a/src/main/java/br/com/imd/cadeduc/localizacao/dao/MunicipioDAO.java b/src/main/java/br/com/imd/cadwork/localizacao/dao/MunicipioDAO.java similarity index 77% rename from src/main/java/br/com/imd/cadeduc/localizacao/dao/MunicipioDAO.java rename to src/main/java/br/com/imd/cadwork/localizacao/dao/MunicipioDAO.java index 06be7e8..58a3905 100644 --- a/src/main/java/br/com/imd/cadeduc/localizacao/dao/MunicipioDAO.java +++ b/src/main/java/br/com/imd/cadwork/localizacao/dao/MunicipioDAO.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.localizacao.dao; +package br.com.imd.cadwork.localizacao.dao; import java.util.Optional; @@ -6,8 +6,8 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import br.com.imd.cadeduc.core.dao.GenericDAO; -import br.com.imd.cadeduc.localizacao.domain.Municipio; +import br.com.imd.cadwork.core.dao.GenericDAO; +import br.com.imd.cadwork.localizacao.domain.Municipio; @Repository public interface MunicipioDAO extends GenericDAO { diff --git a/src/main/java/br/com/imd/cadeduc/localizacao/domain/Endereco.java b/src/main/java/br/com/imd/cadwork/localizacao/domain/Endereco.java similarity index 99% rename from src/main/java/br/com/imd/cadeduc/localizacao/domain/Endereco.java rename to src/main/java/br/com/imd/cadwork/localizacao/domain/Endereco.java index 90a544c..89811b5 100644 --- a/src/main/java/br/com/imd/cadeduc/localizacao/domain/Endereco.java +++ b/src/main/java/br/com/imd/cadwork/localizacao/domain/Endereco.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.localizacao.domain; +package br.com.imd.cadwork.localizacao.domain; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/main/java/br/com/imd/cadeduc/localizacao/domain/EstadosEnum.java b/src/main/java/br/com/imd/cadwork/localizacao/domain/EstadosEnum.java similarity index 96% rename from src/main/java/br/com/imd/cadeduc/localizacao/domain/EstadosEnum.java rename to src/main/java/br/com/imd/cadwork/localizacao/domain/EstadosEnum.java index 7fc4196..b627f61 100644 --- a/src/main/java/br/com/imd/cadeduc/localizacao/domain/EstadosEnum.java +++ b/src/main/java/br/com/imd/cadwork/localizacao/domain/EstadosEnum.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.localizacao.domain; +package br.com.imd.cadwork.localizacao.domain; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/br/com/imd/cadeduc/localizacao/domain/Municipio.java b/src/main/java/br/com/imd/cadwork/localizacao/domain/Municipio.java similarity index 98% rename from src/main/java/br/com/imd/cadeduc/localizacao/domain/Municipio.java rename to src/main/java/br/com/imd/cadwork/localizacao/domain/Municipio.java index 1df38b0..4ef2b58 100644 --- a/src/main/java/br/com/imd/cadeduc/localizacao/domain/Municipio.java +++ b/src/main/java/br/com/imd/cadwork/localizacao/domain/Municipio.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.localizacao.domain; +package br.com.imd.cadwork.localizacao.domain; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/main/java/br/com/imd/cadeduc/localizacao/domain/TipoLocalizacaoEnum.java b/src/main/java/br/com/imd/cadwork/localizacao/domain/TipoLocalizacaoEnum.java similarity index 86% rename from src/main/java/br/com/imd/cadeduc/localizacao/domain/TipoLocalizacaoEnum.java rename to src/main/java/br/com/imd/cadwork/localizacao/domain/TipoLocalizacaoEnum.java index a7b02fd..46b638f 100644 --- a/src/main/java/br/com/imd/cadeduc/localizacao/domain/TipoLocalizacaoEnum.java +++ b/src/main/java/br/com/imd/cadwork/localizacao/domain/TipoLocalizacaoEnum.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.localizacao.domain; +package br.com.imd.cadwork.localizacao.domain; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/br/com/imd/cadeduc/localizacao/resources/EnderecoResources.java b/src/main/java/br/com/imd/cadwork/localizacao/resources/EnderecoResources.java similarity index 88% rename from src/main/java/br/com/imd/cadeduc/localizacao/resources/EnderecoResources.java rename to src/main/java/br/com/imd/cadwork/localizacao/resources/EnderecoResources.java index e7faee4..73b3fe4 100644 --- a/src/main/java/br/com/imd/cadeduc/localizacao/resources/EnderecoResources.java +++ b/src/main/java/br/com/imd/cadwork/localizacao/resources/EnderecoResources.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.localizacao.resources; +package br.com.imd.cadwork.localizacao.resources; import java.net.URI; import java.util.List; @@ -17,9 +17,9 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import br.com.imd.cadeduc.core.service.exception.GenericServiceException; -import br.com.imd.cadeduc.localizacao.domain.Endereco; -import br.com.imd.cadeduc.localizacao.service.EnderecoService; +import br.com.imd.cadwork.core.service.exception.GenericServiceException; +import br.com.imd.cadwork.localizacao.domain.Endereco; +import br.com.imd.cadwork.localizacao.service.EnderecoService; import io.swagger.annotations.Api; @CrossOrigin(origins = "http://localhost:4200", maxAge = 3600) diff --git a/src/main/java/br/com/imd/cadeduc/localizacao/resources/MunicipioResources.java b/src/main/java/br/com/imd/cadwork/localizacao/resources/MunicipioResources.java similarity index 88% rename from src/main/java/br/com/imd/cadeduc/localizacao/resources/MunicipioResources.java rename to src/main/java/br/com/imd/cadwork/localizacao/resources/MunicipioResources.java index 33e76d8..d444152 100644 --- a/src/main/java/br/com/imd/cadeduc/localizacao/resources/MunicipioResources.java +++ b/src/main/java/br/com/imd/cadwork/localizacao/resources/MunicipioResources.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.localizacao.resources; +package br.com.imd.cadwork.localizacao.resources; import java.net.URI; import java.util.List; @@ -16,9 +16,9 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; -import br.com.imd.cadeduc.core.service.exception.GenericServiceException; -import br.com.imd.cadeduc.localizacao.domain.Municipio; -import br.com.imd.cadeduc.localizacao.service.MunicipioService; +import br.com.imd.cadwork.core.service.exception.GenericServiceException; +import br.com.imd.cadwork.localizacao.domain.Municipio; +import br.com.imd.cadwork.localizacao.service.MunicipioService; import io.swagger.annotations.Api; @RestController diff --git a/src/main/java/br/com/imd/cadeduc/localizacao/service/EnderecoService.java b/src/main/java/br/com/imd/cadwork/localizacao/service/EnderecoService.java similarity index 74% rename from src/main/java/br/com/imd/cadeduc/localizacao/service/EnderecoService.java rename to src/main/java/br/com/imd/cadwork/localizacao/service/EnderecoService.java index 7176f44..2785e4c 100644 --- a/src/main/java/br/com/imd/cadeduc/localizacao/service/EnderecoService.java +++ b/src/main/java/br/com/imd/cadwork/localizacao/service/EnderecoService.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.localizacao.service; +package br.com.imd.cadwork.localizacao.service; import java.util.List; import java.util.Optional; @@ -7,12 +7,12 @@ import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; -import br.com.imd.cadeduc.core.dao.GenericDAO; -import br.com.imd.cadeduc.core.service.GenericService; -import br.com.imd.cadeduc.core.service.exception.GenericServiceException; -import br.com.imd.cadeduc.core.service.exception.ResourceConflictException; -import br.com.imd.cadeduc.localizacao.dao.EnderecoDAO; -import br.com.imd.cadeduc.localizacao.domain.Endereco; +import br.com.imd.cadwork.core.dao.GenericDAO; +import br.com.imd.cadwork.core.service.GenericService; +import br.com.imd.cadwork.core.service.exception.GenericServiceException; +import br.com.imd.cadwork.core.service.exception.ResourceConflictException; +import br.com.imd.cadwork.localizacao.dao.EnderecoDAO; +import br.com.imd.cadwork.localizacao.domain.Endereco; @Component public class EnderecoService extends GenericService { diff --git a/src/main/java/br/com/imd/cadeduc/localizacao/service/MunicipioService.java b/src/main/java/br/com/imd/cadwork/localizacao/service/MunicipioService.java similarity index 74% rename from src/main/java/br/com/imd/cadeduc/localizacao/service/MunicipioService.java rename to src/main/java/br/com/imd/cadwork/localizacao/service/MunicipioService.java index f167168..9e8206f 100644 --- a/src/main/java/br/com/imd/cadeduc/localizacao/service/MunicipioService.java +++ b/src/main/java/br/com/imd/cadwork/localizacao/service/MunicipioService.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.localizacao.service; +package br.com.imd.cadwork.localizacao.service; import java.util.List; import java.util.Optional; @@ -7,12 +7,12 @@ import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; -import br.com.imd.cadeduc.core.dao.GenericDAO; -import br.com.imd.cadeduc.core.service.GenericService; -import br.com.imd.cadeduc.core.service.exception.GenericServiceException; -import br.com.imd.cadeduc.core.service.exception.ResourceConflictException; -import br.com.imd.cadeduc.localizacao.dao.MunicipioDAO; -import br.com.imd.cadeduc.localizacao.domain.Municipio; +import br.com.imd.cadwork.core.dao.GenericDAO; +import br.com.imd.cadwork.core.service.GenericService; +import br.com.imd.cadwork.core.service.exception.GenericServiceException; +import br.com.imd.cadwork.core.service.exception.ResourceConflictException; +import br.com.imd.cadwork.localizacao.dao.MunicipioDAO; +import br.com.imd.cadwork.localizacao.domain.Municipio; @Component public class MunicipioService extends GenericService { diff --git a/src/main/java/br/com/imd/cadeduc/util/ValidatorUtil.java b/src/main/java/br/com/imd/cadwork/util/ValidatorUtil.java similarity index 96% rename from src/main/java/br/com/imd/cadeduc/util/ValidatorUtil.java rename to src/main/java/br/com/imd/cadwork/util/ValidatorUtil.java index 65d08c3..260acd3 100644 --- a/src/main/java/br/com/imd/cadeduc/util/ValidatorUtil.java +++ b/src/main/java/br/com/imd/cadwork/util/ValidatorUtil.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc.util; +package br.com.imd.cadwork.util; import java.util.List; From 79493cfe2e98f047ccf0a63a56796d24273d85fb Mon Sep 17 00:00:00 2001 From: Miguel Date: Fri, 8 Jun 2018 16:33:23 -0300 Subject: [PATCH 02/23] =?UTF-8?q?removidas=20classes=20de=20dominio=20e=20?= =?UTF-8?q?aplicado=20localiz=C3=A1vel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/test.mv.db | Bin 69632 -> 77824 bytes db/test.trace.db | 484 ++++++++++++++++++ pom.xml | 8 +- .../localizacao/dao/EnderecoDAO.java | 4 +- .../localizacao/dao/MunicipioDAO.java | 4 +- .../localizacao/domain/Endereco.java | 2 +- .../localizacao/domain/EstadosEnum.java | 2 +- .../localizacao/domain/Municipio.java | 2 +- .../domain/TipoLocalizacaoEnum.java | 2 +- .../resources/EnderecoResources.java | 4 +- .../resources/MunicipioResources.java | 4 +- .../core/localizavel/model/Localizavel.java | 103 ++++ .../cadwork/core/service/GenericService.java | 17 +- .../cadwork/ensino/dao/EtapaEnsinoDAO.java | 15 - .../com/imd/cadwork/ensino/dao/SerieDAO.java | 15 - .../cadwork/ensino/domain/EtapaEnsino.java | 167 ------ .../com/imd/cadwork/ensino/domain/Serie.java | 94 ---- .../ensino/domain/TipoEtapaEnsinoEnum.java | 27 - .../resources/EtapaEnsinoResources.java | 58 --- .../ensino/resources/SerieResources.java | 57 --- .../ensino/service/EtapaEnsinoService.java | 47 -- .../cadwork/ensino/service/SerieService.java | 48 -- .../com/imd/cadwork/escola/dao/EscolaDAO.java | 17 - .../com/imd/cadwork/escola/domain/Escola.java | 163 ------ .../resources/EscolaReportController.java | 40 -- .../escola/resources/EscolaResources.java | 54 -- .../cadwork/escola/service/EscolaService.java | 47 -- .../localizacao/service/EnderecoService.java | 4 +- .../localizacao/service/MunicipioService.java | 4 +- .../db/migration/V1_create_schema.sql | 1 + 30 files changed, 612 insertions(+), 882 deletions(-) rename src/main/java/br/com/imd/cadwork/{ => core}/localizacao/dao/EnderecoDAO.java (79%) rename src/main/java/br/com/imd/cadwork/{ => core}/localizacao/dao/MunicipioDAO.java (83%) rename src/main/java/br/com/imd/cadwork/{ => core}/localizacao/domain/Endereco.java (99%) rename src/main/java/br/com/imd/cadwork/{ => core}/localizacao/domain/EstadosEnum.java (96%) rename src/main/java/br/com/imd/cadwork/{ => core}/localizacao/domain/Municipio.java (97%) rename src/main/java/br/com/imd/cadwork/{ => core}/localizacao/domain/TipoLocalizacaoEnum.java (84%) rename src/main/java/br/com/imd/cadwork/{ => core}/localizacao/resources/EnderecoResources.java (94%) rename src/main/java/br/com/imd/cadwork/{ => core}/localizacao/resources/MunicipioResources.java (94%) create mode 100644 src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java delete mode 100644 src/main/java/br/com/imd/cadwork/ensino/dao/EtapaEnsinoDAO.java delete mode 100644 src/main/java/br/com/imd/cadwork/ensino/dao/SerieDAO.java delete mode 100644 src/main/java/br/com/imd/cadwork/ensino/domain/EtapaEnsino.java delete mode 100644 src/main/java/br/com/imd/cadwork/ensino/domain/Serie.java delete mode 100644 src/main/java/br/com/imd/cadwork/ensino/domain/TipoEtapaEnsinoEnum.java delete mode 100644 src/main/java/br/com/imd/cadwork/ensino/resources/EtapaEnsinoResources.java delete mode 100644 src/main/java/br/com/imd/cadwork/ensino/resources/SerieResources.java delete mode 100644 src/main/java/br/com/imd/cadwork/ensino/service/EtapaEnsinoService.java delete mode 100644 src/main/java/br/com/imd/cadwork/ensino/service/SerieService.java delete mode 100644 src/main/java/br/com/imd/cadwork/escola/dao/EscolaDAO.java delete mode 100644 src/main/java/br/com/imd/cadwork/escola/domain/Escola.java delete mode 100644 src/main/java/br/com/imd/cadwork/escola/resources/EscolaReportController.java delete mode 100644 src/main/java/br/com/imd/cadwork/escola/resources/EscolaResources.java delete mode 100644 src/main/java/br/com/imd/cadwork/escola/service/EscolaService.java diff --git a/db/test.mv.db b/db/test.mv.db index a6b898e630364b8a0e1652d2061914c842bdfe31..13275c78a4e557bf17044e27971ae1222f9ef34c 100644 GIT binary patch delta 2519 zcmcImZEO=|9DnYutc8wMIv5+U1J|`(N_W?5yRN9TYj59sB<4gN#u)|_>C7q6B44)L_cW6mro`p{`=knBA9qz{`cHH z&;RZByWjsZr|HZ$bW6nVa-_y4l*9g1-VTh;Ykr>NIEOMan?CI4HFc@Qwn23ak7+Z? zh&JWtRoN%VUKy{PZd#dqb^UUkq47T-{*bMy(<_A(1Z)a4;gR3#T2qh!$MG(Yufs7j zIu03ic)Y`2FXwU`)uyILC(@9Zf@L;DSnxSk)GZ){y5jf_yS4TuibhNeV_~jP%vEZ2 z{Kz!||GZ-t>ErMd(=X^?<8S0Axc$sA{Z-0D(wku)&g?&IVFW}G2!SV}<0eAM3?jZ; zM5sQ4OrKxLJtre^+{{1DbP-2T&8cyMu;E(KyjIrdTIJ-m)aoMtJVCxr;EcfHq0c;+ zz1&zgo1UH4)KUoo-n!>CV&P3v-Ze2%V>GE-_OTE8POOqI9cGp--ovdtA89E>56*^Ug$1Cm8 z)xUPHoz$yE^vkVx=UOlL+~w8}r#RW|uJEbmTHlgwy?Y^$Z9T)#G)>Yp<7L(|>zNJA zCZ>sLW?B#;ZzLVj81LL|q9 z610`LmARmLylzD+a^Vuyzs%J8GlF0m*tF$^Hy_45!8y9q~Unhe<&6m zNW_CuGy(1l!B_}p1AnXpnLSd>Wmal7VooFwn3FY5RX#k12SQ|V{uX16U|j!jFPO3_{f#z z3yX{0fNK=r7~5$Fif&&+nThN$fFW=(lDD^d%o{;->X~}jkXiGJ*$kqjEXfVJ^SXBP zMudmpB4wt_@~X$3-pu>vW<*npT|>_AR1Z9vc^xv@>sf0|dZ3?dsq#UMB(!Q?4T zAXtCAtT)u|z=o^abo6DTg!H*FWd9c_D~Xzl7x}X|@KF=q>$>niYMbxj2KZc27)x4( zpE_s57loWaT2c=)ig2CvW!)v?QDi{)$Lp?I9Y~gw_vDRt^$V+=*w>tv;U8i~PK{|! z!RJt>GwZ`llXYnL9 z^(+=16@%e-dQMU#@5R4ASNC(UXU(Z+Z5YMDFk9d zy_k3*%8Tj61VrLZle!S~V6dq)cmajPvx$iZ6HSnCG;vxAdi5RN!uih9(k11U-_D$28FhJ@g)j$NhFL99H~fFrY$it|gbecW8z` z(ER_uUb;CRf;&7kzHYVaSJQ#z+%me_C&JR|3A6Ew)#8rUMO2geyJV!iA!c8y`z z%_F%@44o;nS|UOE=9gs&I_B?iYmC!kZDQBq_To86dfV-4nFqDO3T!RbmJBUD8?Y=N zWzOI#n*Rh$=j}AXgM3{D0-P#%;77h0#tOcM{RBhOeZ03R1QHvEXEs}4{dzULdCj}k zG96L!%Ze}>y=7=YqKCqgt_taRI%Nz2S*f#-GF}gSD_n!;+ttwf{-%B3-td)(o2?&W awzkTyX`z4k$$$9;{Q)Up?D1P>F8=}Cf8e74 diff --git a/db/test.trace.db b/db/test.trace.db index 2537d8b..c327a0f 100644 --- a/db/test.trace.db +++ b/db/test.trace.db @@ -482,3 +482,487 @@ INSERT into ENSINO.SERIE values (167, "Quarto ano - 18/35") [42122-196] at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) at java.lang.Thread.run(Thread.java:748) +2018-06-08 16:28:03 jdbc[3]: exception +org.h2.jdbc.JdbcSQLException: Schema "LOCALIZAVEL" not found; SQL statement: +create table localizavel.localizavel (id bigint not null, nome varchar(255), endereco_id_endereco bigint, primary key (id)) [90079-196] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:345) + at org.h2.message.DbException.get(DbException.java:179) + at org.h2.message.DbException.get(DbException.java:155) + at org.h2.command.Parser.getSchema(Parser.java:688) + at org.h2.command.Parser.getSchema(Parser.java:694) + at org.h2.command.Parser.parseCreateTable(Parser.java:6138) + at org.h2.command.Parser.parseCreate(Parser.java:4351) + at org.h2.command.Parser.parsePrepared(Parser.java:366) + at org.h2.command.Parser.parse(Parser.java:321) + at org.h2.command.Parser.parse(Parser.java:293) + at org.h2.command.Parser.prepareCommand(Parser.java:258) + at org.h2.engine.Session.prepareLocal(Session.java:578) + at org.h2.engine.Session.prepareCommand(Session.java:519) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1204) + at org.h2.jdbc.JdbcStatement.executeInternal(JdbcStatement.java:176) + at org.h2.jdbc.JdbcStatement.execute(JdbcStatement.java:164) + at com.zaxxer.hikari.pool.ProxyStatement.execute(ProxyStatement.java:95) + at com.zaxxer.hikari.pool.HikariProxyStatement.execute(HikariProxyStatement.java) + at org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase.accept(GenerationTargetToDatabase.java:54) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlString(AbstractSchemaMigrator.java:559) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlStrings(AbstractSchemaMigrator.java:504) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.createTable(AbstractSchemaMigrator.java:277) + at org.hibernate.tool.schema.internal.GroupedSchemaMigratorImpl.performTablesMigration(GroupedSchemaMigratorImpl.java:71) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.performMigration(AbstractSchemaMigrator.java:207) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.doMigration(AbstractSchemaMigrator.java:114) + at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.performDatabaseAction(SchemaManagementToolCoordinator.java:183) + at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.process(SchemaManagementToolCoordinator.java:72) + at org.hibernate.internal.SessionFactoryImpl.(SessionFactoryImpl.java:312) + at org.hibernate.boot.internal.SessionFactoryBuilderImpl.build(SessionFactoryBuilderImpl.java:460) + at org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl.build(EntityManagerFactoryBuilderImpl.java:892) + at org.springframework.orm.jpa.vendor.SpringHibernateJpaPersistenceProvider.createContainerEntityManagerFactory(SpringHibernateJpaPersistenceProvider.java:57) + at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.createNativeEntityManagerFactory(LocalContainerEntityManagerFactoryBean.java:365) + at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.buildNativeEntityManagerFactory(AbstractEntityManagerFactoryBean.java:388) + at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.afterPropertiesSet(AbstractEntityManagerFactoryBean.java:377) + at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.afterPropertiesSet(LocalContainerEntityManagerFactoryBean.java:341) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1769) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1706) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:583) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:502) + at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:312) + at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:228) + at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:310) + at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:200) + at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1085) + at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:858) + at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:549) + at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:140) + at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:752) + at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:388) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:327) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:1246) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:1234) + at br.com.imd.cadwork.CadworkapiApplication.main(CadworkapiApplication.java:13) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.lang.reflect.Method.invoke(Method.java:498) + at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) +2018-06-08 16:28:03 jdbc[3]: exception +org.h2.jdbc.JdbcSQLException: Schema "LOCALIZAVEL" not found; SQL statement: +alter table localizavel.localizavel add constraint FK3654djd12nc3k4hvpcvn9p1d5 foreign key (endereco_id_endereco) references localizacao.endereco [90079-196] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:345) + at org.h2.message.DbException.get(DbException.java:179) + at org.h2.message.DbException.get(DbException.java:155) + at org.h2.command.Parser.getSchema(Parser.java:688) + at org.h2.command.Parser.getSchema(Parser.java:694) + at org.h2.command.Parser.parseAlterTable(Parser.java:5608) + at org.h2.command.Parser.parseAlter(Parser.java:5007) + at org.h2.command.Parser.parsePrepared(Parser.java:348) + at org.h2.command.Parser.parse(Parser.java:321) + at org.h2.command.Parser.parse(Parser.java:293) + at org.h2.command.Parser.prepareCommand(Parser.java:258) + at org.h2.engine.Session.prepareLocal(Session.java:578) + at org.h2.engine.Session.prepareCommand(Session.java:519) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1204) + at org.h2.jdbc.JdbcStatement.executeInternal(JdbcStatement.java:176) + at org.h2.jdbc.JdbcStatement.execute(JdbcStatement.java:164) + at com.zaxxer.hikari.pool.ProxyStatement.execute(ProxyStatement.java:95) + at com.zaxxer.hikari.pool.HikariProxyStatement.execute(HikariProxyStatement.java) + at org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase.accept(GenerationTargetToDatabase.java:54) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlString(AbstractSchemaMigrator.java:559) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlStrings(AbstractSchemaMigrator.java:504) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applyForeignKeys(AbstractSchemaMigrator.java:433) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.performMigration(AbstractSchemaMigrator.java:249) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.doMigration(AbstractSchemaMigrator.java:114) + at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.performDatabaseAction(SchemaManagementToolCoordinator.java:183) + at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.process(SchemaManagementToolCoordinator.java:72) + at org.hibernate.internal.SessionFactoryImpl.(SessionFactoryImpl.java:312) + at org.hibernate.boot.internal.SessionFactoryBuilderImpl.build(SessionFactoryBuilderImpl.java:460) + at org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl.build(EntityManagerFactoryBuilderImpl.java:892) + at org.springframework.orm.jpa.vendor.SpringHibernateJpaPersistenceProvider.createContainerEntityManagerFactory(SpringHibernateJpaPersistenceProvider.java:57) + at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.createNativeEntityManagerFactory(LocalContainerEntityManagerFactoryBean.java:365) + at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.buildNativeEntityManagerFactory(AbstractEntityManagerFactoryBean.java:388) + at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.afterPropertiesSet(AbstractEntityManagerFactoryBean.java:377) + at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.afterPropertiesSet(LocalContainerEntityManagerFactoryBean.java:341) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1769) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1706) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:583) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:502) + at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:312) + at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:228) + at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:310) + at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:200) + at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1085) + at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:858) + at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:549) + at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:140) + at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:752) + at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:388) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:327) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:1246) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:1234) + at br.com.imd.cadwork.CadworkapiApplication.main(CadworkapiApplication.java:13) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.lang.reflect.Method.invoke(Method.java:498) + at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) +2018-06-08 16:28:07 jdbc[3]: exception +org.h2.jdbc.JdbcSQLException: Schema "LOCALIZAVEL" not found; SQL statement: +create table localizavel.localizavel (id bigint not null, nome varchar(255), endereco_id_endereco bigint, primary key (id)) [90079-196] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:345) + at org.h2.message.DbException.get(DbException.java:179) + at org.h2.message.DbException.get(DbException.java:155) + at org.h2.command.Parser.getSchema(Parser.java:688) + at org.h2.command.Parser.getSchema(Parser.java:694) + at org.h2.command.Parser.parseCreateTable(Parser.java:6138) + at org.h2.command.Parser.parseCreate(Parser.java:4351) + at org.h2.command.Parser.parsePrepared(Parser.java:366) + at org.h2.command.Parser.parse(Parser.java:321) + at org.h2.command.Parser.parse(Parser.java:293) + at org.h2.command.Parser.prepareCommand(Parser.java:258) + at org.h2.engine.Session.prepareLocal(Session.java:578) + at org.h2.engine.Session.prepareCommand(Session.java:519) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1204) + at org.h2.jdbc.JdbcStatement.executeInternal(JdbcStatement.java:176) + at org.h2.jdbc.JdbcStatement.execute(JdbcStatement.java:164) + at com.zaxxer.hikari.pool.ProxyStatement.execute(ProxyStatement.java:95) + at com.zaxxer.hikari.pool.HikariProxyStatement.execute(HikariProxyStatement.java) + at org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase.accept(GenerationTargetToDatabase.java:54) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlString(AbstractSchemaMigrator.java:559) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlStrings(AbstractSchemaMigrator.java:504) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.createTable(AbstractSchemaMigrator.java:277) + at org.hibernate.tool.schema.internal.GroupedSchemaMigratorImpl.performTablesMigration(GroupedSchemaMigratorImpl.java:71) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.performMigration(AbstractSchemaMigrator.java:207) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.doMigration(AbstractSchemaMigrator.java:114) + at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.performDatabaseAction(SchemaManagementToolCoordinator.java:183) + at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.process(SchemaManagementToolCoordinator.java:72) + at org.hibernate.internal.SessionFactoryImpl.(SessionFactoryImpl.java:312) + at org.hibernate.boot.internal.SessionFactoryBuilderImpl.build(SessionFactoryBuilderImpl.java:460) + at org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl.build(EntityManagerFactoryBuilderImpl.java:892) + at org.springframework.orm.jpa.vendor.SpringHibernateJpaPersistenceProvider.createContainerEntityManagerFactory(SpringHibernateJpaPersistenceProvider.java:57) + at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.createNativeEntityManagerFactory(LocalContainerEntityManagerFactoryBean.java:365) + at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.buildNativeEntityManagerFactory(AbstractEntityManagerFactoryBean.java:388) + at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.afterPropertiesSet(AbstractEntityManagerFactoryBean.java:377) + at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.afterPropertiesSet(LocalContainerEntityManagerFactoryBean.java:341) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1769) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1706) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:583) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:502) + at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:312) + at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:228) + at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:310) + at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:200) + at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1085) + at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:858) + at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:549) + at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:140) + at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:752) + at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:388) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:327) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:1246) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:1234) + at br.com.imd.cadwork.CadworkapiApplication.main(CadworkapiApplication.java:13) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.lang.reflect.Method.invoke(Method.java:498) + at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) +2018-06-08 16:28:07 jdbc[3]: exception +org.h2.jdbc.JdbcSQLException: Schema "LOCALIZAVEL" not found; SQL statement: +alter table localizavel.localizavel add constraint FK3654djd12nc3k4hvpcvn9p1d5 foreign key (endereco_id_endereco) references localizacao.endereco [90079-196] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:345) + at org.h2.message.DbException.get(DbException.java:179) + at org.h2.message.DbException.get(DbException.java:155) + at org.h2.command.Parser.getSchema(Parser.java:688) + at org.h2.command.Parser.getSchema(Parser.java:694) + at org.h2.command.Parser.parseAlterTable(Parser.java:5608) + at org.h2.command.Parser.parseAlter(Parser.java:5007) + at org.h2.command.Parser.parsePrepared(Parser.java:348) + at org.h2.command.Parser.parse(Parser.java:321) + at org.h2.command.Parser.parse(Parser.java:293) + at org.h2.command.Parser.prepareCommand(Parser.java:258) + at org.h2.engine.Session.prepareLocal(Session.java:578) + at org.h2.engine.Session.prepareCommand(Session.java:519) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1204) + at org.h2.jdbc.JdbcStatement.executeInternal(JdbcStatement.java:176) + at org.h2.jdbc.JdbcStatement.execute(JdbcStatement.java:164) + at com.zaxxer.hikari.pool.ProxyStatement.execute(ProxyStatement.java:95) + at com.zaxxer.hikari.pool.HikariProxyStatement.execute(HikariProxyStatement.java) + at org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase.accept(GenerationTargetToDatabase.java:54) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlString(AbstractSchemaMigrator.java:559) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlStrings(AbstractSchemaMigrator.java:504) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applyForeignKeys(AbstractSchemaMigrator.java:433) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.performMigration(AbstractSchemaMigrator.java:249) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.doMigration(AbstractSchemaMigrator.java:114) + at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.performDatabaseAction(SchemaManagementToolCoordinator.java:183) + at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.process(SchemaManagementToolCoordinator.java:72) + at org.hibernate.internal.SessionFactoryImpl.(SessionFactoryImpl.java:312) + at org.hibernate.boot.internal.SessionFactoryBuilderImpl.build(SessionFactoryBuilderImpl.java:460) + at org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl.build(EntityManagerFactoryBuilderImpl.java:892) + at org.springframework.orm.jpa.vendor.SpringHibernateJpaPersistenceProvider.createContainerEntityManagerFactory(SpringHibernateJpaPersistenceProvider.java:57) + at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.createNativeEntityManagerFactory(LocalContainerEntityManagerFactoryBean.java:365) + at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.buildNativeEntityManagerFactory(AbstractEntityManagerFactoryBean.java:388) + at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.afterPropertiesSet(AbstractEntityManagerFactoryBean.java:377) + at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.afterPropertiesSet(LocalContainerEntityManagerFactoryBean.java:341) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1769) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1706) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:583) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:502) + at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:312) + at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:228) + at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:310) + at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:200) + at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1085) + at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:858) + at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:549) + at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:140) + at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:752) + at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:388) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:327) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:1246) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:1234) + at br.com.imd.cadwork.CadworkapiApplication.main(CadworkapiApplication.java:13) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.lang.reflect.Method.invoke(Method.java:498) + at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) +2018-06-08 16:29:31 jdbc[3]: exception +org.h2.jdbc.JdbcSQLException: Schema "LOCALIZAVEL" not found; SQL statement: +create table localizavel.localizavel (id bigint not null, nome varchar(255), endereco_id_endereco bigint, primary key (id)) [90079-196] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:345) + at org.h2.message.DbException.get(DbException.java:179) + at org.h2.message.DbException.get(DbException.java:155) + at org.h2.command.Parser.getSchema(Parser.java:688) + at org.h2.command.Parser.getSchema(Parser.java:694) + at org.h2.command.Parser.parseCreateTable(Parser.java:6138) + at org.h2.command.Parser.parseCreate(Parser.java:4351) + at org.h2.command.Parser.parsePrepared(Parser.java:366) + at org.h2.command.Parser.parse(Parser.java:321) + at org.h2.command.Parser.parse(Parser.java:293) + at org.h2.command.Parser.prepareCommand(Parser.java:258) + at org.h2.engine.Session.prepareLocal(Session.java:578) + at org.h2.engine.Session.prepareCommand(Session.java:519) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1204) + at org.h2.jdbc.JdbcStatement.executeInternal(JdbcStatement.java:176) + at org.h2.jdbc.JdbcStatement.execute(JdbcStatement.java:164) + at com.zaxxer.hikari.pool.ProxyStatement.execute(ProxyStatement.java:95) + at com.zaxxer.hikari.pool.HikariProxyStatement.execute(HikariProxyStatement.java) + at org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase.accept(GenerationTargetToDatabase.java:54) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlString(AbstractSchemaMigrator.java:559) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlStrings(AbstractSchemaMigrator.java:504) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.createTable(AbstractSchemaMigrator.java:277) + at org.hibernate.tool.schema.internal.GroupedSchemaMigratorImpl.performTablesMigration(GroupedSchemaMigratorImpl.java:71) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.performMigration(AbstractSchemaMigrator.java:207) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.doMigration(AbstractSchemaMigrator.java:114) + at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.performDatabaseAction(SchemaManagementToolCoordinator.java:183) + at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.process(SchemaManagementToolCoordinator.java:72) + at org.hibernate.internal.SessionFactoryImpl.(SessionFactoryImpl.java:312) + at org.hibernate.boot.internal.SessionFactoryBuilderImpl.build(SessionFactoryBuilderImpl.java:460) + at org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl.build(EntityManagerFactoryBuilderImpl.java:892) + at org.springframework.orm.jpa.vendor.SpringHibernateJpaPersistenceProvider.createContainerEntityManagerFactory(SpringHibernateJpaPersistenceProvider.java:57) + at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.createNativeEntityManagerFactory(LocalContainerEntityManagerFactoryBean.java:365) + at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.buildNativeEntityManagerFactory(AbstractEntityManagerFactoryBean.java:388) + at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.afterPropertiesSet(AbstractEntityManagerFactoryBean.java:377) + at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.afterPropertiesSet(LocalContainerEntityManagerFactoryBean.java:341) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1769) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1706) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:583) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:502) + at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:312) + at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:228) + at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:310) + at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:200) + at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1085) + at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:858) + at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:549) + at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:140) + at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:752) + at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:388) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:327) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:1246) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:1234) + at br.com.imd.cadwork.CadworkapiApplication.main(CadworkapiApplication.java:13) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.lang.reflect.Method.invoke(Method.java:498) + at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) +2018-06-08 16:29:31 jdbc[3]: exception +org.h2.jdbc.JdbcSQLException: Schema "LOCALIZAVEL" not found; SQL statement: +alter table localizavel.localizavel add constraint FK3654djd12nc3k4hvpcvn9p1d5 foreign key (endereco_id_endereco) references localizacao.endereco [90079-196] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:345) + at org.h2.message.DbException.get(DbException.java:179) + at org.h2.message.DbException.get(DbException.java:155) + at org.h2.command.Parser.getSchema(Parser.java:688) + at org.h2.command.Parser.getSchema(Parser.java:694) + at org.h2.command.Parser.parseAlterTable(Parser.java:5608) + at org.h2.command.Parser.parseAlter(Parser.java:5007) + at org.h2.command.Parser.parsePrepared(Parser.java:348) + at org.h2.command.Parser.parse(Parser.java:321) + at org.h2.command.Parser.parse(Parser.java:293) + at org.h2.command.Parser.prepareCommand(Parser.java:258) + at org.h2.engine.Session.prepareLocal(Session.java:578) + at org.h2.engine.Session.prepareCommand(Session.java:519) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1204) + at org.h2.jdbc.JdbcStatement.executeInternal(JdbcStatement.java:176) + at org.h2.jdbc.JdbcStatement.execute(JdbcStatement.java:164) + at com.zaxxer.hikari.pool.ProxyStatement.execute(ProxyStatement.java:95) + at com.zaxxer.hikari.pool.HikariProxyStatement.execute(HikariProxyStatement.java) + at org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase.accept(GenerationTargetToDatabase.java:54) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlString(AbstractSchemaMigrator.java:559) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlStrings(AbstractSchemaMigrator.java:504) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applyForeignKeys(AbstractSchemaMigrator.java:433) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.performMigration(AbstractSchemaMigrator.java:249) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.doMigration(AbstractSchemaMigrator.java:114) + at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.performDatabaseAction(SchemaManagementToolCoordinator.java:183) + at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.process(SchemaManagementToolCoordinator.java:72) + at org.hibernate.internal.SessionFactoryImpl.(SessionFactoryImpl.java:312) + at org.hibernate.boot.internal.SessionFactoryBuilderImpl.build(SessionFactoryBuilderImpl.java:460) + at org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl.build(EntityManagerFactoryBuilderImpl.java:892) + at org.springframework.orm.jpa.vendor.SpringHibernateJpaPersistenceProvider.createContainerEntityManagerFactory(SpringHibernateJpaPersistenceProvider.java:57) + at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.createNativeEntityManagerFactory(LocalContainerEntityManagerFactoryBean.java:365) + at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.buildNativeEntityManagerFactory(AbstractEntityManagerFactoryBean.java:388) + at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.afterPropertiesSet(AbstractEntityManagerFactoryBean.java:377) + at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.afterPropertiesSet(LocalContainerEntityManagerFactoryBean.java:341) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1769) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1706) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:583) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:502) + at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:312) + at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:228) + at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:310) + at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:200) + at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1085) + at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:858) + at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:549) + at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:140) + at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:752) + at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:388) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:327) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:1246) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:1234) + at br.com.imd.cadwork.CadworkapiApplication.main(CadworkapiApplication.java:13) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.lang.reflect.Method.invoke(Method.java:498) + at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) +2018-06-08 16:30:22 jdbc[3]: exception +org.h2.jdbc.JdbcSQLException: Schema "LOCALIZAVEL" not found; SQL statement: +create table localizavel.localizavel (id bigint not null, nome varchar(255), endereco_id_endereco bigint, primary key (id)) [90079-196] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:345) + at org.h2.message.DbException.get(DbException.java:179) + at org.h2.message.DbException.get(DbException.java:155) + at org.h2.command.Parser.getSchema(Parser.java:688) + at org.h2.command.Parser.getSchema(Parser.java:694) + at org.h2.command.Parser.parseCreateTable(Parser.java:6138) + at org.h2.command.Parser.parseCreate(Parser.java:4351) + at org.h2.command.Parser.parsePrepared(Parser.java:366) + at org.h2.command.Parser.parse(Parser.java:321) + at org.h2.command.Parser.parse(Parser.java:293) + at org.h2.command.Parser.prepareCommand(Parser.java:258) + at org.h2.engine.Session.prepareLocal(Session.java:578) + at org.h2.engine.Session.prepareCommand(Session.java:519) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1204) + at org.h2.jdbc.JdbcStatement.executeInternal(JdbcStatement.java:176) + at org.h2.jdbc.JdbcStatement.execute(JdbcStatement.java:164) + at com.zaxxer.hikari.pool.ProxyStatement.execute(ProxyStatement.java:95) + at com.zaxxer.hikari.pool.HikariProxyStatement.execute(HikariProxyStatement.java) + at org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase.accept(GenerationTargetToDatabase.java:54) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlString(AbstractSchemaMigrator.java:559) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlStrings(AbstractSchemaMigrator.java:504) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.createTable(AbstractSchemaMigrator.java:277) + at org.hibernate.tool.schema.internal.GroupedSchemaMigratorImpl.performTablesMigration(GroupedSchemaMigratorImpl.java:71) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.performMigration(AbstractSchemaMigrator.java:207) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.doMigration(AbstractSchemaMigrator.java:114) + at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.performDatabaseAction(SchemaManagementToolCoordinator.java:183) + at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.process(SchemaManagementToolCoordinator.java:72) + at org.hibernate.internal.SessionFactoryImpl.(SessionFactoryImpl.java:312) + at org.hibernate.boot.internal.SessionFactoryBuilderImpl.build(SessionFactoryBuilderImpl.java:460) + at org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl.build(EntityManagerFactoryBuilderImpl.java:892) + at org.springframework.orm.jpa.vendor.SpringHibernateJpaPersistenceProvider.createContainerEntityManagerFactory(SpringHibernateJpaPersistenceProvider.java:57) + at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.createNativeEntityManagerFactory(LocalContainerEntityManagerFactoryBean.java:365) + at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.buildNativeEntityManagerFactory(AbstractEntityManagerFactoryBean.java:388) + at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.afterPropertiesSet(AbstractEntityManagerFactoryBean.java:377) + at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.afterPropertiesSet(LocalContainerEntityManagerFactoryBean.java:341) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1769) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1706) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:583) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:502) + at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:312) + at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:228) + at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:310) + at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:200) + at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1085) + at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:858) + at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:549) + at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:140) + at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:752) + at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:388) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:327) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:1246) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:1234) + at br.com.imd.cadwork.CadworkapiApplication.main(CadworkapiApplication.java:13) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.lang.reflect.Method.invoke(Method.java:498) + at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) +2018-06-08 16:30:22 jdbc[3]: exception +org.h2.jdbc.JdbcSQLException: Schema "LOCALIZAVEL" not found; SQL statement: +alter table localizavel.localizavel add constraint FK3654djd12nc3k4hvpcvn9p1d5 foreign key (endereco_id_endereco) references localizacao.endereco [90079-196] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:345) + at org.h2.message.DbException.get(DbException.java:179) + at org.h2.message.DbException.get(DbException.java:155) + at org.h2.command.Parser.getSchema(Parser.java:688) + at org.h2.command.Parser.getSchema(Parser.java:694) + at org.h2.command.Parser.parseAlterTable(Parser.java:5608) + at org.h2.command.Parser.parseAlter(Parser.java:5007) + at org.h2.command.Parser.parsePrepared(Parser.java:348) + at org.h2.command.Parser.parse(Parser.java:321) + at org.h2.command.Parser.parse(Parser.java:293) + at org.h2.command.Parser.prepareCommand(Parser.java:258) + at org.h2.engine.Session.prepareLocal(Session.java:578) + at org.h2.engine.Session.prepareCommand(Session.java:519) + at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1204) + at org.h2.jdbc.JdbcStatement.executeInternal(JdbcStatement.java:176) + at org.h2.jdbc.JdbcStatement.execute(JdbcStatement.java:164) + at com.zaxxer.hikari.pool.ProxyStatement.execute(ProxyStatement.java:95) + at com.zaxxer.hikari.pool.HikariProxyStatement.execute(HikariProxyStatement.java) + at org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase.accept(GenerationTargetToDatabase.java:54) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlString(AbstractSchemaMigrator.java:559) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlStrings(AbstractSchemaMigrator.java:504) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applyForeignKeys(AbstractSchemaMigrator.java:433) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.performMigration(AbstractSchemaMigrator.java:249) + at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.doMigration(AbstractSchemaMigrator.java:114) + at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.performDatabaseAction(SchemaManagementToolCoordinator.java:183) + at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.process(SchemaManagementToolCoordinator.java:72) + at org.hibernate.internal.SessionFactoryImpl.(SessionFactoryImpl.java:312) + at org.hibernate.boot.internal.SessionFactoryBuilderImpl.build(SessionFactoryBuilderImpl.java:460) + at org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl.build(EntityManagerFactoryBuilderImpl.java:892) + at org.springframework.orm.jpa.vendor.SpringHibernateJpaPersistenceProvider.createContainerEntityManagerFactory(SpringHibernateJpaPersistenceProvider.java:57) + at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.createNativeEntityManagerFactory(LocalContainerEntityManagerFactoryBean.java:365) + at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.buildNativeEntityManagerFactory(AbstractEntityManagerFactoryBean.java:388) + at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.afterPropertiesSet(AbstractEntityManagerFactoryBean.java:377) + at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.afterPropertiesSet(LocalContainerEntityManagerFactoryBean.java:341) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1769) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1706) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:583) + at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:502) + at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:312) + at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:228) + at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:310) + at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:200) + at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1085) + at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:858) + at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:549) + at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:140) + at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:752) + at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:388) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:327) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:1246) + at org.springframework.boot.SpringApplication.run(SpringApplication.java:1234) + at br.com.imd.cadwork.CadworkapiApplication.main(CadworkapiApplication.java:13) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.lang.reflect.Method.invoke(Method.java:498) + at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) diff --git a/pom.xml b/pom.xml index 7ce0d29..a016930 100644 --- a/pom.xml +++ b/pom.xml @@ -3,13 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - br.com.imd.cadeduc - cadeduc + br.com.imd.cadwork + cadwork 0.0.1-SNAPSHOT jar - cadeducapi - API de geocalização de escolas estaduais + cadworkapi + API de geocalização de Recursos org.springframework.boot diff --git a/src/main/java/br/com/imd/cadwork/localizacao/dao/EnderecoDAO.java b/src/main/java/br/com/imd/cadwork/core/localizacao/dao/EnderecoDAO.java similarity index 79% rename from src/main/java/br/com/imd/cadwork/localizacao/dao/EnderecoDAO.java rename to src/main/java/br/com/imd/cadwork/core/localizacao/dao/EnderecoDAO.java index a5f14e8..5727887 100644 --- a/src/main/java/br/com/imd/cadwork/localizacao/dao/EnderecoDAO.java +++ b/src/main/java/br/com/imd/cadwork/core/localizacao/dao/EnderecoDAO.java @@ -1,4 +1,4 @@ -package br.com.imd.cadwork.localizacao.dao; +package br.com.imd.cadwork.core.localizacao.dao; import java.util.Optional; @@ -6,7 +6,7 @@ import org.springframework.stereotype.Repository; import br.com.imd.cadwork.core.dao.GenericDAO; -import br.com.imd.cadwork.localizacao.domain.Endereco; +import br.com.imd.cadwork.core.localizacao.domain.Endereco; @Repository public interface EnderecoDAO extends GenericDAO { diff --git a/src/main/java/br/com/imd/cadwork/localizacao/dao/MunicipioDAO.java b/src/main/java/br/com/imd/cadwork/core/localizacao/dao/MunicipioDAO.java similarity index 83% rename from src/main/java/br/com/imd/cadwork/localizacao/dao/MunicipioDAO.java rename to src/main/java/br/com/imd/cadwork/core/localizacao/dao/MunicipioDAO.java index 58a3905..0480719 100644 --- a/src/main/java/br/com/imd/cadwork/localizacao/dao/MunicipioDAO.java +++ b/src/main/java/br/com/imd/cadwork/core/localizacao/dao/MunicipioDAO.java @@ -1,4 +1,4 @@ -package br.com.imd.cadwork.localizacao.dao; +package br.com.imd.cadwork.core.localizacao.dao; import java.util.Optional; @@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository; import br.com.imd.cadwork.core.dao.GenericDAO; -import br.com.imd.cadwork.localizacao.domain.Municipio; +import br.com.imd.cadwork.core.localizacao.domain.Municipio; @Repository public interface MunicipioDAO extends GenericDAO { diff --git a/src/main/java/br/com/imd/cadwork/localizacao/domain/Endereco.java b/src/main/java/br/com/imd/cadwork/core/localizacao/domain/Endereco.java similarity index 99% rename from src/main/java/br/com/imd/cadwork/localizacao/domain/Endereco.java rename to src/main/java/br/com/imd/cadwork/core/localizacao/domain/Endereco.java index 89811b5..e32edbf 100644 --- a/src/main/java/br/com/imd/cadwork/localizacao/domain/Endereco.java +++ b/src/main/java/br/com/imd/cadwork/core/localizacao/domain/Endereco.java @@ -1,4 +1,4 @@ -package br.com.imd.cadwork.localizacao.domain; +package br.com.imd.cadwork.core.localizacao.domain; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/main/java/br/com/imd/cadwork/localizacao/domain/EstadosEnum.java b/src/main/java/br/com/imd/cadwork/core/localizacao/domain/EstadosEnum.java similarity index 96% rename from src/main/java/br/com/imd/cadwork/localizacao/domain/EstadosEnum.java rename to src/main/java/br/com/imd/cadwork/core/localizacao/domain/EstadosEnum.java index b627f61..ff3aa33 100644 --- a/src/main/java/br/com/imd/cadwork/localizacao/domain/EstadosEnum.java +++ b/src/main/java/br/com/imd/cadwork/core/localizacao/domain/EstadosEnum.java @@ -1,4 +1,4 @@ -package br.com.imd.cadwork.localizacao.domain; +package br.com.imd.cadwork.core.localizacao.domain; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/br/com/imd/cadwork/localizacao/domain/Municipio.java b/src/main/java/br/com/imd/cadwork/core/localizacao/domain/Municipio.java similarity index 97% rename from src/main/java/br/com/imd/cadwork/localizacao/domain/Municipio.java rename to src/main/java/br/com/imd/cadwork/core/localizacao/domain/Municipio.java index 4ef2b58..ea3fcfc 100644 --- a/src/main/java/br/com/imd/cadwork/localizacao/domain/Municipio.java +++ b/src/main/java/br/com/imd/cadwork/core/localizacao/domain/Municipio.java @@ -1,4 +1,4 @@ -package br.com.imd.cadwork.localizacao.domain; +package br.com.imd.cadwork.core.localizacao.domain; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/main/java/br/com/imd/cadwork/localizacao/domain/TipoLocalizacaoEnum.java b/src/main/java/br/com/imd/cadwork/core/localizacao/domain/TipoLocalizacaoEnum.java similarity index 84% rename from src/main/java/br/com/imd/cadwork/localizacao/domain/TipoLocalizacaoEnum.java rename to src/main/java/br/com/imd/cadwork/core/localizacao/domain/TipoLocalizacaoEnum.java index 46b638f..4c17b6e 100644 --- a/src/main/java/br/com/imd/cadwork/localizacao/domain/TipoLocalizacaoEnum.java +++ b/src/main/java/br/com/imd/cadwork/core/localizacao/domain/TipoLocalizacaoEnum.java @@ -1,4 +1,4 @@ -package br.com.imd.cadwork.localizacao.domain; +package br.com.imd.cadwork.core.localizacao.domain; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/br/com/imd/cadwork/localizacao/resources/EnderecoResources.java b/src/main/java/br/com/imd/cadwork/core/localizacao/resources/EnderecoResources.java similarity index 94% rename from src/main/java/br/com/imd/cadwork/localizacao/resources/EnderecoResources.java rename to src/main/java/br/com/imd/cadwork/core/localizacao/resources/EnderecoResources.java index 73b3fe4..c1f0c9f 100644 --- a/src/main/java/br/com/imd/cadwork/localizacao/resources/EnderecoResources.java +++ b/src/main/java/br/com/imd/cadwork/core/localizacao/resources/EnderecoResources.java @@ -1,4 +1,4 @@ -package br.com.imd.cadwork.localizacao.resources; +package br.com.imd.cadwork.core.localizacao.resources; import java.net.URI; import java.util.List; @@ -17,8 +17,8 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import br.com.imd.cadwork.core.localizacao.domain.Endereco; import br.com.imd.cadwork.core.service.exception.GenericServiceException; -import br.com.imd.cadwork.localizacao.domain.Endereco; import br.com.imd.cadwork.localizacao.service.EnderecoService; import io.swagger.annotations.Api; diff --git a/src/main/java/br/com/imd/cadwork/localizacao/resources/MunicipioResources.java b/src/main/java/br/com/imd/cadwork/core/localizacao/resources/MunicipioResources.java similarity index 94% rename from src/main/java/br/com/imd/cadwork/localizacao/resources/MunicipioResources.java rename to src/main/java/br/com/imd/cadwork/core/localizacao/resources/MunicipioResources.java index d444152..45572ce 100644 --- a/src/main/java/br/com/imd/cadwork/localizacao/resources/MunicipioResources.java +++ b/src/main/java/br/com/imd/cadwork/core/localizacao/resources/MunicipioResources.java @@ -1,4 +1,4 @@ -package br.com.imd.cadwork.localizacao.resources; +package br.com.imd.cadwork.core.localizacao.resources; import java.net.URI; import java.util.List; @@ -16,8 +16,8 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; +import br.com.imd.cadwork.core.localizacao.domain.Municipio; import br.com.imd.cadwork.core.service.exception.GenericServiceException; -import br.com.imd.cadwork.localizacao.domain.Municipio; import br.com.imd.cadwork.localizacao.service.MunicipioService; import io.swagger.annotations.Api; diff --git a/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java b/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java new file mode 100644 index 0000000..b24d021 --- /dev/null +++ b/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java @@ -0,0 +1,103 @@ +package br.com.imd.cadwork.core.localizavel.model; + +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.OneToOne; +import javax.persistence.Table; + +import br.com.imd.cadwork.core.localizacao.domain.Endereco; + +/** + * Classe abstrata para ser base do modelo do item localizavel + * + * @author Igor Barbosa Nogueira + * @author Miguel + * @version 0.2 + */ +@Entity +@Table(name = "localizavel", schema = "localizavel") +@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) +public abstract class Localizavel { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + protected Long id; + + @Column + protected String nome; + + @OneToOne(cascade = CascadeType.ALL) + protected Endereco endereco; + + /** + * Retorna o endereço do localizavel + * + * @return Endereco - Endereço da escola + */ + public Endereco getEndereco() { + return endereco; + } + + /** + * Altera o endereço de uma instância de Localizavel + * + * @param endereco + * Endereco - Novo endereço + */ + public void setEndereco(Endereco endereco) { + this.endereco = endereco; + } + + /** + * Método para retorno do id de uma instância de Localizavel + * + * @return Long - Valor do id + */ + public Long getId() { + return id; + } + + /** + * Altera o valor do id de uma instância de Localizavel + * + * @param id + * Long - Novo valor do id + */ + + public void setId(Long id) { + this.id = id; + } + + /** + * Método que retorna o nome do localizavel + * + * @return String - Nome do localizavel + */ + public String getNome() { + return nome; + } + + /** + * Método que modifica o nome do localizavel + * + * @param nome + * String - Novo nome do localizavel + */ + public void setNome(String nome) { + this.nome = nome; + } + + /** + * Método que valida o localizavel + * + * @return boolean - Se o localizavel é válido ou não + */ + protected abstract boolean validaLocalizavel(); + +} \ No newline at end of file diff --git a/src/main/java/br/com/imd/cadwork/core/service/GenericService.java b/src/main/java/br/com/imd/cadwork/core/service/GenericService.java index 1fe1cf7..cde1ec4 100644 --- a/src/main/java/br/com/imd/cadwork/core/service/GenericService.java +++ b/src/main/java/br/com/imd/cadwork/core/service/GenericService.java @@ -18,13 +18,8 @@ public abstract class GenericService { protected GenericDAO dao; protected List listar() throws GenericServiceException { - List entidades = dao.findAll(); - - if (entidades.isEmpty()) { - throw new ResourceNotFoundException(); - } - - return entidades; + return Optional.ofNullable(dao.findAll()) + .orElseThrow(ResourceNotFoundException::new); } protected void salvar(T t, BindingResult resultado) throws GenericServiceException { @@ -45,12 +40,8 @@ protected void salvar(T t, BindingResult resultado) throws GenericServiceExcepti protected Optional buscar(Long id) throws GenericServiceException { - Optional entidade = dao.findById(id); - - if (!entidade.isPresent()) { - throw new ResourceNotFoundException(); - } - return entidade; + return Optional.ofNullable(dao.findById(id)) + .orElseThrow(ResourceNotFoundException::new); } protected abstract void setDao(GenericDAO dao); diff --git a/src/main/java/br/com/imd/cadwork/ensino/dao/EtapaEnsinoDAO.java b/src/main/java/br/com/imd/cadwork/ensino/dao/EtapaEnsinoDAO.java deleted file mode 100644 index 126e49c..0000000 --- a/src/main/java/br/com/imd/cadwork/ensino/dao/EtapaEnsinoDAO.java +++ /dev/null @@ -1,15 +0,0 @@ -package br.com.imd.cadwork.ensino.dao; - -import java.util.Optional; - -import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - -import br.com.imd.cadwork.core.dao.GenericDAO; -import br.com.imd.cadwork.ensino.domain.EtapaEnsino; - -@Repository -public interface EtapaEnsinoDAO extends GenericDAO { - - public Optional findEtapaEnsinoByNome(@Param("nome") String nome); -} diff --git a/src/main/java/br/com/imd/cadwork/ensino/dao/SerieDAO.java b/src/main/java/br/com/imd/cadwork/ensino/dao/SerieDAO.java deleted file mode 100644 index 44000f1..0000000 --- a/src/main/java/br/com/imd/cadwork/ensino/dao/SerieDAO.java +++ /dev/null @@ -1,15 +0,0 @@ -package br.com.imd.cadwork.ensino.dao; - -import java.util.Optional; - -import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - -import br.com.imd.cadwork.core.dao.GenericDAO; -import br.com.imd.cadwork.ensino.domain.Serie; - -@Repository -public interface SerieDAO extends GenericDAO { - - Optional findSerieByNome(@Param("nome") String nome); -} diff --git a/src/main/java/br/com/imd/cadwork/ensino/domain/EtapaEnsino.java b/src/main/java/br/com/imd/cadwork/ensino/domain/EtapaEnsino.java deleted file mode 100644 index 6ac08e9..0000000 --- a/src/main/java/br/com/imd/cadwork/ensino/domain/EtapaEnsino.java +++ /dev/null @@ -1,167 +0,0 @@ -package br.com.imd.cadwork.ensino.domain; - -import java.util.List; - -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * Classe que define o modelo etapa de ensino - * - * @author Miguel - * @version 0.2 - * - */ - -@Entity -@Table(name = "etapa_ensino", schema = "ensino") -@ApiModel -public class EtapaEnsino { - - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - @Column(name = "id_etapa_ensino") - @ApiModelProperty(hidden = true, notes = "ID gerado automaticamente pela base de dados") - private Long id; - - @NotNull - @ApiModelProperty(notes = "Nome da Etapa de Ensino", required = true) - private String nome; - - @NotNull - @Column(name = "vagas_disponiveis") - @ApiModelProperty(notes = "Quantidade de vagas disponíveis", required = true) - private int vagasDisponiveis; - - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) - @ApiModelProperty(notes = "séries da etapa de ensino") - private List series; - - @NotNull - @Column(name = "tipo_etapa_ensino") - @Enumerated(EnumType.STRING) - @ApiModelProperty(notes = "Tipo da etapa de ensino", required = true) - private TipoEtapaEnsinoEnum tipoEtapaEnsino; - - public EtapaEnsino() { - id = new Long(0); - } - - /** - * Método para retorno do id de uma instância de Etapa de Ensino - * - * @return Long - Valor do id - */ - - public Long getId() { - return id; - } - - /** - * Altera o valor do id de uma instância de Etapa de Ensino - * - * @param id - * Long - Novo valor do id - */ - - public void setId(Long id) { - this.id = id; - } - - /** - * Retorna o nome da etapa de ensino - * - * @return String - Nome da etapa de ensino - */ - - public String getNome() { - return nome; - } - - /** - * Altera o nome da etapa de ensino - * - * @param nome - * String - Novo nome da etapa de ensino - */ - - public void setNome(String nome) { - this.nome = nome; - } - - /** - * Retorna o número de vagas disponíveis - * - * @return int - Número de vagas - */ - public int getVagasDisponiveis() { - return vagasDisponiveis; - } - - /** - * Método que atualiza o número de vagas disponíveis - * - * @param vagasDisponiveis - * int - Novo número de vagas disponíveis - */ - - public void setVagasDisponiveis(int vagasDisponiveis) { - this.vagasDisponiveis = vagasDisponiveis; - } - - /** - * Método para retorno do tipo da etapa de ensino - * - * @return TipoEtapaEnsinoEnum - Etapa de ensino - */ - - public TipoEtapaEnsinoEnum getTipoEtapaEnsino() { - return tipoEtapaEnsino; - } - - /** - * Altera a etapa de ensino da instância - * - * @param tipoEtapaEnsino - * TipoEtapaEnsinoEnum - Etapa de ensino para ser atualizada - */ - - public void setTipoEtapaEnsino(TipoEtapaEnsinoEnum tipoEtapaEnsino) { - this.tipoEtapaEnsino = tipoEtapaEnsino; - } - - /** - * Método para retorno da lista de séries da etapa de ensino - * - * @return List - Retorna a lista de séries atual - */ - - public List getSeries() { - return series; - } - - /** - * Atualiza a lista de séries - * - * @param series - * List - Lista de séries a ser atualizada - */ - - public void setSeries(List series) { - this.series = series; - } - -} diff --git a/src/main/java/br/com/imd/cadwork/ensino/domain/Serie.java b/src/main/java/br/com/imd/cadwork/ensino/domain/Serie.java deleted file mode 100644 index 7d07974..0000000 --- a/src/main/java/br/com/imd/cadwork/ensino/domain/Serie.java +++ /dev/null @@ -1,94 +0,0 @@ -package br.com.imd.cadwork.ensino.domain; - -import java.util.List; - -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -import br.com.imd.cadwork.escola.domain.Escola; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * - * Classe que define o modelo de série - * - * @author Miguel - * @version 0.3 - */ - -@Entity -@Table(name = "serie", schema = "ensino") -@ApiModel -public class Serie { - - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - @Column(name = "id_serie") - @ApiModelProperty(hidden = true, notes = "ID gerado automaticamente pela base de dados") - private Long id; - - @NotBlank(message = "Campo em branco") - @NotNull(message = "Campo nulo") - @Column(name = "nome") - @ApiModelProperty(notes = "Nome da série", required = true) - private String nome; - - @ManyToMany(mappedBy = "series", cascade = CascadeType.ALL) - @ApiModelProperty(notes = "Escolas em que a série é disponibilizada") - private List escolas; - - public Serie() { - id = new Long(0); - } - - /** - * Método para retorno do id de uma instância de Serie - * - * @return Long - Valor do id - */ - - public Long getId() { - return id; - } - - /** - * Altera o valor do id de uma instância de Serie - * - * @param id - * Long - Novo valor do id - */ - - public void setId(Long id) { - this.id = id; - } - - /** - * Retorna o nome da série - * - * @return String - nome da série - */ - - public String getNome() { - return nome; - } - - /** - * Modifica o nome da série - * - * @param nome - * String - novo nome da série - */ - public void setNome(String nome) { - this.nome = nome; - } - -} diff --git a/src/main/java/br/com/imd/cadwork/ensino/domain/TipoEtapaEnsinoEnum.java b/src/main/java/br/com/imd/cadwork/ensino/domain/TipoEtapaEnsinoEnum.java deleted file mode 100644 index e3c93be..0000000 --- a/src/main/java/br/com/imd/cadwork/ensino/domain/TipoEtapaEnsinoEnum.java +++ /dev/null @@ -1,27 +0,0 @@ -package br.com.imd.cadwork.ensino.domain; - -import io.swagger.annotations.ApiModel; - -/** - * - * Enumeração dos possíveis tipos de etapa de ensino - * - * @author Miguel - * @version 0.2 - * - */ - -@ApiModel -public enum TipoEtapaEnsinoEnum { - /** - * ENSINO_FUNDAMENTAL - 1 - * ENSINO_MEDIO - 2 - * ENSINO_FUNDAMENTAL_EJA - 3 - * ENSINO_MEDIO_EJA - 4 - */ - ENSINO_FUNDAMENTAL, - ENSINO_MEDIO, - ENSINO_FUNDAMENTAL_EJA, - ENSINO_MEDIO_EJA, - -} diff --git a/src/main/java/br/com/imd/cadwork/ensino/resources/EtapaEnsinoResources.java b/src/main/java/br/com/imd/cadwork/ensino/resources/EtapaEnsinoResources.java deleted file mode 100644 index ad7241b..0000000 --- a/src/main/java/br/com/imd/cadwork/ensino/resources/EtapaEnsinoResources.java +++ /dev/null @@ -1,58 +0,0 @@ -package br.com.imd.cadwork.ensino.resources; - -import java.net.URI; -import java.util.List; -import java.util.Optional; - -import javax.validation.Valid; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.servlet.support.ServletUriComponentsBuilder; - -import br.com.imd.cadwork.core.service.exception.GenericServiceException; -import br.com.imd.cadwork.ensino.domain.EtapaEnsino; -import br.com.imd.cadwork.ensino.service.EtapaEnsinoService; -import io.swagger.annotations.Api; - -@CrossOrigin(origins = "http://localhost:4200", maxAge = 3600) -@RestController -@RequestMapping(value = "/etapasEnsino", produces = "application/json") -@Api(tags = "Etapas de Ensino", description = "Operações pertinentes a etapas de ensino") -public class EtapaEnsinoResources { - - @Autowired - EtapaEnsinoService etapaEnsinoService; - - @RequestMapping(method = RequestMethod.GET) - public ResponseEntity> listar() throws GenericServiceException { - return new ResponseEntity<>(etapaEnsinoService.listar(), HttpStatus.OK); - } - - @RequestMapping(method = RequestMethod.POST) - public ResponseEntity salvar(@Valid @RequestBody EtapaEnsino etapaEnsino, BindingResult resultado) throws GenericServiceException { - - etapaEnsinoService.salvar(etapaEnsino, resultado); - - URI uri = ServletUriComponentsBuilder.fromCurrentRequest().path("/{id}").buildAndExpand(etapaEnsino.getId()) - .toUri(); - - return ResponseEntity.created(uri).build(); - - } - - @RequestMapping(value = "/{id}", method = RequestMethod.GET) - public @ResponseBody ResponseEntity> buscar(@PathVariable("id") Long id) - throws GenericServiceException { - return new ResponseEntity<>(etapaEnsinoService.buscar(id), HttpStatus.OK); - } -} diff --git a/src/main/java/br/com/imd/cadwork/ensino/resources/SerieResources.java b/src/main/java/br/com/imd/cadwork/ensino/resources/SerieResources.java deleted file mode 100644 index 58e0733..0000000 --- a/src/main/java/br/com/imd/cadwork/ensino/resources/SerieResources.java +++ /dev/null @@ -1,57 +0,0 @@ -package br.com.imd.cadwork.ensino.resources; - -import java.net.URI; -import java.util.List; -import java.util.Optional; - -import javax.validation.Valid; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.servlet.support.ServletUriComponentsBuilder; - -import br.com.imd.cadwork.core.service.exception.GenericServiceException; -import br.com.imd.cadwork.ensino.domain.Serie; -import br.com.imd.cadwork.ensino.service.SerieService; -import io.swagger.annotations.Api; - -@CrossOrigin(origins = "http://localhost:4200", maxAge = 3600) -@RestController -@RequestMapping(value = "/series", produces = "application/json") -@Api(tags = "Séries", value = "onlinestore", description = "Operações pertinentes a séries") -public class SerieResources { - - @Autowired - SerieService serieService; - - @RequestMapping(method = RequestMethod.GET) - public ResponseEntity> listar() throws GenericServiceException { - - return new ResponseEntity<>(serieService.listar(), HttpStatus.OK); - - } - - @RequestMapping(method = RequestMethod.POST) - public ResponseEntity salvar(@Valid @RequestBody Serie serie, BindingResult resultado) throws GenericServiceException { - serieService.salvar(serie, resultado); - - URI uri = ServletUriComponentsBuilder.fromCurrentRequest().path("/{id}").buildAndExpand(serie.getId()).toUri(); - - return ResponseEntity.created(uri).build(); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.GET) - public @ResponseBody ResponseEntity> buscar(@PathVariable("id") Long id) - throws GenericServiceException { - return new ResponseEntity<>(serieService.buscar(id), HttpStatus.OK); - } -} diff --git a/src/main/java/br/com/imd/cadwork/ensino/service/EtapaEnsinoService.java b/src/main/java/br/com/imd/cadwork/ensino/service/EtapaEnsinoService.java deleted file mode 100644 index 8ab71b0..0000000 --- a/src/main/java/br/com/imd/cadwork/ensino/service/EtapaEnsinoService.java +++ /dev/null @@ -1,47 +0,0 @@ -package br.com.imd.cadwork.ensino.service; - -import java.util.List; -import java.util.Optional; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.validation.BindingResult; - -import br.com.imd.cadwork.core.dao.GenericDAO; -import br.com.imd.cadwork.core.service.GenericService; -import br.com.imd.cadwork.core.service.exception.GenericServiceException; -import br.com.imd.cadwork.core.service.exception.ResourceConflictException; -import br.com.imd.cadwork.ensino.dao.EtapaEnsinoDAO; -import br.com.imd.cadwork.ensino.domain.EtapaEnsino; - -@Component -public class EtapaEnsinoService extends GenericService { - - @Override - public List listar() throws GenericServiceException { - return super.listar(); - } - - @Override - public void salvar(EtapaEnsino etapaEnsino, BindingResult resultado) throws GenericServiceException { - super.salvar(etapaEnsino, resultado); - } - - @Override - public Optional buscar(Long id) throws GenericServiceException { - return super.buscar(id); - } - - @Autowired - public void setDao(GenericDAO dao) { - super.dao = dao; - } - - @Override - protected void verificaExistencia(EtapaEnsino etapaEnsino) throws GenericServiceException { - Optional etapaCadastrada = ((EtapaEnsinoDAO) dao).findEtapaEnsinoByNome(etapaEnsino.getNome()); - if (etapaEnsino.getId() != 0 || etapaCadastrada.isPresent()) { - throw new ResourceConflictException(); - } - } -} diff --git a/src/main/java/br/com/imd/cadwork/ensino/service/SerieService.java b/src/main/java/br/com/imd/cadwork/ensino/service/SerieService.java deleted file mode 100644 index 9fe86e7..0000000 --- a/src/main/java/br/com/imd/cadwork/ensino/service/SerieService.java +++ /dev/null @@ -1,48 +0,0 @@ -package br.com.imd.cadwork.ensino.service; - -import java.util.List; -import java.util.Optional; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.validation.BindingResult; - -import br.com.imd.cadwork.core.dao.GenericDAO; -import br.com.imd.cadwork.core.service.GenericService; -import br.com.imd.cadwork.core.service.exception.GenericServiceException; -import br.com.imd.cadwork.core.service.exception.ResourceConflictException; -import br.com.imd.cadwork.ensino.dao.SerieDAO; -import br.com.imd.cadwork.ensino.domain.Serie; - -@Component -public class SerieService extends GenericService { - - @Override - public List listar() throws GenericServiceException { - return super.listar(); - } - - @Override - public void salvar(Serie serie, BindingResult resultado) throws GenericServiceException { - super.salvar(serie, resultado); - } - - @Override - public Optional buscar(Long id) throws GenericServiceException { - return super.buscar(id); - } - - - @Autowired - public void setDao(GenericDAO dao) { - super.dao = dao; - } - - @Override - protected void verificaExistencia(Serie serie) throws GenericServiceException { - Optional serieCadastrada = ((SerieDAO) dao).findSerieByNome(serie.getNome()); - if(serie.getId()!=0 || serieCadastrada.isPresent()) { - throw new ResourceConflictException(); - } - } -} diff --git a/src/main/java/br/com/imd/cadwork/escola/dao/EscolaDAO.java b/src/main/java/br/com/imd/cadwork/escola/dao/EscolaDAO.java deleted file mode 100644 index 38f1bd6..0000000 --- a/src/main/java/br/com/imd/cadwork/escola/dao/EscolaDAO.java +++ /dev/null @@ -1,17 +0,0 @@ -package br.com.imd.cadwork.escola.dao; - -import java.util.Optional; - -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - -import br.com.imd.cadwork.core.dao.GenericDAO; -import br.com.imd.cadwork.escola.domain.Escola; - -@Repository -public interface EscolaDAO extends GenericDAO { - - @Query("SELECT e FROM Escola e WHERE e.endereco.id = :idEndereco") - public Optional findEscolaByEndereco(@Param("idEndereco") Long idEndereco); -} diff --git a/src/main/java/br/com/imd/cadwork/escola/domain/Escola.java b/src/main/java/br/com/imd/cadwork/escola/domain/Escola.java deleted file mode 100644 index ce5a77a..0000000 --- a/src/main/java/br/com/imd/cadwork/escola/domain/Escola.java +++ /dev/null @@ -1,163 +0,0 @@ -package br.com.imd.cadwork.escola.domain; - -import java.util.List; - -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -import br.com.imd.cadwork.ensino.domain.Serie; -import br.com.imd.cadwork.localizacao.domain.Endereco; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; - -/** - * - * Classe que define o modelo Escola - * - * @author Miguel - * @version 0.3 - * - */ - -@Entity -@Table(name = "escola", schema = "escola") -@ApiModel -public class Escola { - - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - @Column(name = "id_escola") - @ApiModelProperty(hidden = true, notes = "ID gerado automaticamente pela base de dados") - private Long id; - - @NotBlank(message = "Campo em branco") - @NotNull(message = "Campo nulo") - @ApiModelProperty(notes = "Nome da instituição", required = true) - private String nome; - - @ApiModelProperty(notes = "Telefone da instituição") - private String telefone; - - @NotNull(message = "Campo nulo") - @OneToOne(cascade = CascadeType.MERGE) - @JoinColumn(name = "id_endereco") - @ApiModelProperty(notes = "Endereço da Instituição", required = true) - private Endereco endereco; - - @ManyToMany(fetch = FetchType.EAGER) - @JoinColumn(name = "id_serie") - @ApiModelProperty(notes = "Séries da instituição") - private List series; - - public Escola() { - id = new Long(0); - } - - /** - * Método para retorno do id de uma instância de Escola - * - * @return Long - Valor do id - */ - public Long getId() { - return id; - } - - /** - * Altera o valor do id de uma instância de Escola - * - * @param id - * Long - Novo valor do id - */ - - public void setId(Long id) { - this.id = id; - } - - /** - * Método que retorna o nome da escola - * - * @return String - Nome da escola - */ - public String getNome() { - return nome; - } - - /** - * Método que modifica o nome da escola - * - * @param nome - * String - Novo nome da escola - */ - public void setNome(String nome) { - this.nome = nome; - } - - /** - * Retorna o endereço da escola - * - * @return Endereco - Endereço da escola - */ - public Endereco getEndereco() { - return endereco; - } - - /** - * Altera o endereço de uma instância de Escola - * - * @param endereco - * Endereco - Novo endereço - */ - public void setEndereco(Endereco endereco) { - this.endereco = endereco; - } - - /** - * Método para retorno o telefone da escola - * - * @return String - Telefone da escola - */ - public String getTelefone() { - return telefone; - } - - /** - * Altera o telefone de uma instância de Escola - * - * @param telefone - * String - Novo Telefone - */ - public void setTelefone(String telefone) { - this.telefone = telefone; - } - - /** - * Método para retornar as séries de uma escola - * - * @return List series da escola - */ - public List getSeries() { - return series; - } - - /** - * Altera as séries de uma instância de Escola - * - * @param series - * String - Novo Telefone - */ - public void setSeries(List series) { - this.series = series; - } - -} diff --git a/src/main/java/br/com/imd/cadwork/escola/resources/EscolaReportController.java b/src/main/java/br/com/imd/cadwork/escola/resources/EscolaReportController.java deleted file mode 100644 index e98dd2f..0000000 --- a/src/main/java/br/com/imd/cadwork/escola/resources/EscolaReportController.java +++ /dev/null @@ -1,40 +0,0 @@ -package br.com.imd.cadwork.escola.resources; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import br.com.imd.cadwork.core.service.exception.GenericServiceException; -import br.com.imd.cadwork.escola.service.EscolaService; - -@Controller -@RequestMapping("/reports") -public class EscolaReportController { - - @Autowired - EscolaService escolaService; - - public EscolaReportController(EscolaService escolaService) { - this.escolaService = escolaService; - } - - - @GetMapping("/html") - public String html(@RequestParam(required = false, value = "escola") Long id, Model model) throws GenericServiceException { - - model.addAttribute("escolas", this.escolaService.listar()); - - if (id == null) { - return "report/index"; - } - - model.addAttribute("atribute", this.escolaService.buscar(id).get().getSeries()); - - return "report/index"; - - } - -} diff --git a/src/main/java/br/com/imd/cadwork/escola/resources/EscolaResources.java b/src/main/java/br/com/imd/cadwork/escola/resources/EscolaResources.java deleted file mode 100644 index e25ec6b..0000000 --- a/src/main/java/br/com/imd/cadwork/escola/resources/EscolaResources.java +++ /dev/null @@ -1,54 +0,0 @@ -package br.com.imd.cadwork.escola.resources; - -import java.net.URI; -import java.util.List; -import java.util.Optional; - -import javax.validation.Valid; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.servlet.support.ServletUriComponentsBuilder; - -import br.com.imd.cadwork.core.service.exception.GenericServiceException; -import br.com.imd.cadwork.escola.domain.Escola; -import br.com.imd.cadwork.escola.service.EscolaService; -import io.swagger.annotations.Api; - -@CrossOrigin(origins = "http://localhost:4200", maxAge = 3600) -@RestController -@RequestMapping(value = "/escolas", produces = "application/json") -@Api(tags = "Escolas", description = "Operações pertinentes a escolas") -public class EscolaResources { - - @Autowired - EscolaService escolaService; - - @RequestMapping(method = RequestMethod.GET) - public List listar() throws GenericServiceException { - return escolaService.listar(); - - } - - @RequestMapping(method = RequestMethod.POST) - public ResponseEntity salvar(@Valid @RequestBody Escola escola, BindingResult resultado) throws GenericServiceException { - - escolaService.salvar(escola, resultado); - - URI uri = ServletUriComponentsBuilder.fromCurrentRequest().path("/{id}").buildAndExpand(escola.getId()).toUri(); - - return ResponseEntity.created(uri).build(); - } - - @RequestMapping(value = "/{id}", method = RequestMethod.GET) - public Optional buscar(@PathVariable("id") Long id) throws GenericServiceException { - return escolaService.buscar(id); - } -} diff --git a/src/main/java/br/com/imd/cadwork/escola/service/EscolaService.java b/src/main/java/br/com/imd/cadwork/escola/service/EscolaService.java deleted file mode 100644 index 21c5c8f..0000000 --- a/src/main/java/br/com/imd/cadwork/escola/service/EscolaService.java +++ /dev/null @@ -1,47 +0,0 @@ -package br.com.imd.cadwork.escola.service; - -import java.util.List; -import java.util.Optional; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.validation.BindingResult; - -import br.com.imd.cadwork.core.dao.GenericDAO; -import br.com.imd.cadwork.core.service.GenericService; -import br.com.imd.cadwork.core.service.exception.GenericServiceException; -import br.com.imd.cadwork.core.service.exception.ResourceConflictException; -import br.com.imd.cadwork.escola.dao.EscolaDAO; -import br.com.imd.cadwork.escola.domain.Escola; - -@Component -public class EscolaService extends GenericService { - - @Override - public List listar() throws GenericServiceException { - return super.listar(); - } - - @Override - public void salvar(Escola escola, BindingResult resultado) throws GenericServiceException { - super.salvar(escola, resultado); - } - - @Override - public Optional buscar(Long id) throws GenericServiceException { - return super.buscar(id); - } - - @Autowired - public void setDao(GenericDAO dao) { - super.dao = dao; - } - - @Override - protected void verificaExistencia(Escola escola) throws GenericServiceException { - Optional escolaCadastrada = ((EscolaDAO) dao).findEscolaByEndereco(escola.getEndereco().getId()); - if (escola.getId() != 0 || escolaCadastrada.isPresent()) { - throw new ResourceConflictException(); - } - } -} diff --git a/src/main/java/br/com/imd/cadwork/localizacao/service/EnderecoService.java b/src/main/java/br/com/imd/cadwork/localizacao/service/EnderecoService.java index 2785e4c..847732c 100644 --- a/src/main/java/br/com/imd/cadwork/localizacao/service/EnderecoService.java +++ b/src/main/java/br/com/imd/cadwork/localizacao/service/EnderecoService.java @@ -8,11 +8,11 @@ import org.springframework.validation.BindingResult; import br.com.imd.cadwork.core.dao.GenericDAO; +import br.com.imd.cadwork.core.localizacao.dao.EnderecoDAO; +import br.com.imd.cadwork.core.localizacao.domain.Endereco; import br.com.imd.cadwork.core.service.GenericService; import br.com.imd.cadwork.core.service.exception.GenericServiceException; import br.com.imd.cadwork.core.service.exception.ResourceConflictException; -import br.com.imd.cadwork.localizacao.dao.EnderecoDAO; -import br.com.imd.cadwork.localizacao.domain.Endereco; @Component public class EnderecoService extends GenericService { diff --git a/src/main/java/br/com/imd/cadwork/localizacao/service/MunicipioService.java b/src/main/java/br/com/imd/cadwork/localizacao/service/MunicipioService.java index 9e8206f..94e737d 100644 --- a/src/main/java/br/com/imd/cadwork/localizacao/service/MunicipioService.java +++ b/src/main/java/br/com/imd/cadwork/localizacao/service/MunicipioService.java @@ -8,11 +8,11 @@ import org.springframework.validation.BindingResult; import br.com.imd.cadwork.core.dao.GenericDAO; +import br.com.imd.cadwork.core.localizacao.dao.MunicipioDAO; +import br.com.imd.cadwork.core.localizacao.domain.Municipio; import br.com.imd.cadwork.core.service.GenericService; import br.com.imd.cadwork.core.service.exception.GenericServiceException; import br.com.imd.cadwork.core.service.exception.ResourceConflictException; -import br.com.imd.cadwork.localizacao.dao.MunicipioDAO; -import br.com.imd.cadwork.localizacao.domain.Municipio; @Component public class MunicipioService extends GenericService { diff --git a/src/main/resources/db/migration/V1_create_schema.sql b/src/main/resources/db/migration/V1_create_schema.sql index bf4aed5..1a217ce 100644 --- a/src/main/resources/db/migration/V1_create_schema.sql +++ b/src/main/resources/db/migration/V1_create_schema.sql @@ -1,3 +1,4 @@ CREATE SCHEMA IF NOT EXISTS ENSINO; CREATE SCHEMA IF NOT EXISTS ESCOLA; CREATE SCHEMA IF NOT EXISTS LOCALIZACAO; +CREATE SCHEMA IF NOT EXISTS LOCALIZAVEL; From 5a980d9d135e11fae51a15540396a669ac046794 Mon Sep 17 00:00:00 2001 From: Miguel Date: Fri, 8 Jun 2018 20:39:30 -0300 Subject: [PATCH 03/23] urilizando recurso da linhguagem(java8) --- .../imd/cadwork/core/service/GenericService.java | 16 +++++++++++----- .../localizacao/service/EnderecoService.java | 11 +++++------ .../localizacao/service/MunicipioService.java | 10 +++++----- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/main/java/br/com/imd/cadwork/core/service/GenericService.java b/src/main/java/br/com/imd/cadwork/core/service/GenericService.java index cde1ec4..e56e5f6 100644 --- a/src/main/java/br/com/imd/cadwork/core/service/GenericService.java +++ b/src/main/java/br/com/imd/cadwork/core/service/GenericService.java @@ -18,8 +18,13 @@ public abstract class GenericService { protected GenericDAO dao; protected List listar() throws GenericServiceException { - return Optional.ofNullable(dao.findAll()) - .orElseThrow(ResourceNotFoundException::new); + List entidades = dao.findAll(); + + entidades.stream() + .findAny() + .orElseThrow(ResourceNotFoundException::new); + + return entidades; } protected void salvar(T t, BindingResult resultado) throws GenericServiceException { @@ -28,6 +33,7 @@ protected void salvar(T t, BindingResult resultado) throws GenericServiceExcepti throw new ResourceEmptyException(ValidatorUtil.gerarErrorsInJson(resultado.getAllErrors())); } verificaExistencia(t); + try { dao.save(t); @@ -39,9 +45,9 @@ protected void salvar(T t, BindingResult resultado) throws GenericServiceExcepti } protected Optional buscar(Long id) throws GenericServiceException { - - return Optional.ofNullable(dao.findById(id)) - .orElseThrow(ResourceNotFoundException::new); + T entidade = dao.findById(id).orElseThrow(ResourceNotFoundException::new); + + return Optional.of(entidade); } protected abstract void setDao(GenericDAO dao); diff --git a/src/main/java/br/com/imd/cadwork/localizacao/service/EnderecoService.java b/src/main/java/br/com/imd/cadwork/localizacao/service/EnderecoService.java index 847732c..e28fae1 100644 --- a/src/main/java/br/com/imd/cadwork/localizacao/service/EnderecoService.java +++ b/src/main/java/br/com/imd/cadwork/localizacao/service/EnderecoService.java @@ -39,12 +39,11 @@ public void setDao(GenericDAO dao) { @Override protected void verificaExistencia(Endereco endereco) throws GenericServiceException { - Optional enderecoCadastrado = ((EnderecoDAO) dao) - .findEnderecoByLatitudeAndLongitude(endereco.getLatitude(), endereco.getLongitude()); - - if(endereco.getId()!=0 || enderecoCadastrado.isPresent()) { - throw new ResourceConflictException(); - } + ((EnderecoDAO) dao). + findEnderecoByLatitudeAndLongitude( + endereco.getLatitude(), + endereco.getLongitude() + ).orElseThrow(ResourceConflictException::new); } } diff --git a/src/main/java/br/com/imd/cadwork/localizacao/service/MunicipioService.java b/src/main/java/br/com/imd/cadwork/localizacao/service/MunicipioService.java index 94e737d..0e8ce92 100644 --- a/src/main/java/br/com/imd/cadwork/localizacao/service/MunicipioService.java +++ b/src/main/java/br/com/imd/cadwork/localizacao/service/MunicipioService.java @@ -39,12 +39,12 @@ public void setDao(GenericDAO dao) { @Override protected void verificaExistencia(Municipio municipio) throws GenericServiceException { - Optional municipioCadastrado = ((MunicipioDAO) dao) - .findTop1MunicipioByNomeAndEstado(municipio.getNome(), municipio.getEstado().name()); + ((MunicipioDAO) dao) + .findTop1MunicipioByNomeAndEstado( + municipio.getNome(), + municipio.getEstado().name() + ).orElseThrow(ResourceConflictException::new); - if(municipio.getId()!=0 || municipioCadastrado.isPresent()) { - throw new ResourceConflictException(); - } } From 453130e57c3bc53522baf9c41a38e729b139d62c Mon Sep 17 00:00:00 2001 From: Miguel Date: Fri, 8 Jun 2018 21:46:40 -0300 Subject: [PATCH 04/23] =?UTF-8?q?Atualiza=C3=A7=C3=A3o=20vers=C3=A3o=20Swa?= =?UTF-8?q?gger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 ++++---- .../imd/cadwork/core/config/SwaggerConfig.java | 15 ++++----------- .../CadworkapiApplicationTests.java} | 4 ++-- 3 files changed, 10 insertions(+), 17 deletions(-) rename src/test/java/br/com/imd/{cadeduc/CadeducapiApplicationTests.java => cadwork/CadworkapiApplicationTests.java} (79%) diff --git a/pom.xml b/pom.xml index a016930..c079023 100644 --- a/pom.xml +++ b/pom.xml @@ -69,13 +69,13 @@ io.springfox springfox-swagger2 - 2.7.0 + 2.8.0 - io.springfox - springfox-swagger-ui - 2.7.0 + io.springfox + springfox-swagger-ui + 2.8.0 diff --git a/src/main/java/br/com/imd/cadwork/core/config/SwaggerConfig.java b/src/main/java/br/com/imd/cadwork/core/config/SwaggerConfig.java index 109c235..1a33054 100644 --- a/src/main/java/br/com/imd/cadwork/core/config/SwaggerConfig.java +++ b/src/main/java/br/com/imd/cadwork/core/config/SwaggerConfig.java @@ -1,7 +1,5 @@ package br.com.imd.cadwork.core.config; - - import java.time.LocalDate; import java.util.Collections; @@ -9,7 +7,6 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; @@ -46,11 +43,7 @@ public Docket api() { .pathMapping("/") .directModelSubstitute(LocalDate.class, String.class) .genericModelSubstitutes(ResponseEntity.class) - .useDefaultResponseMessages(false) - .globalResponseMessage(RequestMethod.GET, - ResponseMessagesConfig.getInstance().listaMensagens()) - .globalResponseMessage(RequestMethod.POST, - ResponseMessagesConfig.getInstance().listaMensagens()) + .useDefaultResponseMessages(true) .apiInfo(metaData()); } @@ -61,11 +54,11 @@ public Docket api() { */ private ApiInfo metaData() { ApiInfo apiInfo = new ApiInfo( - "CADEduc", - "Spring Boot REST API para Geocalização de escolas", + "CADWork", + "Spring Boot REST API para Geocalização de recursos", "1.0", "Termos e Serviço", - new Contact("CADEduc", "https://cadeduc.imd.com.br/about/", "miguelwelligton@gmail.com"), + new Contact("CADEduc", "https://cadwork.imd.com.br/about/", "miguelwelligton@gmail.com"), "GNU General Public License 3.0", "https://www.gnu.org/licenses/gpl.txt", Collections.emptyList()); return apiInfo; diff --git a/src/test/java/br/com/imd/cadeduc/CadeducapiApplicationTests.java b/src/test/java/br/com/imd/cadwork/CadworkapiApplicationTests.java similarity index 79% rename from src/test/java/br/com/imd/cadeduc/CadeducapiApplicationTests.java rename to src/test/java/br/com/imd/cadwork/CadworkapiApplicationTests.java index 5ce5420..7ba2cdb 100644 --- a/src/test/java/br/com/imd/cadeduc/CadeducapiApplicationTests.java +++ b/src/test/java/br/com/imd/cadwork/CadworkapiApplicationTests.java @@ -1,4 +1,4 @@ -package br.com.imd.cadeduc; +package br.com.imd.cadwork; import org.junit.Test; import org.junit.runner.RunWith; @@ -7,7 +7,7 @@ @RunWith(SpringRunner.class) @SpringBootTest -public class CadeducapiApplicationTests { +public class CadworkapiApplicationTests { @Test public void contextLoads() { From 5b58d788cc8012530f07e66d94590365aed8ec39 Mon Sep 17 00:00:00 2001 From: Igor Barbosa Nogueira Date: Sat, 9 Jun 2018 00:18:09 -0300 Subject: [PATCH 05/23] =?UTF-8?q?Coment=C3=A1rios=20adicionados=20em=20tod?= =?UTF-8?q?os=20os=20arquivos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../imd/cadwork/CadworkapiApplication.java | 12 ++++- .../imd/cadwork/core/config/DetalheError.java | 51 ++++++++++++++++--- .../core/config/ResponseMessagesConfig.java | 4 +- .../cadwork/core/config/SwaggerConfig.java | 4 +- .../com/imd/cadwork/core/dao/GenericDAO.java | 7 ++- .../core/dao/GenericDomainException.java | 19 +++++++ .../core/dao/GerericDomainException.java | 10 ---- .../core/localizacao/dao/EnderecoDAO.java | 13 ++++- .../core/localizacao/dao/MunicipioDAO.java | 13 ++++- .../core/localizacao/domain/Endereco.java | 4 ++ .../resources/EnderecoResources.java | 27 ++++++++-- .../resources/MunicipioResources.java | 28 ++++++++-- .../core/resources/CadeducResources.java | 11 +++- .../cadwork/core/service/GenericService.java | 35 +++++++++++-- .../exception/GenericServiceException.java | 10 +++- .../exception/ResourceConflictException.java | 15 +++++- .../exception/ResourceEmptyException.java | 8 +++ .../exception/ResourceNotFoundException.java | 13 ++++- .../localizacao/service/EnderecoService.java | 24 +++++++-- .../localizacao/service/MunicipioService.java | 27 +++++++--- .../com/imd/cadwork/util/ValidatorUtil.java | 13 +++-- 21 files changed, 291 insertions(+), 57 deletions(-) create mode 100644 src/main/java/br/com/imd/cadwork/core/dao/GenericDomainException.java delete mode 100644 src/main/java/br/com/imd/cadwork/core/dao/GerericDomainException.java diff --git a/src/main/java/br/com/imd/cadwork/CadworkapiApplication.java b/src/main/java/br/com/imd/cadwork/CadworkapiApplication.java index b6e3df0..b9c02b7 100644 --- a/src/main/java/br/com/imd/cadwork/CadworkapiApplication.java +++ b/src/main/java/br/com/imd/cadwork/CadworkapiApplication.java @@ -4,11 +4,19 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import springfox.documentation.swagger2.annotations.EnableSwagger2; - +/** + * Classe para inicializar aplicação + * @author Welligton Miguel + * @version 0.1 + */ @EnableSwagger2 @SpringBootApplication public class CadworkapiApplication { - + /** + * Função main do framework responsável por inicializar a aplicação + * + * @param args String - argumentos passados na inicialização do programa + */ public static void main(String[] args) { SpringApplication.run(CadworkapiApplication.class, args); } diff --git a/src/main/java/br/com/imd/cadwork/core/config/DetalheError.java b/src/main/java/br/com/imd/cadwork/core/config/DetalheError.java index 9af4b97..612e3e6 100644 --- a/src/main/java/br/com/imd/cadwork/core/config/DetalheError.java +++ b/src/main/java/br/com/imd/cadwork/core/config/DetalheError.java @@ -1,6 +1,11 @@ package br.com.imd.cadwork.core.config; import org.springframework.http.HttpStatus; +/** + * Classe modelo das respostas aos errors e seus detalhes + * @author Welligton Miguel + * @version 0.1 + */ public class DetalheError { @@ -8,35 +13,69 @@ public class DetalheError { private HttpStatus status; private Long timestamp; private String mensagem; + + /** + * Método que retorna o titulo do error + * @return String - titulo do error + */ public String getTitulo() { return titulo; } - + + /** + * Altera titulo do error + * @param titulo String - novo título + */ + public void setTitulo(String titulo) { this.titulo = titulo; } - + + /** + * Método que retorna o status do error + * @return HttpStatus - status do error + */ + public HttpStatus getStatus() { return status; } + /** + * Método que altera o status do error + * @param status HttpStatus - novo status do error + */ + public void setStatus(HttpStatus status) { this.status = status; } - + /** + * Método que o retorna o time stamp do error + * @return Long - time stamp do error + */ + public Long getTimestamp() { return timestamp; } - + /** + * Método que altera o time stamp do error + * @param timestamp Long - novo time stamp + */ public void setTimestamp(Long timestamp) { this.timestamp = timestamp; } - + /** + * Método que retorna a mensagem do error + * @return String - mensagem do error + */ + public String getMensagem() { return mensagem; } - + /** + * Método que altera a mensagem do error + * @param mensagem String - nova mensagem do error + */ public void setMensagem(String mensagem) { this.mensagem = mensagem; } diff --git a/src/main/java/br/com/imd/cadwork/core/config/ResponseMessagesConfig.java b/src/main/java/br/com/imd/cadwork/core/config/ResponseMessagesConfig.java index 34fe549..6f24bee 100644 --- a/src/main/java/br/com/imd/cadwork/core/config/ResponseMessagesConfig.java +++ b/src/main/java/br/com/imd/cadwork/core/config/ResponseMessagesConfig.java @@ -24,7 +24,9 @@ public class ResponseMessagesConfig { private static ResponseMessagesConfig instancia; private static Map mensagens; - + /** + * Procedimento de inicialização das mensagens padrões + */ private ResponseMessagesConfig() { mensagens = new HashMap<>(); mensagensPadroes(); diff --git a/src/main/java/br/com/imd/cadwork/core/config/SwaggerConfig.java b/src/main/java/br/com/imd/cadwork/core/config/SwaggerConfig.java index 109c235..deab5b3 100644 --- a/src/main/java/br/com/imd/cadwork/core/config/SwaggerConfig.java +++ b/src/main/java/br/com/imd/cadwork/core/config/SwaggerConfig.java @@ -22,7 +22,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; /** - * Classe qe define as configurações da documentação Swagger + * Classe que define as configurações da documentação Swagger * * @author miguel * @version 0.2 @@ -34,7 +34,7 @@ public class SwaggerConfig extends WebMvcConfigurationSupport{ /** * Função central que constroi a documentação - * @return + * @return Docket */ @Bean public Docket api() { diff --git a/src/main/java/br/com/imd/cadwork/core/dao/GenericDAO.java b/src/main/java/br/com/imd/cadwork/core/dao/GenericDAO.java index 01cdf0c..8c80633 100644 --- a/src/main/java/br/com/imd/cadwork/core/dao/GenericDAO.java +++ b/src/main/java/br/com/imd/cadwork/core/dao/GenericDAO.java @@ -2,7 +2,12 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.repository.NoRepositoryBean; - +/** + * Interface para criação de DAO no sistema + * @author Welligton Miguel + * + * @param - Classe modelo para criar o DAO + */ @NoRepositoryBean public interface GenericDAO extends JpaRepository { diff --git a/src/main/java/br/com/imd/cadwork/core/dao/GenericDomainException.java b/src/main/java/br/com/imd/cadwork/core/dao/GenericDomainException.java new file mode 100644 index 0000000..2d977aa --- /dev/null +++ b/src/main/java/br/com/imd/cadwork/core/dao/GenericDomainException.java @@ -0,0 +1,19 @@ +package br.com.imd.cadwork.core.dao; + + +/** + * Classe de excessões padrões + * @author Welligton Miguel + * + */ +public class GenericDomainException extends Exception { + + private static final long serialVersionUID = 1L; + /** + * Construtor da classe + * @param message String - mensagem para repassar para Exception + */ + public GenericDomainException(String message) { + super(message); + } +} diff --git a/src/main/java/br/com/imd/cadwork/core/dao/GerericDomainException.java b/src/main/java/br/com/imd/cadwork/core/dao/GerericDomainException.java deleted file mode 100644 index 84cc84e..0000000 --- a/src/main/java/br/com/imd/cadwork/core/dao/GerericDomainException.java +++ /dev/null @@ -1,10 +0,0 @@ -package br.com.imd.cadwork.core.dao; - -public class GerericDomainException extends Exception { - - private static final long serialVersionUID = 1L; - - public GerericDomainException(String message) { - super(message); - } -} diff --git a/src/main/java/br/com/imd/cadwork/core/localizacao/dao/EnderecoDAO.java b/src/main/java/br/com/imd/cadwork/core/localizacao/dao/EnderecoDAO.java index 5727887..df97ff7 100644 --- a/src/main/java/br/com/imd/cadwork/core/localizacao/dao/EnderecoDAO.java +++ b/src/main/java/br/com/imd/cadwork/core/localizacao/dao/EnderecoDAO.java @@ -7,10 +7,19 @@ import br.com.imd.cadwork.core.dao.GenericDAO; import br.com.imd.cadwork.core.localizacao.domain.Endereco; - +/** + * Interface que herda da GeneticDAO para criar um DAO de Endereço + * @author Welligton Miguel + */ @Repository public interface EnderecoDAO extends GenericDAO { - + /** + * Função para buscar endereço através da longitude e latitude + * + * @param latitude double - latitude do endereço + * @param longitude double - longitude do endereço + * @return Option - Optional de um endereço + */ public Optional findEnderecoByLatitudeAndLongitude(@Param("latitude") double latitude, @Param("longitude") double longitude); } diff --git a/src/main/java/br/com/imd/cadwork/core/localizacao/dao/MunicipioDAO.java b/src/main/java/br/com/imd/cadwork/core/localizacao/dao/MunicipioDAO.java index 0480719..c27b9c5 100644 --- a/src/main/java/br/com/imd/cadwork/core/localizacao/dao/MunicipioDAO.java +++ b/src/main/java/br/com/imd/cadwork/core/localizacao/dao/MunicipioDAO.java @@ -8,10 +8,19 @@ import br.com.imd.cadwork.core.dao.GenericDAO; import br.com.imd.cadwork.core.localizacao.domain.Municipio; - +/** + * Interface que herda da GeneticDAO para criar um DAO de Municipio + * @author Welligton Miguel + */ @Repository public interface MunicipioDAO extends GenericDAO { - + /** + * Retorna um único municipio para o nome e estado passados + * @param nome String - nome do municipio a ser pesquisado + * @param estado String - estado ao qual o municipio pertence + * @return Optional - optional de um municipio + */ + @Query(value="SELECT * FROM localizacao.municipio m WHERE m.nome = :nome and m.estado = :#{#estado} LIMIT 1", nativeQuery = true) Optional findTop1MunicipioByNomeAndEstado(@Param("nome")String nome, @Param("estado") String estado); diff --git a/src/main/java/br/com/imd/cadwork/core/localizacao/domain/Endereco.java b/src/main/java/br/com/imd/cadwork/core/localizacao/domain/Endereco.java index e32edbf..db31f0e 100644 --- a/src/main/java/br/com/imd/cadwork/core/localizacao/domain/Endereco.java +++ b/src/main/java/br/com/imd/cadwork/core/localizacao/domain/Endereco.java @@ -80,6 +80,10 @@ public class Endereco { @ApiModelProperty(notes = "Município da instituição ", required = true) private Municipio municipio; + /** + * Construtor da classe Endereço + */ + public Endereco(){ id = new Long(0); } diff --git a/src/main/java/br/com/imd/cadwork/core/localizacao/resources/EnderecoResources.java b/src/main/java/br/com/imd/cadwork/core/localizacao/resources/EnderecoResources.java index c1f0c9f..5fa1437 100644 --- a/src/main/java/br/com/imd/cadwork/core/localizacao/resources/EnderecoResources.java +++ b/src/main/java/br/com/imd/cadwork/core/localizacao/resources/EnderecoResources.java @@ -21,7 +21,11 @@ import br.com.imd.cadwork.core.service.exception.GenericServiceException; import br.com.imd.cadwork.localizacao.service.EnderecoService; import io.swagger.annotations.Api; - +/** + * Classe que faz o controle dos endpoints da API com os dados de enderecos + * @author Welligton Miguel + * + */ @CrossOrigin(origins = "http://localhost:4200", maxAge = 3600) @RestController @RequestMapping(value = "/enderecos", produces = "application/json") @@ -30,13 +34,23 @@ public class EnderecoResources { @Autowired EnderecoService enderecoService; - + /** + * Retorna todos os enderecos da API + * @return List - todos os municipios da API + * @throws GenericServiceException + */ @RequestMapping(method = RequestMethod.GET) public List listar() throws GenericServiceException { return enderecoService.listar(); } - + /** + * Função para adicionar um endereco na API + * @param municipio Endereco - endereco para ser adicionado na API + * @param resultado BindingResult + * @return ResponseEntity + * @throws GenericServiceException + */ @RequestMapping(method = RequestMethod.POST) public ResponseEntity salvar(@Valid @RequestBody Endereco endereco, BindingResult resultado) throws GenericServiceException { @@ -47,7 +61,12 @@ public ResponseEntity salvar(@Valid @RequestBody Endereco endereco, Bind return ResponseEntity.created(uri).build(); } - + /** + * Retorna endereco associado a um determinado id + * @param id Long - id para retornar endereco associado + * @return Optional - caso o id seja válido retorna um endereco + * @throws GenericServiceException + */ @RequestMapping(value = "/{id}", method = RequestMethod.GET) public Optional buscar(@PathVariable("id") Long id) throws GenericServiceException { return enderecoService.buscar(id); diff --git a/src/main/java/br/com/imd/cadwork/core/localizacao/resources/MunicipioResources.java b/src/main/java/br/com/imd/cadwork/core/localizacao/resources/MunicipioResources.java index 45572ce..b830051 100644 --- a/src/main/java/br/com/imd/cadwork/core/localizacao/resources/MunicipioResources.java +++ b/src/main/java/br/com/imd/cadwork/core/localizacao/resources/MunicipioResources.java @@ -20,7 +20,11 @@ import br.com.imd.cadwork.core.service.exception.GenericServiceException; import br.com.imd.cadwork.localizacao.service.MunicipioService; import io.swagger.annotations.Api; - +/** + * Classe que faz o controle dos endpoints da API com os dados de municipios + * @author Welligton Miguel + * + */ @RestController @RequestMapping(value = "/municipios", produces = "application/json") @Api(tags = "Municípios", value = "onlinestore", description = "Operações pertinentes a municípios") @@ -28,13 +32,24 @@ public class MunicipioResources { @Autowired MunicipioService municipioService; - + /** + * Retorna todos os municipios da API + * @return List - todos os municipios da API + * @throws GenericServiceException + */ + @RequestMapping(method = RequestMethod.GET) public List listar() throws GenericServiceException { return municipioService.listar(); } - + /** + * Função para adicionar municipio na API + * @param municipio Municipio - municipio para ser adicionado na API + * @param resultado BindingResult + * @return ResponseEntity + * @throws GenericServiceException + */ @RequestMapping(method = RequestMethod.POST) public ResponseEntity salvar(@Valid @RequestBody Municipio municipio, BindingResult resultado) throws GenericServiceException { municipioService.salvar(municipio, resultado); @@ -44,7 +59,12 @@ public ResponseEntity salvar(@Valid @RequestBody Municipio municipio, Bi return ResponseEntity.created(uri).build(); } - + /** + * Retorna municipio associado a um determinado id + * @param id Long - id para retornar municipio associado + * @return Optional - caso o id seja válido retorna um muninipio + * @throws GenericServiceException + */ @RequestMapping(value = "/{id}", method = RequestMethod.GET) public Optional buscar(@PathVariable("id") Long id) throws GenericServiceException { return municipioService.buscar(id); diff --git a/src/main/java/br/com/imd/cadwork/core/resources/CadeducResources.java b/src/main/java/br/com/imd/cadwork/core/resources/CadeducResources.java index a9a41a3..bc9f35a 100644 --- a/src/main/java/br/com/imd/cadwork/core/resources/CadeducResources.java +++ b/src/main/java/br/com/imd/cadwork/core/resources/CadeducResources.java @@ -6,11 +6,18 @@ import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; - +/** + * Classe para configurar resource principal + * @author Welligton Miguel + * + */ @ApiIgnore @RestController public class CadeducResources { - + /** + * Redireciona para página inicial + * @param response HttpServletResponse + */ @GetMapping("/") public void paginaInicial(HttpServletResponse response) { response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY); diff --git a/src/main/java/br/com/imd/cadwork/core/service/GenericService.java b/src/main/java/br/com/imd/cadwork/core/service/GenericService.java index e56e5f6..0ddd9b5 100644 --- a/src/main/java/br/com/imd/cadwork/core/service/GenericService.java +++ b/src/main/java/br/com/imd/cadwork/core/service/GenericService.java @@ -11,12 +11,21 @@ import br.com.imd.cadwork.core.service.exception.ResourceEmptyException; import br.com.imd.cadwork.core.service.exception.ResourceNotFoundException; import br.com.imd.cadwork.util.ValidatorUtil; - +/** + * Service genérico para objetos do framework + * @author Welligton Miguel + * + * @param + */ @Service public abstract class GenericService { protected GenericDAO dao; - + /** + * Retorna uma lista de objetos + * @return List - lista de objetos + * @throws GenericServiceException + */ protected List listar() throws GenericServiceException { List entidades = dao.findAll(); @@ -27,6 +36,12 @@ protected List listar() throws GenericServiceException { return entidades; } + /** + * Procedimento para salvar um objeto + * @param t T - objeto para ser salvo + * @param resultado BindingResult - resultados da operação + * @throws GenericServiceException + */ protected void salvar(T t, BindingResult resultado) throws GenericServiceException { if (resultado.hasErrors()) { @@ -44,13 +59,27 @@ protected void salvar(T t, BindingResult resultado) throws GenericServiceExcepti } + /** + * Busca um onjeto por um id passado + * @param id Long - busca um objeto pelo id + * @return Optional - retorna o objeto caso exista + * @throws GenericServiceException + */ protected Optional buscar(Long id) throws GenericServiceException { T entidade = dao.findById(id).orElseThrow(ResourceNotFoundException::new); return Optional.of(entidade); } - + /** + * Função abstrata que tem que ser injetada para setar o dao correto + * @param dao GenericDAO + */ protected abstract void setDao(GenericDAO dao); + /** + * Verifica a existência de um determinado objeto no BD + * @param t T - objeto passado + * @throws GenericServiceException + */ protected abstract void verificaExistencia(T t) throws GenericServiceException; } diff --git a/src/main/java/br/com/imd/cadwork/core/service/exception/GenericServiceException.java b/src/main/java/br/com/imd/cadwork/core/service/exception/GenericServiceException.java index 901ee82..d5c1f0c 100644 --- a/src/main/java/br/com/imd/cadwork/core/service/exception/GenericServiceException.java +++ b/src/main/java/br/com/imd/cadwork/core/service/exception/GenericServiceException.java @@ -1,8 +1,16 @@ package br.com.imd.cadwork.core.service.exception; +/** + * Exceção para services + * @author Welligton Miguel + * + */ public class GenericServiceException extends Exception { private static final long serialVersionUID = 1L; - + /** + * Construtor + * @param message String - mensagem de exceção + */ public GenericServiceException(String message) { super(message); } diff --git a/src/main/java/br/com/imd/cadwork/core/service/exception/ResourceConflictException.java b/src/main/java/br/com/imd/cadwork/core/service/exception/ResourceConflictException.java index 744237a..0d1a37c 100644 --- a/src/main/java/br/com/imd/cadwork/core/service/exception/ResourceConflictException.java +++ b/src/main/java/br/com/imd/cadwork/core/service/exception/ResourceConflictException.java @@ -1,14 +1,25 @@ package br.com.imd.cadwork.core.service.exception; +/** + * Exceção para resource de conflito + * @author Welligton Miguel + * + */ public class ResourceConflictException extends GenericServiceException { private static final long serialVersionUID = 1L; - + + /** + * Construtor + */ public ResourceConflictException() { super("Recurso Já existente"); } - + /** + * Constutor + * @param message String - mensagem da exceção + */ public ResourceConflictException(String message) { super(message); diff --git a/src/main/java/br/com/imd/cadwork/core/service/exception/ResourceEmptyException.java b/src/main/java/br/com/imd/cadwork/core/service/exception/ResourceEmptyException.java index 4663558..98829a8 100644 --- a/src/main/java/br/com/imd/cadwork/core/service/exception/ResourceEmptyException.java +++ b/src/main/java/br/com/imd/cadwork/core/service/exception/ResourceEmptyException.java @@ -1,9 +1,17 @@ package br.com.imd.cadwork.core.service.exception; +/** + * Exceção para resource vazio + * @author Welligton Miguel + * + */ public class ResourceEmptyException extends GenericServiceException { private static final long serialVersionUID = 1L; + /** + * Contrutor + */ public ResourceEmptyException(String message) { super(message); } diff --git a/src/main/java/br/com/imd/cadwork/core/service/exception/ResourceNotFoundException.java b/src/main/java/br/com/imd/cadwork/core/service/exception/ResourceNotFoundException.java index 978a827..7055330 100644 --- a/src/main/java/br/com/imd/cadwork/core/service/exception/ResourceNotFoundException.java +++ b/src/main/java/br/com/imd/cadwork/core/service/exception/ResourceNotFoundException.java @@ -1,13 +1,24 @@ package br.com.imd.cadwork.core.service.exception; +/** + * Exceção para resource não encontrado + * @author Welligton Miguel + * + */ public class ResourceNotFoundException extends GenericServiceException { private static final long serialVersionUID = 1L; + /** + * Construtor + */ public ResourceNotFoundException() { super("Recurso não encontrado."); } - + /** + * Construtor + * @param message String - mensagem da exceção + */ public ResourceNotFoundException(String message) { super(message); } diff --git a/src/main/java/br/com/imd/cadwork/localizacao/service/EnderecoService.java b/src/main/java/br/com/imd/cadwork/localizacao/service/EnderecoService.java index e28fae1..030b49a 100644 --- a/src/main/java/br/com/imd/cadwork/localizacao/service/EnderecoService.java +++ b/src/main/java/br/com/imd/cadwork/localizacao/service/EnderecoService.java @@ -13,30 +13,46 @@ import br.com.imd.cadwork.core.service.GenericService; import br.com.imd.cadwork.core.service.exception.GenericServiceException; import br.com.imd.cadwork.core.service.exception.ResourceConflictException; +/** + * Service para objetos da classe Endereco + * @author Welligton Miguel + * + */ @Component public class EnderecoService extends GenericService { + /** + * {@inheritDoc} + */ @Override public List listar() throws GenericServiceException { return super.listar(); } - + /** + * {@inheritDoc} + */ @Override public void salvar(Endereco endereco, BindingResult resultado) throws GenericServiceException { super.salvar(endereco, resultado); } - + /** + * {@inheritDoc} + */ @Override public Optional buscar(Long id) throws GenericServiceException { return super.buscar(id); } - + /** + * {@inheritDoc} + */ @Autowired public void setDao(GenericDAO dao) { super.dao = dao; } - + /** + * {@inheritDoc} + */ @Override protected void verificaExistencia(Endereco endereco) throws GenericServiceException { ((EnderecoDAO) dao). diff --git a/src/main/java/br/com/imd/cadwork/localizacao/service/MunicipioService.java b/src/main/java/br/com/imd/cadwork/localizacao/service/MunicipioService.java index 0e8ce92..695c321 100644 --- a/src/main/java/br/com/imd/cadwork/localizacao/service/MunicipioService.java +++ b/src/main/java/br/com/imd/cadwork/localizacao/service/MunicipioService.java @@ -13,30 +13,44 @@ import br.com.imd.cadwork.core.service.GenericService; import br.com.imd.cadwork.core.service.exception.GenericServiceException; import br.com.imd.cadwork.core.service.exception.ResourceConflictException; - +/** + * Service para objetos da classe Endereco + * @author Welligton Miguel + * + */ @Component public class MunicipioService extends GenericService { - + /** + * {@inheritDoc}} + */ @Override public List listar() throws GenericServiceException { return super.listar(); } - + /** + * {@inheritDoc}} + */ @Override public void salvar(Municipio municipio, BindingResult resultado) throws GenericServiceException { super.salvar(municipio, resultado); } - + /** + * {@inheritDoc}} + */ @Override public Optional buscar(Long id) throws GenericServiceException { return super.buscar(id); } - + /** + * {@inheritDoc}} + */ @Autowired public void setDao(GenericDAO dao) { super.dao = dao; } - + /** + * {@inheritDoc}} + */ @Override protected void verificaExistencia(Municipio municipio) throws GenericServiceException { ((MunicipioDAO) dao) @@ -45,7 +59,6 @@ protected void verificaExistencia(Municipio municipio) throws GenericServiceExce municipio.getEstado().name() ).orElseThrow(ResourceConflictException::new); - } } diff --git a/src/main/java/br/com/imd/cadwork/util/ValidatorUtil.java b/src/main/java/br/com/imd/cadwork/util/ValidatorUtil.java index 260acd3..bc0ba7f 100644 --- a/src/main/java/br/com/imd/cadwork/util/ValidatorUtil.java +++ b/src/main/java/br/com/imd/cadwork/util/ValidatorUtil.java @@ -8,7 +8,11 @@ import com.google.gson.Gson; public class ValidatorUtil { - + /** + * Gera Json com os errors obtidos + * @param allErrors Lis - lista de objeto com todos os errors + * @return String - Json com os errors + */ public static String gerarErrorsInJson(List allErrors) { StringBuilder message = new StringBuilder(); @@ -25,10 +29,13 @@ public static String gerarErrorsInJson(List allErrors) { return new Gson().toJson(errors); } - + /** + * Verifica se um objeto está vazio + * @param o Object - um objeto qualquer + * @return boolean - se o objeto está vazio ou não + */ public static boolean isEmpty(Object o) { //Validar de forma genérica quando um objeto está ou não válido return true; } - } From fa03b7cf882b782166c1887a32d597a689f2a179 Mon Sep 17 00:00:00 2001 From: Miguel Date: Sat, 9 Jun 2018 19:29:07 -0300 Subject: [PATCH 06/23] =?UTF-8?q?Crit=C3=A9rio=20para=20localiza=C3=A7?= =?UTF-8?q?=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/CriterioLocalizacao.java | 23 +++++++++++++++++++ .../core/localizavel/model/Localizavel.java | 4 ++-- .../db/migration/V1_create_schema.sql | 2 -- 3 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 src/main/java/br/com/imd/cadwork/core/localizavel/model/CriterioLocalizacao.java diff --git a/src/main/java/br/com/imd/cadwork/core/localizavel/model/CriterioLocalizacao.java b/src/main/java/br/com/imd/cadwork/core/localizavel/model/CriterioLocalizacao.java new file mode 100644 index 0000000..2c5e335 --- /dev/null +++ b/src/main/java/br/com/imd/cadwork/core/localizavel/model/CriterioLocalizacao.java @@ -0,0 +1,23 @@ +package br.com.imd.cadwork.core.localizavel.model; + +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; +import javax.persistence.MappedSuperclass; +import javax.persistence.Table; + +import br.com.imd.cadwork.core.dao.GenericDomainException; + +@MappedSuperclass +@Table(name = "localizavel", schema = "criterio") +@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) +public abstract class CriterioLocalizacao { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + protected Long id; + + protected abstract void validaCriterios() throws GenericDomainException; +} diff --git a/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java b/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java index b24d021..aa9f89e 100644 --- a/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java +++ b/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java @@ -2,12 +2,12 @@ import javax.persistence.CascadeType; import javax.persistence.Column; -import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; +import javax.persistence.MappedSuperclass; import javax.persistence.OneToOne; import javax.persistence.Table; @@ -20,7 +20,7 @@ * @author Miguel * @version 0.2 */ -@Entity +@MappedSuperclass @Table(name = "localizavel", schema = "localizavel") @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) public abstract class Localizavel { diff --git a/src/main/resources/db/migration/V1_create_schema.sql b/src/main/resources/db/migration/V1_create_schema.sql index 1a217ce..7d8d688 100644 --- a/src/main/resources/db/migration/V1_create_schema.sql +++ b/src/main/resources/db/migration/V1_create_schema.sql @@ -1,4 +1,2 @@ -CREATE SCHEMA IF NOT EXISTS ENSINO; -CREATE SCHEMA IF NOT EXISTS ESCOLA; CREATE SCHEMA IF NOT EXISTS LOCALIZACAO; CREATE SCHEMA IF NOT EXISTS LOCALIZAVEL; From 254bef3ce3f44ec87c52776b169989de2a3f605d Mon Sep 17 00:00:00 2001 From: Miguel Date: Sat, 9 Jun 2018 19:56:56 -0300 Subject: [PATCH 07/23] =?UTF-8?q?Adicionado=20coment=C3=A1rios=20em=20clas?= =?UTF-8?q?ses=20faltantes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/exception/ManipuladorException.java | 32 +++++++++++++++++++ .../core/localizacao/dao/MunicipioDAO.java | 4 +-- .../domain/TipoLocalizacaoEnum.java | 1 - .../resources/EnderecoResources.java | 9 +++--- .../resources/MunicipioResources.java | 8 ++--- .../model/CriterioLocalizacao.java | 31 ++++++++++++++++++ .../core/localizavel/model/Localizavel.java | 4 +-- 7 files changed, 75 insertions(+), 14 deletions(-) diff --git a/src/main/java/br/com/imd/cadwork/core/exception/ManipuladorException.java b/src/main/java/br/com/imd/cadwork/core/exception/ManipuladorException.java index 31b547a..b5308ca 100644 --- a/src/main/java/br/com/imd/cadwork/core/exception/ManipuladorException.java +++ b/src/main/java/br/com/imd/cadwork/core/exception/ManipuladorException.java @@ -14,9 +14,21 @@ import br.com.imd.cadwork.core.service.exception.ResourceEmptyException; import br.com.imd.cadwork.core.service.exception.ResourceNotFoundException; +/** + * Handler que atua entre as classes de exceções + * Formatando as exceções emitidas e as padronizando + * @author miguel + * + */ @ControllerAdvice public class ManipuladorException { + /** + * Captura a exceção lançada do tipo {@link br.com.imd.cadwork.core.service.exception.ResourceEmptyException} + * @param e Exceção lançada + * @param request Requisição que causou a exceção + * @return ResponseEntity - Response com a mensagem correspondente a exceção + */ @ExceptionHandler(ResourceEmptyException.class) public ResponseEntity manipuladorResourceEmptyException(GenericServiceException e, HttpServletRequest request) { @@ -26,6 +38,12 @@ public ResponseEntity manipuladorResourceEmptyException(GenericSer return ResponseEntity.status(HttpStatus.NOT_ACCEPTABLE).body(error); } + /** + * Captura a exceção lançada do tipo {@link br.com.imd.cadwork.core.service.exception.ResourceNotFoundException} + * @param e Exceção lançada + * @param request Requisição que causou a exceção + * @return ResponseEntity<{@link br.com.imd.cadwork.core.config.DetalheError}> - Response com a mensagem correspondente a exceção + */ @ExceptionHandler(ResourceNotFoundException.class) public ResponseEntity manipuladorResourceNotFoundException(GenericServiceException e, HttpServletRequest request) { @@ -35,6 +53,13 @@ public ResponseEntity manipuladorResourceNotFoundException(Generic return ResponseEntity.status(HttpStatus.NOT_FOUND).body(error); } + /** + * Captura a exceção lançada do tipo {@link br.com.imd.cadwork.core.service.exception.ResourceConflictException} + * @param e Exceção lançada + * @param request Requisição que causou a exceção + * @return ResponseEntity<{@link br.com.imd.cadwork.core.config.DetalheError}> - + * Response com a mensagem correspondente a exceção + */ @ExceptionHandler(ResourceConflictException.class) public ResponseEntity manipuladorResourceConflictException(GenericServiceException e, HttpServletRequest request) { @@ -44,6 +69,13 @@ public ResponseEntity manipuladorResourceConflictException(Generic return ResponseEntity.status(HttpStatus.CONFLICT).body(error); } + /** + * Procedimento que dada uma exceção juntamente com o status da mensagem pertencente ao protocolo http, + * formata uma mensagem padrão de resposta ao usuário + * @param status - Status correspondente ao verbo http + * @param e exceção lançada + * @return {@link br.com.imd.cadwork.core.config.DetalheError} - Mensagem padronizada referente a exceção recebida + */ private DetalheError gerarMensagemError(HttpStatus status, GenericServiceException e) { DetalheError error = new DetalheError(); diff --git a/src/main/java/br/com/imd/cadwork/core/localizacao/dao/MunicipioDAO.java b/src/main/java/br/com/imd/cadwork/core/localizacao/dao/MunicipioDAO.java index c27b9c5..83754ff 100644 --- a/src/main/java/br/com/imd/cadwork/core/localizacao/dao/MunicipioDAO.java +++ b/src/main/java/br/com/imd/cadwork/core/localizacao/dao/MunicipioDAO.java @@ -14,13 +14,13 @@ */ @Repository public interface MunicipioDAO extends GenericDAO { + /** * Retorna um único municipio para o nome e estado passados * @param nome String - nome do municipio a ser pesquisado * @param estado String - estado ao qual o municipio pertence - * @return Optional - optional de um municipio + * @return Optional<{@link br.com.imd.cadwork.core.localizacao.domain.Municipio}> - optional de um municipio */ - @Query(value="SELECT * FROM localizacao.municipio m WHERE m.nome = :nome and m.estado = :#{#estado} LIMIT 1", nativeQuery = true) Optional findTop1MunicipioByNomeAndEstado(@Param("nome")String nome, @Param("estado") String estado); diff --git a/src/main/java/br/com/imd/cadwork/core/localizacao/domain/TipoLocalizacaoEnum.java b/src/main/java/br/com/imd/cadwork/core/localizacao/domain/TipoLocalizacaoEnum.java index 4c17b6e..77dee53 100644 --- a/src/main/java/br/com/imd/cadwork/core/localizacao/domain/TipoLocalizacaoEnum.java +++ b/src/main/java/br/com/imd/cadwork/core/localizacao/domain/TipoLocalizacaoEnum.java @@ -10,7 +10,6 @@ * @version 0.2 * */ - @ApiModel public enum TipoLocalizacaoEnum { diff --git a/src/main/java/br/com/imd/cadwork/core/localizacao/resources/EnderecoResources.java b/src/main/java/br/com/imd/cadwork/core/localizacao/resources/EnderecoResources.java index 5fa1437..9b31402 100644 --- a/src/main/java/br/com/imd/cadwork/core/localizacao/resources/EnderecoResources.java +++ b/src/main/java/br/com/imd/cadwork/core/localizacao/resources/EnderecoResources.java @@ -9,7 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -21,12 +20,12 @@ import br.com.imd.cadwork.core.service.exception.GenericServiceException; import br.com.imd.cadwork.localizacao.service.EnderecoService; import io.swagger.annotations.Api; + /** * Classe que faz o controle dos endpoints da API com os dados de enderecos * @author Welligton Miguel * */ -@CrossOrigin(origins = "http://localhost:4200", maxAge = 3600) @RestController @RequestMapping(value = "/enderecos", produces = "application/json") @Api(tags = "Enderecos", description = "Operações pertinentes a endereços") @@ -36,7 +35,7 @@ public class EnderecoResources { EnderecoService enderecoService; /** * Retorna todos os enderecos da API - * @return List - todos os municipios da API + * @return List<{@link br.com.imd.cadwork.core.localizacao.domain.Endereco}> - todos os endereços da API * @throws GenericServiceException */ @RequestMapping(method = RequestMethod.GET) @@ -48,7 +47,7 @@ public List listar() throws GenericServiceException { * Função para adicionar um endereco na API * @param municipio Endereco - endereco para ser adicionado na API * @param resultado BindingResult - * @return ResponseEntity + * @return ResponseEntity<{@link java.lang.String}> * @throws GenericServiceException */ @RequestMapping(method = RequestMethod.POST) @@ -64,7 +63,7 @@ public ResponseEntity salvar(@Valid @RequestBody Endereco endereco, Bind /** * Retorna endereco associado a um determinado id * @param id Long - id para retornar endereco associado - * @return Optional - caso o id seja válido retorna um endereco + * @return Optional<{@link br.com.imd.cadwork.core.localizacao.domain.Endereco}> - caso o id seja válido retorna um endereco * @throws GenericServiceException */ @RequestMapping(value = "/{id}", method = RequestMethod.GET) diff --git a/src/main/java/br/com/imd/cadwork/core/localizacao/resources/MunicipioResources.java b/src/main/java/br/com/imd/cadwork/core/localizacao/resources/MunicipioResources.java index b830051..3fcb7e8 100644 --- a/src/main/java/br/com/imd/cadwork/core/localizacao/resources/MunicipioResources.java +++ b/src/main/java/br/com/imd/cadwork/core/localizacao/resources/MunicipioResources.java @@ -32,12 +32,12 @@ public class MunicipioResources { @Autowired MunicipioService municipioService; + /** * Retorna todos os municipios da API - * @return List - todos os municipios da API + * @return List<{@link br.com.imd.cadwork.core.localizacao.domain.Municipio}> - todos os municipios da API * @throws GenericServiceException */ - @RequestMapping(method = RequestMethod.GET) public List listar() throws GenericServiceException { return municipioService.listar(); @@ -47,7 +47,7 @@ public List listar() throws GenericServiceException { * Função para adicionar municipio na API * @param municipio Municipio - municipio para ser adicionado na API * @param resultado BindingResult - * @return ResponseEntity + * @return ResponseEntity<{@link java.lang.String}> * @throws GenericServiceException */ @RequestMapping(method = RequestMethod.POST) @@ -62,7 +62,7 @@ public ResponseEntity salvar(@Valid @RequestBody Municipio municipio, Bi /** * Retorna municipio associado a um determinado id * @param id Long - id para retornar municipio associado - * @return Optional - caso o id seja válido retorna um muninipio + * @return Optional<{@link br.com.imd.cadwork.core.localizacao.domain.Municipio}> - caso o id seja válido retorna um muninipio * @throws GenericServiceException */ @RequestMapping(value = "/{id}", method = RequestMethod.GET) diff --git a/src/main/java/br/com/imd/cadwork/core/localizavel/model/CriterioLocalizacao.java b/src/main/java/br/com/imd/cadwork/core/localizavel/model/CriterioLocalizacao.java index 2c5e335..f79470c 100644 --- a/src/main/java/br/com/imd/cadwork/core/localizavel/model/CriterioLocalizacao.java +++ b/src/main/java/br/com/imd/cadwork/core/localizavel/model/CriterioLocalizacao.java @@ -10,6 +10,12 @@ import br.com.imd.cadwork.core.dao.GenericDomainException; +/** + * Classe abstrata para ser base do modelo do critério de localização + * + * @author Miguel + * @version 0.1 + */ @MappedSuperclass @Table(name = "localizavel", schema = "criterio") @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) @@ -19,5 +25,30 @@ public abstract class CriterioLocalizacao { @GeneratedValue(strategy = GenerationType.AUTO) protected Long id; + /** + * Método para retorno do id de uma instância do critério + * + * @return Long - Valor do id + */ + public Long getId() { + return id; + } + + /** + * Altera o valor do id de uma instância do critério + * + * @param id + * Long - Novo valor do id + */ + public void setId(Long id) { + this.id = id; + } + + + /** + * Método que será implementado pelas classes filhas com finalidade de limitar os possíveis + * itens localizáveis + * @throws GenericDomainException + */ protected abstract void validaCriterios() throws GenericDomainException; } diff --git a/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java b/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java index aa9f89e..ef19cd0 100644 --- a/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java +++ b/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java @@ -69,7 +69,6 @@ public Long getId() { * @param id * Long - Novo valor do id */ - public void setId(Long id) { this.id = id; } @@ -94,7 +93,8 @@ public void setNome(String nome) { } /** - * Método que valida o localizavel + * Método que será implentado pelas classes filhas com finalidade + * de validar a existência do localizável * * @return boolean - Se o localizavel é válido ou não */ From d325829beccdcd9339eb1e2d37e747af8f0aa600 Mon Sep 17 00:00:00 2001 From: Miguel Date: Sat, 9 Jun 2018 20:37:06 -0300 Subject: [PATCH 08/23] =?UTF-8?q?permitindo=20a=20gera=C3=A7=C3=A3o=20de?= =?UTF-8?q?=20javadoc=20pelo=20maven?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index c079023..f1d4981 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 @@ -38,13 +39,13 @@ - - - - com.google.code.gson - gson - - + + + + com.google.code.gson + gson + + @@ -73,9 +74,9 @@ - io.springfox - springfox-swagger-ui - 2.8.0 + io.springfox + springfox-swagger-ui + 2.8.0 @@ -92,6 +93,25 @@ org.springframework.boot spring-boot-maven-plugin + + + + org.apache.maven.plugins + maven-javadoc-plugin + + false + + + + attach-javadocs + + jar + + + + + + From 741d99075e5c7603b9c953d32920fbb2508703e2 Mon Sep 17 00:00:00 2001 From: Miguel Date: Mon, 11 Jun 2018 22:54:32 -0300 Subject: [PATCH 09/23] =?UTF-8?q?Modulo=20core=20aplica=C3=A7=C3=A3o=20mul?= =?UTF-8?q?ti-project?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db.mv.db | Bin 12288 -> 0 bytes db/test.mv.db | Bin 77824 -> 0 bytes db/test.trace.db | 968 ------------------ pom.xml | 22 +- .../imd/cadwork/CadworkapiApplication.java | 8 - .../cadwork/core/config/SwaggerConfig.java | 11 +- .../db/migration/V1_create_schema.sql | 1 + .../cadwork/CadworkapiApplicationTests.java | 16 - 8 files changed, 16 insertions(+), 1010 deletions(-) delete mode 100644 db.mv.db delete mode 100644 db/test.mv.db delete mode 100644 db/test.trace.db delete mode 100644 src/test/java/br/com/imd/cadwork/CadworkapiApplicationTests.java diff --git a/db.mv.db b/db.mv.db deleted file mode 100644 index fd9bf7816eb23a3e153476b120021975139d5fbc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 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 zEvE6(SessionFactoryImpl.java:312) - at org.hibernate.boot.internal.SessionFactoryBuilderImpl.build(SessionFactoryBuilderImpl.java:460) - at org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl.build(EntityManagerFactoryBuilderImpl.java:892) - at org.springframework.orm.jpa.vendor.SpringHibernateJpaPersistenceProvider.createContainerEntityManagerFactory(SpringHibernateJpaPersistenceProvider.java:57) - at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.createNativeEntityManagerFactory(LocalContainerEntityManagerFactoryBean.java:365) - at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.buildNativeEntityManagerFactory(AbstractEntityManagerFactoryBean.java:388) - at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.afterPropertiesSet(AbstractEntityManagerFactoryBean.java:377) - at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.afterPropertiesSet(LocalContainerEntityManagerFactoryBean.java:341) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1769) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1706) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:583) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:502) - at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:312) - at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:228) - at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:310) - at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:200) - at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1085) - at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:858) - at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:549) - at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:140) - at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:752) - at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:388) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:327) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:1246) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:1234) - at br.com.imd.cadwork.CadworkapiApplication.main(CadworkapiApplication.java:13) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:498) - at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) -2018-06-08 16:28:03 jdbc[3]: exception -org.h2.jdbc.JdbcSQLException: Schema "LOCALIZAVEL" not found; SQL statement: -alter table localizavel.localizavel add constraint FK3654djd12nc3k4hvpcvn9p1d5 foreign key (endereco_id_endereco) references localizacao.endereco [90079-196] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:345) - at org.h2.message.DbException.get(DbException.java:179) - at org.h2.message.DbException.get(DbException.java:155) - at org.h2.command.Parser.getSchema(Parser.java:688) - at org.h2.command.Parser.getSchema(Parser.java:694) - at org.h2.command.Parser.parseAlterTable(Parser.java:5608) - at org.h2.command.Parser.parseAlter(Parser.java:5007) - at org.h2.command.Parser.parsePrepared(Parser.java:348) - at org.h2.command.Parser.parse(Parser.java:321) - at org.h2.command.Parser.parse(Parser.java:293) - at org.h2.command.Parser.prepareCommand(Parser.java:258) - at org.h2.engine.Session.prepareLocal(Session.java:578) - at org.h2.engine.Session.prepareCommand(Session.java:519) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1204) - at org.h2.jdbc.JdbcStatement.executeInternal(JdbcStatement.java:176) - at org.h2.jdbc.JdbcStatement.execute(JdbcStatement.java:164) - at com.zaxxer.hikari.pool.ProxyStatement.execute(ProxyStatement.java:95) - at com.zaxxer.hikari.pool.HikariProxyStatement.execute(HikariProxyStatement.java) - at org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase.accept(GenerationTargetToDatabase.java:54) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlString(AbstractSchemaMigrator.java:559) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlStrings(AbstractSchemaMigrator.java:504) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applyForeignKeys(AbstractSchemaMigrator.java:433) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.performMigration(AbstractSchemaMigrator.java:249) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.doMigration(AbstractSchemaMigrator.java:114) - at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.performDatabaseAction(SchemaManagementToolCoordinator.java:183) - at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.process(SchemaManagementToolCoordinator.java:72) - at org.hibernate.internal.SessionFactoryImpl.(SessionFactoryImpl.java:312) - at org.hibernate.boot.internal.SessionFactoryBuilderImpl.build(SessionFactoryBuilderImpl.java:460) - at org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl.build(EntityManagerFactoryBuilderImpl.java:892) - at org.springframework.orm.jpa.vendor.SpringHibernateJpaPersistenceProvider.createContainerEntityManagerFactory(SpringHibernateJpaPersistenceProvider.java:57) - at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.createNativeEntityManagerFactory(LocalContainerEntityManagerFactoryBean.java:365) - at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.buildNativeEntityManagerFactory(AbstractEntityManagerFactoryBean.java:388) - at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.afterPropertiesSet(AbstractEntityManagerFactoryBean.java:377) - at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.afterPropertiesSet(LocalContainerEntityManagerFactoryBean.java:341) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1769) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1706) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:583) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:502) - at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:312) - at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:228) - at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:310) - at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:200) - at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1085) - at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:858) - at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:549) - at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:140) - at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:752) - at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:388) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:327) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:1246) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:1234) - at br.com.imd.cadwork.CadworkapiApplication.main(CadworkapiApplication.java:13) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:498) - at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) -2018-06-08 16:28:07 jdbc[3]: exception -org.h2.jdbc.JdbcSQLException: Schema "LOCALIZAVEL" not found; SQL statement: -create table localizavel.localizavel (id bigint not null, nome varchar(255), endereco_id_endereco bigint, primary key (id)) [90079-196] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:345) - at org.h2.message.DbException.get(DbException.java:179) - at org.h2.message.DbException.get(DbException.java:155) - at org.h2.command.Parser.getSchema(Parser.java:688) - at org.h2.command.Parser.getSchema(Parser.java:694) - at org.h2.command.Parser.parseCreateTable(Parser.java:6138) - at org.h2.command.Parser.parseCreate(Parser.java:4351) - at org.h2.command.Parser.parsePrepared(Parser.java:366) - at org.h2.command.Parser.parse(Parser.java:321) - at org.h2.command.Parser.parse(Parser.java:293) - at org.h2.command.Parser.prepareCommand(Parser.java:258) - at org.h2.engine.Session.prepareLocal(Session.java:578) - at org.h2.engine.Session.prepareCommand(Session.java:519) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1204) - at org.h2.jdbc.JdbcStatement.executeInternal(JdbcStatement.java:176) - at org.h2.jdbc.JdbcStatement.execute(JdbcStatement.java:164) - at com.zaxxer.hikari.pool.ProxyStatement.execute(ProxyStatement.java:95) - at com.zaxxer.hikari.pool.HikariProxyStatement.execute(HikariProxyStatement.java) - at org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase.accept(GenerationTargetToDatabase.java:54) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlString(AbstractSchemaMigrator.java:559) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlStrings(AbstractSchemaMigrator.java:504) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.createTable(AbstractSchemaMigrator.java:277) - at org.hibernate.tool.schema.internal.GroupedSchemaMigratorImpl.performTablesMigration(GroupedSchemaMigratorImpl.java:71) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.performMigration(AbstractSchemaMigrator.java:207) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.doMigration(AbstractSchemaMigrator.java:114) - at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.performDatabaseAction(SchemaManagementToolCoordinator.java:183) - at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.process(SchemaManagementToolCoordinator.java:72) - at org.hibernate.internal.SessionFactoryImpl.(SessionFactoryImpl.java:312) - at org.hibernate.boot.internal.SessionFactoryBuilderImpl.build(SessionFactoryBuilderImpl.java:460) - at org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl.build(EntityManagerFactoryBuilderImpl.java:892) - at org.springframework.orm.jpa.vendor.SpringHibernateJpaPersistenceProvider.createContainerEntityManagerFactory(SpringHibernateJpaPersistenceProvider.java:57) - at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.createNativeEntityManagerFactory(LocalContainerEntityManagerFactoryBean.java:365) - at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.buildNativeEntityManagerFactory(AbstractEntityManagerFactoryBean.java:388) - at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.afterPropertiesSet(AbstractEntityManagerFactoryBean.java:377) - at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.afterPropertiesSet(LocalContainerEntityManagerFactoryBean.java:341) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1769) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1706) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:583) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:502) - at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:312) - at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:228) - at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:310) - at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:200) - at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1085) - at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:858) - at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:549) - at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:140) - at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:752) - at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:388) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:327) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:1246) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:1234) - at br.com.imd.cadwork.CadworkapiApplication.main(CadworkapiApplication.java:13) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:498) - at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) -2018-06-08 16:28:07 jdbc[3]: exception -org.h2.jdbc.JdbcSQLException: Schema "LOCALIZAVEL" not found; SQL statement: -alter table localizavel.localizavel add constraint FK3654djd12nc3k4hvpcvn9p1d5 foreign key (endereco_id_endereco) references localizacao.endereco [90079-196] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:345) - at org.h2.message.DbException.get(DbException.java:179) - at org.h2.message.DbException.get(DbException.java:155) - at org.h2.command.Parser.getSchema(Parser.java:688) - at org.h2.command.Parser.getSchema(Parser.java:694) - at org.h2.command.Parser.parseAlterTable(Parser.java:5608) - at org.h2.command.Parser.parseAlter(Parser.java:5007) - at org.h2.command.Parser.parsePrepared(Parser.java:348) - at org.h2.command.Parser.parse(Parser.java:321) - at org.h2.command.Parser.parse(Parser.java:293) - at org.h2.command.Parser.prepareCommand(Parser.java:258) - at org.h2.engine.Session.prepareLocal(Session.java:578) - at org.h2.engine.Session.prepareCommand(Session.java:519) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1204) - at org.h2.jdbc.JdbcStatement.executeInternal(JdbcStatement.java:176) - at org.h2.jdbc.JdbcStatement.execute(JdbcStatement.java:164) - at com.zaxxer.hikari.pool.ProxyStatement.execute(ProxyStatement.java:95) - at com.zaxxer.hikari.pool.HikariProxyStatement.execute(HikariProxyStatement.java) - at org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase.accept(GenerationTargetToDatabase.java:54) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlString(AbstractSchemaMigrator.java:559) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlStrings(AbstractSchemaMigrator.java:504) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applyForeignKeys(AbstractSchemaMigrator.java:433) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.performMigration(AbstractSchemaMigrator.java:249) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.doMigration(AbstractSchemaMigrator.java:114) - at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.performDatabaseAction(SchemaManagementToolCoordinator.java:183) - at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.process(SchemaManagementToolCoordinator.java:72) - at org.hibernate.internal.SessionFactoryImpl.(SessionFactoryImpl.java:312) - at org.hibernate.boot.internal.SessionFactoryBuilderImpl.build(SessionFactoryBuilderImpl.java:460) - at org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl.build(EntityManagerFactoryBuilderImpl.java:892) - at org.springframework.orm.jpa.vendor.SpringHibernateJpaPersistenceProvider.createContainerEntityManagerFactory(SpringHibernateJpaPersistenceProvider.java:57) - at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.createNativeEntityManagerFactory(LocalContainerEntityManagerFactoryBean.java:365) - at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.buildNativeEntityManagerFactory(AbstractEntityManagerFactoryBean.java:388) - at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.afterPropertiesSet(AbstractEntityManagerFactoryBean.java:377) - at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.afterPropertiesSet(LocalContainerEntityManagerFactoryBean.java:341) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1769) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1706) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:583) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:502) - at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:312) - at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:228) - at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:310) - at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:200) - at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1085) - at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:858) - at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:549) - at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:140) - at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:752) - at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:388) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:327) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:1246) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:1234) - at br.com.imd.cadwork.CadworkapiApplication.main(CadworkapiApplication.java:13) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:498) - at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) -2018-06-08 16:29:31 jdbc[3]: exception -org.h2.jdbc.JdbcSQLException: Schema "LOCALIZAVEL" not found; SQL statement: -create table localizavel.localizavel (id bigint not null, nome varchar(255), endereco_id_endereco bigint, primary key (id)) [90079-196] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:345) - at org.h2.message.DbException.get(DbException.java:179) - at org.h2.message.DbException.get(DbException.java:155) - at org.h2.command.Parser.getSchema(Parser.java:688) - at org.h2.command.Parser.getSchema(Parser.java:694) - at org.h2.command.Parser.parseCreateTable(Parser.java:6138) - at org.h2.command.Parser.parseCreate(Parser.java:4351) - at org.h2.command.Parser.parsePrepared(Parser.java:366) - at org.h2.command.Parser.parse(Parser.java:321) - at org.h2.command.Parser.parse(Parser.java:293) - at org.h2.command.Parser.prepareCommand(Parser.java:258) - at org.h2.engine.Session.prepareLocal(Session.java:578) - at org.h2.engine.Session.prepareCommand(Session.java:519) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1204) - at org.h2.jdbc.JdbcStatement.executeInternal(JdbcStatement.java:176) - at org.h2.jdbc.JdbcStatement.execute(JdbcStatement.java:164) - at com.zaxxer.hikari.pool.ProxyStatement.execute(ProxyStatement.java:95) - at com.zaxxer.hikari.pool.HikariProxyStatement.execute(HikariProxyStatement.java) - at org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase.accept(GenerationTargetToDatabase.java:54) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlString(AbstractSchemaMigrator.java:559) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlStrings(AbstractSchemaMigrator.java:504) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.createTable(AbstractSchemaMigrator.java:277) - at org.hibernate.tool.schema.internal.GroupedSchemaMigratorImpl.performTablesMigration(GroupedSchemaMigratorImpl.java:71) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.performMigration(AbstractSchemaMigrator.java:207) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.doMigration(AbstractSchemaMigrator.java:114) - at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.performDatabaseAction(SchemaManagementToolCoordinator.java:183) - at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.process(SchemaManagementToolCoordinator.java:72) - at org.hibernate.internal.SessionFactoryImpl.(SessionFactoryImpl.java:312) - at org.hibernate.boot.internal.SessionFactoryBuilderImpl.build(SessionFactoryBuilderImpl.java:460) - at org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl.build(EntityManagerFactoryBuilderImpl.java:892) - at org.springframework.orm.jpa.vendor.SpringHibernateJpaPersistenceProvider.createContainerEntityManagerFactory(SpringHibernateJpaPersistenceProvider.java:57) - at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.createNativeEntityManagerFactory(LocalContainerEntityManagerFactoryBean.java:365) - at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.buildNativeEntityManagerFactory(AbstractEntityManagerFactoryBean.java:388) - at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.afterPropertiesSet(AbstractEntityManagerFactoryBean.java:377) - at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.afterPropertiesSet(LocalContainerEntityManagerFactoryBean.java:341) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1769) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1706) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:583) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:502) - at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:312) - at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:228) - at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:310) - at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:200) - at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1085) - at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:858) - at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:549) - at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:140) - at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:752) - at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:388) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:327) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:1246) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:1234) - at br.com.imd.cadwork.CadworkapiApplication.main(CadworkapiApplication.java:13) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:498) - at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) -2018-06-08 16:29:31 jdbc[3]: exception -org.h2.jdbc.JdbcSQLException: Schema "LOCALIZAVEL" not found; SQL statement: -alter table localizavel.localizavel add constraint FK3654djd12nc3k4hvpcvn9p1d5 foreign key (endereco_id_endereco) references localizacao.endereco [90079-196] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:345) - at org.h2.message.DbException.get(DbException.java:179) - at org.h2.message.DbException.get(DbException.java:155) - at org.h2.command.Parser.getSchema(Parser.java:688) - at org.h2.command.Parser.getSchema(Parser.java:694) - at org.h2.command.Parser.parseAlterTable(Parser.java:5608) - at org.h2.command.Parser.parseAlter(Parser.java:5007) - at org.h2.command.Parser.parsePrepared(Parser.java:348) - at org.h2.command.Parser.parse(Parser.java:321) - at org.h2.command.Parser.parse(Parser.java:293) - at org.h2.command.Parser.prepareCommand(Parser.java:258) - at org.h2.engine.Session.prepareLocal(Session.java:578) - at org.h2.engine.Session.prepareCommand(Session.java:519) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1204) - at org.h2.jdbc.JdbcStatement.executeInternal(JdbcStatement.java:176) - at org.h2.jdbc.JdbcStatement.execute(JdbcStatement.java:164) - at com.zaxxer.hikari.pool.ProxyStatement.execute(ProxyStatement.java:95) - at com.zaxxer.hikari.pool.HikariProxyStatement.execute(HikariProxyStatement.java) - at org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase.accept(GenerationTargetToDatabase.java:54) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlString(AbstractSchemaMigrator.java:559) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlStrings(AbstractSchemaMigrator.java:504) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applyForeignKeys(AbstractSchemaMigrator.java:433) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.performMigration(AbstractSchemaMigrator.java:249) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.doMigration(AbstractSchemaMigrator.java:114) - at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.performDatabaseAction(SchemaManagementToolCoordinator.java:183) - at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.process(SchemaManagementToolCoordinator.java:72) - at org.hibernate.internal.SessionFactoryImpl.(SessionFactoryImpl.java:312) - at org.hibernate.boot.internal.SessionFactoryBuilderImpl.build(SessionFactoryBuilderImpl.java:460) - at org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl.build(EntityManagerFactoryBuilderImpl.java:892) - at org.springframework.orm.jpa.vendor.SpringHibernateJpaPersistenceProvider.createContainerEntityManagerFactory(SpringHibernateJpaPersistenceProvider.java:57) - at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.createNativeEntityManagerFactory(LocalContainerEntityManagerFactoryBean.java:365) - at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.buildNativeEntityManagerFactory(AbstractEntityManagerFactoryBean.java:388) - at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.afterPropertiesSet(AbstractEntityManagerFactoryBean.java:377) - at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.afterPropertiesSet(LocalContainerEntityManagerFactoryBean.java:341) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1769) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1706) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:583) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:502) - at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:312) - at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:228) - at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:310) - at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:200) - at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1085) - at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:858) - at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:549) - at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:140) - at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:752) - at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:388) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:327) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:1246) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:1234) - at br.com.imd.cadwork.CadworkapiApplication.main(CadworkapiApplication.java:13) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:498) - at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) -2018-06-08 16:30:22 jdbc[3]: exception -org.h2.jdbc.JdbcSQLException: Schema "LOCALIZAVEL" not found; SQL statement: -create table localizavel.localizavel (id bigint not null, nome varchar(255), endereco_id_endereco bigint, primary key (id)) [90079-196] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:345) - at org.h2.message.DbException.get(DbException.java:179) - at org.h2.message.DbException.get(DbException.java:155) - at org.h2.command.Parser.getSchema(Parser.java:688) - at org.h2.command.Parser.getSchema(Parser.java:694) - at org.h2.command.Parser.parseCreateTable(Parser.java:6138) - at org.h2.command.Parser.parseCreate(Parser.java:4351) - at org.h2.command.Parser.parsePrepared(Parser.java:366) - at org.h2.command.Parser.parse(Parser.java:321) - at org.h2.command.Parser.parse(Parser.java:293) - at org.h2.command.Parser.prepareCommand(Parser.java:258) - at org.h2.engine.Session.prepareLocal(Session.java:578) - at org.h2.engine.Session.prepareCommand(Session.java:519) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1204) - at org.h2.jdbc.JdbcStatement.executeInternal(JdbcStatement.java:176) - at org.h2.jdbc.JdbcStatement.execute(JdbcStatement.java:164) - at com.zaxxer.hikari.pool.ProxyStatement.execute(ProxyStatement.java:95) - at com.zaxxer.hikari.pool.HikariProxyStatement.execute(HikariProxyStatement.java) - at org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase.accept(GenerationTargetToDatabase.java:54) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlString(AbstractSchemaMigrator.java:559) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlStrings(AbstractSchemaMigrator.java:504) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.createTable(AbstractSchemaMigrator.java:277) - at org.hibernate.tool.schema.internal.GroupedSchemaMigratorImpl.performTablesMigration(GroupedSchemaMigratorImpl.java:71) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.performMigration(AbstractSchemaMigrator.java:207) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.doMigration(AbstractSchemaMigrator.java:114) - at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.performDatabaseAction(SchemaManagementToolCoordinator.java:183) - at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.process(SchemaManagementToolCoordinator.java:72) - at org.hibernate.internal.SessionFactoryImpl.(SessionFactoryImpl.java:312) - at org.hibernate.boot.internal.SessionFactoryBuilderImpl.build(SessionFactoryBuilderImpl.java:460) - at org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl.build(EntityManagerFactoryBuilderImpl.java:892) - at org.springframework.orm.jpa.vendor.SpringHibernateJpaPersistenceProvider.createContainerEntityManagerFactory(SpringHibernateJpaPersistenceProvider.java:57) - at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.createNativeEntityManagerFactory(LocalContainerEntityManagerFactoryBean.java:365) - at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.buildNativeEntityManagerFactory(AbstractEntityManagerFactoryBean.java:388) - at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.afterPropertiesSet(AbstractEntityManagerFactoryBean.java:377) - at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.afterPropertiesSet(LocalContainerEntityManagerFactoryBean.java:341) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1769) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1706) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:583) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:502) - at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:312) - at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:228) - at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:310) - at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:200) - at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1085) - at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:858) - at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:549) - at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:140) - at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:752) - at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:388) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:327) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:1246) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:1234) - at br.com.imd.cadwork.CadworkapiApplication.main(CadworkapiApplication.java:13) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:498) - at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) -2018-06-08 16:30:22 jdbc[3]: exception -org.h2.jdbc.JdbcSQLException: Schema "LOCALIZAVEL" not found; SQL statement: -alter table localizavel.localizavel add constraint FK3654djd12nc3k4hvpcvn9p1d5 foreign key (endereco_id_endereco) references localizacao.endereco [90079-196] - at org.h2.message.DbException.getJdbcSQLException(DbException.java:345) - at org.h2.message.DbException.get(DbException.java:179) - at org.h2.message.DbException.get(DbException.java:155) - at org.h2.command.Parser.getSchema(Parser.java:688) - at org.h2.command.Parser.getSchema(Parser.java:694) - at org.h2.command.Parser.parseAlterTable(Parser.java:5608) - at org.h2.command.Parser.parseAlter(Parser.java:5007) - at org.h2.command.Parser.parsePrepared(Parser.java:348) - at org.h2.command.Parser.parse(Parser.java:321) - at org.h2.command.Parser.parse(Parser.java:293) - at org.h2.command.Parser.prepareCommand(Parser.java:258) - at org.h2.engine.Session.prepareLocal(Session.java:578) - at org.h2.engine.Session.prepareCommand(Session.java:519) - at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1204) - at org.h2.jdbc.JdbcStatement.executeInternal(JdbcStatement.java:176) - at org.h2.jdbc.JdbcStatement.execute(JdbcStatement.java:164) - at com.zaxxer.hikari.pool.ProxyStatement.execute(ProxyStatement.java:95) - at com.zaxxer.hikari.pool.HikariProxyStatement.execute(HikariProxyStatement.java) - at org.hibernate.tool.schema.internal.exec.GenerationTargetToDatabase.accept(GenerationTargetToDatabase.java:54) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlString(AbstractSchemaMigrator.java:559) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applySqlStrings(AbstractSchemaMigrator.java:504) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.applyForeignKeys(AbstractSchemaMigrator.java:433) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.performMigration(AbstractSchemaMigrator.java:249) - at org.hibernate.tool.schema.internal.AbstractSchemaMigrator.doMigration(AbstractSchemaMigrator.java:114) - at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.performDatabaseAction(SchemaManagementToolCoordinator.java:183) - at org.hibernate.tool.schema.spi.SchemaManagementToolCoordinator.process(SchemaManagementToolCoordinator.java:72) - at org.hibernate.internal.SessionFactoryImpl.(SessionFactoryImpl.java:312) - at org.hibernate.boot.internal.SessionFactoryBuilderImpl.build(SessionFactoryBuilderImpl.java:460) - at org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl.build(EntityManagerFactoryBuilderImpl.java:892) - at org.springframework.orm.jpa.vendor.SpringHibernateJpaPersistenceProvider.createContainerEntityManagerFactory(SpringHibernateJpaPersistenceProvider.java:57) - at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.createNativeEntityManagerFactory(LocalContainerEntityManagerFactoryBean.java:365) - at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.buildNativeEntityManagerFactory(AbstractEntityManagerFactoryBean.java:388) - at org.springframework.orm.jpa.AbstractEntityManagerFactoryBean.afterPropertiesSet(AbstractEntityManagerFactoryBean.java:377) - at org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean.afterPropertiesSet(LocalContainerEntityManagerFactoryBean.java:341) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1769) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1706) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:583) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:502) - at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:312) - at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:228) - at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:310) - at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:200) - at org.springframework.context.support.AbstractApplicationContext.getBean(AbstractApplicationContext.java:1085) - at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:858) - at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:549) - at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:140) - at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:752) - at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:388) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:327) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:1246) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:1234) - at br.com.imd.cadwork.CadworkapiApplication.main(CadworkapiApplication.java:13) - at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) - at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) - at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) - at java.lang.reflect.Method.invoke(Method.java:498) - at org.springframework.boot.devtools.restart.RestartLauncher.run(RestartLauncher.java:49) diff --git a/pom.xml b/pom.xml index f1d4981..a93dc9f 100644 --- a/pom.xml +++ b/pom.xml @@ -9,22 +9,13 @@ 0.0.1-SNAPSHOT jar - cadworkapi - API de geocalização de Recursos - org.springframework.boot spring-boot-starter-parent - 2.0.0.RELEASE + 2.0.2.RELEASE - - UTF-8 - UTF-8 - 1.8 - - @@ -90,11 +81,10 @@ - org.springframework.boot - spring-boot-maven-plugin + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 - - org.apache.maven.plugins maven-javadoc-plugin @@ -107,13 +97,11 @@ jar - + - - diff --git a/src/main/java/br/com/imd/cadwork/CadworkapiApplication.java b/src/main/java/br/com/imd/cadwork/CadworkapiApplication.java index b9c02b7..7f61c90 100644 --- a/src/main/java/br/com/imd/cadwork/CadworkapiApplication.java +++ b/src/main/java/br/com/imd/cadwork/CadworkapiApplication.java @@ -12,13 +12,5 @@ @EnableSwagger2 @SpringBootApplication public class CadworkapiApplication { - /** - * Função main do framework responsável por inicializar a aplicação - * - * @param args String - argumentos passados na inicialização do programa - */ - public static void main(String[] args) { - SpringApplication.run(CadworkapiApplication.class, args); - } } diff --git a/src/main/java/br/com/imd/cadwork/core/config/SwaggerConfig.java b/src/main/java/br/com/imd/cadwork/core/config/SwaggerConfig.java index 77fb979..9162ac2 100644 --- a/src/main/java/br/com/imd/cadwork/core/config/SwaggerConfig.java +++ b/src/main/java/br/com/imd/cadwork/core/config/SwaggerConfig.java @@ -8,6 +8,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.http.ResponseEntity; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; import springfox.documentation.builders.PathSelectors; @@ -37,7 +38,7 @@ public class SwaggerConfig extends WebMvcConfigurationSupport{ public Docket api() { return new Docket(DocumentationType.SWAGGER_2) .select() - .apis(RequestHandlerSelectors.basePackage("br.com.imd.cadwork")) + .apis(RequestHandlerSelectors.basePackage("br.com.imd")) .paths(PathSelectors.any()) .build() .pathMapping("/") @@ -76,5 +77,13 @@ protected void addResourceHandlers(ResourceHandlerRegistry registry) { registry.addResourceHandler("/webjars/**") .addResourceLocations("classpath:/META-INF/resources/webjars/"); } + + @Override + public void addViewControllers(ViewControllerRegistry registry) { + registry.addRedirectViewController("/null/v2/api-docs", "/v2/api-docs"); + registry.addRedirectViewController("/null/swagger-resources/configuration/ui", "/swagger-resources/configuration/ui"); + registry.addRedirectViewController("/null/swagger-resources/configuration/security", "/swagger-resources/configuration/security"); + registry.addRedirectViewController("/null/swagger-resources", "/swagger-resources"); + } } \ No newline at end of file diff --git a/src/main/resources/db/migration/V1_create_schema.sql b/src/main/resources/db/migration/V1_create_schema.sql index 7d8d688..70046c0 100644 --- a/src/main/resources/db/migration/V1_create_schema.sql +++ b/src/main/resources/db/migration/V1_create_schema.sql @@ -1,2 +1,3 @@ CREATE SCHEMA IF NOT EXISTS LOCALIZACAO; CREATE SCHEMA IF NOT EXISTS LOCALIZAVEL; +CREATE SCHEMA IF NOT EXISTS CRITERIO; diff --git a/src/test/java/br/com/imd/cadwork/CadworkapiApplicationTests.java b/src/test/java/br/com/imd/cadwork/CadworkapiApplicationTests.java deleted file mode 100644 index 7ba2cdb..0000000 --- a/src/test/java/br/com/imd/cadwork/CadworkapiApplicationTests.java +++ /dev/null @@ -1,16 +0,0 @@ -package br.com.imd.cadwork; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class CadworkapiApplicationTests { - - @Test - public void contextLoads() { - } - -} From 7e9d811b8143b944164e738cd26f418b3a4a15bd Mon Sep 17 00:00:00 2001 From: Miguel Date: Tue, 12 Jun 2018 00:39:55 -0300 Subject: [PATCH 10/23] Classe Localizavel acoplada a core --- .../core/localizavel/model/Localizavel.java | 4 +- .../localizavel/model/LocalizavelDAO.java | 13 ++++++ .../cadwork/core/service/GenericService.java | 41 ++++++++++++------- .../core/service/LocalizavelService.java | 13 ++++++ .../localizacao/service/EnderecoService.java | 6 ++- .../localizacao/service/MunicipioService.java | 11 +++-- 6 files changed, 64 insertions(+), 24 deletions(-) create mode 100644 src/main/java/br/com/imd/cadwork/core/localizavel/model/LocalizavelDAO.java create mode 100644 src/main/java/br/com/imd/cadwork/core/service/LocalizavelService.java diff --git a/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java b/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java index ef19cd0..00dc4c3 100644 --- a/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java +++ b/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java @@ -2,12 +2,12 @@ import javax.persistence.CascadeType; import javax.persistence.Column; +import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; -import javax.persistence.MappedSuperclass; import javax.persistence.OneToOne; import javax.persistence.Table; @@ -20,7 +20,7 @@ * @author Miguel * @version 0.2 */ -@MappedSuperclass +@Entity @Table(name = "localizavel", schema = "localizavel") @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) public abstract class Localizavel { diff --git a/src/main/java/br/com/imd/cadwork/core/localizavel/model/LocalizavelDAO.java b/src/main/java/br/com/imd/cadwork/core/localizavel/model/LocalizavelDAO.java new file mode 100644 index 0000000..d962287 --- /dev/null +++ b/src/main/java/br/com/imd/cadwork/core/localizavel/model/LocalizavelDAO.java @@ -0,0 +1,13 @@ +package br.com.imd.cadwork.core.localizavel.model; + +import org.springframework.data.repository.NoRepositoryBean; + +import br.com.imd.cadwork.core.dao.GenericDAO; + +/** + * {@inheritDoc}} + */ +@NoRepositoryBean +public interface LocalizavelDAO extends GenericDAO { + +} diff --git a/src/main/java/br/com/imd/cadwork/core/service/GenericService.java b/src/main/java/br/com/imd/cadwork/core/service/GenericService.java index 0ddd9b5..7719b0b 100644 --- a/src/main/java/br/com/imd/cadwork/core/service/GenericService.java +++ b/src/main/java/br/com/imd/cadwork/core/service/GenericService.java @@ -11,8 +11,10 @@ import br.com.imd.cadwork.core.service.exception.ResourceEmptyException; import br.com.imd.cadwork.core.service.exception.ResourceNotFoundException; import br.com.imd.cadwork.util.ValidatorUtil; -/** + +/** * Service genérico para objetos do framework + * * @author Welligton Miguel * * @param @@ -21,25 +23,28 @@ public abstract class GenericService { protected GenericDAO dao; + /** - * Retorna uma lista de objetos + * Retorna uma lista de objetos + * * @return List - lista de objetos * @throws GenericServiceException */ protected List listar() throws GenericServiceException { List entidades = dao.findAll(); - - entidades.stream() - .findAny() - .orElseThrow(ResourceNotFoundException::new); - + + entidades.stream().findAny().orElseThrow(ResourceNotFoundException::new); + return entidades; } /** * Procedimento para salvar um objeto - * @param t T - objeto para ser salvo - * @param resultado BindingResult - resultados da operação + * + * @param t + * T - objeto para ser salvo + * @param resultado + * BindingResult - resultados da operação * @throws GenericServiceException */ protected void salvar(T t, BindingResult resultado) throws GenericServiceException { @@ -48,7 +53,7 @@ protected void salvar(T t, BindingResult resultado) throws GenericServiceExcepti throw new ResourceEmptyException(ValidatorUtil.gerarErrorsInJson(resultado.getAllErrors())); } verificaExistencia(t); - + try { dao.save(t); @@ -61,23 +66,31 @@ protected void salvar(T t, BindingResult resultado) throws GenericServiceExcepti /** * Busca um onjeto por um id passado - * @param id Long - busca um objeto pelo id + * + * @param id + * Long - busca um objeto pelo id * @return Optional - retorna o objeto caso exista * @throws GenericServiceException */ protected Optional buscar(Long id) throws GenericServiceException { T entidade = dao.findById(id).orElseThrow(ResourceNotFoundException::new); - + return Optional.of(entidade); } + /** * Função abstrata que tem que ser injetada para setar o dao correto - * @param dao GenericDAO + * + * @param dao + * GenericDAO */ protected abstract void setDao(GenericDAO dao); + /** * Verifica a existência de um determinado objeto no BD - * @param t T - objeto passado + * + * @param t + * T - objeto passado * @throws GenericServiceException */ protected abstract void verificaExistencia(T t) throws GenericServiceException; diff --git a/src/main/java/br/com/imd/cadwork/core/service/LocalizavelService.java b/src/main/java/br/com/imd/cadwork/core/service/LocalizavelService.java new file mode 100644 index 0000000..8cf4fce --- /dev/null +++ b/src/main/java/br/com/imd/cadwork/core/service/LocalizavelService.java @@ -0,0 +1,13 @@ +package br.com.imd.cadwork.core.service; + +import org.springframework.stereotype.Service; + +import br.com.imd.cadwork.core.localizavel.model.Localizavel; + +/** + * {@inheritDoc}} + */ +@Service +public abstract class LocalizavelService extends GenericService { + +} diff --git a/src/main/java/br/com/imd/cadwork/localizacao/service/EnderecoService.java b/src/main/java/br/com/imd/cadwork/localizacao/service/EnderecoService.java index 030b49a..d9341a6 100644 --- a/src/main/java/br/com/imd/cadwork/localizacao/service/EnderecoService.java +++ b/src/main/java/br/com/imd/cadwork/localizacao/service/EnderecoService.java @@ -55,11 +55,13 @@ public void setDao(GenericDAO dao) { */ @Override protected void verificaExistencia(Endereco endereco) throws GenericServiceException { - ((EnderecoDAO) dao). + if (((EnderecoDAO) dao). findEnderecoByLatitudeAndLongitude( endereco.getLatitude(), endereco.getLongitude() - ).orElseThrow(ResourceConflictException::new); + ).isPresent()){ + throw new ResourceConflictException(); + } } } diff --git a/src/main/java/br/com/imd/cadwork/localizacao/service/MunicipioService.java b/src/main/java/br/com/imd/cadwork/localizacao/service/MunicipioService.java index 695c321..d630293 100644 --- a/src/main/java/br/com/imd/cadwork/localizacao/service/MunicipioService.java +++ b/src/main/java/br/com/imd/cadwork/localizacao/service/MunicipioService.java @@ -48,17 +48,16 @@ public Optional buscar(Long id) throws GenericServiceException { public void setDao(GenericDAO dao) { super.dao = dao; } + /** * {@inheritDoc}} */ @Override protected void verificaExistencia(Municipio municipio) throws GenericServiceException { - ((MunicipioDAO) dao) - .findTop1MunicipioByNomeAndEstado( - municipio.getNome(), - municipio.getEstado().name() - ).orElseThrow(ResourceConflictException::new); - + if (((MunicipioDAO) dao).findTop1MunicipioByNomeAndEstado( municipio.getNome(), + municipio.getEstado().name()).isPresent()) { + throw new ResourceConflictException(); + } } } From 0822624c1a128dda96168b39ca0b866dc540dd13 Mon Sep 17 00:00:00 2001 From: Miguel Date: Wed, 13 Jun 2018 16:23:41 -0300 Subject: [PATCH 11/23] Bean Validation em campos fixos do core --- pom.xml | 3 +-- .../com/imd/cadwork/core/localizacao/domain/Endereco.java | 8 ++++---- .../imd/cadwork/core/localizavel/model/Localizavel.java | 5 ++++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index a93dc9f..0bafffc 100644 --- a/pom.xml +++ b/pom.xml @@ -82,8 +82,7 @@ org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 + maven-compiler-plugin org.apache.maven.plugins diff --git a/src/main/java/br/com/imd/cadwork/core/localizacao/domain/Endereco.java b/src/main/java/br/com/imd/cadwork/core/localizacao/domain/Endereco.java index db31f0e..37a506b 100644 --- a/src/main/java/br/com/imd/cadwork/core/localizacao/domain/Endereco.java +++ b/src/main/java/br/com/imd/cadwork/core/localizacao/domain/Endereco.java @@ -61,12 +61,12 @@ public class Endereco { @NotNull(message = "Campo nulo") @ApiModelProperty(notes = "Latitude da Instituição", required = true) @Column(nullable = true) - private double latitude; + private Double latitude; @NotNull(message = "Campo nulo") @ApiModelProperty(notes = "Longitude da Instituição", required = true) @Column(nullable = true) - private double longitude; + private Double longitude; @NotNull(message = "Campo nulo") @Column(name = "tipo_localizacao") @@ -207,7 +207,7 @@ public void setCep(String cep) { * * @return double - latitude de um endereço */ - public double getLatitude() { + public Double getLatitude() { return latitude; } @@ -217,7 +217,7 @@ public double getLatitude() { * @param latitude * double - nova latitude de um endereço */ - public void setLatitude(double latitude) { + public void setLatitude(Double latitude) { this.latitude = latitude; } diff --git a/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java b/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java index 00dc4c3..a1552a8 100644 --- a/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java +++ b/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java @@ -10,6 +10,7 @@ import javax.persistence.InheritanceType; import javax.persistence.OneToOne; import javax.persistence.Table; +import javax.validation.constraints.NotNull; import br.com.imd.cadwork.core.localizacao.domain.Endereco; @@ -29,10 +30,12 @@ public abstract class Localizavel { @GeneratedValue(strategy = GenerationType.AUTO) protected Long id; + @NotNull @Column protected String nome; - @OneToOne(cascade = CascadeType.ALL) + @NotNull + @OneToOne(cascade = CascadeType.REFRESH) protected Endereco endereco; /** From 3aa42dd85a6e22eb7d2992f09fd403589dc59654 Mon Sep 17 00:00:00 2001 From: Miguel Date: Sat, 16 Jun 2018 23:12:58 -0300 Subject: [PATCH 12/23] =?UTF-8?q?Adicionado=20service=20de=20comunica?= =?UTF-8?q?=C3=A7=C3=A3o=20com=20google=20place?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 ++ .../imd/cadwork/CadworkapiApplication.java | 1 - .../core/exception/ManipuladorException.java | 16 ++++ .../resources/EnderecoResources.java | 3 +- .../resources/MunicipioResources.java | 2 +- .../localizacao/service/EnderecoService.java | 19 ++-- .../localizacao/service/MunicipioService.java | 2 +- .../core/localizavel/dao/LocalizavelDAO.java | 20 ++++ .../localizavel/model/LocalizavelDAO.java | 13 --- .../cadwork/core/service/GenericService.java | 4 + .../cadwork/core/service/GoogleService.java | 91 +++++++++++++++++++ .../core/service/LocalizavelService.java | 21 +++++ .../com/imd/cadwork/util/GoogleValidator.java | 35 +++++++ .../com/imd/cadwork/util/ValidatorUtil.java | 1 + .../ConvertLocalizavelException.java | 18 ++++ src/main/resources/application.properties | 4 +- 16 files changed, 230 insertions(+), 26 deletions(-) rename src/main/java/br/com/imd/cadwork/{ => core}/localizacao/service/EnderecoService.java (75%) rename src/main/java/br/com/imd/cadwork/{ => core}/localizacao/service/MunicipioService.java (96%) create mode 100644 src/main/java/br/com/imd/cadwork/core/localizavel/dao/LocalizavelDAO.java delete mode 100644 src/main/java/br/com/imd/cadwork/core/localizavel/model/LocalizavelDAO.java create mode 100644 src/main/java/br/com/imd/cadwork/core/service/GoogleService.java create mode 100644 src/main/java/br/com/imd/cadwork/util/GoogleValidator.java create mode 100644 src/main/java/br/com/imd/cadwork/util/exception/ConvertLocalizavelException.java diff --git a/pom.xml b/pom.xml index 0bafffc..baea3d5 100644 --- a/pom.xml +++ b/pom.xml @@ -75,6 +75,12 @@ org.springframework.boot spring-boot-starter-thymeleaf + + + se.walkercrou + google-places-api-java + 2.1.2 + diff --git a/src/main/java/br/com/imd/cadwork/CadworkapiApplication.java b/src/main/java/br/com/imd/cadwork/CadworkapiApplication.java index 7f61c90..32f2f5e 100644 --- a/src/main/java/br/com/imd/cadwork/CadworkapiApplication.java +++ b/src/main/java/br/com/imd/cadwork/CadworkapiApplication.java @@ -1,6 +1,5 @@ package br.com.imd.cadwork; -import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import springfox.documentation.swagger2.annotations.EnableSwagger2; diff --git a/src/main/java/br/com/imd/cadwork/core/exception/ManipuladorException.java b/src/main/java/br/com/imd/cadwork/core/exception/ManipuladorException.java index b5308ca..66226ba 100644 --- a/src/main/java/br/com/imd/cadwork/core/exception/ManipuladorException.java +++ b/src/main/java/br/com/imd/cadwork/core/exception/ManipuladorException.java @@ -13,6 +13,7 @@ import br.com.imd.cadwork.core.service.exception.ResourceConflictException; import br.com.imd.cadwork.core.service.exception.ResourceEmptyException; import br.com.imd.cadwork.core.service.exception.ResourceNotFoundException; +import br.com.imd.cadwork.util.exception.ConvertLocalizavelException; /** * Handler que atua entre as classes de exceções @@ -69,6 +70,21 @@ public ResponseEntity manipuladorResourceConflictException(Generic return ResponseEntity.status(HttpStatus.CONFLICT).body(error); } + /** + * Captura a exceção lançada do tipo {@link br.com.imd.cadwork.util.exception.ConvertLocalizavelException} + * @param e Exceção lançada + * @param request Requisição que causou a exceção + * @return ResponseEntity<{@link br.com.imd.cadwork.core.config.DetalheError}> - + * Response com a mensagem correspondente a exceção + */ + @ExceptionHandler(ConvertLocalizavelException.class) + public ResponseEntity manipuladorResourceConvertLocalizavelException(GenericServiceException e, + HttpServletRequest request) { + + DetalheError error = gerarMensagemError(HttpStatus.INTERNAL_SERVER_ERROR, e); + + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error); + } /** * Procedimento que dada uma exceção juntamente com o status da mensagem pertencente ao protocolo http, * formata uma mensagem padrão de resposta ao usuário diff --git a/src/main/java/br/com/imd/cadwork/core/localizacao/resources/EnderecoResources.java b/src/main/java/br/com/imd/cadwork/core/localizacao/resources/EnderecoResources.java index 9b31402..3e31eb7 100644 --- a/src/main/java/br/com/imd/cadwork/core/localizacao/resources/EnderecoResources.java +++ b/src/main/java/br/com/imd/cadwork/core/localizacao/resources/EnderecoResources.java @@ -17,8 +17,8 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import br.com.imd.cadwork.core.localizacao.domain.Endereco; +import br.com.imd.cadwork.core.localizacao.service.EnderecoService; import br.com.imd.cadwork.core.service.exception.GenericServiceException; -import br.com.imd.cadwork.localizacao.service.EnderecoService; import io.swagger.annotations.Api; /** @@ -70,5 +70,4 @@ public ResponseEntity salvar(@Valid @RequestBody Endereco endereco, Bind public Optional buscar(@PathVariable("id") Long id) throws GenericServiceException { return enderecoService.buscar(id); } - } diff --git a/src/main/java/br/com/imd/cadwork/core/localizacao/resources/MunicipioResources.java b/src/main/java/br/com/imd/cadwork/core/localizacao/resources/MunicipioResources.java index 3fcb7e8..acd3363 100644 --- a/src/main/java/br/com/imd/cadwork/core/localizacao/resources/MunicipioResources.java +++ b/src/main/java/br/com/imd/cadwork/core/localizacao/resources/MunicipioResources.java @@ -17,8 +17,8 @@ import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import br.com.imd.cadwork.core.localizacao.domain.Municipio; +import br.com.imd.cadwork.core.localizacao.service.MunicipioService; import br.com.imd.cadwork.core.service.exception.GenericServiceException; -import br.com.imd.cadwork.localizacao.service.MunicipioService; import io.swagger.annotations.Api; /** * Classe que faz o controle dos endpoints da API com os dados de municipios diff --git a/src/main/java/br/com/imd/cadwork/localizacao/service/EnderecoService.java b/src/main/java/br/com/imd/cadwork/core/localizacao/service/EnderecoService.java similarity index 75% rename from src/main/java/br/com/imd/cadwork/localizacao/service/EnderecoService.java rename to src/main/java/br/com/imd/cadwork/core/localizacao/service/EnderecoService.java index d9341a6..1dd19e6 100644 --- a/src/main/java/br/com/imd/cadwork/localizacao/service/EnderecoService.java +++ b/src/main/java/br/com/imd/cadwork/core/localizacao/service/EnderecoService.java @@ -1,4 +1,4 @@ -package br.com.imd.cadwork.localizacao.service; +package br.com.imd.cadwork.core.localizacao.service; import java.util.List; import java.util.Optional; @@ -55,13 +55,20 @@ public void setDao(GenericDAO dao) { */ @Override protected void verificaExistencia(Endereco endereco) throws GenericServiceException { - if (((EnderecoDAO) dao). - findEnderecoByLatitudeAndLongitude( - endereco.getLatitude(), - endereco.getLongitude() - ).isPresent()){ + if (buscaEnderecosLatLng(endereco.getLatitude(),endereco.getLongitude()).isPresent()){ throw new ResourceConflictException(); } } + /** + * Função que busca um endereço baseado na latitude e longitude + * @param lat + * @param lng + * @return Optional - retorna o endereço caso exista + */ + public Optional buscaEnderecosLatLng(Double lat, Double lng){ + return ((EnderecoDAO) dao).findEnderecoByLatitudeAndLongitude(lat,lng); + + } + } diff --git a/src/main/java/br/com/imd/cadwork/localizacao/service/MunicipioService.java b/src/main/java/br/com/imd/cadwork/core/localizacao/service/MunicipioService.java similarity index 96% rename from src/main/java/br/com/imd/cadwork/localizacao/service/MunicipioService.java rename to src/main/java/br/com/imd/cadwork/core/localizacao/service/MunicipioService.java index d630293..a89e33c 100644 --- a/src/main/java/br/com/imd/cadwork/localizacao/service/MunicipioService.java +++ b/src/main/java/br/com/imd/cadwork/core/localizacao/service/MunicipioService.java @@ -1,4 +1,4 @@ -package br.com.imd.cadwork.localizacao.service; +package br.com.imd.cadwork.core.localizacao.service; import java.util.List; import java.util.Optional; diff --git a/src/main/java/br/com/imd/cadwork/core/localizavel/dao/LocalizavelDAO.java b/src/main/java/br/com/imd/cadwork/core/localizavel/dao/LocalizavelDAO.java new file mode 100644 index 0000000..24709d3 --- /dev/null +++ b/src/main/java/br/com/imd/cadwork/core/localizavel/dao/LocalizavelDAO.java @@ -0,0 +1,20 @@ +package br.com.imd.cadwork.core.localizavel.dao; + +import java.util.Optional; + +import org.springframework.data.repository.NoRepositoryBean; +import org.springframework.data.repository.query.Param; + +import br.com.imd.cadwork.core.dao.GenericDAO; +import br.com.imd.cadwork.core.localizacao.domain.Endereco; +import br.com.imd.cadwork.core.localizavel.model.Localizavel; + +/** + * {@inheritDoc}} + */ +@NoRepositoryBean +public interface LocalizavelDAO extends GenericDAO { + + public Optional findByEndereco(@Param("endereco")Endereco endereco); + +} diff --git a/src/main/java/br/com/imd/cadwork/core/localizavel/model/LocalizavelDAO.java b/src/main/java/br/com/imd/cadwork/core/localizavel/model/LocalizavelDAO.java deleted file mode 100644 index d962287..0000000 --- a/src/main/java/br/com/imd/cadwork/core/localizavel/model/LocalizavelDAO.java +++ /dev/null @@ -1,13 +0,0 @@ -package br.com.imd.cadwork.core.localizavel.model; - -import org.springframework.data.repository.NoRepositoryBean; - -import br.com.imd.cadwork.core.dao.GenericDAO; - -/** - * {@inheritDoc}} - */ -@NoRepositoryBean -public interface LocalizavelDAO extends GenericDAO { - -} diff --git a/src/main/java/br/com/imd/cadwork/core/service/GenericService.java b/src/main/java/br/com/imd/cadwork/core/service/GenericService.java index 7719b0b..2f0fa7a 100644 --- a/src/main/java/br/com/imd/cadwork/core/service/GenericService.java +++ b/src/main/java/br/com/imd/cadwork/core/service/GenericService.java @@ -3,6 +3,7 @@ import java.util.List; import java.util.Optional; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.validation.BindingResult; @@ -23,6 +24,9 @@ public abstract class GenericService { protected GenericDAO dao; + + @Autowired + protected GoogleService googleService; /** * Retorna uma lista de objetos diff --git a/src/main/java/br/com/imd/cadwork/core/service/GoogleService.java b/src/main/java/br/com/imd/cadwork/core/service/GoogleService.java new file mode 100644 index 0000000..3000728 --- /dev/null +++ b/src/main/java/br/com/imd/cadwork/core/service/GoogleService.java @@ -0,0 +1,91 @@ +package br.com.imd.cadwork.core.service; + +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import org.springframework.stereotype.Service; + +import br.com.imd.cadwork.core.service.exception.GenericServiceException; +import br.com.imd.cadwork.util.GoogleValidator; +import br.com.imd.cadwork.util.exception.ConvertLocalizavelException; +import se.walkercrou.places.GooglePlaces; +import se.walkercrou.places.Param; +import se.walkercrou.places.Place; + +@Service +public class GoogleService { + + public static final String KEY = "AIzaSyD5SoFyhcb2eNCBW4PFwpt56BwMXWGDbHc"; + public static final int RAIO_BUSCA = 50000; + public static final int LIMITE_BUSCA = 20; + + public static final String ESCOLA = "escola"; + + private GooglePlaces cliente; + + public GoogleService() { + cliente = new GooglePlaces(KEY); + } + + /** + * Busca especificamente o localizavel pertencente a latitude e longitude + * @param lat + * @param lng + * @param extraParams + * @return + * @throws GenericServiceException + * @throws ConvertLocalizavelException + */ + public List> getLocalizavelByLatLng(Double lat, Double lng,Param... extraParams) + throws GenericServiceException, ConvertLocalizavelException { + + return getLocalizaveisProximos(lat,lng,RAIO_BUSCA,1,extraParams); + } + + /** + * Retorna uma lista com 20 localizáveis mais próximos no raio de 50.000 metros + * @param lat + * @param lng + * @param extraParams + * @return + * @throws GenericServiceException + * @throws ConvertLocalizavelException + */ + public List> getLocalizaveisByLatLng(Double lat, Double lng,Param... extraParams) + throws GenericServiceException, ConvertLocalizavelException { + + return getLocalizaveisProximos(lat,lng,RAIO_BUSCA,LIMITE_BUSCA,extraParams); + } + + + /** + * Core da consulta por latitude e longitude, invoca o service da google + * informando os parâmetros necessários + * @param lat + * @param lng + * @param raio + * @param limite + * @param extraParams + * @return + * @throws GenericServiceException + * @throws ConvertLocalizavelException + */ + private List> getLocalizaveisProximos(Double lat, Double lng, int raio, int limite, + Param... extraParams) throws GenericServiceException, ConvertLocalizavelException { + List places = new LinkedList<>(); + + places = cliente.getNearbyPlaces(lat,lng,raio,limite,extraParams); + + return GoogleValidator.convertPlaceInMapLocalizavel(places); + } + + + public GooglePlaces getCliente() { + return cliente; + } + + public void setCliente(GooglePlaces cliente) { + this.cliente = cliente; + } +} diff --git a/src/main/java/br/com/imd/cadwork/core/service/LocalizavelService.java b/src/main/java/br/com/imd/cadwork/core/service/LocalizavelService.java index 8cf4fce..1108a54 100644 --- a/src/main/java/br/com/imd/cadwork/core/service/LocalizavelService.java +++ b/src/main/java/br/com/imd/cadwork/core/service/LocalizavelService.java @@ -1,8 +1,14 @@ package br.com.imd.cadwork.core.service; +import java.util.List; +import java.util.Map; + import org.springframework.stereotype.Service; import br.com.imd.cadwork.core.localizavel.model.Localizavel; +import br.com.imd.cadwork.core.service.exception.GenericServiceException; +import br.com.imd.cadwork.util.exception.ConvertLocalizavelException; +import se.walkercrou.places.Param; /** * {@inheritDoc}} @@ -10,4 +16,19 @@ @Service public abstract class LocalizavelService extends GenericService { + /** + * Função que retorna uma lista de localizáveis cadastrados no google baseado na latitude e longitude + * @param lat - Latitude do localizável + * @param lng - Longitude do localizável + * @param keyword - Plavra chave a ser pesquisada + * @return - Lista contendo os localizáveis disponíveis + * @throws GenericServiceException + * @throws ConvertLocalizavelException + */ + protected List> buscarLocalizaveisProximos(Double lat, Double lng, String keyword) throws GenericServiceException, ConvertLocalizavelException { + Param param = new Param("keyword"); + param.value(keyword); + + return googleService.getLocalizaveisByLatLng(lat, lng, param); + } } diff --git a/src/main/java/br/com/imd/cadwork/util/GoogleValidator.java b/src/main/java/br/com/imd/cadwork/util/GoogleValidator.java new file mode 100644 index 0000000..e346046 --- /dev/null +++ b/src/main/java/br/com/imd/cadwork/util/GoogleValidator.java @@ -0,0 +1,35 @@ +package br.com.imd.cadwork.util; + +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import br.com.imd.cadwork.util.exception.ConvertLocalizavelException; +import se.walkercrou.places.Place; + +public class GoogleValidator { + + public static List> convertPlaceInMapLocalizavel(List places) throws ConvertLocalizavelException { + + List> listMapLocalizavel = new LinkedList<>(); + try { + places.stream().forEach(place -> listMapLocalizavel.add(getEnderecoInPlace(place))); + }catch (Exception e) { + throw new ConvertLocalizavelException(); + } + + return listMapLocalizavel; + } + + private static Map getEnderecoInPlace(Place place) { + Map mapLocalizavel = new HashMap<>(); + mapLocalizavel.put("nome", place.getName()); + mapLocalizavel.put("latitude", place.getLatitude()); + mapLocalizavel.put("longitude", place.getLongitude()); + mapLocalizavel.put("logradouro",place.getVicinity()); + + return mapLocalizavel; + } + +} diff --git a/src/main/java/br/com/imd/cadwork/util/ValidatorUtil.java b/src/main/java/br/com/imd/cadwork/util/ValidatorUtil.java index bc0ba7f..a116a1a 100644 --- a/src/main/java/br/com/imd/cadwork/util/ValidatorUtil.java +++ b/src/main/java/br/com/imd/cadwork/util/ValidatorUtil.java @@ -38,4 +38,5 @@ public static boolean isEmpty(Object o) { //Validar de forma genérica quando um objeto está ou não válido return true; } + } diff --git a/src/main/java/br/com/imd/cadwork/util/exception/ConvertLocalizavelException.java b/src/main/java/br/com/imd/cadwork/util/exception/ConvertLocalizavelException.java new file mode 100644 index 0000000..ca583f2 --- /dev/null +++ b/src/main/java/br/com/imd/cadwork/util/exception/ConvertLocalizavelException.java @@ -0,0 +1,18 @@ +package br.com.imd.cadwork.util.exception; + +public class ConvertLocalizavelException extends Exception{ + + private static final long serialVersionUID = 1L; + + public ConvertLocalizavelException() { + super("Erro ao converter Localizável"); + } + + /** + * Construtor + * @param message String - mensagem da exceção + */ + public ConvertLocalizavelException(String message) { + super(message); + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 3e56158..c1f7ef1 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -11,8 +11,8 @@ spring.datasource.driver-class-name=org.h2.Driver ### confiruração JPA spring.jpa.show-sql=true -spring.jpa.hibernate.ddl-auto=update +spring.jpa.hibernate.ddl-auto=create-drop ### Acesso ao BD spring.datasource.username=sa -spring.datasource.password= \ No newline at end of file +spring.datasource.password= From 8a20c14f086d3c54bd8a553e8d485c9aee3b1b91 Mon Sep 17 00:00:00 2001 From: Miguel Date: Mon, 18 Jun 2018 15:47:39 -0300 Subject: [PATCH 13/23] Diminuindo raio de alcance de buscas --- .../java/br/com/imd/cadwork/core/service/GoogleService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/br/com/imd/cadwork/core/service/GoogleService.java b/src/main/java/br/com/imd/cadwork/core/service/GoogleService.java index 3000728..03d6f31 100644 --- a/src/main/java/br/com/imd/cadwork/core/service/GoogleService.java +++ b/src/main/java/br/com/imd/cadwork/core/service/GoogleService.java @@ -17,7 +17,7 @@ public class GoogleService { public static final String KEY = "AIzaSyD5SoFyhcb2eNCBW4PFwpt56BwMXWGDbHc"; - public static final int RAIO_BUSCA = 50000; + public static final int RAIO_BUSCA = 500; public static final int LIMITE_BUSCA = 20; public static final String ESCOLA = "escola"; From 01ec34ec3e1d69e070e9c6cd66fc7b2b4f56acb4 Mon Sep 17 00:00:00 2001 From: Miguel Date: Tue, 19 Jun 2018 01:09:30 -0300 Subject: [PATCH 14/23] =?UTF-8?q?Vincula=C3=A7=C3=A3o=20de=20crit=C3=A9rio?= =?UTF-8?q?=20para=20busca=20e=20persist=C3=AAncia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/CriterioLocalizacao.java | 36 +++++++++++++++--- .../core/localizavel/model/Localizavel.java | 37 ++++++++++++++++++- .../cadwork/core/service/GoogleService.java | 22 ++++++++++- 3 files changed, 87 insertions(+), 8 deletions(-) diff --git a/src/main/java/br/com/imd/cadwork/core/localizavel/model/CriterioLocalizacao.java b/src/main/java/br/com/imd/cadwork/core/localizavel/model/CriterioLocalizacao.java index f79470c..4230db6 100644 --- a/src/main/java/br/com/imd/cadwork/core/localizavel/model/CriterioLocalizacao.java +++ b/src/main/java/br/com/imd/cadwork/core/localizavel/model/CriterioLocalizacao.java @@ -1,12 +1,14 @@ package br.com.imd.cadwork.core.localizavel.model; +import javax.persistence.Column; +import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; -import javax.persistence.MappedSuperclass; import javax.persistence.Table; +import javax.validation.constraints.NotNull; import br.com.imd.cadwork.core.dao.GenericDomainException; @@ -16,8 +18,8 @@ * @author Miguel * @version 0.1 */ -@MappedSuperclass -@Table(name = "localizavel", schema = "criterio") +@Entity +@Table(name = "criterio", schema = "criterio") @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) public abstract class CriterioLocalizacao { @@ -25,8 +27,12 @@ public abstract class CriterioLocalizacao { @GeneratedValue(strategy = GenerationType.AUTO) protected Long id; + @NotNull + @Column + protected String nome; + /** - * Método para retorno do id de uma instância do critério + * Método para retorno do id de uma instância de Etapa de Ensino * * @return Long - Valor do id */ @@ -35,7 +41,7 @@ public Long getId() { } /** - * Altera o valor do id de uma instância do critério + * Altera o valor do id de uma instância de Etapa de Ensino * * @param id * Long - Novo valor do id @@ -44,11 +50,29 @@ public void setId(Long id) { this.id = id; } + /** + * Retorna o nome da etapa de ensino + * + * @return String - Nome da etapa de ensino + */ + public String getNome() { + return nome; + } + + /** + * Altera o nome da etapa de ensino + * + * @param nome + * String - Novo nome da etapa de ensino + */ + public void setNome(String nome) { + this.nome = nome; + } /** * Método que será implementado pelas classes filhas com finalidade de limitar os possíveis * itens localizáveis * @throws GenericDomainException */ - protected abstract void validaCriterios() throws GenericDomainException; + public abstract void validaCriterios() throws GenericDomainException; } diff --git a/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java b/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java index a1552a8..36855ad 100644 --- a/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java +++ b/src/main/java/br/com/imd/cadwork/core/localizavel/model/Localizavel.java @@ -1,5 +1,7 @@ package br.com.imd.cadwork.core.localizavel.model; +import java.util.List; + import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; @@ -8,11 +10,16 @@ import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; +import javax.persistence.OneToMany; import javax.persistence.OneToOne; import javax.persistence.Table; +import javax.persistence.Transient; import javax.validation.constraints.NotNull; +import org.springframework.beans.factory.annotation.Autowired; + import br.com.imd.cadwork.core.localizacao.domain.Endereco; +import br.com.imd.cadwork.core.service.GoogleService; /** * Classe abstrata para ser base do modelo do item localizavel @@ -38,6 +45,15 @@ public abstract class Localizavel { @OneToOne(cascade = CascadeType.REFRESH) protected Endereco endereco; + @NotNull + @OneToMany(cascade = CascadeType.ALL) + @Autowired + protected List criterioLocalizacao; + + + @Transient + @Autowired + protected GoogleService google; /** * Retorna o endereço do localizavel * @@ -95,12 +111,31 @@ public void setNome(String nome) { this.nome = nome; } + /** + * Método que retorna o critério de localização + * + * @return List - Critério para buscar o localizavel + */ + public List getCriterioLocalizacao() { + return criterioLocalizacao; + } + + /** + * Método que modifica o tipo de critério para buscar o localizavel + * + * @param criterioLocalizacao + * List - Novo critério para buscar o localizavel + */ + public void setCriterioLocalizacao(List criterioLocalizacao) { + this.criterioLocalizacao = criterioLocalizacao; + } + /** * Método que será implentado pelas classes filhas com finalidade * de validar a existência do localizável * * @return boolean - Se o localizavel é válido ou não */ - protected abstract boolean validaLocalizavel(); + public abstract boolean validaLocalizavel(); } \ No newline at end of file diff --git a/src/main/java/br/com/imd/cadwork/core/service/GoogleService.java b/src/main/java/br/com/imd/cadwork/core/service/GoogleService.java index 03d6f31..f35d9fc 100644 --- a/src/main/java/br/com/imd/cadwork/core/service/GoogleService.java +++ b/src/main/java/br/com/imd/cadwork/core/service/GoogleService.java @@ -19,6 +19,7 @@ public class GoogleService { public static final String KEY = "AIzaSyD5SoFyhcb2eNCBW4PFwpt56BwMXWGDbHc"; public static final int RAIO_BUSCA = 500; public static final int LIMITE_BUSCA = 20; + public static final int BUSCA_INDIVIDUAL = 1; public static final String ESCOLA = "escola"; @@ -40,7 +41,7 @@ public GoogleService() { public List> getLocalizavelByLatLng(Double lat, Double lng,Param... extraParams) throws GenericServiceException, ConvertLocalizavelException { - return getLocalizaveisProximos(lat,lng,RAIO_BUSCA,1,extraParams); + return getLocalizaveisProximos(lat,lng,RAIO_BUSCA,BUSCA_INDIVIDUAL,extraParams); } /** @@ -88,4 +89,23 @@ public GooglePlaces getCliente() { public void setCliente(GooglePlaces cliente) { this.cliente = cliente; } + + public boolean validaExistencia(Double lat, Double lng, String cep,String tipoInstituicao) { + Param param = new Param("keyword"); + param.value(tipoInstituicao); + try { + + return cliente.getNearbyPlacesRankedByDistance(lat, + lng, + BUSCA_INDIVIDUAL, + param + ) + .stream() + .findFirst() + .isPresent(); + + }catch (Exception e) { + return false; + } + } } From 9f5a1b5d165c3c1260f025ad7ee5e99f69a934e0 Mon Sep 17 00:00:00 2001 From: Miguel Date: Tue, 19 Jun 2018 16:16:41 -0300 Subject: [PATCH 15/23] =?UTF-8?q?keyword=20Parada=20de=20=C3=94nibus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/br/com/imd/cadwork/core/service/GoogleService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/br/com/imd/cadwork/core/service/GoogleService.java b/src/main/java/br/com/imd/cadwork/core/service/GoogleService.java index f35d9fc..330e0e1 100644 --- a/src/main/java/br/com/imd/cadwork/core/service/GoogleService.java +++ b/src/main/java/br/com/imd/cadwork/core/service/GoogleService.java @@ -22,6 +22,7 @@ public class GoogleService { public static final int BUSCA_INDIVIDUAL = 1; public static final String ESCOLA = "escola"; + public static final String PARADA = "bus"; private GooglePlaces cliente; From 333fa5fcdd7f2e0088adb85223120376e6c6beae Mon Sep 17 00:00:00 2001 From: Miguel Date: Tue, 19 Jun 2018 16:30:13 -0300 Subject: [PATCH 16/23] =?UTF-8?q?fun=C3=A7=C3=A3o=20que=20calcula=20a=20di?= =?UTF-8?q?st=C3=A2ncia=20entre=202=20pontos(lat=20e=20lng)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/imd/cadwork/util/ValidatorUtil.java | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/main/java/br/com/imd/cadwork/util/ValidatorUtil.java b/src/main/java/br/com/imd/cadwork/util/ValidatorUtil.java index a116a1a..a60769d 100644 --- a/src/main/java/br/com/imd/cadwork/util/ValidatorUtil.java +++ b/src/main/java/br/com/imd/cadwork/util/ValidatorUtil.java @@ -38,5 +38,39 @@ public static boolean isEmpty(Object o) { //Validar de forma genérica quando um objeto está ou não válido return true; } + + + + /* + * http://www.frameworksystem.com/calculando-a-distancia-entre-2-pontos-latitude-e-longitude-em-java/ + * + * Calculate distance between two points in latitude + and longitude taking into account height difference. + If you are not interested in height difference pass 0.0. + Uses Haversine method as its base. lat1, lon1 Start point + lat2, lon2 End point el1 Start altitude in meters el2 End altitude + in meters */ + + public double distancia(double lat1, double lat2, double lon1, double lon2) { + final double el1 = 0.0; + final double el2 = 0.0; + final int R = 6371; // Radius of the earth + + Double latDistance = deg2rad(lat2 - lat1); + Double lonDistance = deg2rad(lon2 - lon1); + Double a = Math.sin(latDistance / 2) * Math.sin(latDistance / 2) + + Math.cos(deg2rad(lat1)) * Math.cos(deg2rad(lat2)) + * Math.sin(lonDistance / 2) * Math.sin(lonDistance / 2); + Double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)); + double distance = R * c * 1000; // convert to meters + + double height = el1 - el2; + distance = Math.pow(distance, 2) + Math.pow(height, 2); + return Math.sqrt(distance); + } + + private double deg2rad(double deg) { + return (deg * Math.PI / 180.0); + } } From cf3422970abc8a6fe54fef8a6b44df1a8df93bce Mon Sep 17 00:00:00 2001 From: Miguel Date: Wed, 20 Jun 2018 02:57:33 -0300 Subject: [PATCH 17/23] =?UTF-8?q?exce=C3=A7=C3=A3o=20de=20crit=C3=A9rio=20?= =?UTF-8?q?movida=20para=20core?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localizavel/exception/CriterioException.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/main/java/br/com/imd/cadwork/core/localizavel/exception/CriterioException.java diff --git a/src/main/java/br/com/imd/cadwork/core/localizavel/exception/CriterioException.java b/src/main/java/br/com/imd/cadwork/core/localizavel/exception/CriterioException.java new file mode 100644 index 0000000..66ebe73 --- /dev/null +++ b/src/main/java/br/com/imd/cadwork/core/localizavel/exception/CriterioException.java @@ -0,0 +1,16 @@ +package br.com.imd.cadwork.core.localizavel.exception; + +import br.com.imd.cadwork.core.dao.GenericDomainException; + +public class CriterioException extends GenericDomainException { + + private static final long serialVersionUID = 1L; + + public CriterioException() { + super("Erro gerado pelo critério!"); + } + + public CriterioException(String message) { + super(message); + } +} From 83cb402b9018ce010461709e9ec6033ddb0a3d8f Mon Sep 17 00:00:00 2001 From: Miguel Date: Wed, 20 Jun 2018 12:23:25 -0300 Subject: [PATCH 18/23] menor distancia --- .../br/com/imd/cadwork/core/localizavel/dao/LocalizavelDAO.java | 2 ++ .../java/br/com/imd/cadwork/core/service/GoogleService.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/br/com/imd/cadwork/core/localizavel/dao/LocalizavelDAO.java b/src/main/java/br/com/imd/cadwork/core/localizavel/dao/LocalizavelDAO.java index 24709d3..39be06e 100644 --- a/src/main/java/br/com/imd/cadwork/core/localizavel/dao/LocalizavelDAO.java +++ b/src/main/java/br/com/imd/cadwork/core/localizavel/dao/LocalizavelDAO.java @@ -7,6 +7,7 @@ import br.com.imd.cadwork.core.dao.GenericDAO; import br.com.imd.cadwork.core.localizacao.domain.Endereco; +import br.com.imd.cadwork.core.localizavel.model.CriterioLocalizacao; import br.com.imd.cadwork.core.localizavel.model.Localizavel; /** @@ -17,4 +18,5 @@ public interface LocalizavelDAO extends GenericDAO { public Optional findByEndereco(@Param("endereco")Endereco endereco); + public Optional findByCriterioLocalizacao(@Param("criterio")CriterioLocalizacao criterio); } diff --git a/src/main/java/br/com/imd/cadwork/core/service/GoogleService.java b/src/main/java/br/com/imd/cadwork/core/service/GoogleService.java index 330e0e1..deec9db 100644 --- a/src/main/java/br/com/imd/cadwork/core/service/GoogleService.java +++ b/src/main/java/br/com/imd/cadwork/core/service/GoogleService.java @@ -91,7 +91,7 @@ public void setCliente(GooglePlaces cliente) { this.cliente = cliente; } - public boolean validaExistencia(Double lat, Double lng, String cep,String tipoInstituicao) { + public boolean validaExistencia(Double lat, Double lng,String tipoInstituicao) { Param param = new Param("keyword"); param.value(tipoInstituicao); try { From 9b3e23aa483b16a16ce2dd503f7f8fa732ac648b Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Sun, 1 Jul 2018 22:01:27 -0300 Subject: [PATCH 19/23] =?UTF-8?q?Configurando=20integra=C3=A7=C3=A3o=20con?= =?UTF-8?q?t=C3=ADnua?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- travis-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 travis-ci.yml diff --git a/travis-ci.yml b/travis-ci.yml new file mode 100644 index 0000000..6d3b569 --- /dev/null +++ b/travis-ci.yml @@ -0,0 +1,4 @@ +language: java +sudo: true +script: +- mvn install -Dmaven.javadoc.skip=true -B -V \ No newline at end of file From fd9295bd57749ebb565b77dddfc0662898515afd Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Sun, 1 Jul 2018 22:02:09 -0300 Subject: [PATCH 20/23] =?UTF-8?q?Alterando=20pom.xml=20para=20incluir=20de?= =?UTF-8?q?pend=C3=AAncia=20do=20spring-tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pom.xml b/pom.xml index baea3d5..18a4c0b 100644 --- a/pom.xml +++ b/pom.xml @@ -82,6 +82,15 @@ 2.1.2 + + + + org.springframework.boot + spring-boot-starter-test + test + 1.5.3.RELEASE + + From d6417b2c58a24bb72fd7f144b774f379bb3565a8 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Sun, 1 Jul 2018 22:02:55 -0300 Subject: [PATCH 21/23] =?UTF-8?q?Criando=20testes=20para=20o=20servi=C3=A7?= =?UTF-8?q?o=20de=20endere=C3=A7os?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/imd/cadwork/EnderecoServiceTests.java | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 src/test/java/br/com/imd/cadwork/EnderecoServiceTests.java diff --git a/src/test/java/br/com/imd/cadwork/EnderecoServiceTests.java b/src/test/java/br/com/imd/cadwork/EnderecoServiceTests.java new file mode 100644 index 0000000..b30a6e4 --- /dev/null +++ b/src/test/java/br/com/imd/cadwork/EnderecoServiceTests.java @@ -0,0 +1,95 @@ +package br.com.imd.cadwork; + +import br.com.imd.cadwork.core.localizacao.domain.Endereco; +import br.com.imd.cadwork.core.localizacao.domain.EstadosEnum; +import br.com.imd.cadwork.core.localizacao.domain.Municipio; +import br.com.imd.cadwork.core.localizacao.domain.TipoLocalizacaoEnum; +import br.com.imd.cadwork.core.localizacao.service.EnderecoService; +import br.com.imd.cadwork.core.localizacao.service.MunicipioService; +import br.com.imd.cadwork.core.service.exception.GenericServiceException; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.FilterType; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.web.WebAppConfiguration; +import org.springframework.validation.BindingResult; + +import java.util.List; + +@RunWith(SpringRunner.class) +@WebAppConfiguration +@TestPropertySource(locations="classpath:application.properties") +@ContextConfiguration(classes = {CadworkapiApplication.class}) +@ComponentScan(excludeFilters = @ComponentScan.Filter(type = FilterType.REGEX, + pattern = {"br.com.imd.cadwork.core.resources","br.com.imd.cadwork.core.config"})) +public class EnderecoServiceTests { + + @Autowired + EnderecoService enderecoService; + + @Mock + BindingResult bindingResultMock; + + @Mock + Municipio municipio; + + @Autowired + MunicipioService municipioService; + + @Before + public void insereMunicipio() throws GenericServiceException { + Municipio municipio = new Municipio(); + + municipio.setNome("Natal"); + municipio.setEstado(EstadosEnum.TOCANTINS); + + municipioService.salvar(municipio,bindingResultMock); + + } + + @Test + public void testSalvarEndereco() throws GenericServiceException { + + List listar = municipioService.listar(); + + Endereco endereco = new Endereco(); + endereco.setBairro("Teste"); + endereco.setCep("Teste"); + endereco.setComplemento("Teste"); + endereco.setLatitude(0d); + endereco.setLongitude(0); + endereco.setLogradouro("Teste"); + endereco.setTipoLocalizacao(TipoLocalizacaoEnum.Urbana); + endereco.setNumero("467"); + + Mockito.when(municipio.getId()).thenReturn(1l); + + endereco.setMunicipio(municipio); + + Mockito.when(bindingResultMock.hasErrors()).thenReturn(false); + + enderecoService.salvar(endereco,bindingResultMock); + + Assert.assertFalse(enderecoService.listar().isEmpty()); + } + + @Test(expected = GenericServiceException.class) + public void testSalvarMunicipio_ComErrosNoCadastro() throws GenericServiceException { + + Endereco endereco = new Endereco(); + + Mockito.when(bindingResultMock.hasErrors()).thenReturn(true); + + enderecoService.salvar(endereco,bindingResultMock); + + } + +} From 7a0d042ec6ce9a9f0c16afcf2c5070908ffbda27 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Sun, 1 Jul 2018 22:03:08 -0300 Subject: [PATCH 22/23] =?UTF-8?q?Criando=20testes=20para=20o=20servi=C3=A7?= =?UTF-8?q?o=20de=20endere=C3=A7os?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/MunicipioServiceTests.java | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 src/test/java/br/com/imd/cadwork/core/localizavel/service/MunicipioServiceTests.java diff --git a/src/test/java/br/com/imd/cadwork/core/localizavel/service/MunicipioServiceTests.java b/src/test/java/br/com/imd/cadwork/core/localizavel/service/MunicipioServiceTests.java new file mode 100644 index 0000000..b7f4c7e --- /dev/null +++ b/src/test/java/br/com/imd/cadwork/core/localizavel/service/MunicipioServiceTests.java @@ -0,0 +1,65 @@ +package br.com.imd.cadwork.core.localizavel.service; + +import br.com.imd.cadwork.CadworkapiApplication; +import br.com.imd.cadwork.core.localizacao.domain.EstadosEnum; +import br.com.imd.cadwork.core.localizacao.domain.Municipio; +import br.com.imd.cadwork.core.localizacao.service.MunicipioService; +import br.com.imd.cadwork.core.service.exception.GenericServiceException; +import br.com.imd.cadwork.core.service.exception.ResourceNotFoundException; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mockito; +import org.springframework.beans.factory.annotation.Autowired; + +import org.springframework.context.annotation.*; + +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.web.WebAppConfiguration; +import org.springframework.validation.BindingResult; + +@RunWith(SpringRunner.class) +@WebAppConfiguration +@TestPropertySource(locations="classpath:application.properties") +@ContextConfiguration(classes = {CadworkapiApplication.class}) +@ComponentScan(excludeFilters = @ComponentScan.Filter(type = FilterType.REGEX, + pattern = {"br.com.imd.cadwork.core.resources","br.com.imd.cadwork.core.config"})) +public class MunicipioServiceTests { + + @Autowired + MunicipioService municipioService; + + @Test + public void testSalvarMunicipio() throws GenericServiceException { + + Municipio municipio = new Municipio(); + + municipio.setNome("Natal"); + municipio.setEstado(EstadosEnum.TOCANTINS); + + BindingResult bindingResultMock = Mockito.mock(BindingResult.class); + Mockito.when(bindingResultMock.hasErrors()).thenReturn(false); + + municipioService.salvar(municipio,bindingResultMock); + + Assert.assertFalse(municipioService.listar().isEmpty()); + } + + @Test(expected = ResourceNotFoundException.class) + public void testSalvarMunicipio_ComErrosNoCadastro() throws GenericServiceException { + + Municipio municipio = new Municipio(); + + municipio.setNome("Natalondon"); + municipio.setEstado(EstadosEnum.TOCANTINS); + + BindingResult bindingResultMock = Mockito.mock(BindingResult.class); + Mockito.when(bindingResultMock.hasErrors()).thenReturn(true); + + municipioService.salvar(municipio,bindingResultMock); + + } + +} From 33b0b4abdf78d59bd63bab0652286622723ce566 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Sun, 1 Jul 2018 22:05:35 -0300 Subject: [PATCH 23/23] =?UTF-8?q?Criando=20testes=20para=20o=20servi=C3=A7?= =?UTF-8?q?o=20de=20endere=C3=A7os?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ => core/localizavel/service}/EnderecoServiceTests.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename src/test/java/br/com/imd/cadwork/{ => core/localizavel/service}/EnderecoServiceTests.java (96%) diff --git a/src/test/java/br/com/imd/cadwork/EnderecoServiceTests.java b/src/test/java/br/com/imd/cadwork/core/localizavel/service/EnderecoServiceTests.java similarity index 96% rename from src/test/java/br/com/imd/cadwork/EnderecoServiceTests.java rename to src/test/java/br/com/imd/cadwork/core/localizavel/service/EnderecoServiceTests.java index b30a6e4..6261b89 100644 --- a/src/test/java/br/com/imd/cadwork/EnderecoServiceTests.java +++ b/src/test/java/br/com/imd/cadwork/core/localizavel/service/EnderecoServiceTests.java @@ -1,5 +1,6 @@ -package br.com.imd.cadwork; +package br.com.imd.cadwork.core.localizavel.service; +import br.com.imd.cadwork.CadworkapiApplication; import br.com.imd.cadwork.core.localizacao.domain.Endereco; import br.com.imd.cadwork.core.localizacao.domain.EstadosEnum; import br.com.imd.cadwork.core.localizacao.domain.Municipio;