Merge pull request #106 from dbflute/develop

Develop: 1.1.9

dbflute-engine/.classpath

@@ -2,8 +2,16 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="lib" path="lib/dbflute-runtime.jar" sourcepath="lib/sources/dbflute-runtime-sources.jar"/>
 	<classpathentry kind="lib" path="lib/poi-3.12.jar"/>

dbflute-engine/.settings/org.eclipse.jdt.core.prefs

@@ -66,6 +66,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

dbflute-engine/.settings/org.eclipse.jdt.ui.prefs

@@ -1,4 +1,63 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=false
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=false
+cleanup.qualify_static_member_accesses_with_declaring_class=false
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=false
+cleanup.remove_trailing_whitespaces=false
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=false
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=false
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup_profile=_DBFluteCore CleanUp
+cleanup_settings_version=2
 eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=false
 formatter_profile=_DBFlute Style
 formatter_settings_version=12
 internal.default.compliance=default
@@ -7,3 +66,60 @@ org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=99
 org.eclipse.jdt.ui.staticondemandthreshold=99
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=false
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

dbflute-engine/build.xml

@@ -5,9 +5,9 @@
 	<!--                                          ==================================== -->
 
 	<!-- Version -->
-	<property name="version" value="1.1.8" />
+	<property name="version" value="1.1.9" />
 	<property name="build.version" value="${version}" />
-	<property name="runtime.version" value="1.1.8" />
+	<property name="runtime.version" value="1.1.9" />
 	<property name="runtime.build.version" value="${runtime.version}" />
 	<property name="example.latest.version" value="1.x" />
 

dbflute-engine/deploy-script/all-dist-deploy.sh

@@ -37,9 +37,9 @@ mvn -e compile
 cd ../dbflute-test-active-hangar/dbflute_maihamadb
 rm ./log/*.log
 . manage.sh renewal
-. manage.sh load-data-reverse
 . manage.sh freegen
 . diffworld-test.sh
+. lrevworld-test.sh
 . syncworld-test.sh
 cd ..
 mvn -e compile

dbflute-engine/deploy-script/ossdb-dist-deploy.sh

@@ -34,9 +34,9 @@ mvn -e compile
 cd ../dbflute-test-active-hangar/dbflute_maihamadb
 rm ./log/*.log
 . manage.sh renewal
-. manage.sh load-data-reverse
 . manage.sh freegen
 . diffworld-test.sh
+. lrevworld-test.sh
 . syncworld-test.sh
 cd ..
 mvn -e compile

dbflute-engine/deploy-script/small-dist-deploy.sh

@@ -26,9 +26,9 @@ mvn -e compile
 cd ../dbflute-test-active-hangar/dbflute_maihamadb
 rm ./log/*.log
 . manage.sh renewal
-. manage.sh load-data-reverse
 . manage.sh freegen
 . diffworld-test.sh
+. lrevworld-test.sh
 . syncworld-test.sh
 cd ..
 mvn -e compile

dbflute-engine/embedded/etc/client-template/dbflute_dfclient/dfprop/commonColumnMap.dfprop

@@ -6,7 +6,7 @@
 # the user who updated the record and so on...
 # The column names are treated as case insensitive.
 #
-# The variable '$$AccessContext$$' means allcommon.AccessContext.
+# The variable '$$AccessContext$$' means AccessContext class of DBFlute.
 #
 # Example:
 # map:{

dbflute-engine/embedded/etc/friends/eclipse/dbflute-eclipse-editor-templates.xml

@@ -8,14 +8,15 @@
 <template autoinsert="true" context="java-members" deleted="false" description="Commons Logging Logger" enabled="true" name="_clogger">${:import(org.apache.commons.logging.Log,
 	org.apache.commons.logging.LogFactory)}private static final Log
 	LOG = LogFactory.getLog(${enclosing_type}.class);</template>
-	<template autoinsert="true" context="java" deleted="false" description="Java8: forEach()" enabled="true" name="_foreach">${var}.forEach(${newName} -&gt; {
+<template autoinsert="true" context="java" deleted="false" description="Java8: forEach()" enabled="true" name="_foreach">${var}.forEach(${newName} -&gt; {
     ${cursor}
 });</template>
+<template autoinsert="true" context="java" deleted="false" description="#hope comment" enabled="true" name="_hope">    // #hope ${user} ${cursor} (${d:date('yyyy/MM/dd')})</template>
 <template autoinsert="true" context="java" deleted="false" description="Java8: Lambda KeyValue as Inline" enabled="true" name="_kvli">(key, value) -&gt; ${cursor}</template>
 <template autoinsert="true" context="java" deleted="false" description="Java8: Lambda KeyValue as Linefeed" enabled="true" name="_kvll">(key, value) -&gt; {
     ${cursor}
 }</template>
-<template autoinsert="true" context="javadoc" deleted="false" description="JavaDoc: (NotNull)" enabled="true" name="_docnotnull">(NotNull: ${comment})</template>
+<template autoinsert="true" context="javadoc" deleted="false" description="JavaDoc: (NotNull)" enabled="true" name="_docnotnull">(NotNull)</template>
 <template autoinsert="true" context="javadoc" deleted="false" description="JavaDoc: (NullAllowed: ...)" enabled="true" name="_docnullallowed">(NullAllowed: ${comment})</template>
 <template autoinsert="true" context="java-members" deleted="false" description="LastaFlute: DI for Anything" enabled="true" name="_ladany">${:import(javax.annotation.Resource)}@Resource
 private ${component} anything;</template>
@@ -54,8 +55,8 @@ public HtmlResponse ${method}(Integer ${object}Id, ${form}Form form) {
 }</template>
 <template autoinsert="true" context="java-members" deleted="false" description="LastaFlute: Execute Method as JSON response with ID and Body" enabled="true" name="_laexjson">${:import(org.lastaflute.web.Execute
     , org.lastaflute.web.response.JsonResponse)}@Execute
-public JsonResponse&lt;${bean}&gt; ${method}(Integer ${object}Id, ${body}Body body) {
-    return asJson(bean);
+public JsonResponse&lt;${result}&gt; ${method}(Integer ${object}Id, ${body}Body body) {
+    return asJson(result);
 }</template>
 <template autoinsert="true" context="java-members" deleted="false" description="LastaFlute: Public Property simply" enabled="true" name="_laprop">public ${objectType} ${objectName};</template>
 <template autoinsert="true" context="java-members" deleted="false" description="LastaFlute: Public Property as Valid Class" enabled="true" name="_lapvalidclass">${:import(org.lastaflute.web.validation.Required,javax.validation.Valid)}@Valid
@@ -93,6 +94,7 @@ public String toString() {
 	logger = LoggerFactory.getLogger(${enclosing_type}.class);</template>
 <template autoinsert="true" context="java" deleted="false" description="DBFlute: .addOrderBy_..." enabled="true" name="_order">.addOrderBy_${columnName}</template>
 <template autoinsert="true" context="java" deleted="false" description="DBFlute: cb.query()" enabled="true" name="_query">${var}.query()</template>
+<template autoinsert="true" context="java" deleted="false" description="(yyyy/MM/dd)" enabled="true" name="_reardate">// ${cursor}(${d:date('yyyy/MM/dd')})</template>
 <template autoinsert="true" context="java" deleted="false" description="Java8: collect toList()" enabled="true" name="_scolist">${:import(java.util.stream.Collectors)}.collect(Collectors.toList())</template>
 <template autoinsert="true" context="java" deleted="false" description="Java8: collect toMap()" enabled="true" name="_scomap">${:import(java.util.stream.Collectors)}.collect(Collectors.toMap(bean -&gt; bean.get${newName}, bean -&gt; bean))</template>
 <template autoinsert="true" context="java" deleted="false" description="DBFlute: cb.specify()" enabled="true" name="_specify">${var}.specify()</template>
@@ -167,8 +169,9 @@ public String toString() {
 
     // ## Assert ##
 }</template>
-<template autoinsert="true" context="java" deleted="false" description="TODO comment" enabled="true" name="_todo">    // TODO ${user} ${cursor} (${date})</template>
-<template autoinsert="true" context="java" deleted="false" description="TODO review comment" enabled="true" name="_trev">    // TODO ${you} ${message} by ${user} (${date})</template>
+<template autoinsert="true" context="java" deleted="false" description="#thinking comment" enabled="true" name="_thinking">    // #thinking ${user} ${cursor} (${d:date('yyyy/MM/dd')})</template>
+<template autoinsert="true" context="java" deleted="false" description="TODO comment" enabled="true" name="_todo">    // TODO ${user} ${cursor} (${d:date('yyyy/MM/dd')})</template>
+<template autoinsert="true" context="java" deleted="false" description="TODO review comment" enabled="true" name="_trev">    // TODO ${you} ${message} by ${user} (${d:date('yyyy/MM/dd')})</template>
 <template autoinsert="true" context="java-statements" deleted="false" description="throw new IllegalArgumentException(...)" enabled="true" name="_tharg">throw new IllegalArgumentException("The argument '${localVar}' should not be null.");</template>
 <template autoinsert="true" context="java-statements" deleted="false" description="throw new IllegalStateException(...)" enabled="true" name="_thstate">throw new IllegalStateException("${message}", ${e:localVar(java.lang.Throwable)});</template>