BP-731, fix pom.xml to disable filter for defined file extensions
diff --git a/oKBereitschaftsplanungBackend/pom.xml b/oKBereitschaftsplanungBackend/pom.xml
index 818084c..c3c50b7 100644
--- a/oKBereitschaftsplanungBackend/pom.xml
+++ b/oKBereitschaftsplanungBackend/pom.xml
@@ -341,6 +341,7 @@
<filters>
<filter>src/config/${build.profile.name}/config.properties</filter>
+
</filters>
<resources>
@@ -395,6 +396,28 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ <nonFilteredFileExtensions>
+ <nonFilteredFileExtension>jar</nonFilteredFileExtension>
+ <nonFilteredFileExtension>pdf</nonFilteredFileExtension>
+ <nonFilteredFileExtension>swf</nonFilteredFileExtension>
+ <nonFilteredFileExtension>zip</nonFilteredFileExtension>
+ <nonFilteredFileExtension>bz2</nonFilteredFileExtension>
+ <nonFilteredFileExtension>gz</nonFilteredFileExtension>
+ <nonFilteredFileExtension>acp</nonFilteredFileExtension>
+ <nonFilteredFileExtension>bin</nonFilteredFileExtension>
+ <nonFilteredFileExtension>odt</nonFilteredFileExtension>
+ <nonFilteredFileExtension>doc</nonFilteredFileExtension>
+ <nonFilteredFileExtension>xls</nonFilteredFileExtension>
+ <nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
+ </nonFilteredFileExtensions>
+ </configuration>
+ </plugin>
<!-- plugin> <artifactId>maven-javadoc-plugin</artifactId> <version>2.10.3</version>
<executions> <execution> <id>attach-javadocs</id> <goals> <goal>jar</goal>
</goals> </execution> </executions> </plugin> -->
@@ -443,7 +466,7 @@
<goal>process-asciidoc</goal>
</goals>
<configuration>
- <toc />
+ <toc />
<skip>${skip.asciidoc}</skip>
<preserveDirectories>true</preserveDirectories>
<imagesDir>${project.build.directory}/generated-docs/images</imagesDir>
diff --git a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/DocumentController.java b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/DocumentController.java
index 5908b2d..b4ce57e 100644
--- a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/DocumentController.java
+++ b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/DocumentController.java
@@ -16,7 +16,6 @@
import java.io.IOException;
import org.apache.log4j.Logger;
-import org.eclipse.openk.sp.dto.DocumentDto;
import org.eclipse.openk.sp.exceptions.SpException;
import org.eclipse.openk.sp.exceptions.SpExceptionEnum;
import org.eclipse.openk.sp.util.FileHelper;
@@ -42,33 +41,7 @@
* @return
* @throws IOException
*/
- public DocumentDto getUserDocumentation() throws SpException {
- try {
- File file = fileHelper.loadFileFromFileSystemOrResource(USER_DOCUMENTATION_PATH, USER_DOCUMENTATION_FILE,
- false);
- byte[] bytes = fileHelper.convertFileToByteArray(file);
- LOGGER.debug("bytes: " + bytes);
-
- // String encodedBase64 = null;
- // encodedBase64 = Base64.getEncoder().encodeToString(bytes);
- // LOGGER.debug("Base64: " + encodedBase64);
- DocumentDto dto = new DocumentDto();
- dto.setData(bytes);
- dto.setDocumentName(USER_DOCUMENTATION_FILE);
- return dto;
- } catch (Exception e) {
- SpException spE = new SpException(SpExceptionEnum.LOADING_LIST_EXCEPTION, SpMsg.TXT_BRANCHES);
- LOGGER.error(spE, spE);
- throw spE;
- }
- }
-
- /**
- *
- * @return
- * @throws IOException
- */
- public File getUserDocumentation2() throws SpException {
+ public File getUserDocumentation() throws SpException {
try {
return fileHelper.loadFileFromFileSystemOrResource(USER_DOCUMENTATION_PATH, USER_DOCUMENTATION_FILE, false);
} catch (Exception e) {
diff --git a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/rest/DocumentService.java b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/rest/DocumentService.java
index 725ee65..ce47615 100644
--- a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/rest/DocumentService.java
+++ b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/rest/DocumentService.java
@@ -21,7 +21,6 @@
import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.StreamingOutput;
@@ -55,69 +54,6 @@
super(Logger.getLogger(DocumentService.class.getName()), new FileHelper());
}
- // @Override
- // protected Response invokeRunnable(String token, String[] arrSecureType,
- // ModifyingInvokable invokable) {
- // try (AutoCloseable ignored = perform(invokable.getClass().getName() +
- // ".Invoke()")) { // NOSONAR
- // String changeUserName = "";
- //
- // assertAndRefreshToken(token, arrSecureType);
- // changeUserName = JwtHelper.getJwtPayload(token).getPreferredUsername();
- // Object o = invokable.invoke(changeUserName);
- // DocumentDto dto = (DocumentDto) o;
- // byte[] bytes = dto.getData();
- // ByteArrayOutputStream baos = new ByteArrayOutputStream(bytes.length);
- // baos.write(bytes, 0, bytes.length);
- // // String str = new Gson().toJson((DocumentDto) o);
- // // logger.debug("JSON String: " + str);
- //
- // return Response.ok(baos, "application/pdf")
- // .header("Content-Disposition", "attachment; filename=" +
- // dto.getDocumentName()).build();
- //
- // } catch (HttpStatusException e) {
- // SpErrorEntry ee = null;
- // switch (e.getHttpStatus()) {
- // case 401:
- // ee = SpExceptionEnum.HTTP_UNAUTHERIZED_EXCEPTION.getEntry();
- // break;
- // case 404:
- // ee = SpExceptionEnum.HTTP_UNAUTHERIZED_EXCEPTION.getEntry();
- // break;
- // case 500:
- // ee = SpExceptionEnum.HTTP_INTERNAL_SERVER_EXCEPTION.getEntry();
- // break;
- // default:
- // ee = SpExceptionEnum.DEFAULT_EXCEPTION.getEntry();
- // break;
- // }
- // ee.setE(e);
- // SpException spException = new SpException(ee);
- // logger.error(e.getHttpStatus(), spException);
- // return
- // Response.status(spException.getHttpStatus()).entity(spException).build();
- //
- // } catch (TransactionSystemException e) {
- // String errorString =
- // SPExceptionParser.parseSQLExceptions(e.getCause().getMessage());
- // SpErrorEntry ee = SpExceptionEnum.DB_TRANSACTIONAL_EXCEPTION.getEntry();
- // // TransactionSystemException is not serializable
- // SpException spe = new SpException(500,
- // SpExceptionMapper.getExceptionStacktrace(e), null);
- //
- // SpException spException = new SpException(ee.getCode(), spe, errorString);
- // logger.error(errorString, spException);
- // return
- // Response.status(spException.getHttpStatus()).entity(spException).build();
- //
- // } catch (Exception e) {
- // SpErrorEntry ee = SpExceptionEnum.DEFAULT_EXCEPTION.getEntry();
- // SpException spException = new SpException(ee);
- // return Response.status(500).entity(spException).build();
- // }
- // }
-
protected StreamingOutput invokeRunnablePDF(String token, String[] arrSecureType, ModifyingInvokable invokable) {
try (AutoCloseable ignored = perform(invokable.getClass().getName() + ".Invoke()")) { // NOSONAR
String changeUserName = "";
@@ -167,29 +103,13 @@
}
}
- // @GET
- // @Path("/user/documentation")
- // @Produces(MediaType.APPLICATION_OCTET_STREAM)
- // public Response getUserDocumentation(@Context HttpServletResponse
- // servletResponse,
- // @ApiParam(name = "Authorization", value = "JWT Token", required = true)
- // @HeaderParam(value = Globals.KEYCLOAK_AUTH_TAG) String jwt) {
- //
- // ModifyingInvokable<DocumentDto> invokable = modusr ->
- // documentController.getUserDocumentation();
- //
- // String[] securityRoles = Globals.getAllRolls();
- //
- // return invokeRunnable(jwt, securityRoles, invokable);
- // }
-
@GET
@Path("/user/documentation")
- @Produces(MediaType.APPLICATION_OCTET_STREAM)
+ @Produces({ "application/pdf" })
public StreamingOutput getUserDocumentation2(@Context HttpServletResponse servletResponse,
@ApiParam(name = "Authorization", value = "JWT Token", required = true) @HeaderParam(value = Globals.KEYCLOAK_AUTH_TAG) String jwt) {
- ModifyingInvokable<File> invokable = modusr -> documentController.getUserDocumentation2();
+ ModifyingInvokable<File> invokable = modusr -> documentController.getUserDocumentation();
String[] securityRoles = Globals.getAllRolls();
