Added OpenPojo Validations to beans

Change-Id: I34d8922a55b1ba35610ad0856dcd3363fa016785
Issue-ID: SO-516
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/StartStopAction.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/StartStopAction.java
index 6ef822f..988c282 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/StartStopAction.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/appc/payload/beans/StartStopAction.java
@@ -26,20 +26,30 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 \r
 @JsonInclude(JsonInclude.Include.NON_NULL)\r
 @JsonPropertyOrder({\r
-" AICIdentity "\r
+       " AICIdentity "\r
 })\r
 public class StartStopAction {\r
 \r
-@JsonProperty(" AICIdentity ")\r
-private String aICIdentity;\r
+       @JsonProperty(" AICIdentity ")\r
+       private String aICIdentity;\r
 \r
-@JsonProperty(" AICIdentity ")\r
-public String getAICIdentity() {\r
-return aICIdentity;\r
-}\r
+       @JsonProperty(" AICIdentity ")\r
+       public String getAICIdentity() {\r
+               return aICIdentity;\r
+       }\r
+\r
+       @JsonProperty(" AICIdentity ")\r
+       public void setAICIdentity(String aICIdentity) {\r
+               this.aICIdentity = aICIdentity;\r
+       }
+
+       public String getaICIdentity() {
+               return aICIdentity;
+       }
+
+       public void setaICIdentity(String aICIdentity) {
+               this.aICIdentity = aICIdentity;
+       }
+
 \r
-@JsonProperty(" AICIdentity ")\r
-public void setAICIdentity(String aICIdentity) {\r
-this.aICIdentity = aICIdentity;\r
-}\r
 }
\ No newline at end of file

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BeansTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BeansTest.java
new file mode 100644 (file)
index 0000000..358ebfa
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/BeansTest.java
@@ -0,0 +1,75 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.bpmn.common;
+
+import org.junit.Test;
+
+import com.openpojo.validation.Validator;
+import com.openpojo.validation.ValidatorBuilder;
+import com.openpojo.validation.rule.impl.GetterMustExistRule;
+import com.openpojo.validation.rule.impl.SetterMustExistRule;
+import com.openpojo.validation.test.impl.GetterTester;
+import com.openpojo.validation.test.impl.SetterTester;
+import com.openpojo.reflection.PojoClass;
+import com.openpojo.reflection.PojoClassFilter;
+import com.openpojo.reflection.filters.FilterEnum;
+import com.openpojo.reflection.filters.FilterNonConcrete;
+import com.openpojo.reflection.filters.FilterPackageInfo;
+import org.openecomp.mso.openpojo.rules.HasToStringRule;
+import org.openecomp.mso.openpojo.rules.ToStringTester;
+
+public class BeansTest {
+
+
+       private PojoClassFilter filterTestClasses = new FilterTestClasses();
+       
+       private PojoClassFilter  enumFilter = new FilterEnum();
+       
+
+       @Test
+       public void pojoStructure() {   
+               test("org.openecomp.mso.bpmn.appc.payload.beans");              
+               test("org.openecomp.mso.client.sdnc.beans");    
+       }
+
+       private void test(String pojoPackage) {
+               Validator validator = ValidatorBuilder.create()
+                               .with(new GetterMustExistRule())
+                               .with(new SetterMustExistRule())
+                               
+                               .with(new SetterTester())
+                               .with(new GetterTester())
+                        
+                               .with(new SetterTester())
+                               .with(new GetterTester())       
+                               .with(new ToStringTester())
+                            
+                               .build();
+               
+       
+               validator.validate(pojoPackage, new FilterPackageInfo(), filterTestClasses,enumFilter,new FilterNonConcrete());
+       }
+       private static class FilterTestClasses implements PojoClassFilter {
+               public boolean include(PojoClass pojoClass) {
+                       return !pojoClass.getSourcePath().contains("/test-classes/");
+               }
+       }
+}

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/BeansTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/BeansTest.java
new file mode 100644 (file)
index 0000000..723639c
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/BeansTest.java
@@ -0,0 +1,72 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.bpmn.infrastructure;
+
+import org.junit.Test;
+
+import com.openpojo.validation.Validator;
+import com.openpojo.validation.ValidatorBuilder;
+import com.openpojo.validation.rule.impl.GetterMustExistRule;
+import com.openpojo.validation.rule.impl.SetterMustExistRule;
+import com.openpojo.validation.test.impl.GetterTester;
+import com.openpojo.validation.test.impl.SetterTester;
+import com.openpojo.reflection.PojoClass;
+import com.openpojo.reflection.PojoClassFilter;
+import com.openpojo.reflection.filters.FilterEnum;
+import com.openpojo.reflection.filters.FilterNonConcrete;
+import com.openpojo.reflection.filters.FilterPackageInfo;
+
+
+public class BeansTest {
+
+
+       private PojoClassFilter filterTestClasses = new FilterTestClasses();
+       
+       private PojoClassFilter  enumFilter = new FilterEnum();
+       
+
+       @Test
+       public void pojoStructure() {   
+               test("org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.entity");               
+       }
+
+       private void test(String pojoPackage) {         
+               Validator validator = ValidatorBuilder.create()
+                               .with(new GetterMustExistRule())
+                               .with(new SetterMustExistRule())
+                               
+                               .with(new SetterTester())
+                               .with(new GetterTester())                        
+                               .with(new SetterTester())
+                               .with(new GetterTester())       
+                                                    
+                               .build();
+
+
+               validator.validate(pojoPackage, new FilterPackageInfo(), filterTestClasses,enumFilter,new FilterNonConcrete());
+       }
+       
+       private static class FilterTestClasses implements PojoClassFilter {
+               public boolean include(PojoClass pojoClass) {
+                       return !pojoClass.getSourcePath().contains("/test-classes/");
+               }
+       }
+}