Fix Reviews

eclipse · Sep 4, 2018 · 354f643 · 354f643
1 parent 437685d
commit 354f643
Show file tree

Hide file tree

Showing 71 changed files with 137 additions and 146 deletions.
diff --git a/...lity/src/test/java/org/eclipse/winery/accountability/storage/swarm/SwarmProviderTest.java b/...lity/src/test/java/org/eclipse/winery/accountability/storage/swarm/SwarmProviderTest.java
@@ -1,7 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0, or the Apache Software License 2.0
+ * which is available at https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+ *******************************************************************************/
 package org.eclipse.winery.accountability.storage.swarm;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
 
 import org.eclipse.winery.accountability.storage.ImmutableStorageProvider;
@@ -12,52 +26,35 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-/*******************************************************************************
- * Copyright (c) 2018 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0, or the Apache Software License 2.0
- * which is available at https://www.apache.org/licenses/LICENSE-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
- *******************************************************************************/
 class SwarmProviderTest {
-    
+
     private static final Logger LOGGER = LoggerFactory.getLogger(SwarmProviderTest.class);
-    
+
     @Test
-    public void testStorageAndRetrieval() {
+    public void testStorageAndRetrieval() throws ExecutionException, InterruptedException {
 
         final String dataToStore = "This a string intended for testing!";
         ImmutableStorageProvider swarm = ImmutableStorageProviderFactory
             .getStorageProvider(ImmutableStorageProviderFactory.AvailableImmutableStorages.TEST, null);
         assertNotNull(swarm);
-        try {
-            swarm
-                .store(dataToStore.getBytes(Charset.defaultCharset()))
-                .thenCompose((hash)-> {
-                    LOGGER.debug("retrieved hash is: {}", hash);
-                    return swarm.retrieve(hash);
-                })
-                .thenAccept((bytes)-> {
-                    try {
-                        String receivedMsg = IOUtils.toString(bytes, Charset.defaultCharset().name()); 
-                        LOGGER.debug("retrieved msg is: {}", receivedMsg);
-                        assertEquals(dataToStore, receivedMsg);
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                })
-                .get();
-        } catch ( InterruptedException | ExecutionException ignored) {
-
-        }
+        swarm
+            .store(dataToStore.getBytes(Charset.defaultCharset()))
+            .thenCompose((hash) -> {
+                LOGGER.debug("retrieved hash is: {}", hash);
+                return swarm.retrieve(hash);
+            })
+            .thenAccept((bytes) -> {
+                try {
+                    String receivedMsg = IOUtils.toString(bytes, Charset.defaultCharset().name());
+                    LOGGER.debug("retrieved msg is: {}", receivedMsg);
+                    assertEquals(dataToStore, receivedMsg);
+                } catch (IOException e) {
+                    throw new CompletionException(e);
+                }
+            })
+            .get();
     }
-
 }
diff --git a/...tafile/src/main/java/org/eclipse/winery/model/csar/toscametafile/TOSCAMetaFileParser.java b/...tafile/src/main/java/org/eclipse/winery/model/csar/toscametafile/TOSCAMetaFileParser.java
@@ -85,14 +85,14 @@ public TOSCAMetaFile parse(Path toscaMetaFile) {
      * Parses and validates the <code>toscaMetaFile</code>.
      *
      * @param manifestContent       generically parsed manifest file
-     * @param parseTimeProblemCount number of errors found during the generic parsing of the meta file.
+     * @param parseErrorsCount number of errors found during the generic parsing of the meta file.
      * @return <code>TOSCAMetaFile</code> that gives access to the content of
      * the TOSCA meta file. If the given file doesn't exist or is
      * invalid <code>null</code>.
      */
-    public TOSCAMetaFile parse(ManifestContents manifestContent, int parseTimeProblemCount) {
+    public TOSCAMetaFile parse(ManifestContents manifestContent, int parseErrorsCount) {
         // counts the errors during parsing
-        int numErrors = parseTimeProblemCount;
+        int numErrors = parseErrorsCount;
         TOSCAMetaFile toscaMetaFileContent = null;
 
         numErrors += this.validateBlock0(manifestContent);

diff --git a/...se.winery.repository.rest/src/main/java/org/eclipse/winery/repository/rest/RestUtils.java b/...se.winery.repository.rest/src/main/java/org/eclipse/winery/repository/rest/RestUtils.java
@@ -89,9 +89,9 @@
 import org.eclipse.winery.repository.rest.resources._support.IHasName;
 import org.eclipse.winery.repository.rest.resources._support.IPersistable;
 import org.eclipse.winery.repository.rest.resources._support.ResourceResult;
-import org.eclipse.winery.repository.rest.resources.apidata.QNameApiData;
-import org.eclipse.winery.repository.rest.resources.apidata.QNameWithTypeApiData;
-import org.eclipse.winery.repository.rest.resources.apidata.converter.QNameConverter;
+import org.eclipse.winery.repository.rest.resources.apiData.QNameApiData;
+import org.eclipse.winery.repository.rest.resources.apiData.QNameWithTypeApiData;
+import org.eclipse.winery.repository.rest.resources.apiData.converter.QNameConverter;
 import org.eclipse.winery.repository.rest.resources.entitytemplates.artifacttemplates.ArtifactTemplateResource;
 import org.eclipse.winery.repository.rest.resources.entitytemplates.artifacttemplates.ArtifactTemplatesResource;
 import org.eclipse.winery.repository.rest.resources.entitytypes.TopologyGraphElementEntityTypeResource;

diff --git a/...y.repository.rest/src/main/java/org/eclipse/winery/repository/rest/datatypes/GitData.java b/...y.repository.rest/src/main/java/org/eclipse/winery/repository/rest/datatypes/GitData.java
@@ -15,7 +15,7 @@
 
 import java.util.List;
 
-import org.eclipse.winery.repository.rest.resources.apidata.QNameWithTypeApiData;
+import org.eclipse.winery.repository.rest.resources.apiData.QNameWithTypeApiData;
 
 public class GitData {
 

diff --git a/...tory.rest/src/main/java/org/eclipse/winery/repository/rest/resources/API/APIResource.java b/...tory.rest/src/main/java/org/eclipse/winery/repository/rest/resources/API/APIResource.java
@@ -11,7 +11,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  *******************************************************************************/
-package org.eclipse.winery.repository.rest.resources.api;
+package org.eclipse.winery.repository.rest.resources.API;
 
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/...resources/api/AccountabilityResource.java → ...resources/API/AccountabilityResource.java b/...resources/api/AccountabilityResource.java → ...resources/API/AccountabilityResource.java
@@ -12,7 +12,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  *******************************************************************************/
 
-package org.eclipse.winery.repository.rest.resources.api;
+package org.eclipse.winery.repository.rest.resources.API;
 
 import java.io.IOException;
 import java.nio.charset.Charset;

diff --git a/...ory.rest/src/main/java/org/eclipse/winery/repository/rest/resources/API/package-info.java b/...ory.rest/src/main/java/org/eclipse/winery/repository/rest/resources/API/package-info.java
@@ -25,4 +25,4 @@
  * With this API, the stored data is interpreted more abstractly. As a long-term goal, things
  * such as inherticance should be supported here
  */
-package org.eclipse.winery.repository.rest.resources.api;
+package org.eclipse.winery.repository.rest.resources.API;
diff --git a/...ository.rest/src/main/java/org/eclipse/winery/repository/rest/resources/MainResource.java b/...ository.rest/src/main/java/org/eclipse/winery/repository/rest/resources/MainResource.java
@@ -39,7 +39,7 @@
 import org.eclipse.winery.repository.importing.ImportMetaInformation;
 import org.eclipse.winery.repository.rest.RestUtils;
 import org.eclipse.winery.repository.rest.resources.admin.AdminTopResource;
-import org.eclipse.winery.repository.rest.resources.api.APIResource;
+import org.eclipse.winery.repository.rest.resources.API.APIResource;
 import org.eclipse.winery.repository.rest.resources.compliancerules.ComplianceRulesResource;
 import org.eclipse.winery.repository.rest.resources.entitytemplates.artifacttemplates.ArtifactTemplatesResource;
 import org.eclipse.winery.repository.rest.resources.entitytemplates.policytemplates.PolicyTemplatesResource;

diff --git a/.../eclipse/winery/repository/rest/resources/_support/AbstractComponentInstanceResource.java b/.../eclipse/winery/repository/rest/resources/_support/AbstractComponentInstanceResource.java
@@ -64,9 +64,9 @@
 import org.eclipse.winery.repository.configuration.Environment;
 import org.eclipse.winery.repository.export.CsarExportOptions;
 import org.eclipse.winery.repository.rest.RestUtils;
-import org.eclipse.winery.repository.rest.resources.apidata.NewVersionApiData;
-import org.eclipse.winery.repository.rest.resources.apidata.QNameWithTypeApiData;
-import org.eclipse.winery.repository.rest.resources.apidata.RenameApiData;
+import org.eclipse.winery.repository.rest.resources.apiData.NewVersionApiData;
+import org.eclipse.winery.repository.rest.resources.apiData.QNameWithTypeApiData;
+import org.eclipse.winery.repository.rest.resources.apiData.RenameApiData;
 import org.eclipse.winery.repository.rest.resources.compliancerules.ComplianceRuleResource;
 import org.eclipse.winery.repository.rest.resources.documentation.DocumentationResource;
 import org.eclipse.winery.repository.rest.resources.entitytypeimplementations.nodetypeimplementations.NodeTypeImplementationResource;

diff --git a/...resources/_support/AbstractComponentInstanceResourceWithNameDerivedFromAbstractFinal.java b/...resources/_support/AbstractComponentInstanceResourceWithNameDerivedFromAbstractFinal.java
@@ -32,8 +32,8 @@
 import org.eclipse.winery.model.tosca.TRelationshipTypeImplementation;
 import org.eclipse.winery.model.tosca.utils.ModelUtilities;
 import org.eclipse.winery.repository.rest.RestUtils;
-import org.eclipse.winery.repository.rest.resources.apidata.AvailableSuperclassesApiData;
-import org.eclipse.winery.repository.rest.resources.apidata.InheritanceResourceApiData;
+import org.eclipse.winery.repository.rest.resources.apiData.AvailableSuperclassesApiData;
+import org.eclipse.winery.repository.rest.resources.apiData.InheritanceResourceApiData;
 import org.eclipse.winery.repository.rest.resources.entitytypeimplementations.nodetypeimplementations.NodeTypeImplementationResource;
 import org.eclipse.winery.repository.rest.resources.entitytypeimplementations.relationshiptypeimplementations.RelationshipTypeImplementationResource;
 import org.eclipse.winery.repository.rest.resources.entitytypes.EntityTypeResource;

diff --git a/...inery/repository/rest/resources/_support/AbstractComponentsWithTypeReferenceResource.java b/...inery/repository/rest/resources/_support/AbstractComponentsWithTypeReferenceResource.java
@@ -31,7 +31,7 @@
 import org.eclipse.winery.repository.backend.BackendUtils;
 import org.eclipse.winery.repository.backend.IRepository;
 import org.eclipse.winery.repository.backend.RepositoryFactory;
-import org.eclipse.winery.repository.rest.resources.apidata.QNameWithTypeApiData;
+import org.eclipse.winery.repository.rest.resources.apiData.QNameWithTypeApiData;
 
 import org.apache.commons.lang3.StringUtils;
 

diff --git a/...ry/repository/rest/resources/_support/AbstractComponentsWithoutTypeReferenceResource.java b/...ry/repository/rest/resources/_support/AbstractComponentsWithoutTypeReferenceResource.java
@@ -18,7 +18,7 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.eclipse.winery.repository.rest.resources.apidata.QNameApiData;
+import org.eclipse.winery.repository.rest.resources.apiData.QNameApiData;
 
 /**
  * This class does NOT inherit from TEntityTemplatesResource<ArtifactTemplate> as these templates are directly nested in

diff --git a/.../main/java/org/eclipse/winery/repository/rest/resources/_support/InheritanceResource.java b/.../main/java/org/eclipse/winery/repository/rest/resources/_support/InheritanceResource.java
@@ -20,7 +20,7 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.eclipse.winery.repository.rest.resources.apidata.InheritanceResourceApiData;
+import org.eclipse.winery.repository.rest.resources.apiData.InheritanceResourceApiData;
 
 /**
  * Class for managing inheritance properties: abstract, final, derivedFrom

diff --git a/...g/eclipse/winery/repository/rest/resources/admin/AccountabilityConfigurationResource.java b/...g/eclipse/winery/repository/rest/resources/admin/AccountabilityConfigurationResource.java
@@ -27,7 +27,7 @@
 
 import org.eclipse.winery.repository.backend.AccountabilityConfigurationManager;
 import org.eclipse.winery.repository.backend.RepositoryFactory;
-import org.eclipse.winery.repository.rest.resources.apidata.AccountabilityConfigurationData;
+import org.eclipse.winery.repository.rest.resources.apiData.AccountabilityConfigurationData;
 
 import com.sun.jersey.core.header.FormDataContentDisposition;
 import com.sun.jersey.multipart.FormDataParam;

diff --git a/...st/src/main/java/org/eclipse/winery/repository/rest/resources/admin/AdminTopResource.java b/...st/src/main/java/org/eclipse/winery/repository/rest/resources/admin/AdminTopResource.java
@@ -37,7 +37,7 @@
 import org.eclipse.winery.repository.rest.resources.admin.types.ConstraintTypesManager;
 import org.eclipse.winery.repository.rest.resources.admin.types.PlanLanguagesManager;
 import org.eclipse.winery.repository.rest.resources.admin.types.PlanTypesManager;
-import org.eclipse.winery.repository.rest.resources.apidata.OAuthStateAndCodeApiData;
+import org.eclipse.winery.repository.rest.resources.apiData.OAuthStateAndCodeApiData;
 
 import io.swagger.annotations.Api;
 import org.apache.http.HttpResponse;

diff --git a/...n/java/org/eclipse/winery/repository/rest/resources/admin/types/AbstractTypesManager.java b/...n/java/org/eclipse/winery/repository/rest/resources/admin/types/AbstractTypesManager.java
@@ -38,7 +38,7 @@
 import org.eclipse.winery.repository.rest.datatypes.TypeWithShortName;
 import org.eclipse.winery.repository.rest.datatypes.select2.Select2DataItem;
 import org.eclipse.winery.repository.rest.resources.admin.AbstractAdminResource;
-import org.eclipse.winery.repository.rest.resources.apidata.TypeWithShortNameApiData;
+import org.eclipse.winery.repository.rest.resources.apiData.TypeWithShortNameApiData;
 
 import org.apache.commons.lang3.StringUtils;
 

diff --git a/...data/AccountabilityConfigurationData.java → ...Data/AccountabilityConfigurationData.java b/...data/AccountabilityConfigurationData.java → ...Data/AccountabilityConfigurationData.java
@@ -11,7 +11,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  *******************************************************************************/
-package org.eclipse.winery.repository.rest.resources.apidata;
+package org.eclipse.winery.repository.rest.resources.apiData;
 
 import java.io.Serializable;
 

diff --git a/...in/java/org/eclipse/winery/repository/rest/resources/apiData/ArtifactResourceApiData.java b/...in/java/org/eclipse/winery/repository/rest/resources/apiData/ArtifactResourceApiData.java
@@ -12,7 +12,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  *******************************************************************************/
 
-package org.eclipse.winery.repository.rest.resources.apidata;
+package org.eclipse.winery.repository.rest.resources.apiData;
 
 public class ArtifactResourceApiData {
 

diff --git a/...n/java/org/eclipse/winery/repository/rest/resources/apiData/ArtifactResourcesApiData.java b/...n/java/org/eclipse/winery/repository/rest/resources/apiData/ArtifactResourcesApiData.java
@@ -12,7 +12,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  *******************************************************************************/
 
-package org.eclipse.winery.repository.rest.resources.apidata;
+package org.eclipse.winery.repository.rest.resources.apiData;
 
 import java.util.List;
 

diff --git a/...va/org/eclipse/winery/repository/rest/resources/apiData/AvailableSuperclassesApiData.java b/...va/org/eclipse/winery/repository/rest/resources/apiData/AvailableSuperclassesApiData.java
@@ -12,7 +12,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  *******************************************************************************/
 
-package org.eclipse.winery.repository.rest.resources.apidata;
+package org.eclipse.winery.repository.rest.resources.apiData;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...va/org/eclipse/winery/repository/rest/resources/apiData/CapabilityDefinitionPostData.java b/...va/org/eclipse/winery/repository/rest/resources/apiData/CapabilityDefinitionPostData.java
@@ -12,7 +12,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  *******************************************************************************/
 
-package org.eclipse.winery.repository.rest.resources.apidata;
+package org.eclipse.winery.repository.rest.resources.apiData;
 
 public class CapabilityDefinitionPostData {
     public String name;

diff --git a/...clipse/winery/repository/rest/resources/apiData/CapabilityDefinitionsResourceApiData.java b/...clipse/winery/repository/rest/resources/apiData/CapabilityDefinitionsResourceApiData.java
@@ -12,7 +12,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  *******************************************************************************/
 
-package org.eclipse.winery.repository.rest.resources.apidata;
+package org.eclipse.winery.repository.rest.resources.apiData;
 
 import java.util.List;
 

diff --git a/...in/java/org/eclipse/winery/repository/rest/resources/apiData/GenerateArtifactApiData.java b/...in/java/org/eclipse/winery/repository/rest/resources/apiData/GenerateArtifactApiData.java
@@ -12,7 +12,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  *******************************************************************************/
 
-package org.eclipse.winery.repository.rest.resources.apidata;
+package org.eclipse.winery.repository.rest.resources.apiData;
 
 import javax.xml.bind.annotation.XmlAttribute;
 

diff --git a/...java/org/eclipse/winery/repository/rest/resources/apiData/InheritanceResourceApiData.java b/...java/org/eclipse/winery/repository/rest/resources/apiData/InheritanceResourceApiData.java
@@ -12,7 +12,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  *******************************************************************************/
 
-package org.eclipse.winery.repository.rest.resources.apidata;
+package org.eclipse.winery.repository.rest.resources.apiData;
 
 import org.eclipse.winery.repository.rest.resources._support.AbstractComponentInstanceResourceWithNameDerivedFromAbstractFinal;
 

diff --git a/.../main/java/org/eclipse/winery/repository/rest/resources/apiData/InstanceStateApiData.java b/.../main/java/org/eclipse/winery/repository/rest/resources/apiData/InstanceStateApiData.java
@@ -12,7 +12,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  *******************************************************************************/
 
-package org.eclipse.winery.repository.rest.resources.apidata;
+package org.eclipse.winery.repository.rest.resources.apiData;
 
 public class InstanceStateApiData {
 

diff --git a/...in/java/org/eclipse/winery/repository/rest/resources/apiData/InterfacesSelectApiData.java b/...in/java/org/eclipse/winery/repository/rest/resources/apiData/InterfacesSelectApiData.java
@@ -12,7 +12,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  *******************************************************************************/
 
-package org.eclipse.winery.repository.rest.resources.apidata;
+package org.eclipse.winery.repository.rest.resources.apiData;
 
 import java.util.List;
 

diff --git a/...c/main/java/org/eclipse/winery/repository/rest/resources/apiData/NameAndQNameApiData.java b/...c/main/java/org/eclipse/winery/repository/rest/resources/apiData/NameAndQNameApiData.java
@@ -12,7 +12,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  *******************************************************************************/
 
-package org.eclipse.winery.repository.rest.resources.apidata;
+package org.eclipse.winery.repository.rest.resources.apiData;
 
 import javax.xml.namespace.QName;
 

diff --git a/...c/main/java/org/eclipse/winery/repository/rest/resources/apiData/NamespaceWithPrefix.java b/...c/main/java/org/eclipse/winery/repository/rest/resources/apiData/NamespaceWithPrefix.java
@@ -12,7 +12,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  *******************************************************************************/
 
-package org.eclipse.winery.repository.rest.resources.apidata;
+package org.eclipse.winery.repository.rest.resources.apiData;
 
 import java.util.Objects;
 

diff --git a/...src/main/java/org/eclipse/winery/repository/rest/resources/apiData/NewVersionApiData.java b/...src/main/java/org/eclipse/winery/repository/rest/resources/apiData/NewVersionApiData.java
@@ -11,7 +11,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  ********************************************************************************/
-package org.eclipse.winery.repository.rest.resources.apidata;
+package org.eclipse.winery.repository.rest.resources.apiData;
 
 import java.util.List;
 

diff --git a/...in/java/org/eclipse/winery/repository/rest/resources/apiData/NodeTypesVisualsApiData.java b/...in/java/org/eclipse/winery/repository/rest/resources/apiData/NodeTypesVisualsApiData.java
@@ -12,7 +12,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  *******************************************************************************/
 
-package org.eclipse.winery.repository.rest.resources.apidata;
+package org.eclipse.winery.repository.rest.resources.apiData;
 
 import javax.xml.namespace.QName;
 

diff --git a/...n/java/org/eclipse/winery/repository/rest/resources/apiData/OAuthStateAndCodeApiData.java b/...n/java/org/eclipse/winery/repository/rest/resources/apiData/OAuthStateAndCodeApiData.java
@@ -12,7 +12,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  *******************************************************************************/
 
-package org.eclipse.winery.repository.rest.resources.apidata;
+package org.eclipse.winery.repository.rest.resources.apiData;
 
 public class OAuthStateAndCodeApiData {
 

diff --git a/...n/java/org/eclipse/winery/repository/rest/resources/apiData/PropertiesDefinitionEnum.java b/...n/java/org/eclipse/winery/repository/rest/resources/apiData/PropertiesDefinitionEnum.java
@@ -12,7 +12,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  *******************************************************************************/
 
-package org.eclipse.winery.repository.rest.resources.apidata;
+package org.eclipse.winery.repository.rest.resources.apiData;
 
 public enum PropertiesDefinitionEnum {
     Custom, Element, Type, None

diff --git a/...eclipse/winery/repository/rest/resources/apiData/PropertiesDefinitionResourceApiData.java b/...eclipse/winery/repository/rest/resources/apiData/PropertiesDefinitionResourceApiData.java
@@ -12,7 +12,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  *******************************************************************************/
 
-package org.eclipse.winery.repository.rest.resources.apidata;
+package org.eclipse.winery.repository.rest.resources.apiData;
 
 import org.eclipse.winery.model.tosca.TEntityType;
 import org.eclipse.winery.model.tosca.kvproperties.WinerysPropertiesDefinition;