Commit 4049a16d authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Actualiza imagen de compilación

See merge request redmic-project/server/library/mediastorage!1
parents 4312336b b57f31cf

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ stages: 


maven-build:

  stage: build

  image: redmic/maven-gitlab

  image: registry.gitlab.com/redmic-project/docker/maven

  variables:

    MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"

  only:

pom.xml

+90 −28
Original line number Diff line number Diff line
@@ -3,44 +3,55 @@ 
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">



	<parent>

		<groupId>es.redmic.lib</groupId>

		<artifactId>libs</artifactId>

		<version>0.6.0</version>

		<groupId>org.springframework.boot</groupId>

   		<artifactId>spring-boot-starter-parent</artifactId>

    	<version>2.0.0.RELEASE</version>

		<relativePath/>

	</parent>



	<modelVersion>4.0.0</modelVersion>

	<groupId>es.redmic.lib</groupId>

	<artifactId>mediastorage</artifactId>

	<packaging>jar</packaging>

	<version>0.6.0</version>

	<name>Mediastorage</name>

	<description>Publicación de ficheros</description>

	<description>MediaStorage utils and management</description>



	<dependencyManagement>

		<dependencies>

			<dependency>

				<groupId>org.springframework.cloud</groupId>

				<artifactId>spring-cloud-aws</artifactId>

				<version>${spring-cloud-aws.version}</version>

				<type>pom</type>

				<scope>import</scope>

			</dependency>

		</dependencies>

	</dependencyManagement>

	<properties>

		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

		<maven.compiler.source>1.8</maven.compiler.source>

		<maven.compiler.target>1.8</maven.compiler.target>

		<java.version>1.8</java.version>



	<dependencies>

		<!-- REDMIC -->

		<redmic.exceptions.version>0.6.0</redmic.exceptions.version>

		<redmic.models.version>0.6.0</redmic.models.version>

		

		<!-- Redmic -->

		<!-- OTHERS -->

		<commons-io.version>2.6</commons-io.version>

		<spring-cloud-aws.version>1.2.0.RELEASE</spring-cloud-aws.version>

		

		<!-- Version plugins -->

		<jacoco.version>0.8.1</jacoco.version>



		<!-- Environment variables -->

		<env.MAVEN_REPO_URL>https://artifactory.redmic.net/artifactory</env.MAVEN_REPO_URL>

	</properties>

	

	<dependencies>

		<!-- Redmic -->

		<dependency>

			<groupId>es.redmic.lib</groupId>

			<artifactId>exceptions</artifactId>

			<version>${redmic.version}</version>

			<version>${redmic.exceptions.version}</version>

			<scope>provided</scope>

		</dependency>



		<dependency>

			<groupId>es.redmic.lib</groupId>

			<artifactId>models</artifactId>

			<version>${redmic.version}</version>

			<version>${redmic.models.version}</version>

			<scope>provided</scope>

		</dependency>
@@ -59,19 +70,70 @@ 
			<artifactId>spring-cloud-aws-context</artifactId>

		</dependency>

		

		<!-- Apache Commons file upload -->



		<dependency>

			<groupId>com.itextpdf</groupId>

			<artifactId>itextpdf</artifactId>

			<version>${com.itextpdf}</version>

		</dependency>

		

		<dependency>

			<groupId>commons-io</groupId>

			<artifactId>commons-io</artifactId>

			<version>${commons-io.version}</version>

		</dependency>

	</dependencies>

		

		<!-- Logs -->

		<dependency>

			<groupId>org.apache.logging.log4j</groupId>

			<artifactId>log4j-api</artifactId>

			<scope>provided</scope>

		</dependency>

		<dependency>

			<groupId>org.apache.logging.log4j</groupId>

			<artifactId>log4j-core</artifactId>

			<scope>provided</scope>

		</dependency>

	</dependencies>

	<dependencyManagement>

		<dependencies>

			<dependency>

				<groupId>org.springframework.cloud</groupId>

				<artifactId>spring-cloud-aws</artifactId>

				<version>${spring-cloud-aws.version}</version>

				<type>pom</type>

				<scope>import</scope>

			</dependency>

		</dependencies>

	</dependencyManagement>

	<distributionManagement>

		<repository>

			<id>central</id>

			<name>redmic-releases</name>

			<url>${env.MAVEN_REPO_URL}/libs-release-local</url>

		</repository>

		<snapshotRepository>

			<id>snapshots</id>

			<name>redmic-snapshots</name>

			<url>${env.MAVEN_REPO_URL}/libs-snapshot-local</url>

			<uniqueVersion>false</uniqueVersion>

		</snapshotRepository>

	</distributionManagement>

	<build>

		<plugins>

			<plugin>

				<groupId>org.jacoco</groupId>

				<artifactId>jacoco-maven-plugin</artifactId>

				<version>${jacoco.version}</version>

				<executions>

					<execution>

						<id>pre-unit-test</id>

						<goals>

							<goal>prepare-agent</goal>

						</goals>

					</execution>

					<execution>

						<id>post-unit-test</id>

						<phase>test</phase>

						<goals>

							<goal>report</goal>

						</goals>

					</execution>

				</executions>

			</plugin>

		</plugins>

	</build>

</project>

src/main/java/es/redmic/mediastorage/service/MediaStorageS3Service.java

+3 −5
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import com.amazonaws.services.s3.transfer.Download; 
import com.amazonaws.services.s3.transfer.TransferManager;

import com.amazonaws.services.s3.transfer.TransferManagerBuilder;

import com.amazonaws.services.s3.transfer.Upload;

import com.itextpdf.text.pdf.PdfWriter;



import es.redmic.exception.mediastorage.MSFileNotFoundException;

import es.redmic.exception.mediastorage.MSFileUploadException;
@@ -241,8 +240,8 @@ public class MediaStorageS3Service extends MediaStorageService { 
	 * @param name

	 *            nombre del fichero

	 * @param response

	 *            objeto http donde se guarda el documento para ser devuelta por

	 *            el controlador

	 *            objeto http donde se guarda el documento para ser devuelta por el

	 *            controlador

	 * @param path

	 *            ruta donde se va a buscar el fichero

	 */
@@ -263,8 +262,7 @@ public class MediaStorageS3Service extends MediaStorageService { 
			result.waitForCompletion();



			IOUtils.copy(new FileInputStream(file), response.getOutputStream());

			com.itextpdf.text.Document document = new com.itextpdf.text.Document();

			PdfWriter.getInstance(document, response.getOutputStream());



		} catch (Exception e) {

			throw new MSFileNotFoundException(file.getName(), pathResourse, e);

		}