update code format

src/main/java/org/codelibs/fess/app/web/api/admin/dict/BaseSearchDictBody.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2012-2017 CodeLibs Project and the Others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
 package org.codelibs.fess.app.web.api.admin.dict;
 
 import org.codelibs.fess.app.web.api.admin.BaseSearchBody;

src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java

@@ -58,7 +58,7 @@ public abstract class EsAbstractConditionAggregation {
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
-    protected List<AbstractAggregationBuilder> aggregationAggregationBuilderList;
+    protected List<AbstractAggregationBuilder<?>> aggregationAggregationBuilderList;
 
     // ===================================================================================
     //                                                                             Control
@@ -68,7 +68,7 @@ public abstract class EsAbstractConditionAggregation {
         return aggregationAggregationBuilderList != null && !aggregationAggregationBuilderList.isEmpty();
     }
 
-    public List<AbstractAggregationBuilder> getAggregationBuilderList() {
+    public List<AbstractAggregationBuilder<?>> getAggregationBuilderList() {
         return aggregationAggregationBuilderList != null ? aggregationAggregationBuilderList : Collections.emptyList();
     }
 
@@ -222,7 +222,7 @@ public abstract class EsAbstractConditionAggregation {
         return builder;
     }
 
-    protected void regA(AbstractAggregationBuilder builder) {
+    protected void regA(AbstractAggregationBuilder<?> builder) {
         assertObjectNotNull("builder", builder);
         if (aggregationAggregationBuilderList == null) {
             aggregationAggregationBuilderList = new ArrayList<>();
@@ -266,7 +266,7 @@ public abstract class EsAbstractConditionAggregation {
     //                                                                        ============
 
     @FunctionalInterface
-    public interface ConditionOptionCall<OP extends AbstractAggregationBuilder> {
+    public interface ConditionOptionCall<OP extends AbstractAggregationBuilder<?>> {
 
         /**
          * @param op The option of condition to be set up. (NotNull)

src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java

@@ -573,6 +573,6 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
 
     @FunctionalInterface
     public interface ScoreFunctionCreator<T extends EsAbstractConditionQuery> {
-        void filter(final OperatorCall<T> cqLambda, final ScoreFunctionBuilder scoreFunctionBuilder);
+        void filter(final OperatorCall<T> cqLambda, final ScoreFunctionBuilder<?> scoreFunctionBuilder);
     }
 }

src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java

@@ -58,7 +58,7 @@ public abstract class EsAbstractConditionAggregation {
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
-    protected List<AbstractAggregationBuilder> aggregationAggregationBuilderList;
+    protected List<AbstractAggregationBuilder<?>> aggregationAggregationBuilderList;
 
     // ===================================================================================
     //                                                                             Control
@@ -68,7 +68,7 @@ public abstract class EsAbstractConditionAggregation {
         return aggregationAggregationBuilderList != null && !aggregationAggregationBuilderList.isEmpty();
     }
 
-    public List<AbstractAggregationBuilder> getAggregationBuilderList() {
+    public List<AbstractAggregationBuilder<?>> getAggregationBuilderList() {
         return aggregationAggregationBuilderList != null ? aggregationAggregationBuilderList : Collections.emptyList();
     }
 
@@ -222,7 +222,7 @@ public abstract class EsAbstractConditionAggregation {
         return builder;
     }
 
-    protected void regA(AbstractAggregationBuilder builder) {
+    protected void regA(AbstractAggregationBuilder<?> builder) {
         assertObjectNotNull("builder", builder);
         if (aggregationAggregationBuilderList == null) {
             aggregationAggregationBuilderList = new ArrayList<>();
@@ -266,7 +266,7 @@ public abstract class EsAbstractConditionAggregation {
     //                                                                        ============
 
     @FunctionalInterface
-    public interface ConditionOptionCall<OP extends AbstractAggregationBuilder> {
+    public interface ConditionOptionCall<OP extends AbstractAggregationBuilder<?>> {
 
         /**
          * @param op The option of condition to be set up. (NotNull)

src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java

@@ -573,6 +573,6 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
 
     @FunctionalInterface
     public interface ScoreFunctionCreator<T extends EsAbstractConditionQuery> {
-        void filter(final OperatorCall<T> cqLambda, final ScoreFunctionBuilder scoreFunctionBuilder);
+        void filter(final OperatorCall<T> cqLambda, final ScoreFunctionBuilder<?> scoreFunctionBuilder);
     }
 }

src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java

@@ -58,7 +58,7 @@ public abstract class EsAbstractConditionAggregation {
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
-    protected List<AbstractAggregationBuilder> aggregationAggregationBuilderList;
+    protected List<AbstractAggregationBuilder<?>> aggregationAggregationBuilderList;
 
     // ===================================================================================
     //                                                                             Control
@@ -68,7 +68,7 @@ public abstract class EsAbstractConditionAggregation {
         return aggregationAggregationBuilderList != null && !aggregationAggregationBuilderList.isEmpty();
     }
 
-    public List<AbstractAggregationBuilder> getAggregationBuilderList() {
+    public List<AbstractAggregationBuilder<?>> getAggregationBuilderList() {
         return aggregationAggregationBuilderList != null ? aggregationAggregationBuilderList : Collections.emptyList();
     }
 
@@ -222,7 +222,7 @@ public abstract class EsAbstractConditionAggregation {
         return builder;
     }
 
-    protected void regA(AbstractAggregationBuilder builder) {
+    protected void regA(AbstractAggregationBuilder<?> builder) {
         assertObjectNotNull("builder", builder);
         if (aggregationAggregationBuilderList == null) {
             aggregationAggregationBuilderList = new ArrayList<>();
@@ -266,7 +266,7 @@ public abstract class EsAbstractConditionAggregation {
     //                                                                        ============
 
     @FunctionalInterface
-    public interface ConditionOptionCall<OP extends AbstractAggregationBuilder> {
+    public interface ConditionOptionCall<OP extends AbstractAggregationBuilder<?>> {
 
         /**
          * @param op The option of condition to be set up. (NotNull)

src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java

@@ -573,6 +573,6 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
 
     @FunctionalInterface
     public interface ScoreFunctionCreator<T extends EsAbstractConditionQuery> {
-        void filter(final OperatorCall<T> cqLambda, final ScoreFunctionBuilder scoreFunctionBuilder);
+        void filter(final OperatorCall<T> cqLambda, final ScoreFunctionBuilder<?> scoreFunctionBuilder);
     }
 }