Add Pojo Validations CamundaBeans

Change-Id: I17fdca41929f4ba237721d65dcf5e92a2becdfd7

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

diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBooleanInput.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBooleanInput.java
index 4c25bf7..07b72f0 100644 (file)
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBooleanInput.java
+++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBooleanInput.java
@@ -35,7 +35,7 @@ public class CamundaBooleanInput {
     @JsonProperty(CommonConstants.CAMUNDA_VALUE)
     private boolean value;
     @JsonProperty(CommonConstants.CAMUNDA_TYPE)
-    private String type = "Boolean";
+    private final String type = "Boolean";
 
 
     public CamundaBooleanInput() {

diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBpmnRequestInput.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBpmnRequestInput.java
index 62f09d1..e93e6c1 100644 (file)
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBpmnRequestInput.java
+++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaBpmnRequestInput.java
@@ -33,7 +33,7 @@ public class CamundaBpmnRequestInput {
     @JsonProperty(CommonConstants.CAMUNDA_VALUE)
     private BpmnRequest value;
     @JsonProperty(CommonConstants.CAMUNDA_TYPE)
-    private String type = "String";
+    private final String type = "String";
 
 
     public CamundaBpmnRequestInput() {

diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaInput.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaInput.java
index 1eff527..07a3fa4 100644 (file)
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaInput.java
+++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaInput.java
@@ -37,7 +37,7 @@ public class CamundaInput {
        @JsonProperty(CommonConstants.CAMUNDA_VALUE)
        private String value;
        @JsonProperty(CommonConstants.CAMUNDA_TYPE)
-       private String type = "String";
+       private final String type = "String";
 
 
        public CamundaInput() {

diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaIntegerInput.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaIntegerInput.java
index d3039c4..9a1bbca 100644 (file)
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaIntegerInput.java
+++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/openecomp/mso/apihandler/camundabeans/CamundaIntegerInput.java
@@ -33,7 +33,7 @@ public class CamundaIntegerInput {
     @JsonProperty(CommonConstants.CAMUNDA_VALUE)
     private int value;
     @JsonProperty(CommonConstants.CAMUNDA_TYPE)
-    private String type = "Integer";
+    private final String type = "Integer";
 
 
     public CamundaIntegerInput() {

diff --git a/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/apihandler/camundabeans/BeansTest.java b/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/apihandler/camundabeans/BeansTest.java
new file mode 100644 (file)
index 0000000..f9d7f87
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-common/src/test/java/org/openecomp/mso/apihandler/camundabeans/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.apihandler.camundabeans;
+
+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.apihandler.camundabeans");                                      
+       }
+
+       private void test(String pojoPackage) {
+               Validator validator = ValidatorBuilder.create()
+                               
+                               
+                               
+                        
+                               .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/");
+               }
+       }
+}