Fix linting issues

eclipse · Aug 5, 2020 · 9ba8eee · 9ba8eee
1 parent 8d436d0
commit 9ba8eee
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/...a.canonical/src/main/java/org/eclipse/winery/model/jaxbsupport/map/PropertiesAdapter.java b/...a.canonical/src/main/java/org/eclipse/winery/model/jaxbsupport/map/PropertiesAdapter.java
@@ -57,6 +57,10 @@ private enum PropertyKind {
     @Nullable
     private final NamespacePrefixMapper prefixMapper;
 
+    public PropertiesAdapter() {
+        this.prefixMapper = null;
+    }
+
     public PropertiesAdapter(@Nullable NamespacePrefixMapper prefixMapper) {
         this.prefixMapper = prefixMapper;
     }

diff --git a/...pse.winery.repository.common/src/main/java/org/eclipse/winery/repository/JAXBSupport.java b/...pse.winery.repository.common/src/main/java/org/eclipse/winery/repository/JAXBSupport.java
@@ -13,9 +13,6 @@
  *******************************************************************************/
 package org.eclipse.winery.repository;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
@@ -25,7 +22,6 @@
 import org.eclipse.winery.model.jaxbsupport.map.PropertiesAdapter;
 import org.eclipse.winery.model.selfservice.Application;
 import org.eclipse.winery.model.tosca.TDefinitions;
-import org.eclipse.winery.model.tosca.constants.Namespaces;
 import org.eclipse.winery.model.tosca.extensions.kvproperties.AttributeDefinitions;
 import org.eclipse.winery.model.tosca.extensions.kvproperties.ParameterDefinitions;
 import org.eclipse.winery.model.tosca.extensions.kvproperties.WinerysPropertiesDefinition;
@@ -57,8 +53,8 @@ private static JAXBContext initContext() {
                 WinerysPropertiesDefinition.class,
                 ParameterDefinitions.class,
                 AttributeDefinitions.class,
-                MockXMLElement.class,
                 Application.class,
+                MockXMLElement.class,
             });
                 // MockXMLElement is added for testing purposes only.
         } catch (JAXBException e) {

diff --git a/...itory.xml/src/main/java/org/eclipse/winery/repository/xml/export/XmlModelJAXBSupport.java b/...itory.xml/src/main/java/org/eclipse/winery/repository/xml/export/XmlModelJAXBSupport.java
@@ -22,8 +22,8 @@
 
 import org.eclipse.winery.model.selfservice.Application;
 import org.eclipse.winery.model.tosca.xml.TDefinitions;
-import org.eclipse.winery.model.tosca.extensions.kvproperties.AttributeDefinitionList;
-import org.eclipse.winery.model.tosca.extensions.kvproperties.ParameterDefinitionList;
+import org.eclipse.winery.model.tosca.extensions.kvproperties.AttributeDefinitions;
+import org.eclipse.winery.model.tosca.extensions.kvproperties.ParameterDefinitions;
 import org.eclipse.winery.model.tosca.extensions.kvproperties.WinerysPropertiesDefinition;
 import org.eclipse.winery.repository.backend.MockXMLElement;
 
@@ -51,8 +51,8 @@ private static JAXBContext initContext() {
             context = JAXBContext.newInstance(
                 TDefinitions.class, // all other elements are referred by "@XmlSeeAlso"
                 WinerysPropertiesDefinition.class,
-                ParameterDefinitionList.class,
-                AttributeDefinitionList.class,
+                ParameterDefinitions.class,
+                AttributeDefinitions.class,
                 Application.class,
                 MockXMLElement.class // MockXMLElement is added for testing purposes only.
             );