Removed es index type from search & index query

src/main/java/com/tarento/formservice/dao/impl/FormsDaoImpl.java

@@ -48,40 +48,35 @@ public class FormsDaoImpl implements FormsDao {
 
 	@Override
 	public Boolean addForm(FormDetail newForm) {
-		return elasticsearchRepo.writeDatatoElastic(newForm, newForm.getId().toString(), appConfig.getFormIndex(),
-				appConfig.getFormIndexType());
+		return elasticsearchRepo.writeDatatoElastic(newForm, newForm.getId().toString(), appConfig.getFormIndex());
 	}
 
 	@Override
 	public Boolean updateForm(FormDetail newForm) {
-		return elasticsearchRepo.updateElasticData(newForm, newForm.getId().toString(), appConfig.getFormIndex(),
-				appConfig.getFormIndexType());
+		return elasticsearchRepo.updateElasticData(newForm, newForm.getId().toString(), appConfig.getFormIndex());
 	}
 
 	@Override
 	public Boolean addFormData(IncomingData incomingData) {
 		incomingData.setApplicationId(RandomStringUtils.random(15, Boolean.TRUE, Boolean.TRUE));
 		return elasticsearchRepo.writeDatatoElastic(incomingData, incomingData.getApplicationId(),
-				appConfig.getFormDataIndex(), appConfig.getFormIndexType());
+				appConfig.getFormDataIndex());
 	}
-	
+
 	@Override
 	public Boolean addPlainFormData(IncomingData incomingData) {
 		incomingData.setApplicationId(RandomStringUtils.random(15, Boolean.TRUE, Boolean.TRUE));
-		return elasticsearchRepo.writeDatatoElastic(incomingData, incomingData.getApplicationId(),
-				"fs-plain-form", "forms");
+		return elasticsearchRepo.writeDatatoElastic(incomingData, incomingData.getApplicationId(), "fs-plain-form");
 	}
 
 	@Override
 	public Boolean updateFormData(Map<String, Object> jsonMap, String id) {
-		return elasticsearchRepo.updateElasticData(jsonMap, id, appConfig.getFormDataIndex(),
-				appConfig.getFormIndexType());
+		return elasticsearchRepo.updateElasticData(jsonMap, id, appConfig.getFormDataIndex());
 	}
 
 	@Override
 	public Boolean updateFormData(Object object, String id) {
-		return elasticsearchRepo.updateElasticData(object, id, appConfig.getFormDataIndex(),
-				appConfig.getFormIndexType());
+		return elasticsearchRepo.updateElasticData(object, id, appConfig.getFormDataIndex());
 	}
 
 	@Override
@@ -102,7 +97,7 @@ public class FormsDaoImpl implements FormsDao {
 			return null;
 		}
 	}
-	
+
 	@Override
 	public List<Map<String, Object>> searchPlainFormResponse(SearchRequest searchRequest) {
 		try {
@@ -204,8 +199,7 @@ public class FormsDaoImpl implements FormsDao {
 	@Override
 	public Boolean addLogs(ActivityLogs activityLogs) {
 		return elasticsearchRepo.writeDatatoElastic(activityLogs,
-				RandomStringUtils.random(15, Boolean.TRUE, Boolean.TRUE), appConfig.getActivityLogIndex(),
-				appConfig.getActivityLogIndexType());
+				RandomStringUtils.random(15, Boolean.TRUE, Boolean.TRUE), appConfig.getActivityLogIndex());
 	}
 
 }

src/main/java/com/tarento/formservice/repository/ElasticSearchRepository.java

@@ -87,11 +87,10 @@ public class ElasticSearchRepository {
 				RestClient.builder(new HttpHost(appConfig.getElasticHost(), appConfig.getElasticPort())));
 
 	}
-	
+
 	private RestHighLevelClient connectToElasticSearch2() {
 		final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-		credentialsProvider.setCredentials(AuthScope.ANY,
-				new UsernamePasswordCredentials("username", "password"));
+		credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials("username", "password"));
 
 		HttpClientConfigCallback httpClientConfigCallback = new HttpClientConfigCallback() {
 			@Override
@@ -99,9 +98,8 @@ public class ElasticSearchRepository {
 				return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
 			}
 		};
-		return new RestHighLevelClient(
-				RestClient.builder(new HttpHost("hostname",443, "https"))
-				.setHttpClientConfigCallback(httpClientConfigCallback)); 
+		return new RestHighLevelClient(RestClient.builder(new HttpHost("hostname", 443, "https"))
+				.setHttpClientConfigCallback(httpClientConfigCallback));
 
 	}
 
@@ -134,9 +132,9 @@ public class ElasticSearchRepository {
 		return false;
 	}
 
-	public Boolean writeDatatoElastic(Object object, String id, String indexName, String documentType) {
+	public Boolean writeDatatoElastic(Object object, String id, String indexName) {
 		try {
-			IndexRequest indexRequest = new IndexRequest(indexName, documentType, id).source(new Gson().toJson(object),
+			IndexRequest indexRequest = new IndexRequest().index(indexName).id(id).source(new Gson().toJson(object),
 					XContentType.JSON);
 			IndexResponse response = client.index(indexRequest, RequestOptions.DEFAULT);
 			if (!StringUtils.isBlank(response.toString()))
@@ -149,9 +147,9 @@ public class ElasticSearchRepository {
 	}
 
 	// Update ES Data
-	public Boolean updateElasticData(Object object, String id, String indexName, String documentType) {
+	public Boolean updateElasticData(Object object, String id, String indexName) {
 		try {
-			UpdateRequest updateRequest = new UpdateRequest(indexName, documentType, id).doc(new Gson().toJson(object),
+			UpdateRequest updateRequest = new UpdateRequest().index(indexName).id(id).doc(new Gson().toJson(object),
 					XContentType.JSON);
 			UpdateResponse response = client.update(updateRequest, RequestOptions.DEFAULT);
 			if (!StringUtils.isBlank(response.toString()))
@@ -225,12 +223,12 @@ public class ElasticSearchRepository {
 		}
 		return response;
 	}
-	
+
 	public MultiSearchResponse executeMultiSearchRequest(List<SearchRequest> searchRequests) {
 		MultiSearchResponse response = null;
 		try {
 			MultiSearchRequest multiRequest = new MultiSearchRequest();
-			for(SearchRequest request : searchRequests) { 
+			for (SearchRequest request : searchRequests) {
 				multiRequest.add(request);
 			}
 			response = client.msearch(multiRequest, RequestOptions.DEFAULT);

src/main/java/com/tarento/formservice/service/impl/FormsServiceImpl.java

@@ -154,8 +154,7 @@ public class FormsServiceImpl implements FormsService {
 		boolBuilder.must().add(QueryBuilders.matchQuery(Constants.Parameters.ID, newForm.getId()));
 		searchSourceBuilder.query(boolBuilder);
 		SearchRequest sRequest;
-		sRequest = new SearchRequest(appConfig.getFormIndex()).types(appConfig.getFormIndexType())
-				.source(searchSourceBuilder);
+		sRequest = new SearchRequest(appConfig.getFormIndex()).source(searchSourceBuilder);
 		return sRequest;
 	}
 
@@ -238,8 +237,7 @@ public class FormsServiceImpl implements FormsService {
 						.subAggregation(AggregationBuilders.topHits("LatestVersion").from(0).size(1)
 								.version(Boolean.FALSE).explain(Boolean.FALSE)
 								.sort(SortBuilders.fieldSort("version").order(SortOrder.DESC))));
-		return new SearchRequest(appConfig.getFormIndex()).types(appConfig.getFormIndexType())
-				.source(searchSourceBuilder);
+		return new SearchRequest(appConfig.getFormIndex()).source(searchSourceBuilder);
 	}
 
 	private BoolQueryBuilder roleBasedFormQuery(UserInfo userInfo) {
@@ -275,8 +273,7 @@ public class FormsServiceImpl implements FormsService {
 						.subAggregation(AggregationBuilders.topHits("LatestVersion").from(0).size(1)
 								.version(Boolean.FALSE).explain(Boolean.FALSE)
 								.sort(SortBuilders.fieldSort("version").order(SortOrder.DESC))));
-		return new SearchRequest(appConfig.getFormIndex()).types(appConfig.getFormIndexType())
-				.source(searchSourceBuilder);
+		return new SearchRequest(appConfig.getFormIndex()).source(searchSourceBuilder);
 	}
 
 	@Override
@@ -372,8 +369,7 @@ public class FormsServiceImpl implements FormsService {
 			searchSourceBuilder.sort(Constants.TIMESTAMP, SortOrder.DESC);
 			System.out.println(searchSourceBuilder);
 			// es call
-			SearchRequest searchRequest = new SearchRequest(appConfig.getFormDataIndex())
-					.types(appConfig.getFormIndexType()).source(searchSourceBuilder);
+			SearchRequest searchRequest = new SearchRequest(appConfig.getFormDataIndex()).source(searchSourceBuilder);
 			LOGGER.info("Search Request : " + searchRequest);
 			List<Map<String, Object>> response = formsDao.searchResponse(searchRequest);
 			if (searchRequestDto != null && searchRequestDto.getFilterObjects() != null) {
@@ -470,7 +466,7 @@ public class FormsServiceImpl implements FormsService {
 						searchSourceBuilder.aggregation(AggregationBuilders.terms("Total Pending")
 								.field(Constants.ElasticSearchFields.MAPPING.get(Constants.STATUS)));
 						SearchRequest searchRequest = new SearchRequest(appConfig.getFormDataIndex())
-								.types(appConfig.getFormIndexType()).source(searchSourceBuilder);
+								.source(searchSourceBuilder);
 						LOGGER.info("Search Request : " + searchRequest);
 						List<Map<String, Object>> responseNode = formsDao.searchAggregationResponse(searchRequest,
 								"Total Pending");
@@ -514,7 +510,7 @@ public class FormsServiceImpl implements FormsService {
 						SearchSourceBuilder totalPendingAggrSourceBuilder = new SearchSourceBuilder().size(0);
 						totalPendingAggrSourceBuilder.aggregation(totalPendingAggregationFilter);
 						SearchRequest totalPendingSearchRequest = new SearchRequest(appConfig.getFormDataIndex())
-								.types(appConfig.getFormIndexType()).source(totalPendingAggrSourceBuilder);
+								.source(totalPendingAggrSourceBuilder);
 						LOGGER.info("Search Request : " + totalPendingSearchRequest);
 						List<Map<String, Object>> totalPendingResponse = formsDao
 								.searchAggregationResponse(totalPendingSearchRequest, "Inspector Total Pending");
@@ -534,7 +530,7 @@ public class FormsServiceImpl implements FormsService {
 						SearchSourceBuilder receivedTodayAggrSourceBuilder = new SearchSourceBuilder().size(0);
 						receivedTodayAggrSourceBuilder.aggregation(receivedTodayAggregationFilter);
 						SearchRequest receivedTodaySearchRequest = new SearchRequest(appConfig.getFormDataIndex())
-								.types(appConfig.getFormIndexType()).source(receivedTodayAggrSourceBuilder);
+								.source(receivedTodayAggrSourceBuilder);
 						LOGGER.info("Search Request : " + receivedTodaySearchRequest);
 						List<Map<String, Object>> receivedTodayResponse = formsDao
 								.searchAggregationResponse(receivedTodaySearchRequest, "Received Today");
@@ -553,7 +549,7 @@ public class FormsServiceImpl implements FormsService {
 						SearchSourceBuilder reviewedTodayAggrSourceBuilder = new SearchSourceBuilder().size(0);
 						reviewedTodayAggrSourceBuilder.aggregation(reviewedTodayAggregationFilter);
 						SearchRequest reviewedTodaySearchRequest = new SearchRequest(appConfig.getFormDataIndex())
-								.types(appConfig.getFormIndexType()).source(reviewedTodayAggrSourceBuilder);
+								.source(reviewedTodayAggrSourceBuilder);
 						LOGGER.info("Search Request : " + reviewedTodaySearchRequest);
 						List<Map<String, Object>> reviewedTodayResponse = formsDao
 								.searchAggregationResponse(reviewedTodaySearchRequest, "Reviewed Today");
@@ -621,16 +617,15 @@ public class FormsServiceImpl implements FormsService {
 
 	@Override
 	public Boolean savePlainForm(IncomingData incomingData) {
-		Boolean indexed = null; 
+		Boolean indexed = null;
 		try {
-				indexed = formsDao.addPlainFormData(incomingData);
+			indexed = formsDao.addPlainFormData(incomingData);
 		} catch (Exception e) {
 			LOGGER.error(String.format(Constants.EXCEPTION, "savePlainForm", e.getMessage()));
 		}
 		return indexed;
 	}
 
-	
 	@Override
 	public Map<String, Object> getApplicationById(String applicationId, UserInfo userInfo) {
 		SearchRequestDto searchRequestDto = new SearchRequestDto();
@@ -820,8 +815,7 @@ public class FormsServiceImpl implements FormsService {
 	public ConcurrentMap<Long, State> fetchAllStates() {
 		SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder().size(1000);
 		// es call
-		SearchRequest searchRequest = new SearchRequest(appConfig.getFormStateIndex())
-				.types(appConfig.getFormIndexType()).source(searchSourceBuilder);
+		SearchRequest searchRequest = new SearchRequest(appConfig.getFormStateIndex()).source(searchSourceBuilder);
 		LOGGER.info("Search Request : " + searchRequest);
 		return formsDao.fetchAllStates(searchRequest);
 	}
@@ -831,7 +825,7 @@ public class FormsServiceImpl implements FormsService {
 		SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder().size(1000);
 		// es call
 		SearchRequest searchRequest = new SearchRequest(appConfig.getFormStateMatrixIndex())
-				.types(appConfig.getFormIndexType()).source(searchSourceBuilder);
+				.source(searchSourceBuilder);
 		LOGGER.info("Search Request : " + searchRequest);
 		return formsDao.fetchAllStateMatrix(searchRequest);
 	}
@@ -979,7 +973,7 @@ public class FormsServiceImpl implements FormsService {
 					new String[] {});
 			searchSourceBuilder.sort(SortBuilders.fieldSort(Constants.TIMESTAMP).order(SortOrder.DESC));
 			SearchRequest searchRequest = new SearchRequest(appConfig.getActivityLogIndex())
-					.types(appConfig.getActivityLogIndexType()).source(searchSourceBuilder);
+					.source(searchSourceBuilder);
 			return formsDao.searchResponse(searchRequest);
 		} catch (Exception e) {
 			LOGGER.error(String.format(Constants.EXCEPTION, "getActivityLogs", e.getMessage()));
@@ -1069,8 +1063,7 @@ public class FormsServiceImpl implements FormsService {
 			searchSourceBuilder.query(boolBuilder);
 			System.out.println(searchSourceBuilder);
 			// es call
-			SearchRequest searchRequest = new SearchRequest("fs-plain-form")
-					.types("forms").source(searchSourceBuilder);
+			SearchRequest searchRequest = new SearchRequest("fs-plain-form").types("forms").source(searchSourceBuilder);
 			LOGGER.info("Search Request : " + searchRequest);
 			List<Map<String, Object>> response = formsDao.searchPlainFormResponse(searchRequest);
 			return response;
@@ -1087,13 +1080,11 @@ public class FormsServiceImpl implements FormsService {
 			// query builder
 			SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder().size(1000);
 			BoolQueryBuilder boolBuilder = QueryBuilders.boolQuery();
-			boolBuilder.must().add(
-					QueryBuilders.termsQuery("_id", id));
+			boolBuilder.must().add(QueryBuilders.termsQuery("_id", id));
 			searchSourceBuilder.query(boolBuilder);
 			System.out.println(searchSourceBuilder);
 			// es call
-			SearchRequest searchRequest = new SearchRequest("fs-plain-form")
-					.types("forms").source(searchSourceBuilder);
+			SearchRequest searchRequest = new SearchRequest("fs-plain-form").types("forms").source(searchSourceBuilder);
 			LOGGER.info("Search Request : " + searchRequest);
 			List<Map<String, Object>> response = formsDao.searchPlainFormResponse(searchRequest);
 			return response;

src/main/java/com/tarento/formservice/utils/AppConfiguration.java

@@ -27,15 +27,9 @@ public class AppConfiguration {
 	@Value("${es.fs.forms.index.name}")
 	private String formIndex;
 
-	@Value("${es.fs.forms.document.type}")
-	private String formIndexType;
-
 	@Value("${es.fs.formsdata.index.name}")
 	private String formDataIndex;
 
-	@Value("${es.fs.formsdata.document.type}")
-	private String formDataIndexType;
-
 	@Value("${cloud_storage_type}")
 	private String provider;
 
@@ -84,9 +78,6 @@ public class AppConfiguration {
 	@Value("${es.fs.activitylog.index.name}")
 	private String activityLogIndex;
 
-	@Value("${es.fs.activitylog.index.type}")
-	private String activityLogIndexType;
-
 	@Value("${user.routes.getuserbyid.url}")
 	private String getUserByIdAPI;
 
@@ -160,14 +151,6 @@ public class AppConfiguration {
 		this.formIndex = formIndex;
 	}
 
-	public String getFormIndexType() {
-		return formIndexType;
-	}
-
-	public void setFormIndexType(String formIndexType) {
-		this.formIndexType = formIndexType;
-	}
-
 	public String getFormDataIndex() {
 		return formDataIndex;
 	}
@@ -176,14 +159,6 @@ public class AppConfiguration {
 		this.formDataIndex = formDataIndex;
 	}
 
-	public String getFormDataIndexType() {
-		return formDataIndexType;
-	}
-
-	public void setFormDataIndexType(String formDataIndexType) {
-		this.formDataIndexType = formDataIndexType;
-	}
-
 	public String getProvider() {
 		return provider;
 	}
@@ -312,12 +287,4 @@ public class AppConfiguration {
 		this.activityLogIndex = activityLogIndex;
 	}
 
-	public String getActivityLogIndexType() {
-		return activityLogIndexType;
-	}
-
-	public void setActivityLogIndexType(String activityLogIndexType) {
-		this.activityLogIndexType = activityLogIndexType;
-	}
-
 }

src/main/java/com/tarento/formservice/utils/WorkflowUtil.java

@@ -59,6 +59,6 @@ public class WorkflowUtil {
 
 	public static Boolean updateWorkflow(WorkflowDto workflowDto) {
 		return elasticsearchRepo.writeDatatoElastic(workflowDto, String.valueOf(new Date().getTime()),
-				appConfig.getWorkflowLogIndex(), appConfig.getFormIndexType());
+				appConfig.getWorkflowLogIndex());
 	}
 }

src/main/resources/application.properties

@@ -13,14 +13,11 @@ services.esindexer.username=elastic
 services.esindexer.password=PuAz@itAqwsaR34bYu
 # INDEX AND DOCUMENT TYPES
 es.fs.forms.index.name=fs-forms
-es.fs.forms.document.type=forms
 es.fs.formsdata.index.name=fs-forms-data
-es.fs.formsdata.document.type=forms
 es.fs.state.index.name=fs-forms-state
 es.fs.statematrix.index.name=fs-forms-state-matrix
 es.fs.workflowlog.index.name=fs-forms-workflow-log
 es.fs.activitylog.index.name=fs-forms-activity-log
-es.fs.activitylog.index.type=logs
 
 es.forms.fail.records.index.name=form-failure-records
 es.forms.fail.records.index.type=formfailurerecords