Bugfixes for BinaryAssetDataService

ccm-cms/src/main/java/org/librecms/assets/BinaryAssetBlobDataProvider.java

@@ -20,6 +20,7 @@ package org.librecms.assets;
 
 import org.libreccm.core.UnexpectedErrorException;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.sql.Blob;
@@ -45,20 +46,30 @@ public class BinaryAssetBlobDataProvider implements BinaryAssetDataProvider {
     private DataSource dataSource;
 
     @Override
-    public InputStream retrieveData(final BinaryAsset asset) {
+    public void copyDataToOutputStream(
+        final BinaryAsset asset, final OutputStream outputStream
+    ) {
         Objects.requireNonNull(asset, "Can't retrieve data from null.");
         try ( Connection connection = dataSource.getConnection()) {
+            connection.setAutoCommit(false);
             final PreparedStatement stmt = connection
                 .prepareStatement(
-                    "SELECT data FROM binary_assets WHERE object_id  = ?"
+                    "SELECT asset_data FROM ccm_cms.binary_assets WHERE object_id  = ?"
                 );
             stmt.setLong(1, asset.getObjectId());
 
             try (ResultSet resultSet = stmt.executeQuery()) {
-                final Blob blob = resultSet.getBlob("data");
+                resultSet.next();
-                return blob.getBinaryStream();
+                final Blob blob = resultSet.getBlob("asset_data");
+                try(InputStream inputStream = blob.getBinaryStream()) {
+                    byte[] buffer = new byte[8192];
+                    int length;
+                    while((length = inputStream.read(buffer)) != -1) {
+                        outputStream.write(buffer, 0, length);
+                    }
+                } 
             }
-        } catch (SQLException ex) {
+        } catch (SQLException |IOException ex) {
             throw new UnexpectedErrorException(ex);
         }
     }
@@ -69,10 +80,11 @@ public class BinaryAssetBlobDataProvider implements BinaryAssetDataProvider {
         try ( Connection connection = dataSource.getConnection()) {
             final PreparedStatement stmt = connection
                 .prepareStatement(
-                    "UPDATE binary_assets SET data = ? WHERE object_id = ?"
+                    "UPDATE ccm_cms.binary_assets SET asset_data = ? WHERE object_id = ?"
                 );
             stmt.setBlob(1, stream);
             stmt.setLong(2, asset.getObjectId());
+//            connection.commit();
         } catch (SQLException ex) {
             throw new UnexpectedErrorException(ex);
         }

ccm-cms/src/main/java/org/librecms/assets/BinaryAssetDataProvider.java

@@ -19,6 +19,7 @@
 package org.librecms.assets;
 
 import java.io.InputStream;
+import java.io.OutputStream;
 
 /**
  *
@@ -26,7 +27,9 @@ import java.io.InputStream;
  */
 public interface BinaryAssetDataProvider {
     
-    InputStream retrieveData(BinaryAsset asset);
+    void copyDataToOutputStream(
+        BinaryAsset asset, OutputStream outputStream
+    );
     
     void saveData(BinaryAsset asset, InputStream stream);
     

ccm-cms/src/main/java/org/librecms/assets/BinaryAssetDataService.java

@@ -22,6 +22,7 @@ import org.libreccm.configuration.ConfigurationManager;
 import org.libreccm.core.UnexpectedErrorException;
 
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.Objects;
 
 import javax.enterprise.context.RequestScoped;
@@ -43,12 +44,12 @@ public class BinaryAssetDataService {
     @Any
     private Instance<BinaryAssetDataProvider> dataProvider;
 
-    public InputStream retrieveData(final BinaryAsset asset) {
+    public void copyDataToOutputStream(
+        final BinaryAsset asset, final OutputStream outputStream
+    ) {
         Objects.requireNonNull(asset, "Can't retrieve data from null.");
-
+        Objects.requireNonNull(outputStream, "Can't copy data to null.");
-        final BinaryAssetDataProvider dataProvider = getDataProvider();
+        getDataProvider().copyDataToOutputStream(asset, outputStream);
-
-        return dataProvider.retrieveData(asset);
     }
 
     public void saveData(final BinaryAsset asset, final InputStream stream) {

ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/FileAssetEditStep.java

@@ -316,9 +316,6 @@ public class FileAssetEditStep extends AbstractMvcAssetEditStep {
         }
     }
 
-  
-    
-    
     @POST
     @Path("/upload")
     @Consumes(MediaType.MULTIPART_FORM_DATA)
@@ -346,7 +343,6 @@ public class FileAssetEditStep extends AbstractMvcAssetEditStep {
                 .getFormDataMap();
             final List<InputPart> inputParts = uploadForm.get("fileData");
 
-            final Part part;
             String fileName = "";
             String contentType = "";
             for (final InputPart inputPart : inputParts) {
@@ -355,10 +351,27 @@ public class FileAssetEditStep extends AbstractMvcAssetEditStep {
                         .getHeaders();
                     fileName = getFileName(headers);
                     contentType = getContentType(headers);
-                    dataService.saveData(
+
-                        fileAsset,
+                    fileAsset.setFileName(fileName);
-                        inputPart.getBody(InputStream.class, null)
+                    fileAsset.setSize(fileAsset.getData().length);
-                    );
+                    try {
+                        fileAsset.setMimeType(new MimeType(contentType));
+                    } catch (MimeTypeParseException ex) {
+                        LOGGER.error(
+                            "Failed to upload file for FileAsset {}:", assetPath
+                        );
+                        LOGGER.error(ex);
+
+                        models.put("uploadFailed", true);
+                        return buildRedirectPathForStep();
+                    }
+
+                    assetRepo.save(fileAsset);
+
+                    try ( InputStream inputStream = inputPart.getBody(
+                        InputStream.class, null)) {
+                        dataService.saveData(fileAsset, inputStream);
+                    }
                 } catch (IOException ex) {
                     LOGGER.error(
                         "Failed to upload file for FileAsset {}:", assetPath
@@ -368,51 +381,8 @@ public class FileAssetEditStep extends AbstractMvcAssetEditStep {
                     models.put("uploadFailed", true);
                     return buildRedirectPathForStep();
                 }
-
-//                    final MultivaluedMap<String, String> headers = inputPart
-//                        .getHeaders();
-//                    fileName = getFileName(headers);
-//                    contentType = getContentType(headers);
-//                    final byte[] bytes = new byte[1024];
-//                    try (InputStream inputStream = inputPart.getBody(
-//                        InputStream.class, null
-//                    );
-//                         ByteArrayOutputStream fileDataOutputStream
-//                         = new ByteArrayOutputStream()) {
-//                        while (inputStream.read(bytes) != -1) {
-//                            fileDataOutputStream.writeBytes(bytes);
-//                        }
-//
-//                        fileAsset.setData(fileDataOutputStream.toByteArray());
-//                    }
-//
-//                } catch (IOException ex) {
-//                    LOGGER.error(
-//                        "Failed to upload file for FileAsset {}:", assetPath
-//                    );
-//                    LOGGER.error(ex);
-//
-//                    models.put("uploadFailed", true);
-//                    return buildRedirectPathForStep();
-//                }
             }
 
-            fileAsset.setFileName(fileName);
-            fileAsset.setSize(fileAsset.getData().length);
-            try {
-                fileAsset.setMimeType(new MimeType(contentType));
-            } catch (MimeTypeParseException ex) {
-                LOGGER.error(
-                    "Failed to upload file for FileAsset {}:", assetPath
-                );
-                LOGGER.error(ex);
-
-                models.put("uploadFailed", true);
-                return buildRedirectPathForStep();
-            }
-
-            assetRepo.save(fileAsset);
-
             return buildRedirectPathForStep();
         } else {
             return assetUi.showAccessDenied(

ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/FileAssetEditStepDownload.java

@@ -122,50 +122,27 @@ public class FileAssetEditStepDownload {
             );
         }
         final FileAsset fileAsset = (FileAsset) asset;
-        try ( InputStream dataInputStream = dataService.retrieveData(fileAsset)) {
+        return Response
-
+            .ok()
-            final StreamingOutput output = new StreamingOutput() {
+            .entity(
+                new StreamingOutput() {
 
                 @Override
                 public void write(final OutputStream outputStream)
                     throws IOException, WebApplicationException {
-                    byte[] buffer = new byte[8192];
+                    dataService.copyDataToOutputStream(fileAsset, outputStream);
-                    int length;
-                    while ((length = dataInputStream.read(buffer)) != -1) {
-                        outputStream.write(buffer, 0, length);
-                    }
                 }
 
-            };
+            })
-
+            .header("Content-Type", fileAsset.getMimeType())
-            return Response
+            .header(
-                .ok()
+                "Content-Disposition",
-                .entity(output)
+                String.format(
-                .header("Content-Type", fileAsset.getMimeType())
+                    "attachment; filename=\"%s\"",
-                .header(
+                    fileAsset.getFileName()
-                    "Content-Disposition",
-                    String.format(
-                        "attachment; filename=\"%s\"",
-                        fileAsset.getFileName()
-                    )
                 )
-                .build();
+            )
-
+            .build();
-        } catch (IOException ex) {
-            throw new WebApplicationException(
-                ex,
-                Response.Status.INTERNAL_SERVER_ERROR
-            );
-        }
     }
 
-//    private class FileAssetOutput implements StreamingOutput {
-//
-//        @Override
-//        public void write(final OutputStream outputStream)
-//            throws IOException, WebApplicationException {
-//            
-//        }
-//
-//    }
 }