fix warnings

src/main/java/org/codelibs/fess/app/web/admin/suggest/AdminSuggestAction.java

@@ -22,14 +22,11 @@ import org.codelibs.fess.helper.SuggestHelper;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.ruts.process.ActionRuntime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * @author yfujita
  */
 public class AdminSuggestAction extends FessAdminAction {
-    private static final Logger logger = LoggerFactory.getLogger(AdminSuggestAction.class);
 
     // ===================================================================================
     //                                                                           Attribute

src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java

@@ -155,11 +155,13 @@ public class AdminUpgradeAction extends FessAdminAction {
         return redirect(getClass());
     }
 
+    /*
     private void upgradeFrom12_0() {
     }
 
     private void upgradeFromAll() {
     }
+    */
 
     private boolean startReindex(final boolean replaceAliases) {
         final String docIndex = "fess";

src/main/java/org/codelibs/fess/entity/QueryContext.java

@@ -38,7 +38,7 @@ import org.lastaflute.web.util.LaRequestUtil;
 public class QueryContext {
     private QueryBuilder queryBuilder;
 
-    private final List<SortBuilder> sortBuilderList = new ArrayList<>();
+    private final List<SortBuilder<?>> sortBuilderList = new ArrayList<>();
 
     private final String queryString;
 
@@ -87,7 +87,7 @@ public class QueryContext {
         this.queryBuilder = queryBuilder;
     }
 
-    public void addSorts(final SortBuilder... sortBuilders) {
+    public void addSorts(final SortBuilder<?>... sortBuilders) {
         stream(sortBuilders).of(stream -> stream.forEach(sortBuilder -> sortBuilderList.add(sortBuilder)));
     }
 
@@ -95,7 +95,7 @@ public class QueryContext {
         return !sortBuilderList.isEmpty();
     }
 
-    public List<SortBuilder> sortBuilders() {
+    public List<SortBuilder<?>> sortBuilders() {
         return sortBuilderList;
     }
 

src/main/java/org/codelibs/fess/es/client/FessEsClient.java

@@ -138,7 +138,7 @@ import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.Settings.Builder;
 import org.elasticsearch.common.transport.TransportAddress;
 import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.query.InnerHitBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
@@ -397,7 +397,7 @@ public class FessEsClient implements Client {
             }
             source = source.replaceAll(Pattern.quote("${fess.dictionary.path}"), dictionaryPath);
             final CreateIndexResponse indexResponse =
-                    client.admin().indices().prepareCreate(indexName).setSource(source, XContentFactory.xContentType(source)).execute()
+                    client.admin().indices().prepareCreate(indexName).setSource(source, XContentType.JSON).execute()
                             .actionGet(fessConfig.getIndexIndicesTimeout());
             if (indexResponse.isAcknowledged()) {
                 logger.info("Created " + indexName + " index.");
@@ -428,9 +428,8 @@ public class FessEsClient implements Client {
             }
             try {
                 final PutMappingResponse putMappingResponse =
-                        client.admin().indices().preparePutMapping(indexName).setType(docType)
-                                .setSource(source, XContentFactory.xContentType(source)).execute()
-                                .actionGet(fessConfig.getIndexIndicesTimeout());
+                        client.admin().indices().preparePutMapping(indexName).setType(docType).setSource(source, XContentType.JSON)
+                                .execute().actionGet(fessConfig.getIndexIndicesTimeout());
                 if (putMappingResponse.isAcknowledged()) {
                     logger.info("Created " + indexName + "/" + docType + " mapping.");
                 } else {
@@ -569,7 +568,7 @@ public class FessEsClient implements Client {
                                 if (result.keySet().contains("index")) {
                                     final IndexRequestBuilder requestBuilder =
                                             client.prepareIndex(configIndex, configType, result.get("index").get("_id")).setSource(line,
-                                                    XContentFactory.xContentType(line));
+                                                    XContentType.JSON);
                                     builder.add(requestBuilder);
                                 }
                             }

src/main/java/org/codelibs/fess/helper/CrawlerLogHelper.java

@@ -42,7 +42,7 @@ public class CrawlerLogHelper extends LogHelperImpl {
             switch (key) {
             case CRAWLING_ACCESS_EXCEPTION: {
                 final CrawlerContext crawlerContext = (CrawlerContext) objs[0];
-                final UrlQueue urlQueue = (UrlQueue) objs[1];
+                final UrlQueue<?> urlQueue = (UrlQueue<?>) objs[1];
                 Throwable e = (Throwable) objs[2];
                 if (e instanceof MultipleCrawlingAccessException) {
                     final Throwable[] causes = ((MultipleCrawlingAccessException) e).getCauses();
@@ -63,7 +63,7 @@ public class CrawlerLogHelper extends LogHelperImpl {
             }
             case CRAWLING_EXCETPION: {
                 final CrawlerContext crawlerContext = (CrawlerContext) objs[0];
-                final UrlQueue urlQueue = (UrlQueue) objs[1];
+                final UrlQueue<?> urlQueue = (UrlQueue<?>) objs[1];
                 final Throwable e = (Throwable) objs[2];
 
                 storeFailureUrl(crawlerContext, urlQueue, e.getClass().getCanonicalName(), e);
@@ -90,7 +90,7 @@ public class CrawlerLogHelper extends LogHelperImpl {
         super.log(key, objs);
     }
 
-    private void storeFailureUrl(final CrawlerContext crawlerContext, final UrlQueue urlQueue, final String errorName, final Throwable e) {
+    private void storeFailureUrl(final CrawlerContext crawlerContext, final UrlQueue<?> urlQueue, final String errorName, final Throwable e) {
 
         final CrawlingConfig crawlingConfig = getCrawlingConfig(crawlerContext.getSessionId());
         final String url = urlQueue.getUrl();

src/main/java/org/codelibs/fess/indexer/DocBoostMatcher.java

@@ -19,11 +19,8 @@ import java.util.Map;
 
 import org.codelibs.fess.es.config.exentity.BoostDocumentRule;
 import org.codelibs.fess.util.GroovyUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class DocBoostMatcher {
-    private static final Logger logger = LoggerFactory.getLogger(DocBoostMatcher.class);
 
     private String boostExpression = "0";