feat(core): extract query domain to saparate library

kucharzyk · kucharzyk · commit 96d190d372c6 · 2017-06-19T18:52:47.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -50,3 +50,6 @@ nbdist/
 
 ### shardis-common ###
 /shardis-common/build/
+
+### shardis-query ###
+/shardis-query/build/
diff --git a/settings.gradle b/settings.gradle
@@ -10,5 +10,6 @@ def configureGradleScriptKotlinOn(ProjectDescriptor project) {
 include 'shardis-webapp'
 include 'shardis-frontend'
 include 'shardis-common'
+include 'shardis-query'
 
 configureGradleScriptKotlinOn rootProject
diff --git a/shardis-common/src/test/kotlin/com/shardis/common/ShardisCommonTestApplication.kt b/shardis-common/src/test/kotlin/com/shardis/common/ShardisCommonTestApplication.kt
@@ -4,9 +4,9 @@ import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
 
 @SpringBootApplication
-open class ShardisTestApplication
+open class ShardisCommonTestApplication
 
 fun main(args: Array<String>) {
-    SpringApplication.run(ShardisTestApplication::class.java, *args)
+    SpringApplication.run(ShardisCommonTestApplication::class.java, *args)
 }
 
diff --git a/shardis-query/build.gradle.kts b/shardis-query/build.gradle.kts
@@ -0,0 +1,9 @@
+import org.gradle.api.tasks.bundling.Jar
+
+dependencies {
+  compile(project(":shardis-common"))
+}
+
+tasks.withType<Jar> {
+  baseName = "shardis-query"
+}
diff --git a/shardis-query/src/main/kotlin/com/shardis/query/domain/AuditedEntity.kt b/shardis-query/src/main/kotlin/com/shardis/query/domain/AuditedEntity.kt
@@ -1,4 +1,4 @@
-package com.shardis.webapp.query.domain
+package com.shardis.query.domain
 
 import com.fasterxml.jackson.annotation.JsonIgnore
 import org.hibernate.envers.Audited
diff --git a/shardis-query/src/main/kotlin/com/shardis/query/domain/BaseEntity.kt b/shardis-query/src/main/kotlin/com/shardis/query/domain/BaseEntity.kt
@@ -1,4 +1,4 @@
-package com.shardis.webapp.query.domain
+package com.shardis.query.domain
 
 import java.util.*
 import javax.persistence.*
diff --git a/shardis-query/src/main/kotlin/com/shardis/query/domain/JwtToken.kt b/shardis-query/src/main/kotlin/com/shardis/query/domain/JwtToken.kt
@@ -1,4 +1,4 @@
-package com.shardis.webapp.query.domain
+package com.shardis.query.domain
 
 import org.hibernate.envers.Audited
 import java.util.*
diff --git a/shardis-query/src/main/kotlin/com/shardis/query/domain/Permission.kt b/shardis-query/src/main/kotlin/com/shardis/query/domain/Permission.kt
@@ -1,4 +1,4 @@
-package com.shardis.webapp.query.domain
+package com.shardis.query.domain
 
 import org.hibernate.envers.Audited
 import org.springframework.security.core.GrantedAuthority
diff --git a/shardis-query/src/main/kotlin/com/shardis/query/domain/Role.kt b/shardis-query/src/main/kotlin/com/shardis/query/domain/Role.kt
@@ -1,4 +1,4 @@
-package com.shardis.webapp.query.domain
+package com.shardis.query.domain
 
 import org.hibernate.envers.Audited
 import org.springframework.security.core.GrantedAuthority
diff --git a/shardis-query/src/main/kotlin/com/shardis/query/domain/User.kt b/shardis-query/src/main/kotlin/com/shardis/query/domain/User.kt
@@ -1,4 +1,4 @@
-package com.shardis.webapp.query.domain
+package com.shardis.query.domain
 
 import org.hibernate.envers.Audited
 import javax.persistence.*
diff --git a/shardis-query/src/main/kotlin/com/shardis/query/repositories/JwtTokenRepository.kt b/shardis-query/src/main/kotlin/com/shardis/query/repositories/JwtTokenRepository.kt
@@ -1,7 +1,7 @@
-package com.shardis.webapp.query.repositories
+package com.shardis.query.repositories
 
 
-import com.shardis.webapp.query.domain.JwtToken
+import com.shardis.query.domain.JwtToken
 import org.springframework.data.repository.CrudRepository
 import org.springframework.stereotype.Repository
 
diff --git a/shardis-query/src/main/kotlin/com/shardis/query/repositories/PermissionRepository.kt b/shardis-query/src/main/kotlin/com/shardis/query/repositories/PermissionRepository.kt
@@ -1,6 +1,6 @@
-package com.shardis.webapp.query.repositories
+package com.shardis.query.repositories
 
-import com.shardis.webapp.query.domain.Permission
+import com.shardis.query.domain.Permission
 import org.springframework.data.repository.CrudRepository
 import org.springframework.stereotype.Repository
 
diff --git a/shardis-query/src/main/kotlin/com/shardis/query/repositories/RoleRepository.kt b/shardis-query/src/main/kotlin/com/shardis/query/repositories/RoleRepository.kt
@@ -1,6 +1,6 @@
-package com.shardis.webapp.query.repositories
+package com.shardis.query.repositories
 
-import com.shardis.webapp.query.domain.Role
+import com.shardis.query.domain.Role
 import org.springframework.data.repository.CrudRepository
 import org.springframework.stereotype.Repository
 
diff --git a/shardis-query/src/main/kotlin/com/shardis/query/repositories/UserRepository.kt b/shardis-query/src/main/kotlin/com/shardis/query/repositories/UserRepository.kt
@@ -1,6 +1,6 @@
-package com.shardis.webapp.query.repositories
+package com.shardis.query.repositories
 
-import com.shardis.webapp.query.domain.User
+import com.shardis.query.domain.User
 import org.springframework.data.repository.CrudRepository
 import org.springframework.stereotype.Repository
 
diff --git a/shardis-query/src/test/kotlin/com/shardis/query/ShardisApplicationTest.kt b/shardis-query/src/test/kotlin/com/shardis/query/ShardisApplicationTest.kt
@@ -1,4 +1,4 @@
-package com.shardis.webapp
+package com.shardis.query
 
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/shardis-query/src/test/kotlin/com/shardis/query/ShardisQueryTestApplication.kt b/shardis-query/src/test/kotlin/com/shardis/query/ShardisQueryTestApplication.kt
@@ -0,0 +1,12 @@
+package com.shardis.query
+
+import org.springframework.boot.SpringApplication
+import org.springframework.boot.autoconfigure.SpringBootApplication
+
+@SpringBootApplication
+open class ShardisQueryTestApplication
+
+fun main(args: Array<String>) {
+    SpringApplication.run(ShardisQueryTestApplication::class.java, *args)
+}
+
diff --git a/shardis-webapp/build.gradle.kts b/shardis-webapp/build.gradle.kts
@@ -7,6 +7,7 @@ apply {
 
 dependencies {
   compile(project(":shardis-common"))
+  compile(project(":shardis-query"))
   compile(project(":shardis-frontend"))
 }
 
diff --git a/shardis-webapp/src/main/kotlin/com/shardis/webapp/ShardisApplication.kt b/shardis-webapp/src/main/kotlin/com/shardis/webapp/ShardisApplication.kt
@@ -2,9 +2,28 @@ package com.shardis.webapp
 
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.autoconfigure.domain.EntityScan
 import org.springframework.boot.context.properties.EnableConfigurationProperties
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories
 
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = arrayOf(
+    "com.shardis.common",
+    "com.shardis.query",
+    "com.shardis.webapp"
+))
+@EnableJpaRepositories(basePackages = arrayOf(
+    "com.shardis.common",
+    "com.shardis.query",
+    "com.shardis.webapp"
+))
+@EntityScan(basePackages = arrayOf(
+    "org.axonframework.eventsourcing.eventstore.jpa",
+    "org.axonframework.eventhandling.saga.repository.jpa",
+    "org.axonframework.eventhandling.tokenstore.jpa",
+    "com.shardis.common",
+    "com.shardis.query",
+    "com.shardis.webapp"
+))
 @EnableConfigurationProperties(ShardisProperties::class)
 open class ShardisApplication
 
diff --git a/shardis-webapp/src/main/kotlin/com/shardis/webapp/services/jwt/JwtTokenAuthService.kt b/shardis-webapp/src/main/kotlin/com/shardis/webapp/services/jwt/JwtTokenAuthService.kt
@@ -1,9 +1,9 @@
 package com.shardis.webapp.services.jwt
 
 import com.shardis.webapp.ShardisProperties
-import com.shardis.webapp.query.domain.JwtToken
-import com.shardis.webapp.query.repositories.JwtTokenRepository
-import com.shardis.webapp.query.repositories.UserRepository
+import com.shardis.query.domain.JwtToken
+import com.shardis.query.repositories.JwtTokenRepository
+import com.shardis.query.repositories.UserRepository
 import com.shardis.webapp.support.security.ShardisUserDetails
 import io.jsonwebtoken.Jwts
 import io.jsonwebtoken.SignatureAlgorithm
diff --git a/shardis-webapp/src/main/kotlin/com/shardis/webapp/services/security/ShardisUserDetailsService.kt b/shardis-webapp/src/main/kotlin/com/shardis/webapp/services/security/ShardisUserDetailsService.kt
@@ -1,8 +1,8 @@
 package com.shardis.webapp.services.security
 
-import com.shardis.webapp.query.domain.Role
-import com.shardis.webapp.query.domain.User
-import com.shardis.webapp.query.repositories.UserRepository
+import com.shardis.query.domain.Role
+import com.shardis.query.domain.User
+import com.shardis.query.repositories.UserRepository
 import com.shardis.webapp.support.security.ShardisUserDetails
 import org.springframework.security.core.GrantedAuthority
 import org.springframework.security.core.userdetails.UserDetails
diff --git a/shardis-webapp/src/main/kotlin/com/shardis/webapp/support/initializer/DbInitializer.kt b/shardis-webapp/src/main/kotlin/com/shardis/webapp/support/initializer/DbInitializer.kt
@@ -1,11 +1,11 @@
 package com.shardis.webapp.support.initializer
 
-import com.shardis.webapp.query.domain.Permission
-import com.shardis.webapp.query.domain.Role
-import com.shardis.webapp.query.domain.User
-import com.shardis.webapp.query.repositories.PermissionRepository
-import com.shardis.webapp.query.repositories.RoleRepository
-import com.shardis.webapp.query.repositories.UserRepository
+import com.shardis.query.domain.Permission
+import com.shardis.query.domain.Role
+import com.shardis.query.domain.User
+import com.shardis.query.repositories.PermissionRepository
+import com.shardis.query.repositories.RoleRepository
+import com.shardis.query.repositories.UserRepository
 import org.slf4j.LoggerFactory
 import org.springframework.security.crypto.password.PasswordEncoder
 import org.springframework.stereotype.Component
diff --git a/shardis-webapp/src/test/kotlin/com/shardis/webapp/ShardisApplicationTest.kt b/shardis-webapp/src/test/kotlin/com/shardis/webapp/ShardisApplicationTest.kt
@@ -0,0 +1,16 @@
+package com.shardis.webapp
+
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.test.context.junit4.SpringRunner
+
+@RunWith(SpringRunner::class)
+@SpringBootTest
+class ShardisApplicationTest {
+
+    @Test
+    fun contextLoads() {
+    }
+
+}
diff --git a/shardis-webapp/src/test/kotlin/com/shardis/webapp/auth/AuthControllerMockedTest.kt b/shardis-webapp/src/test/kotlin/com/shardis/webapp/auth/AuthControllerMockedTest.kt
@@ -18,7 +18,7 @@ import org.springframework.web.context.WebApplicationContext
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK)
 @RunWith(SpringRunner::class)
-class AuthControllerMockedTests {
+class AuthControllerMockedTest {
 
     @Autowired
     private lateinit var context: WebApplicationContext
diff --git a/shardis-webapp/src/test/kotlin/com/shardis/webapp/auth/AuthControllerTest.kt b/shardis-webapp/src/test/kotlin/com/shardis/webapp/auth/AuthControllerTest.kt
@@ -19,7 +19,7 @@ import org.springframework.web.context.WebApplicationContext
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK)
 @RunWith(SpringRunner::class)
-class AuthControllerTests {
+class AuthControllerTest {
 
     @Autowired
     private lateinit var context: WebApplicationContext

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@ import org.springframework.boot.SpringApplication`
`4`	`4`	`import org.springframework.boot.autoconfigure.SpringBootApplication`
`5`	`5`
`6`	`6`	`@SpringBootApplication`
`7`		`-open class ShardisTestApplication`
	`7`	`+open class ShardisCommonTestApplication`
`8`	`8`
`9`	`9`	`fun main(args: Array<String>) {`
`10`		`- SpringApplication.run(ShardisTestApplication::class.java, *args)`
	`10`	`+ SpringApplication.run(ShardisCommonTestApplication::class.java, *args)`
`11`	`11`	`}`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.shardis.webapp.query.domain`
	`1`	`+package com.shardis.query.domain`
`2`	`2`
`3`	`3`	`import com.fasterxml.jackson.annotation.JsonIgnore`
`4`	`4`	`import org.hibernate.envers.Audited`