restructure project (#64)

* refactor split app and server

* change server to keva

* rename keva -> core

* update scripts

* run reformat code

* add publishing information

* update contrib guide

* update val usage

* fix unit tests fail

Author: tuhuynh27

.github/FUNDING.yml

@@ -3,7 +3,7 @@
 github: [tuhuynh27, axblueblader]
 patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
-ko_fi: tuhuynh27
+ko_fi: # Replace with a single Ko-Fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: # Replace with a single Liberapay username

.github/workflows/build.yml

@@ -33,4 +33,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: ./gradlew --parallel --info build sonarqube
+        run: ./gradlew --parallel --info test

.gitignore

@@ -1,5 +1,6 @@
 .idea/
 build/
+dist/
 .gradle/
 .DS_Store
 gradle.properties

CONTRIBUTING.md

@@ -0,0 +1,3 @@
+# Developer guide
+
+[See Developer Guide](https://keva.dev/guide/developer-guide.html)

Dockerfile

@@ -5,18 +5,18 @@ WORKDIR /root/src/keva
 
 COPY gradle ./gradle
 COPY build.gradle gradlew settings.gradle ./
-COPY ./server/build.gradle ./server/keva.properties ./server/
+COPY ./app/build.gradle ./app/keva.properties ./app/
 RUN ./gradlew dependencies
 
 COPY . .
-RUN ./gradlew :server:build -x test
+RUN ./gradlew :app:build -x test
 
 FROM adoptopenjdk/openjdk11:jdk-11.0.6_10-alpine
 
 RUN mkdir -p /root/binary/keva
 WORKDIR /root/binary/keva
 
-COPY --from=builder /root/src/keva/server/build/libs/server-1.0-SNAPSHOT-all.jar /root/binary/keva/keva.jar
+COPY --from=builder /root/src/keva/app/build/libs/app-1.0-SNAPSHOT-all.jar /root/binary/keva/keva.jar
 
 EXPOSE 6379
 

README.md

@@ -43,13 +43,13 @@ cd keva
 Run:
 
 ```
-./gradlew :server:run
+./gradlew :app:run
 ```
 
 Build:
 
 ```
-./gradlew :build:server
+./gradlew :app:build
 ```
 
 ## License

app/build.gradle

@@ -0,0 +1,39 @@
+plugins {
+    id 'application'
+    id 'com.github.johnrengelman.shadow' version '6.0.0'
+    id 'com.adarshr.test-logger' version '2.1.0'
+}
+
+group 'dev.keva'
+version '1.0-SNAPSHOT'
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation project(':core')
+    implementation project(':config')
+
+    implementation 'ch.qos.logback:logback-classic:1.2.7'
+    implementation 'ch.qos.logback:logback-core:1.2.7'
+
+    testImplementation 'redis.clients:jedis:3.7.0'
+}
+
+shadowJar {
+    minimize()
+}
+
+application {
+    mainClassName = 'dev.keva.app.Application'
+}
+
+test {
+    useJUnitPlatform()
+    testLogging {
+        outputs.upToDateWhen { true }
+        showStandardStreams = true
+    }
+    maxParallelForks = Runtime.runtime.availableProcessors()
+}

server/keva.properties renamed to app/keva.properties

@@ -1,10 +1,10 @@
-package dev.keva.server;
+package dev.keva.app;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.LoggerContext;
 import com.keva.config.ConfigLoader;
-import dev.keva.server.config.KevaConfig;
-import dev.keva.server.core.KevaServer;
+import dev.keva.core.config.KevaConfig;
+import dev.keva.core.server.KevaServer;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
 import org.slf4j.LoggerFactory;

server/src/main/java/dev/keva/server/Application.java renamed to app/src/main/java/dev/keva/app/Application.java

@@ -1,5 +1,6 @@
-package dev.keva.server;
+package dev.keva.app;
 
+import dev.keva.app.Application;
 import lombok.val;
 import org.junit.jupiter.api.Test;
 import redis.clients.jedis.Jedis;
@@ -17,7 +18,7 @@ void testMain() throws Exception {
         new Thread(() -> Application.main(ARGS)).start();
         TimeUnit.SECONDS.sleep(5);
 
-        Jedis jedis = new Jedis("localhost", 6379);
+        val jedis = new Jedis("localhost", 6379);
         val pong = jedis.ping();
         assertEquals("PONG", pong);
     }