#279 modify OverlappingHost

src/main/java/org/codelibs/fess/es/exentity/OverlappingHost.java

@@ -8,4 +8,26 @@ import org.codelibs.fess.es.bsentity.BsOverlappingHost;
 public class OverlappingHost extends BsOverlappingHost {
 
     private static final long serialVersionUID = 1L;
+
+    public String getId() {
+        return asDocMeta().id();
+    }
+
+    public void setId(String id) {
+        asDocMeta().id(id);
+    }
+
+    public Long getVersionNo() {
+        return asDocMeta().version();
+    }
+
+    public void setVersionNo(Long version) {
+        asDocMeta().version(version);
+    }
+
+    public String convert(final String url) {
+        final String targetStr = getOverlappingName().replaceAll("\\.", "\\\\.");
+        return url.replaceFirst("://" + targetStr + "$", "://" + getRegularName()).replaceFirst("://" + targetStr + "([:/])",
+                "://" + getRegularName() + "$1");
+    }
 }

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

@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.codelibs.fess.db.exentity.OverlappingHost;
+import org.codelibs.fess.es.exentity.OverlappingHost;
 import org.codelibs.fess.service.OverlappingHostService;
 import org.seasar.framework.container.SingletonS2Container;
 import org.seasar.framework.container.annotation.tiger.InitMethod;

src/main/java/org/codelibs/fess/service/OverlappingHostService.java

@@ -24,9 +24,9 @@ import javax.annotation.Resource;
 
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
-import org.codelibs.fess.db.cbean.OverlappingHostCB;
-import org.codelibs.fess.db.exbhv.OverlappingHostBhv;
-import org.codelibs.fess.db.exentity.OverlappingHost;
+import org.codelibs.fess.es.cbean.OverlappingHostCB;
+import org.codelibs.fess.es.exbhv.OverlappingHostBhv;
+import org.codelibs.fess.es.exentity.OverlappingHost;
 import org.codelibs.fess.pager.OverlappingHostPager;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.seasar.framework.beans.util.Beans;
@@ -60,7 +60,7 @@ public class OverlappingHostService implements Serializable {
 
     public OverlappingHost getOverlappingHost(final Map<String, String> keys) {
         final OverlappingHost overlappingHost = overlappingHostBhv.selectEntity(cb -> {
-            cb.query().setId_Equal(Long.parseLong(keys.get("id")));
+            cb.query().docMeta().setId_Equal(keys.get("id"));
             setupEntityCondition(cb, keys);
         }).orElse(null);//TODO
         if (overlappingHost == null) {
@@ -74,21 +74,24 @@ public class OverlappingHostService implements Serializable {
     public void store(final OverlappingHost overlappingHost) throws CrudMessageException {
         setupStoreCondition(overlappingHost);
 
-        overlappingHostBhv.insertOrUpdate(overlappingHost);
+        overlappingHostBhv.insertOrUpdate(overlappingHost, op -> {
+            op.setRefresh(true);
+        });
 
     }
 
     public void delete(final OverlappingHost overlappingHost) throws CrudMessageException {
         setupDeleteCondition(overlappingHost);
 
-        overlappingHostBhv.delete(overlappingHost);
+        overlappingHostBhv.delete(overlappingHost, op -> {
+            op.setRefresh(true);
+        });
 
     }
 
     public List<OverlappingHost> getOverlappingHostList() {
 
         return overlappingHostBhv.selectList(cb -> {
-            cb.query().setDeletedBy_IsNull();
             cb.query().addOrderBy_SortOrder_Asc();
             cb.query().addOrderBy_RegularName_Asc();
             cb.query().addOrderBy_OverlappingName_Asc();
@@ -97,12 +100,11 @@ public class OverlappingHostService implements Serializable {
 
     protected void setupListCondition(final OverlappingHostCB cb, final OverlappingHostPager overlappingHostPager) {
         if (overlappingHostPager.id != null) {
-            cb.query().setId_Equal(Long.parseLong(overlappingHostPager.id));
+            cb.query().docMeta().setId_Equal(overlappingHostPager.id);
         }
         // TODO Long, Integer, String supported only.
 
         // setup condition
-        cb.query().setDeletedBy_IsNull();
         cb.query().addOrderBy_SortOrder_Asc();
 
         // search
@@ -112,7 +114,6 @@ public class OverlappingHostService implements Serializable {
     protected void setupEntityCondition(final OverlappingHostCB cb, final Map<String, String> keys) {
 
         // setup condition
-        cb.query().setDeletedBy_IsNull();
 
     }
 

src/main/java/org/codelibs/fess/web/admin/OverlappingHostAction.java

@@ -27,7 +27,7 @@ import org.codelibs.fess.beans.FessBeans;
 import org.codelibs.fess.crud.CommonConstants;
 import org.codelibs.fess.crud.CrudMessageException;
 import org.codelibs.fess.crud.util.SAStrutsUtil;
-import org.codelibs.fess.db.exentity.OverlappingHost;
+import org.codelibs.fess.es.exentity.OverlappingHost;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.pager.OverlappingHostPager;
 import org.codelibs.fess.service.OverlappingHostService;
@@ -277,7 +277,7 @@ public class OverlappingHostAction extends FessAdminAction {
     protected OverlappingHost createOverlappingHost() {
         OverlappingHost overlappingHost;
         final String username = systemHelper.getUsername();
-        final LocalDateTime currentTime = systemHelper.getCurrentTime();
+        final long currentTime = systemHelper.getCurrentTimeAsLong();
         if (overlappingHostForm.crudMode == CommonConstants.EDIT_MODE) {
             overlappingHost = overlappingHostService.getOverlappingHost(createKeyMap());
             if (overlappingHost == null) {
@@ -310,12 +310,8 @@ public class OverlappingHostAction extends FessAdminAction {
                 throw new SSCActionMessagesException("errors.crud_could_not_find_crud_table", new Object[] { overlappingHostForm.id });
             }
 
-            //            overlappingHostService.delete(overlappingHost);
-            final String username = systemHelper.getUsername();
-            final LocalDateTime currentTime = systemHelper.getCurrentTime();
-            overlappingHost.setDeletedBy(username);
-            overlappingHost.setDeletedTime(currentTime);
-            overlappingHostService.store(overlappingHost);
+            overlappingHostService.delete(overlappingHost);
+
             SAStrutsUtil.addSessionMessage("success.crud_delete_crud_table");
 
             return displayList(true);

src/main/java/org/codelibs/fess/web/admin/OverlappingHostForm.java

@@ -23,6 +23,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.codelibs.fess.Constants;
+import org.codelibs.fess.util.ComponentUtil;
 import org.seasar.struts.annotation.DateType;
 import org.seasar.struts.annotation.IntRange;
 import org.seasar.struts.annotation.IntegerType;
@@ -47,7 +48,7 @@ public class OverlappingHostForm implements Serializable {
     }
 
     @Required(target = "confirmfromupdate,update,delete")
-    @LongType
+    @Maxbytelength(maxbytelength = 1000)
     public String id;
 
     @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
@@ -67,21 +68,15 @@ public class OverlappingHostForm implements Serializable {
     public String createdBy;
 
     @Required(target = "confirmfromupdate,update,delete")
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    @LongType
     public String createdTime;
 
     @Maxbytelength(maxbytelength = 255)
     public String updatedBy;
 
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
+    @LongType
     public String updatedTime;
 
-    @Maxbytelength(maxbytelength = 255)
-    public String deletedBy;
-
-    @DateType(datePattern = Constants.DEFAULT_DATETIME_FORMAT)
-    public String deletedTime;
-
     @Required(target = "confirmfromupdate,update,delete")
     @IntegerType
     public String versionNo;
@@ -91,17 +86,11 @@ public class OverlappingHostForm implements Serializable {
         regularName = null;
         overlappingName = null;
         sortOrder = null;
-        createdBy = null;
-        createdTime = null;
+        createdBy = "system";
+        createdTime = Long.toString(ComponentUtil.getSystemHelper().getCurrentTimeAsLong());
         updatedBy = null;
         updatedTime = null;
-        deletedBy = null;
-        deletedTime = null;
         versionNo = null;
         sortOrder = "0";
-        // Temporary data
-        createdBy = "system";
-        final SimpleDateFormat sdf = new SimpleDateFormat(Constants.DEFAULT_DATETIME_FORMAT);
-        createdTime = sdf.format(new Date());
     }
 }