Added OpenPojo Validations to beans

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

2 files changed, 96 insertions, 11 deletions

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 6ef822fbe1..988c282076 100644
--- 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;
 

 @JsonInclude(JsonInclude.Include.NON_NULL)

 @JsonPropertyOrder({

-" AICIdentity "

+	" AICIdentity "

 })

 public class StartStopAction {

 

-@JsonProperty(" AICIdentity ")

-private String aICIdentity;

+	@JsonProperty(" AICIdentity ")

+	private String aICIdentity;

 

-@JsonProperty(" AICIdentity ")

-public String getAICIdentity() {

-return aICIdentity;

-}

+	@JsonProperty(" AICIdentity ")

+	public String getAICIdentity() {

+		return aICIdentity;

+	}

+

+	@JsonProperty(" AICIdentity ")

+	public void setAICIdentity(String aICIdentity) {

+		this.aICIdentity = aICIdentity;

+	}
+
+	public String getaICIdentity() {
+		return aICIdentity;
+	}
+
+	public void setaICIdentity(String aICIdentity) {
+		this.aICIdentity = aICIdentity;
+	}
+
 

-@JsonProperty(" AICIdentity ")

-public void setAICIdentity(String aICIdentity) {

-this.aICIdentity = aICIdentity;

-}

 }
\ 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
index 0000000000..358ebfa13c
--- /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/");
+		}
+	}
+}