Apply suggestions from code review

Co-authored-by: Kamil Czaja <[email protected]>
sovity · Jun 26, 2024 · a14531f · a14531f
1 parent 6c74d8a
commit a14531f
Show file tree

Hide file tree

Showing 18 changed files with 226 additions and 4 deletions.
diff --git a/...on-api/src/main/java/de/sovity/edc/ext/wrapper/api/common/model/UiDataSourceHttpData.java b/...on-api/src/main/java/de/sovity/edc/ext/wrapper/api/common/model/UiDataSourceHttpData.java
@@ -1,4 +1,3 @@
-
 /*
  *  Copyright (c) 2022 sovity GmbH
  *

diff --git a/.../src/main/java/de/sovity/edc/ext/wrapper/api/common/model/UiDataSourceHttpDataMethod.java b/.../src/main/java/de/sovity/edc/ext/wrapper/api/common/model/UiDataSourceHttpDataMethod.java
@@ -1,3 +1,17 @@
+/*
+ *  Copyright (c) 2022 sovity GmbH
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       sovity GmbH - initial API and implementation
+ *
+ */
+
 package de.sovity.edc.ext.wrapper.api.common.model;
 
 import io.swagger.v3.oas.annotations.media.Schema;

diff --git a/...ommon-mappers/src/main/java/de/sovity/edc/ext/wrapper/api/common/mappers/AssetMapper.java b/...ommon-mappers/src/main/java/de/sovity/edc/ext/wrapper/api/common/mappers/AssetMapper.java
@@ -1,3 +1,17 @@
+/*
+ *  Copyright (c) 2022 sovity GmbH
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       sovity GmbH - initial API and implementation
+ *
+ */
+
 package de.sovity.edc.ext.wrapper.api.common.mappers;
 
 import de.sovity.edc.ext.wrapper.api.common.mappers.asset.AssetJsonLdBuilder;

diff --git a/...mmon-mappers/src/main/java/de/sovity/edc/ext/wrapper/api/common/mappers/PolicyMapper.java b/...mmon-mappers/src/main/java/de/sovity/edc/ext/wrapper/api/common/mappers/PolicyMapper.java
@@ -1,3 +1,17 @@
+/*
+ *  Copyright (c) 2022 sovity GmbH
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       sovity GmbH - initial API and implementation
+ *
+ */
+
 package de.sovity.edc.ext.wrapper.api.common.mappers;
 
 import de.sovity.edc.ext.wrapper.api.common.mappers.policy.AtomicConstraintMapper;

diff --git a/.../main/java/de/sovity/edc/ext/wrapper/api/common/mappers/asset/AssetEditRequestMapper.java b/.../main/java/de/sovity/edc/ext/wrapper/api/common/mappers/asset/AssetEditRequestMapper.java
@@ -1,3 +1,17 @@
+/*
+ *  Copyright (c) 2022 sovity GmbH
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       sovity GmbH - initial API and implementation
+ *
+ */
+
 package de.sovity.edc.ext.wrapper.api.common.mappers.asset;
 
 import de.sovity.edc.ext.wrapper.api.common.model.UiAssetCreateRequest;

diff --git a/.../main/java/de/sovity/edc/ext/wrapper/api/common/mappers/dataaddress/DataSourceMapper.java b/.../main/java/de/sovity/edc/ext/wrapper/api/common/mappers/dataaddress/DataSourceMapper.java
@@ -1,6 +1,5 @@
 package de.sovity.edc.ext.wrapper.api.common.mappers.dataaddress;
 
-import com.ibm.icu.impl.Pair;
 import de.sovity.edc.ext.wrapper.api.common.mappers.asset.utils.EdcPropertyUtils;
 import de.sovity.edc.ext.wrapper.api.common.mappers.dataaddress.http.HttpDataSourceMapper;
 import de.sovity.edc.ext.wrapper.api.common.model.DataSourceType;

diff --git a/...a/de/sovity/edc/ext/wrapper/api/common/mappers/dataaddress/http/HttpDataSourceMapper.java b/...a/de/sovity/edc/ext/wrapper/api/common/mappers/dataaddress/http/HttpDataSourceMapper.java
@@ -1,3 +1,17 @@
+/*
+ *  Copyright (c) 2022 sovity GmbH
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       sovity GmbH - initial API and implementation
+ *
+ */
+
 package de.sovity.edc.ext.wrapper.api.common.mappers.dataaddress.http;
 
 import de.sovity.edc.ext.wrapper.api.common.model.UiDataSourceHttpData;
@@ -28,7 +42,7 @@ public class HttpDataSourceMapper {
      * @return properties for {@link org.eclipse.edc.spi.types.domain.DataAddress}
      */
     public Map<String, String> buildDataAddress(@NonNull UiDataSourceHttpData httpData) {
-        var baseUrl = requireNonNull(httpData.getBaseUrl(), "Need baseUrl");
+        var baseUrl = requireNonNull(httpData.getBaseUrl(), "baseUrl must not be null");
         var props = new HashMap<>(Map.of(
             Prop.Edc.TYPE, Prop.Edc.DATA_ADDRESS_TYPE_HTTP_DATA,
             Prop.Edc.BASE_URL, baseUrl
@@ -62,7 +76,7 @@ public Map<String, String> buildDataAddress(@NonNull UiDataSourceHttpData httpDa
     }
 
     public Map<String, String> buildOnRequestDataAddress(@NonNull UiDataSourceOnRequest onRequest) {
-        var contactEmail = requireNonNull(onRequest.getContactEmail(), "Need contactEmail");
+        var contactEmail = requireNonNull(onRequest.getContactEmail(), "contactEmail must not be null");
         var contactEmailSubject = requireNonNull(
             onRequest.getContactPreferredEmailSubject(),
             "Need contactPreferredEmailSubject"

diff --git a/.../java/de/sovity/edc/ext/wrapper/api/common/mappers/dataaddress/http/HttpHeaderMapper.java b/.../java/de/sovity/edc/ext/wrapper/api/common/mappers/dataaddress/http/HttpHeaderMapper.java
@@ -1,3 +1,17 @@
+/*
+ *  Copyright (c) 2022 sovity GmbH
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       sovity GmbH - initial API and implementation
+ *
+ */
+
 package de.sovity.edc.ext.wrapper.api.common.mappers.dataaddress.http;
 
 import de.sovity.edc.utils.jsonld.vocab.Prop;

diff --git a/...-mappers/src/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/JsonAssertsUtils.java b/...-mappers/src/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/JsonAssertsUtils.java
@@ -1,3 +1,17 @@
+/*
+ *  Copyright (c) 2022 sovity GmbH
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       sovity GmbH - initial API and implementation
+ *
+ */
+
 package de.sovity.edc.ext.wrapper.api.common.mappers;
 
 import de.sovity.edc.utils.JsonUtils;

diff --git a/...-mappers/src/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/PolicyMapperTest.java b/...-mappers/src/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/PolicyMapperTest.java
@@ -1,3 +1,17 @@
+/*
+ *  Copyright (c) 2022 sovity GmbH
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       sovity GmbH - initial API and implementation
+ *
+ */
+
 package de.sovity.edc.ext.wrapper.api.common.mappers;
 
 import de.sovity.edc.ext.wrapper.api.common.mappers.policy.AtomicConstraintMapper;

diff --git a/...ers/src/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/asset/AssetMapperTest.java b/...ers/src/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/asset/AssetMapperTest.java
@@ -1,3 +1,17 @@
+/*
+ *  Copyright (c) 2022 sovity GmbH
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       sovity GmbH - initial API and implementation
+ *
+ */
+
 package de.sovity.edc.ext.wrapper.api.common.mappers.asset;
 
 import de.sovity.edc.ext.wrapper.api.common.mappers.AssetMapper;

diff --git a/...de/sovity/edc/ext/wrapper/api/common/mappers/asset/utils/ShortDescriptionBuilderTest.java b/...de/sovity/edc/ext/wrapper/api/common/mappers/asset/utils/ShortDescriptionBuilderTest.java
@@ -1,3 +1,17 @@
+/*
+ *  Copyright (c) 2022 sovity GmbH
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       sovity GmbH - initial API and implementation
+ *
+ */
+
 package de.sovity.edc.ext.wrapper.api.common.mappers.asset.utils;
 
 import org.junit.jupiter.api.BeforeEach;

diff --git a/.../java/de/sovity/edc/ext/wrapper/api/common/mappers/policy/AtomicConstraintMapperTest.java b/.../java/de/sovity/edc/ext/wrapper/api/common/mappers/policy/AtomicConstraintMapperTest.java
@@ -1,3 +1,17 @@
+/*
+ *  Copyright (c) 2022 sovity GmbH
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       sovity GmbH - initial API and implementation
+ *
+ */
+
 package de.sovity.edc.ext.wrapper.api.common.mappers.policy;
 
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/...est/java/de/sovity/edc/ext/wrapper/api/common/mappers/policy/ConstraintExtractorTest.java b/...est/java/de/sovity/edc/ext/wrapper/api/common/mappers/policy/ConstraintExtractorTest.java
@@ -1,3 +1,17 @@
+/*
+ *  Copyright (c) 2022 sovity GmbH
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       sovity GmbH - initial API and implementation
+ *
+ */
+
 package de.sovity.edc.ext.wrapper.api.common.mappers.policy;
 
 import de.sovity.edc.ext.wrapper.api.common.mappers.policy.AtomicConstraintMapper;

diff --git a/.../src/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/policy/LiteralMapperTest.java b/.../src/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/policy/LiteralMapperTest.java
@@ -1,3 +1,17 @@
+/*
+ *  Copyright (c) 2022 sovity GmbH
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       sovity GmbH - initial API and implementation
+ *
+ */
+
 package de.sovity.edc.ext.wrapper.api.common.mappers.policy;
 
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/.../src/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/policy/MappingErrorsTest.java b/.../src/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/policy/MappingErrorsTest.java
@@ -1,3 +1,17 @@
+/*
+ *  Copyright (c) 2022 sovity GmbH
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       sovity GmbH - initial API and implementation
+ *
+ */
+
 package de.sovity.edc.ext.wrapper.api.common.mappers.policy;
 
 import de.sovity.edc.ext.wrapper.api.common.mappers.policy.MappingErrors;

diff --git a/...src/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/policy/OperatorMapperTest.java b/...src/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/policy/OperatorMapperTest.java
@@ -1,3 +1,17 @@
+/*
+ *  Copyright (c) 2022 sovity GmbH
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       sovity GmbH - initial API and implementation
+ *
+ */
+
 package de.sovity.edc.ext.wrapper.api.common.mappers.policy;
 
 import de.sovity.edc.ext.wrapper.api.common.mappers.policy.OperatorMapper;

diff --git a/...rc/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/policy/PolicyValidatorTest.java b/...rc/test/java/de/sovity/edc/ext/wrapper/api/common/mappers/policy/PolicyValidatorTest.java
@@ -1,3 +1,17 @@
+/*
+ *  Copyright (c) 2022 sovity GmbH
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       sovity GmbH - initial API and implementation
+ *
+ */
+
 package de.sovity.edc.ext.wrapper.api.common.mappers.policy;
 
 import de.sovity.edc.ext.wrapper.api.common.mappers.policy.MappingErrors;