From 03525acc445ab3310966d9b53ca5b6af4ecd11f2 Mon Sep 17 00:00:00 2001
From: Sonia Zorba <sonia.zorba@inaf.it>
Date: Mon, 22 Mar 2021 14:30:01 +0100
Subject: [PATCH] Removed exclusion of jackson-module-jaxb-annotations in
pom.xml: this project doesn't include this dependency (unlike vospace-rest)
---
pom.xml | 8 --------
.../inaf/ia2/transfer/controller/PutFileController.java | 9 ---------
2 files changed, 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 537810f..994cdaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,14 +71,6 @@
<groupId>it.oats.inaf</groupId>
<artifactId>vospace-datamodel</artifactId>
<version>1.0-SNAPSHOT</version>
- <exclusions>
- <!-- Transitive dependency excluded to avoid duplicated dependency issues.
- We want to use always the version provided by Spring Boot -->
- <exclusion>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
diff --git a/src/main/java/it/inaf/ia2/transfer/controller/PutFileController.java b/src/main/java/it/inaf/ia2/transfer/controller/PutFileController.java
index fc5df48..1c9c8f6 100644
--- a/src/main/java/it/inaf/ia2/transfer/controller/PutFileController.java
+++ b/src/main/java/it/inaf/ia2/transfer/controller/PutFileController.java
@@ -81,15 +81,6 @@ public class PutFileController extends FileController {
}
}
- /*
- private void storeFile(FileInfo fileInfo, InputStream is, String jobId) throws IOException {
-
- if (fileInfo.getAcceptViews() != null && fileInfo.getAcceptViews().contains("urn:list-of-files")) {
- storeListOfFiles(fileInfo, is);
- } else {
- storeGenericFile(fileInfo, is, jobId);
- }
- }*/
private void storeListOfFiles(FileInfo fileInfo, InputStream is) throws IOException {
List<String> filePaths = parseListOfFiles(is);
listOfFilesDAO.createList(fileInfo.getVirtualPath(), filePaths);
--
GitLab