Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/nurkiewicz/download/DownloadController.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public DownloadController(FileStorage storage) {
@RequestMapping(method = {GET, HEAD}, value = "/{uuid}")
public ResponseEntity<Resource> redirect(
HttpMethod method,
@PathVariable UUID uuid,
@PathVariable("uuid") UUID uuid,
@RequestHeader(IF_NONE_MATCH) Optional<String> requestEtagOpt,
@RequestHeader(IF_MODIFIED_SINCE) Optional<Date> ifModifiedSinceOpt
) {
Expand All @@ -45,7 +45,7 @@ public ResponseEntity<Resource> redirect(
@RequestMapping(method = {GET, HEAD}, value = "/{uuid}/{filename}")
public ResponseEntity<Resource> download(
HttpMethod method,
@PathVariable UUID uuid,
@PathVariable("uuid") UUID uuid,
@RequestHeader(IF_NONE_MATCH) Optional<String> requestEtagOpt,
@RequestHeader(IF_MODIFIED_SINCE) Optional<Date> ifModifiedSinceOpt
) {
Expand Down
12 changes: 7 additions & 5 deletions src/main/resources/logback.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
<configuration>

<appender name="console-appender" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} | %thread | %-5level | %logger{1} | %msg%n</pattern>
</encoder>
</appender>

<logger name="com" level="INFO"/>
<logger name="com.nurkiewicz" level="ALL"/>
<logger name="net" level="INFO"/>
<logger name="org" level="INFO"/>

<root level="DEBUG">
<appender class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} | %thread | %-5level | %logger{1} | %msg%n</pattern>
</encoder>
</appender>
<appender-ref ref="console-appender"/>
</root>
</configuration>