diff --git a/dbflute_fess/dfprop/esfluteMap.dfprop b/dbflute_fess/dfprop/esfluteMap.dfprop
index dc3e0a118..b9c9cc878 100644
--- a/dbflute_fess/dfprop/esfluteMap.dfprop
+++ b/dbflute_fess/dfprop/esfluteMap.dfprop
@@ -31,4 +31,5 @@ map:{
}
}
}
+ ; elasticsearchVersion = 2.0.0
}
diff --git a/pom.xml b/pom.xml
index d0f2d4f2c..308af8b16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,8 +60,8 @@
1.0.0-SNAPSHOT
- 1.7.3
- 1.7.0.1-SNAPSHOT
+ 2.0.0
+ 2.0.0.0-SNAPSHOT
0.3.8-RC9
@@ -277,26 +277,26 @@
+ url="${maven.snapshot.repo.url}/org/codelibs/elasticsearch-analysis-kuromoji-neologd/2.0.0-SNAPSHOT/elasticsearch-analysis-kuromoji-neologd-2.0.0-20151105.074711-1.zip" />
+ url="${maven.snapshot.repo.url}/org/codelibs/elasticsearch-analysis-synonym/2.0.0-SNAPSHOT/elasticsearch-analysis-synonym-2.0.0-20151104.150646-1.zip" />
+ url="${maven.snapshot.repo.url}/org/codelibs/elasticsearch-configsync/2.0.0-SNAPSHOT/elasticsearch-configsync-2.0.0-20151105.133219-2.zip" />
+ url="${maven.snapshot.repo.url}/org/codelibs/elasticsearch-langfield/2.0.0-SNAPSHOT/elasticsearch-langfield-2.0.0-20151105.133031-2.zip" />
+ src="${basedir}/target/plugins/elasticsearch-analysis-kuromoji-neologd-2.0.0-20151105.074711-1.zip" />
+ src="${basedir}/target/plugins/elasticsearch-analysis-synonym-2.0.0-20151104.150646-1.zip" />
+ src="${basedir}/target/plugins/elasticsearch-configsync-2.0.0-20151105.133219-2.zip" />
+ src="${basedir}/target/plugins/elasticsearch-langfield-2.0.0-20151105.133031-2.zip" />
@@ -392,18 +392,6 @@
-
- javax.servlet
- javax.servlet-api
- ${servlet.version}
- provided
-
-
- javax.servlet.jsp
- javax.servlet.jsp-api
- ${jsp.version}
- provided
-
javax.servlet
jstl
@@ -558,6 +546,24 @@
${tomcat.boot.version}
provided
+
+
+ org.apache.tomcat
+ tomcat-servlet-api
+
+
+ org.apache.tomcat
+ tomcat-juli
+
+
+ org.apache.tomcat
+ tomcat-api
+
+
+ org.apache.tomcat
+ tomcat-util-scan
+
+
diff --git a/src/main/config/es/fess_config.json b/src/main/config/es/fess_config.json
index 45cbf9618..cf005dc49 100644
--- a/src/main/config/es/fess_config.json
+++ b/src/main/config/es/fess_config.json
@@ -5,14 +5,7 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"labelTypeId" : {
"type" : "string",
"index" : "not_analyzed"
@@ -27,18 +20,11 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"dataConfigId" : {
"type" : "string",
"index" : "not_analyzed"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"roleTypeId" : {
"type" : "string",
"index" : "not_analyzed"
@@ -49,9 +35,6 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"createdBy" : {
"type" : "string",
@@ -60,10 +43,6 @@
"createdTime" : {
"type" : "long"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"processType" : {
"type" : "string",
"index" : "not_analyzed"
@@ -92,9 +71,6 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"boostExpr" : {
"type" : "string",
@@ -107,10 +83,6 @@
"createdTime" : {
"type" : "long"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"sortOrder" : {
"type" : "integer"
},
@@ -131,18 +103,11 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"fileConfigId" : {
"type" : "string",
"index" : "not_analyzed"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"roleTypeId" : {
"type" : "string",
"index" : "not_analyzed"
@@ -153,17 +118,10 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"endTime" : {
"type" : "long"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"jobName" : {
"type" : "string",
"index" : "not_analyzed"
@@ -197,9 +155,6 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"createdBy" : {
"type" : "string",
@@ -208,10 +163,6 @@
"createdTime" : {
"type" : "long"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"name" : {
"type" : "string",
"index" : "not_analyzed"
@@ -236,9 +187,6 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"available" : {
"type" : "boolean"
@@ -268,10 +216,6 @@
"type" : "string",
"index" : "not_analyzed"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"includedDocUrls" : {
"type" : "string",
"index" : "not_analyzed"
@@ -317,9 +261,6 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"authRealm" : {
"type" : "string",
@@ -336,10 +277,6 @@
"type" : "string",
"index" : "not_analyzed"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"parameters" : {
"type" : "string",
"index" : "not_analyzed"
@@ -376,18 +313,11 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"dataConfigId" : {
"type" : "string",
"index" : "not_analyzed"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"labelTypeId" : {
"type" : "string",
"index" : "not_analyzed"
@@ -398,9 +328,6 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"createdBy" : {
"type" : "string",
@@ -409,10 +336,6 @@
"createdTime" : {
"type" : "long"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"overlappingName" : {
"type" : "string",
"index" : "not_analyzed"
@@ -437,9 +360,6 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"createdBy" : {
"type" : "string",
@@ -448,10 +368,6 @@
"createdTime" : {
"type" : "long"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"name" : {
"type" : "string",
"index" : "not_analyzed"
@@ -477,9 +393,6 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"createdBy" : {
"type" : "string",
@@ -488,10 +401,6 @@
"createdTime" : {
"type" : "long"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"suggestWord" : {
"type" : "string",
"index" : "not_analyzed"
@@ -517,9 +426,6 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"available" : {
"type" : "boolean"
@@ -546,10 +452,6 @@
"type" : "string",
"index" : "not_analyzed"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"name" : {
"type" : "string",
"index" : "not_analyzed"
@@ -570,9 +472,6 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"crawlingSessionId" : {
"type" : "string",
@@ -581,10 +480,6 @@
"createdTime" : {
"type" : "long"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"key" : {
"type" : "string",
"index" : "not_analyzed"
@@ -599,14 +494,7 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"roleTypeId" : {
"type" : "string",
"index" : "not_analyzed"
@@ -621,9 +509,6 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"createdBy" : {
"type" : "string",
@@ -640,10 +525,6 @@
"type" : "string",
"index" : "not_analyzed"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"parameters" : {
"type" : "string",
"index" : "not_analyzed"
@@ -676,9 +557,6 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"createdTime" : {
"type" : "long"
@@ -686,10 +564,6 @@
"expiredTime" : {
"type" : "long"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"name" : {
"type" : "string",
"index" : "not_analyzed"
@@ -704,9 +578,6 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"boost" : {
"type" : "float"
@@ -718,10 +589,6 @@
"createdTime" : {
"type" : "long"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"maxSize" : {
"type" : "integer"
},
@@ -746,14 +613,7 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"labelTypeId" : {
"type" : "string",
"index" : "not_analyzed"
@@ -768,9 +628,6 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"boost" : {
"type" : "float"
@@ -782,10 +639,6 @@
"createdTime" : {
"type" : "long"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"reading" : {
"type" : "string",
"index" : "not_analyzed"
@@ -815,18 +668,11 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"fileConfigId" : {
"type" : "string",
"index" : "not_analyzed"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"labelTypeId" : {
"type" : "string",
"index" : "not_analyzed"
@@ -837,9 +683,6 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"available" : {
"type" : "boolean"
@@ -869,10 +712,6 @@
"type" : "string",
"index" : "not_analyzed"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"includedDocPaths" : {
"type" : "string",
"index" : "not_analyzed"
@@ -914,9 +753,6 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"available" : {
"type" : "boolean"
@@ -935,10 +771,6 @@
"type" : "string",
"index" : "not_analyzed"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"jobLogging" : {
"type" : "boolean"
},
@@ -974,9 +806,6 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"configId" : {
"type" : "string",
@@ -993,10 +822,6 @@
"type" : "string",
"index" : "not_analyzed"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"lastAccessTime" : {
"type" : "long"
},
@@ -1014,9 +839,6 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"createdBy" : {
"type" : "string",
@@ -1029,10 +851,6 @@
"type" : "string",
"index" : "not_analyzed"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"includedPaths" : {
"type" : "string",
"index" : "not_analyzed"
diff --git a/src/main/config/es/fess_log.json b/src/main/config/es/fess_log.json
index c3f0e2b9b..463e69b43 100644
--- a/src/main/config/es/fess_log.json
+++ b/src/main/config/es/fess_log.json
@@ -5,14 +5,7 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"name" : {
"type" : "string",
"index" : "not_analyzed"
@@ -31,17 +24,10 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"createdTime" : {
"type" : "long"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"url" : {
"type" : "string",
"index" : "not_analyzed"
@@ -56,9 +42,6 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"createdAt" : {
"type" : "date",
@@ -72,10 +55,6 @@
"type" : "string",
"index" : "not_analyzed"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"message" : {
"type" : "string"
},
@@ -89,14 +68,7 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"requestedTime" : {
"type" : "long"
},
@@ -114,9 +86,6 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"accessType" : {
"type" : "string",
@@ -129,10 +98,6 @@
"hitCount" : {
"type" : "long"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"queryOffset" : {
"type" : "integer"
},
@@ -171,9 +136,6 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"code" : {
"type" : "string",
@@ -182,10 +144,6 @@
"createdTime" : {
"type" : "long"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"updatedTime" : {
"type" : "long"
}
diff --git a/src/main/config/es/fess_user.json b/src/main/config/es/fess_user.json
index 084f5eda5..996950047 100644
--- a/src/main/config/es/fess_user.json
+++ b/src/main/config/es/fess_user.json
@@ -5,14 +5,7 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"name" : {
"type" : "string",
"index" : "not_analyzed"
@@ -23,18 +16,11 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
"groups" : {
"type" : "string",
"index" : "not_analyzed"
},
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"name" : {
"type" : "string",
"index" : "not_analyzed"
@@ -53,14 +39,7 @@
"_all" : {
"enabled" : false
},
- "_id" : {
- "path" : "id"
- },
"properties" : {
- "id" : {
- "type" : "string",
- "index" : "not_analyzed"
- },
"name" : {
"type" : "string",
"index" : "not_analyzed"
diff --git a/src/main/java/org/codelibs/fess/entity/GeoInfo.java b/src/main/java/org/codelibs/fess/entity/GeoInfo.java
index 54c64afab..2224a2cd3 100644
--- a/src/main/java/org/codelibs/fess/entity/GeoInfo.java
+++ b/src/main/java/org/codelibs/fess/entity/GeoInfo.java
@@ -17,8 +17,8 @@ package org.codelibs.fess.entity;
import org.codelibs.core.lang.StringUtil;
import org.elasticsearch.common.unit.DistanceUnit;
-import org.elasticsearch.index.query.FilterBuilder;
-import org.elasticsearch.index.query.FilterBuilders;
+import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
public class GeoInfo {
//@Mask(mask = "-?([0-9]+|[0-9]+\\.[0-9]+)")
@@ -35,7 +35,7 @@ public class GeoInfo {
private boolean isInit = false;
- private FilterBuilder builder;
+ private QueryBuilder builder;
private void init() {
if (!isInit) {
@@ -74,7 +74,7 @@ public class GeoInfo {
}
}
- builder = FilterBuilders.geoDistanceFilter("geo_info").distance(dist, DistanceUnit.KILOMETERS).lat(lat).lon(lon);
+ builder = QueryBuilders.geoDistanceQuery("geo_info").distance(dist, DistanceUnit.KILOMETERS).lat(lat).lon(lon);
} catch (final NumberFormatException e) {
clear();
}
@@ -93,7 +93,7 @@ public class GeoInfo {
return builder != null;
}
- public FilterBuilder toFilterBuilder() {
+ public QueryBuilder toQueryBuilder() {
init();
return builder;
}
diff --git a/src/main/java/org/codelibs/fess/entity/QueryContext.java b/src/main/java/org/codelibs/fess/entity/QueryContext.java
index 6a83c2178..78b11b10a 100644
--- a/src/main/java/org/codelibs/fess/entity/QueryContext.java
+++ b/src/main/java/org/codelibs/fess/entity/QueryContext.java
@@ -26,7 +26,6 @@ import java.util.stream.Stream;
import org.codelibs.fess.Constants;
import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilterBuilder;
import org.elasticsearch.index.query.MatchAllQueryBuilder;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
@@ -52,10 +51,6 @@ public class QueryContext {
});
}
- public void addFilter(final FilterBuilder filterBuilder) {
- queryBuilder = QueryBuilders.filteredQuery(queryBuilder, filterBuilder);
- }
-
public void addQuery(final Consumer boolQuery) {
BoolQueryBuilder builder;
if (queryBuilder instanceof BoolQueryBuilder) {
@@ -104,4 +99,8 @@ public class QueryContext {
highlightedQuerySet.add(text);
}
+ public String getQueryString() {
+ return queryString;
+ }
+
}
diff --git a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
index 88e116876..4bf4fc4f7 100644
--- a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
+++ b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
@@ -18,6 +18,8 @@ package org.codelibs.fess.es.client;
import static org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner.newConfigs;
import java.io.File;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
@@ -46,11 +48,13 @@ import org.codelibs.fess.entity.FacetInfo;
import org.codelibs.fess.entity.GeoInfo;
import org.codelibs.fess.entity.PingResponse;
import org.codelibs.fess.entity.QueryContext;
+import org.codelibs.fess.exception.FessSystemException;
import org.codelibs.fess.exception.ResultOffsetExceededException;
import org.codelibs.fess.helper.QueryHelper;
import org.codelibs.fess.indexer.FessSearchQueryException;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.StreamUtil;
+import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.action.Action;
@@ -59,7 +63,6 @@ import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.ActionRequest;
import org.elasticsearch.action.ActionRequestBuilder;
import org.elasticsearch.action.ActionResponse;
-import org.elasticsearch.action.ShardOperationFailedException;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
import org.elasticsearch.action.admin.indices.flush.FlushResponse;
@@ -76,9 +79,6 @@ import org.elasticsearch.action.count.CountResponse;
import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.action.delete.DeleteRequestBuilder;
import org.elasticsearch.action.delete.DeleteResponse;
-import org.elasticsearch.action.deletebyquery.DeleteByQueryRequest;
-import org.elasticsearch.action.deletebyquery.DeleteByQueryRequestBuilder;
-import org.elasticsearch.action.deletebyquery.DeleteByQueryResponse;
import org.elasticsearch.action.exists.ExistsRequest;
import org.elasticsearch.action.exists.ExistsRequestBuilder;
import org.elasticsearch.action.exists.ExistsResponse;
@@ -107,8 +107,6 @@ import org.elasticsearch.action.indexedscripts.get.GetIndexedScriptResponse;
import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptRequest;
import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptRequestBuilder;
import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptResponse;
-import org.elasticsearch.action.mlt.MoreLikeThisRequest;
-import org.elasticsearch.action.mlt.MoreLikeThisRequestBuilder;
import org.elasticsearch.action.percolate.MultiPercolateRequest;
import org.elasticsearch.action.percolate.MultiPercolateRequestBuilder;
import org.elasticsearch.action.percolate.MultiPercolateResponse;
@@ -126,36 +124,37 @@ import org.elasticsearch.action.search.SearchRequestBuilder;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.SearchScrollRequest;
import org.elasticsearch.action.search.SearchScrollRequestBuilder;
+import org.elasticsearch.action.search.SearchType;
import org.elasticsearch.action.suggest.SuggestRequest;
import org.elasticsearch.action.suggest.SuggestRequestBuilder;
import org.elasticsearch.action.suggest.SuggestResponse;
-import org.elasticsearch.action.termvector.MultiTermVectorsRequest;
-import org.elasticsearch.action.termvector.MultiTermVectorsRequestBuilder;
-import org.elasticsearch.action.termvector.MultiTermVectorsResponse;
-import org.elasticsearch.action.termvector.TermVectorRequest;
-import org.elasticsearch.action.termvector.TermVectorRequestBuilder;
-import org.elasticsearch.action.termvector.TermVectorResponse;
+import org.elasticsearch.action.termvectors.MultiTermVectorsRequest;
+import org.elasticsearch.action.termvectors.MultiTermVectorsRequestBuilder;
+import org.elasticsearch.action.termvectors.MultiTermVectorsResponse;
+import org.elasticsearch.action.termvectors.TermVectorsRequest;
+import org.elasticsearch.action.termvectors.TermVectorsRequestBuilder;
+import org.elasticsearch.action.termvectors.TermVectorsResponse;
import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.action.update.UpdateRequestBuilder;
import org.elasticsearch.action.update.UpdateResponse;
import org.elasticsearch.client.AdminClient;
import org.elasticsearch.client.Client;
+import org.elasticsearch.client.support.Headers;
import org.elasticsearch.client.transport.TransportClient;
import org.elasticsearch.cluster.metadata.MappingMetaData;
import org.elasticsearch.common.collect.ImmutableOpenMap;
-import org.elasticsearch.common.settings.ImmutableSettings;
-import org.elasticsearch.common.settings.ImmutableSettings.Builder;
import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.settings.Settings.Builder;
import org.elasticsearch.common.transport.InetSocketTransportAddress;
import org.elasticsearch.common.transport.TransportAddress;
import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.index.IndexNotFoundException;
import org.elasticsearch.index.get.GetField;
-import org.elasticsearch.index.query.FilterBuilders;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.indices.IndexAlreadyExistsException;
-import org.elasticsearch.indices.IndexMissingException;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.SearchHitField;
+import org.elasticsearch.search.SearchHits;
import org.elasticsearch.search.aggregations.AggregationBuilders;
import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
@@ -184,6 +183,10 @@ public class FessEsClient implements Client {
protected Map> configListMap = new HashMap<>();
+ protected int sizeForDelete = 100;
+
+ protected String scrollForDelete = "1m";
+
public void addIndexConfig(final String path) {
indexConfigList.add(path);
}
@@ -218,7 +221,11 @@ public class FessEsClient implements Client {
}
public void addTransportAddress(final String host, final int port) {
- transportAddressList.add(new InetSocketTransportAddress(host, port));
+ try {
+ transportAddressList.add(new InetSocketTransportAddress(InetAddress.getByName(host), port));
+ } catch (UnknownHostException e) {
+ throw new FessSystemException("Failed to resolve the hostname: " + host, e);
+ }
}
@PostConstruct
@@ -268,10 +275,10 @@ public class FessEsClient implements Client {
client = runner.client();
addTransportAddress("localhost", runner.node().settings().getAsInt("transport.tcp.port", 9300));
} else {
- final Builder settingsBuilder = ImmutableSettings.settingsBuilder();
+ final Builder settingsBuilder = Settings.settingsBuilder();
settingsBuilder.put("cluster.name", clusterName);
final Settings settings = settingsBuilder.build();
- final TransportClient transportClient = new TransportClient(settings);
+ final TransportClient transportClient = TransportClient.builder().settings(settings).build();
for (final TransportAddress address : transportAddressList) {
transportClient.addTransportAddress(address);
}
@@ -311,7 +318,7 @@ public class FessEsClient implements Client {
try {
client.prepareExists(configIndex).execute().actionGet();
exists = true;
- } catch (final IndexMissingException e) {
+ } catch (final IndexNotFoundException e) {
// ignore
}
if (!exists) {
@@ -437,23 +444,35 @@ public class FessEsClient implements Client {
}
}
- public void deleteByQuery(final String index, final String type, final QueryBuilder queryBuilder) {
- try {
- // TODO replace with deleting bulk ids with scroll/scan
- client.prepareDeleteByQuery(index).setQuery(queryBuilder).setTypes(type).execute().actionGet().forEach(res -> {
- final ShardOperationFailedException[] failures = res.getFailures();
- if (failures.length > 0) {
- final StringBuilder buf = new StringBuilder(200);
- buf.append("Failed to delete documents in some shards.");
- for (final ShardOperationFailedException failure : failures) {
- buf.append('\n').append(failure.toString());
- }
- throw new FessEsClientException(buf.toString());
- }
- });
- } catch (final ElasticsearchException e) {
- throw new FessEsClientException("Failed to delete documents.", e);
+ public int deleteByQuery(final String index, final String type, final QueryBuilder queryBuilder) {
+
+ final SearchResponse response =
+ client.prepareSearch(index).setTypes(type).setSearchType(SearchType.SCAN).setScroll(scrollForDelete).setSize(sizeForDelete)
+ .setQuery(queryBuilder).execute().actionGet();
+
+ int count = 0;
+ String scrollId = response.getScrollId();
+ while (scrollId != null) {
+ final SearchResponse scrollResponse = client.prepareSearchScroll(scrollId).setScroll(scrollForDelete).execute().actionGet();
+ scrollId = scrollResponse.getScrollId();
+ final SearchHits searchHits = scrollResponse.getHits();
+ final SearchHit[] hits = searchHits.getHits();
+ if (hits.length == 0) {
+ scrollId = null;
+ break;
+ }
+
+ final BulkRequestBuilder bulkRequest = client.prepareBulk();
+ for (final SearchHit hit : hits) {
+ bulkRequest.add(client.prepareDelete(index, type, hit.getId()));
+ }
+ count += hits.length;
+ final BulkResponse bulkResponse = bulkRequest.execute().actionGet();
+ if (bulkResponse.hasFailures()) {
+ throw new IllegalBehaviorStateException(bulkResponse.buildFailureMessage());
+ }
}
+ return count;
}
public T get(final String index, final String type, final String id, final SearchCondition condition,
@@ -743,7 +762,9 @@ public class FessEsClient implements Client {
final QueryContext queryContext = queryHelper.build(query, context -> {
// geo
if (geoInfo != null && geoInfo.isAvailable()) {
- context.addFilter(geoInfo.toFilterBuilder());
+ context.addQuery(boolQuery -> {
+ boolQuery.filter(geoInfo.toQueryBuilder());
+ });
}
});
@@ -783,7 +804,7 @@ public class FessEsClient implements Client {
final String encodedFacetQuery = BaseEncoding.base64().encode(fq.getBytes(StandardCharsets.UTF_8));
final FilterAggregationBuilder filterBuilder =
AggregationBuilders.filter(Constants.FACET_QUERY_PREFIX + encodedFacetQuery).filter(
- FilterBuilders.queryFilter(facetContext.getQueryBuilder()));
+ facetContext.getQueryBuilder());
// TODO order
if (facetInfo.limit != null) {
// TODO
@@ -857,24 +878,6 @@ public class FessEsClient implements Client {
// Elasticsearch Client
//
- @Override
- public > ActionFuture execute(
- final Action action, final Request request) {
- return client.execute(action, request);
- }
-
- @Override
- public > void execute(
- final Action action, final Request request, final ActionListener listener) {
- client.execute(action, request, listener);
- }
-
- @Override
- public > RequestBuilder prepareExecute(
- final Action action) {
- return client.prepareExecute(action);
- }
-
@Override
public ThreadPool threadPool() {
return client.threadPool();
@@ -965,21 +968,6 @@ public class FessEsClient implements Client {
return client.prepareBulk();
}
- @Override
- public ActionFuture deleteByQuery(final DeleteByQueryRequest request) {
- return client.deleteByQuery(request);
- }
-
- @Override
- public void deleteByQuery(final DeleteByQueryRequest request, final ActionListener listener) {
- client.deleteByQuery(request, listener);
- }
-
- @Override
- public DeleteByQueryRequestBuilder prepareDeleteByQuery(final String... indices) {
- return client.prepareDeleteByQuery(indices);
- }
-
@Override
public ActionFuture get(final GetRequest request) {
return client.get(request);
@@ -1165,56 +1153,6 @@ public class FessEsClient implements Client {
return client.prepareMultiSearch();
}
- @Override
- public ActionFuture moreLikeThis(final MoreLikeThisRequest request) {
- return client.moreLikeThis(request);
- }
-
- @Override
- public void moreLikeThis(final MoreLikeThisRequest request, final ActionListener listener) {
- client.moreLikeThis(request, listener);
- }
-
- @Override
- public MoreLikeThisRequestBuilder prepareMoreLikeThis(final String index, final String type, final String id) {
- return client.prepareMoreLikeThis(index, type, id);
- }
-
- @Override
- public ActionFuture termVector(final TermVectorRequest request) {
- return client.termVector(request);
- }
-
- @Override
- public void termVector(final TermVectorRequest request, final ActionListener listener) {
- client.termVector(request, listener);
- }
-
- @Override
- public TermVectorRequestBuilder prepareTermVector() {
- return client.prepareTermVector();
- }
-
- @Override
- public TermVectorRequestBuilder prepareTermVector(final String index, final String type, final String id) {
- return client.prepareTermVector(index, type, id);
- }
-
- @Override
- public ActionFuture multiTermVectors(final MultiTermVectorsRequest request) {
- return client.multiTermVectors(request);
- }
-
- @Override
- public void multiTermVectors(final MultiTermVectorsRequest request, final ActionListener listener) {
- client.multiTermVectors(request, listener);
- }
-
- @Override
- public MultiTermVectorsRequestBuilder prepareMultiTermVectors() {
- return client.prepareMultiTermVectors();
- }
-
@Override
public ActionFuture percolate(final PercolateRequest request) {
return client.percolate(request);
@@ -1295,4 +1233,90 @@ public class FessEsClient implements Client {
return client.settings();
}
+ @Override
+ public > ActionFuture execute(
+ Action action, Request request) {
+ return client.execute(action, request);
+ }
+
+ @Override
+ public > void execute(
+ Action action, Request request, ActionListener listener) {
+ client.execute(action, request, listener);
+ }
+
+ @Override
+ public > RequestBuilder prepareExecute(
+ Action action) {
+ return client.prepareExecute(action);
+ }
+
+ @Override
+ public ActionFuture termVectors(TermVectorsRequest request) {
+ return client.termVectors(request);
+ }
+
+ @Override
+ public void termVectors(TermVectorsRequest request, ActionListener listener) {
+ client.termVector(request, listener);
+ }
+
+ @Override
+ public TermVectorsRequestBuilder prepareTermVectors() {
+ return client.prepareTermVectors();
+ }
+
+ @Override
+ public TermVectorsRequestBuilder prepareTermVectors(String index, String type, String id) {
+ return client.prepareTermVectors(index, type, id);
+ }
+
+ @Override
+ public ActionFuture termVector(TermVectorsRequest request) {
+ return client.termVector(request);
+ }
+
+ @Override
+ public void termVector(TermVectorsRequest request, ActionListener listener) {
+ client.termVector(request, listener);
+ }
+
+ @Override
+ public TermVectorsRequestBuilder prepareTermVector() {
+ return client.prepareTermVector();
+ }
+
+ @Override
+ public TermVectorsRequestBuilder prepareTermVector(String index, String type, String id) {
+ return client.prepareTermVector(index, type, id);
+ }
+
+ @Override
+ public ActionFuture multiTermVectors(MultiTermVectorsRequest request) {
+ return client.multiTermVectors(request);
+ }
+
+ @Override
+ public void multiTermVectors(MultiTermVectorsRequest request, ActionListener listener) {
+ client.multiTermVectors(request, listener);
+ }
+
+ @Override
+ public MultiTermVectorsRequestBuilder prepareMultiTermVectors() {
+ return client.prepareMultiTermVectors();
+ }
+
+ @Override
+ public Headers headers() {
+ return client.headers();
+ }
+
+ public void setSizeForDelete(int sizeForDelete) {
+ this.sizeForDelete = sizeForDelete;
+ }
+
+ public void setScrollForDelete(String scrollForDelete) {
+ this.scrollForDelete = scrollForDelete;
+ }
+
}
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionFilter.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionFilter.java
deleted file mode 100644
index 3c2142f18..000000000
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionFilter.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.allcommon;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.InvalidQueryRegisteredException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.FilterBuilder;
-import org.elasticsearch.index.query.FilterBuilders;
-import org.elasticsearch.index.query.IdsFilterBuilder;
-import org.elasticsearch.index.query.MatchAllFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.ScriptFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class EsAbstractConditionFilter {
-
- // ===================================================================================
- // Attribute
- // =========
- protected List filterBuilderList;
-
- // ===================================================================================
- // Control
- // =======
- public boolean hasFilters() {
- return filterBuilderList != null && !filterBuilderList.isEmpty();
- }
-
- public FilterBuilder getFilter() {
- if (filterBuilderList == null) {
- return null;
- } else if (filterBuilderList.size() == 1) {
- return filterBuilderList.get(0);
- }
- return FilterBuilders.andFilter(filterBuilderList.toArray(new FilterBuilder[filterBuilderList.size()]));
- }
-
- public void addFilter(FilterBuilder filterBuilder) {
- regF(filterBuilder);
- }
-
- // ===================================================================================
- // Query
- // =====
- public void setIds_Equal(Collection idList) {
- checkEsInvalidQueryCollection("ids", idList);
- doSetIds_Equal(idList, null);
- }
-
- public void setIds_Equal(Collection idList, ConditionOptionCall opLambda) {
- checkEsInvalidQueryCollection("ids", idList);
- assertObjectNotNull("opLambda", opLambda);
- doSetIds_Equal(idList, opLambda);
- }
-
- protected void doSetIds_Equal(Collection idList, ConditionOptionCall opLambda) {
- IdsFilterBuilder builder = regIdsF(idList);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void matchAll() {
- doMatchAll(null);
- }
-
- public void matchAll(ConditionOptionCall opLambda) {
- assertObjectNotNull("opLambda", opLambda);
- doMatchAll(opLambda);
- }
-
- protected void doMatchAll(ConditionOptionCall opLambda) {
- MatchAllFilterBuilder builder = FilterBuilders.matchAllFilter();
- regF(builder);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setScript(String script) {
- checkEsInvalidQuery("script", script);
- doSetScript(script, null);
- }
-
- public void setScript(String script, ConditionOptionCall opLambda) {
- checkEsInvalidQuery("script", script);
- assertObjectNotNull("opLambda", opLambda);
- doSetScript(script, opLambda);
- }
-
- protected void doSetScript(String script, ConditionOptionCall opLambda) {
- ScriptFilterBuilder builder = regScriptF(script);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- // ===================================================================================
- // Register
- // ========
- protected void regF(FilterBuilder builder) {
- assertObjectNotNull("builder", builder);
- if (filterBuilderList == null) {
- filterBuilderList = new ArrayList<>();
- }
- filterBuilderList.add(builder);
- }
-
- protected TermFilterBuilder regTermF(String name, Object value) {
- checkEsInvalidQuery(name, value);
- TermFilterBuilder termFilter = FilterBuilders.termFilter(name, value);
- regF(termFilter);
- return termFilter;
- }
-
- protected TermsFilterBuilder regTermsF(String name, Collection> values) {
- checkEsInvalidQueryCollection(name, values);
- TermsFilterBuilder termsFilter = FilterBuilders.termsFilter(name, values);
- regF(termsFilter);
- return termsFilter;
- }
-
- protected PrefixFilterBuilder regPrefixF(String name, String value) {
- checkEsInvalidQuery(name, value);
- PrefixFilterBuilder prefixFilter = FilterBuilders.prefixFilter(name, value);
- regF(prefixFilter);
- return prefixFilter;
- }
-
- protected ExistsFilterBuilder regExistsF(String name) {
- ExistsFilterBuilder existsFilter = FilterBuilders.existsFilter(name);
- regF(existsFilter);
- return existsFilter;
- }
-
- protected MissingFilterBuilder regMissingF(String name) {
- MissingFilterBuilder missingFilter = FilterBuilders.missingFilter(name);
- regF(missingFilter);
- return missingFilter;
- }
-
- protected RangeFilterBuilder regRangeF(String name, ConditionKey ck, Object value) {
- checkEsInvalidQuery(name, value);
- assertObjectNotNull("ck", ck);
- for (FilterBuilder builder : filterBuilderList) {
- if (builder instanceof RangeFilterBuilder) {
- RangeFilterBuilder rangeFilterBuilder = (RangeFilterBuilder) builder;
- if (rangeFilterBuilder.toString().replaceAll("\\s", "").startsWith("{\"range\":{\"" + name + "\"")) {
- addRangeC(rangeFilterBuilder, ck, value);
- return rangeFilterBuilder;
- }
- }
- }
- RangeFilterBuilder rangeFilterBuilder = FilterBuilders.rangeFilter(name);
- addRangeC(rangeFilterBuilder, ck, value);
- regF(rangeFilterBuilder);
- return rangeFilterBuilder;
- }
-
- protected void addRangeC(RangeFilterBuilder builder, ConditionKey ck, Object value) {
- assertObjectNotNull("builder", builder);
- assertObjectNotNull("ck", ck);
- if (ck.equals(ConditionKey.CK_GREATER_THAN)) {
- builder.gt(value);
- } else if (ck.equals(ConditionKey.CK_GREATER_EQUAL)) {
- builder.gte(value);
- } else if (ck.equals(ConditionKey.CK_LESS_THAN)) {
- builder.lt(value);
- } else if (ck.equals(ConditionKey.CK_LESS_EQUAL)) {
- builder.lte(value);
- }
- }
-
- protected ScriptFilterBuilder regScriptF(String script) {
- checkEsInvalidQuery("script", script);
- ScriptFilterBuilder scriptFilter = FilterBuilders.scriptFilter(script);
- regF(scriptFilter);
- return scriptFilter;
- }
-
- protected IdsFilterBuilder regIdsF(Collection> values) {
- checkEsInvalidQueryCollection("idsF", values);
- IdsFilterBuilder idsFilter = FilterBuilders.idsFilter(values.toArray(new String[values.size()]));
- regF(idsFilter);
- return idsFilter;
- }
-
- protected BoolFilterBuilder regBoolF(List mustList, List shouldList, List mustNotList) {
- assertObjectNotNull("mustList", mustList);
- assertObjectNotNull("shouldList", shouldList);
- assertObjectNotNull("mustNotList", mustNotList);
- BoolFilterBuilder boolFilter = FilterBuilders.boolFilter();
- mustList.forEach(query -> {
- boolFilter.must(query);
- });
- shouldList.forEach(query -> {
- boolFilter.should(query);
- });
- mustNotList.forEach(query -> {
- boolFilter.mustNot(query);
- });
- return boolFilter;
- }
-
- protected AndFilterBuilder regAndF(List filterList) {
- assertObjectNotNull("filterList", filterList);
- AndFilterBuilder andFilter = FilterBuilders.andFilter(filterList.toArray(new FilterBuilder[filterList.size()]));
- regF(andFilter);
- return andFilter;
- }
-
- protected OrFilterBuilder regOrF(List filterList) {
- assertObjectNotNull("filterList", filterList);
- OrFilterBuilder andFilter = FilterBuilders.orFilter(filterList.toArray(new FilterBuilder[filterList.size()]));
- regF(andFilter);
- return andFilter;
- }
-
- protected NotFilterBuilder regNotF(FilterBuilder filter) {
- assertObjectNotNull("filter", filter);
- NotFilterBuilder notFilter = FilterBuilders.notFilter(filter);
- regF(notFilter);
- return notFilter;
- }
-
- protected QueryFilterBuilder regQueryF(QueryBuilder filter) {
- assertObjectNotNull("filter", filter);
- QueryFilterBuilder queryFilter = FilterBuilders.queryFilter(filter);
- regF(queryFilter);
- return queryFilter;
- }
-
- // ===================================================================================
- // Invalid Query
- // =============
- protected void checkEsInvalidQuery(String name, Object value) {
- if (value == null || (value instanceof String && ((String) value).isEmpty())) {
- String msg = "Cannot register null or empty query: name=" + name + " value=" + value;
- throw new InvalidQueryRegisteredException(msg);
- }
- }
-
- protected void checkEsInvalidQueryCollection(String name, Collection> values) {
- if (values == null || values.isEmpty()) {
- String msg = "Cannot register null or empty query collection: name=" + name + " values=" + values;
- throw new InvalidQueryRegisteredException(msg);
- }
- }
-
- // ===================================================================================
- // General Helper
- // ==============
- protected void assertObjectNotNull(String variableName, Object value) {
- if (variableName == null) {
- String msg = "The value should not be null: variableName=null value=" + value;
- throw new IllegalArgumentException(msg);
- }
- if (value == null) {
- String msg = "The value should not be null: variableName=" + variableName;
- throw new IllegalArgumentException(msg);
- }
- }
-
- // ===================================================================================
- // Assist Class
- // ============
- @FunctionalInterface
- public interface ConditionOptionCall {
-
- /**
- * @param op The option of condition to be set up. (NotNull)
- */
- void callback(OP op);
- }
-
- @FunctionalInterface
- public interface BoolCall {
-
- void callback(CF must, CF should, CF mustNot);
- }
-
- @FunctionalInterface
- public interface OperatorCall {
-
- void callback(CF and);
- }
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
index d8e8e0c43..02811d658 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
@@ -33,9 +33,8 @@ import org.dbflute.dbmeta.name.ColumnSqlName;
import org.dbflute.exception.InvalidQueryRegisteredException;
import org.dbflute.util.Srl;
import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.FilterBuilder;
-import org.elasticsearch.index.query.FilteredQueryBuilder;
import org.elasticsearch.index.query.FuzzyQueryBuilder;
+import org.elasticsearch.index.query.IdsQueryBuilder;
import org.elasticsearch.index.query.MatchAllQueryBuilder;
import org.elasticsearch.index.query.MatchQueryBuilder;
import org.elasticsearch.index.query.PrefixQueryBuilder;
@@ -141,16 +140,13 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
// ===================================================================================
// Register
// ========
- protected FilteredQueryBuilder regFilteredQ(QueryBuilder queryBuilder, FilterBuilder filterBuilder) {
- assertObjectNotNull("queryBuilder", queryBuilder);
- assertObjectNotNull("filterBuilder", filterBuilder);
- return QueryBuilders.filteredQuery(queryBuilder, filterBuilder);
- }
- protected BoolQueryBuilder regBoolCQ(List mustList, List shouldList, List mustNotList) {
+ protected BoolQueryBuilder regBoolCQ(List mustList, List shouldList, List mustNotList,
+ List filterList) {
assertObjectNotNull("mustList", mustList);
assertObjectNotNull("shouldList", shouldList);
assertObjectNotNull("mustNotList", mustNotList);
+ assertObjectNotNull("filterList", filterList);
BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
mustList.forEach(query -> {
boolQuery.must(query);
@@ -161,6 +157,9 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
mustNotList.forEach(query -> {
boolQuery.mustNot(query);
});
+ filterList.forEach(query -> {
+ boolQuery.filter(query);
+ });
return boolQuery;
}
@@ -178,6 +177,13 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
return termsQuery;
}
+ protected IdsQueryBuilder regIdsQ(Collection values) {
+ checkEsInvalidQueryCollection("_id", values);
+ IdsQueryBuilder idsQuery = QueryBuilders.idsQuery(asTableDbName()).addIds(values);
+ regQ(idsQuery);
+ return idsQuery;
+ }
+
protected MatchQueryBuilder regMatchQ(String name, Object value) {
checkEsInvalidQuery(name, value);
MatchQueryBuilder matchQuery = QueryBuilders.matchQuery(name, value);
@@ -453,11 +459,11 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
@FunctionalInterface
public interface BoolCall {
- void callback(CQ must, CQ should, CQ mustNot);
+ void callback(CQ must, CQ should, CQ mustNot, CQ filter);
}
@FunctionalInterface
- public interface FilteredCall {
+ public interface FilteredCall {
void callback(CQ query, CF filter);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java
index 3ac6a6824..daee888d5 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java
@@ -175,24 +175,6 @@ public abstract class EsAbstractEntity implements Entity, Serializable, Cloneabl
return false;
}
- // ===================================================================================
- // Basic Override
- // ==============
- @Override
- public int instanceHash() { // #pending
- return 0;
- }
-
- @Override
- public String toStringWithRelation() { // #pending
- return null;
- }
-
- @Override
- public String buildDisplayString(String name, boolean column, boolean relation) { // #pending
- return null;
- }
-
// ===================================================================================
// Classification
// ==============
@@ -205,11 +187,44 @@ public abstract class EsAbstractEntity implements Entity, Serializable, Cloneabl
return false;
}
+ // ===================================================================================
+ // Empty String
+ // ============
+ protected String convertEmptyToNull(String value) {
+ return (value != null && value.length() == 0) ? null : value;
+ }
+
// ===================================================================================
// Source
// ======
public abstract Map toSource();
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ // #pending hashCode(), equals()
+ @Override
+ public int instanceHash() {
+ return super.hashCode();
+ }
+
+ @Override
+ public String toString() {
+ return getClass().getSimpleName() + ":" + doBuildColumnString(", ") + "@" + Integer.toHexString(hashCode());
+ }
+
+ protected abstract String doBuildColumnString(String dm);
+
+ @Override
+ public String toStringWithRelation() { // #pending
+ return toString();
+ }
+
+ @Override
+ public String buildDisplayString(String name, boolean column, boolean relation) { // #pending
+ return toString();
+ }
+
// ===================================================================================
// Assist Class
// ============
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java
index 71fbd4851..24bfcfc92 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java
@@ -77,7 +77,6 @@ public abstract class BsBoostDocumentRuleBhv extends EsAbstractBehavior {
try {
final RESULT result = entityType.newInstance();
result.setEndTime(DfTypeUtil.toLong(source.get("endTime")));
- result.setId(DfTypeUtil.toString(source.get("id")));
result.setJobName(DfTypeUtil.toString(source.get("jobName")));
result.setJobStatus(DfTypeUtil.toString(source.get("jobStatus")));
result.setScriptData(DfTypeUtil.toString(source.get("scriptData")));
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java
index 545cc04e1..58b062aa2 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java
@@ -77,7 +77,6 @@ public abstract class BsKeyMatchBhv extends EsAbstractBehavior RESULT createEntity(Map source, Class extends RESULT> entityType) {
try {
final RESULT result = entityType.newInstance();
- result.setId(DfTypeUtil.toString(source.get("id")));
result.setLabelTypeId(DfTypeUtil.toString(source.get("labelTypeId")));
result.setRoleTypeId(DfTypeUtil.toString(source.get("roleTypeId")));
return result;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java
index 41599d13d..bb73b99f6 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java
@@ -77,7 +77,6 @@ public abstract class BsLabelTypeBhv extends EsAbstractBehavior RESULT createEntity(Map source, Class extends RESULT> entityType) {
try {
final RESULT result = entityType.newInstance();
- result.setId(DfTypeUtil.toString(source.get("id")));
result.setLabelTypeId(DfTypeUtil.toString(source.get("labelTypeId")));
result.setWebConfigId(DfTypeUtil.toString(source.get("webConfigId")));
return result;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToRoleBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToRoleBhv.java
index fda1f76d4..ba2b7d313 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToRoleBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigToRoleBhv.java
@@ -74,7 +74,6 @@ public abstract class BsWebConfigToRoleBhv extends EsAbstractBehavior RESULT createEntity(Map source, Class extends RESULT> entityType) {
try {
final RESULT result = entityType.newInstance();
- result.setId(DfTypeUtil.toString(source.get("id")));
result.setRoleTypeId(DfTypeUtil.toString(source.get("roleTypeId")));
result.setWebConfigId(DfTypeUtil.toString(source.get("webConfigId")));
return result;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsBoostDocumentRule.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsBoostDocumentRule.java
index 8ea84e5f5..3c030143b 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsBoostDocumentRule.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsBoostDocumentRule.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.BoostDocumentRuleDbm;
*/
public class BsBoostDocumentRule extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public BoostDocumentRuleDbm asDBMeta() {
- return BoostDocumentRuleDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "boost_document_rule";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -67,12 +60,75 @@ public class BsBoostDocumentRule extends EsAbstractEntity {
// [Referrers] *comment only
+ // ===================================================================================
+ // DB Meta
+ // =======
+ @Override
+ public BoostDocumentRuleDbm asDBMeta() {
+ return BoostDocumentRuleDbm.getInstance();
+ }
+
+ @Override
+ public String asTableDbName() {
+ return "boost_document_rule";
+ }
+
+ // ===================================================================================
+ // Source
+ // ======
+ @Override
+ public Map toSource() {
+ Map sourceMap = new HashMap<>();
+ if (boostExpr != null) {
+ sourceMap.put("boostExpr", boostExpr);
+ }
+ if (createdBy != null) {
+ sourceMap.put("createdBy", createdBy);
+ }
+ if (createdTime != null) {
+ sourceMap.put("createdTime", createdTime);
+ }
+ if (sortOrder != null) {
+ sourceMap.put("sortOrder", sortOrder);
+ }
+ if (updatedBy != null) {
+ sourceMap.put("updatedBy", updatedBy);
+ }
+ if (updatedTime != null) {
+ sourceMap.put("updatedTime", updatedTime);
+ }
+ if (urlExpr != null) {
+ sourceMap.put("urlExpr", urlExpr);
+ }
+ return sourceMap;
+ }
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(boostExpr);
+ sb.append(dm).append(createdBy);
+ sb.append(dm).append(createdTime);
+ sb.append(dm).append(sortOrder);
+ sb.append(dm).append(updatedBy);
+ sb.append(dm).append(updatedTime);
+ sb.append(dm).append(urlExpr);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
// ===================================================================================
// Accessor
// ========
public String getBoostExpr() {
checkSpecifiedProperty("boostExpr");
- return boostExpr;
+ return convertEmptyToNull(boostExpr);
}
public void setBoostExpr(String value) {
@@ -82,7 +138,7 @@ public class BsBoostDocumentRule extends EsAbstractEntity {
public String getCreatedBy() {
checkSpecifiedProperty("createdBy");
- return createdBy;
+ return convertEmptyToNull(createdBy);
}
public void setCreatedBy(String value) {
@@ -100,16 +156,6 @@ public class BsBoostDocumentRule extends EsAbstractEntity {
this.createdTime = value;
}
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
public Integer getSortOrder() {
checkSpecifiedProperty("sortOrder");
return sortOrder;
@@ -122,7 +168,7 @@ public class BsBoostDocumentRule extends EsAbstractEntity {
public String getUpdatedBy() {
checkSpecifiedProperty("updatedBy");
- return updatedBy;
+ return convertEmptyToNull(updatedBy);
}
public void setUpdatedBy(String value) {
@@ -142,41 +188,11 @@ public class BsBoostDocumentRule extends EsAbstractEntity {
public String getUrlExpr() {
checkSpecifiedProperty("urlExpr");
- return urlExpr;
+ return convertEmptyToNull(urlExpr);
}
public void setUrlExpr(String value) {
registerModifiedProperty("urlExpr");
this.urlExpr = value;
}
-
- @Override
- public Map toSource() {
- Map sourceMap = new HashMap<>();
- if (boostExpr != null) {
- sourceMap.put("boostExpr", boostExpr);
- }
- if (createdBy != null) {
- sourceMap.put("createdBy", createdBy);
- }
- if (createdTime != null) {
- sourceMap.put("createdTime", createdTime);
- }
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
- if (sortOrder != null) {
- sourceMap.put("sortOrder", sortOrder);
- }
- if (updatedBy != null) {
- sourceMap.put("updatedBy", updatedBy);
- }
- if (updatedTime != null) {
- sourceMap.put("updatedTime", updatedTime);
- }
- if (urlExpr != null) {
- sourceMap.put("urlExpr", urlExpr);
- }
- return sourceMap;
- }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingSession.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingSession.java
index f00292785..e8e09b439 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingSession.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingSession.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingSessionDbm;
*/
public class BsCrawlingSession extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public CrawlingSessionDbm asDBMeta() {
- return CrawlingSessionDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "crawling_session";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -58,6 +51,57 @@ public class BsCrawlingSession extends EsAbstractEntity {
// [Referrers] *comment only
+ // ===================================================================================
+ // DB Meta
+ // =======
+ @Override
+ public CrawlingSessionDbm asDBMeta() {
+ return CrawlingSessionDbm.getInstance();
+ }
+
+ @Override
+ public String asTableDbName() {
+ return "crawling_session";
+ }
+
+ // ===================================================================================
+ // Source
+ // ======
+ @Override
+ public Map toSource() {
+ Map sourceMap = new HashMap<>();
+ if (createdTime != null) {
+ sourceMap.put("createdTime", createdTime);
+ }
+ if (expiredTime != null) {
+ sourceMap.put("expiredTime", expiredTime);
+ }
+ if (name != null) {
+ sourceMap.put("name", name);
+ }
+ if (sessionId != null) {
+ sourceMap.put("sessionId", sessionId);
+ }
+ return sourceMap;
+ }
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(createdTime);
+ sb.append(dm).append(expiredTime);
+ sb.append(dm).append(name);
+ sb.append(dm).append(sessionId);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
// ===================================================================================
// Accessor
// ========
@@ -81,19 +125,9 @@ public class BsCrawlingSession extends EsAbstractEntity {
this.expiredTime = value;
}
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
public String getName() {
checkSpecifiedProperty("name");
- return name;
+ return convertEmptyToNull(name);
}
public void setName(String value) {
@@ -103,32 +137,11 @@ public class BsCrawlingSession extends EsAbstractEntity {
public String getSessionId() {
checkSpecifiedProperty("sessionId");
- return sessionId;
+ return convertEmptyToNull(sessionId);
}
public void setSessionId(String value) {
registerModifiedProperty("sessionId");
this.sessionId = value;
}
-
- @Override
- public Map toSource() {
- Map sourceMap = new HashMap<>();
- if (createdTime != null) {
- sourceMap.put("createdTime", createdTime);
- }
- if (expiredTime != null) {
- sourceMap.put("expiredTime", expiredTime);
- }
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
- if (name != null) {
- sourceMap.put("name", name);
- }
- if (sessionId != null) {
- sourceMap.put("sessionId", sessionId);
- }
- return sourceMap;
- }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingSessionInfo.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingSessionInfo.java
index 8097914fd..26cda03a6 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingSessionInfo.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsCrawlingSessionInfo.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingSessionInfoDbm;
*/
public class BsCrawlingSessionInfo extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public CrawlingSessionInfoDbm asDBMeta() {
- return CrawlingSessionInfoDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "crawling_session_info";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -58,12 +51,63 @@ public class BsCrawlingSessionInfo extends EsAbstractEntity {
// [Referrers] *comment only
+ // ===================================================================================
+ // DB Meta
+ // =======
+ @Override
+ public CrawlingSessionInfoDbm asDBMeta() {
+ return CrawlingSessionInfoDbm.getInstance();
+ }
+
+ @Override
+ public String asTableDbName() {
+ return "crawling_session_info";
+ }
+
+ // ===================================================================================
+ // Source
+ // ======
+ @Override
+ public Map toSource() {
+ Map sourceMap = new HashMap<>();
+ if (crawlingSessionId != null) {
+ sourceMap.put("crawlingSessionId", crawlingSessionId);
+ }
+ if (createdTime != null) {
+ sourceMap.put("createdTime", createdTime);
+ }
+ if (key != null) {
+ sourceMap.put("key", key);
+ }
+ if (value != null) {
+ sourceMap.put("value", value);
+ }
+ return sourceMap;
+ }
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(crawlingSessionId);
+ sb.append(dm).append(createdTime);
+ sb.append(dm).append(key);
+ sb.append(dm).append(value);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
// ===================================================================================
// Accessor
// ========
public String getCrawlingSessionId() {
checkSpecifiedProperty("crawlingSessionId");
- return crawlingSessionId;
+ return convertEmptyToNull(crawlingSessionId);
}
public void setCrawlingSessionId(String value) {
@@ -81,19 +125,9 @@ public class BsCrawlingSessionInfo extends EsAbstractEntity {
this.createdTime = value;
}
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
public String getKey() {
checkSpecifiedProperty("key");
- return key;
+ return convertEmptyToNull(key);
}
public void setKey(String value) {
@@ -103,32 +137,11 @@ public class BsCrawlingSessionInfo extends EsAbstractEntity {
public String getValue() {
checkSpecifiedProperty("value");
- return value;
+ return convertEmptyToNull(value);
}
public void setValue(String value) {
registerModifiedProperty("value");
this.value = value;
}
-
- @Override
- public Map toSource() {
- Map sourceMap = new HashMap<>();
- if (crawlingSessionId != null) {
- sourceMap.put("crawlingSessionId", crawlingSessionId);
- }
- if (createdTime != null) {
- sourceMap.put("createdTime", createdTime);
- }
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
- if (key != null) {
- sourceMap.put("key", key);
- }
- if (value != null) {
- sourceMap.put("value", value);
- }
- return sourceMap;
- }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java
index bb2b87351..66015b5ef 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfig.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.DataConfigDbm;
*/
public class BsDataConfig extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public DataConfigDbm asDBMeta() {
- return DataConfigDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "data_config";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -80,128 +73,21 @@ public class BsDataConfig extends EsAbstractEntity {
// [Referrers] *comment only
// ===================================================================================
- // Accessor
- // ========
- public Boolean getAvailable() {
- checkSpecifiedProperty("available");
- return available;
+ // DB Meta
+ // =======
+ @Override
+ public DataConfigDbm asDBMeta() {
+ return DataConfigDbm.getInstance();
}
- public void setAvailable(Boolean value) {
- registerModifiedProperty("available");
- this.available = value;
- }
-
- public Float getBoost() {
- checkSpecifiedProperty("boost");
- return boost;
- }
-
- public void setBoost(Float value) {
- registerModifiedProperty("boost");
- this.boost = value;
- }
-
- public String getCreatedBy() {
- checkSpecifiedProperty("createdBy");
- return createdBy;
- }
-
- public void setCreatedBy(String value) {
- registerModifiedProperty("createdBy");
- this.createdBy = value;
- }
-
- public Long getCreatedTime() {
- checkSpecifiedProperty("createdTime");
- return createdTime;
- }
-
- public void setCreatedTime(Long value) {
- registerModifiedProperty("createdTime");
- this.createdTime = value;
- }
-
- public String getHandlerName() {
- checkSpecifiedProperty("handlerName");
- return handlerName;
- }
-
- public void setHandlerName(String value) {
- registerModifiedProperty("handlerName");
- this.handlerName = value;
- }
-
- public String getHandlerParameter() {
- checkSpecifiedProperty("handlerParameter");
- return handlerParameter;
- }
-
- public void setHandlerParameter(String value) {
- registerModifiedProperty("handlerParameter");
- this.handlerParameter = value;
- }
-
- public String getHandlerScript() {
- checkSpecifiedProperty("handlerScript");
- return handlerScript;
- }
-
- public void setHandlerScript(String value) {
- registerModifiedProperty("handlerScript");
- this.handlerScript = value;
- }
-
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
- public String getName() {
- checkSpecifiedProperty("name");
- return name;
- }
-
- public void setName(String value) {
- registerModifiedProperty("name");
- this.name = value;
- }
-
- public Integer getSortOrder() {
- checkSpecifiedProperty("sortOrder");
- return sortOrder;
- }
-
- public void setSortOrder(Integer value) {
- registerModifiedProperty("sortOrder");
- this.sortOrder = value;
- }
-
- public String getUpdatedBy() {
- checkSpecifiedProperty("updatedBy");
- return updatedBy;
- }
-
- public void setUpdatedBy(String value) {
- registerModifiedProperty("updatedBy");
- this.updatedBy = value;
- }
-
- public Long getUpdatedTime() {
- checkSpecifiedProperty("updatedTime");
- return updatedTime;
- }
-
- public void setUpdatedTime(Long value) {
- registerModifiedProperty("updatedTime");
- this.updatedTime = value;
+ @Override
+ public String asTableDbName() {
+ return "data_config";
}
+ // ===================================================================================
+ // Source
+ // ======
@Override
public Map toSource() {
Map sourceMap = new HashMap<>();
@@ -226,9 +112,6 @@ public class BsDataConfig extends EsAbstractEntity {
if (handlerScript != null) {
sourceMap.put("handlerScript", handlerScript);
}
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
if (name != null) {
sourceMap.put("name", name);
}
@@ -243,4 +126,141 @@ public class BsDataConfig extends EsAbstractEntity {
}
return sourceMap;
}
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(available);
+ sb.append(dm).append(boost);
+ sb.append(dm).append(createdBy);
+ sb.append(dm).append(createdTime);
+ sb.append(dm).append(handlerName);
+ sb.append(dm).append(handlerParameter);
+ sb.append(dm).append(handlerScript);
+ sb.append(dm).append(name);
+ sb.append(dm).append(sortOrder);
+ sb.append(dm).append(updatedBy);
+ sb.append(dm).append(updatedTime);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
+ // ===================================================================================
+ // Accessor
+ // ========
+ public Boolean getAvailable() {
+ checkSpecifiedProperty("available");
+ return available;
+ }
+
+ public void setAvailable(Boolean value) {
+ registerModifiedProperty("available");
+ this.available = value;
+ }
+
+ public Float getBoost() {
+ checkSpecifiedProperty("boost");
+ return boost;
+ }
+
+ public void setBoost(Float value) {
+ registerModifiedProperty("boost");
+ this.boost = value;
+ }
+
+ public String getCreatedBy() {
+ checkSpecifiedProperty("createdBy");
+ return convertEmptyToNull(createdBy);
+ }
+
+ public void setCreatedBy(String value) {
+ registerModifiedProperty("createdBy");
+ this.createdBy = value;
+ }
+
+ public Long getCreatedTime() {
+ checkSpecifiedProperty("createdTime");
+ return createdTime;
+ }
+
+ public void setCreatedTime(Long value) {
+ registerModifiedProperty("createdTime");
+ this.createdTime = value;
+ }
+
+ public String getHandlerName() {
+ checkSpecifiedProperty("handlerName");
+ return convertEmptyToNull(handlerName);
+ }
+
+ public void setHandlerName(String value) {
+ registerModifiedProperty("handlerName");
+ this.handlerName = value;
+ }
+
+ public String getHandlerParameter() {
+ checkSpecifiedProperty("handlerParameter");
+ return convertEmptyToNull(handlerParameter);
+ }
+
+ public void setHandlerParameter(String value) {
+ registerModifiedProperty("handlerParameter");
+ this.handlerParameter = value;
+ }
+
+ public String getHandlerScript() {
+ checkSpecifiedProperty("handlerScript");
+ return convertEmptyToNull(handlerScript);
+ }
+
+ public void setHandlerScript(String value) {
+ registerModifiedProperty("handlerScript");
+ this.handlerScript = value;
+ }
+
+ public String getName() {
+ checkSpecifiedProperty("name");
+ return convertEmptyToNull(name);
+ }
+
+ public void setName(String value) {
+ registerModifiedProperty("name");
+ this.name = value;
+ }
+
+ public Integer getSortOrder() {
+ checkSpecifiedProperty("sortOrder");
+ return sortOrder;
+ }
+
+ public void setSortOrder(Integer value) {
+ registerModifiedProperty("sortOrder");
+ this.sortOrder = value;
+ }
+
+ public String getUpdatedBy() {
+ checkSpecifiedProperty("updatedBy");
+ return convertEmptyToNull(updatedBy);
+ }
+
+ public void setUpdatedBy(String value) {
+ registerModifiedProperty("updatedBy");
+ this.updatedBy = value;
+ }
+
+ public Long getUpdatedTime() {
+ checkSpecifiedProperty("updatedTime");
+ return updatedTime;
+ }
+
+ public void setUpdatedTime(Long value) {
+ registerModifiedProperty("updatedTime");
+ this.updatedTime = value;
+ }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToLabel.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToLabel.java
index c26663c97..92cba0e78 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToLabel.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToLabel.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.DataConfigToLabelDbm;
*/
public class BsDataConfigToLabel extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public DataConfigToLabelDbm asDBMeta() {
- return DataConfigToLabelDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "data_config_to_label";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -52,12 +45,55 @@ public class BsDataConfigToLabel extends EsAbstractEntity {
// [Referrers] *comment only
+ // ===================================================================================
+ // DB Meta
+ // =======
+ @Override
+ public DataConfigToLabelDbm asDBMeta() {
+ return DataConfigToLabelDbm.getInstance();
+ }
+
+ @Override
+ public String asTableDbName() {
+ return "data_config_to_label";
+ }
+
+ // ===================================================================================
+ // Source
+ // ======
+ @Override
+ public Map toSource() {
+ Map sourceMap = new HashMap<>();
+ if (dataConfigId != null) {
+ sourceMap.put("dataConfigId", dataConfigId);
+ }
+ if (labelTypeId != null) {
+ sourceMap.put("labelTypeId", labelTypeId);
+ }
+ return sourceMap;
+ }
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(dataConfigId);
+ sb.append(dm).append(labelTypeId);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
// ===================================================================================
// Accessor
// ========
public String getDataConfigId() {
checkSpecifiedProperty("dataConfigId");
- return dataConfigId;
+ return convertEmptyToNull(dataConfigId);
}
public void setDataConfigId(String value) {
@@ -65,38 +101,13 @@ public class BsDataConfigToLabel extends EsAbstractEntity {
this.dataConfigId = value;
}
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
public String getLabelTypeId() {
checkSpecifiedProperty("labelTypeId");
- return labelTypeId;
+ return convertEmptyToNull(labelTypeId);
}
public void setLabelTypeId(String value) {
registerModifiedProperty("labelTypeId");
this.labelTypeId = value;
}
-
- @Override
- public Map toSource() {
- Map sourceMap = new HashMap<>();
- if (dataConfigId != null) {
- sourceMap.put("dataConfigId", dataConfigId);
- }
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
- if (labelTypeId != null) {
- sourceMap.put("labelTypeId", labelTypeId);
- }
- return sourceMap;
- }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToRole.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToRole.java
index 2138433b4..4d9e6d7cc 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToRole.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsDataConfigToRole.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.DataConfigToRoleDbm;
*/
public class BsDataConfigToRole extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public DataConfigToRoleDbm asDBMeta() {
- return DataConfigToRoleDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "data_config_to_role";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -52,12 +45,55 @@ public class BsDataConfigToRole extends EsAbstractEntity {
// [Referrers] *comment only
+ // ===================================================================================
+ // DB Meta
+ // =======
+ @Override
+ public DataConfigToRoleDbm asDBMeta() {
+ return DataConfigToRoleDbm.getInstance();
+ }
+
+ @Override
+ public String asTableDbName() {
+ return "data_config_to_role";
+ }
+
+ // ===================================================================================
+ // Source
+ // ======
+ @Override
+ public Map toSource() {
+ Map sourceMap = new HashMap<>();
+ if (dataConfigId != null) {
+ sourceMap.put("dataConfigId", dataConfigId);
+ }
+ if (roleTypeId != null) {
+ sourceMap.put("roleTypeId", roleTypeId);
+ }
+ return sourceMap;
+ }
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(dataConfigId);
+ sb.append(dm).append(roleTypeId);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
// ===================================================================================
// Accessor
// ========
public String getDataConfigId() {
checkSpecifiedProperty("dataConfigId");
- return dataConfigId;
+ return convertEmptyToNull(dataConfigId);
}
public void setDataConfigId(String value) {
@@ -65,38 +101,13 @@ public class BsDataConfigToRole extends EsAbstractEntity {
this.dataConfigId = value;
}
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
public String getRoleTypeId() {
checkSpecifiedProperty("roleTypeId");
- return roleTypeId;
+ return convertEmptyToNull(roleTypeId);
}
public void setRoleTypeId(String value) {
registerModifiedProperty("roleTypeId");
this.roleTypeId = value;
}
-
- @Override
- public Map toSource() {
- Map sourceMap = new HashMap<>();
- if (dataConfigId != null) {
- sourceMap.put("dataConfigId", dataConfigId);
- }
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
- if (roleTypeId != null) {
- sourceMap.put("roleTypeId", roleTypeId);
- }
- return sourceMap;
- }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFailureUrl.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFailureUrl.java
index f62439a86..aaeb38525 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFailureUrl.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFailureUrl.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.FailureUrlDbm;
*/
public class BsFailureUrl extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public FailureUrlDbm asDBMeta() {
- return FailureUrlDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "failure_url";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -67,12 +60,75 @@ public class BsFailureUrl extends EsAbstractEntity {
// [Referrers] *comment only
+ // ===================================================================================
+ // DB Meta
+ // =======
+ @Override
+ public FailureUrlDbm asDBMeta() {
+ return FailureUrlDbm.getInstance();
+ }
+
+ @Override
+ public String asTableDbName() {
+ return "failure_url";
+ }
+
+ // ===================================================================================
+ // Source
+ // ======
+ @Override
+ public Map toSource() {
+ Map sourceMap = new HashMap<>();
+ if (configId != null) {
+ sourceMap.put("configId", configId);
+ }
+ if (errorCount != null) {
+ sourceMap.put("errorCount", errorCount);
+ }
+ if (errorLog != null) {
+ sourceMap.put("errorLog", errorLog);
+ }
+ if (errorName != null) {
+ sourceMap.put("errorName", errorName);
+ }
+ if (lastAccessTime != null) {
+ sourceMap.put("lastAccessTime", lastAccessTime);
+ }
+ if (threadName != null) {
+ sourceMap.put("threadName", threadName);
+ }
+ if (url != null) {
+ sourceMap.put("url", url);
+ }
+ return sourceMap;
+ }
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(configId);
+ sb.append(dm).append(errorCount);
+ sb.append(dm).append(errorLog);
+ sb.append(dm).append(errorName);
+ sb.append(dm).append(lastAccessTime);
+ sb.append(dm).append(threadName);
+ sb.append(dm).append(url);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
// ===================================================================================
// Accessor
// ========
public String getConfigId() {
checkSpecifiedProperty("configId");
- return configId;
+ return convertEmptyToNull(configId);
}
public void setConfigId(String value) {
@@ -92,7 +148,7 @@ public class BsFailureUrl extends EsAbstractEntity {
public String getErrorLog() {
checkSpecifiedProperty("errorLog");
- return errorLog;
+ return convertEmptyToNull(errorLog);
}
public void setErrorLog(String value) {
@@ -102,7 +158,7 @@ public class BsFailureUrl extends EsAbstractEntity {
public String getErrorName() {
checkSpecifiedProperty("errorName");
- return errorName;
+ return convertEmptyToNull(errorName);
}
public void setErrorName(String value) {
@@ -110,16 +166,6 @@ public class BsFailureUrl extends EsAbstractEntity {
this.errorName = value;
}
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
public Long getLastAccessTime() {
checkSpecifiedProperty("lastAccessTime");
return lastAccessTime;
@@ -132,7 +178,7 @@ public class BsFailureUrl extends EsAbstractEntity {
public String getThreadName() {
checkSpecifiedProperty("threadName");
- return threadName;
+ return convertEmptyToNull(threadName);
}
public void setThreadName(String value) {
@@ -142,41 +188,11 @@ public class BsFailureUrl extends EsAbstractEntity {
public String getUrl() {
checkSpecifiedProperty("url");
- return url;
+ return convertEmptyToNull(url);
}
public void setUrl(String value) {
registerModifiedProperty("url");
this.url = value;
}
-
- @Override
- public Map toSource() {
- Map sourceMap = new HashMap<>();
- if (configId != null) {
- sourceMap.put("configId", configId);
- }
- if (errorCount != null) {
- sourceMap.put("errorCount", errorCount);
- }
- if (errorLog != null) {
- sourceMap.put("errorLog", errorLog);
- }
- if (errorName != null) {
- sourceMap.put("errorName", errorName);
- }
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
- if (lastAccessTime != null) {
- sourceMap.put("lastAccessTime", lastAccessTime);
- }
- if (threadName != null) {
- sourceMap.put("threadName", threadName);
- }
- if (url != null) {
- sourceMap.put("url", url);
- }
- return sourceMap;
- }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileAuthentication.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileAuthentication.java
index 2520a5295..ef8995ece 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileAuthentication.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileAuthentication.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.FileAuthenticationDbm;
*/
public class BsFileAuthentication extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public FileAuthenticationDbm asDBMeta() {
- return FileAuthenticationDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "file_authentication";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -80,128 +73,21 @@ public class BsFileAuthentication extends EsAbstractEntity {
// [Referrers] *comment only
// ===================================================================================
- // Accessor
- // ========
- public String getCreatedBy() {
- checkSpecifiedProperty("createdBy");
- return createdBy;
+ // DB Meta
+ // =======
+ @Override
+ public FileAuthenticationDbm asDBMeta() {
+ return FileAuthenticationDbm.getInstance();
}
- public void setCreatedBy(String value) {
- registerModifiedProperty("createdBy");
- this.createdBy = value;
- }
-
- public Long getCreatedTime() {
- checkSpecifiedProperty("createdTime");
- return createdTime;
- }
-
- public void setCreatedTime(Long value) {
- registerModifiedProperty("createdTime");
- this.createdTime = value;
- }
-
- public String getFileConfigId() {
- checkSpecifiedProperty("fileConfigId");
- return fileConfigId;
- }
-
- public void setFileConfigId(String value) {
- registerModifiedProperty("fileConfigId");
- this.fileConfigId = value;
- }
-
- public String getHostname() {
- checkSpecifiedProperty("hostname");
- return hostname;
- }
-
- public void setHostname(String value) {
- registerModifiedProperty("hostname");
- this.hostname = value;
- }
-
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
- public String getParameters() {
- checkSpecifiedProperty("parameters");
- return parameters;
- }
-
- public void setParameters(String value) {
- registerModifiedProperty("parameters");
- this.parameters = value;
- }
-
- public String getPassword() {
- checkSpecifiedProperty("password");
- return password;
- }
-
- public void setPassword(String value) {
- registerModifiedProperty("password");
- this.password = value;
- }
-
- public Integer getPort() {
- checkSpecifiedProperty("port");
- return port;
- }
-
- public void setPort(Integer value) {
- registerModifiedProperty("port");
- this.port = value;
- }
-
- public String getProtocolScheme() {
- checkSpecifiedProperty("protocolScheme");
- return protocolScheme;
- }
-
- public void setProtocolScheme(String value) {
- registerModifiedProperty("protocolScheme");
- this.protocolScheme = value;
- }
-
- public String getUpdatedBy() {
- checkSpecifiedProperty("updatedBy");
- return updatedBy;
- }
-
- public void setUpdatedBy(String value) {
- registerModifiedProperty("updatedBy");
- this.updatedBy = value;
- }
-
- public Long getUpdatedTime() {
- checkSpecifiedProperty("updatedTime");
- return updatedTime;
- }
-
- public void setUpdatedTime(Long value) {
- registerModifiedProperty("updatedTime");
- this.updatedTime = value;
- }
-
- public String getUsername() {
- checkSpecifiedProperty("username");
- return username;
- }
-
- public void setUsername(String value) {
- registerModifiedProperty("username");
- this.username = value;
+ @Override
+ public String asTableDbName() {
+ return "file_authentication";
}
+ // ===================================================================================
+ // Source
+ // ======
@Override
public Map toSource() {
Map sourceMap = new HashMap<>();
@@ -217,9 +103,6 @@ public class BsFileAuthentication extends EsAbstractEntity {
if (hostname != null) {
sourceMap.put("hostname", hostname);
}
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
if (parameters != null) {
sourceMap.put("parameters", parameters);
}
@@ -243,4 +126,141 @@ public class BsFileAuthentication extends EsAbstractEntity {
}
return sourceMap;
}
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(createdBy);
+ sb.append(dm).append(createdTime);
+ sb.append(dm).append(fileConfigId);
+ sb.append(dm).append(hostname);
+ sb.append(dm).append(parameters);
+ sb.append(dm).append(password);
+ sb.append(dm).append(port);
+ sb.append(dm).append(protocolScheme);
+ sb.append(dm).append(updatedBy);
+ sb.append(dm).append(updatedTime);
+ sb.append(dm).append(username);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
+ // ===================================================================================
+ // Accessor
+ // ========
+ public String getCreatedBy() {
+ checkSpecifiedProperty("createdBy");
+ return convertEmptyToNull(createdBy);
+ }
+
+ public void setCreatedBy(String value) {
+ registerModifiedProperty("createdBy");
+ this.createdBy = value;
+ }
+
+ public Long getCreatedTime() {
+ checkSpecifiedProperty("createdTime");
+ return createdTime;
+ }
+
+ public void setCreatedTime(Long value) {
+ registerModifiedProperty("createdTime");
+ this.createdTime = value;
+ }
+
+ public String getFileConfigId() {
+ checkSpecifiedProperty("fileConfigId");
+ return convertEmptyToNull(fileConfigId);
+ }
+
+ public void setFileConfigId(String value) {
+ registerModifiedProperty("fileConfigId");
+ this.fileConfigId = value;
+ }
+
+ public String getHostname() {
+ checkSpecifiedProperty("hostname");
+ return convertEmptyToNull(hostname);
+ }
+
+ public void setHostname(String value) {
+ registerModifiedProperty("hostname");
+ this.hostname = value;
+ }
+
+ public String getParameters() {
+ checkSpecifiedProperty("parameters");
+ return convertEmptyToNull(parameters);
+ }
+
+ public void setParameters(String value) {
+ registerModifiedProperty("parameters");
+ this.parameters = value;
+ }
+
+ public String getPassword() {
+ checkSpecifiedProperty("password");
+ return convertEmptyToNull(password);
+ }
+
+ public void setPassword(String value) {
+ registerModifiedProperty("password");
+ this.password = value;
+ }
+
+ public Integer getPort() {
+ checkSpecifiedProperty("port");
+ return port;
+ }
+
+ public void setPort(Integer value) {
+ registerModifiedProperty("port");
+ this.port = value;
+ }
+
+ public String getProtocolScheme() {
+ checkSpecifiedProperty("protocolScheme");
+ return convertEmptyToNull(protocolScheme);
+ }
+
+ public void setProtocolScheme(String value) {
+ registerModifiedProperty("protocolScheme");
+ this.protocolScheme = value;
+ }
+
+ public String getUpdatedBy() {
+ checkSpecifiedProperty("updatedBy");
+ return convertEmptyToNull(updatedBy);
+ }
+
+ public void setUpdatedBy(String value) {
+ registerModifiedProperty("updatedBy");
+ this.updatedBy = value;
+ }
+
+ public Long getUpdatedTime() {
+ checkSpecifiedProperty("updatedTime");
+ return updatedTime;
+ }
+
+ public void setUpdatedTime(Long value) {
+ registerModifiedProperty("updatedTime");
+ this.updatedTime = value;
+ }
+
+ public String getUsername() {
+ checkSpecifiedProperty("username");
+ return convertEmptyToNull(username);
+ }
+
+ public void setUsername(String value) {
+ registerModifiedProperty("username");
+ this.username = value;
+ }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java
index f19bbe7e7..26898898c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfig.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.FileConfigDbm;
*/
public class BsFileConfig extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public FileConfigDbm asDBMeta() {
- return FileConfigDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "file_config";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -101,198 +94,21 @@ public class BsFileConfig extends EsAbstractEntity {
// [Referrers] *comment only
// ===================================================================================
- // Accessor
- // ========
- public Boolean getAvailable() {
- checkSpecifiedProperty("available");
- return available;
+ // DB Meta
+ // =======
+ @Override
+ public FileConfigDbm asDBMeta() {
+ return FileConfigDbm.getInstance();
}
- public void setAvailable(Boolean value) {
- registerModifiedProperty("available");
- this.available = value;
- }
-
- public Float getBoost() {
- checkSpecifiedProperty("boost");
- return boost;
- }
-
- public void setBoost(Float value) {
- registerModifiedProperty("boost");
- this.boost = value;
- }
-
- public String getConfigParameter() {
- checkSpecifiedProperty("configParameter");
- return configParameter;
- }
-
- public void setConfigParameter(String value) {
- registerModifiedProperty("configParameter");
- this.configParameter = value;
- }
-
- public String getCreatedBy() {
- checkSpecifiedProperty("createdBy");
- return createdBy;
- }
-
- public void setCreatedBy(String value) {
- registerModifiedProperty("createdBy");
- this.createdBy = value;
- }
-
- public Long getCreatedTime() {
- checkSpecifiedProperty("createdTime");
- return createdTime;
- }
-
- public void setCreatedTime(Long value) {
- registerModifiedProperty("createdTime");
- this.createdTime = value;
- }
-
- public Integer getDepth() {
- checkSpecifiedProperty("depth");
- return depth;
- }
-
- public void setDepth(Integer value) {
- registerModifiedProperty("depth");
- this.depth = value;
- }
-
- public String getExcludedDocPaths() {
- checkSpecifiedProperty("excludedDocPaths");
- return excludedDocPaths;
- }
-
- public void setExcludedDocPaths(String value) {
- registerModifiedProperty("excludedDocPaths");
- this.excludedDocPaths = value;
- }
-
- public String getExcludedPaths() {
- checkSpecifiedProperty("excludedPaths");
- return excludedPaths;
- }
-
- public void setExcludedPaths(String value) {
- registerModifiedProperty("excludedPaths");
- this.excludedPaths = value;
- }
-
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
- public String getIncludedDocPaths() {
- checkSpecifiedProperty("includedDocPaths");
- return includedDocPaths;
- }
-
- public void setIncludedDocPaths(String value) {
- registerModifiedProperty("includedDocPaths");
- this.includedDocPaths = value;
- }
-
- public String getIncludedPaths() {
- checkSpecifiedProperty("includedPaths");
- return includedPaths;
- }
-
- public void setIncludedPaths(String value) {
- registerModifiedProperty("includedPaths");
- this.includedPaths = value;
- }
-
- public Integer getIntervalTime() {
- checkSpecifiedProperty("intervalTime");
- return intervalTime;
- }
-
- public void setIntervalTime(Integer value) {
- registerModifiedProperty("intervalTime");
- this.intervalTime = value;
- }
-
- public Long getMaxAccessCount() {
- checkSpecifiedProperty("maxAccessCount");
- return maxAccessCount;
- }
-
- public void setMaxAccessCount(Long value) {
- registerModifiedProperty("maxAccessCount");
- this.maxAccessCount = value;
- }
-
- public String getName() {
- checkSpecifiedProperty("name");
- return name;
- }
-
- public void setName(String value) {
- registerModifiedProperty("name");
- this.name = value;
- }
-
- public Integer getNumOfThread() {
- checkSpecifiedProperty("numOfThread");
- return numOfThread;
- }
-
- public void setNumOfThread(Integer value) {
- registerModifiedProperty("numOfThread");
- this.numOfThread = value;
- }
-
- public String getPaths() {
- checkSpecifiedProperty("paths");
- return paths;
- }
-
- public void setPaths(String value) {
- registerModifiedProperty("paths");
- this.paths = value;
- }
-
- public Integer getSortOrder() {
- checkSpecifiedProperty("sortOrder");
- return sortOrder;
- }
-
- public void setSortOrder(Integer value) {
- registerModifiedProperty("sortOrder");
- this.sortOrder = value;
- }
-
- public String getUpdatedBy() {
- checkSpecifiedProperty("updatedBy");
- return updatedBy;
- }
-
- public void setUpdatedBy(String value) {
- registerModifiedProperty("updatedBy");
- this.updatedBy = value;
- }
-
- public Long getUpdatedTime() {
- checkSpecifiedProperty("updatedTime");
- return updatedTime;
- }
-
- public void setUpdatedTime(Long value) {
- registerModifiedProperty("updatedTime");
- this.updatedTime = value;
+ @Override
+ public String asTableDbName() {
+ return "file_config";
}
+ // ===================================================================================
+ // Source
+ // ======
@Override
public Map toSource() {
Map sourceMap = new HashMap<>();
@@ -320,9 +136,6 @@ public class BsFileConfig extends EsAbstractEntity {
if (excludedPaths != null) {
sourceMap.put("excludedPaths", excludedPaths);
}
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
if (includedDocPaths != null) {
sourceMap.put("includedDocPaths", includedDocPaths);
}
@@ -355,4 +168,218 @@ public class BsFileConfig extends EsAbstractEntity {
}
return sourceMap;
}
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(available);
+ sb.append(dm).append(boost);
+ sb.append(dm).append(configParameter);
+ sb.append(dm).append(createdBy);
+ sb.append(dm).append(createdTime);
+ sb.append(dm).append(depth);
+ sb.append(dm).append(excludedDocPaths);
+ sb.append(dm).append(excludedPaths);
+ sb.append(dm).append(includedDocPaths);
+ sb.append(dm).append(includedPaths);
+ sb.append(dm).append(intervalTime);
+ sb.append(dm).append(maxAccessCount);
+ sb.append(dm).append(name);
+ sb.append(dm).append(numOfThread);
+ sb.append(dm).append(paths);
+ sb.append(dm).append(sortOrder);
+ sb.append(dm).append(updatedBy);
+ sb.append(dm).append(updatedTime);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
+ // ===================================================================================
+ // Accessor
+ // ========
+ public Boolean getAvailable() {
+ checkSpecifiedProperty("available");
+ return available;
+ }
+
+ public void setAvailable(Boolean value) {
+ registerModifiedProperty("available");
+ this.available = value;
+ }
+
+ public Float getBoost() {
+ checkSpecifiedProperty("boost");
+ return boost;
+ }
+
+ public void setBoost(Float value) {
+ registerModifiedProperty("boost");
+ this.boost = value;
+ }
+
+ public String getConfigParameter() {
+ checkSpecifiedProperty("configParameter");
+ return convertEmptyToNull(configParameter);
+ }
+
+ public void setConfigParameter(String value) {
+ registerModifiedProperty("configParameter");
+ this.configParameter = value;
+ }
+
+ public String getCreatedBy() {
+ checkSpecifiedProperty("createdBy");
+ return convertEmptyToNull(createdBy);
+ }
+
+ public void setCreatedBy(String value) {
+ registerModifiedProperty("createdBy");
+ this.createdBy = value;
+ }
+
+ public Long getCreatedTime() {
+ checkSpecifiedProperty("createdTime");
+ return createdTime;
+ }
+
+ public void setCreatedTime(Long value) {
+ registerModifiedProperty("createdTime");
+ this.createdTime = value;
+ }
+
+ public Integer getDepth() {
+ checkSpecifiedProperty("depth");
+ return depth;
+ }
+
+ public void setDepth(Integer value) {
+ registerModifiedProperty("depth");
+ this.depth = value;
+ }
+
+ public String getExcludedDocPaths() {
+ checkSpecifiedProperty("excludedDocPaths");
+ return convertEmptyToNull(excludedDocPaths);
+ }
+
+ public void setExcludedDocPaths(String value) {
+ registerModifiedProperty("excludedDocPaths");
+ this.excludedDocPaths = value;
+ }
+
+ public String getExcludedPaths() {
+ checkSpecifiedProperty("excludedPaths");
+ return convertEmptyToNull(excludedPaths);
+ }
+
+ public void setExcludedPaths(String value) {
+ registerModifiedProperty("excludedPaths");
+ this.excludedPaths = value;
+ }
+
+ public String getIncludedDocPaths() {
+ checkSpecifiedProperty("includedDocPaths");
+ return convertEmptyToNull(includedDocPaths);
+ }
+
+ public void setIncludedDocPaths(String value) {
+ registerModifiedProperty("includedDocPaths");
+ this.includedDocPaths = value;
+ }
+
+ public String getIncludedPaths() {
+ checkSpecifiedProperty("includedPaths");
+ return convertEmptyToNull(includedPaths);
+ }
+
+ public void setIncludedPaths(String value) {
+ registerModifiedProperty("includedPaths");
+ this.includedPaths = value;
+ }
+
+ public Integer getIntervalTime() {
+ checkSpecifiedProperty("intervalTime");
+ return intervalTime;
+ }
+
+ public void setIntervalTime(Integer value) {
+ registerModifiedProperty("intervalTime");
+ this.intervalTime = value;
+ }
+
+ public Long getMaxAccessCount() {
+ checkSpecifiedProperty("maxAccessCount");
+ return maxAccessCount;
+ }
+
+ public void setMaxAccessCount(Long value) {
+ registerModifiedProperty("maxAccessCount");
+ this.maxAccessCount = value;
+ }
+
+ public String getName() {
+ checkSpecifiedProperty("name");
+ return convertEmptyToNull(name);
+ }
+
+ public void setName(String value) {
+ registerModifiedProperty("name");
+ this.name = value;
+ }
+
+ public Integer getNumOfThread() {
+ checkSpecifiedProperty("numOfThread");
+ return numOfThread;
+ }
+
+ public void setNumOfThread(Integer value) {
+ registerModifiedProperty("numOfThread");
+ this.numOfThread = value;
+ }
+
+ public String getPaths() {
+ checkSpecifiedProperty("paths");
+ return convertEmptyToNull(paths);
+ }
+
+ public void setPaths(String value) {
+ registerModifiedProperty("paths");
+ this.paths = value;
+ }
+
+ public Integer getSortOrder() {
+ checkSpecifiedProperty("sortOrder");
+ return sortOrder;
+ }
+
+ public void setSortOrder(Integer value) {
+ registerModifiedProperty("sortOrder");
+ this.sortOrder = value;
+ }
+
+ public String getUpdatedBy() {
+ checkSpecifiedProperty("updatedBy");
+ return convertEmptyToNull(updatedBy);
+ }
+
+ public void setUpdatedBy(String value) {
+ registerModifiedProperty("updatedBy");
+ this.updatedBy = value;
+ }
+
+ public Long getUpdatedTime() {
+ checkSpecifiedProperty("updatedTime");
+ return updatedTime;
+ }
+
+ public void setUpdatedTime(Long value) {
+ registerModifiedProperty("updatedTime");
+ this.updatedTime = value;
+ }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToLabel.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToLabel.java
index f55c0d7f5..5ea1cd441 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToLabel.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToLabel.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.FileConfigToLabelDbm;
*/
public class BsFileConfigToLabel extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public FileConfigToLabelDbm asDBMeta() {
- return FileConfigToLabelDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "file_config_to_label";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -52,12 +45,55 @@ public class BsFileConfigToLabel extends EsAbstractEntity {
// [Referrers] *comment only
+ // ===================================================================================
+ // DB Meta
+ // =======
+ @Override
+ public FileConfigToLabelDbm asDBMeta() {
+ return FileConfigToLabelDbm.getInstance();
+ }
+
+ @Override
+ public String asTableDbName() {
+ return "file_config_to_label";
+ }
+
+ // ===================================================================================
+ // Source
+ // ======
+ @Override
+ public Map toSource() {
+ Map sourceMap = new HashMap<>();
+ if (fileConfigId != null) {
+ sourceMap.put("fileConfigId", fileConfigId);
+ }
+ if (labelTypeId != null) {
+ sourceMap.put("labelTypeId", labelTypeId);
+ }
+ return sourceMap;
+ }
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(fileConfigId);
+ sb.append(dm).append(labelTypeId);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
// ===================================================================================
// Accessor
// ========
public String getFileConfigId() {
checkSpecifiedProperty("fileConfigId");
- return fileConfigId;
+ return convertEmptyToNull(fileConfigId);
}
public void setFileConfigId(String value) {
@@ -65,38 +101,13 @@ public class BsFileConfigToLabel extends EsAbstractEntity {
this.fileConfigId = value;
}
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
public String getLabelTypeId() {
checkSpecifiedProperty("labelTypeId");
- return labelTypeId;
+ return convertEmptyToNull(labelTypeId);
}
public void setLabelTypeId(String value) {
registerModifiedProperty("labelTypeId");
this.labelTypeId = value;
}
-
- @Override
- public Map toSource() {
- Map sourceMap = new HashMap<>();
- if (fileConfigId != null) {
- sourceMap.put("fileConfigId", fileConfigId);
- }
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
- if (labelTypeId != null) {
- sourceMap.put("labelTypeId", labelTypeId);
- }
- return sourceMap;
- }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToRole.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToRole.java
index 8e785eabc..f9e815a4b 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToRole.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsFileConfigToRole.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.FileConfigToRoleDbm;
*/
public class BsFileConfigToRole extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public FileConfigToRoleDbm asDBMeta() {
- return FileConfigToRoleDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "file_config_to_role";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -52,12 +45,55 @@ public class BsFileConfigToRole extends EsAbstractEntity {
// [Referrers] *comment only
+ // ===================================================================================
+ // DB Meta
+ // =======
+ @Override
+ public FileConfigToRoleDbm asDBMeta() {
+ return FileConfigToRoleDbm.getInstance();
+ }
+
+ @Override
+ public String asTableDbName() {
+ return "file_config_to_role";
+ }
+
+ // ===================================================================================
+ // Source
+ // ======
+ @Override
+ public Map toSource() {
+ Map sourceMap = new HashMap<>();
+ if (fileConfigId != null) {
+ sourceMap.put("fileConfigId", fileConfigId);
+ }
+ if (roleTypeId != null) {
+ sourceMap.put("roleTypeId", roleTypeId);
+ }
+ return sourceMap;
+ }
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(fileConfigId);
+ sb.append(dm).append(roleTypeId);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
// ===================================================================================
// Accessor
// ========
public String getFileConfigId() {
checkSpecifiedProperty("fileConfigId");
- return fileConfigId;
+ return convertEmptyToNull(fileConfigId);
}
public void setFileConfigId(String value) {
@@ -65,38 +101,13 @@ public class BsFileConfigToRole extends EsAbstractEntity {
this.fileConfigId = value;
}
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
public String getRoleTypeId() {
checkSpecifiedProperty("roleTypeId");
- return roleTypeId;
+ return convertEmptyToNull(roleTypeId);
}
public void setRoleTypeId(String value) {
registerModifiedProperty("roleTypeId");
this.roleTypeId = value;
}
-
- @Override
- public Map toSource() {
- Map sourceMap = new HashMap<>();
- if (fileConfigId != null) {
- sourceMap.put("fileConfigId", fileConfigId);
- }
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
- if (roleTypeId != null) {
- sourceMap.put("roleTypeId", roleTypeId);
- }
- return sourceMap;
- }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java
index 65523c9c9..a31cd7dd8 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsJobLog.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.JobLogDbm;
*/
public class BsJobLog extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public JobLogDbm asDBMeta() {
- return JobLogDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "job_log";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -71,107 +64,27 @@ public class BsJobLog extends EsAbstractEntity {
// [Referrers] *comment only
// ===================================================================================
- // Accessor
- // ========
- public Long getEndTime() {
- checkSpecifiedProperty("endTime");
- return endTime;
+ // DB Meta
+ // =======
+ @Override
+ public JobLogDbm asDBMeta() {
+ return JobLogDbm.getInstance();
}
- public void setEndTime(Long value) {
- registerModifiedProperty("endTime");
- this.endTime = value;
- }
-
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
- public String getJobName() {
- checkSpecifiedProperty("jobName");
- return jobName;
- }
-
- public void setJobName(String value) {
- registerModifiedProperty("jobName");
- this.jobName = value;
- }
-
- public String getJobStatus() {
- checkSpecifiedProperty("jobStatus");
- return jobStatus;
- }
-
- public void setJobStatus(String value) {
- registerModifiedProperty("jobStatus");
- this.jobStatus = value;
- }
-
- public String getScriptData() {
- checkSpecifiedProperty("scriptData");
- return scriptData;
- }
-
- public void setScriptData(String value) {
- registerModifiedProperty("scriptData");
- this.scriptData = value;
- }
-
- public String getScriptResult() {
- checkSpecifiedProperty("scriptResult");
- return scriptResult;
- }
-
- public void setScriptResult(String value) {
- registerModifiedProperty("scriptResult");
- this.scriptResult = value;
- }
-
- public String getScriptType() {
- checkSpecifiedProperty("scriptType");
- return scriptType;
- }
-
- public void setScriptType(String value) {
- registerModifiedProperty("scriptType");
- this.scriptType = value;
- }
-
- public Long getStartTime() {
- checkSpecifiedProperty("startTime");
- return startTime;
- }
-
- public void setStartTime(Long value) {
- registerModifiedProperty("startTime");
- this.startTime = value;
- }
-
- public String getTarget() {
- checkSpecifiedProperty("target");
- return target;
- }
-
- public void setTarget(String value) {
- registerModifiedProperty("target");
- this.target = value;
+ @Override
+ public String asTableDbName() {
+ return "job_log";
}
+ // ===================================================================================
+ // Source
+ // ======
@Override
public Map toSource() {
Map sourceMap = new HashMap<>();
if (endTime != null) {
sourceMap.put("endTime", endTime);
}
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
if (jobName != null) {
sourceMap.put("jobName", jobName);
}
@@ -195,4 +108,108 @@ public class BsJobLog extends EsAbstractEntity {
}
return sourceMap;
}
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(endTime);
+ sb.append(dm).append(jobName);
+ sb.append(dm).append(jobStatus);
+ sb.append(dm).append(scriptData);
+ sb.append(dm).append(scriptResult);
+ sb.append(dm).append(scriptType);
+ sb.append(dm).append(startTime);
+ sb.append(dm).append(target);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
+ // ===================================================================================
+ // Accessor
+ // ========
+ public Long getEndTime() {
+ checkSpecifiedProperty("endTime");
+ return endTime;
+ }
+
+ public void setEndTime(Long value) {
+ registerModifiedProperty("endTime");
+ this.endTime = value;
+ }
+
+ public String getJobName() {
+ checkSpecifiedProperty("jobName");
+ return convertEmptyToNull(jobName);
+ }
+
+ public void setJobName(String value) {
+ registerModifiedProperty("jobName");
+ this.jobName = value;
+ }
+
+ public String getJobStatus() {
+ checkSpecifiedProperty("jobStatus");
+ return convertEmptyToNull(jobStatus);
+ }
+
+ public void setJobStatus(String value) {
+ registerModifiedProperty("jobStatus");
+ this.jobStatus = value;
+ }
+
+ public String getScriptData() {
+ checkSpecifiedProperty("scriptData");
+ return convertEmptyToNull(scriptData);
+ }
+
+ public void setScriptData(String value) {
+ registerModifiedProperty("scriptData");
+ this.scriptData = value;
+ }
+
+ public String getScriptResult() {
+ checkSpecifiedProperty("scriptResult");
+ return convertEmptyToNull(scriptResult);
+ }
+
+ public void setScriptResult(String value) {
+ registerModifiedProperty("scriptResult");
+ this.scriptResult = value;
+ }
+
+ public String getScriptType() {
+ checkSpecifiedProperty("scriptType");
+ return convertEmptyToNull(scriptType);
+ }
+
+ public void setScriptType(String value) {
+ registerModifiedProperty("scriptType");
+ this.scriptType = value;
+ }
+
+ public Long getStartTime() {
+ checkSpecifiedProperty("startTime");
+ return startTime;
+ }
+
+ public void setStartTime(Long value) {
+ registerModifiedProperty("startTime");
+ this.startTime = value;
+ }
+
+ public String getTarget() {
+ checkSpecifiedProperty("target");
+ return convertEmptyToNull(target);
+ }
+
+ public void setTarget(String value) {
+ registerModifiedProperty("target");
+ this.target = value;
+ }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java
index c3ab9a46a..ecd3b6077 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsKeyMatch.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.KeyMatchDbm;
*/
public class BsKeyMatch extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public KeyMatchDbm asDBMeta() {
- return KeyMatchDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "key_match";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -71,98 +64,21 @@ public class BsKeyMatch extends EsAbstractEntity {
// [Referrers] *comment only
// ===================================================================================
- // Accessor
- // ========
- public Float getBoost() {
- checkSpecifiedProperty("boost");
- return boost;
+ // DB Meta
+ // =======
+ @Override
+ public KeyMatchDbm asDBMeta() {
+ return KeyMatchDbm.getInstance();
}
- public void setBoost(Float value) {
- registerModifiedProperty("boost");
- this.boost = value;
- }
-
- public String getCreatedBy() {
- checkSpecifiedProperty("createdBy");
- return createdBy;
- }
-
- public void setCreatedBy(String value) {
- registerModifiedProperty("createdBy");
- this.createdBy = value;
- }
-
- public Long getCreatedTime() {
- checkSpecifiedProperty("createdTime");
- return createdTime;
- }
-
- public void setCreatedTime(Long value) {
- registerModifiedProperty("createdTime");
- this.createdTime = value;
- }
-
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
- public Integer getMaxSize() {
- checkSpecifiedProperty("maxSize");
- return maxSize;
- }
-
- public void setMaxSize(Integer value) {
- registerModifiedProperty("maxSize");
- this.maxSize = value;
- }
-
- public String getQuery() {
- checkSpecifiedProperty("query");
- return query;
- }
-
- public void setQuery(String value) {
- registerModifiedProperty("query");
- this.query = value;
- }
-
- public String getTerm() {
- checkSpecifiedProperty("term");
- return term;
- }
-
- public void setTerm(String value) {
- registerModifiedProperty("term");
- this.term = value;
- }
-
- public String getUpdatedBy() {
- checkSpecifiedProperty("updatedBy");
- return updatedBy;
- }
-
- public void setUpdatedBy(String value) {
- registerModifiedProperty("updatedBy");
- this.updatedBy = value;
- }
-
- public Long getUpdatedTime() {
- checkSpecifiedProperty("updatedTime");
- return updatedTime;
- }
-
- public void setUpdatedTime(Long value) {
- registerModifiedProperty("updatedTime");
- this.updatedTime = value;
+ @Override
+ public String asTableDbName() {
+ return "key_match";
}
+ // ===================================================================================
+ // Source
+ // ======
@Override
public Map toSource() {
Map sourceMap = new HashMap<>();
@@ -175,9 +91,6 @@ public class BsKeyMatch extends EsAbstractEntity {
if (createdTime != null) {
sourceMap.put("createdTime", createdTime);
}
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
if (maxSize != null) {
sourceMap.put("maxSize", maxSize);
}
@@ -195,4 +108,108 @@ public class BsKeyMatch extends EsAbstractEntity {
}
return sourceMap;
}
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(boost);
+ sb.append(dm).append(createdBy);
+ sb.append(dm).append(createdTime);
+ sb.append(dm).append(maxSize);
+ sb.append(dm).append(query);
+ sb.append(dm).append(term);
+ sb.append(dm).append(updatedBy);
+ sb.append(dm).append(updatedTime);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
+ // ===================================================================================
+ // Accessor
+ // ========
+ public Float getBoost() {
+ checkSpecifiedProperty("boost");
+ return boost;
+ }
+
+ public void setBoost(Float value) {
+ registerModifiedProperty("boost");
+ this.boost = value;
+ }
+
+ public String getCreatedBy() {
+ checkSpecifiedProperty("createdBy");
+ return convertEmptyToNull(createdBy);
+ }
+
+ public void setCreatedBy(String value) {
+ registerModifiedProperty("createdBy");
+ this.createdBy = value;
+ }
+
+ public Long getCreatedTime() {
+ checkSpecifiedProperty("createdTime");
+ return createdTime;
+ }
+
+ public void setCreatedTime(Long value) {
+ registerModifiedProperty("createdTime");
+ this.createdTime = value;
+ }
+
+ public Integer getMaxSize() {
+ checkSpecifiedProperty("maxSize");
+ return maxSize;
+ }
+
+ public void setMaxSize(Integer value) {
+ registerModifiedProperty("maxSize");
+ this.maxSize = value;
+ }
+
+ public String getQuery() {
+ checkSpecifiedProperty("query");
+ return convertEmptyToNull(query);
+ }
+
+ public void setQuery(String value) {
+ registerModifiedProperty("query");
+ this.query = value;
+ }
+
+ public String getTerm() {
+ checkSpecifiedProperty("term");
+ return convertEmptyToNull(term);
+ }
+
+ public void setTerm(String value) {
+ registerModifiedProperty("term");
+ this.term = value;
+ }
+
+ public String getUpdatedBy() {
+ checkSpecifiedProperty("updatedBy");
+ return convertEmptyToNull(updatedBy);
+ }
+
+ public void setUpdatedBy(String value) {
+ registerModifiedProperty("updatedBy");
+ this.updatedBy = value;
+ }
+
+ public Long getUpdatedTime() {
+ checkSpecifiedProperty("updatedTime");
+ return updatedTime;
+ }
+
+ public void setUpdatedTime(Long value) {
+ registerModifiedProperty("updatedTime");
+ this.updatedTime = value;
+ }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelToRole.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelToRole.java
index 61a7493a7..d6579b8b7 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelToRole.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelToRole.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.LabelToRoleDbm;
*/
public class BsLabelToRole extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public LabelToRoleDbm asDBMeta() {
- return LabelToRoleDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "label_to_role";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -52,22 +45,55 @@ public class BsLabelToRole extends EsAbstractEntity {
// [Referrers] *comment only
+ // ===================================================================================
+ // DB Meta
+ // =======
+ @Override
+ public LabelToRoleDbm asDBMeta() {
+ return LabelToRoleDbm.getInstance();
+ }
+
+ @Override
+ public String asTableDbName() {
+ return "label_to_role";
+ }
+
+ // ===================================================================================
+ // Source
+ // ======
+ @Override
+ public Map toSource() {
+ Map sourceMap = new HashMap<>();
+ if (labelTypeId != null) {
+ sourceMap.put("labelTypeId", labelTypeId);
+ }
+ if (roleTypeId != null) {
+ sourceMap.put("roleTypeId", roleTypeId);
+ }
+ return sourceMap;
+ }
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(labelTypeId);
+ sb.append(dm).append(roleTypeId);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
// ===================================================================================
// Accessor
// ========
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
public String getLabelTypeId() {
checkSpecifiedProperty("labelTypeId");
- return labelTypeId;
+ return convertEmptyToNull(labelTypeId);
}
public void setLabelTypeId(String value) {
@@ -77,26 +103,11 @@ public class BsLabelToRole extends EsAbstractEntity {
public String getRoleTypeId() {
checkSpecifiedProperty("roleTypeId");
- return roleTypeId;
+ return convertEmptyToNull(roleTypeId);
}
public void setRoleTypeId(String value) {
registerModifiedProperty("roleTypeId");
this.roleTypeId = value;
}
-
- @Override
- public Map toSource() {
- Map sourceMap = new HashMap<>();
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
- if (labelTypeId != null) {
- sourceMap.put("labelTypeId", labelTypeId);
- }
- if (roleTypeId != null) {
- sourceMap.put("roleTypeId", roleTypeId);
- }
- return sourceMap;
- }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java
index 64dd20d1d..c78b3ac51 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsLabelType.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.LabelTypeDbm;
*/
public class BsLabelType extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public LabelTypeDbm asDBMeta() {
- return LabelTypeDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "label_type";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -74,108 +67,21 @@ public class BsLabelType extends EsAbstractEntity {
// [Referrers] *comment only
// ===================================================================================
- // Accessor
- // ========
- public String getCreatedBy() {
- checkSpecifiedProperty("createdBy");
- return createdBy;
+ // DB Meta
+ // =======
+ @Override
+ public LabelTypeDbm asDBMeta() {
+ return LabelTypeDbm.getInstance();
}
- public void setCreatedBy(String value) {
- registerModifiedProperty("createdBy");
- this.createdBy = value;
- }
-
- public Long getCreatedTime() {
- checkSpecifiedProperty("createdTime");
- return createdTime;
- }
-
- public void setCreatedTime(Long value) {
- registerModifiedProperty("createdTime");
- this.createdTime = value;
- }
-
- public String getExcludedPaths() {
- checkSpecifiedProperty("excludedPaths");
- return excludedPaths;
- }
-
- public void setExcludedPaths(String value) {
- registerModifiedProperty("excludedPaths");
- this.excludedPaths = value;
- }
-
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
- public String getIncludedPaths() {
- checkSpecifiedProperty("includedPaths");
- return includedPaths;
- }
-
- public void setIncludedPaths(String value) {
- registerModifiedProperty("includedPaths");
- this.includedPaths = value;
- }
-
- public String getName() {
- checkSpecifiedProperty("name");
- return name;
- }
-
- public void setName(String value) {
- registerModifiedProperty("name");
- this.name = value;
- }
-
- public Integer getSortOrder() {
- checkSpecifiedProperty("sortOrder");
- return sortOrder;
- }
-
- public void setSortOrder(Integer value) {
- registerModifiedProperty("sortOrder");
- this.sortOrder = value;
- }
-
- public String getUpdatedBy() {
- checkSpecifiedProperty("updatedBy");
- return updatedBy;
- }
-
- public void setUpdatedBy(String value) {
- registerModifiedProperty("updatedBy");
- this.updatedBy = value;
- }
-
- public Long getUpdatedTime() {
- checkSpecifiedProperty("updatedTime");
- return updatedTime;
- }
-
- public void setUpdatedTime(Long value) {
- registerModifiedProperty("updatedTime");
- this.updatedTime = value;
- }
-
- public String getValue() {
- checkSpecifiedProperty("value");
- return value;
- }
-
- public void setValue(String value) {
- registerModifiedProperty("value");
- this.value = value;
+ @Override
+ public String asTableDbName() {
+ return "label_type";
}
+ // ===================================================================================
+ // Source
+ // ======
@Override
public Map toSource() {
Map sourceMap = new HashMap<>();
@@ -188,9 +94,6 @@ public class BsLabelType extends EsAbstractEntity {
if (excludedPaths != null) {
sourceMap.put("excludedPaths", excludedPaths);
}
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
if (includedPaths != null) {
sourceMap.put("includedPaths", includedPaths);
}
@@ -211,4 +114,119 @@ public class BsLabelType extends EsAbstractEntity {
}
return sourceMap;
}
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(createdBy);
+ sb.append(dm).append(createdTime);
+ sb.append(dm).append(excludedPaths);
+ sb.append(dm).append(includedPaths);
+ sb.append(dm).append(name);
+ sb.append(dm).append(sortOrder);
+ sb.append(dm).append(updatedBy);
+ sb.append(dm).append(updatedTime);
+ sb.append(dm).append(value);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
+ // ===================================================================================
+ // Accessor
+ // ========
+ public String getCreatedBy() {
+ checkSpecifiedProperty("createdBy");
+ return convertEmptyToNull(createdBy);
+ }
+
+ public void setCreatedBy(String value) {
+ registerModifiedProperty("createdBy");
+ this.createdBy = value;
+ }
+
+ public Long getCreatedTime() {
+ checkSpecifiedProperty("createdTime");
+ return createdTime;
+ }
+
+ public void setCreatedTime(Long value) {
+ registerModifiedProperty("createdTime");
+ this.createdTime = value;
+ }
+
+ public String getExcludedPaths() {
+ checkSpecifiedProperty("excludedPaths");
+ return convertEmptyToNull(excludedPaths);
+ }
+
+ public void setExcludedPaths(String value) {
+ registerModifiedProperty("excludedPaths");
+ this.excludedPaths = value;
+ }
+
+ public String getIncludedPaths() {
+ checkSpecifiedProperty("includedPaths");
+ return convertEmptyToNull(includedPaths);
+ }
+
+ public void setIncludedPaths(String value) {
+ registerModifiedProperty("includedPaths");
+ this.includedPaths = value;
+ }
+
+ public String getName() {
+ checkSpecifiedProperty("name");
+ return convertEmptyToNull(name);
+ }
+
+ public void setName(String value) {
+ registerModifiedProperty("name");
+ this.name = value;
+ }
+
+ public Integer getSortOrder() {
+ checkSpecifiedProperty("sortOrder");
+ return sortOrder;
+ }
+
+ public void setSortOrder(Integer value) {
+ registerModifiedProperty("sortOrder");
+ this.sortOrder = value;
+ }
+
+ public String getUpdatedBy() {
+ checkSpecifiedProperty("updatedBy");
+ return convertEmptyToNull(updatedBy);
+ }
+
+ public void setUpdatedBy(String value) {
+ registerModifiedProperty("updatedBy");
+ this.updatedBy = value;
+ }
+
+ public Long getUpdatedTime() {
+ checkSpecifiedProperty("updatedTime");
+ return updatedTime;
+ }
+
+ public void setUpdatedTime(Long value) {
+ registerModifiedProperty("updatedTime");
+ this.updatedTime = value;
+ }
+
+ public String getValue() {
+ checkSpecifiedProperty("value");
+ return convertEmptyToNull(value);
+ }
+
+ public void setValue(String value) {
+ registerModifiedProperty("value");
+ this.value = value;
+ }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsOverlappingHost.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsOverlappingHost.java
index 4c9e6a6a2..952f0d4bf 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsOverlappingHost.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsOverlappingHost.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.OverlappingHostDbm;
*/
public class BsOverlappingHost extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public OverlappingHostDbm asDBMeta() {
- return OverlappingHostDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "overlapping_host";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -67,12 +60,75 @@ public class BsOverlappingHost extends EsAbstractEntity {
// [Referrers] *comment only
+ // ===================================================================================
+ // DB Meta
+ // =======
+ @Override
+ public OverlappingHostDbm asDBMeta() {
+ return OverlappingHostDbm.getInstance();
+ }
+
+ @Override
+ public String asTableDbName() {
+ return "overlapping_host";
+ }
+
+ // ===================================================================================
+ // Source
+ // ======
+ @Override
+ public Map toSource() {
+ Map sourceMap = new HashMap<>();
+ if (createdBy != null) {
+ sourceMap.put("createdBy", createdBy);
+ }
+ if (createdTime != null) {
+ sourceMap.put("createdTime", createdTime);
+ }
+ if (overlappingName != null) {
+ sourceMap.put("overlappingName", overlappingName);
+ }
+ if (regularName != null) {
+ sourceMap.put("regularName", regularName);
+ }
+ if (sortOrder != null) {
+ sourceMap.put("sortOrder", sortOrder);
+ }
+ if (updatedBy != null) {
+ sourceMap.put("updatedBy", updatedBy);
+ }
+ if (updatedTime != null) {
+ sourceMap.put("updatedTime", updatedTime);
+ }
+ return sourceMap;
+ }
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(createdBy);
+ sb.append(dm).append(createdTime);
+ sb.append(dm).append(overlappingName);
+ sb.append(dm).append(regularName);
+ sb.append(dm).append(sortOrder);
+ sb.append(dm).append(updatedBy);
+ sb.append(dm).append(updatedTime);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
// ===================================================================================
// Accessor
// ========
public String getCreatedBy() {
checkSpecifiedProperty("createdBy");
- return createdBy;
+ return convertEmptyToNull(createdBy);
}
public void setCreatedBy(String value) {
@@ -90,19 +146,9 @@ public class BsOverlappingHost extends EsAbstractEntity {
this.createdTime = value;
}
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
public String getOverlappingName() {
checkSpecifiedProperty("overlappingName");
- return overlappingName;
+ return convertEmptyToNull(overlappingName);
}
public void setOverlappingName(String value) {
@@ -112,7 +158,7 @@ public class BsOverlappingHost extends EsAbstractEntity {
public String getRegularName() {
checkSpecifiedProperty("regularName");
- return regularName;
+ return convertEmptyToNull(regularName);
}
public void setRegularName(String value) {
@@ -132,7 +178,7 @@ public class BsOverlappingHost extends EsAbstractEntity {
public String getUpdatedBy() {
checkSpecifiedProperty("updatedBy");
- return updatedBy;
+ return convertEmptyToNull(updatedBy);
}
public void setUpdatedBy(String value) {
@@ -149,34 +195,4 @@ public class BsOverlappingHost extends EsAbstractEntity {
registerModifiedProperty("updatedTime");
this.updatedTime = value;
}
-
- @Override
- public Map toSource() {
- Map sourceMap = new HashMap<>();
- if (createdBy != null) {
- sourceMap.put("createdBy", createdBy);
- }
- if (createdTime != null) {
- sourceMap.put("createdTime", createdTime);
- }
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
- if (overlappingName != null) {
- sourceMap.put("overlappingName", overlappingName);
- }
- if (regularName != null) {
- sourceMap.put("regularName", regularName);
- }
- if (sortOrder != null) {
- sourceMap.put("sortOrder", sortOrder);
- }
- if (updatedBy != null) {
- sourceMap.put("updatedBy", updatedBy);
- }
- if (updatedTime != null) {
- sourceMap.put("updatedTime", updatedTime);
- }
- return sourceMap;
- }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java
index 9921946f8..293be0928 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.PathMappingDbm;
*/
public class BsPathMapping extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public PathMappingDbm asDBMeta() {
- return PathMappingDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "path_mapping";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -71,98 +64,21 @@ public class BsPathMapping extends EsAbstractEntity {
// [Referrers] *comment only
// ===================================================================================
- // Accessor
- // ========
- public String getCreatedBy() {
- checkSpecifiedProperty("createdBy");
- return createdBy;
+ // DB Meta
+ // =======
+ @Override
+ public PathMappingDbm asDBMeta() {
+ return PathMappingDbm.getInstance();
}
- public void setCreatedBy(String value) {
- registerModifiedProperty("createdBy");
- this.createdBy = value;
- }
-
- public Long getCreatedTime() {
- checkSpecifiedProperty("createdTime");
- return createdTime;
- }
-
- public void setCreatedTime(Long value) {
- registerModifiedProperty("createdTime");
- this.createdTime = value;
- }
-
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
- public String getProcessType() {
- checkSpecifiedProperty("processType");
- return processType;
- }
-
- public void setProcessType(String value) {
- registerModifiedProperty("processType");
- this.processType = value;
- }
-
- public String getRegex() {
- checkSpecifiedProperty("regex");
- return regex;
- }
-
- public void setRegex(String value) {
- registerModifiedProperty("regex");
- this.regex = value;
- }
-
- public String getReplacement() {
- checkSpecifiedProperty("replacement");
- return replacement;
- }
-
- public void setReplacement(String value) {
- registerModifiedProperty("replacement");
- this.replacement = value;
- }
-
- public Integer getSortOrder() {
- checkSpecifiedProperty("sortOrder");
- return sortOrder;
- }
-
- public void setSortOrder(Integer value) {
- registerModifiedProperty("sortOrder");
- this.sortOrder = value;
- }
-
- public String getUpdatedBy() {
- checkSpecifiedProperty("updatedBy");
- return updatedBy;
- }
-
- public void setUpdatedBy(String value) {
- registerModifiedProperty("updatedBy");
- this.updatedBy = value;
- }
-
- public Long getUpdatedTime() {
- checkSpecifiedProperty("updatedTime");
- return updatedTime;
- }
-
- public void setUpdatedTime(Long value) {
- registerModifiedProperty("updatedTime");
- this.updatedTime = value;
+ @Override
+ public String asTableDbName() {
+ return "path_mapping";
}
+ // ===================================================================================
+ // Source
+ // ======
@Override
public Map toSource() {
Map sourceMap = new HashMap<>();
@@ -172,9 +88,6 @@ public class BsPathMapping extends EsAbstractEntity {
if (createdTime != null) {
sourceMap.put("createdTime", createdTime);
}
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
if (processType != null) {
sourceMap.put("processType", processType);
}
@@ -195,4 +108,108 @@ public class BsPathMapping extends EsAbstractEntity {
}
return sourceMap;
}
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(createdBy);
+ sb.append(dm).append(createdTime);
+ sb.append(dm).append(processType);
+ sb.append(dm).append(regex);
+ sb.append(dm).append(replacement);
+ sb.append(dm).append(sortOrder);
+ sb.append(dm).append(updatedBy);
+ sb.append(dm).append(updatedTime);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
+ // ===================================================================================
+ // Accessor
+ // ========
+ public String getCreatedBy() {
+ checkSpecifiedProperty("createdBy");
+ return convertEmptyToNull(createdBy);
+ }
+
+ public void setCreatedBy(String value) {
+ registerModifiedProperty("createdBy");
+ this.createdBy = value;
+ }
+
+ public Long getCreatedTime() {
+ checkSpecifiedProperty("createdTime");
+ return createdTime;
+ }
+
+ public void setCreatedTime(Long value) {
+ registerModifiedProperty("createdTime");
+ this.createdTime = value;
+ }
+
+ public String getProcessType() {
+ checkSpecifiedProperty("processType");
+ return convertEmptyToNull(processType);
+ }
+
+ public void setProcessType(String value) {
+ registerModifiedProperty("processType");
+ this.processType = value;
+ }
+
+ public String getRegex() {
+ checkSpecifiedProperty("regex");
+ return convertEmptyToNull(regex);
+ }
+
+ public void setRegex(String value) {
+ registerModifiedProperty("regex");
+ this.regex = value;
+ }
+
+ public String getReplacement() {
+ checkSpecifiedProperty("replacement");
+ return convertEmptyToNull(replacement);
+ }
+
+ public void setReplacement(String value) {
+ registerModifiedProperty("replacement");
+ this.replacement = value;
+ }
+
+ public Integer getSortOrder() {
+ checkSpecifiedProperty("sortOrder");
+ return sortOrder;
+ }
+
+ public void setSortOrder(Integer value) {
+ registerModifiedProperty("sortOrder");
+ this.sortOrder = value;
+ }
+
+ public String getUpdatedBy() {
+ checkSpecifiedProperty("updatedBy");
+ return convertEmptyToNull(updatedBy);
+ }
+
+ public void setUpdatedBy(String value) {
+ registerModifiedProperty("updatedBy");
+ this.updatedBy = value;
+ }
+
+ public Long getUpdatedTime() {
+ checkSpecifiedProperty("updatedTime");
+ return updatedTime;
+ }
+
+ public void setUpdatedTime(Long value) {
+ registerModifiedProperty("updatedTime");
+ this.updatedTime = value;
+ }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRequestHeader.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRequestHeader.java
index 55249b97a..8dcd0fb9a 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRequestHeader.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRequestHeader.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.RequestHeaderDbm;
*/
public class BsRequestHeader extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public RequestHeaderDbm asDBMeta() {
- return RequestHeaderDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "request_header";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -67,12 +60,75 @@ public class BsRequestHeader extends EsAbstractEntity {
// [Referrers] *comment only
+ // ===================================================================================
+ // DB Meta
+ // =======
+ @Override
+ public RequestHeaderDbm asDBMeta() {
+ return RequestHeaderDbm.getInstance();
+ }
+
+ @Override
+ public String asTableDbName() {
+ return "request_header";
+ }
+
+ // ===================================================================================
+ // Source
+ // ======
+ @Override
+ public Map toSource() {
+ Map sourceMap = new HashMap<>();
+ if (createdBy != null) {
+ sourceMap.put("createdBy", createdBy);
+ }
+ if (createdTime != null) {
+ sourceMap.put("createdTime", createdTime);
+ }
+ if (name != null) {
+ sourceMap.put("name", name);
+ }
+ if (updatedBy != null) {
+ sourceMap.put("updatedBy", updatedBy);
+ }
+ if (updatedTime != null) {
+ sourceMap.put("updatedTime", updatedTime);
+ }
+ if (value != null) {
+ sourceMap.put("value", value);
+ }
+ if (webConfigId != null) {
+ sourceMap.put("webConfigId", webConfigId);
+ }
+ return sourceMap;
+ }
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(createdBy);
+ sb.append(dm).append(createdTime);
+ sb.append(dm).append(name);
+ sb.append(dm).append(updatedBy);
+ sb.append(dm).append(updatedTime);
+ sb.append(dm).append(value);
+ sb.append(dm).append(webConfigId);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
// ===================================================================================
// Accessor
// ========
public String getCreatedBy() {
checkSpecifiedProperty("createdBy");
- return createdBy;
+ return convertEmptyToNull(createdBy);
}
public void setCreatedBy(String value) {
@@ -90,19 +146,9 @@ public class BsRequestHeader extends EsAbstractEntity {
this.createdTime = value;
}
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
public String getName() {
checkSpecifiedProperty("name");
- return name;
+ return convertEmptyToNull(name);
}
public void setName(String value) {
@@ -112,7 +158,7 @@ public class BsRequestHeader extends EsAbstractEntity {
public String getUpdatedBy() {
checkSpecifiedProperty("updatedBy");
- return updatedBy;
+ return convertEmptyToNull(updatedBy);
}
public void setUpdatedBy(String value) {
@@ -132,7 +178,7 @@ public class BsRequestHeader extends EsAbstractEntity {
public String getValue() {
checkSpecifiedProperty("value");
- return value;
+ return convertEmptyToNull(value);
}
public void setValue(String value) {
@@ -142,41 +188,11 @@ public class BsRequestHeader extends EsAbstractEntity {
public String getWebConfigId() {
checkSpecifiedProperty("webConfigId");
- return webConfigId;
+ return convertEmptyToNull(webConfigId);
}
public void setWebConfigId(String value) {
registerModifiedProperty("webConfigId");
this.webConfigId = value;
}
-
- @Override
- public Map toSource() {
- Map sourceMap = new HashMap<>();
- if (createdBy != null) {
- sourceMap.put("createdBy", createdBy);
- }
- if (createdTime != null) {
- sourceMap.put("createdTime", createdTime);
- }
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
- if (name != null) {
- sourceMap.put("name", name);
- }
- if (updatedBy != null) {
- sourceMap.put("updatedBy", updatedBy);
- }
- if (updatedTime != null) {
- sourceMap.put("updatedTime", updatedTime);
- }
- if (value != null) {
- sourceMap.put("value", value);
- }
- if (webConfigId != null) {
- sourceMap.put("webConfigId", webConfigId);
- }
- return sourceMap;
- }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRoleType.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRoleType.java
index f7c2526fd..24633c0de 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsRoleType.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsRoleType.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.RoleTypeDbm;
*/
public class BsRoleType extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public RoleTypeDbm asDBMeta() {
- return RoleTypeDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "role_type";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -67,12 +60,75 @@ public class BsRoleType extends EsAbstractEntity {
// [Referrers] *comment only
+ // ===================================================================================
+ // DB Meta
+ // =======
+ @Override
+ public RoleTypeDbm asDBMeta() {
+ return RoleTypeDbm.getInstance();
+ }
+
+ @Override
+ public String asTableDbName() {
+ return "role_type";
+ }
+
+ // ===================================================================================
+ // Source
+ // ======
+ @Override
+ public Map toSource() {
+ Map sourceMap = new HashMap<>();
+ if (createdBy != null) {
+ sourceMap.put("createdBy", createdBy);
+ }
+ if (createdTime != null) {
+ sourceMap.put("createdTime", createdTime);
+ }
+ if (name != null) {
+ sourceMap.put("name", name);
+ }
+ if (sortOrder != null) {
+ sourceMap.put("sortOrder", sortOrder);
+ }
+ if (updatedBy != null) {
+ sourceMap.put("updatedBy", updatedBy);
+ }
+ if (updatedTime != null) {
+ sourceMap.put("updatedTime", updatedTime);
+ }
+ if (value != null) {
+ sourceMap.put("value", value);
+ }
+ return sourceMap;
+ }
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(createdBy);
+ sb.append(dm).append(createdTime);
+ sb.append(dm).append(name);
+ sb.append(dm).append(sortOrder);
+ sb.append(dm).append(updatedBy);
+ sb.append(dm).append(updatedTime);
+ sb.append(dm).append(value);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
// ===================================================================================
// Accessor
// ========
public String getCreatedBy() {
checkSpecifiedProperty("createdBy");
- return createdBy;
+ return convertEmptyToNull(createdBy);
}
public void setCreatedBy(String value) {
@@ -90,19 +146,9 @@ public class BsRoleType extends EsAbstractEntity {
this.createdTime = value;
}
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
public String getName() {
checkSpecifiedProperty("name");
- return name;
+ return convertEmptyToNull(name);
}
public void setName(String value) {
@@ -122,7 +168,7 @@ public class BsRoleType extends EsAbstractEntity {
public String getUpdatedBy() {
checkSpecifiedProperty("updatedBy");
- return updatedBy;
+ return convertEmptyToNull(updatedBy);
}
public void setUpdatedBy(String value) {
@@ -142,41 +188,11 @@ public class BsRoleType extends EsAbstractEntity {
public String getValue() {
checkSpecifiedProperty("value");
- return value;
+ return convertEmptyToNull(value);
}
public void setValue(String value) {
registerModifiedProperty("value");
this.value = value;
}
-
- @Override
- public Map toSource() {
- Map sourceMap = new HashMap<>();
- if (createdBy != null) {
- sourceMap.put("createdBy", createdBy);
- }
- if (createdTime != null) {
- sourceMap.put("createdTime", createdTime);
- }
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
- if (name != null) {
- sourceMap.put("name", name);
- }
- if (sortOrder != null) {
- sourceMap.put("sortOrder", sortOrder);
- }
- if (updatedBy != null) {
- sourceMap.put("updatedBy", updatedBy);
- }
- if (updatedTime != null) {
- sourceMap.put("updatedTime", updatedTime);
- }
- if (value != null) {
- sourceMap.put("value", value);
- }
- return sourceMap;
- }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsScheduledJob.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsScheduledJob.java
index e6fd4b994..32ed472ba 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsScheduledJob.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsScheduledJob.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.ScheduledJobDbm;
*/
public class BsScheduledJob extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public ScheduledJobDbm asDBMeta() {
- return ScheduledJobDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "scheduled_job";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -86,148 +79,21 @@ public class BsScheduledJob extends EsAbstractEntity {
// [Referrers] *comment only
// ===================================================================================
- // Accessor
- // ========
- public Boolean getAvailable() {
- checkSpecifiedProperty("available");
- return available;
+ // DB Meta
+ // =======
+ @Override
+ public ScheduledJobDbm asDBMeta() {
+ return ScheduledJobDbm.getInstance();
}
- public void setAvailable(Boolean value) {
- registerModifiedProperty("available");
- this.available = value;
- }
-
- public Boolean getCrawler() {
- checkSpecifiedProperty("crawler");
- return crawler;
- }
-
- public void setCrawler(Boolean value) {
- registerModifiedProperty("crawler");
- this.crawler = value;
- }
-
- public String getCreatedBy() {
- checkSpecifiedProperty("createdBy");
- return createdBy;
- }
-
- public void setCreatedBy(String value) {
- registerModifiedProperty("createdBy");
- this.createdBy = value;
- }
-
- public Long getCreatedTime() {
- checkSpecifiedProperty("createdTime");
- return createdTime;
- }
-
- public void setCreatedTime(Long value) {
- registerModifiedProperty("createdTime");
- this.createdTime = value;
- }
-
- public String getCronExpression() {
- checkSpecifiedProperty("cronExpression");
- return cronExpression;
- }
-
- public void setCronExpression(String value) {
- registerModifiedProperty("cronExpression");
- this.cronExpression = value;
- }
-
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
- public Boolean getJobLogging() {
- checkSpecifiedProperty("jobLogging");
- return jobLogging;
- }
-
- public void setJobLogging(Boolean value) {
- registerModifiedProperty("jobLogging");
- this.jobLogging = value;
- }
-
- public String getName() {
- checkSpecifiedProperty("name");
- return name;
- }
-
- public void setName(String value) {
- registerModifiedProperty("name");
- this.name = value;
- }
-
- public String getScriptData() {
- checkSpecifiedProperty("scriptData");
- return scriptData;
- }
-
- public void setScriptData(String value) {
- registerModifiedProperty("scriptData");
- this.scriptData = value;
- }
-
- public String getScriptType() {
- checkSpecifiedProperty("scriptType");
- return scriptType;
- }
-
- public void setScriptType(String value) {
- registerModifiedProperty("scriptType");
- this.scriptType = value;
- }
-
- public Integer getSortOrder() {
- checkSpecifiedProperty("sortOrder");
- return sortOrder;
- }
-
- public void setSortOrder(Integer value) {
- registerModifiedProperty("sortOrder");
- this.sortOrder = value;
- }
-
- public String getTarget() {
- checkSpecifiedProperty("target");
- return target;
- }
-
- public void setTarget(String value) {
- registerModifiedProperty("target");
- this.target = value;
- }
-
- public String getUpdatedBy() {
- checkSpecifiedProperty("updatedBy");
- return updatedBy;
- }
-
- public void setUpdatedBy(String value) {
- registerModifiedProperty("updatedBy");
- this.updatedBy = value;
- }
-
- public Long getUpdatedTime() {
- checkSpecifiedProperty("updatedTime");
- return updatedTime;
- }
-
- public void setUpdatedTime(Long value) {
- registerModifiedProperty("updatedTime");
- this.updatedTime = value;
+ @Override
+ public String asTableDbName() {
+ return "scheduled_job";
}
+ // ===================================================================================
+ // Source
+ // ======
@Override
public Map toSource() {
Map sourceMap = new HashMap<>();
@@ -246,9 +112,6 @@ public class BsScheduledJob extends EsAbstractEntity {
if (cronExpression != null) {
sourceMap.put("cronExpression", cronExpression);
}
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
if (jobLogging != null) {
sourceMap.put("jobLogging", jobLogging);
}
@@ -275,4 +138,163 @@ public class BsScheduledJob extends EsAbstractEntity {
}
return sourceMap;
}
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(available);
+ sb.append(dm).append(crawler);
+ sb.append(dm).append(createdBy);
+ sb.append(dm).append(createdTime);
+ sb.append(dm).append(cronExpression);
+ sb.append(dm).append(jobLogging);
+ sb.append(dm).append(name);
+ sb.append(dm).append(scriptData);
+ sb.append(dm).append(scriptType);
+ sb.append(dm).append(sortOrder);
+ sb.append(dm).append(target);
+ sb.append(dm).append(updatedBy);
+ sb.append(dm).append(updatedTime);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
+ // ===================================================================================
+ // Accessor
+ // ========
+ public Boolean getAvailable() {
+ checkSpecifiedProperty("available");
+ return available;
+ }
+
+ public void setAvailable(Boolean value) {
+ registerModifiedProperty("available");
+ this.available = value;
+ }
+
+ public Boolean getCrawler() {
+ checkSpecifiedProperty("crawler");
+ return crawler;
+ }
+
+ public void setCrawler(Boolean value) {
+ registerModifiedProperty("crawler");
+ this.crawler = value;
+ }
+
+ public String getCreatedBy() {
+ checkSpecifiedProperty("createdBy");
+ return convertEmptyToNull(createdBy);
+ }
+
+ public void setCreatedBy(String value) {
+ registerModifiedProperty("createdBy");
+ this.createdBy = value;
+ }
+
+ public Long getCreatedTime() {
+ checkSpecifiedProperty("createdTime");
+ return createdTime;
+ }
+
+ public void setCreatedTime(Long value) {
+ registerModifiedProperty("createdTime");
+ this.createdTime = value;
+ }
+
+ public String getCronExpression() {
+ checkSpecifiedProperty("cronExpression");
+ return convertEmptyToNull(cronExpression);
+ }
+
+ public void setCronExpression(String value) {
+ registerModifiedProperty("cronExpression");
+ this.cronExpression = value;
+ }
+
+ public Boolean getJobLogging() {
+ checkSpecifiedProperty("jobLogging");
+ return jobLogging;
+ }
+
+ public void setJobLogging(Boolean value) {
+ registerModifiedProperty("jobLogging");
+ this.jobLogging = value;
+ }
+
+ public String getName() {
+ checkSpecifiedProperty("name");
+ return convertEmptyToNull(name);
+ }
+
+ public void setName(String value) {
+ registerModifiedProperty("name");
+ this.name = value;
+ }
+
+ public String getScriptData() {
+ checkSpecifiedProperty("scriptData");
+ return convertEmptyToNull(scriptData);
+ }
+
+ public void setScriptData(String value) {
+ registerModifiedProperty("scriptData");
+ this.scriptData = value;
+ }
+
+ public String getScriptType() {
+ checkSpecifiedProperty("scriptType");
+ return convertEmptyToNull(scriptType);
+ }
+
+ public void setScriptType(String value) {
+ registerModifiedProperty("scriptType");
+ this.scriptType = value;
+ }
+
+ public Integer getSortOrder() {
+ checkSpecifiedProperty("sortOrder");
+ return sortOrder;
+ }
+
+ public void setSortOrder(Integer value) {
+ registerModifiedProperty("sortOrder");
+ this.sortOrder = value;
+ }
+
+ public String getTarget() {
+ checkSpecifiedProperty("target");
+ return convertEmptyToNull(target);
+ }
+
+ public void setTarget(String value) {
+ registerModifiedProperty("target");
+ this.target = value;
+ }
+
+ public String getUpdatedBy() {
+ checkSpecifiedProperty("updatedBy");
+ return convertEmptyToNull(updatedBy);
+ }
+
+ public void setUpdatedBy(String value) {
+ registerModifiedProperty("updatedBy");
+ this.updatedBy = value;
+ }
+
+ public Long getUpdatedTime() {
+ checkSpecifiedProperty("updatedTime");
+ return updatedTime;
+ }
+
+ public void setUpdatedTime(Long value) {
+ registerModifiedProperty("updatedTime");
+ this.updatedTime = value;
+ }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestBadWord.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestBadWord.java
index d5c14cf00..88eb2e4e4 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestBadWord.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestBadWord.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.SuggestBadWordDbm;
*/
public class BsSuggestBadWord extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public SuggestBadWordDbm asDBMeta() {
- return SuggestBadWordDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "suggest_bad_word";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -68,88 +61,21 @@ public class BsSuggestBadWord extends EsAbstractEntity {
// [Referrers] *comment only
// ===================================================================================
- // Accessor
- // ========
- public String getCreatedBy() {
- checkSpecifiedProperty("createdBy");
- return createdBy;
+ // DB Meta
+ // =======
+ @Override
+ public SuggestBadWordDbm asDBMeta() {
+ return SuggestBadWordDbm.getInstance();
}
- public void setCreatedBy(String value) {
- registerModifiedProperty("createdBy");
- this.createdBy = value;
- }
-
- public Long getCreatedTime() {
- checkSpecifiedProperty("createdTime");
- return createdTime;
- }
-
- public void setCreatedTime(Long value) {
- registerModifiedProperty("createdTime");
- this.createdTime = value;
- }
-
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
- public String getSuggestWord() {
- checkSpecifiedProperty("suggestWord");
- return suggestWord;
- }
-
- public void setSuggestWord(String value) {
- registerModifiedProperty("suggestWord");
- this.suggestWord = value;
- }
-
- public String getTargetLabel() {
- checkSpecifiedProperty("targetLabel");
- return targetLabel;
- }
-
- public void setTargetLabel(String value) {
- registerModifiedProperty("targetLabel");
- this.targetLabel = value;
- }
-
- public String getTargetRole() {
- checkSpecifiedProperty("targetRole");
- return targetRole;
- }
-
- public void setTargetRole(String value) {
- registerModifiedProperty("targetRole");
- this.targetRole = value;
- }
-
- public String getUpdatedBy() {
- checkSpecifiedProperty("updatedBy");
- return updatedBy;
- }
-
- public void setUpdatedBy(String value) {
- registerModifiedProperty("updatedBy");
- this.updatedBy = value;
- }
-
- public Long getUpdatedTime() {
- checkSpecifiedProperty("updatedTime");
- return updatedTime;
- }
-
- public void setUpdatedTime(Long value) {
- registerModifiedProperty("updatedTime");
- this.updatedTime = value;
+ @Override
+ public String asTableDbName() {
+ return "suggest_bad_word";
}
+ // ===================================================================================
+ // Source
+ // ======
@Override
public Map toSource() {
Map sourceMap = new HashMap<>();
@@ -159,9 +85,6 @@ public class BsSuggestBadWord extends EsAbstractEntity {
if (createdTime != null) {
sourceMap.put("createdTime", createdTime);
}
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
if (suggestWord != null) {
sourceMap.put("suggestWord", suggestWord);
}
@@ -179,4 +102,97 @@ public class BsSuggestBadWord extends EsAbstractEntity {
}
return sourceMap;
}
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(createdBy);
+ sb.append(dm).append(createdTime);
+ sb.append(dm).append(suggestWord);
+ sb.append(dm).append(targetLabel);
+ sb.append(dm).append(targetRole);
+ sb.append(dm).append(updatedBy);
+ sb.append(dm).append(updatedTime);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
+ // ===================================================================================
+ // Accessor
+ // ========
+ public String getCreatedBy() {
+ checkSpecifiedProperty("createdBy");
+ return convertEmptyToNull(createdBy);
+ }
+
+ public void setCreatedBy(String value) {
+ registerModifiedProperty("createdBy");
+ this.createdBy = value;
+ }
+
+ public Long getCreatedTime() {
+ checkSpecifiedProperty("createdTime");
+ return createdTime;
+ }
+
+ public void setCreatedTime(Long value) {
+ registerModifiedProperty("createdTime");
+ this.createdTime = value;
+ }
+
+ public String getSuggestWord() {
+ checkSpecifiedProperty("suggestWord");
+ return convertEmptyToNull(suggestWord);
+ }
+
+ public void setSuggestWord(String value) {
+ registerModifiedProperty("suggestWord");
+ this.suggestWord = value;
+ }
+
+ public String getTargetLabel() {
+ checkSpecifiedProperty("targetLabel");
+ return convertEmptyToNull(targetLabel);
+ }
+
+ public void setTargetLabel(String value) {
+ registerModifiedProperty("targetLabel");
+ this.targetLabel = value;
+ }
+
+ public String getTargetRole() {
+ checkSpecifiedProperty("targetRole");
+ return convertEmptyToNull(targetRole);
+ }
+
+ public void setTargetRole(String value) {
+ registerModifiedProperty("targetRole");
+ this.targetRole = value;
+ }
+
+ public String getUpdatedBy() {
+ checkSpecifiedProperty("updatedBy");
+ return convertEmptyToNull(updatedBy);
+ }
+
+ public void setUpdatedBy(String value) {
+ registerModifiedProperty("updatedBy");
+ this.updatedBy = value;
+ }
+
+ public Long getUpdatedTime() {
+ checkSpecifiedProperty("updatedTime");
+ return updatedTime;
+ }
+
+ public void setUpdatedTime(Long value) {
+ registerModifiedProperty("updatedTime");
+ this.updatedTime = value;
+ }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWord.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWord.java
index c3afe5473..541df6042 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWord.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsSuggestElevateWord.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.SuggestElevateWordDbm;
*/
public class BsSuggestElevateWord extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public SuggestElevateWordDbm asDBMeta() {
- return SuggestElevateWordDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "suggest_elevate_word";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -74,108 +67,21 @@ public class BsSuggestElevateWord extends EsAbstractEntity {
// [Referrers] *comment only
// ===================================================================================
- // Accessor
- // ========
- public Float getBoost() {
- checkSpecifiedProperty("boost");
- return boost;
+ // DB Meta
+ // =======
+ @Override
+ public SuggestElevateWordDbm asDBMeta() {
+ return SuggestElevateWordDbm.getInstance();
}
- public void setBoost(Float value) {
- registerModifiedProperty("boost");
- this.boost = value;
- }
-
- public String getCreatedBy() {
- checkSpecifiedProperty("createdBy");
- return createdBy;
- }
-
- public void setCreatedBy(String value) {
- registerModifiedProperty("createdBy");
- this.createdBy = value;
- }
-
- public Long getCreatedTime() {
- checkSpecifiedProperty("createdTime");
- return createdTime;
- }
-
- public void setCreatedTime(Long value) {
- registerModifiedProperty("createdTime");
- this.createdTime = value;
- }
-
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
- public String getReading() {
- checkSpecifiedProperty("reading");
- return reading;
- }
-
- public void setReading(String value) {
- registerModifiedProperty("reading");
- this.reading = value;
- }
-
- public String getSuggestWord() {
- checkSpecifiedProperty("suggestWord");
- return suggestWord;
- }
-
- public void setSuggestWord(String value) {
- registerModifiedProperty("suggestWord");
- this.suggestWord = value;
- }
-
- public String getTargetLabel() {
- checkSpecifiedProperty("targetLabel");
- return targetLabel;
- }
-
- public void setTargetLabel(String value) {
- registerModifiedProperty("targetLabel");
- this.targetLabel = value;
- }
-
- public String getTargetRole() {
- checkSpecifiedProperty("targetRole");
- return targetRole;
- }
-
- public void setTargetRole(String value) {
- registerModifiedProperty("targetRole");
- this.targetRole = value;
- }
-
- public String getUpdatedBy() {
- checkSpecifiedProperty("updatedBy");
- return updatedBy;
- }
-
- public void setUpdatedBy(String value) {
- registerModifiedProperty("updatedBy");
- this.updatedBy = value;
- }
-
- public Long getUpdatedTime() {
- checkSpecifiedProperty("updatedTime");
- return updatedTime;
- }
-
- public void setUpdatedTime(Long value) {
- registerModifiedProperty("updatedTime");
- this.updatedTime = value;
+ @Override
+ public String asTableDbName() {
+ return "suggest_elevate_word";
}
+ // ===================================================================================
+ // Source
+ // ======
@Override
public Map toSource() {
Map sourceMap = new HashMap<>();
@@ -188,9 +94,6 @@ public class BsSuggestElevateWord extends EsAbstractEntity {
if (createdTime != null) {
sourceMap.put("createdTime", createdTime);
}
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
if (reading != null) {
sourceMap.put("reading", reading);
}
@@ -211,4 +114,119 @@ public class BsSuggestElevateWord extends EsAbstractEntity {
}
return sourceMap;
}
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(boost);
+ sb.append(dm).append(createdBy);
+ sb.append(dm).append(createdTime);
+ sb.append(dm).append(reading);
+ sb.append(dm).append(suggestWord);
+ sb.append(dm).append(targetLabel);
+ sb.append(dm).append(targetRole);
+ sb.append(dm).append(updatedBy);
+ sb.append(dm).append(updatedTime);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
+ // ===================================================================================
+ // Accessor
+ // ========
+ public Float getBoost() {
+ checkSpecifiedProperty("boost");
+ return boost;
+ }
+
+ public void setBoost(Float value) {
+ registerModifiedProperty("boost");
+ this.boost = value;
+ }
+
+ public String getCreatedBy() {
+ checkSpecifiedProperty("createdBy");
+ return convertEmptyToNull(createdBy);
+ }
+
+ public void setCreatedBy(String value) {
+ registerModifiedProperty("createdBy");
+ this.createdBy = value;
+ }
+
+ public Long getCreatedTime() {
+ checkSpecifiedProperty("createdTime");
+ return createdTime;
+ }
+
+ public void setCreatedTime(Long value) {
+ registerModifiedProperty("createdTime");
+ this.createdTime = value;
+ }
+
+ public String getReading() {
+ checkSpecifiedProperty("reading");
+ return convertEmptyToNull(reading);
+ }
+
+ public void setReading(String value) {
+ registerModifiedProperty("reading");
+ this.reading = value;
+ }
+
+ public String getSuggestWord() {
+ checkSpecifiedProperty("suggestWord");
+ return convertEmptyToNull(suggestWord);
+ }
+
+ public void setSuggestWord(String value) {
+ registerModifiedProperty("suggestWord");
+ this.suggestWord = value;
+ }
+
+ public String getTargetLabel() {
+ checkSpecifiedProperty("targetLabel");
+ return convertEmptyToNull(targetLabel);
+ }
+
+ public void setTargetLabel(String value) {
+ registerModifiedProperty("targetLabel");
+ this.targetLabel = value;
+ }
+
+ public String getTargetRole() {
+ checkSpecifiedProperty("targetRole");
+ return convertEmptyToNull(targetRole);
+ }
+
+ public void setTargetRole(String value) {
+ registerModifiedProperty("targetRole");
+ this.targetRole = value;
+ }
+
+ public String getUpdatedBy() {
+ checkSpecifiedProperty("updatedBy");
+ return convertEmptyToNull(updatedBy);
+ }
+
+ public void setUpdatedBy(String value) {
+ registerModifiedProperty("updatedBy");
+ this.updatedBy = value;
+ }
+
+ public Long getUpdatedTime() {
+ checkSpecifiedProperty("updatedTime");
+ return updatedTime;
+ }
+
+ public void setUpdatedTime(Long value) {
+ registerModifiedProperty("updatedTime");
+ this.updatedTime = value;
+ }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebAuthentication.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebAuthentication.java
index 7424707f2..ae1c0cc87 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebAuthentication.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebAuthentication.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.WebAuthenticationDbm;
*/
public class BsWebAuthentication extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public WebAuthenticationDbm asDBMeta() {
- return WebAuthenticationDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "web_authentication";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -83,138 +76,21 @@ public class BsWebAuthentication extends EsAbstractEntity {
// [Referrers] *comment only
// ===================================================================================
- // Accessor
- // ========
- public String getAuthRealm() {
- checkSpecifiedProperty("authRealm");
- return authRealm;
+ // DB Meta
+ // =======
+ @Override
+ public WebAuthenticationDbm asDBMeta() {
+ return WebAuthenticationDbm.getInstance();
}
- public void setAuthRealm(String value) {
- registerModifiedProperty("authRealm");
- this.authRealm = value;
- }
-
- public String getCreatedBy() {
- checkSpecifiedProperty("createdBy");
- return createdBy;
- }
-
- public void setCreatedBy(String value) {
- registerModifiedProperty("createdBy");
- this.createdBy = value;
- }
-
- public Long getCreatedTime() {
- checkSpecifiedProperty("createdTime");
- return createdTime;
- }
-
- public void setCreatedTime(Long value) {
- registerModifiedProperty("createdTime");
- this.createdTime = value;
- }
-
- public String getHostname() {
- checkSpecifiedProperty("hostname");
- return hostname;
- }
-
- public void setHostname(String value) {
- registerModifiedProperty("hostname");
- this.hostname = value;
- }
-
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
- public String getParameters() {
- checkSpecifiedProperty("parameters");
- return parameters;
- }
-
- public void setParameters(String value) {
- registerModifiedProperty("parameters");
- this.parameters = value;
- }
-
- public String getPassword() {
- checkSpecifiedProperty("password");
- return password;
- }
-
- public void setPassword(String value) {
- registerModifiedProperty("password");
- this.password = value;
- }
-
- public Integer getPort() {
- checkSpecifiedProperty("port");
- return port;
- }
-
- public void setPort(Integer value) {
- registerModifiedProperty("port");
- this.port = value;
- }
-
- public String getProtocolScheme() {
- checkSpecifiedProperty("protocolScheme");
- return protocolScheme;
- }
-
- public void setProtocolScheme(String value) {
- registerModifiedProperty("protocolScheme");
- this.protocolScheme = value;
- }
-
- public String getUpdatedBy() {
- checkSpecifiedProperty("updatedBy");
- return updatedBy;
- }
-
- public void setUpdatedBy(String value) {
- registerModifiedProperty("updatedBy");
- this.updatedBy = value;
- }
-
- public Long getUpdatedTime() {
- checkSpecifiedProperty("updatedTime");
- return updatedTime;
- }
-
- public void setUpdatedTime(Long value) {
- registerModifiedProperty("updatedTime");
- this.updatedTime = value;
- }
-
- public String getUsername() {
- checkSpecifiedProperty("username");
- return username;
- }
-
- public void setUsername(String value) {
- registerModifiedProperty("username");
- this.username = value;
- }
-
- public String getWebConfigId() {
- checkSpecifiedProperty("webConfigId");
- return webConfigId;
- }
-
- public void setWebConfigId(String value) {
- registerModifiedProperty("webConfigId");
- this.webConfigId = value;
+ @Override
+ public String asTableDbName() {
+ return "web_authentication";
}
+ // ===================================================================================
+ // Source
+ // ======
@Override
public Map toSource() {
Map sourceMap = new HashMap<>();
@@ -230,9 +106,6 @@ public class BsWebAuthentication extends EsAbstractEntity {
if (hostname != null) {
sourceMap.put("hostname", hostname);
}
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
if (parameters != null) {
sourceMap.put("parameters", parameters);
}
@@ -259,4 +132,152 @@ public class BsWebAuthentication extends EsAbstractEntity {
}
return sourceMap;
}
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(authRealm);
+ sb.append(dm).append(createdBy);
+ sb.append(dm).append(createdTime);
+ sb.append(dm).append(hostname);
+ sb.append(dm).append(parameters);
+ sb.append(dm).append(password);
+ sb.append(dm).append(port);
+ sb.append(dm).append(protocolScheme);
+ sb.append(dm).append(updatedBy);
+ sb.append(dm).append(updatedTime);
+ sb.append(dm).append(username);
+ sb.append(dm).append(webConfigId);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
+ // ===================================================================================
+ // Accessor
+ // ========
+ public String getAuthRealm() {
+ checkSpecifiedProperty("authRealm");
+ return convertEmptyToNull(authRealm);
+ }
+
+ public void setAuthRealm(String value) {
+ registerModifiedProperty("authRealm");
+ this.authRealm = value;
+ }
+
+ public String getCreatedBy() {
+ checkSpecifiedProperty("createdBy");
+ return convertEmptyToNull(createdBy);
+ }
+
+ public void setCreatedBy(String value) {
+ registerModifiedProperty("createdBy");
+ this.createdBy = value;
+ }
+
+ public Long getCreatedTime() {
+ checkSpecifiedProperty("createdTime");
+ return createdTime;
+ }
+
+ public void setCreatedTime(Long value) {
+ registerModifiedProperty("createdTime");
+ this.createdTime = value;
+ }
+
+ public String getHostname() {
+ checkSpecifiedProperty("hostname");
+ return convertEmptyToNull(hostname);
+ }
+
+ public void setHostname(String value) {
+ registerModifiedProperty("hostname");
+ this.hostname = value;
+ }
+
+ public String getParameters() {
+ checkSpecifiedProperty("parameters");
+ return convertEmptyToNull(parameters);
+ }
+
+ public void setParameters(String value) {
+ registerModifiedProperty("parameters");
+ this.parameters = value;
+ }
+
+ public String getPassword() {
+ checkSpecifiedProperty("password");
+ return convertEmptyToNull(password);
+ }
+
+ public void setPassword(String value) {
+ registerModifiedProperty("password");
+ this.password = value;
+ }
+
+ public Integer getPort() {
+ checkSpecifiedProperty("port");
+ return port;
+ }
+
+ public void setPort(Integer value) {
+ registerModifiedProperty("port");
+ this.port = value;
+ }
+
+ public String getProtocolScheme() {
+ checkSpecifiedProperty("protocolScheme");
+ return convertEmptyToNull(protocolScheme);
+ }
+
+ public void setProtocolScheme(String value) {
+ registerModifiedProperty("protocolScheme");
+ this.protocolScheme = value;
+ }
+
+ public String getUpdatedBy() {
+ checkSpecifiedProperty("updatedBy");
+ return convertEmptyToNull(updatedBy);
+ }
+
+ public void setUpdatedBy(String value) {
+ registerModifiedProperty("updatedBy");
+ this.updatedBy = value;
+ }
+
+ public Long getUpdatedTime() {
+ checkSpecifiedProperty("updatedTime");
+ return updatedTime;
+ }
+
+ public void setUpdatedTime(Long value) {
+ registerModifiedProperty("updatedTime");
+ this.updatedTime = value;
+ }
+
+ public String getUsername() {
+ checkSpecifiedProperty("username");
+ return convertEmptyToNull(username);
+ }
+
+ public void setUsername(String value) {
+ registerModifiedProperty("username");
+ this.username = value;
+ }
+
+ public String getWebConfigId() {
+ checkSpecifiedProperty("webConfigId");
+ return convertEmptyToNull(webConfigId);
+ }
+
+ public void setWebConfigId(String value) {
+ registerModifiedProperty("webConfigId");
+ this.webConfigId = value;
+ }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java
index 155b61705..53612c570 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfig.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.WebConfigDbm;
*/
public class BsWebConfig extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public WebConfigDbm asDBMeta() {
- return WebConfigDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "web_config";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -104,208 +97,21 @@ public class BsWebConfig extends EsAbstractEntity {
// [Referrers] *comment only
// ===================================================================================
- // Accessor
- // ========
- public Boolean getAvailable() {
- checkSpecifiedProperty("available");
- return available;
+ // DB Meta
+ // =======
+ @Override
+ public WebConfigDbm asDBMeta() {
+ return WebConfigDbm.getInstance();
}
- public void setAvailable(Boolean value) {
- registerModifiedProperty("available");
- this.available = value;
- }
-
- public Float getBoost() {
- checkSpecifiedProperty("boost");
- return boost;
- }
-
- public void setBoost(Float value) {
- registerModifiedProperty("boost");
- this.boost = value;
- }
-
- public String getConfigParameter() {
- checkSpecifiedProperty("configParameter");
- return configParameter;
- }
-
- public void setConfigParameter(String value) {
- registerModifiedProperty("configParameter");
- this.configParameter = value;
- }
-
- public String getCreatedBy() {
- checkSpecifiedProperty("createdBy");
- return createdBy;
- }
-
- public void setCreatedBy(String value) {
- registerModifiedProperty("createdBy");
- this.createdBy = value;
- }
-
- public Long getCreatedTime() {
- checkSpecifiedProperty("createdTime");
- return createdTime;
- }
-
- public void setCreatedTime(Long value) {
- registerModifiedProperty("createdTime");
- this.createdTime = value;
- }
-
- public Integer getDepth() {
- checkSpecifiedProperty("depth");
- return depth;
- }
-
- public void setDepth(Integer value) {
- registerModifiedProperty("depth");
- this.depth = value;
- }
-
- public String getExcludedDocUrls() {
- checkSpecifiedProperty("excludedDocUrls");
- return excludedDocUrls;
- }
-
- public void setExcludedDocUrls(String value) {
- registerModifiedProperty("excludedDocUrls");
- this.excludedDocUrls = value;
- }
-
- public String getExcludedUrls() {
- checkSpecifiedProperty("excludedUrls");
- return excludedUrls;
- }
-
- public void setExcludedUrls(String value) {
- registerModifiedProperty("excludedUrls");
- this.excludedUrls = value;
- }
-
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
- public String getIncludedDocUrls() {
- checkSpecifiedProperty("includedDocUrls");
- return includedDocUrls;
- }
-
- public void setIncludedDocUrls(String value) {
- registerModifiedProperty("includedDocUrls");
- this.includedDocUrls = value;
- }
-
- public String getIncludedUrls() {
- checkSpecifiedProperty("includedUrls");
- return includedUrls;
- }
-
- public void setIncludedUrls(String value) {
- registerModifiedProperty("includedUrls");
- this.includedUrls = value;
- }
-
- public Integer getIntervalTime() {
- checkSpecifiedProperty("intervalTime");
- return intervalTime;
- }
-
- public void setIntervalTime(Integer value) {
- registerModifiedProperty("intervalTime");
- this.intervalTime = value;
- }
-
- public Long getMaxAccessCount() {
- checkSpecifiedProperty("maxAccessCount");
- return maxAccessCount;
- }
-
- public void setMaxAccessCount(Long value) {
- registerModifiedProperty("maxAccessCount");
- this.maxAccessCount = value;
- }
-
- public String getName() {
- checkSpecifiedProperty("name");
- return name;
- }
-
- public void setName(String value) {
- registerModifiedProperty("name");
- this.name = value;
- }
-
- public Integer getNumOfThread() {
- checkSpecifiedProperty("numOfThread");
- return numOfThread;
- }
-
- public void setNumOfThread(Integer value) {
- registerModifiedProperty("numOfThread");
- this.numOfThread = value;
- }
-
- public Integer getSortOrder() {
- checkSpecifiedProperty("sortOrder");
- return sortOrder;
- }
-
- public void setSortOrder(Integer value) {
- registerModifiedProperty("sortOrder");
- this.sortOrder = value;
- }
-
- public String getUpdatedBy() {
- checkSpecifiedProperty("updatedBy");
- return updatedBy;
- }
-
- public void setUpdatedBy(String value) {
- registerModifiedProperty("updatedBy");
- this.updatedBy = value;
- }
-
- public Long getUpdatedTime() {
- checkSpecifiedProperty("updatedTime");
- return updatedTime;
- }
-
- public void setUpdatedTime(Long value) {
- registerModifiedProperty("updatedTime");
- this.updatedTime = value;
- }
-
- public String getUrls() {
- checkSpecifiedProperty("urls");
- return urls;
- }
-
- public void setUrls(String value) {
- registerModifiedProperty("urls");
- this.urls = value;
- }
-
- public String getUserAgent() {
- checkSpecifiedProperty("userAgent");
- return userAgent;
- }
-
- public void setUserAgent(String value) {
- registerModifiedProperty("userAgent");
- this.userAgent = value;
+ @Override
+ public String asTableDbName() {
+ return "web_config";
}
+ // ===================================================================================
+ // Source
+ // ======
@Override
public Map toSource() {
Map sourceMap = new HashMap<>();
@@ -333,9 +139,6 @@ public class BsWebConfig extends EsAbstractEntity {
if (excludedUrls != null) {
sourceMap.put("excludedUrls", excludedUrls);
}
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
if (includedDocUrls != null) {
sourceMap.put("includedDocUrls", includedDocUrls);
}
@@ -371,4 +174,229 @@ public class BsWebConfig extends EsAbstractEntity {
}
return sourceMap;
}
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(available);
+ sb.append(dm).append(boost);
+ sb.append(dm).append(configParameter);
+ sb.append(dm).append(createdBy);
+ sb.append(dm).append(createdTime);
+ sb.append(dm).append(depth);
+ sb.append(dm).append(excludedDocUrls);
+ sb.append(dm).append(excludedUrls);
+ sb.append(dm).append(includedDocUrls);
+ sb.append(dm).append(includedUrls);
+ sb.append(dm).append(intervalTime);
+ sb.append(dm).append(maxAccessCount);
+ sb.append(dm).append(name);
+ sb.append(dm).append(numOfThread);
+ sb.append(dm).append(sortOrder);
+ sb.append(dm).append(updatedBy);
+ sb.append(dm).append(updatedTime);
+ sb.append(dm).append(urls);
+ sb.append(dm).append(userAgent);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
+ // ===================================================================================
+ // Accessor
+ // ========
+ public Boolean getAvailable() {
+ checkSpecifiedProperty("available");
+ return available;
+ }
+
+ public void setAvailable(Boolean value) {
+ registerModifiedProperty("available");
+ this.available = value;
+ }
+
+ public Float getBoost() {
+ checkSpecifiedProperty("boost");
+ return boost;
+ }
+
+ public void setBoost(Float value) {
+ registerModifiedProperty("boost");
+ this.boost = value;
+ }
+
+ public String getConfigParameter() {
+ checkSpecifiedProperty("configParameter");
+ return convertEmptyToNull(configParameter);
+ }
+
+ public void setConfigParameter(String value) {
+ registerModifiedProperty("configParameter");
+ this.configParameter = value;
+ }
+
+ public String getCreatedBy() {
+ checkSpecifiedProperty("createdBy");
+ return convertEmptyToNull(createdBy);
+ }
+
+ public void setCreatedBy(String value) {
+ registerModifiedProperty("createdBy");
+ this.createdBy = value;
+ }
+
+ public Long getCreatedTime() {
+ checkSpecifiedProperty("createdTime");
+ return createdTime;
+ }
+
+ public void setCreatedTime(Long value) {
+ registerModifiedProperty("createdTime");
+ this.createdTime = value;
+ }
+
+ public Integer getDepth() {
+ checkSpecifiedProperty("depth");
+ return depth;
+ }
+
+ public void setDepth(Integer value) {
+ registerModifiedProperty("depth");
+ this.depth = value;
+ }
+
+ public String getExcludedDocUrls() {
+ checkSpecifiedProperty("excludedDocUrls");
+ return convertEmptyToNull(excludedDocUrls);
+ }
+
+ public void setExcludedDocUrls(String value) {
+ registerModifiedProperty("excludedDocUrls");
+ this.excludedDocUrls = value;
+ }
+
+ public String getExcludedUrls() {
+ checkSpecifiedProperty("excludedUrls");
+ return convertEmptyToNull(excludedUrls);
+ }
+
+ public void setExcludedUrls(String value) {
+ registerModifiedProperty("excludedUrls");
+ this.excludedUrls = value;
+ }
+
+ public String getIncludedDocUrls() {
+ checkSpecifiedProperty("includedDocUrls");
+ return convertEmptyToNull(includedDocUrls);
+ }
+
+ public void setIncludedDocUrls(String value) {
+ registerModifiedProperty("includedDocUrls");
+ this.includedDocUrls = value;
+ }
+
+ public String getIncludedUrls() {
+ checkSpecifiedProperty("includedUrls");
+ return convertEmptyToNull(includedUrls);
+ }
+
+ public void setIncludedUrls(String value) {
+ registerModifiedProperty("includedUrls");
+ this.includedUrls = value;
+ }
+
+ public Integer getIntervalTime() {
+ checkSpecifiedProperty("intervalTime");
+ return intervalTime;
+ }
+
+ public void setIntervalTime(Integer value) {
+ registerModifiedProperty("intervalTime");
+ this.intervalTime = value;
+ }
+
+ public Long getMaxAccessCount() {
+ checkSpecifiedProperty("maxAccessCount");
+ return maxAccessCount;
+ }
+
+ public void setMaxAccessCount(Long value) {
+ registerModifiedProperty("maxAccessCount");
+ this.maxAccessCount = value;
+ }
+
+ public String getName() {
+ checkSpecifiedProperty("name");
+ return convertEmptyToNull(name);
+ }
+
+ public void setName(String value) {
+ registerModifiedProperty("name");
+ this.name = value;
+ }
+
+ public Integer getNumOfThread() {
+ checkSpecifiedProperty("numOfThread");
+ return numOfThread;
+ }
+
+ public void setNumOfThread(Integer value) {
+ registerModifiedProperty("numOfThread");
+ this.numOfThread = value;
+ }
+
+ public Integer getSortOrder() {
+ checkSpecifiedProperty("sortOrder");
+ return sortOrder;
+ }
+
+ public void setSortOrder(Integer value) {
+ registerModifiedProperty("sortOrder");
+ this.sortOrder = value;
+ }
+
+ public String getUpdatedBy() {
+ checkSpecifiedProperty("updatedBy");
+ return convertEmptyToNull(updatedBy);
+ }
+
+ public void setUpdatedBy(String value) {
+ registerModifiedProperty("updatedBy");
+ this.updatedBy = value;
+ }
+
+ public Long getUpdatedTime() {
+ checkSpecifiedProperty("updatedTime");
+ return updatedTime;
+ }
+
+ public void setUpdatedTime(Long value) {
+ registerModifiedProperty("updatedTime");
+ this.updatedTime = value;
+ }
+
+ public String getUrls() {
+ checkSpecifiedProperty("urls");
+ return convertEmptyToNull(urls);
+ }
+
+ public void setUrls(String value) {
+ registerModifiedProperty("urls");
+ this.urls = value;
+ }
+
+ public String getUserAgent() {
+ checkSpecifiedProperty("userAgent");
+ return convertEmptyToNull(userAgent);
+ }
+
+ public void setUserAgent(String value) {
+ registerModifiedProperty("userAgent");
+ this.userAgent = value;
+ }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToLabel.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToLabel.java
index 1cbc88fd9..0c826c8dc 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToLabel.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToLabel.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.WebConfigToLabelDbm;
*/
public class BsWebConfigToLabel extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public WebConfigToLabelDbm asDBMeta() {
- return WebConfigToLabelDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "web_config_to_label";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -52,22 +45,55 @@ public class BsWebConfigToLabel extends EsAbstractEntity {
// [Referrers] *comment only
+ // ===================================================================================
+ // DB Meta
+ // =======
+ @Override
+ public WebConfigToLabelDbm asDBMeta() {
+ return WebConfigToLabelDbm.getInstance();
+ }
+
+ @Override
+ public String asTableDbName() {
+ return "web_config_to_label";
+ }
+
+ // ===================================================================================
+ // Source
+ // ======
+ @Override
+ public Map toSource() {
+ Map sourceMap = new HashMap<>();
+ if (labelTypeId != null) {
+ sourceMap.put("labelTypeId", labelTypeId);
+ }
+ if (webConfigId != null) {
+ sourceMap.put("webConfigId", webConfigId);
+ }
+ return sourceMap;
+ }
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(labelTypeId);
+ sb.append(dm).append(webConfigId);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
// ===================================================================================
// Accessor
// ========
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
public String getLabelTypeId() {
checkSpecifiedProperty("labelTypeId");
- return labelTypeId;
+ return convertEmptyToNull(labelTypeId);
}
public void setLabelTypeId(String value) {
@@ -77,26 +103,11 @@ public class BsWebConfigToLabel extends EsAbstractEntity {
public String getWebConfigId() {
checkSpecifiedProperty("webConfigId");
- return webConfigId;
+ return convertEmptyToNull(webConfigId);
}
public void setWebConfigId(String value) {
registerModifiedProperty("webConfigId");
this.webConfigId = value;
}
-
- @Override
- public Map toSource() {
- Map sourceMap = new HashMap<>();
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
- if (labelTypeId != null) {
- sourceMap.put("labelTypeId", labelTypeId);
- }
- if (webConfigId != null) {
- sourceMap.put("webConfigId", webConfigId);
- }
- return sourceMap;
- }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToRole.java b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToRole.java
index e520ac9a1..064169ca5 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToRole.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/BsWebConfigToRole.java
@@ -28,19 +28,12 @@ import org.codelibs.fess.es.config.bsentity.dbmeta.WebConfigToRoleDbm;
*/
public class BsWebConfigToRole extends EsAbstractEntity {
+ // ===================================================================================
+ // Definition
+ // ==========
private static final long serialVersionUID = 1L;
protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
- @Override
- public WebConfigToRoleDbm asDBMeta() {
- return WebConfigToRoleDbm.getInstance();
- }
-
- @Override
- public String asTableDbName() {
- return "web_config_to_role";
- }
-
// ===================================================================================
// Attribute
// =========
@@ -52,22 +45,55 @@ public class BsWebConfigToRole extends EsAbstractEntity {
// [Referrers] *comment only
+ // ===================================================================================
+ // DB Meta
+ // =======
+ @Override
+ public WebConfigToRoleDbm asDBMeta() {
+ return WebConfigToRoleDbm.getInstance();
+ }
+
+ @Override
+ public String asTableDbName() {
+ return "web_config_to_role";
+ }
+
+ // ===================================================================================
+ // Source
+ // ======
+ @Override
+ public Map toSource() {
+ Map sourceMap = new HashMap<>();
+ if (roleTypeId != null) {
+ sourceMap.put("roleTypeId", roleTypeId);
+ }
+ if (webConfigId != null) {
+ sourceMap.put("webConfigId", webConfigId);
+ }
+ return sourceMap;
+ }
+
+ // ===================================================================================
+ // Basic Override
+ // ==============
+ @Override
+ protected String doBuildColumnString(String dm) {
+ StringBuilder sb = new StringBuilder();
+ sb.append(dm).append(roleTypeId);
+ sb.append(dm).append(webConfigId);
+ if (sb.length() > dm.length()) {
+ sb.delete(0, dm.length());
+ }
+ sb.insert(0, "{").append("}");
+ return sb.toString();
+ }
+
// ===================================================================================
// Accessor
// ========
- public String getId() {
- checkSpecifiedProperty("id");
- return asDocMeta().id();
- }
-
- public void setId(String value) {
- registerModifiedProperty("id");
- asDocMeta().id(value);
- }
-
public String getRoleTypeId() {
checkSpecifiedProperty("roleTypeId");
- return roleTypeId;
+ return convertEmptyToNull(roleTypeId);
}
public void setRoleTypeId(String value) {
@@ -77,26 +103,11 @@ public class BsWebConfigToRole extends EsAbstractEntity {
public String getWebConfigId() {
checkSpecifiedProperty("webConfigId");
- return webConfigId;
+ return convertEmptyToNull(webConfigId);
}
public void setWebConfigId(String value) {
registerModifiedProperty("webConfigId");
this.webConfigId = value;
}
-
- @Override
- public Map toSource() {
- Map sourceMap = new HashMap<>();
- if (asDocMeta().id() != null) {
- sourceMap.put("id", asDocMeta().id());
- }
- if (roleTypeId != null) {
- sourceMap.put("roleTypeId", roleTypeId);
- }
- if (webConfigId != null) {
- sourceMap.put("webConfigId", webConfigId);
- }
- return sourceMap;
- }
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java
index 63b225d24..eaa82c472 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java
@@ -85,7 +85,6 @@ public class BoostDocumentRuleDbm extends AbstractDBMeta {
(et, vl) -> ((BoostDocumentRule) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
setupEpg(_epgMap, et -> ((BoostDocumentRule) et).getCreatedTime(),
(et, vl) -> ((BoostDocumentRule) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
- setupEpg(_epgMap, et -> ((BoostDocumentRule) et).getId(), (et, vl) -> ((BoostDocumentRule) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((BoostDocumentRule) et).getSortOrder(),
(et, vl) -> ((BoostDocumentRule) et).setSortOrder(DfTypeUtil.toInteger(vl)), "sortOrder");
setupEpg(_epgMap, et -> ((BoostDocumentRule) et).getUpdatedBy(),
@@ -136,8 +135,6 @@ public class BoostDocumentRuleDbm extends AbstractDBMeta {
false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
@@ -159,10 +156,6 @@ public class BoostDocumentRuleDbm extends AbstractDBMeta {
return _columnCreatedTime;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnSortOrder() {
return _columnSortOrder;
}
@@ -184,7 +177,6 @@ public class BoostDocumentRuleDbm extends AbstractDBMeta {
ls.add(columnBoostExpr());
ls.add(columnCreatedBy());
ls.add(columnCreatedTime());
- ls.add(columnId());
ls.add(columnSortOrder());
ls.add(columnUpdatedBy());
ls.add(columnUpdatedTime());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingSessionDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingSessionDbm.java
index 4b46505c7..07aa67cfc 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingSessionDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingSessionDbm.java
@@ -83,7 +83,6 @@ public class CrawlingSessionDbm extends AbstractDBMeta {
(et, vl) -> ((CrawlingSession) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
setupEpg(_epgMap, et -> ((CrawlingSession) et).getExpiredTime(),
(et, vl) -> ((CrawlingSession) et).setExpiredTime(DfTypeUtil.toLong(vl)), "expiredTime");
- setupEpg(_epgMap, et -> ((CrawlingSession) et).getId(), (et, vl) -> ((CrawlingSession) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((CrawlingSession) et).getName(), (et, vl) -> ((CrawlingSession) et).setName(DfTypeUtil.toString(vl)),
"name");
setupEpg(_epgMap, et -> ((CrawlingSession) et).getSessionId(),
@@ -128,8 +127,6 @@ public class CrawlingSessionDbm extends AbstractDBMeta {
false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnExpiredTime = cci("expiredTime", "expiredTime", null, null, Long.class, "expiredTime", null, false,
false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnSessionId = cci("sessionId", "sessionId", null, null, String.class, "sessionId", null, false, false,
@@ -143,10 +140,6 @@ public class CrawlingSessionDbm extends AbstractDBMeta {
return _columnExpiredTime;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnName() {
return _columnName;
}
@@ -159,7 +152,6 @@ public class CrawlingSessionDbm extends AbstractDBMeta {
List ls = newArrayList();
ls.add(columnCreatedTime());
ls.add(columnExpiredTime());
- ls.add(columnId());
ls.add(columnName());
ls.add(columnSessionId());
return ls;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingSessionInfoDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingSessionInfoDbm.java
index b7f290ca9..162097288 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingSessionInfoDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingSessionInfoDbm.java
@@ -83,8 +83,6 @@ public class CrawlingSessionInfoDbm extends AbstractDBMeta {
(et, vl) -> ((CrawlingSessionInfo) et).setCrawlingSessionId(DfTypeUtil.toString(vl)), "crawlingSessionId");
setupEpg(_epgMap, et -> ((CrawlingSessionInfo) et).getCreatedTime(),
(et, vl) -> ((CrawlingSessionInfo) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
- setupEpg(_epgMap, et -> ((CrawlingSessionInfo) et).getId(), (et, vl) -> ((CrawlingSessionInfo) et).setId(DfTypeUtil.toString(vl)),
- "id");
setupEpg(_epgMap, et -> ((CrawlingSessionInfo) et).getKey(),
(et, vl) -> ((CrawlingSessionInfo) et).setKey(DfTypeUtil.toString(vl)), "key");
setupEpg(_epgMap, et -> ((CrawlingSessionInfo) et).getValue(),
@@ -129,8 +127,6 @@ public class CrawlingSessionInfoDbm extends AbstractDBMeta {
"crawlingSessionId", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnKey = cci("key", "key", null, null, String.class, "key", null, false, false, false, "String", 0, 0,
null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String",
@@ -144,10 +140,6 @@ public class CrawlingSessionInfoDbm extends AbstractDBMeta {
return _columnCreatedTime;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnKey() {
return _columnKey;
}
@@ -160,7 +152,6 @@ public class CrawlingSessionInfoDbm extends AbstractDBMeta {
List ls = newArrayList();
ls.add(columnCrawlingSessionId());
ls.add(columnCreatedTime());
- ls.add(columnId());
ls.add(columnKey());
ls.add(columnValue());
return ls;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java
index 53f4c0b48..8e890e5cf 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java
@@ -92,7 +92,6 @@ public class DataConfigDbm extends AbstractDBMeta {
(et, vl) -> ((DataConfig) et).setHandlerParameter(DfTypeUtil.toString(vl)), "handlerParameter");
setupEpg(_epgMap, et -> ((DataConfig) et).getHandlerScript(),
(et, vl) -> ((DataConfig) et).setHandlerScript(DfTypeUtil.toString(vl)), "handlerScript");
- setupEpg(_epgMap, et -> ((DataConfig) et).getId(), (et, vl) -> ((DataConfig) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((DataConfig) et).getName(), (et, vl) -> ((DataConfig) et).setName(DfTypeUtil.toString(vl)), "name");
setupEpg(_epgMap, et -> ((DataConfig) et).getSortOrder(), (et, vl) -> ((DataConfig) et).setSortOrder(DfTypeUtil.toInteger(vl)),
"sortOrder");
@@ -150,8 +149,6 @@ public class DataConfigDbm extends AbstractDBMeta {
"handlerParameter", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnHandlerScript = cci("handlerScript", "handlerScript", null, null, String.class, "handlerScript",
null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
@@ -189,10 +186,6 @@ public class DataConfigDbm extends AbstractDBMeta {
return _columnHandlerScript;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnName() {
return _columnName;
}
@@ -218,7 +211,6 @@ public class DataConfigDbm extends AbstractDBMeta {
ls.add(columnHandlerName());
ls.add(columnHandlerParameter());
ls.add(columnHandlerScript());
- ls.add(columnId());
ls.add(columnName());
ls.add(columnSortOrder());
ls.add(columnUpdatedBy());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java
index cbf0f4d51..1663b8f96 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java
@@ -81,7 +81,6 @@ public class DataConfigToLabelDbm extends AbstractDBMeta {
{
setupEpg(_epgMap, et -> ((DataConfigToLabel) et).getDataConfigId(),
(et, vl) -> ((DataConfigToLabel) et).setDataConfigId(DfTypeUtil.toString(vl)), "dataConfigId");
- setupEpg(_epgMap, et -> ((DataConfigToLabel) et).getId(), (et, vl) -> ((DataConfigToLabel) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((DataConfigToLabel) et).getLabelTypeId(),
(et, vl) -> ((DataConfigToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId");
}
@@ -122,8 +121,6 @@ public class DataConfigToLabelDbm extends AbstractDBMeta {
// ===========
protected final ColumnInfo _columnDataConfigId = cci("dataConfigId", "dataConfigId", null, null, String.class, "dataConfigId", null,
false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false,
false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
@@ -131,10 +128,6 @@ public class DataConfigToLabelDbm extends AbstractDBMeta {
return _columnDataConfigId;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnLabelTypeId() {
return _columnLabelTypeId;
}
@@ -142,7 +135,6 @@ public class DataConfigToLabelDbm extends AbstractDBMeta {
protected List ccil() {
List ls = newArrayList();
ls.add(columnDataConfigId());
- ls.add(columnId());
ls.add(columnLabelTypeId());
return ls;
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java
index 5cb18d577..f9308cea9 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java
@@ -81,7 +81,6 @@ public class DataConfigToRoleDbm extends AbstractDBMeta {
{
setupEpg(_epgMap, et -> ((DataConfigToRole) et).getDataConfigId(),
(et, vl) -> ((DataConfigToRole) et).setDataConfigId(DfTypeUtil.toString(vl)), "dataConfigId");
- setupEpg(_epgMap, et -> ((DataConfigToRole) et).getId(), (et, vl) -> ((DataConfigToRole) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((DataConfigToRole) et).getRoleTypeId(),
(et, vl) -> ((DataConfigToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId");
}
@@ -122,8 +121,6 @@ public class DataConfigToRoleDbm extends AbstractDBMeta {
// ===========
protected final ColumnInfo _columnDataConfigId = cci("dataConfigId", "dataConfigId", null, null, String.class, "dataConfigId", null,
false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false,
false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
@@ -131,10 +128,6 @@ public class DataConfigToRoleDbm extends AbstractDBMeta {
return _columnDataConfigId;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnRoleTypeId() {
return _columnRoleTypeId;
}
@@ -142,7 +135,6 @@ public class DataConfigToRoleDbm extends AbstractDBMeta {
protected List ccil() {
List ls = newArrayList();
ls.add(columnDataConfigId());
- ls.add(columnId());
ls.add(columnRoleTypeId());
return ls;
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java
index cfe22a65b..12952b846 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java
@@ -87,7 +87,6 @@ public class FailureUrlDbm extends AbstractDBMeta {
"errorLog");
setupEpg(_epgMap, et -> ((FailureUrl) et).getErrorName(), (et, vl) -> ((FailureUrl) et).setErrorName(DfTypeUtil.toString(vl)),
"errorName");
- setupEpg(_epgMap, et -> ((FailureUrl) et).getId(), (et, vl) -> ((FailureUrl) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((FailureUrl) et).getLastAccessTime(),
(et, vl) -> ((FailureUrl) et).setLastAccessTime(DfTypeUtil.toLong(vl)), "lastAccessTime");
setupEpg(_epgMap, et -> ((FailureUrl) et).getThreadName(), (et, vl) -> ((FailureUrl) et).setThreadName(DfTypeUtil.toString(vl)),
@@ -137,8 +136,6 @@ public class FailureUrlDbm extends AbstractDBMeta {
false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnErrorName = cci("errorName", "errorName", null, null, String.class, "errorName", null, false, false,
false, "String", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnLastAccessTime = cci("lastAccessTime", "lastAccessTime", null, null, Long.class, "lastAccessTime",
null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnThreadName = cci("threadName", "threadName", null, null, String.class, "threadName", null, false,
@@ -162,10 +159,6 @@ public class FailureUrlDbm extends AbstractDBMeta {
return _columnErrorName;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnLastAccessTime() {
return _columnLastAccessTime;
}
@@ -184,7 +177,6 @@ public class FailureUrlDbm extends AbstractDBMeta {
ls.add(columnErrorCount());
ls.add(columnErrorLog());
ls.add(columnErrorName());
- ls.add(columnId());
ls.add(columnLastAccessTime());
ls.add(columnThreadName());
ls.add(columnUrl());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java
index 07e417955..40099ecda 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java
@@ -87,8 +87,6 @@ public class FileAuthenticationDbm extends AbstractDBMeta {
(et, vl) -> ((FileAuthentication) et).setFileConfigId(DfTypeUtil.toString(vl)), "fileConfigId");
setupEpg(_epgMap, et -> ((FileAuthentication) et).getHostname(),
(et, vl) -> ((FileAuthentication) et).setHostname(DfTypeUtil.toString(vl)), "hostname");
- setupEpg(_epgMap, et -> ((FileAuthentication) et).getId(), (et, vl) -> ((FileAuthentication) et).setId(DfTypeUtil.toString(vl)),
- "id");
setupEpg(_epgMap, et -> ((FileAuthentication) et).getParameters(),
(et, vl) -> ((FileAuthentication) et).setParameters(DfTypeUtil.toString(vl)), "parameters");
setupEpg(_epgMap, et -> ((FileAuthentication) et).getPassword(),
@@ -147,8 +145,6 @@ public class FileAuthenticationDbm extends AbstractDBMeta {
false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnHostname = cci("hostname", "hostname", null, null, String.class, "hostname", null, false, false,
false, "String", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnParameters = cci("parameters", "parameters", null, null, String.class, "parameters", null, false,
false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false,
@@ -180,10 +176,6 @@ public class FileAuthenticationDbm extends AbstractDBMeta {
return _columnHostname;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnParameters() {
return _columnParameters;
}
@@ -218,7 +210,6 @@ public class FileAuthenticationDbm extends AbstractDBMeta {
ls.add(columnCreatedTime());
ls.add(columnFileConfigId());
ls.add(columnHostname());
- ls.add(columnId());
ls.add(columnParameters());
ls.add(columnPassword());
ls.add(columnPort());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java
index 4f73a1561..b5fd64a1c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java
@@ -93,7 +93,6 @@ public class FileConfigDbm extends AbstractDBMeta {
(et, vl) -> ((FileConfig) et).setExcludedDocPaths(DfTypeUtil.toString(vl)), "excludedDocPaths");
setupEpg(_epgMap, et -> ((FileConfig) et).getExcludedPaths(),
(et, vl) -> ((FileConfig) et).setExcludedPaths(DfTypeUtil.toString(vl)), "excludedPaths");
- setupEpg(_epgMap, et -> ((FileConfig) et).getId(), (et, vl) -> ((FileConfig) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((FileConfig) et).getIncludedDocPaths(),
(et, vl) -> ((FileConfig) et).setIncludedDocPaths(DfTypeUtil.toString(vl)), "includedDocPaths");
setupEpg(_epgMap, et -> ((FileConfig) et).getIncludedPaths(),
@@ -164,8 +163,6 @@ public class FileConfigDbm extends AbstractDBMeta {
"excludedDocPaths", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnExcludedPaths = cci("excludedPaths", "excludedPaths", null, null, String.class, "excludedPaths",
null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnIncludedDocPaths = cci("includedDocPaths", "includedDocPaths", null, null, String.class,
"includedDocPaths", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnIncludedPaths = cci("includedPaths", "includedPaths", null, null, String.class, "includedPaths",
@@ -219,10 +216,6 @@ public class FileConfigDbm extends AbstractDBMeta {
return _columnExcludedPaths;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnIncludedDocPaths() {
return _columnIncludedDocPaths;
}
@@ -273,7 +266,6 @@ public class FileConfigDbm extends AbstractDBMeta {
ls.add(columnDepth());
ls.add(columnExcludedDocPaths());
ls.add(columnExcludedPaths());
- ls.add(columnId());
ls.add(columnIncludedDocPaths());
ls.add(columnIncludedPaths());
ls.add(columnIntervalTime());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java
index c176de7f1..e969392f8 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java
@@ -81,7 +81,6 @@ public class FileConfigToLabelDbm extends AbstractDBMeta {
{
setupEpg(_epgMap, et -> ((FileConfigToLabel) et).getFileConfigId(),
(et, vl) -> ((FileConfigToLabel) et).setFileConfigId(DfTypeUtil.toString(vl)), "fileConfigId");
- setupEpg(_epgMap, et -> ((FileConfigToLabel) et).getId(), (et, vl) -> ((FileConfigToLabel) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((FileConfigToLabel) et).getLabelTypeId(),
(et, vl) -> ((FileConfigToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId");
}
@@ -122,8 +121,6 @@ public class FileConfigToLabelDbm extends AbstractDBMeta {
// ===========
protected final ColumnInfo _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null,
false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false,
false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
@@ -131,10 +128,6 @@ public class FileConfigToLabelDbm extends AbstractDBMeta {
return _columnFileConfigId;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnLabelTypeId() {
return _columnLabelTypeId;
}
@@ -142,7 +135,6 @@ public class FileConfigToLabelDbm extends AbstractDBMeta {
protected List ccil() {
List ls = newArrayList();
ls.add(columnFileConfigId());
- ls.add(columnId());
ls.add(columnLabelTypeId());
return ls;
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java
index 3c486dd14..22165b556 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java
@@ -81,7 +81,6 @@ public class FileConfigToRoleDbm extends AbstractDBMeta {
{
setupEpg(_epgMap, et -> ((FileConfigToRole) et).getFileConfigId(),
(et, vl) -> ((FileConfigToRole) et).setFileConfigId(DfTypeUtil.toString(vl)), "fileConfigId");
- setupEpg(_epgMap, et -> ((FileConfigToRole) et).getId(), (et, vl) -> ((FileConfigToRole) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((FileConfigToRole) et).getRoleTypeId(),
(et, vl) -> ((FileConfigToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId");
}
@@ -122,8 +121,6 @@ public class FileConfigToRoleDbm extends AbstractDBMeta {
// ===========
protected final ColumnInfo _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null,
false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false,
false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
@@ -131,10 +128,6 @@ public class FileConfigToRoleDbm extends AbstractDBMeta {
return _columnFileConfigId;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnRoleTypeId() {
return _columnRoleTypeId;
}
@@ -142,7 +135,6 @@ public class FileConfigToRoleDbm extends AbstractDBMeta {
protected List ccil() {
List ls = newArrayList();
ls.add(columnFileConfigId());
- ls.add(columnId());
ls.add(columnRoleTypeId());
return ls;
}
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java
index ea0e26502..6af58ca00 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java
@@ -80,7 +80,6 @@ public class JobLogDbm extends AbstractDBMeta {
protected final Map _epgMap = newHashMap();
{
setupEpg(_epgMap, et -> ((JobLog) et).getEndTime(), (et, vl) -> ((JobLog) et).setEndTime(DfTypeUtil.toLong(vl)), "endTime");
- setupEpg(_epgMap, et -> ((JobLog) et).getId(), (et, vl) -> ((JobLog) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((JobLog) et).getJobName(), (et, vl) -> ((JobLog) et).setJobName(DfTypeUtil.toString(vl)), "jobName");
setupEpg(_epgMap, et -> ((JobLog) et).getJobStatus(), (et, vl) -> ((JobLog) et).setJobStatus(DfTypeUtil.toString(vl)), "jobStatus");
setupEpg(_epgMap, et -> ((JobLog) et).getScriptData(), (et, vl) -> ((JobLog) et).setScriptData(DfTypeUtil.toString(vl)),
@@ -129,8 +128,6 @@ public class JobLogDbm extends AbstractDBMeta {
// ===========
protected final ColumnInfo _columnEndTime = cci("endTime", "endTime", null, null, Long.class, "endTime", null, false, false, false,
"Long", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnJobName = cci("jobName", "jobName", null, null, String.class, "jobName", null, false, false, false,
"String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnJobStatus = cci("jobStatus", "jobStatus", null, null, String.class, "jobStatus", null, false, false,
@@ -150,10 +147,6 @@ public class JobLogDbm extends AbstractDBMeta {
return _columnEndTime;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnJobName() {
return _columnJobName;
}
@@ -185,7 +178,6 @@ public class JobLogDbm extends AbstractDBMeta {
protected List ccil() {
List ls = newArrayList();
ls.add(columnEndTime());
- ls.add(columnId());
ls.add(columnJobName());
ls.add(columnJobStatus());
ls.add(columnScriptData());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java
index 156404d6d..193ab6d95 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java
@@ -84,7 +84,6 @@ public class KeyMatchDbm extends AbstractDBMeta {
"createdBy");
setupEpg(_epgMap, et -> ((KeyMatch) et).getCreatedTime(), (et, vl) -> ((KeyMatch) et).setCreatedTime(DfTypeUtil.toLong(vl)),
"createdTime");
- setupEpg(_epgMap, et -> ((KeyMatch) et).getId(), (et, vl) -> ((KeyMatch) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((KeyMatch) et).getMaxSize(), (et, vl) -> ((KeyMatch) et).setMaxSize(DfTypeUtil.toInteger(vl)), "maxSize");
setupEpg(_epgMap, et -> ((KeyMatch) et).getQuery(), (et, vl) -> ((KeyMatch) et).setQuery(DfTypeUtil.toString(vl)), "query");
setupEpg(_epgMap, et -> ((KeyMatch) et).getTerm(), (et, vl) -> ((KeyMatch) et).setTerm(DfTypeUtil.toString(vl)), "term");
@@ -134,8 +133,6 @@ public class KeyMatchDbm extends AbstractDBMeta {
false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnMaxSize = cci("maxSize", "maxSize", null, null, Integer.class, "maxSize", null, false, false, false,
"Integer", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnQuery = cci("query", "query", null, null, String.class, "query", null, false, false, false, "String",
@@ -159,10 +156,6 @@ public class KeyMatchDbm extends AbstractDBMeta {
return _columnCreatedTime;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnMaxSize() {
return _columnMaxSize;
}
@@ -188,7 +181,6 @@ public class KeyMatchDbm extends AbstractDBMeta {
ls.add(columnBoost());
ls.add(columnCreatedBy());
ls.add(columnCreatedTime());
- ls.add(columnId());
ls.add(columnMaxSize());
ls.add(columnQuery());
ls.add(columnTerm());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java
index c469e3ea4..f0ee70f82 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java
@@ -79,7 +79,6 @@ public class LabelToRoleDbm extends AbstractDBMeta {
// ---------------
protected final Map _epgMap = newHashMap();
{
- setupEpg(_epgMap, et -> ((LabelToRole) et).getId(), (et, vl) -> ((LabelToRole) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((LabelToRole) et).getLabelTypeId(),
(et, vl) -> ((LabelToRole) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId");
setupEpg(_epgMap, et -> ((LabelToRole) et).getRoleTypeId(), (et, vl) -> ((LabelToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)),
@@ -120,17 +119,11 @@ public class LabelToRoleDbm extends AbstractDBMeta {
// ===================================================================================
// Column Info
// ===========
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false,
false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false,
false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnLabelTypeId() {
return _columnLabelTypeId;
}
@@ -141,7 +134,6 @@ public class LabelToRoleDbm extends AbstractDBMeta {
protected List ccil() {
List ls = newArrayList();
- ls.add(columnId());
ls.add(columnLabelTypeId());
ls.add(columnRoleTypeId());
return ls;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java
index 0d6a2e0ae..d9ba285b0 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java
@@ -85,7 +85,6 @@ public class LabelTypeDbm extends AbstractDBMeta {
"createdTime");
setupEpg(_epgMap, et -> ((LabelType) et).getExcludedPaths(),
(et, vl) -> ((LabelType) et).setExcludedPaths(DfTypeUtil.toString(vl)), "excludedPaths");
- setupEpg(_epgMap, et -> ((LabelType) et).getId(), (et, vl) -> ((LabelType) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((LabelType) et).getIncludedPaths(),
(et, vl) -> ((LabelType) et).setIncludedPaths(DfTypeUtil.toString(vl)), "includedPaths");
setupEpg(_epgMap, et -> ((LabelType) et).getName(), (et, vl) -> ((LabelType) et).setName(DfTypeUtil.toString(vl)), "name");
@@ -138,8 +137,6 @@ public class LabelTypeDbm extends AbstractDBMeta {
false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnExcludedPaths = cci("excludedPaths", "excludedPaths", null, null, String.class, "excludedPaths",
null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnIncludedPaths = cci("includedPaths", "includedPaths", null, null, String.class, "includedPaths",
null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
@@ -165,10 +162,6 @@ public class LabelTypeDbm extends AbstractDBMeta {
return _columnExcludedPaths;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnIncludedPaths() {
return _columnIncludedPaths;
}
@@ -198,7 +191,6 @@ public class LabelTypeDbm extends AbstractDBMeta {
ls.add(columnCreatedBy());
ls.add(columnCreatedTime());
ls.add(columnExcludedPaths());
- ls.add(columnId());
ls.add(columnIncludedPaths());
ls.add(columnName());
ls.add(columnSortOrder());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/OverlappingHostDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/OverlappingHostDbm.java
index 971abd1f6..c35f2fdcd 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/OverlappingHostDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/OverlappingHostDbm.java
@@ -83,7 +83,6 @@ public class OverlappingHostDbm extends AbstractDBMeta {
(et, vl) -> ((OverlappingHost) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
setupEpg(_epgMap, et -> ((OverlappingHost) et).getCreatedTime(),
(et, vl) -> ((OverlappingHost) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
- setupEpg(_epgMap, et -> ((OverlappingHost) et).getId(), (et, vl) -> ((OverlappingHost) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((OverlappingHost) et).getOverlappingName(),
(et, vl) -> ((OverlappingHost) et).setOverlappingName(DfTypeUtil.toString(vl)), "overlappingName");
setupEpg(_epgMap, et -> ((OverlappingHost) et).getRegularName(),
@@ -134,8 +133,6 @@ public class OverlappingHostDbm extends AbstractDBMeta {
false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnOverlappingName = cci("overlappingName", "overlappingName", null, null, String.class,
"overlappingName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnRegularName = cci("regularName", "regularName", null, null, String.class, "regularName", null, false,
@@ -155,10 +152,6 @@ public class OverlappingHostDbm extends AbstractDBMeta {
return _columnCreatedTime;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnOverlappingName() {
return _columnOverlappingName;
}
@@ -183,7 +176,6 @@ public class OverlappingHostDbm extends AbstractDBMeta {
List ls = newArrayList();
ls.add(columnCreatedBy());
ls.add(columnCreatedTime());
- ls.add(columnId());
ls.add(columnOverlappingName());
ls.add(columnRegularName());
ls.add(columnSortOrder());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java
index dc0c496bb..7eae7f605 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java
@@ -83,7 +83,6 @@ public class PathMappingDbm extends AbstractDBMeta {
"createdBy");
setupEpg(_epgMap, et -> ((PathMapping) et).getCreatedTime(), (et, vl) -> ((PathMapping) et).setCreatedTime(DfTypeUtil.toLong(vl)),
"createdTime");
- setupEpg(_epgMap, et -> ((PathMapping) et).getId(), (et, vl) -> ((PathMapping) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((PathMapping) et).getProcessType(),
(et, vl) -> ((PathMapping) et).setProcessType(DfTypeUtil.toString(vl)), "processType");
setupEpg(_epgMap, et -> ((PathMapping) et).getRegex(), (et, vl) -> ((PathMapping) et).setRegex(DfTypeUtil.toString(vl)), "regex");
@@ -135,8 +134,6 @@ public class PathMappingDbm extends AbstractDBMeta {
false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnProcessType = cci("processType", "processType", null, null, String.class, "processType", null, false,
false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnRegex = cci("regex", "regex", null, null, String.class, "regex", null, false, false, false, "String",
@@ -158,10 +155,6 @@ public class PathMappingDbm extends AbstractDBMeta {
return _columnCreatedTime;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnProcessType() {
return _columnProcessType;
}
@@ -190,7 +183,6 @@ public class PathMappingDbm extends AbstractDBMeta {
List ls = newArrayList();
ls.add(columnCreatedBy());
ls.add(columnCreatedTime());
- ls.add(columnId());
ls.add(columnProcessType());
ls.add(columnRegex());
ls.add(columnReplacement());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java
index 802ec7abd..3e89d49cc 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java
@@ -83,7 +83,6 @@ public class RequestHeaderDbm extends AbstractDBMeta {
(et, vl) -> ((RequestHeader) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
setupEpg(_epgMap, et -> ((RequestHeader) et).getCreatedTime(),
(et, vl) -> ((RequestHeader) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
- setupEpg(_epgMap, et -> ((RequestHeader) et).getId(), (et, vl) -> ((RequestHeader) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((RequestHeader) et).getName(), (et, vl) -> ((RequestHeader) et).setName(DfTypeUtil.toString(vl)), "name");
setupEpg(_epgMap, et -> ((RequestHeader) et).getUpdatedBy(),
(et, vl) -> ((RequestHeader) et).setUpdatedBy(DfTypeUtil.toString(vl)), "updatedBy");
@@ -133,8 +132,6 @@ public class RequestHeaderDbm extends AbstractDBMeta {
false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
@@ -154,10 +151,6 @@ public class RequestHeaderDbm extends AbstractDBMeta {
return _columnCreatedTime;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnName() {
return _columnName;
}
@@ -182,7 +175,6 @@ public class RequestHeaderDbm extends AbstractDBMeta {
List ls = newArrayList();
ls.add(columnCreatedBy());
ls.add(columnCreatedTime());
- ls.add(columnId());
ls.add(columnName());
ls.add(columnUpdatedBy());
ls.add(columnUpdatedTime());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java
index f0f114bdc..dadc4456d 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java
@@ -83,7 +83,6 @@ public class RoleTypeDbm extends AbstractDBMeta {
"createdBy");
setupEpg(_epgMap, et -> ((RoleType) et).getCreatedTime(), (et, vl) -> ((RoleType) et).setCreatedTime(DfTypeUtil.toLong(vl)),
"createdTime");
- setupEpg(_epgMap, et -> ((RoleType) et).getId(), (et, vl) -> ((RoleType) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((RoleType) et).getName(), (et, vl) -> ((RoleType) et).setName(DfTypeUtil.toString(vl)), "name");
setupEpg(_epgMap, et -> ((RoleType) et).getSortOrder(), (et, vl) -> ((RoleType) et).setSortOrder(DfTypeUtil.toInteger(vl)),
"sortOrder");
@@ -132,8 +131,6 @@ public class RoleTypeDbm extends AbstractDBMeta {
false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
@@ -153,10 +150,6 @@ public class RoleTypeDbm extends AbstractDBMeta {
return _columnCreatedTime;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnName() {
return _columnName;
}
@@ -181,7 +174,6 @@ public class RoleTypeDbm extends AbstractDBMeta {
List ls = newArrayList();
ls.add(columnCreatedBy());
ls.add(columnCreatedTime());
- ls.add(columnId());
ls.add(columnName());
ls.add(columnSortOrder());
ls.add(columnUpdatedBy());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java
index 3964dbbf6..f1184888a 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java
@@ -89,7 +89,6 @@ public class ScheduledJobDbm extends AbstractDBMeta {
(et, vl) -> ((ScheduledJob) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
setupEpg(_epgMap, et -> ((ScheduledJob) et).getCronExpression(),
(et, vl) -> ((ScheduledJob) et).setCronExpression(DfTypeUtil.toString(vl)), "cronExpression");
- setupEpg(_epgMap, et -> ((ScheduledJob) et).getId(), (et, vl) -> ((ScheduledJob) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((ScheduledJob) et).getJobLogging(),
(et, vl) -> ((ScheduledJob) et).setJobLogging(DfTypeUtil.toBoolean(vl)), "jobLogging");
setupEpg(_epgMap, et -> ((ScheduledJob) et).getName(), (et, vl) -> ((ScheduledJob) et).setName(DfTypeUtil.toString(vl)), "name");
@@ -151,8 +150,6 @@ public class ScheduledJobDbm extends AbstractDBMeta {
false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnCronExpression = cci("cronExpression", "cronExpression", null, null, String.class, "cronExpression",
null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnJobLogging = cci("jobLogging", "jobLogging", null, null, Boolean.class, "jobLogging", null, false,
false, false, "Boolean", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
@@ -190,10 +187,6 @@ public class ScheduledJobDbm extends AbstractDBMeta {
return _columnCronExpression;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnJobLogging() {
return _columnJobLogging;
}
@@ -233,7 +226,6 @@ public class ScheduledJobDbm extends AbstractDBMeta {
ls.add(columnCreatedBy());
ls.add(columnCreatedTime());
ls.add(columnCronExpression());
- ls.add(columnId());
ls.add(columnJobLogging());
ls.add(columnName());
ls.add(columnScriptData());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestBadWordDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestBadWordDbm.java
index d8982f54e..e76de36ac 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestBadWordDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestBadWordDbm.java
@@ -83,7 +83,6 @@ public class SuggestBadWordDbm extends AbstractDBMeta {
(et, vl) -> ((SuggestBadWord) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
setupEpg(_epgMap, et -> ((SuggestBadWord) et).getCreatedTime(),
(et, vl) -> ((SuggestBadWord) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
- setupEpg(_epgMap, et -> ((SuggestBadWord) et).getId(), (et, vl) -> ((SuggestBadWord) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((SuggestBadWord) et).getSuggestWord(),
(et, vl) -> ((SuggestBadWord) et).setSuggestWord(DfTypeUtil.toString(vl)), "suggestWord");
setupEpg(_epgMap, et -> ((SuggestBadWord) et).getTargetLabel(),
@@ -134,8 +133,6 @@ public class SuggestBadWordDbm extends AbstractDBMeta {
false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnSuggestWord = cci("suggestWord", "suggestWord", null, null, String.class, "suggestWord", null, false,
false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnTargetLabel = cci("targetLabel", "targetLabel", null, null, String.class, "targetLabel", null, false,
@@ -155,10 +152,6 @@ public class SuggestBadWordDbm extends AbstractDBMeta {
return _columnCreatedTime;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnSuggestWord() {
return _columnSuggestWord;
}
@@ -183,7 +176,6 @@ public class SuggestBadWordDbm extends AbstractDBMeta {
List ls = newArrayList();
ls.add(columnCreatedBy());
ls.add(columnCreatedTime());
- ls.add(columnId());
ls.add(columnSuggestWord());
ls.add(columnTargetLabel());
ls.add(columnTargetRole());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordDbm.java
index 6c6c9e7d2..e6f250e0d 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/SuggestElevateWordDbm.java
@@ -85,8 +85,6 @@ public class SuggestElevateWordDbm extends AbstractDBMeta {
(et, vl) -> ((SuggestElevateWord) et).setCreatedBy(DfTypeUtil.toString(vl)), "createdBy");
setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getCreatedTime(),
(et, vl) -> ((SuggestElevateWord) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
- setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getId(), (et, vl) -> ((SuggestElevateWord) et).setId(DfTypeUtil.toString(vl)),
- "id");
setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getReading(),
(et, vl) -> ((SuggestElevateWord) et).setReading(DfTypeUtil.toString(vl)), "reading");
setupEpg(_epgMap, et -> ((SuggestElevateWord) et).getSuggestWord(),
@@ -141,8 +139,6 @@ public class SuggestElevateWordDbm extends AbstractDBMeta {
false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnReading = cci("reading", "reading", null, null, String.class, "reading", null, false, false, false,
"String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnSuggestWord = cci("suggestWord", "suggestWord", null, null, String.class, "suggestWord", null, false,
@@ -168,10 +164,6 @@ public class SuggestElevateWordDbm extends AbstractDBMeta {
return _columnCreatedTime;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnReading() {
return _columnReading;
}
@@ -201,7 +193,6 @@ public class SuggestElevateWordDbm extends AbstractDBMeta {
ls.add(columnBoost());
ls.add(columnCreatedBy());
ls.add(columnCreatedTime());
- ls.add(columnId());
ls.add(columnReading());
ls.add(columnSuggestWord());
ls.add(columnTargetLabel());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java
index a5442ea11..2ca0e904c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java
@@ -87,7 +87,6 @@ public class WebAuthenticationDbm extends AbstractDBMeta {
(et, vl) -> ((WebAuthentication) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime");
setupEpg(_epgMap, et -> ((WebAuthentication) et).getHostname(),
(et, vl) -> ((WebAuthentication) et).setHostname(DfTypeUtil.toString(vl)), "hostname");
- setupEpg(_epgMap, et -> ((WebAuthentication) et).getId(), (et, vl) -> ((WebAuthentication) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((WebAuthentication) et).getParameters(),
(et, vl) -> ((WebAuthentication) et).setParameters(DfTypeUtil.toString(vl)), "parameters");
setupEpg(_epgMap, et -> ((WebAuthentication) et).getPassword(),
@@ -148,8 +147,6 @@ public class WebAuthenticationDbm extends AbstractDBMeta {
false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnHostname = cci("hostname", "hostname", null, null, String.class, "hostname", null, false, false,
false, "String", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnParameters = cci("parameters", "parameters", null, null, String.class, "parameters", null, false,
false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false,
@@ -183,10 +180,6 @@ public class WebAuthenticationDbm extends AbstractDBMeta {
return _columnHostname;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnParameters() {
return _columnParameters;
}
@@ -225,7 +218,6 @@ public class WebAuthenticationDbm extends AbstractDBMeta {
ls.add(columnCreatedBy());
ls.add(columnCreatedTime());
ls.add(columnHostname());
- ls.add(columnId());
ls.add(columnParameters());
ls.add(columnPassword());
ls.add(columnPort());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java
index ddebddce0..6dddf6509 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java
@@ -93,7 +93,6 @@ public class WebConfigDbm extends AbstractDBMeta {
(et, vl) -> ((WebConfig) et).setExcludedDocUrls(DfTypeUtil.toString(vl)), "excludedDocUrls");
setupEpg(_epgMap, et -> ((WebConfig) et).getExcludedUrls(), (et, vl) -> ((WebConfig) et).setExcludedUrls(DfTypeUtil.toString(vl)),
"excludedUrls");
- setupEpg(_epgMap, et -> ((WebConfig) et).getId(), (et, vl) -> ((WebConfig) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((WebConfig) et).getIncludedDocUrls(),
(et, vl) -> ((WebConfig) et).setIncludedDocUrls(DfTypeUtil.toString(vl)), "includedDocUrls");
setupEpg(_epgMap, et -> ((WebConfig) et).getIncludedUrls(), (et, vl) -> ((WebConfig) et).setIncludedUrls(DfTypeUtil.toString(vl)),
@@ -166,8 +165,6 @@ public class WebConfigDbm extends AbstractDBMeta {
"excludedDocUrls", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnExcludedUrls = cci("excludedUrls", "excludedUrls", null, null, String.class, "excludedUrls", null,
false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnIncludedDocUrls = cci("includedDocUrls", "includedDocUrls", null, null, String.class,
"includedDocUrls", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnIncludedUrls = cci("includedUrls", "includedUrls", null, null, String.class, "includedUrls", null,
@@ -223,10 +220,6 @@ public class WebConfigDbm extends AbstractDBMeta {
return _columnExcludedUrls;
}
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnIncludedDocUrls() {
return _columnIncludedDocUrls;
}
@@ -281,7 +274,6 @@ public class WebConfigDbm extends AbstractDBMeta {
ls.add(columnDepth());
ls.add(columnExcludedDocUrls());
ls.add(columnExcludedUrls());
- ls.add(columnId());
ls.add(columnIncludedDocUrls());
ls.add(columnIncludedUrls());
ls.add(columnIntervalTime());
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java
index f321ac3f9..10c7bb6d5 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java
@@ -79,7 +79,6 @@ public class WebConfigToLabelDbm extends AbstractDBMeta {
// ---------------
protected final Map _epgMap = newHashMap();
{
- setupEpg(_epgMap, et -> ((WebConfigToLabel) et).getId(), (et, vl) -> ((WebConfigToLabel) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((WebConfigToLabel) et).getLabelTypeId(),
(et, vl) -> ((WebConfigToLabel) et).setLabelTypeId(DfTypeUtil.toString(vl)), "labelTypeId");
setupEpg(_epgMap, et -> ((WebConfigToLabel) et).getWebConfigId(),
@@ -120,17 +119,11 @@ public class WebConfigToLabelDbm extends AbstractDBMeta {
// ===================================================================================
// Column Info
// ===========
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false,
false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false,
false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnLabelTypeId() {
return _columnLabelTypeId;
}
@@ -141,7 +134,6 @@ public class WebConfigToLabelDbm extends AbstractDBMeta {
protected List ccil() {
List ls = newArrayList();
- ls.add(columnId());
ls.add(columnLabelTypeId());
ls.add(columnWebConfigId());
return ls;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java
index a1f08c0b8..6a19ef2ee 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java
@@ -79,7 +79,6 @@ public class WebConfigToRoleDbm extends AbstractDBMeta {
// ---------------
protected final Map _epgMap = newHashMap();
{
- setupEpg(_epgMap, et -> ((WebConfigToRole) et).getId(), (et, vl) -> ((WebConfigToRole) et).setId(DfTypeUtil.toString(vl)), "id");
setupEpg(_epgMap, et -> ((WebConfigToRole) et).getRoleTypeId(),
(et, vl) -> ((WebConfigToRole) et).setRoleTypeId(DfTypeUtil.toString(vl)), "roleTypeId");
setupEpg(_epgMap, et -> ((WebConfigToRole) et).getWebConfigId(),
@@ -120,17 +119,11 @@ public class WebConfigToRoleDbm extends AbstractDBMeta {
// ===================================================================================
// Column Info
// ===========
- protected final ColumnInfo _columnId = cci("id", "id", null, null, String.class, "id", null, false, false, false, "String", 0, 0, null,
- false, null, null, null, null, null, false);
protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false,
false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false,
false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
- public ColumnInfo columnId() {
- return _columnId;
- }
-
public ColumnInfo columnRoleTypeId() {
return _columnRoleTypeId;
}
@@ -141,7 +134,6 @@ public class WebConfigToRoleDbm extends AbstractDBMeta {
protected List ccil() {
List ls = newArrayList();
- ls.add(columnId());
ls.add(columnRoleTypeId());
ls.add(columnWebConfigId());
return ls;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java
index eae7be6ae..252ab500a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java
@@ -154,6 +154,10 @@ public class BsBoostDocumentRuleCB extends EsAbstractConditionBean {
columnList.add(name);
}
+ public void columnId() {
+ doColumn("_id");
+ }
+
public void columnBoostExpr() {
doColumn("boostExpr");
}
@@ -166,10 +170,6 @@ public class BsBoostDocumentRuleCB extends EsAbstractConditionBean {
doColumn("createdTime");
}
- public void columnId() {
- doColumn("id");
- }
-
public void columnSortOrder() {
doColumn("sortOrder");
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingSessionCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingSessionCB.java
index 4dc462d4a..744f9fac4 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingSessionCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingSessionCB.java
@@ -154,6 +154,10 @@ public class BsCrawlingSessionCB extends EsAbstractConditionBean {
columnList.add(name);
}
+ public void columnId() {
+ doColumn("_id");
+ }
+
public void columnCreatedTime() {
doColumn("createdTime");
}
@@ -162,10 +166,6 @@ public class BsCrawlingSessionCB extends EsAbstractConditionBean {
doColumn("expiredTime");
}
- public void columnId() {
- doColumn("id");
- }
-
public void columnName() {
doColumn("name");
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingSessionInfoCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingSessionInfoCB.java
index 8a729b189..6d0263914 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingSessionInfoCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingSessionInfoCB.java
@@ -154,6 +154,10 @@ public class BsCrawlingSessionInfoCB extends EsAbstractConditionBean {
columnList.add(name);
}
+ public void columnId() {
+ doColumn("_id");
+ }
+
public void columnCrawlingSessionId() {
doColumn("crawlingSessionId");
}
@@ -162,10 +166,6 @@ public class BsCrawlingSessionInfoCB extends EsAbstractConditionBean {
doColumn("createdTime");
}
- public void columnId() {
- doColumn("id");
- }
-
public void columnKey() {
doColumn("key");
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java
index ea96ddadf..e1487f020 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java
@@ -154,6 +154,10 @@ public class BsDataConfigCB extends EsAbstractConditionBean {
columnList.add(name);
}
+ public void columnId() {
+ doColumn("_id");
+ }
+
public void columnAvailable() {
doColumn("available");
}
@@ -182,10 +186,6 @@ public class BsDataConfigCB extends EsAbstractConditionBean {
doColumn("handlerScript");
}
- public void columnId() {
- doColumn("id");
- }
-
public void columnName() {
doColumn("name");
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToLabelCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToLabelCB.java
index 8acb14d5b..b1c641d69 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToLabelCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToLabelCB.java
@@ -154,12 +154,12 @@ public class BsDataConfigToLabelCB extends EsAbstractConditionBean {
columnList.add(name);
}
- public void columnDataConfigId() {
- doColumn("dataConfigId");
+ public void columnId() {
+ doColumn("_id");
}
- public void columnId() {
- doColumn("id");
+ public void columnDataConfigId() {
+ doColumn("dataConfigId");
}
public void columnLabelTypeId() {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToRoleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToRoleCB.java
index 4a878cf98..0207e5156 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToRoleCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigToRoleCB.java
@@ -154,12 +154,12 @@ public class BsDataConfigToRoleCB extends EsAbstractConditionBean {
columnList.add(name);
}
- public void columnDataConfigId() {
- doColumn("dataConfigId");
+ public void columnId() {
+ doColumn("_id");
}
- public void columnId() {
- doColumn("id");
+ public void columnDataConfigId() {
+ doColumn("dataConfigId");
}
public void columnRoleTypeId() {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java
index 33820f1d7..e5d8baa00 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java
@@ -154,6 +154,10 @@ public class BsFailureUrlCB extends EsAbstractConditionBean {
columnList.add(name);
}
+ public void columnId() {
+ doColumn("_id");
+ }
+
public void columnConfigId() {
doColumn("configId");
}
@@ -170,10 +174,6 @@ public class BsFailureUrlCB extends EsAbstractConditionBean {
doColumn("errorName");
}
- public void columnId() {
- doColumn("id");
- }
-
public void columnLastAccessTime() {
doColumn("lastAccessTime");
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java
index f33ed4048..0cb3ea71d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java
@@ -154,6 +154,10 @@ public class BsFileAuthenticationCB extends EsAbstractConditionBean {
columnList.add(name);
}
+ public void columnId() {
+ doColumn("_id");
+ }
+
public void columnCreatedBy() {
doColumn("createdBy");
}
@@ -170,10 +174,6 @@ public class BsFileAuthenticationCB extends EsAbstractConditionBean {
doColumn("hostname");
}
- public void columnId() {
- doColumn("id");
- }
-
public void columnParameters() {
doColumn("parameters");
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
index ff521c44f..2e2da9ad4 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
@@ -154,6 +154,10 @@ public class BsFileConfigCB extends EsAbstractConditionBean {
columnList.add(name);
}
+ public void columnId() {
+ doColumn("_id");
+ }
+
public void columnAvailable() {
doColumn("available");
}
@@ -186,10 +190,6 @@ public class BsFileConfigCB extends EsAbstractConditionBean {
doColumn("excludedPaths");
}
- public void columnId() {
- doColumn("id");
- }
-
public void columnIncludedDocPaths() {
doColumn("includedDocPaths");
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToLabelCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToLabelCB.java
index f1520c540..4c3458e20 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToLabelCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToLabelCB.java
@@ -154,12 +154,12 @@ public class BsFileConfigToLabelCB extends EsAbstractConditionBean {
columnList.add(name);
}
- public void columnFileConfigId() {
- doColumn("fileConfigId");
+ public void columnId() {
+ doColumn("_id");
}
- public void columnId() {
- doColumn("id");
+ public void columnFileConfigId() {
+ doColumn("fileConfigId");
}
public void columnLabelTypeId() {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToRoleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToRoleCB.java
index 016a03cc3..58aaf217f 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToRoleCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigToRoleCB.java
@@ -154,12 +154,12 @@ public class BsFileConfigToRoleCB extends EsAbstractConditionBean {
columnList.add(name);
}
- public void columnFileConfigId() {
- doColumn("fileConfigId");
+ public void columnId() {
+ doColumn("_id");
}
- public void columnId() {
- doColumn("id");
+ public void columnFileConfigId() {
+ doColumn("fileConfigId");
}
public void columnRoleTypeId() {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java
index 3e8a6315e..3f986a100 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java
@@ -154,12 +154,12 @@ public class BsJobLogCB extends EsAbstractConditionBean {
columnList.add(name);
}
- public void columnEndTime() {
- doColumn("endTime");
+ public void columnId() {
+ doColumn("_id");
}
- public void columnId() {
- doColumn("id");
+ public void columnEndTime() {
+ doColumn("endTime");
}
public void columnJobName() {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java
index b8fe86474..d0e1d54fe 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java
@@ -154,6 +154,10 @@ public class BsKeyMatchCB extends EsAbstractConditionBean {
columnList.add(name);
}
+ public void columnId() {
+ doColumn("_id");
+ }
+
public void columnBoost() {
doColumn("boost");
}
@@ -166,10 +170,6 @@ public class BsKeyMatchCB extends EsAbstractConditionBean {
doColumn("createdTime");
}
- public void columnId() {
- doColumn("id");
- }
-
public void columnMaxSize() {
doColumn("maxSize");
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelToRoleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelToRoleCB.java
index 115655354..a606d5fa6 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelToRoleCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelToRoleCB.java
@@ -155,7 +155,7 @@ public class BsLabelToRoleCB extends EsAbstractConditionBean {
}
public void columnId() {
- doColumn("id");
+ doColumn("_id");
}
public void columnLabelTypeId() {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java
index 6b5d7a88e..c7283c576 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java
@@ -154,6 +154,10 @@ public class BsLabelTypeCB extends EsAbstractConditionBean {
columnList.add(name);
}
+ public void columnId() {
+ doColumn("_id");
+ }
+
public void columnCreatedBy() {
doColumn("createdBy");
}
@@ -166,10 +170,6 @@ public class BsLabelTypeCB extends EsAbstractConditionBean {
doColumn("excludedPaths");
}
- public void columnId() {
- doColumn("id");
- }
-
public void columnIncludedPaths() {
doColumn("includedPaths");
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsOverlappingHostCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsOverlappingHostCB.java
index 0df305994..169207008 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsOverlappingHostCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsOverlappingHostCB.java
@@ -154,6 +154,10 @@ public class BsOverlappingHostCB extends EsAbstractConditionBean {
columnList.add(name);
}
+ public void columnId() {
+ doColumn("_id");
+ }
+
public void columnCreatedBy() {
doColumn("createdBy");
}
@@ -162,10 +166,6 @@ public class BsOverlappingHostCB extends EsAbstractConditionBean {
doColumn("createdTime");
}
- public void columnId() {
- doColumn("id");
- }
-
public void columnOverlappingName() {
doColumn("overlappingName");
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java
index fceca1632..1ab5c924c 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java
@@ -154,6 +154,10 @@ public class BsPathMappingCB extends EsAbstractConditionBean {
columnList.add(name);
}
+ public void columnId() {
+ doColumn("_id");
+ }
+
public void columnCreatedBy() {
doColumn("createdBy");
}
@@ -162,10 +166,6 @@ public class BsPathMappingCB extends EsAbstractConditionBean {
doColumn("createdTime");
}
- public void columnId() {
- doColumn("id");
- }
-
public void columnProcessType() {
doColumn("processType");
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java
index 39e81a9a2..6937b041b 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java
@@ -154,6 +154,10 @@ public class BsRequestHeaderCB extends EsAbstractConditionBean {
columnList.add(name);
}
+ public void columnId() {
+ doColumn("_id");
+ }
+
public void columnCreatedBy() {
doColumn("createdBy");
}
@@ -162,10 +166,6 @@ public class BsRequestHeaderCB extends EsAbstractConditionBean {
doColumn("createdTime");
}
- public void columnId() {
- doColumn("id");
- }
-
public void columnName() {
doColumn("name");
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java
index 2ef478c7c..9b8904c7c 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java
@@ -154,6 +154,10 @@ public class BsRoleTypeCB extends EsAbstractConditionBean {
columnList.add(name);
}
+ public void columnId() {
+ doColumn("_id");
+ }
+
public void columnCreatedBy() {
doColumn("createdBy");
}
@@ -162,10 +166,6 @@ public class BsRoleTypeCB extends EsAbstractConditionBean {
doColumn("createdTime");
}
- public void columnId() {
- doColumn("id");
- }
-
public void columnName() {
doColumn("name");
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java
index 1a1e8e255..e303bc9f2 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java
@@ -154,6 +154,10 @@ public class BsScheduledJobCB extends EsAbstractConditionBean {
columnList.add(name);
}
+ public void columnId() {
+ doColumn("_id");
+ }
+
public void columnAvailable() {
doColumn("available");
}
@@ -174,10 +178,6 @@ public class BsScheduledJobCB extends EsAbstractConditionBean {
doColumn("cronExpression");
}
- public void columnId() {
- doColumn("id");
- }
-
public void columnJobLogging() {
doColumn("jobLogging");
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestBadWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestBadWordCB.java
index bccac9ec9..761350905 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestBadWordCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestBadWordCB.java
@@ -154,6 +154,10 @@ public class BsSuggestBadWordCB extends EsAbstractConditionBean {
columnList.add(name);
}
+ public void columnId() {
+ doColumn("_id");
+ }
+
public void columnCreatedBy() {
doColumn("createdBy");
}
@@ -162,10 +166,6 @@ public class BsSuggestBadWordCB extends EsAbstractConditionBean {
doColumn("createdTime");
}
- public void columnId() {
- doColumn("id");
- }
-
public void columnSuggestWord() {
doColumn("suggestWord");
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordCB.java
index 4b4614de6..346246df2 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsSuggestElevateWordCB.java
@@ -154,6 +154,10 @@ public class BsSuggestElevateWordCB extends EsAbstractConditionBean {
columnList.add(name);
}
+ public void columnId() {
+ doColumn("_id");
+ }
+
public void columnBoost() {
doColumn("boost");
}
@@ -166,10 +170,6 @@ public class BsSuggestElevateWordCB extends EsAbstractConditionBean {
doColumn("createdTime");
}
- public void columnId() {
- doColumn("id");
- }
-
public void columnReading() {
doColumn("reading");
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java
index 76f00617c..1e43b69cb 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java
@@ -154,6 +154,10 @@ public class BsWebAuthenticationCB extends EsAbstractConditionBean {
columnList.add(name);
}
+ public void columnId() {
+ doColumn("_id");
+ }
+
public void columnAuthRealm() {
doColumn("authRealm");
}
@@ -170,10 +174,6 @@ public class BsWebAuthenticationCB extends EsAbstractConditionBean {
doColumn("hostname");
}
- public void columnId() {
- doColumn("id");
- }
-
public void columnParameters() {
doColumn("parameters");
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
index 1d4f93314..7c1811783 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
@@ -154,6 +154,10 @@ public class BsWebConfigCB extends EsAbstractConditionBean {
columnList.add(name);
}
+ public void columnId() {
+ doColumn("_id");
+ }
+
public void columnAvailable() {
doColumn("available");
}
@@ -186,10 +190,6 @@ public class BsWebConfigCB extends EsAbstractConditionBean {
doColumn("excludedUrls");
}
- public void columnId() {
- doColumn("id");
- }
-
public void columnIncludedDocUrls() {
doColumn("includedDocUrls");
}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToLabelCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToLabelCB.java
index cfd642641..5c6d89281 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToLabelCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToLabelCB.java
@@ -155,7 +155,7 @@ public class BsWebConfigToLabelCB extends EsAbstractConditionBean {
}
public void columnId() {
- doColumn("id");
+ doColumn("_id");
}
public void columnLabelTypeId() {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToRoleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToRoleCB.java
index e47e6c8b0..2b3f5e9b6 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToRoleCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigToRoleCB.java
@@ -155,7 +155,7 @@ public class BsWebConfigToRoleCB extends EsAbstractConditionBean {
}
public void columnId() {
- doColumn("id");
+ doColumn("_id");
}
public void columnRoleTypeId() {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/BoostDocumentRuleCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/BoostDocumentRuleCF.java
deleted file mode 100644
index 25fef90de..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/BoostDocumentRuleCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsBoostDocumentRuleCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class BoostDocumentRuleCF extends BsBoostDocumentRuleCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/CrawlingSessionCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/CrawlingSessionCF.java
deleted file mode 100644
index 45d149f9a..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/CrawlingSessionCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsCrawlingSessionCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class CrawlingSessionCF extends BsCrawlingSessionCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/CrawlingSessionInfoCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/CrawlingSessionInfoCF.java
deleted file mode 100644
index dd08f9cc1..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/CrawlingSessionInfoCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsCrawlingSessionInfoCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class CrawlingSessionInfoCF extends BsCrawlingSessionInfoCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/DataConfigCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/DataConfigCF.java
deleted file mode 100644
index 902141edd..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/DataConfigCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsDataConfigCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class DataConfigCF extends BsDataConfigCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/DataConfigToLabelCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/DataConfigToLabelCF.java
deleted file mode 100644
index c8e578314..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/DataConfigToLabelCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsDataConfigToLabelCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class DataConfigToLabelCF extends BsDataConfigToLabelCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/DataConfigToRoleCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/DataConfigToRoleCF.java
deleted file mode 100644
index 63b945322..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/DataConfigToRoleCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsDataConfigToRoleCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class DataConfigToRoleCF extends BsDataConfigToRoleCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/FailureUrlCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/FailureUrlCF.java
deleted file mode 100644
index ad907b3fe..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/FailureUrlCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsFailureUrlCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class FailureUrlCF extends BsFailureUrlCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileAuthenticationCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileAuthenticationCF.java
deleted file mode 100644
index c1eddd531..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileAuthenticationCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsFileAuthenticationCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class FileAuthenticationCF extends BsFileAuthenticationCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileConfigCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileConfigCF.java
deleted file mode 100644
index 9d02026cd..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileConfigCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsFileConfigCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class FileConfigCF extends BsFileConfigCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileConfigToLabelCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileConfigToLabelCF.java
deleted file mode 100644
index 025fca7e6..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileConfigToLabelCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsFileConfigToLabelCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class FileConfigToLabelCF extends BsFileConfigToLabelCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileConfigToRoleCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileConfigToRoleCF.java
deleted file mode 100644
index ab758e270..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/FileConfigToRoleCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsFileConfigToRoleCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class FileConfigToRoleCF extends BsFileConfigToRoleCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/JobLogCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/JobLogCF.java
deleted file mode 100644
index dcd15f409..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/JobLogCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsJobLogCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class JobLogCF extends BsJobLogCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/KeyMatchCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/KeyMatchCF.java
deleted file mode 100644
index 2f851afbc..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/KeyMatchCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsKeyMatchCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class KeyMatchCF extends BsKeyMatchCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/LabelToRoleCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/LabelToRoleCF.java
deleted file mode 100644
index ba702c5b6..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/LabelToRoleCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsLabelToRoleCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class LabelToRoleCF extends BsLabelToRoleCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/LabelTypeCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/LabelTypeCF.java
deleted file mode 100644
index 02a733154..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/LabelTypeCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsLabelTypeCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class LabelTypeCF extends BsLabelTypeCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/OverlappingHostCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/OverlappingHostCF.java
deleted file mode 100644
index 9a0dfa715..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/OverlappingHostCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsOverlappingHostCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class OverlappingHostCF extends BsOverlappingHostCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/PathMappingCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/PathMappingCF.java
deleted file mode 100644
index 5cb3dfb0b..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/PathMappingCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsPathMappingCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class PathMappingCF extends BsPathMappingCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/RequestHeaderCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/RequestHeaderCF.java
deleted file mode 100644
index 2c6e131c5..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/RequestHeaderCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsRequestHeaderCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class RequestHeaderCF extends BsRequestHeaderCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/RoleTypeCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/RoleTypeCF.java
deleted file mode 100644
index 1d0104221..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/RoleTypeCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsRoleTypeCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class RoleTypeCF extends BsRoleTypeCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/ScheduledJobCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/ScheduledJobCF.java
deleted file mode 100644
index d2b61e28d..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/ScheduledJobCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsScheduledJobCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class ScheduledJobCF extends BsScheduledJobCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/SuggestBadWordCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/SuggestBadWordCF.java
deleted file mode 100644
index 2cdf12844..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/SuggestBadWordCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsSuggestBadWordCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class SuggestBadWordCF extends BsSuggestBadWordCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/SuggestElevateWordCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/SuggestElevateWordCF.java
deleted file mode 100644
index 9e346d138..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/SuggestElevateWordCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsSuggestElevateWordCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class SuggestElevateWordCF extends BsSuggestElevateWordCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebAuthenticationCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebAuthenticationCF.java
deleted file mode 100644
index 00187906b..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebAuthenticationCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsWebAuthenticationCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class WebAuthenticationCF extends BsWebAuthenticationCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebConfigCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebConfigCF.java
deleted file mode 100644
index 346398d4d..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebConfigCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsWebConfigCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class WebConfigCF extends BsWebConfigCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebConfigToLabelCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebConfigToLabelCF.java
deleted file mode 100644
index 5f4bfa048..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebConfigToLabelCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsWebConfigToLabelCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class WebConfigToLabelCF extends BsWebConfigToLabelCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebConfigToRoleCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebConfigToRoleCF.java
deleted file mode 100644
index 8e6851c90..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/WebConfigToRoleCF.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf;
-
-import org.codelibs.fess.es.config.cbean.cf.bs.BsWebConfigToRoleCF;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public class WebConfigToRoleCF extends BsWebConfigToRoleCF {
-}
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsBoostDocumentRuleCF.java b/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsBoostDocumentRuleCF.java
deleted file mode 100644
index 41125034f..000000000
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cf/bs/BsBoostDocumentRuleCF.java
+++ /dev/null
@@ -1,1109 +0,0 @@
-/*
- * Copyright 2012-2015 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.es.config.cbean.cf.bs;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-
-import org.codelibs.fess.es.config.allcommon.EsAbstractConditionFilter;
-import org.codelibs.fess.es.config.cbean.cf.BoostDocumentRuleCF;
-import org.codelibs.fess.es.config.cbean.cq.BoostDocumentRuleCQ;
-import org.dbflute.cbean.ckey.ConditionKey;
-import org.dbflute.exception.IllegalConditionBeanOperationException;
-import org.elasticsearch.index.query.AndFilterBuilder;
-import org.elasticsearch.index.query.BoolFilterBuilder;
-import org.elasticsearch.index.query.ExistsFilterBuilder;
-import org.elasticsearch.index.query.MissingFilterBuilder;
-import org.elasticsearch.index.query.NotFilterBuilder;
-import org.elasticsearch.index.query.OrFilterBuilder;
-import org.elasticsearch.index.query.PrefixFilterBuilder;
-import org.elasticsearch.index.query.QueryFilterBuilder;
-import org.elasticsearch.index.query.RangeFilterBuilder;
-import org.elasticsearch.index.query.TermFilterBuilder;
-import org.elasticsearch.index.query.TermsFilterBuilder;
-
-/**
- * @author ESFlute (using FreeGen)
- */
-public abstract class BsBoostDocumentRuleCF extends EsAbstractConditionFilter {
-
- protected static final Class> suppressUnusedImportLocalDateTime = LocalDateTime.class;
-
- // ===================================================================================
- // Query Control
- // =============
- public void bool(BoolCall boolLambda) {
- bool(boolLambda, null);
- }
-
- public void bool(BoolCall boolLambda, ConditionOptionCall opLambda) {
- BoostDocumentRuleCF mustFilter = new BoostDocumentRuleCF();
- BoostDocumentRuleCF shouldFilter = new BoostDocumentRuleCF();
- BoostDocumentRuleCF mustNotFilter = new BoostDocumentRuleCF();
- boolLambda.callback(mustFilter, shouldFilter, mustNotFilter);
- if (mustFilter.hasFilters() || shouldFilter.hasFilters() || mustNotFilter.hasFilters()) {
- BoolFilterBuilder builder =
- regBoolF(mustFilter.filterBuilderList, shouldFilter.filterBuilderList, mustNotFilter.filterBuilderList);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
- }
-
- public void and(OperatorCall andLambda) {
- and(andLambda, null);
- }
-
- public void and(OperatorCall andLambda, ConditionOptionCall opLambda) {
- BoostDocumentRuleCF andFilter = new BoostDocumentRuleCF();
- andLambda.callback(andFilter);
- if (andFilter.hasFilters()) {
- AndFilterBuilder builder = regAndF(andFilter.filterBuilderList);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
- }
-
- public void or(OperatorCall orLambda) {
- or(orLambda, null);
- }
-
- public void or(OperatorCall orLambda, ConditionOptionCall opLambda) {
- BoostDocumentRuleCF orFilter = new BoostDocumentRuleCF();
- orLambda.callback(orFilter);
- if (orFilter.hasFilters()) {
- OrFilterBuilder builder = regOrF(orFilter.filterBuilderList);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
- }
-
- public void not(OperatorCall notLambda) {
- not(notLambda, null);
- }
-
- public void not(OperatorCall notLambda, ConditionOptionCall opLambda) {
- BoostDocumentRuleCF notFilter = new BoostDocumentRuleCF();
- notLambda.callback(notFilter);
- if (notFilter.hasFilters()) {
- if (notFilter.filterBuilderList.size() > 1) {
- final String msg = "not filter must be one filter.";
- throw new IllegalConditionBeanOperationException(msg);
- }
- NotFilterBuilder builder = regNotF(notFilter.filterBuilderList.get(0));
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
- }
-
- public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall queryLambda) {
- query(queryLambda, null);
- }
-
- public void query(org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery.OperatorCall queryLambda,
- ConditionOptionCall opLambda) {
- BoostDocumentRuleCQ query = new BoostDocumentRuleCQ();
- queryLambda.callback(query);
- if (query.hasQueries()) {
- QueryFilterBuilder builder = regQueryF(query.getQuery());
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
- }
-
- // ===================================================================================
- // Query Set
- // =========
- public void setBoostExpr_NotEqual(String boostExpr) {
- setBoostExpr_NotEqual(boostExpr, null, null);
- }
-
- public void setBoostExpr_NotEqual(String boostExpr, ConditionOptionCall notOpLambda,
- ConditionOptionCall eqOpLambda) {
- not(subCf -> {
- subCf.setBoostExpr_Equal(boostExpr, eqOpLambda);
- }, notOpLambda);
- }
-
- public void setBoostExpr_Equal(String boostExpr) {
- setBoostExpr_Term(boostExpr, null);
- }
-
- public void setBoostExpr_Equal(String boostExpr, ConditionOptionCall opLambda) {
- setBoostExpr_Term(boostExpr, opLambda);
- }
-
- public void setBoostExpr_Term(String boostExpr) {
- setBoostExpr_Term(boostExpr, null);
- }
-
- public void setBoostExpr_Term(String boostExpr, ConditionOptionCall opLambda) {
- TermFilterBuilder builder = regTermF("boostExpr", boostExpr);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setBoostExpr_Terms(Collection boostExprList) {
- setBoostExpr_Terms(boostExprList, null);
- }
-
- public void setBoostExpr_Terms(Collection boostExprList, ConditionOptionCall opLambda) {
- TermsFilterBuilder builder = regTermsF("boostExpr", boostExprList);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setBoostExpr_InScope(Collection boostExprList) {
- setBoostExpr_Terms(boostExprList, null);
- }
-
- public void setBoostExpr_InScope(Collection boostExprList, ConditionOptionCall opLambda) {
- setBoostExpr_Terms(boostExprList, opLambda);
- }
-
- public void setBoostExpr_Prefix(String boostExpr) {
- setBoostExpr_Prefix(boostExpr, null);
- }
-
- public void setBoostExpr_Prefix(String boostExpr, ConditionOptionCall opLambda) {
- PrefixFilterBuilder builder = regPrefixF("boostExpr", boostExpr);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setBoostExpr_Exists() {
- setBoostExpr_Exists(null);
- }
-
- public void setBoostExpr_Exists(ConditionOptionCall opLambda) {
- ExistsFilterBuilder builder = regExistsF("boostExpr");
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setBoostExpr_Missing() {
- setBoostExpr_Missing(null);
- }
-
- public void setBoostExpr_Missing(ConditionOptionCall opLambda) {
- MissingFilterBuilder builder = regMissingF("boostExpr");
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setBoostExpr_GreaterThan(String boostExpr) {
- setBoostExpr_GreaterThan(boostExpr, null);
- }
-
- public void setBoostExpr_GreaterThan(String boostExpr, ConditionOptionCall opLambda) {
- RangeFilterBuilder builder = regRangeF("boostExpr", ConditionKey.CK_GREATER_THAN, boostExpr);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setBoostExpr_LessThan(String boostExpr) {
- setBoostExpr_LessThan(boostExpr, null);
- }
-
- public void setBoostExpr_LessThan(String boostExpr, ConditionOptionCall opLambda) {
- RangeFilterBuilder builder = regRangeF("boostExpr", ConditionKey.CK_LESS_THAN, boostExpr);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setBoostExpr_GreaterEqual(String boostExpr) {
- setBoostExpr_GreaterEqual(boostExpr, null);
- }
-
- public void setBoostExpr_GreaterEqual(String boostExpr, ConditionOptionCall opLambda) {
- RangeFilterBuilder builder = regRangeF("boostExpr", ConditionKey.CK_GREATER_EQUAL, boostExpr);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setBoostExpr_LessEqual(String boostExpr) {
- setBoostExpr_LessEqual(boostExpr, null);
- }
-
- public void setBoostExpr_LessEqual(String boostExpr, ConditionOptionCall opLambda) {
- RangeFilterBuilder builder = regRangeF("boostExpr", ConditionKey.CK_LESS_EQUAL, boostExpr);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setCreatedBy_NotEqual(String createdBy) {
- setCreatedBy_NotEqual(createdBy, null, null);
- }
-
- public void setCreatedBy_NotEqual(String createdBy, ConditionOptionCall notOpLambda,
- ConditionOptionCall eqOpLambda) {
- not(subCf -> {
- subCf.setCreatedBy_Equal(createdBy, eqOpLambda);
- }, notOpLambda);
- }
-
- public void setCreatedBy_Equal(String createdBy) {
- setCreatedBy_Term(createdBy, null);
- }
-
- public void setCreatedBy_Equal(String createdBy, ConditionOptionCall opLambda) {
- setCreatedBy_Term(createdBy, opLambda);
- }
-
- public void setCreatedBy_Term(String createdBy) {
- setCreatedBy_Term(createdBy, null);
- }
-
- public void setCreatedBy_Term(String createdBy, ConditionOptionCall opLambda) {
- TermFilterBuilder builder = regTermF("createdBy", createdBy);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setCreatedBy_Terms(Collection createdByList) {
- setCreatedBy_Terms(createdByList, null);
- }
-
- public void setCreatedBy_Terms(Collection createdByList, ConditionOptionCall opLambda) {
- TermsFilterBuilder builder = regTermsF("createdBy", createdByList);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setCreatedBy_InScope(Collection createdByList) {
- setCreatedBy_Terms(createdByList, null);
- }
-
- public void setCreatedBy_InScope(Collection createdByList, ConditionOptionCall opLambda) {
- setCreatedBy_Terms(createdByList, opLambda);
- }
-
- public void setCreatedBy_Prefix(String createdBy) {
- setCreatedBy_Prefix(createdBy, null);
- }
-
- public void setCreatedBy_Prefix(String createdBy, ConditionOptionCall opLambda) {
- PrefixFilterBuilder builder = regPrefixF("createdBy", createdBy);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setCreatedBy_Exists() {
- setCreatedBy_Exists(null);
- }
-
- public void setCreatedBy_Exists(ConditionOptionCall opLambda) {
- ExistsFilterBuilder builder = regExistsF("createdBy");
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setCreatedBy_Missing() {
- setCreatedBy_Missing(null);
- }
-
- public void setCreatedBy_Missing(ConditionOptionCall opLambda) {
- MissingFilterBuilder builder = regMissingF("createdBy");
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setCreatedBy_GreaterThan(String createdBy) {
- setCreatedBy_GreaterThan(createdBy, null);
- }
-
- public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall opLambda) {
- RangeFilterBuilder builder = regRangeF("createdBy", ConditionKey.CK_GREATER_THAN, createdBy);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setCreatedBy_LessThan(String createdBy) {
- setCreatedBy_LessThan(createdBy, null);
- }
-
- public void setCreatedBy_LessThan(String createdBy, ConditionOptionCall opLambda) {
- RangeFilterBuilder builder = regRangeF("createdBy", ConditionKey.CK_LESS_THAN, createdBy);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setCreatedBy_GreaterEqual(String createdBy) {
- setCreatedBy_GreaterEqual(createdBy, null);
- }
-
- public void setCreatedBy_GreaterEqual(String createdBy, ConditionOptionCall opLambda) {
- RangeFilterBuilder builder = regRangeF("createdBy", ConditionKey.CK_GREATER_EQUAL, createdBy);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setCreatedBy_LessEqual(String createdBy) {
- setCreatedBy_LessEqual(createdBy, null);
- }
-
- public void setCreatedBy_LessEqual(String createdBy, ConditionOptionCall opLambda) {
- RangeFilterBuilder builder = regRangeF("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setCreatedTime_NotEqual(Long createdTime) {
- setCreatedTime_NotEqual(createdTime, null, null);
- }
-
- public void setCreatedTime_NotEqual(Long createdTime, ConditionOptionCall notOpLambda,
- ConditionOptionCall eqOpLambda) {
- not(subCf -> {
- subCf.setCreatedTime_Equal(createdTime, eqOpLambda);
- }, notOpLambda);
- }
-
- public void setCreatedTime_Equal(Long createdTime) {
- setCreatedTime_Term(createdTime, null);
- }
-
- public void setCreatedTime_Equal(Long createdTime, ConditionOptionCall opLambda) {
- setCreatedTime_Term(createdTime, opLambda);
- }
-
- public void setCreatedTime_Term(Long createdTime) {
- setCreatedTime_Term(createdTime, null);
- }
-
- public void setCreatedTime_Term(Long createdTime, ConditionOptionCall opLambda) {
- TermFilterBuilder builder = regTermF("createdTime", createdTime);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setCreatedTime_Terms(Collection createdTimeList) {
- setCreatedTime_Terms(createdTimeList, null);
- }
-
- public void setCreatedTime_Terms(Collection createdTimeList, ConditionOptionCall opLambda) {
- TermsFilterBuilder builder = regTermsF("createdTime", createdTimeList);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setCreatedTime_InScope(Collection createdTimeList) {
- setCreatedTime_Terms(createdTimeList, null);
- }
-
- public void setCreatedTime_InScope(Collection createdTimeList, ConditionOptionCall opLambda) {
- setCreatedTime_Terms(createdTimeList, opLambda);
- }
-
- public void setCreatedTime_Exists() {
- setCreatedTime_Exists(null);
- }
-
- public void setCreatedTime_Exists(ConditionOptionCall opLambda) {
- ExistsFilterBuilder builder = regExistsF("createdTime");
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setCreatedTime_Missing() {
- setCreatedTime_Missing(null);
- }
-
- public void setCreatedTime_Missing(ConditionOptionCall opLambda) {
- MissingFilterBuilder builder = regMissingF("createdTime");
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setCreatedTime_GreaterThan(Long createdTime) {
- setCreatedTime_GreaterThan(createdTime, null);
- }
-
- public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall opLambda) {
- RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setCreatedTime_LessThan(Long createdTime) {
- setCreatedTime_LessThan(createdTime, null);
- }
-
- public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall opLambda) {
- RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setCreatedTime_GreaterEqual(Long createdTime) {
- setCreatedTime_GreaterEqual(createdTime, null);
- }
-
- public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall opLambda) {
- RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setCreatedTime_LessEqual(Long createdTime) {
- setCreatedTime_LessEqual(createdTime, null);
- }
-
- public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall opLambda) {
- RangeFilterBuilder builder = regRangeF("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setId_NotEqual(String id) {
- setId_NotEqual(id, null, null);
- }
-
- public void setId_NotEqual(String id, ConditionOptionCall notOpLambda,
- ConditionOptionCall eqOpLambda) {
- not(subCf -> {
- subCf.setId_Equal(id, eqOpLambda);
- }, notOpLambda);
- }
-
- public void setId_Equal(String id) {
- setId_Term(id, null);
- }
-
- public void setId_Equal(String id, ConditionOptionCall opLambda) {
- setId_Term(id, opLambda);
- }
-
- public void setId_Term(String id) {
- setId_Term(id, null);
- }
-
- public void setId_Term(String id, ConditionOptionCall opLambda) {
- TermFilterBuilder builder = regTermF("id", id);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setId_Terms(Collection idList) {
- setId_Terms(idList, null);
- }
-
- public void setId_Terms(Collection idList, ConditionOptionCall opLambda) {
- TermsFilterBuilder builder = regTermsF("id", idList);
- if (opLambda != null) {
- opLambda.callback(builder);
- }
- }
-
- public void setId_InScope(Collection idList) {
- setId_Terms(idList, null);
- }
-
- public void setId_InScope(Collection idList, ConditionOptionCall