add userAgent property to path-mapping #575

src/main/config/es/fess_config.json

@@ -58,6 +58,10 @@
           "sortOrder" : {
             "type" : "integer"
           },
+          "userAgent" : {
+            "type" : "string",
+            "index" : "not_analyzed"
+          },
           "updatedBy" : {
             "type" : "string",
             "index" : "not_analyzed"

src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java

@@ -80,6 +80,7 @@ public abstract class BsPathMappingBhv extends EsAbstractBehavior<PathMapping, P
             result.setRegex(DfTypeUtil.toString(source.get("regex")));
             result.setReplacement(DfTypeUtil.toString(source.get("replacement")));
             result.setSortOrder(DfTypeUtil.toInteger(source.get("sortOrder")));
+            result.setUserAgent(DfTypeUtil.toString(source.get("userAgent")));
             result.setUpdatedBy(DfTypeUtil.toString(source.get("updatedBy")));
             result.setUpdatedTime(DfTypeUtil.toLong(source.get("updatedTime")));
             return result;

src/main/java/org/codelibs/fess/es/config/bsentity/BsPathMapping.java

@@ -55,6 +55,9 @@ public class BsPathMapping extends EsAbstractEntity {
     /** sortOrder */
     protected Integer sortOrder;
 
+    /** userAgent */
+    protected String userAgent;
+
     /** updatedBy */
     protected String updatedBy;
 
@@ -100,6 +103,9 @@ public class BsPathMapping extends EsAbstractEntity {
         if (sortOrder != null) {
             sourceMap.put("sortOrder", sortOrder);
         }
+        if (userAgent != null) {
+            sourceMap.put("userAgent", userAgent);
+        }
         if (updatedBy != null) {
             sourceMap.put("updatedBy", updatedBy);
         }
@@ -121,6 +127,7 @@ public class BsPathMapping extends EsAbstractEntity {
         sb.append(dm).append(regex);
         sb.append(dm).append(replacement);
         sb.append(dm).append(sortOrder);
+        sb.append(dm).append(userAgent);
         sb.append(dm).append(updatedBy);
         sb.append(dm).append(updatedTime);
         if (sb.length() > dm.length()) {
@@ -193,6 +200,16 @@ public class BsPathMapping extends EsAbstractEntity {
         this.sortOrder = value;
     }
 
+    public String getUserAgent() {
+        checkSpecifiedProperty("userAgent");
+        return convertEmptyToNull(userAgent);
+    }
+
+    public void setUserAgent(String value) {
+        registerModifiedProperty("userAgent");
+        this.userAgent = value;
+    }
+
     public String getUpdatedBy() {
         checkSpecifiedProperty("updatedBy");
         return convertEmptyToNull(updatedBy);

src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java

@@ -90,6 +90,8 @@ public class PathMappingDbm extends AbstractDBMeta {
                 (et, vl) -> ((PathMapping) et).setReplacement(DfTypeUtil.toString(vl)), "replacement");
         setupEpg(_epgMap, et -> ((PathMapping) et).getSortOrder(), (et, vl) -> ((PathMapping) et).setSortOrder(DfTypeUtil.toInteger(vl)),
                 "sortOrder");
+        setupEpg(_epgMap, et -> ((PathMapping) et).getUserAgent(), (et, vl) -> ((PathMapping) et).setUserAgent(DfTypeUtil.toString(vl)),
+                "userAgent");
         setupEpg(_epgMap, et -> ((PathMapping) et).getUpdatedBy(), (et, vl) -> ((PathMapping) et).setUpdatedBy(DfTypeUtil.toString(vl)),
                 "updatedBy");
         setupEpg(_epgMap, et -> ((PathMapping) et).getUpdatedTime(), (et, vl) -> ((PathMapping) et).setUpdatedTime(DfTypeUtil.toLong(vl)),
@@ -142,6 +144,8 @@ public class PathMappingDbm extends AbstractDBMeta {
             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 _columnUserAgent = cci("userAgent", "userAgent", null, null, String.class, "userAgent", 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,
             false, "String", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
@@ -171,6 +175,10 @@ public class PathMappingDbm extends AbstractDBMeta {
         return _columnSortOrder;
     }
 
+    public ColumnInfo columnUserAgent() {
+        return _columnUserAgent;
+    }
+
     public ColumnInfo columnUpdatedBy() {
         return _columnUpdatedBy;
     }
@@ -187,6 +195,7 @@ public class PathMappingDbm extends AbstractDBMeta {
         ls.add(columnRegex());
         ls.add(columnReplacement());
         ls.add(columnSortOrder());
+        ls.add(columnUserAgent());
         ls.add(columnUpdatedBy());
         ls.add(columnUpdatedTime());
         return ls;

src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java

@@ -171,6 +171,10 @@ public class BsPathMappingCB extends EsAbstractConditionBean {
             doColumn("sortOrder");
         }
 
+        public void columnUserAgent() {
+            doColumn("userAgent");
+        }
+
         public void columnUpdatedBy() {
             doColumn("updatedBy");
         }

src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java

@@ -1114,6 +1114,169 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         return this;
     }
 
+    public void setUserAgent_Equal(String userAgent) {
+        setUserAgent_Term(userAgent, null);
+    }
+
+    public void setUserAgent_Equal(String userAgent, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        setUserAgent_Term(userAgent, opLambda);
+    }
+
+    public void setUserAgent_Term(String userAgent) {
+        setUserAgent_Term(userAgent, null);
+    }
+
+    public void setUserAgent_Term(String userAgent, ConditionOptionCall<TermQueryBuilder> opLambda) {
+        TermQueryBuilder builder = regTermQ("userAgent", userAgent);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_NotEqual(String userAgent) {
+        setUserAgent_NotTerm(userAgent, null);
+    }
+
+    public void setUserAgent_NotTerm(String userAgent) {
+        setUserAgent_NotTerm(userAgent, null);
+    }
+
+    public void setUserAgent_NotEqual(String userAgent, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        setUserAgent_NotTerm(userAgent, opLambda);
+    }
+
+    public void setUserAgent_NotTerm(String userAgent, ConditionOptionCall<BoolQueryBuilder> opLambda) {
+        not(not -> not.setUserAgent_Term(userAgent), opLambda);
+    }
+
+    public void setUserAgent_Terms(Collection<String> userAgentList) {
+        setUserAgent_Terms(userAgentList, null);
+    }
+
+    public void setUserAgent_Terms(Collection<String> userAgentList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        TermsQueryBuilder builder = regTermsQ("userAgent", userAgentList);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_InScope(Collection<String> userAgentList) {
+        setUserAgent_Terms(userAgentList, null);
+    }
+
+    public void setUserAgent_InScope(Collection<String> userAgentList, ConditionOptionCall<TermsQueryBuilder> opLambda) {
+        setUserAgent_Terms(userAgentList, opLambda);
+    }
+
+    public void setUserAgent_Match(String userAgent) {
+        setUserAgent_Match(userAgent, null);
+    }
+
+    public void setUserAgent_Match(String userAgent, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchQ("userAgent", userAgent);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_MatchPhrase(String userAgent) {
+        setUserAgent_MatchPhrase(userAgent, null);
+    }
+
+    public void setUserAgent_MatchPhrase(String userAgent, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchPhraseQ("userAgent", userAgent);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_MatchPhrasePrefix(String userAgent) {
+        setUserAgent_MatchPhrasePrefix(userAgent, null);
+    }
+
+    public void setUserAgent_MatchPhrasePrefix(String userAgent, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regMatchPhrasePrefixQ("userAgent", userAgent);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_Fuzzy(String userAgent) {
+        setUserAgent_Fuzzy(userAgent, null);
+    }
+
+    public void setUserAgent_Fuzzy(String userAgent, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
+        FuzzyQueryBuilder builder = regFuzzyQ("userAgent", userAgent);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_Prefix(String userAgent) {
+        setUserAgent_Prefix(userAgent, null);
+    }
+
+    public void setUserAgent_Prefix(String userAgent, ConditionOptionCall<PrefixQueryBuilder> opLambda) {
+        PrefixQueryBuilder builder = regPrefixQ("userAgent", userAgent);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_GreaterThan(String userAgent) {
+        setUserAgent_GreaterThan(userAgent, null);
+    }
+
+    public void setUserAgent_GreaterThan(String userAgent, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_GREATER_THAN, userAgent);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_LessThan(String userAgent) {
+        setUserAgent_LessThan(userAgent, null);
+    }
+
+    public void setUserAgent_LessThan(String userAgent, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_LESS_THAN, userAgent);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_GreaterEqual(String userAgent) {
+        setUserAgent_GreaterEqual(userAgent, null);
+    }
+
+    public void setUserAgent_GreaterEqual(String userAgent, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_GREATER_EQUAL, userAgent);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public void setUserAgent_LessEqual(String userAgent) {
+        setUserAgent_LessEqual(userAgent, null);
+    }
+
+    public void setUserAgent_LessEqual(String userAgent, ConditionOptionCall<RangeQueryBuilder> opLambda) {
+        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_LESS_EQUAL, userAgent);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
+    public BsPathMappingCQ addOrderBy_UserAgent_Asc() {
+        regOBA("userAgent");
+        return this;
+    }
+
+    public BsPathMappingCQ addOrderBy_UserAgent_Desc() {
+        regOBD("userAgent");
+        return this;
+    }
+
     public void setUpdatedBy_Equal(String updatedBy) {
         setUpdatedBy_Term(updatedBy, null);
     }

src/main/resources/fess_indices/.fess_config/path_mapping.json

@@ -22,6 +22,10 @@
       "sortOrder": {
         "type": "integer"
       },
+      "userAgent": {
+        "type": "string",
+        "index": "not_analyzed"
+      },
       "createdBy": {
         "type": "string",
         "index": "not_analyzed"