From d4b95138ee95ab21562ed74cb74eb778f399d13b Mon Sep 17 00:00:00 2001 From: dergeorg Date: Sat, 23 Apr 2022 23:04:00 +0200 Subject: [PATCH] Working Service --- .default-gitci.yml | 62 ++++ .gitignore | 35 ++ .gitlab-ci.yml | 53 +++ Dockerfile | 17 + README.md | 6 + mvnw | 316 ++++++++++++++++++ mvnw.cmd | 188 +++++++++++ pom.xml | 81 +++++ .../todoservice/TodoServiceApplication.java | 13 + .../at/dergeorg/todoservice/WebConfig.java | 18 + .../controller/restController.java | 95 ++++++ .../dergeorg/todoservice/data/TodoRepo.java | 15 + .../dergeorg/todoservice/model/StateEnum.java | 7 + .../at/dergeorg/todoservice/model/Todo.java | 39 +++ src/main/resources/application.yaml | 16 + .../TodoServiceApplicationTests.java | 13 + 16 files changed, 974 insertions(+) create mode 100644 .default-gitci.yml create mode 100644 .gitignore create mode 100644 .gitlab-ci.yml create mode 100644 Dockerfile create mode 100644 README.md create mode 100755 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/at/dergeorg/todoservice/TodoServiceApplication.java create mode 100644 src/main/java/at/dergeorg/todoservice/WebConfig.java create mode 100644 src/main/java/at/dergeorg/todoservice/controller/restController.java create mode 100644 src/main/java/at/dergeorg/todoservice/data/TodoRepo.java create mode 100644 src/main/java/at/dergeorg/todoservice/model/StateEnum.java create mode 100644 src/main/java/at/dergeorg/todoservice/model/Todo.java create mode 100644 src/main/resources/application.yaml create mode 100644 src/test/java/at/dergeorg/todoservice/TodoServiceApplicationTests.java diff --git a/.default-gitci.yml b/.default-gitci.yml new file mode 100644 index 0000000..81f4b1c --- /dev/null +++ b/.default-gitci.yml @@ -0,0 +1,62 @@ +stages: # List of stages for jobs, and their order of execution + - build + - docker + - deploy + + +variables: + CI_REGISTRY_IMAGE: docker.dergeorg.at/dergeorg + SERVICE: todo-service + Docker_name: gitlab-todo-service + TAG_LATEST: $CI_REGISTRY_IMAGE/$Docker_name:latest + Project_name: todo-service + Docker_url: docker.dergeorg.at + Docker_namespace: dergeorg + DOCKER_TAG: latest + ENV: test + PORT_HOST: 2222 + PORT_CONTAINER: 2222 + EUREKA_HOSTNAME: 192.168.1.65 + EUREKA_PORT: 9995 + CONFIG_PORT: 1111 + CONFIG_URL: service.todo.gitlab.dergeorg.at + CONFIG_HTTP: https + +build-job: # Building jar file + image: maven:3.6.3-jdk-11-slim + stage: build + script: + - mvn clean install && mvn package -B -e + - export + artifacts: + paths: + - target/*.jar + +publish-job: # Building docker image and publishing it + image: docker:latest + stage: docker + services: + - docker:dind + script: + - docker login $DOCKER_URL -u $DOCKER_USER -p $DOCKER_PW + - docker build -t $DOCKER_URL/$TAG_LATEST . + - docker push $DOCKER_URL/$TAG_LATEST + +deploy-job: # Deploy docker image on ssh server + image: alpine:latest + stage: deploy + tags: + - deployment + before_script: + - 'command -v ssh-agent >/dev/null || ( apk add --update openssh )' + - eval $(ssh-agent -s) + - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - + - mkdir -p ~/.ssh + - chmod 700 ~/.ssh + - ssh-keyscan $SERVER_IP >> ~/.ssh/known_hosts + - chmod 644 ~/.ssh/known_hosts + script: + - ssh $SSH_USER@$SERVER_IP "docker login $DOCKER_URL -u $DOCKER_USER -p $DOCKER_PW" + - ssh $SSH_USER@$SERVER_IP "docker push $DOCKER_URL/$TAG_LATEST" + - ssh $SSH_USER@$SERVER_IP "docker container rm -f $Docker_name || true" + - ssh $SSH_USER@$SERVER_IP "docker run -it -d --name $Docker_name -e PROJEKTNAME_UNIQUE='$Project_name:$CI_JOB_ID' -e PROJEKTNAME='$Project_name' -e HOSTNAME=$EUREKA_HOSTNAME -e EUREKAPORT=$EUREKA_PORT -e server.port=$CONFIG_PORT -e CONFIGPORT=$CONFIG_PORT -e KEY='$CONFIG_KEY' -e CONFIGURL='$CONFIG_URL' -e CONFIGUSER='$CONFIG_USER' -e CONFIGHTTP=$CONFIG_HTTP -p $PORT_HOST:$PORT_CONTAINER $DOCKER_URL/$TAG_LATEST" diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3565ef1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,35 @@ + +.mvn/ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..d07ee0b --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,53 @@ +# You can override the included template(s) by including variable overrides +# SAST customization: https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings +# Secret Detection customization: https://docs.gitlab.com/ee/user/application_security/secret_detection/#customizing-settings +# Dependency Scanning customization: https://docs.gitlab.com/ee/user/application_security/dependency_scanning/#customizing-the-dependency-scanning-settings +# Container Scanning customization: https://docs.gitlab.com/ee/user/application_security/container_scanning/#customizing-the-container-scanning-settings +# Note that environment variables can be set in several places +# See https://docs.gitlab.com/ee/ci/variables/#cicd-variable-precedence +stages: +- build +- docker +- deploy +variables: + CI_REGISTRY_IMAGE: dergeorg + TAG_LATEST: "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME:latest" +build-job: + image: maven:3.6.3-jdk-11-slim + stage: build + script: + - mvn clean install && mvn package -B -e + - export + artifacts: + paths: + - target/*.jar +publish-job: + image: docker:latest + stage: docker + services: + - docker:19.03-dind + script: + - docker build -t $TAG_LATEST . + - docker login -u $DOCKER_USER -p $DOCKER_PW + - docker push $TAG_LATEST +deploy-job: + image: alpine:latest + stage: deploy + tags: + - deployment + before_script: + - command -v ssh-agent >/dev/null || ( apk add --update openssh ) + - eval $(ssh-agent -s) + - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - + - mkdir -p ~/.ssh + - chmod 700 ~/.ssh + - ssh-keyscan $SERVER_IP >> ~/.ssh/known_hosts + - chmod 644 ~/.ssh/known_hosts + script: + - ssh $SSH_USER@$SERVER_IP "docker login -u $DOCKER_USER -p $DOCKER_PW" + - ssh $SSH_USER@$SERVER_IP "docker pull $TAG_LATEST" + - ssh $SSH_USER@$SERVER_IP "docker container rm -f my-app || true" + - ssh $SSH_USER@$SERVER_IP "docker run -d -p $SERVER_IP:8888:8080 --name my-app + $TAG_LATEST" +include: +- template: Security/Secret-Detection.gitlab-ci.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..0539605 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,17 @@ +# For Java 8, try this +# FROM openjdk:8-jdk-alpine + +# For Java 11, try this +FROM adoptopenjdk/openjdk11:alpine-jre + +# Refer to Maven build -> finalName +ARG JAR_FILE=target/todo-service-0.0.1-SNAPSHOT.jar + +# cd /opt/app +WORKDIR /opt/app + +# cp target/spring-boot-web.jar /opt/app/app.jar +COPY ${JAR_FILE} app.jar + +# java -jar /opt/app/app.jar +ENTRYPOINT ["java", "-jar", "app.jar"] diff --git a/README.md b/README.md new file mode 100644 index 0000000..da36e6c --- /dev/null +++ b/README.md @@ -0,0 +1,6 @@ +# todo-service +* Env variable 'HOSTNAME' is available to set the Eureka hostname to something other than the 'localhost'. +* Env variable 'EUREKAPORT' is available to set the port to something other than the '8761'. +* Env variable 'CONFIGURL' is available to set the config server url to something other than the 'http://localhost:8888/config'. +* Env variable 'CONFIGUSER' is available to set the config server user to something other than the 'admin:admin@'. It is important to include the '@' on the end of the variable +* Env variable 'CONFIGHTTP' is available to set the config server http protocol to something other than the 'http'. \ No newline at end of file diff --git a/mvnw b/mvnw new file mode 100755 index 0000000..8a8fb22 --- /dev/null +++ b/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..1d8ab01 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,188 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..3e82395 --- /dev/null +++ b/pom.xml @@ -0,0 +1,81 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.6.3 + + + at.dergeorg + todo-service + 0.0.1-SNAPSHOT + todo-service + todo-service + + 11 + 2021.0.1 + + + + org.springframework.cloud + spring-cloud-starter-config + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + org.mariadb.jdbc + mariadb-java-client + runtime + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/src/main/java/at/dergeorg/todoservice/TodoServiceApplication.java b/src/main/java/at/dergeorg/todoservice/TodoServiceApplication.java new file mode 100644 index 0000000..90e3ebf --- /dev/null +++ b/src/main/java/at/dergeorg/todoservice/TodoServiceApplication.java @@ -0,0 +1,13 @@ +package at.dergeorg.todoservice; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class TodoServiceApplication { + + public static void main(String[] args) { + SpringApplication.run(TodoServiceApplication.class, args); + } + +} diff --git a/src/main/java/at/dergeorg/todoservice/WebConfig.java b/src/main/java/at/dergeorg/todoservice/WebConfig.java new file mode 100644 index 0000000..61c9ad4 --- /dev/null +++ b/src/main/java/at/dergeorg/todoservice/WebConfig.java @@ -0,0 +1,18 @@ +package at.dergeorg.todoservice; + +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class WebConfig { + + @Bean + public Jackson2ObjectMapperBuilderCustomizer customizeJson(){ + return builder -> { + builder.indentOutput(true); + builder.propertyNamingStrategy(PropertyNamingStrategy.LOWER_CASE); + }; + } +} diff --git a/src/main/java/at/dergeorg/todoservice/controller/restController.java b/src/main/java/at/dergeorg/todoservice/controller/restController.java new file mode 100644 index 0000000..889c274 --- /dev/null +++ b/src/main/java/at/dergeorg/todoservice/controller/restController.java @@ -0,0 +1,95 @@ +package at.dergeorg.todoservice.controller; + +import at.dergeorg.todoservice.data.TodoRepo; +import at.dergeorg.todoservice.model.StateEnum; +import at.dergeorg.todoservice.model.Todo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.Optional; + +@RestController +@RequestMapping("/api") +@CrossOrigin(value = "*") +public class restController { + + @Autowired + private TodoRepo repo; + + @GetMapping("/todo/{id}") + public ResponseEntity getTodo(@PathVariable("id") int id){ + Optional ret = repo.findById(id); + return ret.map(ResponseEntity::ok).orElseGet(() -> (ResponseEntity) ResponseEntity.notFound()); + } + + @PostMapping("/test") + public void generateTestData(){ + repo.deleteAll(); + ArrayList newTodos = new ArrayList<>(); + Todo nTodo = new Todo("Test 1", "Das ist ein Test", StateEnum.DOING); + nTodo.setDateSting("1644415439976"); + newTodos.add(nTodo); + nTodo = new Todo("Test 2", "Das ist ein Test 2", StateEnum.DOING); + nTodo.setDateSting("1645570800000"); + newTodos.add(nTodo); + nTodo = new Todo("Test 3", "Das ist ein Test 3", StateEnum.DONE); + nTodo.setDateSting("1647903600000"); + newTodos.add(nTodo); + nTodo = new Todo("Test 4", "Das ist ein Test 4", StateEnum.DONE); + nTodo.setDateSting("1644102000000"); + newTodos.add(nTodo); + nTodo = new Todo("Test 5", "Das ist ein Test 5", StateEnum.TODO); + nTodo.setDateSting("1647730800000"); + newTodos.add(nTodo); + nTodo = new Todo("Test 6", "Das ist ein Test 6", StateEnum.TODO); + nTodo.setDateSting("1647298800000"); + newTodos.add(nTodo); + repo.saveAll(newTodos); + } + + @GetMapping("/todos") + public Iterable getTodosFiltered(@RequestParam(required = false) Optional state){ + if(state.isPresent()){ + StateEnum stateEnum = StateEnum.valueOf(state.get().toUpperCase()); + return repo.findByState(stateEnum); + }else{ + return repo.findAll(); + } + } + + @PostMapping("/todo") + public void addTodo(@RequestParam(value="name") String name, @RequestParam(value="description") String description, @RequestParam(value = "date") String date, @RequestParam(value = "state") String state){ + Todo newTodo = new Todo(name, description, StateEnum.valueOf(state.toUpperCase())); + newTodo.setDateSting(date); + repo.save(newTodo); + } + + @DeleteMapping("/todo/{id}") + public void deleteTodo(@PathVariable("id") int id){ + repo.deleteById(id); + } + + @PutMapping("/todo/{id}") + public void editTodo(@PathVariable("id") int id, @RequestParam(value="name") String name, @RequestParam(value="description") String description, @RequestParam(value = "date") String date, @RequestParam(value = "state") String state){ + Optional optionalToEdit = repo.findById(id); + if(optionalToEdit.isPresent()) { + Todo toEdit = optionalToEdit.get(); + if (!name.isEmpty()) { + toEdit.setName(name); + } + if (!description.isEmpty()) { + toEdit.setDescription(description); + } + if (!date.isEmpty()) { + toEdit.setDateSting(date); + System.out.println(date); + } + if (!state.isEmpty()) { + toEdit.setState(StateEnum.valueOf(state)); + } + repo.save(toEdit); + } + } +} diff --git a/src/main/java/at/dergeorg/todoservice/data/TodoRepo.java b/src/main/java/at/dergeorg/todoservice/data/TodoRepo.java new file mode 100644 index 0000000..22a8649 --- /dev/null +++ b/src/main/java/at/dergeorg/todoservice/data/TodoRepo.java @@ -0,0 +1,15 @@ +package at.dergeorg.todoservice.data; + +import at.dergeorg.todoservice.model.StateEnum; +import at.dergeorg.todoservice.model.Todo; +import org.springframework.data.repository.CrudRepository; + +import java.util.Optional; + +public interface TodoRepo extends CrudRepository { + + @Override + Optional findById(Integer integer); + + Iterable findByState(StateEnum stateEnum); +} diff --git a/src/main/java/at/dergeorg/todoservice/model/StateEnum.java b/src/main/java/at/dergeorg/todoservice/model/StateEnum.java new file mode 100644 index 0000000..a880220 --- /dev/null +++ b/src/main/java/at/dergeorg/todoservice/model/StateEnum.java @@ -0,0 +1,7 @@ +package at.dergeorg.todoservice.model; + +public enum StateEnum { + TODO, + DOING, + DONE +} diff --git a/src/main/java/at/dergeorg/todoservice/model/Todo.java b/src/main/java/at/dergeorg/todoservice/model/Todo.java new file mode 100644 index 0000000..aa9cd36 --- /dev/null +++ b/src/main/java/at/dergeorg/todoservice/model/Todo.java @@ -0,0 +1,39 @@ +package at.dergeorg.todoservice.model; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.*; +import javax.persistence.*; +import java.util.Date; + +@Getter +@Setter +@RequiredArgsConstructor +@Entity +@NoArgsConstructor +public class Todo { + @NonNull + @Column(name = "name") + @JsonProperty("name") + private String name; + @NonNull + @Column(name = "description") + @JsonProperty("description") + private String description; + @Id + @GeneratedValue + @JsonProperty("id") + private int id; + @Column(name = "date") + @JsonProperty("date") + private Date date; + @NonNull + @Column(name = "state") + @JsonProperty("state") + private StateEnum state; + + public void setDateSting(String date){ + Date dDate = new Date(); + dDate.setTime(Long.parseLong(date)); + this.date = dDate; + } +} diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml new file mode 100644 index 0000000..1270791 --- /dev/null +++ b/src/main/resources/application.yaml @@ -0,0 +1,16 @@ +spring: + application: + name: todo-service + profiles: + active: default + config: + import: configserver:${CONFIGHTTP:http}://${CONFIGUSER:}${CONFIGURL:localhost:9997}/todo-config +eureka: + client: + service-url: + defaultZone: http://${HOSTNAME:localhost}:${EUREKAPORT:8761}/eureka + instance: + ip-address: ${HOSTNAME:localhost} + hostname: ${HOSTNAME:localhost} + instance-id: ${spring.application.name}:${random.value} + prefer-ip-address: true diff --git a/src/test/java/at/dergeorg/todoservice/TodoServiceApplicationTests.java b/src/test/java/at/dergeorg/todoservice/TodoServiceApplicationTests.java new file mode 100644 index 0000000..86519e8 --- /dev/null +++ b/src/test/java/at/dergeorg/todoservice/TodoServiceApplicationTests.java @@ -0,0 +1,13 @@ +package at.dergeorg.todoservice; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class TodoServiceApplicationTests { + + @Test + void contextLoads() { + } + +}