Revert "from Development/5.6.0 (#957)"

This reverts commit 423c3d5.

terasoluna-gfw-common-libraries/terasoluna-gfw-codepoints/pom.xml

@@ -84,6 +84,11 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

terasoluna-gfw-common-libraries/terasoluna-gfw-common/pom.xml

@@ -79,6 +79,11 @@
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
     </dependency>
+    <!-- Log4JDBC -->
+    <dependency>
+      <groupId>org.lazyluke</groupId>
+      <artifactId>log4jdbc-remix</artifactId>
+    </dependency>
     <!-- == End Logging == -->
 
     <!-- == Begin Spring == -->
@@ -148,6 +153,11 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

terasoluna-gfw-common-libraries/terasoluna-gfw-common/src/test/java/org/terasoluna/gfw/common/sequencer/JdbcSequencerTest.java

@@ -78,15 +78,13 @@ public void testGetCurrent01() {
 
         jdbcSequencer.setSequenceClass(String.class);
         jdbcSequencer.afterPropertiesSet();
-        String nextVal1 = jdbcSequencer.getNext();
         String currentVal1 = jdbcSequencer.getCurrent();
-        String nextVal2 = jdbcSequencer.getNext();
+        String nextVal = jdbcSequencer.getNext();
         String currentVal2 = jdbcSequencer.getCurrent();
 
-        assertThat(nextVal1, is(String.valueOf(1)));
-        assertThat(currentVal1, is(String.valueOf(1)));
-        assertThat(nextVal2, is(String.valueOf(2)));
-        assertThat(currentVal2, is(String.valueOf(2)));
+        assertThat(currentVal1, is(String.valueOf(0)));
+        assertThat(nextVal, is(String.valueOf(1)));
+        assertThat(currentVal2, is(String.valueOf(1)));
     }
 
     @Test(expected = IllegalArgumentException.class)

terasoluna-gfw-common-libraries/terasoluna-gfw-common/src/test/resources/org/terasoluna/gfw/common/codelist/ExistInCodeListTest-context.xml

@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:context="http://www.springframework.org/schema/context"
   xsi:schemaLocation="
-       http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
    ">
 
   <bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean" />

terasoluna-gfw-common-libraries/terasoluna-gfw-common/src/test/resources/org/terasoluna/gfw/common/codelist/i18n/simpleI18nCodeList.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:util="http://www.springframework.org/schema/util"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
 
   <bean id="CL_testSetRows" class="org.terasoluna.gfw.common.codelist.i18n.SimpleI18nCodeList">

terasoluna-gfw-common-libraries/terasoluna-gfw-common/src/test/resources/org/terasoluna/gfw/common/exception/ResultMessagesLoggingInterceptorTest.xml

@@ -3,13 +3,13 @@
   xmlns:context="http://www.springframework.org/schema/context" xmlns:jee="http://www.springframework.org/schema/jee"
   xmlns:tx="http://www.springframework.org/schema/tx" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:jpa="http://www.springframework.org/schema/data/jpa" xmlns:util="http://www.springframework.org/schema/util"
-  xsi:schemaLocation="http://www.springframework.org/schema/jee https://www.springframework.org/schema/jee/spring-jee.xsd
-        http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd
-        http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd
-        http://www.springframework.org/schema/data/jpa https://www.springframework.org/schema/data/jpa/spring-jpa.xsd
-        http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx.xsd
-        http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee.xsd
+        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd
+        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
+        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
   <!-- component scan -->
   <tx:annotation-driven />

terasoluna-gfw-common-libraries/terasoluna-gfw-common/src/test/resources/test-context.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:tx="http://www.springframework.org/schema/tx" xmlns:util="http://www.springframework.org/schema/util"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd
-		http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
 
 
   <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">

terasoluna-gfw-common-libraries/terasoluna-gfw-jodatime/pom.xml

@@ -87,6 +87,11 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <scope>test</scope>
+    </dependency>
     <!-- == End Unit Test == -->
 
     <!-- == Begin Database == -->

terasoluna-gfw-common-libraries/terasoluna-gfw-jodatime/src/test/resources/test-context.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:tx="http://www.springframework.org/schema/tx" xmlns:util="http://www.springframework.org/schema/util"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd
-		http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
 
 
   <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">

terasoluna-gfw-common-libraries/terasoluna-gfw-security-web/pom.xml

@@ -111,6 +111,11 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

terasoluna-gfw-common-libraries/terasoluna-gfw-string/pom.xml

@@ -73,6 +73,11 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

terasoluna-gfw-common-libraries/terasoluna-gfw-validator/pom.xml

@@ -77,6 +77,11 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

terasoluna-gfw-common-libraries/terasoluna-gfw-web-jsp/pom.xml

@@ -125,6 +125,11 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

terasoluna-gfw-common-libraries/terasoluna-gfw-web/pom.xml

@@ -107,6 +107,11 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>

terasoluna-gfw-common-libraries/terasoluna-gfw-web/src/main/java/org/terasoluna/gfw/web/el/ObjectToMapConverter.java

@@ -285,7 +285,7 @@ private boolean flatten(Map<String, String> map, String prefix, String name,
             Object value, TypeDescriptor sourceType) {
         String key = StringUtils.isEmpty(prefix) ? name : prefix + "." + name;
         if (value == null) {
-            String resetKey = determineResetKey(key, sourceType);
+            String resetKey = "_" + key;
             map.put(resetKey, "");
             // the value has been flatten
             return true;
@@ -323,24 +323,6 @@ private boolean flatten(Map<String, String> map, String prefix, String name,
         return true;
     }
 
-    /**
-     * Determine whether to convert null value to field marker.
-     * <p>
-     * Should not convert Boolean null value to field marker.<br>
-     * {@link org.springframework.web.bind.WebDataBinder} bind boolean & Boolean field marker as same false value.
-     * @param key Property name with prefix
-     * @param sourceType {@link TypeDescriptor} to use
-     * @return ResetKey
-     */
-    private String determineResetKey(String key, TypeDescriptor sourceType) {
-        if (sourceType != null) {
-            if (Boolean.class == sourceType.getType()) {
-                return key;
-            }
-        }
-        return "_" + key;
-    }
-
     /**
      * Convert any array to {@code List<Object>}
      * @param arrayObject array to convert

terasoluna-gfw-common-libraries/terasoluna-gfw-web/src/test/java/org/terasoluna/gfw/web/el/ObjectToMapConverterTest.java

@@ -306,17 +306,6 @@ public void test10_propertiesIsEmptyElement() {
         assertThat(map, hasEntry("nestedForm.array", ""));
     }
 
-    @Test
-    public void testConvert11_Boolean() {
-        BooleanForm11 form = new BooleanForm11(true, false, null);
-        Map<String, String> map = converter.convert(form);
-
-        assertThat(map.size(), is(3));
-        assertThat(map, hasEntry("bool1", "true"));
-        assertThat(map, hasEntry("bool2", "false"));
-        assertThat(map, hasEntry("bool3", ""));
-    }
-
     public static class SearchUserForm0 {
         private String name;
 
@@ -1097,43 +1086,4 @@ public void setArray(int[] array) {
         }
     }
 
-    public static class BooleanForm11 {
-        private Boolean bool1;
-
-        private Boolean bool2;
-
-        private Boolean bool3;
-
-        public BooleanForm11(Boolean bool1, Boolean bool2, Boolean bool3) {
-            this.bool1 = bool1;
-            this.bool2 = bool2;
-            this.bool3 = bool3;
-        }
-
-        public Boolean getBool1() {
-            return bool1;
-        }
-
-        public void setBool1(Boolean bool1) {
-            this.bool1 = bool1;
-        }
-
-        public Boolean getBool2() {
-            return bool2;
-        }
-
-        public void setBool2(Boolean bool2) {
-            this.bool2 = bool2;
-        }
-
-        public Boolean getBool3() {
-            return bool3;
-        }
-
-        public void setBool3(Boolean bool3) {
-            this.bool3 = bool3;
-        }
-
-    }
-
 }

terasoluna-gfw-common-libraries/terasoluna-gfw-web/src/test/java/org/terasoluna/gfw/web/pagination/PaginationInfoTest.java

@@ -110,7 +110,7 @@ public void testCreateAttributeMap_SortSet() {
 
         int page = 1;
         int size = 1;
-        Sort mockedSort = Sort.by(Direction.DESC, "id");
+        Sort mockedSort = new Sort(Direction.DESC, "id");
 
         // run
         Map<String, Object> attributesMap = PaginationInfo.createAttributeMap(

terasoluna-gfw-common-libraries/terasoluna-gfw-web/src/test/resources/org/terasoluna/gfw/web/codelist/CodeListInterceptorTest.xml

@@ -3,13 +3,13 @@
   xmlns:context="http://www.springframework.org/schema/context" xmlns:jee="http://www.springframework.org/schema/jee"
   xmlns:tx="http://www.springframework.org/schema/tx" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:jpa="http://www.springframework.org/schema/data/jpa" xmlns:util="http://www.springframework.org/schema/util"
-  xsi:schemaLocation="http://www.springframework.org/schema/jee https://www.springframework.org/schema/jee/spring-jee.xsd
-        http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd
-        http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd
-        http://www.springframework.org/schema/data/jpa https://www.springframework.org/schema/data/jpa/spring-jpa.xsd
-        http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx.xsd
-        http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee.xsd
+        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+        http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd
+        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
+        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 
   <bean id="simpleMapCodeList" class="org.terasoluna.gfw.common.codelist.SimpleMapCodeList">

terasoluna-gfw-common-libraries/terasoluna-gfw-web/src/test/resources/test-context.xml

@@ -3,11 +3,11 @@
   xmlns:aop="http://www.springframework.org/schema/aop" xmlns:c="http://www.springframework.org/schema/c"
   xmlns:context="http://www.springframework.org/schema/context" xmlns:mvc="http://www.springframework.org/schema/mvc"
   xmlns:p="http://www.springframework.org/schema/p" xmlns:util="http://www.springframework.org/schema/util"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd
-        http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd
-        http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc.xsd
-        http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd">
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
   <bean id="dataSource" class="org.springframework.jdbc.datasource.SimpleDriverDataSource">
     <property name="driverClass" value="org.h2.Driver" />

terasoluna-gfw-dependencies/terasoluna-gfw-common-dependencies/pom.xml

@@ -37,6 +37,11 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <!-- Log4JDBC -->
+    <dependency>
+      <groupId>org.lazyluke</groupId>
+      <artifactId>log4jdbc-remix</artifactId>
+    </dependency>
     <!-- == End Logging == -->
 
     <!-- == Begin Spring == -->