feat(api): add a POST endpoint to request the catalog (#2060)

* feat(api): add catalog request endpoint * use CriterionDto, introduce CatalogRequest...transformer
eclipse-edc · Oct 10, 2022 · a418469 · a418469
1 parent 6e87492
commit a418469
Show file tree

Hide file tree

Showing 41 changed files with 2,070 additions and 1,406 deletions.
diff --git a/...src/main/java/org/eclipse/dataspaceconnector/contract/offer/ContractOfferServiceImpl.java b/...src/main/java/org/eclipse/dataspaceconnector/contract/offer/ContractOfferServiceImpl.java
@@ -12,6 +12,7 @@
  * Microsoft Corporation - Refactoring
  * Fraunhofer Institute for Software and Systems Engineering - extended method implementation
  * Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - improvements
+ * ZF Friedrichshafen AG - enable asset filtering
  *
  */
 

diff --git a/...or/ids/api/multipart/dispatcher/sender/type/MultipartCatalogDescriptionRequestSender.java b/...or/ids/api/multipart/dispatcher/sender/type/MultipartCatalogDescriptionRequestSender.java
@@ -10,6 +10,7 @@
  * Contributors:
  * Fraunhofer Institute for Software and Systems Engineering - initial API and implementation
  * ZF Friedrichshafen AG - enable asset filtering
+ *
  */
 
 package org.eclipse.dataspaceconnector.ids.api.multipart.dispatcher.sender.type;
@@ -55,11 +56,6 @@ public MultipartCatalogDescriptionRequestSender(SenderDelegateContext context) {
  this.context = context;
  }
 
- @Override
- public Class<CatalogRequest> getMessageType() {
- return CatalogRequest.class;
- }
-
  /**
  * Builds a {@link de.fraunhofer.iais.eis.DescriptionRequestMessage} for requesting another
  * connector's self description. Includes paging information defined in the {@link CatalogRequest}.
@@ -129,6 +125,11 @@ public List<Class<? extends Message>> getAllowedResponseTypes() {
  return List.of(DescriptionResponseMessageImpl.class);
  }
 
+ @Override
+ public Class<CatalogRequest> getMessageType() {
+ return CatalogRequest.class;
+ }
+
  private BaseConnector getBaseConnector(IdsMultipartParts parts) {
  try {
  var payload = Objects.requireNonNull(parts.getPayload());

diff --git a/.../src/test/java/org/eclipse/dataspaceconnector/ids/api/multipart/util/RequestUtilTest.java b/.../src/test/java/org/eclipse/dataspaceconnector/ids/api/multipart/util/RequestUtilTest.java
@@ -1,3 +1,17 @@
+/*
+ * Copyright (c) 2022 ZF Friedrichshafen AG
+ *
+ * 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:
+ * ZF Friedrichshafen AG - initial implementation
+ *
+ */
+
 package org.eclipse.dataspaceconnector.ids.api.multipart.util;
 
 import com.fasterxml.jackson.databind.ObjectMapper;