diff --git a/src/main/java/org/upsmf/grievance/dao/impl/TicketDaoImpl.java b/src/main/java/org/upsmf/grievance/dao/impl/TicketDaoImpl.java
index 4ecf4ab552b4f2444893c747b6fd1b001093f747..474f3beed461ee28ed29b26f80b3c43c24c4c83b 100644
--- a/src/main/java/org/upsmf/grievance/dao/impl/TicketDaoImpl.java
+++ b/src/main/java/org/upsmf/grievance/dao/impl/TicketDaoImpl.java
@@ -113,10 +113,6 @@ import org.upsmf.grievance.util.Sql.Apps;
@Repository(Constants.TICKET_DAO)
public class TicketDaoImpl implements TicketDao {
- private static final String EL_STIC123 = "El@stic123";
-
- private static final String ELASTIC = "elastic";
-
private static final String T = "T";
private static final String COUNT = "count";
@@ -1468,7 +1464,7 @@ public class TicketDaoImpl implements TicketDao {
private RestHighLevelClient connectToElasticSearch() {
final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
- credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(ELASTIC, EL_STIC123));
+ credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(Constants.ELASTIC, Constants.EL_STIC123));
HttpClientConfigCallback r = new RestClientBuilder.HttpClientConfigCallback() {
@Override
public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) {
diff --git a/src/main/java/org/upsmf/grievance/dao/impl/UserDaoImpl.java b/src/main/java/org/upsmf/grievance/dao/impl/UserDaoImpl.java
index f2480e54753ee7a8f46bbccbed0173f9b1fd4e02..b21be3244c49908363b6f6981872ff3f80d743df 100644
--- a/src/main/java/org/upsmf/grievance/dao/impl/UserDaoImpl.java
+++ b/src/main/java/org/upsmf/grievance/dao/impl/UserDaoImpl.java
@@ -94,10 +94,6 @@ public class UserDaoImpl implements UserDao {
private static final String ENCOUNTERED_AN_EXCEPTION_S = "Encountered an Exception : %s";
- private static final String EL_STIC123 = "El@stic123";
-
- private static final String ELASTIC = "elastic";
-
public static final Logger LOGGER = LoggerFactory.getLogger(UserDaoImpl.class);
@Value("${elk.data.up}")
@@ -895,7 +891,7 @@ public class UserDaoImpl implements UserDao {
private RestHighLevelClient connectToElasticSearch() {
final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
- credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(ELASTIC, EL_STIC123));
+ credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(Constants.ELASTIC, Constants.EL_STIC123));
HttpClientConfigCallback httpClientConfigCallback = new RestClientBuilder.HttpClientConfigCallback() {
@Override
diff --git a/src/main/java/org/upsmf/grievance/interceptor/TicketsRequestInterceptor.java b/src/main/java/org/upsmf/grievance/interceptor/TicketsRequestInterceptor.java
index 172b2532c266f239aca47b11c080128097fa517e..fa5fedd047f3992440453a6d2be7c9ca018bbceb 100644
--- a/src/main/java/org/upsmf/grievance/interceptor/TicketsRequestInterceptor.java
+++ b/src/main/java/org/upsmf/grievance/interceptor/TicketsRequestInterceptor.java
@@ -35,13 +35,11 @@ import org.upsmf.grievance.dao.impl.ApplicationDaoImpl;
import org.upsmf.grievance.model.Tags;
import org.upsmf.grievance.model.Ticket;
import org.upsmf.grievance.util.Constants;
+import org.upsmf.grievance.util.DateUtil;
import org.upsmf.grievance.util.ProjectUtil;
@Component
public class TicketsRequestInterceptor {
-
- private static final String EL_STIC123 = "El@stic123";
- private static final String ELASTIC = "elastic";
private static final String ENCOUNTERED_AN_EXCEPTION_S = "Encountered an Exception : %s";
private static final String CLASSNAME = TicketsRequestInterceptor.class.getName();
private static BlockingQueue<Ticket> queue = new ArrayBlockingQueue<>(Constants.CAPACITY);
@@ -182,16 +180,11 @@ public class TicketsRequestInterceptor {
public void setValuesOnUpdate(Ticket value, Map<String, Object> jsonMap) throws ParseException {
setValuesOnUpdate3(value, jsonMap);
if (value.getUpdatedTime() != null) {
- jsonMap.put(Constants.U_T, value.getUpdatedTime());
- }
- if (value.getCreatedTimeTS() != null) {
- jsonMap.put(Constants.CREATED_TIME_TS, value.getCreatedTimeTS());
- } else if (value.getCreatedTime() != null) {
- jsonMap.put(Constants.CREATED_TIME_TS, value.getCreatedTime());
- }
- if (value.getUpdatedTimeTS() != null) {
- jsonMap.put(Constants.UPDATED_TIME_TS, value.getUpdatedTimeTS());
+ jsonMap.put(Constants.U_T, DateUtil.getFormattedDateInString(value.getUpdatedTime()).split(" ")[1]);
}
+ jsonMap.put(Constants.CREATED_TIME_TS, value.getCreatedTime().getTime());
+
+ jsonMap.put(Constants.UPDATED_TIME_TS, value.getUpdatedTime().getTime());
if (value.getRequestedBy() != null) {
jsonMap.put(Constants.REQUESTED_BY, value.getRequestedBy());
}
@@ -220,13 +213,13 @@ public class TicketsRequestInterceptor {
jsonMap.put(Constants.MAX_RATING, value.getMaxRating());
}
if (value.getCreatedTime() != null) {
- jsonMap.put(Constants.CREATED_TIME, value.getCreatedTime());
+ jsonMap.put(Constants.CREATED_TIME, DateUtil.getFormattedDateInString(value.getCreatedTime()).split(" ")[0]);
}
if (value.getUpdatedTime() != null) {
- jsonMap.put(Constants.UPDATED_TIME, value.getUpdatedTime());
+ jsonMap.put(Constants.UPDATED_TIME, DateUtil.getFormattedDateInString(value.getUpdatedTime()).split(" ")[0]);
}
if (value.getCreatedTime() != null) {
- jsonMap.put(Constants.C_T, value.getCreatedTime());
+ jsonMap.put(Constants.C_T, DateUtil.getFormattedDateInString(value.getCreatedTime()).split(" ")[1]);
}
}
@@ -362,27 +355,17 @@ public class TicketsRequestInterceptor {
public void setValuesOnCreate2(Ticket value, Map<String, Object> jsonMap) throws ParseException {
if (!StringUtils.isBlank(String.valueOf(value.getCreatedTime()))) {
- jsonMap.put(Constants.C_T, value.getCreatedTime());
+ jsonMap.put(Constants.C_T, DateUtil.getFormattedDateInString(value.getCreatedTime()).split(" ")[1]);
} else {
jsonMap.put(Constants.C_T, null);
}
if (!StringUtils.isBlank(String.valueOf(value.getUpdatedTime()))) {
- jsonMap.put(Constants.U_T, value.getUpdatedTime());
+ jsonMap.put(Constants.U_T, DateUtil.getFormattedDateInString(value.getUpdatedTime()).split(" ")[1]);
} else {
jsonMap.put(Constants.U_T, null);
}
- if (!StringUtils.isBlank(String.valueOf(value.getCreatedTimeTS()))) {
- jsonMap.put(Constants.CREATED_TIME_TS, value.getCreatedTimeTS());
- } else if (!StringUtils.isBlank(String.valueOf(value.getCreatedTime()))) {
- jsonMap.put(Constants.CREATED_TIME_TS, value.getCreatedTime());
- } else {
- jsonMap.put(Constants.CREATED_TIME_TS, null);
- }
- if (!StringUtils.isBlank(String.valueOf(value.getUpdatedTimeTS()))) {
- jsonMap.put(Constants.UPDATED_TIME_TS, value.getUpdatedTimeTS());
- } else {
- jsonMap.put(Constants.UPDATED_TIME_TS, null);
- }
+ jsonMap.put(Constants.CREATED_TIME_TS, value.getCreatedTime().getTime());
+ jsonMap.put(Constants.UPDATED_TIME_TS, value.getUpdatedTime().getTime());
if (!StringUtils.isBlank(String.valueOf(value.getRequestedBy()))) {
jsonMap.put(Constants.REQUESTED_BY, value.getRequestedBy());
} else {
@@ -422,12 +405,12 @@ public class TicketsRequestInterceptor {
jsonMap.put(Constants.MAX_RATING, null);
}
if (!StringUtils.isBlank(String.valueOf(value.getCreatedTime()))) {
- jsonMap.put(Constants.CREATED_TIME, value.getCreatedTime());
+ jsonMap.put(Constants.CREATED_TIME, DateUtil.getFormattedDateInString(value.getCreatedTime()).split(" ")[0]);
} else {
jsonMap.put(Constants.CREATED_TIME, null);
}
if (!StringUtils.isBlank(String.valueOf(value.getUpdatedTime()))) {
- jsonMap.put(Constants.UPDATED_TIME, value.getUpdatedTime());
+ jsonMap.put(Constants.UPDATED_TIME, DateUtil.getFormattedDateInString(value.getUpdatedTime()).split(" ")[0]);
} else {
jsonMap.put(Constants.UPDATED_TIME, null);
}
@@ -458,7 +441,7 @@ public class TicketsRequestInterceptor {
private RestHighLevelClient connectToElasticSearch() {
final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
- credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(ELASTIC, EL_STIC123));
+ credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(Constants.ELASTIC, Constants.EL_STIC123));
HttpClientConfigCallback httpClientConfigCallback = new HttpClientConfigCallback() {
@Override
diff --git a/src/main/java/org/upsmf/grievance/util/Constants.java b/src/main/java/org/upsmf/grievance/util/Constants.java
index 5173a34caec04272f5e0edb37ab43e99d30607d5..ef6edc9afa681462be351dca54c6e1c8b3202637 100644
--- a/src/main/java/org/upsmf/grievance/util/Constants.java
+++ b/src/main/java/org/upsmf/grievance/util/Constants.java
@@ -332,8 +332,9 @@ public class Constants {
public static final String MAX_RATING = "max-rating";
public static final String RATE = "rate";
public static final String DESCRIPTION = "description";
-
- public static final String RANDOM="abcdefghijklmnopqrstuvwxyz123456789";
+ public static final String RANDOM="abcdefghijklmnopqrstuvwxyz123456789";
+ public static final String EL_STIC123 = "Elastic123";
+ public static final String ELASTIC = "elastic";
private static final String[] INCLUDE_FIELDS = new String[] { ID, STATUS, TOTAL, DESCRIPTION, PINNED_TICKET,
REQUESTED_BY, HELPDESK_ID, UPDATED_TIME, CREATED_TIME, U_T, C_T };
diff --git a/src/main/java/org/upsmf/grievance/util/DateUtil.java b/src/main/java/org/upsmf/grievance/util/DateUtil.java
index f6f72a9a309980b4d6bc28d76fcba1579e38a413..5f04c8982f35d3b3d0400575424d7a4871fa2870 100644
--- a/src/main/java/org/upsmf/grievance/util/DateUtil.java
+++ b/src/main/java/org/upsmf/grievance/util/DateUtil.java
@@ -1,8 +1,10 @@
package org.upsmf.grievance.util;
+import java.sql.Timestamp;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
@@ -36,6 +38,12 @@ public class DateUtil {
return format.format(date);
}
+
+ public static String getFormattedDateInString(Timestamp ts) {
+ DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT);
+ return dateTimeFormatter.format(ts.toLocalDateTime());
+ }
+
/**
* this method take date object and time zone ,and format date object with
* incoming time zone.