AS-3017: Fix a bug in CodeTableDaoImpl.

Author: hwang-vividsolutions

farms-api/farms-persistence/src/main/java/ca/bc/gov/farms/persistence/v1/dao/jdbc/CodeTableDaoImpl.java

@@ -190,11 +190,10 @@ protected void insert(Connection conn, CodeTableConfig codeTableConfig, CodeDto
                     + ") values ("
                     + "?,"
                     + "?,"
-                    + "?,"
                     + (Boolean.TRUE.equals(codeTableConfig.getUseDisplayOrder()) ? "?," : "")
                     + (dto.getEffectiveDate() == null ? "trunc(SYSDATE)," : "?,")
                     + (dto.getExpiryDate() == null ? "to_date('9999-12-31','YYYY-MM-DD')," : "?,")
-                    + (Boolean.TRUE.equals(codeTableConfig.getUseDisplayOrder()) ? "1," : "")
+                    + (Boolean.TRUE.equals(codeTableConfig.getUseRevisionCount()) ? "1," : "")
                     + "?,"
                     + "SYSDATE,"
                     + "?,"
@@ -208,10 +207,12 @@ protected void insert(Connection conn, CodeTableConfig codeTableConfig, CodeDto
             int parameterIndex = 0;
             st.setString(++parameterIndex, dto.getCode());
             st.setString(++parameterIndex, dto.getDescription());
-            if (!Boolean.FALSE.equals(codeTableConfig.getUseDisplayOrder())) {
+            if (Boolean.TRUE.equals(codeTableConfig.getUseDisplayOrder())) {
                 setInteger(++parameterIndex, st, dto.getDisplayOrder());
             }
-            setLocalDate(++parameterIndex, st, dto.getEffectiveDate());
+            if (dto.getEffectiveDate() != null) {
+                setLocalDate(++parameterIndex, st, dto.getEffectiveDate());
+            }
             if (dto.getExpiryDate() != null) {
                 setLocalDate(++parameterIndex, st, dto.getExpiryDate());
             }

farms-api/farms-service-api/src/main/java/ca/bc/gov/farms/service/api/v1/spring/CodeHierarchySpringConfig.java

@@ -1,7 +1,6 @@
 package ca.bc.gov.farms.service.api.v1.spring;
 
 import ca.bc.gov.nrs.wfone.common.persistence.code.dao.CodeHierarchyConfig;
-import ca.bc.gov.nrs.wfone.common.persistence.code.spring.CodePersistenceSpringConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;

farms-api/farms-service-api/src/main/java/ca/bc/gov/farms/service/api/v1/spring/CodePersistenceSpringConfig.java

@@ -0,0 +1,41 @@
+package ca.bc.gov.farms.service.api.v1.spring;
+
+import javax.sql.DataSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import ca.bc.gov.farms.persistence.v1.dao.jdbc.CodeTableDaoImpl;
+import ca.bc.gov.nrs.wfone.common.persistence.code.dao.CodeHierarchyDao;
+import ca.bc.gov.nrs.wfone.common.persistence.code.dao.CodeTableDao;
+import ca.bc.gov.nrs.wfone.common.persistence.code.dao.jdbc.CodeHierarchyDaoImpl;
+
+@Configuration
+public class CodePersistenceSpringConfig {
+
+    @Autowired
+    @Qualifier("codeTableDataSource")
+    DataSource dataSource;
+
+    @Bean
+    public CodeTableDao codeTableDao() {
+        CodeTableDaoImpl result;
+
+        result = new CodeTableDaoImpl();
+        result.setDataSource(dataSource);
+
+        return result;
+    }
+
+    @Bean
+    public CodeHierarchyDao codeHierarchyDao() {
+        CodeHierarchyDaoImpl result;
+
+        result = new CodeHierarchyDaoImpl();
+        result.setDataSource(dataSource);
+
+        return result;
+    }
+}

farms-api/farms-service-api/src/main/java/ca/bc/gov/farms/service/api/v1/spring/CodeTableSpringConfig.java

@@ -12,7 +12,6 @@
 
 import ca.bc.gov.farms.service.api.v1.util.CachedCodeTables;
 import ca.bc.gov.nrs.wfone.common.persistence.code.dao.CodeTableConfig;
-import ca.bc.gov.nrs.wfone.common.persistence.code.spring.CodePersistenceSpringConfig;
 
 @Configuration
 @Import({