Merge pull request #234 from terasolunaorg/issues/224_separate-jodati…

…me-backport Issues/224 separate jodatime backport
terasolunaorg · Jan 8, 2015 · 3599804 · 3599804
2 parents 382cbd4 + 92e9aba
commit 3599804
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...luna-gfw-common/src/main/java/org/terasoluna/gfw/common/date/JdbcAdjustedDateFactory.java b/...luna-gfw-common/src/main/java/org/terasoluna/gfw/common/date/JdbcAdjustedDateFactory.java
@@ -92,7 +92,7 @@ public long reload() {
             adjustedValue = cachedAdjustedValue.get();
             logger.warn("adjusted value is null. use {}", adjustedValue);
         } else if (isUseCache()) {
-            logger.debug("cache adjustd value = {}", adjustedValue);
+            logger.debug("cache adjusted value = {}", adjustedValue);
             cachedAdjustedValue.set(adjustedValue);
         }
 
@@ -115,15 +115,15 @@ public void afterPropertiesSet() {
 
     /**
      * Sets JDBC Template from DataSource
-     * @param dataSource
+     * @param dataSource dataSource
      */
     public void setDataSource(DataSource dataSource) {
         this.jdbcTemplate = new JdbcTemplate(dataSource);
     }
 
     /**
      * Sets JDBC Template
-     * @param jdbcTemplate
+     * @param jdbcTemplate jdbcTemplate
      */
     public void setJdbcTemplate(JdbcTemplate jdbcTemplate) {
         this.jdbcTemplate = jdbcTemplate;

diff --git a/terasoluna-gfw-common/src/main/java/org/terasoluna/gfw/common/date/JdbcFixedDateFactory.java b/terasoluna-gfw-common/src/main/java/org/terasoluna/gfw/common/date/JdbcFixedDateFactory.java
@@ -66,15 +66,15 @@ public DateTime newDateTime() {
 
     /**
      * Sets JDBC Template from DataSource
-     * @param dataSource
+     * @param dataSource dataSource
      */
     public void setDataSource(DataSource dataSource) {
         this.jdbcTemplate = new JdbcTemplate(dataSource);
     }
 
     /** the current timestamp received as parameter.
      * Sets
-     * @param currentTimestampQuery
+     * @param currentTimestampQuery SQL to retrieve current timestamp
      */
     public void setCurrentTimestampQuery(String currentTimestampQuery) {
         this.currentTimestampQuery = currentTimestampQuery;

diff --git a/terasoluna-gfw-web/src/test/java/org/terasoluna/gfw/web/el/FunctionsTest.java b/terasoluna-gfw-web/src/test/java/org/terasoluna/gfw/web/el/FunctionsTest.java
@@ -557,7 +557,7 @@ public void testMapToQuery_map_isNull() {
 class Person {
     private String name;
 
-    @DateTimeFormat(pattern = "yyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date date;
 
     private Integer age;