Browse Source

remove explicit type argument

sunyj 7 years ago
parent
commit
902269e393

+ 1 - 1
mall-search/src/main/java/com/uas/search/aop/ExceptionHandlerAdvice.java

@@ -44,7 +44,7 @@ public class ExceptionHandlerAdvice {
 		map.put("detailedMessage", ExceptionUtils.getDetailedMessage(e));
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		return new ResponseEntity<ModelMap>(map, headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		return new ResponseEntity<>(map, headers, HttpStatus.INTERNAL_SERVER_ERROR);
 	}
 
 	/**

+ 1 - 1
mall-search/src/main/java/com/uas/search/controller/SearchController.java

@@ -96,7 +96,7 @@ public class SearchController {
 
     private List<Component> findComponents(List<Long> ids){
         if (CollectionUtils.isEmpty(ids)) {
-            return new ArrayList<Component>();
+            return new ArrayList<>();
         }
 
         Long[] idsLong = new Long[ids.size()];

+ 6 - 6
mall-search/src/main/java/com/uas/search/service/impl/SearchServiceImpl.java

@@ -53,8 +53,8 @@ public class SearchServiceImpl implements SearchService {
 	public SPage<Long> getKindIds(String keyword, Integer page, Integer size) {
 		List<Long> ids = new ArrayList<>();
 		SPage<Document> documents = getKindDocuments(keyword, page, size);;
-		SPage<Long> sPage = new SPage<Long>(documents.getTotalPage(), documents.getTotalElement(), documents.getPage(),
-				documents.getSize(), documents.isFirst(), documents.isLast());
+		SPage<Long> sPage = new SPage<>(documents.getTotalPage(), documents.getTotalElement(), documents.getPage(),
+                documents.getSize(), documents.isFirst(), documents.isLast());
 		for (Document document : documents.getContent()) {
 			ids.add(Long.parseLong(document.get(SearchConstants.KIND_ID_FIELD)));
 		}
@@ -120,8 +120,8 @@ public class SearchServiceImpl implements SearchService {
 	public SPage<Long> getBrandIds(String keyword, Integer page, Integer size) {
 		List<Long> ids = new ArrayList<>();
 		SPage<Document> documents = getBrandDocuments(keyword, page, size);
-		SPage<Long> sPage = new SPage<Long>(documents.getTotalPage(), documents.getTotalElement(), documents.getPage(),
-				documents.getSize(), documents.isFirst(), documents.isLast());
+		SPage<Long> sPage = new SPage<>(documents.getTotalPage(), documents.getTotalElement(), documents.getPage(),
+                documents.getSize(), documents.isFirst(), documents.isLast());
 		for (Document document : documents.getContent()) {
 			ids.add(Long.parseLong(document.get(SearchConstants.BRAND_ID_FIELD)));
 		}
@@ -215,8 +215,8 @@ public class SearchServiceImpl implements SearchService {
 		if (pageParams.getSize() <= 0)
 			pageParams.setSize(20);
 
-		Map<String, Object> map = new HashMap<String, Object>();
-		List<Long> ids = new ArrayList<Long>();
+		Map<String, Object> map = new HashMap<>();
+		List<Long> ids = new ArrayList<>();
 		try {
 			BooleanQuery booleanQuery = new BooleanQuery();
 			if (!SearchUtils.isKeywordInvalid(keyword)) {

+ 1 - 1
mall-search/src/main/java/com/uas/search/support/DownloadHelper.java

@@ -178,7 +178,7 @@ public class DownloadHelper<T> {
                 logger.error("第 " + retry + " 次校验,下载遗失的文件:" + missingFiles);
                 List<DownloadHelper<T>> downloadHelpers = new ArrayList<>();
                 for (Integer missingFile : missingFiles) {
-                    downloadHelpers.add(new DownloadHelper<T>(1, missingFile, missingFile, tableName, sortField, dao, downloadService, NONE));
+                    downloadHelpers.add(new DownloadHelper<>(1, missingFile, missingFile, tableName, sortField, dao, downloadService, NONE));
                 }
                 for (DownloadHelper downloadHelper : downloadHelpers) {
                     downloadHelper.getResult();

+ 1 - 1
search-console-b2b/src/main/java/com/uas/search/console/b2b/aop/ExceptionHandlerAdvice.java

@@ -38,6 +38,6 @@ public class ExceptionHandlerAdvice {
 		map.put("detailedMessage", ExceptionUtils.getDetailedMessage(e));
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
-		return new ResponseEntity<ModelMap>(map, headers, HttpStatus.INTERNAL_SERVER_ERROR);
+		return new ResponseEntity<>(map, headers, HttpStatus.INTERNAL_SERVER_ERROR);
 	}
 }

+ 1 - 1
search-console-b2b/src/main/java/com/uas/search/console/b2b/service/impl/IndexServiceImpl.java

@@ -390,7 +390,7 @@ public class IndexServiceImpl implements IndexService {
         }
         endFileIndex = endFileIndex == null || endFileIndex < 1 ? 1024 * 1024 * 1024 : endFileIndex;
         for (int i = 1; i <= threads; i++) {
-            new Thread(new DownloadTread<T>(clazz, "Thread-" + i, threads, startFileIndex + i - 1, endFileIndex)).start();
+            new Thread(new DownloadTread<>(clazz, "Thread-" + i, threads, startFileIndex + i - 1, endFileIndex)).start();
         }
     }
 

+ 2 - 2
search-console-b2b/src/main/java/com/uas/search/console/b2b/service/impl/SearchServiceImpl.java

@@ -151,8 +151,8 @@ public class SearchServiceImpl implements SearchService, InnerSearchService {
 	 * @return
 	 */
 	private <T> SPage<T> convertSPage(SPage<ScoreDoc> scoreDocPage, Class<T> clazz) {
-		return new SPage<T>(scoreDocPage.getTotalPage(), scoreDocPage.getTotalElement(), scoreDocPage.getPage(),
-				scoreDocPage.getSize(), scoreDocPage.isFirst(), scoreDocPage.isLast());
+		return new SPage<>(scoreDocPage.getTotalPage(), scoreDocPage.getTotalElement(), scoreDocPage.getPage(),
+                scoreDocPage.getSize(), scoreDocPage.isFirst(), scoreDocPage.isLast());
 	}
 
 	/**