Skip to content

Commit cff7440

Browse files
author
Jan Mikolajczak
committed
Move source files around to specialise the meaning of the api package
1 parent a28cb0c commit cff7440

File tree

17 files changed

+39
-97
lines changed

17 files changed

+39
-97
lines changed

‎aviary-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ limitations under the License.
271271
<includes>(?i:AVIARY\..*)</includes>
272272
</database>
273273
<target>
274-
<packageName>eu.bluehawkqs.aviary.api.dao</packageName>
274+
<packageName>eu.bluehawkqs.aviary.dao</packageName>
275275
<directory>${project.basedir}/src/main/java/generated</directory>
276276
</target>
277277
</generator>

‎aviary-api/src/main/java/generated/eu/bluehawkqs/aviary/api/dao/DefaultCatalog.java

-62
This file was deleted.

‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/api/controllers/ApiResponseFilter.kt ‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/api/ApiResponseFilter.kt

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package eu.bluehawkqs.aviary.api.controllers
1+
package eu.bluehawkqs.aviary.api
22

33
import com.google.appengine.api.utils.SystemProperty
44
import javax.ws.rs.container.ContainerRequestContext
@@ -17,4 +17,6 @@ class ApiResponseFilter : ContainerResponseFilter {
1717
add("Access-Control-Allow-Headers", "Content-Type")
1818
}
1919
}
20-
}
20+
}
21+
22+
// TODO Add exception catcher. Currently if response terminates with an exception then no headers are applied.

‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/api/controllers/JacksonProvider.kt ‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/api/JacksonProvider.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package eu.bluehawkqs.aviary.api.controllers
1+
package eu.bluehawkqs.aviary.api
22

33
import com.fasterxml.jackson.databind.ObjectMapper
44
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule

‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/api/controllers/AviaryController.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package eu.bluehawkqs.aviary.api.controllers
22

3-
import eu.bluehawkqs.aviary.api.di.AviaryComponent
3+
import eu.bluehawkqs.aviary.di.AviaryComponent
44
import javax.servlet.ServletContext
55
import javax.ws.rs.Consumes
66
import javax.ws.rs.Produces

‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/api/dao/DbConnectionManager.kt ‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/dao/DbConnectionManager.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package eu.bluehawkqs.aviary.api.dao
1+
package eu.bluehawkqs.aviary.dao
22

33
import org.jooq.DSLContext
44
import org.jooq.SQLDialect

‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/api/dao/PlayersDao.kt ‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/dao/PlayersDao.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
package eu.bluehawkqs.aviary.api.dao
1+
package eu.bluehawkqs.aviary.dao
22

3-
import eu.bluehawkqs.aviary.api.dao.aviary.Tables.*
4-
import eu.bluehawkqs.aviary.api.dao.aviary.tables.records.TournamentAttendeesRecord
53
import eu.bluehawkqs.aviary.api.models.Person
4+
import eu.bluehawkqs.aviary.dao.aviary.Tables.PERSONS
5+
import eu.bluehawkqs.aviary.dao.aviary.Tables.TOURNAMENT_ATTENDEES
6+
import eu.bluehawkqs.aviary.dao.aviary.tables.records.TournamentAttendeesRecord
67
import org.jooq.exception.DataAccessException
78
import javax.inject.Inject
89
import javax.ws.rs.WebApplicationException

‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/api/dao/TournamentsDao.kt ‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/dao/TournamentsDao.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package eu.bluehawkqs.aviary.api.dao
1+
package eu.bluehawkqs.aviary.dao
22

3-
import eu.bluehawkqs.aviary.api.dao.aviary.Tables.TOURNAMENTS
4-
import eu.bluehawkqs.aviary.api.dao.aviary.Tables.TOURNAMENT_ATTENDEES
53
import eu.bluehawkqs.aviary.api.models.Tournament
4+
import eu.bluehawkqs.aviary.dao.aviary.Tables.TOURNAMENTS
5+
import eu.bluehawkqs.aviary.dao.aviary.Tables.TOURNAMENT_ATTENDEES
66
import javax.inject.Inject
77

88
class TournamentsDao @Inject constructor(private val db: DbConnectionManager) {

‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/api/dao/UsersDao.kt ‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/dao/UsersDao.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package eu.bluehawkqs.aviary.api.dao
1+
package eu.bluehawkqs.aviary.dao
22

3-
import eu.bluehawkqs.aviary.api.dao.aviary.tables.Persons.PERSONS
4-
import eu.bluehawkqs.aviary.api.dao.aviary.tables.Users.USERS
5-
import eu.bluehawkqs.aviary.api.dao.aviary.tables.records.UsersRecord
63
import eu.bluehawkqs.aviary.api.models.AviaryUser
74
import eu.bluehawkqs.aviary.api.models.Person
5+
import eu.bluehawkqs.aviary.dao.aviary.tables.Persons.PERSONS
6+
import eu.bluehawkqs.aviary.dao.aviary.tables.Users.USERS
7+
import eu.bluehawkqs.aviary.dao.aviary.tables.records.UsersRecord
88
import org.jooq.impl.DSL
99
import javax.inject.Inject
1010

‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/api/di/AviaryComponent.kt ‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/di/AviaryComponent.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package eu.bluehawkqs.aviary.api.di
1+
package eu.bluehawkqs.aviary.di
22

33
import dagger.Component
4-
import eu.bluehawkqs.aviary.api.dao.DbConnectionManager
5-
import eu.bluehawkqs.aviary.api.dao.PlayersDao
6-
import eu.bluehawkqs.aviary.api.dao.TournamentsDao
7-
import eu.bluehawkqs.aviary.api.dao.UsersDao
8-
import java.util.Properties
4+
import eu.bluehawkqs.aviary.dao.DbConnectionManager
5+
import eu.bluehawkqs.aviary.dao.PlayersDao
6+
import eu.bluehawkqs.aviary.dao.TournamentsDao
7+
import eu.bluehawkqs.aviary.dao.UsersDao
8+
import java.util.*
99
import javax.inject.Singleton
1010

1111
@Singleton

‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/api/di/AviaryModule.kt ‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/di/AviaryModule.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package eu.bluehawkqs.aviary.api.di
1+
package eu.bluehawkqs.aviary.di
22

33
import dagger.Module
44
import dagger.Provides

‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/api/di/ConfigModule.kt ‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/di/ConfigModule.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
package eu.bluehawkqs.aviary.api.di
1+
package eu.bluehawkqs.aviary.di
22

33
import com.google.appengine.api.utils.SystemProperty
4-
import com.google.appengine.api.utils.SystemProperty.Environment.Value.*
4+
import com.google.appengine.api.utils.SystemProperty.Environment.Value.Development
5+
import com.google.appengine.api.utils.SystemProperty.Environment.Value.Production
56
import dagger.Module
67
import dagger.Provides
78
import org.cfg4j.provider.ConfigurationProviderBuilder

‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/api/di/DaggerServletContextListener.kt ‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/di/DaggerServletContextListener.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package eu.bluehawkqs.aviary.api.di
1+
package eu.bluehawkqs.aviary.di
22

33
import javax.servlet.ServletContextEvent
44
import javax.servlet.ServletContextListener

‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/api/di/DatabaseModule.kt ‎aviary-api/src/main/kotlin/eu/bluehawkqs/aviary/di/DatabaseModule.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package eu.bluehawkqs.aviary.api.di
1+
package eu.bluehawkqs.aviary.di
22

3+
import com.zaxxer.hikari.HikariConfig
4+
import com.zaxxer.hikari.HikariDataSource
35
import dagger.Module
46
import dagger.Provides
57
import liquibase.Liquibase
68
import liquibase.database.DatabaseFactory
79
import liquibase.database.jvm.JdbcConnection
810
import liquibase.resource.ClassLoaderResourceAccessor
9-
import com.zaxxer.hikari.HikariDataSource
10-
import com.zaxxer.hikari.HikariConfig
1111
import java.util.*
1212
import javax.inject.Singleton
1313
import javax.sql.DataSource

‎aviary-api/src/main/webapp/WEB-INF/web.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
33
<listener>
4-
<listener-class>eu.bluehawkqs.aviary.api.di.DaggerServletContextListener</listener-class>
4+
<listener-class>eu.bluehawkqs.aviary.di.DaggerServletContextListener</listener-class>
55
</listener>
66

77
<servlet>
@@ -19,10 +19,10 @@
1919
<init-param>
2020
<param-name>jersey.config.server.provider.classnames</param-name>
2121
<param-value>
22-
eu.bluehawkqs.aviary.api.controllers.ApiResponseFilter,
22+
eu.bluehawkqs.aviary.api.ApiResponseFilter,
2323
eu.bluehawkqs.aviary.api.authentication.AuthenticationFilter,
2424
org.glassfish.jersey.filter.LoggingFilter,
25-
eu.bluehawkqs.aviary.api.controllers.JacksonProvider
25+
eu.bluehawkqs.aviary.api.JacksonProvider
2626
</param-value>
2727
</init-param>
2828
<load-on-startup>1</load-on-startup>

‎aviary-api/src/test/kotlin/eu/bluehawkqs/aviary/api/controllers/UsersControllerTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package eu.bluehawkqs.aviary.api.controllers
22

33
import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig
44
import com.google.appengine.tools.development.testing.LocalServiceTestHelper
5-
import eu.bluehawkqs.aviary.api.dao.UsersDao
6-
import eu.bluehawkqs.aviary.api.di.AviaryComponent
5+
import eu.bluehawkqs.aviary.dao.UsersDao
6+
import eu.bluehawkqs.aviary.di.AviaryComponent
77
import org.junit.After
88
import org.junit.Before
99
import org.mockito.Mockito.`when`

‎aviary-api/src/test/kotlin/eu/bluehawkqs/aviary/api/dao/PlayersDaoTest.kt ‎aviary-api/src/test/kotlin/eu/bluehawkqs/aviary/dao/PlayersDaoTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package eu.bluehawkqs.aviary.api.dao
1+
package eu.bluehawkqs.aviary.dao
22

33
import org.junit.Test
44

0 commit comments

Comments
 (0)