Merge "Fix skipPostInstConf for PNF"

2 files changed, 7 insertions, 7 deletions

diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResourceCustomization.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResourceCustomization.java
index d26ce84505..2e4623d25d 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResourceCustomization.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/PnfResourceCustomization.java
@@ -83,7 +83,7 @@ public class PnfResourceCustomization implements Serializable {
     private String blueprintVersion;
 
     @Column(name = "SKIP_POST_INSTANTIATION_CONFIGURATION")
-    private Boolean skipPostInstConf;
+    private boolean skipPostInstConf;
 
     @Column(name = "CONTROLLER_ACTOR")
     private String controllerActor;
@@ -219,11 +219,11 @@ public class PnfResourceCustomization implements Serializable {
         this.blueprintVersion = blueprintVersion;
     }
 
-    public Boolean isSkipPostInstConf() {
+    public boolean isSkipPostInstConf() {
         return skipPostInstConf;
     }
 
-    public void setSkipPostInstConf(Boolean skipPostInstConf) {
+    public void setSkipPostInstConf(boolean skipPostInstConf) {
         this.skipPostInstConf = skipPostInstConf;
     }
 
diff --git a/mso-catalog-db/src/test/java/org/onap/so/db/catalog/beans/BeansTest.java b/mso-catalog-db/src/test/java/org/onap/so/db/catalog/beans/BeansTest.java
index f710890883..b39a85fb92 100644
--- a/mso-catalog-db/src/test/java/org/onap/so/db/catalog/beans/BeansTest.java
+++ b/mso-catalog-db/src/test/java/org/onap/so/db/catalog/beans/BeansTest.java
@@ -67,10 +67,10 @@ public class BeansTest {
     }
 
     private void test(String pojoPackage) {
-        Validator validator = ValidatorBuilder.create().with(new GetterMustExistRule()).with(new NoPrimitivesRule())
-                .with(new NoNestedClassRule()).with(new NoStaticExceptFinalRule())
-                .with(new SerializableMustHaveSerialVersionUIDRule()).with(new HasToStringRule())
-                .with(new EqualsAndHashCodeTester()).with(new NoPublicFieldsExceptStaticFinalRule())
+        Validator validator = ValidatorBuilder.create().with(new GetterMustExistRule()).with(new NoNestedClassRule())
+                .with(new NoStaticExceptFinalRule()).with(new SerializableMustHaveSerialVersionUIDRule())
+                .with(new HasToStringRule()).with(new EqualsAndHashCodeTester())
+                .with(new NoPublicFieldsExceptStaticFinalRule())
                 .with(new CustomSetterMustExistRule()
                         .exclude(allOf(hasAnnotationPropertyWithValue(Column.class, "updatable", equalTo(false)),
                                 hasAnnotation(GeneratedValue.class)), hasAnnotation(Temporal.class)))