0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update code format

Browse source
This commit is contained in:
Shinsuke Sugaya 2017-05-25 17:03:29 +09:00
parent f5ffbb69bb
commit 1450c2b38a
7 changed files with 30 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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;

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

@ -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)

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

@ -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);
}
}

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

@ -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)

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

@ -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);
}
}

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

@ -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)

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

@ -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);
}
}