dynamic s3

project-openubl · Apr 26, 2020 · 6b1cc69 · 6b1cc69
1 parent 48ac7ae
commit 6b1cc69
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/api/src/main/java/io/github/project/openubl/xmlsender/camel/FilesystemRoute.java b/api/src/main/java/io/github/project/openubl/xmlsender/camel/FilesystemRoute.java
@@ -16,7 +16,6 @@
  */
 package io.github.project.openubl.xmlsender.camel;
 
-import io.github.project.openubl.xmlsender.models.FileType;
 import org.apache.camel.LoggingLevel;
 import org.apache.camel.builder.RouteBuilder;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
@@ -38,7 +37,7 @@ public void configure() throws Exception {
         from("direct:filesystem-save-file")
                 .id("filesystem-save-file")
                 .choice()
-                    .when(header("fileType").isEqualTo(FileType.XML))
+                    .when(header("isZipFile").isEqualTo(false))
                         .marshal().zipFile()
                     .endChoice()
                 .end()
@@ -59,7 +58,12 @@ public void configure() throws Exception {
                     String filename = exchange.getIn().getBody(String.class);
                     byte[] bytes = Files.readAllBytes(Paths.get(filename));
                     exchange.getIn().setBody(bytes);
-                });
+                })
+                .choice()
+                    .when(header("shouldUnzip").isEqualTo(true))
+                        .unmarshal().zipFile()
+                    .endChoice()
+                .end();
 
         from("direct:filesystem-get-file-link")
                 .id("filesystem-get-file-link")

diff --git a/api/src/main/java/io/github/project/openubl/xmlsender/camel/S3FilesRoute.java b/api/src/main/java/io/github/project/openubl/xmlsender/camel/S3FilesRoute.java
@@ -101,7 +101,7 @@ public void configure() throws Exception {
                     exchange.getIn().setHeader(S3Constants.CONTENT_TYPE, "application/zip");
                     exchange.getIn().setHeader(S3Constants.CONTENT_DISPOSITION, "attachment;filename=\"${header.CamelFileName}\"");
                 })
-                .to("aws-s3:" + s3Bucket + "?deleteAfterWrite=true&amazonS3Client=#s3client")
+                .toD("aws-s3:" + s3Bucket + "?deleteAfterWrite=true&amazonS3Client=#s3client")
                 .process(exchange -> {
                     String documentID = exchange.getIn().getHeader(S3Constants.KEY, String.class);
                     exchange.getIn().setBody(documentID);
@@ -123,23 +123,20 @@ public void configure() throws Exception {
                     .endChoice()
                 .end();
 
-        from("direct:s3-get-file-util")
-                .pollEnrich().simple("aws-s3:"+ s3Bucket + "?amazonS3Client=#s3client&deleteAfterRead=false&fileName=${body}");
-
         from("direct:s3-get-file-link")
                 .id("s3-get-file-link")
                 .setHeader(S3Constants.KEY, simple("${body}"))
                 .setHeader(S3Constants.S3_OPERATION, constant("downloadLink"))
                 .setHeader(S3Constants.DOWNLOAD_LINK_EXPIRATION, constant(linkExpiration))
-                .to("aws-s3:" + s3Bucket + "?amazonS3Client=#s3client")
+                .toD("aws-s3:" + s3Bucket + "?amazonS3Client=#s3client")
                 .process(exchange -> {
                     String downloadLink = exchange.getIn().getHeader(S3Constants.DOWNLOAD_LINK, String.class);
                     exchange.getIn().setBody(downloadLink);
                 });
 
         from("direct:s3-delete-file")
                 .id("s3-delete-file")
-                .to("aws-s3:"+ s3Bucket + "?amazonS3Client=#s3client&operation=deleteObject");
+                .toD("aws-s3:"+ s3Bucket + "?amazonS3Client=#s3client&operation=deleteObject");
     }
 
 }
diff --git a/api/src/main/resources/application.properties b/api/src/main/resources/application.properties
@@ -19,7 +19,7 @@ openubl.sunat.username=12345678912MODDATOS
 openubl.sunat.password=MODDATOS
 openubl.sunat.url1=https://e-beta.sunat.gob.pe/ol-ti-itcpfegem-beta/billService
 
-openubl.storage.type=s3
+openubl.storage.type=filesystem
 openubl.storage.filesystem.folder=/myFolder
 openubl.storage.s3.bucket=project-openubl
 openubl.storage.s3.access_key_id=BQA2GEXO711FVBVXDWKM

diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,7 @@
         <maven.compiler.target>11</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <quarkus.version>1.3.2.Final</quarkus.version>
+        <quarkus.version>1.4.1.Final</quarkus.version>
         <surefire-plugin.version>2.22.1</surefire-plugin.version>
 
         <sunat-web-services.version>2.0.0.Final</sunat-web-services.version>