Migrate to latest Play version - addresses #92

- removes the AuthProvider from the repositories
- fixes unit tests

app/auth/AccessTokenAuthenticator.java

@@ -8,9 +8,6 @@
 import play.inject.Injector;
 import services.AccessTokenService;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 public class AccessTokenAuthenticator implements Authenticator<TokenCredentials> {
 
   private final Injector injector;
@@ -26,7 +23,7 @@ public AccessTokenAuthenticator(Injector injector, String clientName) {
   public void validate(TokenCredentials credentials, WebContext context) {
     init();
 
-    AccessToken accessToken = accessTokenService.byKey(credentials.getToken(), null) /* FIXME */;
+    AccessToken accessToken = accessTokenService.byKey(credentials.getToken(), null);
 
     if (accessToken == null) {
       throw new CredentialsException("Could not validate access token");

app/criterias/AbstractContextCriteria.java

@@ -14,7 +14,8 @@ public UUID getLoggedInUserId() {
     return loggedInUserId;
   }
 
-  public void setLoggedInUserId(UUID loggedInUserId) {
+  @Override
+  public void setLoggedInUserId(@CheckForNull UUID loggedInUserId) {
     this.loggedInUserId = loggedInUserId;
   }
 

app/criterias/AbstractSearchCriteria.java

@@ -6,6 +6,7 @@
 import play.mvc.Http.Request;
 import utils.NumberUtils;
 
+import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 import java.util.UUID;
 
@@ -68,7 +69,8 @@ public UUID getLoggedInUserId() {
     return loggedInUserId;
   }
 
-  public void setLoggedInUserId(UUID loggedInUserId) {
+  @Override
+  public void setLoggedInUserId(@CheckForNull UUID loggedInUserId) {
     this.loggedInUserId = loggedInUserId;
   }
 

app/criterias/ContextCriteria.java

@@ -7,4 +7,6 @@ public interface ContextCriteria extends FetchCriteria {
 
   @CheckForNull
   UUID getLoggedInUserId();
+
+  void setLoggedInUserId(@CheckForNull UUID loggedInUserId);
 }

app/importers/AbstractImporter.java

@@ -8,6 +8,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import play.mvc.Http;
 import services.KeyService;
 import services.MessageService;
 
@@ -49,40 +50,40 @@ public AbstractImporter(KeyService keyService, MessageService messageService) {
   }
 
   @Override
-  public void apply(File file, Locale locale) throws Exception {
+  public void apply(File file, Locale locale, Http.Request request) throws Exception {
     LOGGER.debug("Importing from file {}", file.getName());
 
     Properties properties = retrieveProperties(new FileInputStream(file), locale);
 
-    load(locale, properties.stringPropertyNames());
+    load(locale, properties.stringPropertyNames(), request);
 
-    saveKeys(locale, properties);
-    saveMessages(locale, properties);
+    saveKeys(locale, properties, request);
+    saveMessages(locale, properties, request);
 
     LOGGER.debug("Imported from file {}", file.getName());
   }
 
   abstract Properties retrieveProperties(InputStream stream, Locale locale) throws Exception;
 
-  protected void load(Locale locale, Collection<String> keyNames) {
+  protected void load(Locale locale, Collection<String> keyNames, Http.Request request) {
     keys = keyService.findBy(
-        new KeyCriteria()
+        KeyCriteria.from(request)
             .withLimit(Integer.MAX_VALUE)
             .withProjectId(locale.project.id)
             .withNames(keyNames))
         .getList()
         .stream()
         .collect(toMap(k -> k.name, a -> a));
     messages = messageService.findBy(
-        new MessageCriteria()
+        MessageCriteria.from(request)
             .withLimit(Integer.MAX_VALUE)
             .withLocaleId(locale.id))
         .getList()
         .stream()
         .collect(toMap(m -> m.key.name, a -> a));
   }
 
-  void saveKeys(Locale locale, Properties properties) {
+  void saveKeys(Locale locale, Properties properties, Http.Request request) {
     List<Key> newKeys = new ArrayList<>();
     for (String keyName : properties.stringPropertyNames()) {
       String value = (String) properties.get(keyName);
@@ -97,12 +98,12 @@ void saveKeys(Locale locale, Properties properties) {
     }
 
     // Update keys cache
-    for (Key key : keyService.save(newKeys)) {
+    for (Key key : keyService.save(newKeys, request)) {
       keys.put(key.name, key);
     }
   }
 
-  void saveMessages(Locale locale, Properties properties) {
+  void saveMessages(Locale locale, Properties properties, Http.Request request) {
     List<Message> newMessages = new ArrayList<>();
     for (String keyName : properties.stringPropertyNames()) {
       String value = (String) properties.get(keyName);
@@ -132,6 +133,6 @@ void saveMessages(Locale locale, Properties properties) {
       }
     }
 
-    messageService.save(newMessages);
+    messageService.save(newMessages, request);
   }
 }

app/importers/Importer.java

@@ -1,9 +1,10 @@
 package importers;
 
 import models.Locale;
+import play.mvc.Http;
 
 import java.io.File;
 
 public interface Importer {
-	void apply(File file, Locale locale) throws Exception;
+	void apply(File file, Locale locale, Http.Request request) throws Exception;
 }

app/importers/PropertiesImporter.java

@@ -3,6 +3,7 @@
 import models.Locale;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import play.mvc.Http;
 import services.KeyService;
 import services.MessageService;
 
@@ -18,16 +19,13 @@
 public abstract class PropertiesImporter extends AbstractImporter implements Importer {
   private static final Logger LOGGER = LoggerFactory.getLogger(PropertiesImporter.class);
 
-  /**
-   * 
-   */
   protected PropertiesImporter(KeyService keyService, MessageService messageService) {
     super(keyService, messageService);
   }
 
   /**
    * {@inheritDoc}
-   * 
+   *
    * @throws IOException
    * @throws FileNotFoundException
    * @throws UnsupportedEncodingException
@@ -44,15 +42,15 @@ Properties retrieveProperties(InputStream inputStream, Locale locale) throws IOE
   }
 
   @Override
-  public void apply(File file, Locale locale) throws Exception {
+  public void apply(File file, Locale locale, Http.Request request) throws Exception {
     LOGGER.debug("Importing from file {}", file.getName());
 
     Properties properties = retrieveProperties(new FileInputStream(file), null);
 
-    load(locale, properties.stringPropertyNames());
+    load(locale, properties.stringPropertyNames(), request);
 
-    saveKeys(locale, properties);
-    saveMessages(locale, properties);
+    saveKeys(locale, properties, request);
+    saveMessages(locale, properties, request);
 
     LOGGER.debug("Imported from file {}", file.getName());
   }

app/mappers/AccessTokenMapper.java

@@ -2,7 +2,6 @@
 
 import dto.AccessToken;
 import models.User;
-import play.mvc.Http;
 
 public class AccessTokenMapper {
   public static models.AccessToken toModel(dto.AccessToken in) {

app/mappers/NotificationMapper.java

@@ -35,11 +35,11 @@ public Notification toDto(SimpleActivity in, LogEntry activity, Http.Request req
     Notification out = new Notification();
 
     out.id = in.getId();
-    out.user = UserMapper.toDto(userService.byId(Notification.extractUuid(in.getActor())));
+    out.user = UserMapper.toDto(userService.byId(Notification.extractUuid(in.getActor()), request));
     out.verb = in.getVerb();
     out.time = in.getTime() != null ? new Date(in.getTime().getTime()) : null;
     if (activity == null)
-      activity = logEntryService.byId(Notification.extractUuid(in.getForeignId()));
+      activity = logEntryService.byId(Notification.extractUuid(in.getForeignId()), request);
     if (activity != null) {
       out.activityId = activity.id;
       out.contentType = activity.getSimpleContentType();

app/models/ProjectUser.java

@@ -6,7 +6,6 @@
 import org.joda.time.DateTime;
 import utils.CacheUtils;
 import validators.NameUnique;
-import validators.ProjectUserModifyAllowed;
 import validators.ProjectUserOwnerExists;
 import validators.ProjectUserUniqueChecker;
 
@@ -29,7 +28,6 @@
 @Table(uniqueConstraints = {@UniqueConstraint(columnNames = {"project_id", "user_id"})})
 @NameUnique(checker = ProjectUserUniqueChecker.class, field = "user", message = "error.projectuserunique")
 @ProjectUserOwnerExists
-@ProjectUserModifyAllowed
 public class ProjectUser implements Model<ProjectUser, Long> {
 
   private static final int ROLE_LENGTH = 16;

app/repositories/ModelRepository.java

@@ -18,14 +18,36 @@ public interface ModelRepository<T extends Model<T, ID>, ID, CRITERIA extends Ab
 
   T byId(GetCriteria<ID> criteria);
 
+  /**
+   * Create a new model in the database. Eventually, the {@link ModelRepository#save(Model)} method will be invoked.
+   *
+   * @param model the model including the ID
+   * @return the created model
+   * @throws javax.validation.ValidationException when either the ID is not unique, or the validation of the entity
+   *                                              fails
+   */
   T create(T model);
 
+  /**
+   * Update existing model in the database. If the model doesn't exist, a validation exception will be thrown.
+   * Eventually, the {@link ModelRepository#save(Model)} method will be invoked.
+   *
+   * @param model the model including the ID
+   * @return the updated model
+   * @throws javax.validation.ValidationException when either the ID is missing, the entity doesn't exist in the
+   *                                              database, or the validation of the entity fails
+   */
   T update(T model);
 
   /**
-   * Persist model to database.
+   * Save or update existing model in the database. Decides on the existence of the ID whether or not the entity needs
+   * to be saved or updated.
+   *
+   * @param model the model
+   * @return the saved model
+   * @throws javax.validation.ValidationException when the validation of the entity fails
    */
-  T save(T t);
+  T save(T model);
 
   /**
    * Persist model collection to database.

app/repositories/ProjectRepository.java

@@ -33,7 +33,7 @@ FETCH_KEYS, singletonList(FETCH_KEYS),
                     FETCH_LOCALES, singletonList(FETCH_LOCALES)
             );
 
-    Project byOwnerAndName(String username, String name, String... fetches);
+    Project byOwnerAndName(String username, String name, UUID loggedInUserId, String... fetches);
 
     Map<UUID, Double> progress(List<UUID> projectIds);
 }