rename package to beans

service/src/main/java/com/telephoners/krakyournet/ctf/CTFApplication.java

@@ -9,7 +9,7 @@ import com.telephoners.krakyournet.ctf.commands.RegisterTasksCommand;
 import com.telephoners.krakyournet.ctf.commands.RegisterTeamsCommand;
 import com.telephoners.krakyournet.ctf.core.ApplicationConfiguration;
 import com.telephoners.krakyournet.ctf.modules.ApplicationModule;
-import com.telephoners.krakyournet.ctf.objects.User;
+import com.telephoners.krakyournet.ctf.beans.User;
 import com.telephoners.krakyournet.ctf.repositories.UsersRepository;
 import com.telephoners.krakyournet.ctf.resources.*;
 import io.dropwizard.Application;

service/src/main/java/com/telephoners/krakyournet/ctf/auth/ExampleAuthenticator.java

@@ -2,7 +2,7 @@ package com.telephoners.krakyournet.ctf.auth;
 
 import com.google.common.base.Optional;
 import com.google.inject.Inject;
-import com.telephoners.krakyournet.ctf.objects.User;
+import com.telephoners.krakyournet.ctf.beans.User;
 import com.telephoners.krakyournet.ctf.repositories.UsersRepository;
 import io.dropwizard.auth.AuthenticationException;
 import io.dropwizard.auth.Authenticator;

service/src/main/java/com/telephoners/krakyournet/ctf/objects/Flag.java → service/src/main/java/com/telephoners/krakyournet/ctf/beans/Flag.java

-package com.telephoners.krakyournet.ctf.objects;
+package com.telephoners.krakyournet.ctf.beans;
 
 public class Flag {
     private String value;

service/src/main/java/com/telephoners/krakyournet/ctf/objects/Solution.java → service/src/main/java/com/telephoners/krakyournet/ctf/beans/Solution.java

-package com.telephoners.krakyournet.ctf.objects;
+package com.telephoners.krakyournet.ctf.beans;
 
-import com.telephoners.krakyournet.ctf.objects.tasks.Task;
+import com.telephoners.krakyournet.ctf.beans.tasks.Task;
 import org.bson.types.ObjectId;
 import org.mongodb.morphia.annotations.Entity;
 import org.mongodb.morphia.annotations.Id;

service/src/main/java/com/telephoners/krakyournet/ctf/objects/Team.java → service/src/main/java/com/telephoners/krakyournet/ctf/beans/Team.java

-package com.telephoners.krakyournet.ctf.objects;
+package com.telephoners.krakyournet.ctf.beans;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

service/src/main/java/com/telephoners/krakyournet/ctf/objects/User.java → service/src/main/java/com/telephoners/krakyournet/ctf/beans/User.java

-package com.telephoners.krakyournet.ctf.objects;
+package com.telephoners.krakyournet.ctf.beans;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

service/src/main/java/com/telephoners/krakyournet/ctf/objects/tasks/Task.java → service/src/main/java/com/telephoners/krakyournet/ctf/beans/tasks/Task.java

-package com.telephoners.krakyournet.ctf.objects.tasks;
+package com.telephoners.krakyournet.ctf.beans.tasks;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.telephoners.krakyournet.ctf.core.TaskType;
 import com.telephoners.krakyournet.ctf.helpers.PublicProperty;
-import com.telephoners.krakyournet.ctf.objects.Flag;
+import com.telephoners.krakyournet.ctf.beans.Flag;
 import org.bson.types.ObjectId;
 import org.mongodb.morphia.annotations.Entity;
 import org.mongodb.morphia.annotations.Id;

service/src/main/java/com/telephoners/krakyournet/ctf/objects/tasks/TextTask.java → service/src/main/java/com/telephoners/krakyournet/ctf/beans/tasks/TextTask.java

-package com.telephoners.krakyournet.ctf.objects.tasks;
+package com.telephoners.krakyournet.ctf.beans.tasks;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.telephoners.krakyournet.ctf.objects.Flag;
+import com.telephoners.krakyournet.ctf.beans.Flag;
 import org.mongodb.morphia.annotations.Entity;
 
 import java.util.List;

service/src/main/java/com/telephoners/krakyournet/ctf/objects/tasks/WebTask.java → service/src/main/java/com/telephoners/krakyournet/ctf/beans/tasks/WebTask.java

-package com.telephoners.krakyournet.ctf.objects.tasks;
+package com.telephoners.krakyournet.ctf.beans.tasks;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.telephoners.krakyournet.ctf.objects.Flag;
+import com.telephoners.krakyournet.ctf.beans.Flag;
 import org.mongodb.morphia.annotations.Entity;
 
 import java.util.List;

service/src/main/java/com/telephoners/krakyournet/ctf/commands/RegisterTasksCommand.java

@@ -4,8 +4,8 @@ import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.telephoners.krakyournet.ctf.core.ApplicationConfiguration;
 import com.telephoners.krakyournet.ctf.modules.ApplicationModule;
-import com.telephoners.krakyournet.ctf.objects.tasks.TextTask;
-import com.telephoners.krakyournet.ctf.objects.tasks.WebTask;
+import com.telephoners.krakyournet.ctf.beans.tasks.TextTask;
+import com.telephoners.krakyournet.ctf.beans.tasks.WebTask;
 import com.telephoners.krakyournet.ctf.repositories.TasksRepository;
 import io.dropwizard.cli.ConfiguredCommand;
 import io.dropwizard.setup.Bootstrap;

service/src/main/java/com/telephoners/krakyournet/ctf/core/ApplicationConfiguration.java

 package com.telephoners.krakyournet.ctf.core;
 
-import com.telephoners.krakyournet.ctf.objects.Team;
-import com.telephoners.krakyournet.ctf.objects.User;
-import com.telephoners.krakyournet.ctf.objects.tasks.TextTask;
-import com.telephoners.krakyournet.ctf.objects.tasks.WebTask;
+import com.telephoners.krakyournet.ctf.beans.Team;
+import com.telephoners.krakyournet.ctf.beans.User;
+import com.telephoners.krakyournet.ctf.beans.tasks.TextTask;
+import com.telephoners.krakyournet.ctf.beans.tasks.WebTask;
 import io.dropwizard.Configuration;
 
 import java.util.List;

service/src/main/java/com/telephoners/krakyournet/ctf/helpers/DBObjectUtils.java

 package com.telephoners.krakyournet.ctf.helpers;
 
-import com.telephoners.krakyournet.ctf.objects.tasks.Task;
+import com.telephoners.krakyournet.ctf.beans.tasks.Task;
 
 import java.lang.reflect.Field;
 import java.util.List;

service/src/main/java/com/telephoners/krakyournet/ctf/modules/ApplicationModule.java

@@ -22,7 +22,7 @@ public class ApplicationModule extends AbstractModule
         bind(ApplicationConfiguration.class).toInstance(applicationConfiguration); //todo: refactor
 
         Morphia morphia = new Morphia();
-        morphia.mapPackage("objects.Team"); //todo? what for?
+        morphia.mapPackage("beans.Team"); //todo? what for?
         //todo: instantiate somewhere else?
         Datastore datastore = morphia.createDatastore(
                 new MongoClient(applicationConfiguration.getDbHost(), applicationConfiguration.getDbPort()), applicationConfiguration.getDbName());

service/src/main/java/com/telephoners/krakyournet/ctf/repositories/SolutionsRepository.java

 package com.telephoners.krakyournet.ctf.repositories;
 
-import com.telephoners.krakyournet.ctf.objects.Solution;
-import com.telephoners.krakyournet.ctf.objects.Team;
+import com.telephoners.krakyournet.ctf.beans.Solution;
+import com.telephoners.krakyournet.ctf.beans.Team;
 import org.mongodb.morphia.Datastore;
 
 import javax.inject.Inject;

service/src/main/java/com/telephoners/krakyournet/ctf/repositories/TasksRepository.java

@@ -2,11 +2,11 @@ package com.telephoners.krakyournet.ctf.repositories;
 
 import com.telephoners.krakyournet.ctf.core.ApplicationConfiguration;
 import com.telephoners.krakyournet.ctf.helpers.DBObjectUtils;
-import com.telephoners.krakyournet.ctf.objects.Flag;
-import com.telephoners.krakyournet.ctf.objects.Solution;
-import com.telephoners.krakyournet.ctf.objects.Team;
-import com.telephoners.krakyournet.ctf.objects.User;
-import com.telephoners.krakyournet.ctf.objects.tasks.Task;
+import com.telephoners.krakyournet.ctf.beans.Flag;
+import com.telephoners.krakyournet.ctf.beans.Solution;
+import com.telephoners.krakyournet.ctf.beans.Team;
+import com.telephoners.krakyournet.ctf.beans.User;
+import com.telephoners.krakyournet.ctf.beans.tasks.Task;
 import javafx.util.Pair;
 import org.apache.commons.codec.binary.Hex;
 import org.mongodb.morphia.Datastore;

service/src/main/java/com/telephoners/krakyournet/ctf/repositories/TeamsRepository.java

 package com.telephoners.krakyournet.ctf.repositories;
 
 import com.telephoners.krakyournet.ctf.core.ApplicationConfiguration;
-import com.telephoners.krakyournet.ctf.objects.Team;
-import com.telephoners.krakyournet.ctf.objects.User;
+import com.telephoners.krakyournet.ctf.beans.Team;
+import com.telephoners.krakyournet.ctf.beans.User;
 import org.mongodb.morphia.Datastore;
 
 import javax.inject.Inject;

service/src/main/java/com/telephoners/krakyournet/ctf/repositories/UsersRepository.java

@@ -2,7 +2,7 @@ package com.telephoners.krakyournet.ctf.repositories;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-import com.telephoners.krakyournet.ctf.objects.User;
+import com.telephoners.krakyournet.ctf.beans.User;
 import io.dropwizard.auth.basic.BasicCredentials;
 import org.apache.commons.codec.binary.Hex;
 import org.mongodb.morphia.Datastore;

service/src/main/java/com/telephoners/krakyournet/ctf/resources/ProxyResource.java

 package com.telephoners.krakyournet.ctf.resources;
 
-import com.telephoners.krakyournet.ctf.objects.User;
+import com.telephoners.krakyournet.ctf.beans.User;
 import io.dropwizard.auth.Auth;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;

service/src/main/java/com/telephoners/krakyournet/ctf/resources/SolutionsResource.java

 package com.telephoners.krakyournet.ctf.resources;
 
-import com.telephoners.krakyournet.ctf.objects.Solution;
-import com.telephoners.krakyournet.ctf.objects.Team;
-import com.telephoners.krakyournet.ctf.objects.User;
-import com.telephoners.krakyournet.ctf.objects.tasks.Task;
+import com.telephoners.krakyournet.ctf.beans.Solution;
+import com.telephoners.krakyournet.ctf.beans.Team;
+import com.telephoners.krakyournet.ctf.beans.User;
+import com.telephoners.krakyournet.ctf.beans.tasks.Task;
 import com.telephoners.krakyournet.ctf.repositories.SolutionsRepository;
 import com.telephoners.krakyournet.ctf.repositories.TasksRepository;
 import com.telephoners.krakyournet.ctf.repositories.TeamsRepository;

service/src/main/java/com/telephoners/krakyournet/ctf/resources/TaskResource.java

 package com.telephoners.krakyournet.ctf.resources;
 
-import com.telephoners.krakyournet.ctf.objects.User;
-import com.telephoners.krakyournet.ctf.objects.tasks.Task;
-import com.telephoners.krakyournet.ctf.objects.tasks.TextTask;
-import com.telephoners.krakyournet.ctf.objects.tasks.WebTask;
+import com.telephoners.krakyournet.ctf.beans.User;
+import com.telephoners.krakyournet.ctf.beans.tasks.Task;
+import com.telephoners.krakyournet.ctf.beans.tasks.TextTask;
+import com.telephoners.krakyournet.ctf.beans.tasks.WebTask;
 import com.telephoners.krakyournet.ctf.repositories.TasksRepository;
 import io.dropwizard.auth.Auth;
 import org.apache.http.HttpEntity;

service/src/main/java/com/telephoners/krakyournet/ctf/resources/TasksResource.java

 package com.telephoners.krakyournet.ctf.resources;
 
-import com.telephoners.krakyournet.ctf.objects.User;
-import com.telephoners.krakyournet.ctf.objects.tasks.Task;
+import com.telephoners.krakyournet.ctf.beans.User;
+import com.telephoners.krakyournet.ctf.beans.tasks.Task;
 import com.telephoners.krakyournet.ctf.repositories.TasksRepository;
 import io.dropwizard.auth.Auth;
 import org.apache.commons.collections.MapUtils;

service/src/main/java/com/telephoners/krakyournet/ctf/resources/TeamsResource.java

 package com.telephoners.krakyournet.ctf.resources;
 
-import com.telephoners.krakyournet.ctf.objects.Team;
+import com.telephoners.krakyournet.ctf.beans.Team;
 import com.telephoners.krakyournet.ctf.repositories.TeamsRepository;
 
 import javax.inject.Inject;

service/src/main/java/com/telephoners/krakyournet/ctf/resources/UtilResource.java

 package com.telephoners.krakyournet.ctf.resources;
 
 import com.google.common.collect.ImmutableMap;
-import com.telephoners.krakyournet.ctf.objects.Team;
-import com.telephoners.krakyournet.ctf.objects.User;
+import com.telephoners.krakyournet.ctf.beans.Team;
+import com.telephoners.krakyournet.ctf.beans.User;
 import com.telephoners.krakyournet.ctf.repositories.TeamsRepository;
 import io.dropwizard.auth.Auth;