Commit d052c8fa authored by Grzegorz Pietrusza's avatar Grzegorz Pietrusza

code inspection fixes

parent a1ccd8aa
......@@ -16,12 +16,12 @@ import java.util.List;
public abstract class Task
{
@Id
protected ObjectId id;
private ObjectId id;
@PublicProperty
protected String name;
private String name;
@PublicProperty
protected int level;
protected List<Flag> flags;
private int level;
private 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;
public class ApplicationModule extends AbstractModule
{
private ApplicationConfiguration applicationConfiguration;
private final ApplicationConfiguration applicationConfiguration;
public ApplicationModule(ApplicationConfiguration applicationConfiguration)
{
......
......@@ -9,7 +9,7 @@ import javax.inject.Inject;
public class DatastoreProvider
{
private ApplicationConfiguration applicationConfiguration;
private final ApplicationConfiguration applicationConfiguration;
@Inject
public DatastoreProvider(ApplicationConfiguration applicationConfiguration)
......
......@@ -10,7 +10,7 @@ import java.security.NoSuchAlgorithmException;
@Singleton
public class MessageDigestProvider
{
private ApplicationConfiguration applicationConfiguration;
private final ApplicationConfiguration applicationConfiguration;
@Inject
public MessageDigestProvider(ApplicationConfiguration applicationConfiguration)
......
......@@ -8,7 +8,7 @@ import java.util.List;
public abstract class Repository<T>
{
protected Datastore datastore;
protected final Datastore datastore;
@Inject
public Repository(Datastore datastore)
......@@ -23,7 +23,6 @@ public abstract class Repository<T>
public List<T> getAll()
{
//todo: unchecked cast
return datastore.createQuery(getRepositoryType()).asList();
}
......
......@@ -16,7 +16,7 @@ import java.util.stream.Collectors;
@Singleton
public class SolutionsRepository extends Repository<Solution>
{
private TasksRepository tasksRepository;
private final TasksRepository tasksRepository;
@Inject
public SolutionsRepository(TasksRepository tasksRepository,
......@@ -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)
.filter("flag.value", solution.getFlag().getValue())
......
......@@ -12,7 +12,7 @@ import java.util.List;
@Singleton
public class TasksRepository extends Repository<Task>
{
private Datastore datastore;
private final Datastore datastore;
@Inject
public TasksRepository(Datastore datastore)
......
......@@ -12,8 +12,8 @@ import javax.inject.Singleton;
public class TeamsRepository extends Repository<Team>
{
private Datastore datastore;
private UsersRepository usersRepository;
private final Datastore datastore;
private final UsersRepository usersRepository;
@Inject
public TeamsRepository(Datastore datastore,
......
......@@ -12,7 +12,7 @@ import org.mongodb.morphia.Datastore;
@Singleton
public class UsersRepository extends Repository<User>
{
private MessageDigestProvider messageDigestProvider;
private final MessageDigestProvider messageDigestProvider;
@Inject
public UsersRepository(Datastore datastore, MessageDigestProvider messageDigestProvider)
......
......@@ -25,9 +25,9 @@ import java.util.stream.Collectors;
@Produces(MediaType.APPLICATION_JSON)
public class SolutionsResource
{
private TeamsRepository teamsRepository;
private SolutionsRepository solutionsRepository;
private TasksRepository tasksRepository;
private final TeamsRepository teamsRepository;
private final SolutionsRepository solutionsRepository;
private final TasksRepository tasksRepository;
@Inject
public SolutionsResource(SolutionsRepository solutionsRepository, TasksRepository tasksRepository,
......
......@@ -2,15 +2,8 @@ package com.telephoners.krakyournet.ctf.resources;
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;
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.Singleton;
......@@ -18,18 +11,13 @@ import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.core.Response;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.stream.Collectors;
@Singleton
@Path(value = "/task")
public class TaskResource
{
protected TasksRepository tasksRepository;
private final TasksRepository tasksRepository;
@Inject
public TaskResource(TasksRepository tasksRepository)
......
......@@ -16,7 +16,7 @@ import java.util.List;
@Produces(MediaType.APPLICATION_JSON)
public class TasksResource
{
private TasksRepository tasksRepository;
private final TasksRepository tasksRepository;
@Inject
public TasksResource(TasksRepository tasksRepository)
......
......@@ -16,7 +16,7 @@ import java.util.List;
@Produces(MediaType.APPLICATION_JSON)
public class TeamsResource
{
private TeamsRepository teamsRepository;
private final TeamsRepository teamsRepository;
@Inject
public TeamsResource(TeamsRepository teamsRepository) {
......
......@@ -24,7 +24,7 @@ import java.io.IOException;
public class UtilResource
{
private TeamsRepository teamsRepository;
private final TeamsRepository teamsRepository;
@Inject
public UtilResource(TeamsRepository teamsRepository)
......
......@@ -3,4 +3,4 @@
</div>
<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
src="/statics/img/logo_telephoners.svg"></img></a></div>
\ No newline at end of file
src="/statics/img/logo_telephoners.svg"></a></div>
\ 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