1 files changed, 47 insertions, 51 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/licenseartifacts/impl/types/VnfLicenseArtifact.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/licenseartifacts/impl/types/VnfLicenseArtifact.java
index 91a73b6377..1686b9631d 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/licenseartifacts/impl/types/VnfLicenseArtifact.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/licenseartifacts/impl/types/VnfLicenseArtifact.java
@@ -7,9 +7,9 @@
  * 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.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.vendorlicense.licenseartifacts.impl.types;
 
 import com.ctc.wstx.api.WstxInputProperties;
@@ -29,6 +28,11 @@ import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
 import org.openecomp.sdc.vendorlicense.dao.types.EntitlementPoolEntity;
 import org.openecomp.sdc.vendorlicense.dao.types.FeatureGroupModel;
 import org.openecomp.sdc.vendorlicense.dao.types.LicenseKeyGroupEntity;
@@ -38,63 +42,55 @@ import org.openecomp.sdc.vendorlicense.licenseartifacts.impl.types.mixins.MixinF
 import org.openecomp.sdc.vendorlicense.licenseartifacts.impl.types.mixins.MixinLicenseKeyGroupEntityForVnfArtifact;
 import org.openecomp.sdc.vendorlicense.licenseartifacts.impl.types.mixins.MixinLimitArtifact;
 
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.List;
-
 @JacksonXmlRootElement(localName = "vf-license-model",
     namespace = "http://xmlns.openecomp.org/asdc/license-model/1.0")
 public class VnfLicenseArtifact extends XmlArtifact {
-  @JsonProperty(value = "vendor-name")
-  String vendorName;
-  @JsonProperty(value = "vf-id")
-  String vspId;
-  List<FeatureGroupModel> featureGroups = new ArrayList<>();
-
-  public String getVspId() {
-    return vspId;
-  }
-
-  public void setVspId(String vspId) {
-    this.vspId = vspId;
-  }
 
-  public String getVendorName() {
-    return vendorName;
-  }
+    @JsonProperty(value = "vendor-name")
+    String vendorName;
+    @JsonProperty(value = "vf-id")
+    String vspId;
+    List<FeatureGroupModel> featureGroups = new ArrayList<>();
 
-  public void setVendorName(String vendorName) {
-    this.vendorName = vendorName;
-  }
+    public String getVspId() {
+        return vspId;
+    }
 
-  @JacksonXmlProperty(isAttribute = false, localName = "feature-group")
-  @JacksonXmlElementWrapper(localName = "feature-group-list")
-  public List<FeatureGroupModel> getFeatureGroups() {
-    return featureGroups;
-  }
+    public void setVspId(String vspId) {
+        this.vspId = vspId;
+    }
 
-  public void setFeatureGroups(List<FeatureGroupModel> featureGroups) {
-    this.featureGroups = featureGroups;
-  }
+    public String getVendorName() {
+        return vendorName;
+    }
 
-  void initMapper() {
-    WstxOutputFactory wstxOutputFactory = new WstxOutputFactory() {
-      @Override
-      public XMLStreamWriter createXMLStreamWriter(Writer writer) throws XMLStreamException {
-        mConfig.setProperty(WstxInputProperties.P_RETURN_NULL_FOR_DEFAULT_NAMESPACE, true);
-        return super.createXMLStreamWriter(writer);
-      }
-    };
-    XmlFactory factory = new XmlFactory(new WstxInputFactory(), wstxOutputFactory);
+    public void setVendorName(String vendorName) {
+        this.vendorName = vendorName;
+    }
 
-    xmlMapper = new XmlMapper(factory);
+    @JacksonXmlProperty(isAttribute = false, localName = "feature-group")
+    @JacksonXmlElementWrapper(localName = "feature-group-list")
+    public List<FeatureGroupModel> getFeatureGroups() {
+        return featureGroups;
+    }
 
+    public void setFeatureGroups(List<FeatureGroupModel> featureGroups) {
+        this.featureGroups = featureGroups;
+    }
 
-    xmlMapper.addMixIn(EntitlementPoolEntity.class, MixinEntitlementPoolEntityForVnfArtifact.class);
-    xmlMapper.addMixIn(LicenseKeyGroupEntity.class, MixinLicenseKeyGroupEntityForVnfArtifact.class);
-    xmlMapper.addMixIn(FeatureGroupModel.class, MixinFeatureGroupModel.class);
-    xmlMapper.addMixIn(LimitXml.class, MixinLimitArtifact.class);
-  }
+    void initMapper() {
+        WstxOutputFactory wstxOutputFactory = new WstxOutputFactory() {
+            @Override
+            public XMLStreamWriter createXMLStreamWriter(Writer writer) throws XMLStreamException {
+                mConfig.setProperty(WstxInputProperties.P_RETURN_NULL_FOR_DEFAULT_NAMESPACE, true);
+                return super.createXMLStreamWriter(writer);
+            }
+        };
+        XmlFactory factory = new XmlFactory(new WstxInputFactory(), wstxOutputFactory);
+        xmlMapper = new XmlMapper(factory);
+        xmlMapper.addMixIn(EntitlementPoolEntity.class, MixinEntitlementPoolEntityForVnfArtifact.class);
+        xmlMapper.addMixIn(LicenseKeyGroupEntity.class, MixinLicenseKeyGroupEntityForVnfArtifact.class);
+        xmlMapper.addMixIn(FeatureGroupModel.class, MixinFeatureGroupModel.class);
+        xmlMapper.addMixIn(LimitXml.class, MixinLimitArtifact.class);
+    }
 }