Merge pull request #2 from bennu/feat/response-entity

feat: add error response into base controller

Author: camilomolina

README.md

@@ -15,7 +15,7 @@ LTS releases: 17 and 21.
 <dependency>
     <groupId>cl.bennu</groupId>
     <artifactId>spring-boot-commons</artifactId>
-    <version>0.0.1</version>
+    <version>0.1.0</version>
 </dependency>
 ```
 

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>cl.bennu</groupId>
     <artifactId>spring-boot-commons</artifactId>
-    <version>0.0.1</version>
+    <version>0.1.0</version>
     <name>bennu-spring-boot-commons</name>
     <description>Utilitarios bennu para SpringBoot</description>
     <url>https://github.com/bennu/spring-boot-commons</url>
@@ -67,7 +67,7 @@
                     <plugin>
                         <groupId>org.sonatype.central</groupId>
                         <artifactId>central-publishing-maven-plugin</artifactId>
-                        <version>0.3.0</version>
+                        <version>0.7.0</version>
                         <extensions>true</extensions>
                         <configuration>
                             <publishingServerId>central</publishingServerId>
@@ -79,7 +79,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>3.3.0</version>
+                        <version>3.3.1</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>
@@ -92,7 +92,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.6.3</version>
+                        <version>3.11.2</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -105,7 +105,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.1.0</version>
+                        <version>3.2.7</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -132,12 +132,12 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>3.2.5</version>
+                        <version>3.5.3</version>
                     </plugin>
                     <plugin>
                         <groupId>org.jacoco</groupId>
                         <artifactId>jacoco-maven-plugin</artifactId>
-                        <version>0.8.7</version>
+                        <version>0.8.13</version>
                         <executions>
                             <execution>
                                 <id>prepare-agent</id>
@@ -168,7 +168,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.10.1</version> <!-- Check for latest version at Maven Central -->
+                <version>3.11.2</version> <!-- Check for latest version at Maven Central -->
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>

src/main/java/cl/bennu/commons/controller/base/BaseController.java

@@ -1,9 +1,12 @@
 package cl.bennu.commons.controller.base;
 
+import cl.bennu.commons.controller.model.common.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CrossOrigin;
 
+import java.util.Date;
+
 @CrossOrigin
 public abstract class BaseController {
 
@@ -12,7 +15,29 @@ protected static ResponseEntity<?> ok() {
     }
 
     protected static ResponseEntity<?> ok(Object o) {
-        return ResponseEntity.ok().body(o);
+        if (o instanceof String
+                || o instanceof Date
+                || o instanceof Number
+                || o instanceof Character
+                || o instanceof Boolean) {
+            Value value = new Value();
+            value.setValue(o);
+
+            return new ResponseEntity<>(value, HttpStatus.OK);
+        }
+        return new ResponseEntity<>(o, HttpStatus.OK);
+    }
+
+    public ResponseEntity<?> unauthorized(Exception e) {
+        return new ResponseEntity<>(e, HttpStatus.UNAUTHORIZED);
+    }
+
+    public ResponseEntity<?> conflict(Exception e) {
+        return new ResponseEntity<>(e, HttpStatus.CONFLICT);
+    }
+
+    public ResponseEntity<?> serverError(Exception e) {
+        return new ResponseEntity<>(e, HttpStatus.INTERNAL_SERVER_ERROR);
     }
 
 }

src/main/java/cl/bennu/commons/controller/config/RestConfig.java

@@ -0,0 +1,28 @@
+package cl.bennu.commons.controller.config;
+
+
+import org.springframework.http.HttpMethod;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+
+public abstract class RestConfig {
+
+    public static UrlBasedCorsConfigurationSource basic() {
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        CorsConfiguration config = new CorsConfiguration();
+        config.addAllowedMethod(HttpMethod.GET);
+        config.addAllowedMethod(HttpMethod.POST);
+        config.addAllowedMethod(HttpMethod.PUT);
+        config.addAllowedMethod(HttpMethod.DELETE);
+        config.addAllowedMethod(HttpMethod.PATCH);
+
+        config.addAllowedHeader("*");
+        config.addAllowedOrigin("*");
+
+        source.registerCorsConfiguration("/**", config);
+
+        return source;
+    }
+
+}
+

src/main/java/cl/bennu/commons/controller/model/common/Value.java

@@ -10,6 +10,6 @@
 public class Value implements Serializable {
 
     private Long id;
-    private String value;
+    private Object value;
 
 }