Merge pull request #2 from DamianoAlves/development

Versão 0.1.1

Author: damianoalves

README.md

@@ -1 +1,34 @@
-# Spring-api
+# Spring Rest Api
+
+API de serviços relacionados a sistemas eólicos 
+
+## Getting Started
+
+* Rota de Login : https://spring-restful-api.herokuapp.com/api/login 
+
+    **Entrar em contato com o autor para as credenciais de acesso**
+    
+* Todas as outras rotas estão documentadas 
+
+## Documentation
+
+A documentação das rotas da API podem ser encontrada no [Swagger](https://spring-restful-api.herokuapp.com/api/swagger-ui.html)
+
+## Deployment
+
+Essa API foi colocada no ar, usando o [Heroku](https://www.heroku.com/) como plataforma, no seguinte [link](https://spring-restful-api.herokuapp.com/api/)
+
+## Built With
+
+* [Spring Boot](https://spring.io/projects/spring-boot) - O web framework
+* [Maven](https://maven.apache.org/) - Dependency Management
+
+## Authors
+
+* **Damiano Alves** - *[email protected]* 
+
+See also the list of [contributors](https://github.com/DamianoAlves/Spring-api/graphs/contributors) who participated in this project.
+
+## License
+
+This project is licensed under the MIT License - see the [LICENSE.md](LICENSE) file for details

src/main/java/com/restful/api/config/WebSecurityConfig.java

@@ -35,8 +35,8 @@ protected void configure(HttpSecurity httpSecurity) throws Exception {
     protected void configure(AuthenticationManagerBuilder auth) throws Exception {
         PasswordEncoder encoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
         auth.inMemoryAuthentication()
-                .withUser(System.getenv("USER_ADMIN"))
-                .password(encoder.encode(System.getenv("USER_PASSWORD")))
+                .withUser("admin")
+                .password(encoder.encode("admin"))
                 .roles("ADMIN");
     }
 }

src/main/java/com/restful/api/model/Aerogerador.java

@@ -2,7 +2,10 @@
 
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotEmpty;
@@ -22,16 +25,19 @@ public class Aerogerador implements Serializable {
     @Id
     @Column(name = "id")
     @GeneratedValue(strategy = GenerationType.AUTO)
+    @ApiModelProperty(hidden = true)
     private Long id;
 
     @ManyToOne(fetch = FetchType.LAZY, optional = false, cascade=CascadeType.PERSIST)
     @JoinColumn(name = "parque_eolico_id", nullable = false, foreignKey=@ForeignKey(name = "Fk_parque_eolico_id"))
     @JsonIgnore
+    @ApiModelProperty(hidden = true)
     private ParqueEolico parqueEolico;
 
     @NotEmpty
     @Size(max = 45)
     @Column(name = "nome")
+    @ApiModelProperty(required = true)
     private String nome;
 
     private Float latitude;
@@ -44,6 +50,7 @@ public class Aerogerador implements Serializable {
 
     @NotEmpty
     @Size(max = 45)
+    @ApiModelProperty(required = true)
     private String modelo;
 
     public Aerogerador() {

src/main/java/com/restful/api/model/ComplexoEolico.java

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.Set;
@@ -22,25 +23,30 @@ public class ComplexoEolico implements Serializable {
     @Id
     @Column(name = "id")
     @GeneratedValue(strategy = GenerationType.AUTO)
+    @ApiModelProperty(hidden = true)
     private Long id;
 
     @NotEmpty
     @Size(max = 45)
     @Column(name = "nome")
+    @ApiModelProperty(required = true)
     private String nome;
 
     @NotEmpty
     @Size(max = 45)
     @Column(name = "uf")
+    @ApiModelProperty(required = true)
     private String uf;
 
     @NotEmpty
     @Size(max = 45)
     @Column(name = "identificador")
+    @ApiModelProperty(required = true)
     private String identificador;
 
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     @OneToMany(mappedBy = "complexoEolico", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @ApiModelProperty(hidden = true)
     private Set<ParqueEolico> parqueEolicos;
 
     public ComplexoEolico() {

src/main/java/com/restful/api/model/ParqueEolico.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotEmpty;
@@ -24,6 +25,7 @@ public class ParqueEolico implements Serializable {
     @Id
     @Column(name = "id")
     @GeneratedValue(strategy = GenerationType.AUTO)
+    @ApiModelProperty(hidden = true)
     private Long id;
 
     @ManyToOne(fetch = FetchType.LAZY, optional = false, cascade=CascadeType.PERSIST)
@@ -34,6 +36,7 @@ public class ParqueEolico implements Serializable {
     @NotEmpty
     @Size(max = 45)
     @Column(name = "nome")
+    @ApiModelProperty(required = true)
     private String nome;
 
     private Integer latitude;
@@ -42,10 +45,12 @@ public class ParqueEolico implements Serializable {
 
     @NotNull
     @Column(name = "potencia_instalada")
+    @ApiModelProperty(required = true)
     private Float potenciaInstalada;
 
     @JsonInclude(JsonInclude.Include.NON_NULL)
     @OneToMany(mappedBy = "parqueEolico", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @ApiModelProperty(hidden = true)
     private Set<Aerogerador> aerogeradores;
 
     public ParqueEolico() {