drop de.metas.util.web

- refs: #10818
metasfresh · Mar 15, 2021 · 74ffe98 · 74ffe98
1 parent 07dee16
commit 74ffe98
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 26 deletions.
diff --git a/...ness.rest-api-impl/src/main/java/de/metas/rest_api/v2/product/ProductsRestController.java b/...ness.rest-api-impl/src/main/java/de/metas/rest_api/v2/product/ProductsRestController.java
@@ -29,6 +29,7 @@
 import de.metas.logging.LogManager;
 import de.metas.process.PInstanceId;
 import de.metas.rest_api.externlasystem.dto.ExternalSystemService;
+import de.metas.rest_api.utils.JsonErrors;
 import de.metas.rest_api.v2.product.command.GetProductsCommand;
 import de.metas.util.web.MetasfreshRestAPIConstants;
 import de.metas.vertical.healthcare.alberta.service.AlbertaProductService;
@@ -38,7 +39,6 @@
 import org.compiere.util.Env;
 import org.slf4j.Logger;
 import org.springframework.context.annotation.Profile;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -78,7 +78,7 @@ public ProductsRestController(
 	}
 
 	@GetMapping
-	public ResponseEntity<JsonGetProductsResponse> getProducts(
+	public ResponseEntity<?> getProducts(
 			@RequestParam(value = SINCE, required = false) @Nullable final Instant since,
 			@RequestParam(value = AD_PINSTANCE_ID, required = false) @Nullable final Integer pInstanceId,
 			@RequestParam(value = EXTERNAL_SYSTEM_CONFIG_TYPE, required = false) @Nullable final String externalSystemConfigType,
@@ -113,11 +113,10 @@ public ResponseEntity<JsonGetProductsResponse> getProducts(
 		}
 		catch (final Exception ex)
 		{
-			logger.debug("Got exception", ex);
+			logger.error(ex.getMessage(), ex);
 
-			return ResponseEntity
-					.status(HttpStatus.NOT_FOUND)
-					.body(JsonGetProductsResponse.error(ex, adLanguage));
+			return ResponseEntity.badRequest()
+					.body(JsonErrors.ofThrowable(ex, adLanguage));
 		}
 	}
 

diff --git a/misc/de-metas-common/de-metas-common-product/pom.xml b/misc/de-metas-common/de-metas-common-product/pom.xml
@@ -51,11 +51,5 @@
             <artifactId>de-metas-common-rest_api</artifactId>
             <version>${metasfresh-common.version}</version>
         </dependency>
-        <dependency>
-            <groupId>de.metas.util</groupId>
-            <artifactId>de.metas.util.web</artifactId>
-            <version>${metasfresh.version}</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/...on-product/src/main/java/de/metas/common/product/v2/response/JsonGetProductsResponse.java b/...on-product/src/main/java/de/metas/common/product/v2/response/JsonGetProductsResponse.java
@@ -5,10 +5,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import de.metas.common.rest_api.JsonErrorItem;
-import de.metas.rest_api.utils.JsonErrors;
 import lombok.Builder;
-import lombok.NonNull;
 import lombok.Singular;
 import lombok.Value;
 
@@ -46,15 +43,4 @@ public class JsonGetProductsResponse
 	@JsonProperty("products")
 	@Singular
 	List<JsonProduct> products;
-
-	@JsonInclude(JsonInclude.Include.NON_NULL)
-	@JsonProperty("error")
-	JsonErrorItem error;
-
-	public static JsonGetProductsResponse error(@NonNull final Throwable throwable, @NonNull final String adLanguage)
-	{
-		return builder()
-				.error(JsonErrors.ofThrowable(throwable, adLanguage))
-				.build();
-	}
 }