Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

dropwizard upgrade

Browse Source
This commit is contained in:
Athou
2015-06-19 08:41:23 +02:00
parent 84f51603fb
commit bae5c67dfa
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -15,7 +15,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<dropwizard.version>0.8.1</dropwizard.version> <dropwizard.version>0.9.0-rc1</dropwizard.version>
<guice.version>4.0</guice.version> <guice.version>4.0</guice.version>
<querydsl.version>3.6.4</querydsl.version> <querydsl.version>3.6.4</querydsl.version>
<rome.version>1.5.0</rome.version> <rome.version>1.5.0</rome.version>

10
src/main/java/com/commafeed/frontend/resource/UserREST.java
View File

@@ -4,14 +4,12 @@ import io.dropwizard.hibernate.UnitOfWork;
import io.dropwizard.jersey.validation.ValidationErrorMessage; import io.dropwizard.jersey.validation.ValidationErrorMessage;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import javax.validation.ConstraintViolation;
import javax.validation.Valid; import javax.validation.Valid;
import javax.ws.rs.Consumes; import javax.ws.rs.Consumes;
import javax.ws.rs.GET; import javax.ws.rs.GET;
@@ -230,12 +228,8 @@ public class UserREST {
sessionHelper.setLoggedInUser(registeredUser); sessionHelper.setLoggedInUser(registeredUser);
return Response.ok().build(); return Response.ok().build();
} catch (final IllegalArgumentException e) { } catch (final IllegalArgumentException e) {
return Response.status(422).entity(new ValidationErrorMessage(Collections.<ConstraintViolation<?>> emptySet()) { return Response.status(422).entity(new ValidationErrorMessage(ImmutableList.of(e.getMessage()))).type(MediaType.TEXT_PLAIN)
@Override .build();
public ImmutableList<String> getErrors() {
return ImmutableList.of(e.getMessage());
}
}).type(MediaType.TEXT_PLAIN).build();
} }
} }