Renamed package.

This commit is contained in:
neviyn 2018-09-27 09:05:22 +01:00
parent 498478b577
commit 2950095e50
29 changed files with 100 additions and 101 deletions

View File

@ -152,7 +152,7 @@
<transformers> <transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>uk.co.neviyn.Observations.ObservationsApplication</mainClass> <mainClass>uk.co.neviyn.observations.ObservationsApplication</mainClass>
</transformer> </transformer>
</transformers> </transformers>
</configuration> </configuration>
@ -181,7 +181,7 @@
<argument>server</argument> <argument>server</argument>
<argument>configuration.yml</argument> <argument>configuration.yml</argument>
</arguments> </arguments>
<mainClass>uk.co.neviyn.Observations.ObservationsApplication</mainClass> <mainClass>uk.co.neviyn.observations.ObservationsApplication</mainClass>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

View File

@ -1,4 +1,4 @@
package uk.co.neviyn.Observations; package uk.co.neviyn.observations;
import io.dropwizard.Application; import io.dropwizard.Application;
import io.dropwizard.assets.AssetsBundle; import io.dropwizard.assets.AssetsBundle;
@ -10,17 +10,17 @@ import io.dropwizard.hibernate.HibernateBundle;
import io.dropwizard.jersey.setup.JerseyEnvironment; import io.dropwizard.jersey.setup.JerseyEnvironment;
import io.dropwizard.setup.Bootstrap; import io.dropwizard.setup.Bootstrap;
import io.dropwizard.setup.Environment; import io.dropwizard.setup.Environment;
import uk.co.neviyn.Observations.auth.SimpleAuthenticator; import uk.co.neviyn.observations.auth.SimpleAuthenticator;
import uk.co.neviyn.Observations.core.Observation; import uk.co.neviyn.observations.core.Observation;
import uk.co.neviyn.Observations.core.Site; import uk.co.neviyn.observations.core.Site;
import uk.co.neviyn.Observations.core.Tutor; import uk.co.neviyn.observations.core.Tutor;
import uk.co.neviyn.Observations.core.User; import uk.co.neviyn.observations.core.User;
import uk.co.neviyn.Observations.dao.ObservationDao; import uk.co.neviyn.observations.dao.ObservationDao;
import uk.co.neviyn.Observations.dao.SiteDao; import uk.co.neviyn.observations.dao.SiteDao;
import uk.co.neviyn.Observations.dao.TutorDao; import uk.co.neviyn.observations.dao.TutorDao;
import uk.co.neviyn.Observations.resources.ObservationResource; import uk.co.neviyn.observations.resources.ObservationResource;
import uk.co.neviyn.Observations.resources.SiteResource; import uk.co.neviyn.observations.resources.SiteResource;
import uk.co.neviyn.Observations.resources.TutorResource; import uk.co.neviyn.observations.resources.TutorResource;
public class ObservationsApplication extends Application<ObservationsConfiguration> { public class ObservationsApplication extends Application<ObservationsConfiguration> {

View File

@ -1,4 +1,4 @@
package uk.co.neviyn.Observations; package uk.co.neviyn.observations;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import io.dropwizard.Configuration; import io.dropwizard.Configuration;

View File

@ -1,4 +1,4 @@
package uk.co.neviyn.Observations.api; package uk.co.neviyn.observations.api;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.*; import lombok.*;

View File

@ -1,11 +1,10 @@
package uk.co.neviyn.Observations.api; package uk.co.neviyn.observations.api;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.NonNull; import lombok.NonNull;
/** /**

View File

@ -1,8 +1,8 @@
package uk.co.neviyn.Observations.api; package uk.co.neviyn.observations.api;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.*; import lombok.*;
import uk.co.neviyn.Observations.core.ObservationEntry; import uk.co.neviyn.observations.core.ObservationEntry;
import java.util.List; import java.util.List;

View File

@ -1,4 +1,4 @@
package uk.co.neviyn.Observations.api; package uk.co.neviyn.observations.api;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

View File

@ -1,10 +1,10 @@
package uk.co.neviyn.Observations.auth; package uk.co.neviyn.observations.auth;
import io.dropwizard.auth.AuthenticationException; import io.dropwizard.auth.AuthenticationException;
import io.dropwizard.auth.Authenticator; import io.dropwizard.auth.Authenticator;
import io.dropwizard.auth.basic.BasicCredentials; import io.dropwizard.auth.basic.BasicCredentials;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import uk.co.neviyn.Observations.core.User; import uk.co.neviyn.observations.core.User;
import java.util.Optional; import java.util.Optional;

View File

@ -1,4 +1,4 @@
package uk.co.neviyn.Observations.core; package uk.co.neviyn.observations.core;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;

View File

@ -1,4 +1,4 @@
package uk.co.neviyn.Observations.core; package uk.co.neviyn.observations.core;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.*; import lombok.*;

View File

@ -1,4 +1,4 @@
package uk.co.neviyn.Observations.core; package uk.co.neviyn.observations.core;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;

View File

@ -1,4 +1,4 @@
package uk.co.neviyn.Observations.core; package uk.co.neviyn.observations.core;
public enum TrainingType { public enum TrainingType {
INITIAL, CONTINUING INITIAL, CONTINUING

View File

@ -1,4 +1,4 @@
package uk.co.neviyn.Observations.core; package uk.co.neviyn.observations.core;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;

View File

@ -1,4 +1,4 @@
package uk.co.neviyn.Observations.core; package uk.co.neviyn.observations.core;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;

View File

@ -1,13 +1,13 @@
package uk.co.neviyn.Observations.dao; package uk.co.neviyn.observations.dao;
import io.dropwizard.hibernate.AbstractDAO; import io.dropwizard.hibernate.AbstractDAO;
import org.hibernate.SessionFactory; import org.hibernate.SessionFactory;
import org.hibernate.query.Query; import org.hibernate.query.Query;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import uk.co.neviyn.Observations.api.AverageStats; import uk.co.neviyn.observations.api.AverageStats;
import uk.co.neviyn.Observations.core.Observation; import uk.co.neviyn.observations.core.Observation;
import uk.co.neviyn.Observations.core.Site; import uk.co.neviyn.observations.core.Site;
import uk.co.neviyn.Observations.core.Tutor; import uk.co.neviyn.observations.core.Tutor;
import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.CriteriaQuery;

View File

@ -1,8 +1,8 @@
package uk.co.neviyn.Observations.dao; package uk.co.neviyn.observations.dao;
import io.dropwizard.hibernate.AbstractDAO; import io.dropwizard.hibernate.AbstractDAO;
import org.hibernate.SessionFactory; import org.hibernate.SessionFactory;
import uk.co.neviyn.Observations.core.Site; import uk.co.neviyn.observations.core.Site;
import java.util.List; import java.util.List;

View File

@ -1,8 +1,8 @@
package uk.co.neviyn.Observations.dao; package uk.co.neviyn.observations.dao;
import io.dropwizard.hibernate.AbstractDAO; import io.dropwizard.hibernate.AbstractDAO;
import org.hibernate.SessionFactory; import org.hibernate.SessionFactory;
import uk.co.neviyn.Observations.core.Tutor; import uk.co.neviyn.observations.core.Tutor;
import java.util.List; import java.util.List;

View File

@ -1,19 +1,19 @@
package uk.co.neviyn.Observations.resources; package uk.co.neviyn.observations.resources;
import io.dropwizard.hibernate.UnitOfWork; import io.dropwizard.hibernate.UnitOfWork;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.joda.time.LocalDate; import org.joda.time.LocalDate;
import uk.co.neviyn.Observations.api.AverageStatsChartJs; import uk.co.neviyn.observations.api.AverageStatsChartJs;
import uk.co.neviyn.Observations.api.NewObservation; import uk.co.neviyn.observations.api.NewObservation;
import uk.co.neviyn.Observations.core.Observation; import uk.co.neviyn.observations.core.Observation;
import uk.co.neviyn.Observations.core.Site; import uk.co.neviyn.observations.core.Site;
import uk.co.neviyn.Observations.core.TrainingType; import uk.co.neviyn.observations.core.TrainingType;
import uk.co.neviyn.Observations.core.Tutor; import uk.co.neviyn.observations.core.Tutor;
import uk.co.neviyn.Observations.dao.ObservationDao; import uk.co.neviyn.observations.dao.ObservationDao;
import uk.co.neviyn.Observations.dao.SiteDao; import uk.co.neviyn.observations.dao.SiteDao;
import uk.co.neviyn.Observations.dao.TutorDao; import uk.co.neviyn.observations.dao.TutorDao;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import javax.ws.rs.*; import javax.ws.rs.*;

View File

@ -1,13 +1,13 @@
package uk.co.neviyn.Observations.resources; package uk.co.neviyn.observations.resources;
import io.dropwizard.auth.Auth; import io.dropwizard.auth.Auth;
import io.dropwizard.hibernate.UnitOfWork; import io.dropwizard.hibernate.UnitOfWork;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import uk.co.neviyn.Observations.api.SelectOption; import uk.co.neviyn.observations.api.SelectOption;
import uk.co.neviyn.Observations.core.Site; import uk.co.neviyn.observations.core.Site;
import uk.co.neviyn.Observations.core.User; import uk.co.neviyn.observations.core.User;
import uk.co.neviyn.Observations.dao.SiteDao; import uk.co.neviyn.observations.dao.SiteDao;
import javax.ws.rs.*; import javax.ws.rs.*;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;

View File

@ -1,4 +1,4 @@
package uk.co.neviyn.Observations.resources; package uk.co.neviyn.observations.resources;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import io.dropwizard.auth.Auth; import io.dropwizard.auth.Auth;
@ -8,12 +8,12 @@ import lombok.NoArgsConstructor;
import lombok.NonNull; import lombok.NonNull;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import uk.co.neviyn.Observations.core.Observation; import uk.co.neviyn.observations.core.Observation;
import uk.co.neviyn.Observations.core.Site; import uk.co.neviyn.observations.core.Site;
import uk.co.neviyn.Observations.core.Tutor; import uk.co.neviyn.observations.core.Tutor;
import uk.co.neviyn.Observations.core.User; import uk.co.neviyn.observations.core.User;
import uk.co.neviyn.Observations.dao.SiteDao; import uk.co.neviyn.observations.dao.SiteDao;
import uk.co.neviyn.Observations.dao.TutorDao; import uk.co.neviyn.observations.dao.TutorDao;
import javax.ws.rs.*; import javax.ws.rs.*;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;

View File

@ -1,9 +1,9 @@
package uk.co.neviyn.Observations.api; package uk.co.neviyn.observations.api;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import io.dropwizard.jackson.Jackson; import io.dropwizard.jackson.Jackson;
import org.junit.Test; import org.junit.Test;
import uk.co.neviyn.Observations.core.ObservationEntry; import uk.co.neviyn.observations.core.ObservationEntry;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;

View File

@ -1,4 +1,4 @@
package uk.co.neviyn.Observations.core; package uk.co.neviyn.observations.core;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import io.dropwizard.jackson.Jackson; import io.dropwizard.jackson.Jackson;

View File

@ -1,10 +1,10 @@
package uk.co.neviyn.Observations.dao; package uk.co.neviyn.observations.dao;
import io.dropwizard.testing.junit.DAOTestRule; import io.dropwizard.testing.junit.DAOTestRule;
import org.junit.Rule; import org.junit.Rule;
import uk.co.neviyn.Observations.core.Observation; import uk.co.neviyn.observations.core.Observation;
import uk.co.neviyn.Observations.core.Site; import uk.co.neviyn.observations.core.Site;
import uk.co.neviyn.Observations.core.Tutor; import uk.co.neviyn.observations.core.Tutor;
public abstract class DaoTestBase { public abstract class DaoTestBase {
@Rule @Rule

View File

@ -1,14 +1,14 @@
package uk.co.neviyn.Observations.dao; package uk.co.neviyn.observations.dao;
import org.apache.commons.lang3.SerializationUtils; import org.apache.commons.lang3.SerializationUtils;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import uk.co.neviyn.Observations.api.AverageStats; import uk.co.neviyn.observations.api.AverageStats;
import uk.co.neviyn.Observations.core.Observation; import uk.co.neviyn.observations.core.Observation;
import uk.co.neviyn.Observations.core.ObservationEntry; import uk.co.neviyn.observations.core.ObservationEntry;
import uk.co.neviyn.Observations.core.Site; import uk.co.neviyn.observations.core.Site;
import uk.co.neviyn.Observations.core.TrainingType; import uk.co.neviyn.observations.core.TrainingType;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;

View File

@ -1,8 +1,8 @@
package uk.co.neviyn.Observations.dao; package uk.co.neviyn.observations.dao;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import uk.co.neviyn.Observations.core.Site; import uk.co.neviyn.observations.core.Site;
import java.util.List; import java.util.List;

View File

@ -1,9 +1,9 @@
package uk.co.neviyn.Observations.dao; package uk.co.neviyn.observations.dao;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import uk.co.neviyn.Observations.core.Site; import uk.co.neviyn.observations.core.Site;
import uk.co.neviyn.Observations.core.Tutor; import uk.co.neviyn.observations.core.Tutor;
import java.util.List; import java.util.List;

View File

@ -1,16 +1,16 @@
package uk.co.neviyn.Observations.resources; package uk.co.neviyn.observations.resources;
import io.dropwizard.testing.junit.ResourceTestRule; import io.dropwizard.testing.junit.ResourceTestRule;
import org.junit.After; import org.junit.After;
import org.junit.ClassRule; import org.junit.ClassRule;
import org.junit.Test; import org.junit.Test;
import uk.co.neviyn.Observations.api.NewObservation; import uk.co.neviyn.observations.api.NewObservation;
import uk.co.neviyn.Observations.core.Observation; import uk.co.neviyn.observations.core.Observation;
import uk.co.neviyn.Observations.core.Site; import uk.co.neviyn.observations.core.Site;
import uk.co.neviyn.Observations.core.Tutor; import uk.co.neviyn.observations.core.Tutor;
import uk.co.neviyn.Observations.dao.ObservationDao; import uk.co.neviyn.observations.dao.ObservationDao;
import uk.co.neviyn.Observations.dao.SiteDao; import uk.co.neviyn.observations.dao.SiteDao;
import uk.co.neviyn.Observations.dao.TutorDao; import uk.co.neviyn.observations.dao.TutorDao;
import javax.ws.rs.client.Entity; import javax.ws.rs.client.Entity;
import java.util.ArrayList; import java.util.ArrayList;

View File

@ -1,4 +1,4 @@
package uk.co.neviyn.Observations.resources; package uk.co.neviyn.observations.resources;
import io.dropwizard.auth.AuthDynamicFeature; import io.dropwizard.auth.AuthDynamicFeature;
import io.dropwizard.auth.AuthValueFactoryProvider; import io.dropwizard.auth.AuthValueFactoryProvider;
@ -7,12 +7,12 @@ import io.dropwizard.testing.junit.ResourceTestRule;
import org.junit.After; import org.junit.After;
import org.junit.ClassRule; import org.junit.ClassRule;
import org.junit.Test; import org.junit.Test;
import uk.co.neviyn.Observations.api.SelectOption; import uk.co.neviyn.observations.api.SelectOption;
import uk.co.neviyn.Observations.auth.SimpleAuthenticator; import uk.co.neviyn.observations.auth.SimpleAuthenticator;
import uk.co.neviyn.Observations.core.Site; import uk.co.neviyn.observations.core.Site;
import uk.co.neviyn.Observations.core.Tutor; import uk.co.neviyn.observations.core.Tutor;
import uk.co.neviyn.Observations.core.User; import uk.co.neviyn.observations.core.User;
import uk.co.neviyn.Observations.dao.SiteDao; import uk.co.neviyn.observations.dao.SiteDao;
import javax.ws.rs.client.Entity; import javax.ws.rs.client.Entity;
import javax.ws.rs.core.GenericType; import javax.ws.rs.core.GenericType;

View File

@ -1,4 +1,4 @@
package uk.co.neviyn.Observations.resources; package uk.co.neviyn.observations.resources;
import io.dropwizard.auth.AuthDynamicFeature; import io.dropwizard.auth.AuthDynamicFeature;
import io.dropwizard.auth.AuthValueFactoryProvider; import io.dropwizard.auth.AuthValueFactoryProvider;
@ -7,12 +7,12 @@ import io.dropwizard.testing.junit.ResourceTestRule;
import org.junit.After; import org.junit.After;
import org.junit.ClassRule; import org.junit.ClassRule;
import org.junit.Test; import org.junit.Test;
import uk.co.neviyn.Observations.auth.SimpleAuthenticator; import uk.co.neviyn.observations.auth.SimpleAuthenticator;
import uk.co.neviyn.Observations.core.Site; import uk.co.neviyn.observations.core.Site;
import uk.co.neviyn.Observations.core.Tutor; import uk.co.neviyn.observations.core.Tutor;
import uk.co.neviyn.Observations.core.User; import uk.co.neviyn.observations.core.User;
import uk.co.neviyn.Observations.dao.SiteDao; import uk.co.neviyn.observations.dao.SiteDao;
import uk.co.neviyn.Observations.dao.TutorDao; import uk.co.neviyn.observations.dao.TutorDao;
import javax.ws.rs.client.Entity; import javax.ws.rs.client.Entity;
import javax.ws.rs.core.GenericType; import javax.ws.rs.core.GenericType;