diff --git a/pom.xml b/pom.xml
index a2e75a32f5113b7c56668aac28e7305134e17884..6c201fbbafb516b807d23f59e206af7abff3abe3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -210,12 +210,12 @@
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
- <version>6.0.0</version>
+ <version>7.3.0</version>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-high-level-client</artifactId>
- <version>6.2.4</version>
+ <version>7.3.0</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
diff --git a/src/main/java/org/upsmf/grievance/dao/impl/ApplicationDaoImpl.java b/src/main/java/org/upsmf/grievance/dao/impl/ApplicationDaoImpl.java
index 595577c8fc91450dd3663015a6199ee9184ae11c..7987e0ba34ae889575d308589fee804846b62ad6 100644
--- a/src/main/java/org/upsmf/grievance/dao/impl/ApplicationDaoImpl.java
+++ b/src/main/java/org/upsmf/grievance/dao/impl/ApplicationDaoImpl.java
@@ -3,6 +3,7 @@ package org.upsmf.grievance.dao.impl;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
+import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -93,7 +94,7 @@ public class ApplicationDaoImpl implements ApplicationDao {
jdbcTemplate.update(Apps.UPDATE_APP, new Object[] { app.getName(), app.getAppUrl(), app.getLogo(),
app.getSourceId(), app.getActiveStatus(), app.getClientName(), app.getVersion(), user.getId(),
- DateUtil.getFormattedDateInUTC(new Date()), app.getAppKey(), app.getDescription(), app.getId() });
+ new Timestamp(new Date().getTime()), app.getAppKey(), app.getDescription(), app.getId() });
if (app.getActiveStatus()) {
jdbcTemplate.update(Sql.Apps.DELETE_ORG_APP, new Object[] { app.getId(), user.getOrgId() });
}
diff --git a/src/main/java/org/upsmf/grievance/dao/impl/HelpdeskDaoImpl.java b/src/main/java/org/upsmf/grievance/dao/impl/HelpdeskDaoImpl.java
index 195c24d3d2644c0cbda229ccac3a286bd2632af7..873c3530988f2c819a05e8c8417c2b006f396f1e 100644
--- a/src/main/java/org/upsmf/grievance/dao/impl/HelpdeskDaoImpl.java
+++ b/src/main/java/org/upsmf/grievance/dao/impl/HelpdeskDaoImpl.java
@@ -3,6 +3,7 @@ package org.upsmf.grievance.dao.impl;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
+import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -75,7 +76,7 @@ public class HelpdeskDaoImpl implements HelpdeskDao {
statement.setString(1, helpdesk.getName());
statement.setLong(2, helpdesk.getOrgId());
statement.setLong(3, helpdesk.getCreatedBy());
- statement.setString(4, DateUtil.getFormattedDateInUTC(new Date()));
+ statement.setTimestamp(4, new Timestamp(new Date().getTime()));
statement.setBoolean(5, helpdesk.getIsActive());
statement.setString(6, helpdesk.getColor());
statement.setString(7, helpdesk.getDescription());
@@ -92,7 +93,7 @@ public class HelpdeskDaoImpl implements HelpdeskDao {
try {
jdbcTemplate.update(Sql.Helpdesk.UPDATE_HELPDESK,
new Object[] { helpdesk.getName(), helpdesk.getUpdatedBy(),
- DateUtil.getFormattedDateInUTC(new Date()), helpdesk.getIsActive(), helpdesk.getColor(),
+ new Timestamp(new Date().getTime()), helpdesk.getIsActive(), helpdesk.getColor(),
helpdesk.getDescription(), helpdesk.getId(), helpdesk.getOrgId() });
setHelpdeskChannels(helpdesk);
return true;
diff --git a/src/main/java/org/upsmf/grievance/dao/impl/SuperAdminDaoImpl.java b/src/main/java/org/upsmf/grievance/dao/impl/SuperAdminDaoImpl.java
index 10cae994ad4f23268a1e2cc1e5089541e80b579a..ad053e85d634f3a2e908fbc6e1d1147fe4ad94da 100644
--- a/src/main/java/org/upsmf/grievance/dao/impl/SuperAdminDaoImpl.java
+++ b/src/main/java/org/upsmf/grievance/dao/impl/SuperAdminDaoImpl.java
@@ -3,6 +3,7 @@ package org.upsmf.grievance.dao.impl;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
+import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -261,7 +262,7 @@ public class SuperAdminDaoImpl implements SuperAdminDao {
int value = 0;
try {
value = jdbcTemplate.update(Sql.Organization.UPDATE_ORG,
- new Object[] { org.getOrgName(), org.getLogo(), DateUtil.getFormattedDateInUTC(new Date()),
+ new Object[] { org.getOrgName(), org.getLogo(), new Timestamp(new Date().getTime()),
org.getUserId(), org.getUrl(), org.getOrgDescription(), org.getOrgColor(),
org.getEmailDomain(), org.getId() });
} catch (Exception e) {
@@ -289,7 +290,7 @@ public class SuperAdminDaoImpl implements SuperAdminDao {
public boolean deleteOrganization(Organization organization) {
try {
int value = jdbcTemplate.update(Sql.Organization.DELETE_ORG, new Object[] { organization.getUserId(),
- DateUtil.getFormattedDateInUTC(new Date()), organization.getId() });
+ new Timestamp(new Date().getTime()), organization.getId() });
return (value > 0);
} catch (Exception e) {
LOGGER.error(String.format(ENCOUNTERED_AN_EXCEPTION_S, e.getMessage()));
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 8fc1a1574a47d13df7d4e73b41b063faf35af6bc..e0be344c251aba796273647cd64e538e1d493e80 100644
--- a/src/main/java/org/upsmf/grievance/dao/impl/TicketDaoImpl.java
+++ b/src/main/java/org/upsmf/grievance/dao/impl/TicketDaoImpl.java
@@ -8,6 +8,7 @@ import java.nio.file.Paths;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
+import java.sql.Timestamp;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -28,11 +29,13 @@ import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.CredentialsProvider;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
+import org.apache.lucene.search.TotalHits;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.elasticsearch.action.bulk.BulkRequest;
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.RestClient;
import org.elasticsearch.client.RestClientBuilder;
import org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback;
@@ -216,11 +219,11 @@ public class TicketDaoImpl implements TicketDao {
public PreparedStatement createPreparedStatement(Connection connection) throws SQLException {
String[] returnValColumn = new String[] { "id" };
PreparedStatement statement = connection.prepareStatement(Sql.Ticket.ADD_TICKET, returnValColumn);
- ticket.setCreatedTime(DateUtil.getFormattedDateInUTC(new Date()));
- ticket.setUpdatedTime(DateUtil.getFormattedDateInUTC(new Date()));
+ ticket.setCreatedTime(new Timestamp(new Date().getTime()));
+ ticket.setUpdatedTime(new Timestamp(new Date().getTime()));
ticket.setCreatedTimeTS(new Date().getTime());
ticket.setUpdatedTimeTS(new Date().getTime());
- statement.setString(1, ticket.getCreatedTime());
+ statement.setTimestamp(1, ticket.getCreatedTime());
if (!StringUtils.isBlank(String.valueOf(ticket.getRate()))) {
statement.setLong(2, ticket.getRate());
} else {
@@ -257,7 +260,7 @@ public class TicketDaoImpl implements TicketDao {
statement.setLong(7, id);
}
}
- statement.setString(8, ticket.getUpdatedTime());
+ statement.setTimestamp(8, ticket.getUpdatedTime());
statement.setBoolean(9, false);
return statement;
}
@@ -578,7 +581,7 @@ public class TicketDaoImpl implements TicketDao {
List<Ticket> ticketList = null;
try {
jdbcTemplate.update(Sql.Ticket.ADD_ACTIVITY_LOG,
- new Object[] { activity, ticketId, DateUtil.getFormattedDateInUTC(new Date()), changesBy });
+ new Object[] { activity, ticketId, new Timestamp(new Date().getTime()), changesBy });
} catch (Exception e) {
LOGGER.error(String.format(ENCOUNTERED_AN_EXCEPTION_S, e.getMessage()));
}
@@ -660,7 +663,7 @@ public class TicketDaoImpl implements TicketDao {
String name) {
if (values != null && values.length > 0) {
jdbcTemplate.update(Sql.Ticket.UPDATE_TICKET_WORKFLOW, new Object[] { true,
- DateUtil.getFormattedDateInUTC(new Date()), workFlowIds.get(0), ticketTypeDto.getId() });
+ new Timestamp(new Date().getTime()), workFlowIds.get(0), ticketTypeDto.getId() });
name = jdbcTemplate.queryForObject(Sql.Ticket.GET_WORKFLOW_NAME, new Object[] { workFlowIds.get(0) },
String.class);
}
@@ -776,7 +779,7 @@ public class TicketDaoImpl implements TicketDao {
if (update.getId() != null) {
sendRepliesToReviews(update);
jdbcTemplate.update(Sql.Ticket.UPDATE_UPDATES, new Object[] { update.getUpds(), update.isActive(),
- DateUtil.getFormattedDateInUTC(new Date()), update.getId() });
+ new Timestamp(new Date().getTime()), update.getId() });
} else {
sendRepliesToReviews(update);
List<Long> ccList = getTicketCC(update.getTicketId());
@@ -785,7 +788,7 @@ public class TicketDaoImpl implements TicketDao {
ccList.add(requestedBy);
ccList.remove(update.getCreatedBy());
jdbcTemplate.update(Sql.Ticket.ADD_UPDATES, new Object[] { update.getUpds(), update.getCreatedBy(),
- update.getTicketId(), DateUtil.getFormattedDateInUTC(new Date()) });
+ update.getTicketId(), new Timestamp(new Date().getTime()) });
for (int i = 0; i < ccList.size(); i++) {
sendMailToCC(update, ccList, i);
}
@@ -1045,7 +1048,7 @@ public class TicketDaoImpl implements TicketDao {
@Override
public boolean updateTicketBasic(MultipartFile file, Ticket ticket) {
- ticket.setUpdatedTime(DateUtil.getFormattedDateInUTC(new Date()));
+ ticket.setUpdatedTime(new Timestamp(new Date().getTime()));
Long loggedInUserId = ticket.getUserId();
int status = 0;
Long id = ticket.getId();
@@ -1175,7 +1178,7 @@ public class TicketDaoImpl implements TicketDao {
newticket.setType(ticketTypeDto.getTypeId());
newticket.setOperation(UPDATE);
newticket.setStatus(stat);
- newticket.setUpdatedTime(DateUtil.getFormattedDateInUTC(new Date()));
+ newticket.setUpdatedTime(new Timestamp(new Date().getTime()));
newticket.setUpdatedTimeTS(new Date().getTime());
ticketsRequestInterceptor.addData(newticket);
@@ -1215,7 +1218,7 @@ public class TicketDaoImpl implements TicketDao {
});
if (values != null && values.length > 0) {
jdbcTemplate.update(Sql.Ticket.UPDATE_TICKET_WORKFLOW,
- new Object[] { true, DateUtil.getFormattedDateInUTC(new Date()), workFlowStages.get(0).getId(),
+ new Object[] { true, new Timestamp(new Date().getTime()), workFlowStages.get(0).getId(),
ticketTypeDto.getId() });
name = jdbcTemplate.queryForObject(Sql.Ticket.GET_WORKFLOW_NAME, new Object[] { workFlowIds.get(0) },
String.class);
@@ -1241,7 +1244,7 @@ public class TicketDaoImpl implements TicketDao {
for (int i = 0; i < ticket.getWorkflowStages().size(); i++) {
status = jdbcTemplate.update(Sql.Ticket.UPDATE_TICKET_WORKFLOW,
new Object[] { ticket.getWorkflowStages().get(i).getStatus(),
- DateUtil.getFormattedDateInUTC(new Date()),
+ new Timestamp(new Date().getTime()),
ticket.getWorkflowStages().get(i).getWorkFlowId(), ticket.getId() });
}
List<TicketWorkflowDto> workFlow = getWorkflowForTicket(ticket.getId());
@@ -1257,7 +1260,7 @@ public class TicketDaoImpl implements TicketDao {
newticket.setId(ticket.getId());
newticket.setOperation(UPDATE);
newticket.setStatus(newStatus);
- newticket.setUpdatedTime(DateUtil.getFormattedDateInUTC(new Date()));
+ newticket.setUpdatedTime(new Timestamp(new Date().getTime()));
newticket.setUpdatedTimeTS(new Date().getTime());
User user = superAdminDao.userDetailsByUserId(ticket.getRequestedBy());
String email = user.getUsername();
@@ -1299,12 +1302,12 @@ public class TicketDaoImpl implements TicketDao {
if (!searchSourceBuilder.toString().equals("{}")) {
searchResponse = searchFromTicketElasticData(client, searchSourceBuilder);
SearchHit[] hit = searchResponse.getHits().getHits();
- long total = searchResponse.getHits().getTotalHits();
+ TotalHits total = searchResponse.getHits().getTotalHits();
for (SearchHit hits : hit) {
String sourceAsMap = hits.getSourceAsString();
Gson g = new Gson();
TicketElastic ticketElastic = g.fromJson(sourceAsMap, TicketElastic.class);
- ticketElastic.setTotal(total);
+ ticketElastic.setTotal(total.value);
mapper.add(ticketElastic);
}
}
@@ -1374,7 +1377,7 @@ public class TicketDaoImpl implements TicketDao {
.query(QueryBuilders.boolQuery().must(QueryBuilders.matchAllQuery())).size(700);
searchResponse = searchFromAuroraSdkData(client, searchSourceBuilder);
SearchHit[] hit = searchResponse.getHits().getHits();
- long total = searchResponse.getHits().getTotalHits();
+ TotalHits total = searchResponse.getHits().getTotalHits();
for (SearchHit hits : hit) {
String sourceAsMap = hits.getSourceAsString();
Gson g = new Gson();
@@ -1382,7 +1385,7 @@ public class TicketDaoImpl implements TicketDao {
mapper.add(t);
}
BulkRequest request = new BulkRequest();
- for (int i = 0; i < total; i++) {
+ for (int i = 0; i < total.value; i++) {
mapper.get(i).setSourceId(1L);
Ticket tkt = addTicket(mapper.get(i));
if (tkt != null) {
@@ -1391,7 +1394,7 @@ public class TicketDaoImpl implements TicketDao {
.source(jsonMap));
}
}
- client.bulk(request);
+ client.bulk(request, RequestOptions.DEFAULT);
client.close();
} catch (Exception e) {
LOGGER.error(String.format(ENCOUNTERED_AN_EXCEPTION_S, e.getMessage()));
@@ -1442,7 +1445,7 @@ public class TicketDaoImpl implements TicketDao {
SearchSourceBuilder searchSourceBuilder) throws IOException {
SearchRequest searchRequest = new SearchRequest(elasticsearchIndex).types(elasticsearchType)
.source(searchSourceBuilder);
- SearchResponse searchResponse = client.search(searchRequest);
+ SearchResponse searchResponse = client.search(searchRequest, RequestOptions.DEFAULT);
client.close();
return searchResponse;
}
@@ -1450,7 +1453,7 @@ public class TicketDaoImpl implements TicketDao {
private SearchResponse searchFromAuroraSdkData(RestHighLevelClient client, SearchSourceBuilder searchSourceBuilder)
throws IOException {
SearchRequest searchRequest = new SearchRequest(FEEDBACK_D1).types(EVENT).source(searchSourceBuilder);
- SearchResponse searchResponse = client.search(searchRequest);
+ SearchResponse searchResponse = client.search(searchRequest, RequestOptions.DEFAULT);
client.close();
return searchResponse;
}
@@ -1505,7 +1508,7 @@ public class TicketDaoImpl implements TicketDao {
newticket.setId(ticket.getId());
newticket.setPinnedTicket(ticket.getPinnedTicket());
newticket.setOperation(UPDATE);
- newticket.setUpdatedTime(DateUtil.getFormattedDateInUTC(new Date()));
+ newticket.setUpdatedTime(new Timestamp(new Date().getTime()));
newticket.setUpdatedTimeTS(new Date().getTime());
ticketsRequestInterceptor.addData(newticket);
}
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 1f2b581986184410f2cedb1a8254ce518e54a7e7..4058ea71d0d37a3b1cafe4f8be2713f2491b78ce 100644
--- a/src/main/java/org/upsmf/grievance/dao/impl/UserDaoImpl.java
+++ b/src/main/java/org/upsmf/grievance/dao/impl/UserDaoImpl.java
@@ -6,13 +6,10 @@ import java.io.IOException;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
+import java.sql.Timestamp;
import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDateTime;
+import java.util.*;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
@@ -25,6 +22,7 @@ import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
import org.apache.velocity.VelocityContext;
import org.elasticsearch.action.bulk.BulkRequest;
import org.elasticsearch.action.index.IndexRequest;
+import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.RestClient;
import org.elasticsearch.client.RestClientBuilder;
import org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback;
@@ -609,7 +607,7 @@ public class UserDaoImpl implements UserDao {
if (isPasswordMatch(changePasswordDto.getUserId(), changePasswordDto.getOldPass())) {
int count = jdbcTemplate.update(Sql.Common.UPDATE_PSWRD,
new Object[] { OneWayHashing.encryptVal(changePasswordDto.getNewPass()),
- DateUtil.getFormattedDateInUTC(new Date()), changePasswordDto.getUserId(),
+ new Timestamp(new Date().getTime()), changePasswordDto.getUserId(),
OneWayHashing.encryptVal(changePasswordDto.getOldPass()) });
if (count > 0) {
resposne = true;
@@ -654,7 +652,7 @@ public class UserDaoImpl implements UserDao {
try {
String encryptVal = OneWayHashing.encryptVal(password);
count = jdbcTemplate.update(Sql.Common.SAVE_FORGOT_PSWRD,
- new Object[] { encryptVal, DateUtil.getFormattedDateInUTC(new Date()), userId });
+ new Object[] { encryptVal, new Timestamp(new Date().getTime()), userId });
LOGGER.info("Password : {}", encryptVal);
} catch (Exception e) {
LOGGER.error(String.format(ENCOUNTERED_AN_EXCEPTION_S, e.getMessage()));
@@ -887,7 +885,7 @@ public class UserDaoImpl implements UserDao {
.source(jsonMap));
}
}
- client.bulk(req);
+ client.bulk(req, RequestOptions.DEFAULT);
client.close();
}
} catch (RestClientException e) {
diff --git a/src/main/java/org/upsmf/grievance/interceptor/TicketsRequestInterceptor.java b/src/main/java/org/upsmf/grievance/interceptor/TicketsRequestInterceptor.java
index fb690d791ce3cae0aad99c67e83f78861081ea23..172b2532c266f239aca47b11c080128097fa517e 100644
--- a/src/main/java/org/upsmf/grievance/interceptor/TicketsRequestInterceptor.java
+++ b/src/main/java/org/upsmf/grievance/interceptor/TicketsRequestInterceptor.java
@@ -22,6 +22,7 @@ import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.action.index.IndexResponse;
import org.elasticsearch.action.update.UpdateRequest;
+import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.RestClient;
import org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback;
import org.elasticsearch.client.RestHighLevelClient;
@@ -181,12 +182,12 @@ 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().split(" ")[1]);
+ 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, timestampconvertor(value.getCreatedTime()));
+ jsonMap.put(Constants.CREATED_TIME_TS, value.getCreatedTime());
}
if (value.getUpdatedTimeTS() != null) {
jsonMap.put(Constants.UPDATED_TIME_TS, value.getUpdatedTimeTS());
@@ -219,13 +220,13 @@ public class TicketsRequestInterceptor {
jsonMap.put(Constants.MAX_RATING, value.getMaxRating());
}
if (value.getCreatedTime() != null) {
- jsonMap.put(Constants.CREATED_TIME, value.getCreatedTime().split(" ")[0]);
+ jsonMap.put(Constants.CREATED_TIME, value.getCreatedTime());
}
if (value.getUpdatedTime() != null) {
- jsonMap.put(Constants.UPDATED_TIME, value.getUpdatedTime().split(" ")[0]);
+ jsonMap.put(Constants.UPDATED_TIME, value.getUpdatedTime());
}
if (value.getCreatedTime() != null) {
- jsonMap.put(Constants.C_T, value.getCreatedTime().split(" ")[1]);
+ jsonMap.put(Constants.C_T, value.getCreatedTime());
}
}
@@ -361,19 +362,19 @@ 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().split(" ")[1]);
+ jsonMap.put(Constants.C_T, value.getCreatedTime());
} else {
jsonMap.put(Constants.C_T, null);
}
if (!StringUtils.isBlank(String.valueOf(value.getUpdatedTime()))) {
- jsonMap.put(Constants.U_T, value.getUpdatedTime().split(" ")[1]);
+ jsonMap.put(Constants.U_T, value.getUpdatedTime());
} 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, timestampconvertor(value.getCreatedTime()));
+ jsonMap.put(Constants.CREATED_TIME_TS, value.getCreatedTime());
} else {
jsonMap.put(Constants.CREATED_TIME_TS, null);
}
@@ -421,12 +422,12 @@ public class TicketsRequestInterceptor {
jsonMap.put(Constants.MAX_RATING, null);
}
if (!StringUtils.isBlank(String.valueOf(value.getCreatedTime()))) {
- jsonMap.put(Constants.CREATED_TIME, value.getCreatedTime().split(" ")[0]);
+ jsonMap.put(Constants.CREATED_TIME, value.getCreatedTime());
} else {
jsonMap.put(Constants.CREATED_TIME, null);
}
if (!StringUtils.isBlank(String.valueOf(value.getUpdatedTime()))) {
- jsonMap.put(Constants.UPDATED_TIME, value.getUpdatedTime().split(" ")[0]);
+ jsonMap.put(Constants.UPDATED_TIME, value.getUpdatedTime());
} else {
jsonMap.put(Constants.UPDATED_TIME, null);
}
@@ -436,7 +437,7 @@ public class TicketsRequestInterceptor {
RestHighLevelClient rc = new RestHighLevelClient(RestClient.builder(new HttpHost(elasticsearchUrl)));
try {
DeleteRequest request = new DeleteRequest(elasticsearchIndex, "doc", String.valueOf(data.getId()));
- rc.delete(request);
+ rc.delete(request, RequestOptions.DEFAULT);
} catch (Exception e) {
LOGGER.error(e.getMessage());
} finally {
@@ -473,7 +474,7 @@ public class TicketsRequestInterceptor {
RestHighLevelClient rc = connectToElasticSearch();
try {
IndexRequest indexRequest = new IndexRequest(elasticsearchIndex, elasticsearchType, id).source(jsonMap);
- IndexResponse response = rc.index(indexRequest);
+ IndexResponse response = rc.index(indexRequest, RequestOptions.DEFAULT);
if (!StringUtils.isBlank(response.toString())) {
LOGGER.info("Response : {}", response);
}
@@ -488,7 +489,7 @@ public class TicketsRequestInterceptor {
RestHighLevelClient rc = connectToElasticSearch();
try {
UpdateRequest updateRequest = new UpdateRequest(elasticsearchIndex, elasticsearchType, id).doc(jsonMap);
- rc.update(updateRequest);
+ rc.update(updateRequest, RequestOptions.DEFAULT);
} catch (Exception e) {
LOGGER.error(e.getMessage());
} finally {
diff --git a/src/main/java/org/upsmf/grievance/model/Ticket.java b/src/main/java/org/upsmf/grievance/model/Ticket.java
index f081766422951cb1e03cec903ea87510e3a62a6b..87337b0617a21cd50bb803948f747cd3de9dd0aa 100644
--- a/src/main/java/org/upsmf/grievance/model/Ticket.java
+++ b/src/main/java/org/upsmf/grievance/model/Ticket.java
@@ -1,5 +1,6 @@
package org.upsmf.grievance.model;
+import java.sql.Timestamp;
import java.util.List;
import org.upsmf.grievance.dto.TicketWorkflowDto;
@@ -25,8 +26,8 @@ public class Ticket {
private String developerComment;
private int rate;
private int maxRating;
- private String createdTime;
- private String updatedTime;
+ private Timestamp createdTime;
+ private Timestamp updatedTime;
private Long createdTimeTS;
private Long updatedTimeTS;
private String userName;
diff --git a/src/main/java/org/upsmf/grievance/model/mapper/SqlDataMapper.java b/src/main/java/org/upsmf/grievance/model/mapper/SqlDataMapper.java
index 69a1eea5638b044b161619d5984066fb9653e78c..8ba7c64d09d61d9ca32dd1a80b156cb6e7cff5b6 100644
--- a/src/main/java/org/upsmf/grievance/model/mapper/SqlDataMapper.java
+++ b/src/main/java/org/upsmf/grievance/model/mapper/SqlDataMapper.java
@@ -505,9 +505,9 @@ public class SqlDataMapper {
ticket.setId(rs.getLong(SqlConstants.DbAttributes.TICKETID));
ticket.setAppId(rs.getLong(SqlConstants.DbAttributes.APPID));
ticket.setPinnedTicket(rs.getBoolean(SqlConstants.DbAttributes.PINNEDTICKET));
- ticket.setUpdatedTime(rs.getString(SqlConstants.DbAttributes.UPDATEDTIME));
+ ticket.setUpdatedTime(rs.getTimestamp(SqlConstants.DbAttributes.UPDATEDTIME));
ticket.setUpdatedTimeTS(rs.getDate(SqlConstants.DbAttributes.UPDATEDTIME).getTime());
- ticket.setCreatedTime(rs.getString(SqlConstants.DbAttributes.CREATEDTIME));
+ ticket.setCreatedTime(rs.getTimestamp(SqlConstants.DbAttributes.CREATEDTIME));
ticket.setCreatedTimeTS(rs.getDate(SqlConstants.DbAttributes.CREATEDTIME).getTime());
ticket.setRate(rs.getInt(SqlConstants.DbAttributes.RATING));
ticket.setMaxRating(rs.getInt(SqlConstants.DbAttributes.MAXRATING));
diff --git a/src/main/java/org/upsmf/grievance/repository/ElasticSearchRepository.java b/src/main/java/org/upsmf/grievance/repository/ElasticSearchRepository.java
index 77d86fef43d78ba61e09d316205f5404cbbc196f..df7f71f359688cc0afe1c4bf49ba5a1703eb251a 100644
--- a/src/main/java/org/upsmf/grievance/repository/ElasticSearchRepository.java
+++ b/src/main/java/org/upsmf/grievance/repository/ElasticSearchRepository.java
@@ -8,6 +8,7 @@ import org.apache.http.HttpHost;
import org.elasticsearch.action.search.MultiSearchRequest;
import org.elasticsearch.action.search.MultiSearchResponse;
import org.elasticsearch.action.search.SearchRequest;
+import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.RestClient;
import org.elasticsearch.client.RestHighLevelClient;
import org.slf4j.Logger;
@@ -85,7 +86,7 @@ public class ElasticSearchRepository {
}
multiRequest.add(searchRequest);
try {
- response = client.multiSearch(multiRequest);
+ response = client.multiSearch(multiRequest, RequestOptions.DEFAULT);
} catch (IOException e) {
LOGGER.error(String.format(marker.toString(), " Encountered an error while connecting : %s", e));
LOGGER.error(String.format(marker.toString(), " Error Message to report : %s", e.getMessage()));
diff --git a/src/main/java/org/upsmf/grievance/util/Sql.java b/src/main/java/org/upsmf/grievance/util/Sql.java
index 134a47cefb15f203334ef7a9ae7060ca5bdb4466..8b418e856d6891dbe70fbaf2686a8c416c010aac 100644
--- a/src/main/java/org/upsmf/grievance/util/Sql.java
+++ b/src/main/java/org/upsmf/grievance/util/Sql.java
@@ -266,7 +266,7 @@ public final class Sql {
public static final String FETCH_AUTH_TOKEN_REF = "SELECT id FROM user_authentication WHERE auth_token = ? ";
public static final String CHECK_USER_DEVICE_TOKEN = "SELECT COUNT(*) FROM user_device WHERE user_id = ? AND device_token = ? ";
public static final String INSERT_PD = "insert into password(pwd, user_id) values(?,?)";
- public static final String INSERT_ACTION = "INSERT INTO action(`id`,`name`,`display_name`,`url`) VALUES(?,?,?,?);";
+ public static final String INSERT_ACTION = "INSERT INTO action(id,name,display_name,url) VALUES(?,?,?,?);";
public static final String UPDATE_ACTION = "UPDATE action set name=?, display_name=?, url=? where id=?";
public static final String GET_AUTH_TYPE_ID = "select aut_id from organization_auth where org_id = ?";
public static final String CHECK_FIRST_ADMIN = "SELECT org_id FROM user_org WHERE user_id=?";