refactor(core): refactor app structure

Author: kucharzyk

.gitignore

@@ -48,8 +48,8 @@ nbdist/
 ### shardis-webapp ###
 /shardis-webapp/build/
 
-### shardis-common ###
-/shardis-common/build/
+### shardis-core ###
+/shardis-core/build/
 
 ### shardis-query ###
 /shardis-query/build/

build.gradle.kts

@@ -3,6 +3,7 @@ import org.gradle.api.tasks.testing.Test
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.testing.jacoco.tasks.JacocoReport
 import org.jetbrains.kotlin.allopen.gradle.AllOpenExtension
+import org.jetbrains.kotlin.gradle.plugin.KaptExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.kotlin.noarg.gradle.NoArgExtension
 

settings.gradle

@@ -7,9 +7,9 @@ def configureGradleScriptKotlinOn(ProjectDescriptor project) {
   project.children.each { configureGradleScriptKotlinOn(it) }
 }
 
-include 'shardis-webapp'
-include 'shardis-frontend'
-include 'shardis-common'
+include 'shardis-core'
 include 'shardis-query'
+include 'shardis-frontend'
+include 'shardis-webapp'
 
 configureGradleScriptKotlinOn rootProject

shardis-common/build.gradle.kts

@@ -0,0 +1,16 @@
+import org.gradle.api.tasks.bundling.Jar
+
+tasks.withType<Jar> {
+  baseName = "shardis-core"
+
+  doFirst {
+    file("${project.buildDir}/classes/java/main/META-INF/spring-configuration-metadata.json").apply {
+      if(exists()){
+        println("moving spring-configuration-metadata.json to correct location")
+        copyTo(file("${project.projectDir}/src/main/resources/META-INF/spring-configuration-metadata.json"),overwrite = true)
+        delete()
+      }
+    }
+  }
+
+}

shardis-core/build.gradle.kts

@@ -0,0 +1,9 @@
+package com.shardis.core.config.properties
+
+import com.shardis.core.config.properties.support.ShardisProperties
+import org.springframework.boot.context.properties.EnableConfigurationProperties
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+@EnableConfigurationProperties(ShardisProperties::class)
+open class PropertiesConfig

shardis-core/src/main/kotlin/com/shardis/core/config/properties/PropertiesConfig.kt

@@ -1,4 +1,4 @@
-package com.shardis.webapp
+package com.shardis.core.config.properties.support
 
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.stereotype.Component

…/com/shardis/webapp/ShardisProperties.kt …/properties/support/ShardisProperties.ktshardis-webapp/src/main/kotlin/com/shardis/webapp/ShardisProperties.kt renamed to shardis-core/src/main/kotlin/com/shardis/core/config/properties/support/ShardisProperties.kt shardis-webapp/src/main/kotlin/com/shardis/webapp/ShardisProperties.kt renamed to shardis-core/src/main/kotlin/com/shardis/core/config/properties/support/ShardisProperties.kt

@@ -1,14 +1,14 @@
-package com.shardis.webapp.config
+package com.shardis.core.config.resources
 
-import com.shardis.webapp.support.view.resolvers.PushStateResourceResolver
+import com.shardis.core.config.resources.support.PushStateResourceResolver
 import org.springframework.context.annotation.Configuration
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
 
 import java.util.concurrent.TimeUnit
 
 @Configuration
-open class ViewConfig : WebMvcConfigurerAdapter() {
+open class ViewConfig : WebMvcConfigurer {
 
     override fun addResourceHandlers(registry: ResourceHandlerRegistry) {
         registry

…/com/shardis/webapp/config/ViewConfig.kt …rdis/core/config/resources/ViewConfig.ktshardis-webapp/src/main/kotlin/com/shardis/webapp/config/ViewConfig.kt renamed to shardis-core/src/main/kotlin/com/shardis/core/config/resources/ViewConfig.kt shardis-webapp/src/main/kotlin/com/shardis/webapp/config/ViewConfig.kt renamed to shardis-core/src/main/kotlin/com/shardis/core/config/resources/ViewConfig.kt

@@ -1,4 +1,4 @@
-package com.shardis.webapp.support.view.resolvers
+package com.shardis.core.config.resources.support
 
 import org.springframework.core.io.ClassPathResource
 import org.springframework.core.io.Resource

…w/resolvers/PushStateResourceResolver.kt …ces/support/PushStateResourceResolver.ktshardis-webapp/src/main/kotlin/com/shardis/webapp/support/view/resolvers/PushStateResourceResolver.kt renamed to shardis-core/src/main/kotlin/com/shardis/core/config/resources/support/PushStateResourceResolver.kt shardis-webapp/src/main/kotlin/com/shardis/webapp/support/view/resolvers/PushStateResourceResolver.kt renamed to shardis-core/src/main/kotlin/com/shardis/core/config/resources/support/PushStateResourceResolver.kt

@@ -1,4 +1,4 @@
-package com.shardis.common
+package com.shardis.core.service
 
 import org.springframework.stereotype.Service