Merge remote-tracking branch 'origin/master'

WenderGalan · Dec 3, 2018 · 55bb773 · 55bb773
2 parents b6369e6 + ae50dc5
commit 55bb773
Show file tree

Hide file tree

Showing 20 changed files with 121 additions and 208 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/Back-end/src/main/java/com/casafacilimoveis/model/entities/Anuncio.java b/Back-end/src/main/java/com/casafacilimoveis/model/entities/Anuncio.java
@@ -25,6 +25,7 @@
 @Entity
 @Table(name = "anuncio", schema = "public")
 public class Anuncio implements Serializable {
+    public static final long serialVersionUID = 1L;
 
     @Id
     @Column(name = "id", nullable = false)

diff --git a/Back-end/src/main/java/com/casafacilimoveis/model/entities/Endereco.java b/Back-end/src/main/java/com/casafacilimoveis/model/entities/Endereco.java
@@ -23,6 +23,7 @@
 @Entity
 @Table(name = "endereco", schema = "public")
 public class Endereco implements Serializable {
+    public static final long serialVersionUID = 1L;
 
     @Id
     @Column(name = "id", nullable = false)

diff --git a/Back-end/src/main/java/com/casafacilimoveis/model/entities/Favorito.java b/Back-end/src/main/java/com/casafacilimoveis/model/entities/Favorito.java
@@ -18,6 +18,7 @@
 @Entity
 @Table(name = "favorito", schema = "public")
 public class Favorito implements Serializable {
+    public static final long serialVersionUID = 1L;
 
     @Id
     @Column(name = "id", nullable = false)

diff --git a/Back-end/src/main/java/com/casafacilimoveis/model/entities/Imagem.java b/Back-end/src/main/java/com/casafacilimoveis/model/entities/Imagem.java
@@ -19,6 +19,7 @@
 @Entity
 @Table(name = "imagem", schema = "public")
 public class Imagem implements Serializable {
+    public static final long serialVersionUID = 1L;
 
     @Id
     @Column(name = "id", nullable = false)

diff --git a/Back-end/src/main/java/com/casafacilimoveis/model/entities/Usuario.java b/Back-end/src/main/java/com/casafacilimoveis/model/entities/Usuario.java
@@ -22,6 +22,7 @@
 @Entity
 @Table(name = "usuario", schema = "public")
 public class Usuario implements Serializable {
+    public static final long serialVersionUID = 1L;
 
     @Id
     @Column(name = "id", nullable = false)

diff --git a/Back-end/src/main/java/com/casafacilimoveis/model/entities/interceptor/Crashlytics.java b/Back-end/src/main/java/com/casafacilimoveis/model/entities/interceptor/Crashlytics.java
@@ -18,6 +18,7 @@
 @Entity
 @Table(name = "crashlytics", schema = "public")
 public class Crashlytics implements Serializable {
+    public static final long serialVersionUID = 1L;
 
     @Id
     @Column(name = "id", nullable = false)

diff --git a/Back-end/src/main/java/com/casafacilimoveis/model/entities/interceptor/Header.java b/Back-end/src/main/java/com/casafacilimoveis/model/entities/interceptor/Header.java
@@ -18,6 +18,7 @@
 @Entity
 @Table(name = "header", schema = "public")
 public class Header implements Serializable {
+    public static final long serialVersionUID = 1L;
 
     @Id
     @Column(name = "id", nullable = false)

diff --git a/Back-end/src/main/java/com/casafacilimoveis/service/impl/AnuncioServiceImpl.java b/Back-end/src/main/java/com/casafacilimoveis/service/impl/AnuncioServiceImpl.java
@@ -27,6 +27,7 @@
 import org.springframework.validation.BindingResult;
 
 import java.util.List;
+import java.util.Locale;
 
 /**
  * casa-facil-imoveis
@@ -74,9 +75,9 @@ public ResponseEntity buscarTodos(Integer id, Integer page, Integer size) {
     @Override
     public ResponseEntity buscaTodosAutoComplete(String text) {
         if (text != null && !text.isEmpty() && text.length() > 2) {
-            List<String> cidades = enderecoRepository.findCidadesAutoComplete(text.toLowerCase());
-            List<String> bairros = enderecoRepository.findBairroAutoComplete(text.toLowerCase());
-            List<String> enderecos = enderecoRepository.findEnderecoAutoComplete(text.toLowerCase());
+            List<String> cidades = enderecoRepository.findCidadesAutoComplete(text.toLowerCase(Locale.getDefault()));
+            List<String> bairros = enderecoRepository.findBairroAutoComplete(text.toLowerCase(Locale.getDefault()));
+            List<String> enderecos = enderecoRepository.findEnderecoAutoComplete(text.toLowerCase(Locale.getDefault()));
             return ResponseEntity.ok(SugestaoAutoComplete.criaSugestaoAutoComplete(cidades, bairros, enderecos));
         } else return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
     }

diff --git a/Back-end/src/main/java/com/casafacilimoveis/service/impl/EmailServiceImpl.java b/Back-end/src/main/java/com/casafacilimoveis/service/impl/EmailServiceImpl.java
@@ -36,7 +36,7 @@
 @Service
 public class EmailServiceImpl implements EmailService {
 
-    private static Logger LOGGER = LoggerFactory.getLogger(EmailServiceImpl.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(EmailServiceImpl.class);
 
     @Autowired
     private AnuncioRepository anuncioRepository;
@@ -84,13 +84,11 @@ public ResponseEntity sendEmailContato(ContatoAnunciante contato, Integer idAnun
                 try {
                     mailSender.send(message);
                     return ResponseEntity.ok().build();
+                } catch (MailParseException ex) {
+                    return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
                 } catch (Exception e) {
                     e.printStackTrace();
-                    if (e instanceof MailParseException) {
-                        return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
-                    } else {
-                        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
-                    }
+                    return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
                 }
             } else {
                 return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();