Merge pull request #80 from diging/develop

bugfix for null content files
diging · Oct 22, 2019 · d378957 · d378957
2 parents e6e20a5 + 3a6a73f
commit d378957
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/giles-eco/pom.xml b/giles-eco/pom.xml
@@ -17,10 +17,10 @@
         <org.slf4j-version>1.7.5</org.slf4j-version>
         <com.fasterxml.jackson.version>2.8.4</com.fasterxml.jackson.version>
 
-        <geco.requests.version>0.7</geco.requests.version>
-        <geco.util.version>0.4.3</geco.util.version>
+        <geco.requests.version>0.9</geco.requests.version>
+        <geco.util.version>0.6</geco.util.version>
         <geco.september.util.version>0.2</geco.september.util.version>
-        <geco.kafka-util.version>0.1</geco.kafka-util.version>
+        <geco.kafka-util.version>0.2</geco.kafka-util.version>
 
         <tomcat.deploy.path></tomcat.deploy.path>
         <tomcat.app.name>geco-giles</tomcat.app.name>
@@ -99,8 +99,8 @@
         <!-- Giles Ecosystem -->
 
         <dependency>
-            <groupId>edu.asu.diging.giles-eco</groupId>
-            <artifactId>kafka-util</artifactId>
+            <groupId>edu.asu.diging</groupId>
+            <artifactId>giles-eco-kafka-util</artifactId>
             <version>${geco.kafka-util.version}</version>
         </dependency>
         <dependency>
@@ -109,13 +109,13 @@
             <version>${geco.september.util.version}</version>
         </dependency>
         <dependency>
-            <groupId>edu.asu.diging.giles-eco</groupId>
-            <artifactId>requests</artifactId>
+            <groupId>edu.asu.diging</groupId>
+            <artifactId>giles-eco-requests</artifactId>
             <version>${geco.requests.version}</version>
         </dependency>
         <dependency>
-            <groupId>edu.asu.diging.giles-eco</groupId>
-            <artifactId>util</artifactId>
+            <groupId>edu.asu.diging</groupId>
+            <artifactId>giles-eco-util</artifactId>
             <version>${geco.util.version}</version>
         </dependency>
 

diff --git a/...co/src/main/java/edu/asu/diging/gilesecosystem/web/controllers/FileContentController.java b/...co/src/main/java/edu/asu/diging/gilesecosystem/web/controllers/FileContentController.java
@@ -48,11 +48,14 @@ public ResponseEntity<String> getFile(
 
         byte[] content = filesManager.getFileContent(file);
         response.setContentType(file.getContentType());
-        response.setContentLength(content.length);
+
         response.setHeader("Content-disposition", "filename=\"" + file.getFilename() + "\""); 
         try {
-            response.getOutputStream().write(content);
-            response.getOutputStream().close();
+            if (content != null) {
+                response.setContentLength(content.length);
+                response.getOutputStream().write(content);
+                response.getOutputStream().close();
+            }
         } catch (IOException e) {
             messageHandler.handleMessage("Could not write to output stream.", e, MessageType.ERROR);
             return new ResponseEntity<String>(HttpStatus.INTERNAL_SERVER_ERROR);

diff --git a/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/domain/impl/File.java b/giles-eco/src/main/java/edu/asu/diging/gilesecosystem/web/domain/impl/File.java
@@ -3,6 +3,7 @@
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Index;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 import edu.asu.diging.gilesecosystem.web.domain.DocumentAccess;
@@ -23,14 +24,14 @@ public class File implements IFile {
 
     @Id private String id;
     private String uploadId;
-    private String filename;
+    @Lob private String filename;
     private String username;
     private String documentId;
     private String uploadDate;
     private DocumentAccess access;
     private String contentType;
     private long size;
-    private String filepath; 
+    @Lob private String filepath; 
     private String derivedFrom;
     private String usernameForStorage;
     private String requestId;

diff --git a/giles-eco/src/main/resources/META-INF/hibernate/orm.xml b/giles-eco/src/main/resources/META-INF/hibernate/orm.xml
@@ -84,8 +84,8 @@
         </id>
         <property name="pageNr" type="int" />
         <property name="filename" type="string" />
-        <property name="pathToFile" type="string" />
-        <property name="downloadUrl" type="string" />
+        <property name="pathToFile" type="text" />
+        <property name="downloadUrl" type="text" />
         <property name="contentType" type="string" />
         <property name="size" type="long" />
     </class>