Commit d052c8fa authored by Grzegorz Pietrusza's avatar Grzegorz Pietrusza

code inspection fixes

parent a1ccd8aa
...@@ -16,12 +16,12 @@ import java.util.List; ...@@ -16,12 +16,12 @@ import java.util.List;
public abstract class Task public abstract class Task
{ {
@Id @Id
protected ObjectId id; private ObjectId id;
@PublicProperty @PublicProperty
protected String name; private String name;
@PublicProperty @PublicProperty
protected int level; private int level;
protected List<Flag> flags; private List<Flag> flags;
public Task(String name, int level, List<Flag> flags) public Task(String name, int level, List<Flag> flags)
{ {
......
package com.telephoners.krakyournet.ctf.core;
/**
* Created by gpietrus on 21.02.2016.
*/
public class Test {
private String value;
private String asdf;
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
public String getAsdf() {
return asdf;
}
public void setAsdf(String asdf) {
this.asdf = asdf;
}
}
...@@ -7,7 +7,7 @@ import org.mongodb.morphia.Datastore; ...@@ -7,7 +7,7 @@ import org.mongodb.morphia.Datastore;
public class ApplicationModule extends AbstractModule public class ApplicationModule extends AbstractModule
{ {
private ApplicationConfiguration applicationConfiguration; private final ApplicationConfiguration applicationConfiguration;
public ApplicationModule(ApplicationConfiguration applicationConfiguration) public ApplicationModule(ApplicationConfiguration applicationConfiguration)
{ {
......
...@@ -9,7 +9,7 @@ import javax.inject.Inject; ...@@ -9,7 +9,7 @@ import javax.inject.Inject;
public class DatastoreProvider public class DatastoreProvider
{ {
private ApplicationConfiguration applicationConfiguration; private final ApplicationConfiguration applicationConfiguration;
@Inject @Inject
public DatastoreProvider(ApplicationConfiguration applicationConfiguration) public DatastoreProvider(ApplicationConfiguration applicationConfiguration)
......
...@@ -10,7 +10,7 @@ import java.security.NoSuchAlgorithmException; ...@@ -10,7 +10,7 @@ import java.security.NoSuchAlgorithmException;
@Singleton @Singleton
public class MessageDigestProvider public class MessageDigestProvider
{ {
private ApplicationConfiguration applicationConfiguration; private final ApplicationConfiguration applicationConfiguration;
@Inject @Inject
public MessageDigestProvider(ApplicationConfiguration applicationConfiguration) public MessageDigestProvider(ApplicationConfiguration applicationConfiguration)
......
...@@ -8,7 +8,7 @@ import java.util.List; ...@@ -8,7 +8,7 @@ import java.util.List;
public abstract class Repository<T> public abstract class Repository<T>
{ {
protected Datastore datastore; protected final Datastore datastore;
@Inject @Inject
public Repository(Datastore datastore) public Repository(Datastore datastore)
...@@ -23,7 +23,6 @@ public abstract class Repository<T> ...@@ -23,7 +23,6 @@ public abstract class Repository<T>
public List<T> getAll() public List<T> getAll()
{ {
//todo: unchecked cast
return datastore.createQuery(getRepositoryType()).asList(); return datastore.createQuery(getRepositoryType()).asList();
} }
......
...@@ -16,7 +16,7 @@ import java.util.stream.Collectors; ...@@ -16,7 +16,7 @@ import java.util.stream.Collectors;
@Singleton @Singleton
public class SolutionsRepository extends Repository<Solution> public class SolutionsRepository extends Repository<Solution>
{ {
private TasksRepository tasksRepository; private final TasksRepository tasksRepository;
@Inject @Inject
public SolutionsRepository(TasksRepository tasksRepository, public SolutionsRepository(TasksRepository tasksRepository,
...@@ -49,7 +49,7 @@ public class SolutionsRepository extends Repository<Solution> ...@@ -49,7 +49,7 @@ public class SolutionsRepository extends Repository<Solution>
)); ));
} }
public boolean isAlreadySubmittedSolution(Solution solution) private boolean isAlreadySubmittedSolution(Solution solution)
{ {
return !datastore.find(Solution.class) return !datastore.find(Solution.class)
.filter("flag.value", solution.getFlag().getValue()) .filter("flag.value", solution.getFlag().getValue())
......
...@@ -12,7 +12,7 @@ import java.util.List; ...@@ -12,7 +12,7 @@ import java.util.List;
@Singleton @Singleton
public class TasksRepository extends Repository<Task> public class TasksRepository extends Repository<Task>
{ {
private Datastore datastore; private final Datastore datastore;
@Inject @Inject
public TasksRepository(Datastore datastore) public TasksRepository(Datastore datastore)
......
...@@ -12,8 +12,8 @@ import javax.inject.Singleton; ...@@ -12,8 +12,8 @@ import javax.inject.Singleton;
public class TeamsRepository extends Repository<Team> public class TeamsRepository extends Repository<Team>
{ {
private Datastore datastore; private final Datastore datastore;
private UsersRepository usersRepository; private final UsersRepository usersRepository;
@Inject @Inject
public TeamsRepository(Datastore datastore, public TeamsRepository(Datastore datastore,
......
...@@ -12,7 +12,7 @@ import org.mongodb.morphia.Datastore; ...@@ -12,7 +12,7 @@ import org.mongodb.morphia.Datastore;
@Singleton @Singleton
public class UsersRepository extends Repository<User> public class UsersRepository extends Repository<User>
{ {
private MessageDigestProvider messageDigestProvider; private final MessageDigestProvider messageDigestProvider;
@Inject @Inject
public UsersRepository(Datastore datastore, MessageDigestProvider messageDigestProvider) public UsersRepository(Datastore datastore, MessageDigestProvider messageDigestProvider)
......
...@@ -25,9 +25,9 @@ import java.util.stream.Collectors; ...@@ -25,9 +25,9 @@ import java.util.stream.Collectors;
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
public class SolutionsResource public class SolutionsResource
{ {
private TeamsRepository teamsRepository; private final TeamsRepository teamsRepository;
private SolutionsRepository solutionsRepository; private final SolutionsRepository solutionsRepository;
private TasksRepository tasksRepository; private final TasksRepository tasksRepository;
@Inject @Inject
public SolutionsResource(SolutionsRepository solutionsRepository, TasksRepository tasksRepository, public SolutionsResource(SolutionsRepository solutionsRepository, TasksRepository tasksRepository,
......
...@@ -2,15 +2,8 @@ package com.telephoners.krakyournet.ctf.resources; ...@@ -2,15 +2,8 @@ package com.telephoners.krakyournet.ctf.resources;
import com.telephoners.krakyournet.ctf.beans.User; import com.telephoners.krakyournet.ctf.beans.User;
import com.telephoners.krakyournet.ctf.beans.tasks.Task; 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 com.telephoners.krakyournet.ctf.repositories.TasksRepository;
import io.dropwizard.auth.Auth; import io.dropwizard.auth.Auth;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
...@@ -18,18 +11,13 @@ import javax.ws.rs.GET; ...@@ -18,18 +11,13 @@ import javax.ws.rs.GET;
import javax.ws.rs.Path; import javax.ws.rs.Path;
import javax.ws.rs.PathParam; import javax.ws.rs.PathParam;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.stream.Collectors;
@Singleton @Singleton
@Path(value = "/task") @Path(value = "/task")
public class TaskResource public class TaskResource
{ {
private final TasksRepository tasksRepository;
protected TasksRepository tasksRepository;
@Inject @Inject
public TaskResource(TasksRepository tasksRepository) public TaskResource(TasksRepository tasksRepository)
......
...@@ -16,7 +16,7 @@ import java.util.List; ...@@ -16,7 +16,7 @@ import java.util.List;
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
public class TasksResource public class TasksResource
{ {
private TasksRepository tasksRepository; private final TasksRepository tasksRepository;
@Inject @Inject
public TasksResource(TasksRepository tasksRepository) public TasksResource(TasksRepository tasksRepository)
......
...@@ -16,7 +16,7 @@ import java.util.List; ...@@ -16,7 +16,7 @@ import java.util.List;
@Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON)
public class TeamsResource public class TeamsResource
{ {
private TeamsRepository teamsRepository; private final TeamsRepository teamsRepository;
@Inject @Inject
public TeamsResource(TeamsRepository teamsRepository) { public TeamsResource(TeamsRepository teamsRepository) {
......
...@@ -24,7 +24,7 @@ import java.io.IOException; ...@@ -24,7 +24,7 @@ import java.io.IOException;
public class UtilResource public class UtilResource
{ {
private TeamsRepository teamsRepository; private final TeamsRepository teamsRepository;
@Inject @Inject
public UtilResource(TeamsRepository teamsRepository) public UtilResource(TeamsRepository teamsRepository)
......
...@@ -3,4 +3,4 @@ ...@@ -3,4 +3,4 @@
</div> </div>
<div style="text-align:center;width:100%">made with <i class="fa fa-heart"></i> by <a <div style="text-align:center;width:100%">made with <i class="fa fa-heart"></i> by <a
href="http://telephoners.agh.edu.pl" id="telephoners"><img href="http://telephoners.agh.edu.pl" id="telephoners"><img
src="/statics/img/logo_telephoners.svg"></img></a></div> src="/statics/img/logo_telephoners.svg"></a></div>
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment