Sorted out the Code Structure.

landy8530 · landy8530 · commit 36f1f49a0b3f · 2019-05-18T20:21:31.000+08:00
diff --git a/design-patterns-business/src/main/java/org/landy/business/domain/detail/CustomerRequestDetail.java b/design-patterns-business/src/main/java/org/landy/business/domain/detail/CustomerRequestDetail.java
@@ -1,6 +1,6 @@
 package org.landy.business.domain.detail;
 
-public class PolicyRequestDetail extends RequestDetail {
+public class CustomerRequestDetail extends RequestDetail {
 
     private String parentCarrierId;
     private String applicationId;
diff --git a/design-patterns-business/src/main/java/org/landy/business/domain/file/CustomerRequestFile.java b/design-patterns-business/src/main/java/org/landy/business/domain/file/CustomerRequestFile.java
@@ -1,6 +1,6 @@
 package org.landy.business.domain.file;
 
-import org.landy.business.domain.detail.PolicyRequestDetail;
+import org.landy.business.domain.detail.CustomerRequestDetail;
 import org.landy.business.enums.WorkflowEnum;
 import org.landy.constants.Constants;
 
@@ -11,17 +11,17 @@
  * @author landyl
  * @create 9:46 AM 05/08/2018
  */
-public class PolicyRequestFile extends RequestFile<PolicyRequestDetail> {
+public class CustomerRequestFile extends RequestFile<CustomerRequestDetail> {
 
     public static final String[] policyDetailHeaders = {
-            "ROW_NUMBER", "SYSTEM_SOURCE", "SYSTEM_SOURCE_ID", "MEMBER_NUMBER",
+            "ROW_NUMBER", "MEMBER_NUMBER",
             "IS_ACTIVE", "IS_REVERSED","NOT_CANCELLED","GENDER","BUSINESS_LINE","MEMBER_COUNT"
     };
 
-    private List<PolicyRequestDetail> requestPolicyDetails;
+    private List<CustomerRequestDetail> requestPolicyDetails;
 
     @Override
-    public List<PolicyRequestDetail> getRequestDetails() {
+    public List<CustomerRequestDetail> getRequestDetails() {
         return getRequestPolicyDetails();
     }
 
@@ -35,11 +35,11 @@ public WorkflowEnum getProcessWorkFlow() {
         return WorkflowEnum.POLICY;
     }
 
-    private List<PolicyRequestDetail> getRequestPolicyDetails() {
+    private List<CustomerRequestDetail> getRequestPolicyDetails() {
         if (requestPolicyDetails == null) {
             List<String> detailLines = getDetailLines();
             if (detailLines == null) return null;
-            PolicyRequestDetail detail;
+            CustomerRequestDetail detail;
             requestPolicyDetails = new ArrayList<>();
             for (String detailLine : detailLines) {
                 detail = parseDetailLinesToRequestPolicyDetail(detailLine);
@@ -50,8 +50,8 @@ private List<PolicyRequestDetail> getRequestPolicyDetails() {
         return requestPolicyDetails;
     }
 
-    private PolicyRequestDetail parseDetailLinesToRequestPolicyDetail(String detailLine) {
-        PolicyRequestDetail detail = new PolicyRequestDetail();
+    private CustomerRequestDetail parseDetailLinesToRequestPolicyDetail(String detailLine) {
+        CustomerRequestDetail detail = new CustomerRequestDetail();
         String[] detailValues = detailLine.split(Constants.DELIMITER_PIPE);
         parseToDetail(detail,detailValues);
         return detail;
diff --git a/design-patterns-business/src/main/java/org/landy/business/domain/file/XHFRequestFile.java b/design-patterns-business/src/main/java/org/landy/business/domain/file/XHFRequestFile.java
@@ -13,15 +13,15 @@
  */
 public class XHFRequestFile extends RequestFile<XHFRequestDetail> {
     public static final String[] xhfDetailHeaders = {
-            "ROW_NUMBER", "SYSTEM_SOURCE", "SYSTEM_SOURCE_ID","MEMBER_NUMBER"
-
+            "ROW_NUMBER", "SYSTEM_SOURCE", "SYSTEM_SOURCE_ID","MEMBER_NUMBER",
+            "IS_ACTIVE", "IS_REVERSED","NOT_CANCELLED","GENDER"
     };
 
-    private List<XHFRequestDetail> requestBOBDetails;
+    private List<XHFRequestDetail> requestXHFDetails;
 
     @Override
     public List<XHFRequestDetail> getRequestDetails() {
-        return getRequestBOBDetails();
+        return getRequestXHFDetails();
     }
 
     @Override
@@ -34,21 +34,21 @@ public WorkflowEnum getProcessWorkFlow() {
         return WorkflowEnum.XHF;
     }
 
-    private List<XHFRequestDetail> getRequestBOBDetails() {
-        if (requestBOBDetails == null) {
+    private List<XHFRequestDetail> getRequestXHFDetails() {
+        if (requestXHFDetails == null) {
             List<String> detailLines = getDetailLines();
 
             if (detailLines == null) return null;
 
             XHFRequestDetail detail;
-            requestBOBDetails = new ArrayList<>();
+            requestXHFDetails = new ArrayList<>();
             for (String detailLine : detailLines) {
                 detail = parseDetailLinesToRequestBOBDetail(detailLine);
-                requestBOBDetails.add(detail);
+                requestXHFDetails.add(detail);
             }
         }
 
-        return requestBOBDetails;
+        return requestXHFDetails;
     }
 
     private XHFRequestDetail parseDetailLinesToRequestBOBDetail(String detailLine) {
diff --git a/design-patterns-business/src/main/java/org/landy/business/validation/CustomerRequestValidation.java b/design-patterns-business/src/main/java/org/landy/business/validation/CustomerRequestValidation.java
@@ -1,7 +1,7 @@
 package org.landy.business.validation;
 
 import org.apache.commons.lang.StringUtils;
-import org.landy.business.domain.detail.PolicyRequestDetail;
+import org.landy.business.domain.detail.CustomerRequestDetail;
 import org.landy.business.domain.file.RequestFile;
 import org.landy.business.enums.WorkflowEnum;
 import org.landy.constants.Constants;
@@ -15,9 +15,9 @@
  * @author landyl
  * @create 2:31 PM 05/07/2018
  */
-@Component(value = PolicyRequestValidation.BEAN_NAME)
-public class PolicyRequestValidation extends AbstractRequestValidation {
-    public static final String BEAN_NAME = "policyRequestValidation";
+@Component(value = CustomerRequestValidation.BEAN_NAME)
+public class CustomerRequestValidation extends AbstractRequestValidation {
+    public static final String BEAN_NAME = "customerRequestValidation";
 
     @Override
     protected String validateFileName(String fileName) {
@@ -53,7 +53,7 @@ protected String validateFileName(String fileName) {
 
     @Override
     protected StringBuilder validateFileDetails(StringBuilder errMsg, RequestFile requestFile) {
-        List<PolicyRequestDetail> requestPolicyDetails = requestFile.getRequestDetails();
+        List<CustomerRequestDetail> requestPolicyDetails = requestFile.getRequestDetails();
         if (requestPolicyDetails == null || requestPolicyDetails.size() == 0) {
             return errMsg.append(" No update details were provided on the request.");
         }
@@ -88,7 +88,7 @@ protected String accessBeanName() {
         return BEAN_NAME;
     }
 
-    private String validatePolicyDetail(PolicyRequestDetail requestDetail,RequestFile requestFile) {
+    private String validatePolicyDetail(CustomerRequestDetail requestDetail, RequestFile requestFile) {
         return super.validateDetail(requestDetail,requestFile);
     }
 
diff --git a/design-patterns-business/src/main/java/org/landy/business/validation/detail/customer/BusinessLineValidator.java b/design-patterns-business/src/main/java/org/landy/business/validation/detail/customer/BusinessLineValidator.java
@@ -1,7 +1,7 @@
 package org.landy.business.validation.detail.customer;
 
-import org.landy.business.domain.detail.PolicyRequestDetail;
-import org.landy.business.domain.file.PolicyRequestFile;
+import org.landy.business.domain.detail.CustomerRequestDetail;
+import org.landy.business.domain.file.CustomerRequestFile;
 import org.landy.business.validation.Validator;
 import org.landy.business.validation.ValidatorChain;
 import org.landy.business.validation.ValidatorConstants;
@@ -14,9 +14,9 @@
  * @create 2:57 PM 05/09/2018
  */
 @Component(ValidatorConstants.BEAN_NAME_CUSTOMER_BUSINESS_LINE)
-public class BusinessLineValidator implements Validator<PolicyRequestDetail,PolicyRequestFile> {
+public class BusinessLineValidator implements Validator<CustomerRequestDetail, CustomerRequestFile> {
 
-    public String doValidate(PolicyRequestDetail detail, PolicyRequestFile file, ValidatorChain chain) throws BusinessValidationException {
+    public String doValidate(CustomerRequestDetail detail, CustomerRequestFile file, ValidatorChain chain) throws BusinessValidationException {
         String result = validateBusinessLineLogic(detail);
 
         if(!Constants.VALID.equals(result)){
@@ -26,7 +26,7 @@ public String doValidate(PolicyRequestDetail detail, PolicyRequestFile file, Val
         return chain.doValidate(detail,file);
     }
 
-    private String validateBusinessLineLogic(PolicyRequestDetail detail) {
+    private String validateBusinessLineLogic(CustomerRequestDetail detail) {
         if(detail.getBusinessLine() == null || detail.getBusinessLine().trim().isEmpty()){
             return "BusinessLine is required!";
         }
diff --git a/design-patterns-business/src/main/java/org/landy/business/validation/detail/customer/ConstrainedColumnValidator.java b/design-patterns-business/src/main/java/org/landy/business/validation/detail/customer/ConstrainedColumnValidator.java
@@ -1,10 +1,11 @@
 package org.landy.business.validation.detail.customer;
 
-import org.landy.business.domain.detail.PolicyRequestDetail;
-import org.landy.business.domain.file.PolicyRequestFile;
+import org.landy.business.domain.detail.CustomerRequestDetail;
+import org.landy.business.domain.file.CustomerRequestFile;
 import org.landy.business.validation.Validator;
 import org.landy.business.validation.ValidatorChain;
 import org.landy.business.validation.ValidatorConstants;
+import org.landy.business.validation.handler.CustomerValidatorHandler;
 import org.landy.business.validation.util.ValidatorUtil;
 import org.landy.exception.BusinessValidationException;
 import org.landy.web.utils.ApplicationUtil;
@@ -17,20 +18,20 @@
 
 /**
  * 所有的约束字段校验器需要在此校验器中进行逐一进行校验操作，校验的结果，如果不是合法字段，则需要把该字段赋值未NULL，或者默认值。
- * 故而，在执行统一校验操作的时候，需要先把约束字段校验器进行排除（PolicyValidatorHandler），在这个类加入。
+ * 故而，在执行统一校验操作的时候，需要先把约束字段校验器进行排除（CustomerValidatorHandler），在这个类加入。
  * @author landyl
- * @see org.landy.business.validation.handler.PolicyValidatorHandler
+ * @see CustomerValidatorHandler
  * @create 14:03 05/18/2019
  */
 @Component(ValidatorConstants.BEAN_NAME_CONSTRAINED_COLUMN)
-public class ConstrainedColumnValidator implements Validator<PolicyRequestDetail,PolicyRequestFile> {
+public class ConstrainedColumnValidator implements Validator<CustomerRequestDetail, CustomerRequestFile> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ConstrainedColumnValidator.class);
     //约束字段校验器集合
     private static final Map<String, Class> CONSTRAINED_COLUMN_VALIDATOR_MAP = ValidatorUtil.constrainedColumnValidatorClassMap();
 
     @Override
-    public String doValidate(PolicyRequestDetail detail,PolicyRequestFile file, ValidatorChain chain) throws BusinessValidationException {
+    public String doValidate(CustomerRequestDetail detail, CustomerRequestFile file, ValidatorChain chain) throws BusinessValidationException {
         Set<String> beanNameSet = CONSTRAINED_COLUMN_VALIDATOR_MAP.keySet();
 
         for (String beanName : beanNameSet) {
diff --git a/design-patterns-business/src/main/java/org/landy/business/validation/detail/customer/MemberCountValidator.java b/design-patterns-business/src/main/java/org/landy/business/validation/detail/customer/MemberCountValidator.java
@@ -1,8 +1,8 @@
 package org.landy.business.validation.detail.customer;
 
 import org.apache.commons.lang.StringUtils;
-import org.landy.business.domain.detail.PolicyRequestDetail;
-import org.landy.business.domain.file.PolicyRequestFile;
+import org.landy.business.domain.detail.CustomerRequestDetail;
+import org.landy.business.domain.file.CustomerRequestFile;
 import org.landy.business.validation.Validator;
 import org.landy.business.validation.ValidatorChain;
 import org.landy.business.validation.ValidatorConstants;
@@ -15,9 +15,9 @@
  * @create 2:57 PM 05/09/2018
  */
 @Component(ValidatorConstants.BEAN_NAME_CUSTOMER_MEMBER_COUNT)
-public class MemberCountValidator implements Validator<PolicyRequestDetail,PolicyRequestFile> {
+public class MemberCountValidator implements Validator<CustomerRequestDetail, CustomerRequestFile> {
 
-    public String doValidate(PolicyRequestDetail detail, PolicyRequestFile file, ValidatorChain chain) throws BusinessValidationException {
+    public String doValidate(CustomerRequestDetail detail, CustomerRequestFile file, ValidatorChain chain) throws BusinessValidationException {
         if (!isValidMemberCount(detail.getMemberCount())) {
             return "An invalid User count was provided. Accepted Value(s): 0 - 10.";
         }
diff --git a/design-patterns-business/src/main/java/org/landy/business/validation/handler/CustomerValidatorHandler.java b/design-patterns-business/src/main/java/org/landy/business/validation/handler/CustomerValidatorHandler.java
@@ -11,9 +11,9 @@
  * @author landyl
  * @create 11:16 AM 05/09/2018
  */
-@Component(PolicyValidatorHandler.BEAN_NAME)
-public class PolicyValidatorHandler extends AbstractValidatorHandler {
-    public static final String BEAN_NAME = "policyValidatorHandler";
+@Component(CustomerValidatorHandler.BEAN_NAME)
+public class CustomerValidatorHandler extends AbstractValidatorHandler {
+    public static final String BEAN_NAME = "customerValidatorHandler";
 
     @Override
     protected WorkflowEnum getWorkflowId() {
@@ -24,7 +24,7 @@ protected WorkflowEnum getWorkflowId() {
     protected Set<String> getBasePackages() {
         Set<String> packages = new HashSet<>();
         packages.add("org.landy.business.validation.detail.customer");
-        packages.add("org.landy.business.validation.detail.component");
+        packages.add("org.landy.business.validation.detail.common");
         return packages;
     }
 
diff --git a/design-patterns-business/src/main/java/org/landy/business/validation/handler/XHFValidatorHandler.java b/design-patterns-business/src/main/java/org/landy/business/validation/handler/XHFValidatorHandler.java
@@ -23,7 +23,7 @@ protected WorkflowEnum getWorkflowId() {
     protected Set<String> getBasePackages() {
         Set<String> packages = new HashSet<>();
         packages.add("org.landy.business.validation.detail.xhf");
-        packages.add("org.landy.business.validation.detail.component");
+        packages.add("org.landy.business.validation.detail.common");
         return packages;
     }
 
diff --git a/design-patterns-business/src/main/java/org/landy/business/validation/util/ValidatorUtil.java b/design-patterns-business/src/main/java/org/landy/business/validation/util/ValidatorUtil.java
@@ -1,6 +1,6 @@
 package org.landy.business.validation.util;
 
-import org.landy.business.domain.detail.PolicyRequestDetail;
+import org.landy.business.domain.detail.CustomerRequestDetail;
 import org.landy.business.validation.ValidatorConstants;
 import org.landy.business.validation.detail.common.GenderValidator;
 import org.landy.business.validation.detail.common.IsActiveValidator;
@@ -75,8 +75,8 @@ public static String getConstrainedColumnName(String beanName) {
         return Constants.EMPTY_STRING;
     }
 
-    public static void setNullIfInvalid(PolicyRequestDetail detail, String columnName) {
-        Field dataField = ReflectionUtils.findField(PolicyRequestDetail.class,columnName);
+    public static void setNullIfInvalid(CustomerRequestDetail detail, String columnName) {
+        Field dataField = ReflectionUtils.findField(CustomerRequestDetail.class,columnName);
         ReflectionUtils.makeAccessible(dataField);
         ReflectionUtils.setField(dataField,detail,null);
     }
diff --git a/design-patterns-business/src/test/java/business/validator/RequestValidatorTest.java b/design-patterns-business/src/test/java/business/validator/RequestValidatorTest.java
@@ -4,7 +4,7 @@
 import org.junit.Test;
 import org.landy.business.RequestValidator;
 import org.landy.business.domain.file.XHFRequestFile;
-import org.landy.business.domain.file.PolicyRequestFile;
+import org.landy.business.domain.file.CustomerRequestFile;
 import org.landy.business.domain.file.RequestFile;
 import org.landy.constants.Constants;
 import test.SpringTestBase;
@@ -30,9 +30,10 @@ public void testValidation() throws IOException {
         String filePath = FileUtil.getFilePathByClassPath("/org/landy/business");
 //        String fileName = "test_20180517_102637_324.txt";
         String fileName = "xhf_customer_20190518_101705_2.txt";
+//        String fileName = "xhf_integration_20190518_101705_2.txt";
         RequestFile requestFile;
         if (fileName.startsWith("xhf_customer_")) {
-            requestFile = new PolicyRequestFile();
+            requestFile = new CustomerRequestFile();
         } else {
             requestFile = new XHFRequestFile();
         }
diff --git a/design-patterns-business/src/test/resources/org/landy/business/xhf_customer_20190518_101705_2.txt b/design-patterns-business/src/test/resources/org/landy/business/xhf_customer_20190518_101705_2.txt
@@ -3,6 +3,6 @@ ISSUE_ID: XHF-2785
 UPDATES: ON
 PROCESS_DATE: 7/16/2018
 
-ROW_NUMBER|SYSTEM_SOURCE|SYSTEM_SOURCE_ID|MEMBER_NUMBER|IS_ACTIVE|IS_REVERSED|NOT_CANCELLED|GENDER|BUSINESS_LINE|MEMBER_COUNT
-1|4|11839498|1|1|3|1|M|2|1
-2|3|11839498|1|1|1|1|M|1|1
+ROW_NUMBER|MEMBER_NUMBER|IS_ACTIVE|IS_REVERSED|NOT_CANCELLED|GENDER|BUSINESS_LINE|MEMBER_COUNT
+1|1|1|3|1|M|2|1
+2|1|1|1|1|M|1|1
diff --git a/design-patterns-business/src/test/resources/org/landy/business/xhf_integration_20180716_101705_2.txt b/design-patterns-business/src/test/resources/org/landy/business/xhf_integration_20180716_101705_2.txt
diff --git a/design-patterns-business/src/test/resources/org/landy/business/xhf_integration_20190518_101705_2.txt b/design-patterns-business/src/test/resources/org/landy/business/xhf_integration_20190518_101705_2.txt
@@ -0,0 +1,8 @@
+NETWORK_ID: landyl
+ISSUE_ID: XHF-2785
+UPDATES: ON
+PROCESS_DATE: 7/16/2018
+
+ROW_NUMBER|SYSTEM_SOURCE|SYSTEM_SOURCE_ID|MEMBER_NUMBER|IS_ACTIVE|IS_REVERSED|NOT_CANCELLED|GENDER
+1|4|11839498|1|1|1|1|M
+2|3|11839498|1|1|3|1|M

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ protected WorkflowEnum getWorkflowId() {`
`23`	`23`	`protected Set<String> getBasePackages() {`
`24`	`24`	`Set<String> packages = new HashSet<>();`
`25`	`25`	`packages.add("org.landy.business.validation.detail.xhf");`
`26`		`- packages.add("org.landy.business.validation.detail.component");`
	`26`	`+ packages.add("org.landy.business.validation.detail.common");`
`27`	`27`	`return packages;`
`28`	`28`	`}`
`29`	`29`