Merge pull request #53 from SelimHorri/develop

adjust props

Author: SelimHorri

src/main/java/tn/cita/app/config/annotation/InstantCustomFormat.java

@@ -6,17 +6,13 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.format.annotation.DateTimeFormat;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.deser.InstantDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.InstantSerializer;
 
-import tn.cita.app.constant.AppConstant;
-
 @Target(value = {
 		ElementType.ANNOTATION_TYPE, 
 		ElementType.TYPE, 
@@ -26,17 +22,17 @@
 })
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
-@JsonFormat(pattern = AppConstant.INSTANT_FORMAT, shape = Shape.STRING)
-@DateTimeFormat(pattern = AppConstant.INSTANT_FORMAT)
+@JsonFormat(shape = Shape.STRING)
 @JsonSerialize(using = InstantSerializer.class)
 @JsonDeserialize(using = InstantDeserializer.class)
 public @interface InstantCustomFormat {
 
-	String format() default AppConstant.INSTANT_FORMAT;
+	String format();
 
 }
 
 
 
 
 
+

src/main/java/tn/cita/app/config/annotation/LocalDateCustomFormat.java

@@ -40,3 +40,4 @@
 
 
 
+

src/main/java/tn/cita/app/config/annotation/LocalDateTimeCustomFormat.java

@@ -40,3 +40,4 @@
 
 
 
+

src/main/java/tn/cita/app/config/annotation/ZonedDateTimeCustomFormat.java

@@ -37,3 +37,4 @@
 
 
 
+

src/main/java/tn/cita/app/config/cors/CorsConfig.java

@@ -48,4 +48,3 @@ public CorsFilter corsFilter() {
 
 
 
-

src/main/java/tn/cita/app/config/encoder/PasswordEncoderConfig.java

@@ -27,4 +27,3 @@ public PasswordEncoder passwordEncoderBean() {
 
 
 
-

src/main/java/tn/cita/app/config/filter/JwtRequestFilter.java

@@ -64,3 +64,12 @@ protected void doFilterInternal(final HttpServletRequest request, final HttpServ
 
 }
 
+
+
+
+
+
+
+
+
+

src/main/java/tn/cita/app/config/SerializationConfig.java renamed to src/main/java/tn/cita/app/config/marshal/MarshalConfig.java

@@ -1,4 +1,4 @@
-package tn.cita.app.config;
+package tn.cita.app.config.marshal;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -8,7 +8,7 @@
 import com.fasterxml.jackson.databind.json.JsonMapper;
 
 @Configuration
-public class SerializationConfig {
+public class MarshalConfig {
 
 	@Bean
 	public ObjectMapper objectMapperBean() {
@@ -29,5 +29,3 @@ public ObjectMapper objectMapperBean() {
 
 
 
-
-

src/main/java/tn/cita/app/constant/AppConstant.java

@@ -9,7 +9,6 @@ public final class AppConstant {
 	public static final String LOCAL_DATE_FORMAT = "dd-MM-yyyy";
 	public static final String LOCAL_DATE_TIME_FORMAT = "dd-MM-yyyy__HH:mm:ss:SSSSSS";
 	public static final String ZONED_DATE_TIME_FORMAT = "dd-MM-yyyy__HH:mm:ss:SSSSSS";
-	public static final String INSTANT_FORMAT = "dd-MM-yyyy__HH:mm:ss:SSSSSS";
 
 	public static final String API_CONTEXT_V0 = "/api/v0";
 
@@ -24,4 +23,3 @@ public final class AppConstant {
 
 
 
-

src/main/java/tn/cita/app/domain/ReservationStatus.java

@@ -15,4 +15,3 @@ public enum ReservationStatus {
 
 
 
-