From 57463e99126fa24838c29c1ac15583f04011fa33 Mon Sep 17 00:00:00 2001 From: Michael Reiche <48999328+mikereiche@users.noreply.github.com> Date: Thu, 28 Jul 2022 15:34:29 -0700 Subject: [PATCH] Add testapp and remove duplicate text from README. Closes #1517. --- README.adoc | 107 ------ spring-data-testapp/HELP.md | 10 + spring-data-testapp/mvnw | 310 ++++++++++++++++++ spring-data-testapp/mvnw.cmd | 182 ++++++++++ spring-data-testapp/pom.xml | 95 ++++++ .../main/java/com/example/demo/Airport.java | 116 +++++++ .../com/example/demo/AirportRepository.java | 96 ++++++ .../java/com/example/demo/AirportService.java | 36 ++ .../main/java/com/example/demo/CmdRunner.java | 67 ++++ .../main/java/com/example/demo/Config.java | 58 ++++ .../com/example/demo/DemoApplication.java | 19 ++ .../src/main/java/com/example/demo/Iata.java | 6 + .../src/main/resources/application.properties | 1 + .../src/main/resources/logback.xml | 30 ++ .../example/demo/DemoApplicationTests.java | 13 + 15 files changed, 1039 insertions(+), 107 deletions(-) create mode 100644 spring-data-testapp/HELP.md create mode 100644 spring-data-testapp/mvnw create mode 100644 spring-data-testapp/mvnw.cmd create mode 100644 spring-data-testapp/pom.xml create mode 100644 spring-data-testapp/src/main/java/com/example/demo/Airport.java create mode 100644 spring-data-testapp/src/main/java/com/example/demo/AirportRepository.java create mode 100644 spring-data-testapp/src/main/java/com/example/demo/AirportService.java create mode 100644 spring-data-testapp/src/main/java/com/example/demo/CmdRunner.java create mode 100644 spring-data-testapp/src/main/java/com/example/demo/Config.java create mode 100644 spring-data-testapp/src/main/java/com/example/demo/DemoApplication.java create mode 100644 spring-data-testapp/src/main/java/com/example/demo/Iata.java create mode 100644 spring-data-testapp/src/main/resources/application.properties create mode 100644 spring-data-testapp/src/main/resources/logback.xml create mode 100644 spring-data-testapp/src/test/java/com/example/demo/DemoApplicationTests.java diff --git a/README.adoc b/README.adoc index 3b6b81163..6089f8800 100644 --- a/README.adoc +++ b/README.adoc @@ -177,113 +177,6 @@ Building the documentation builds also the project without running tests. $ ./mvnw clean install -Pdistribute ---- -The generated documentation is available from `target/site/reference/html/index.html`. -It can be staged and accessed via : - -[source,bash] ----- - docs=`pwd`/target/site/reference/html - cd /tmp - # see https://docs.github.com/en/pages/getting-started-with-github-pages/creating-a-github-pages-site - git clone git@github.com:mikereiche/staged.git -b gh-pages - cd staged - cp -R $docs/* . - git add . - git commit --message "stage for review" - git push origin gh-pages ----- -https://mikereiche.github.io/staged/index.html - -=== Building and staging reference documentation for review - -[source,bash] ----- - export MY_GIT_USER= - mvn generate-resources - docs=`pwd`/target/site/reference/html - pushd /tmp - mkdir $$ - cd $$ - # see https://docs.github.com/en/pages/getting-started-with-github-pages/creating-a-github-pages-site - # this examples uses a repository named "staged" - git clone git@github.com:${MY_GIT_USER}/staged.git -b gh-pages - cd staged - cp -R $docs/* . - git add . - git commit --message "stage for review" - git push origin gh-pages - popd ----- - -The generated documentation is available from `target/site/reference/html/index.html`. - -=== Building and staging reference documentation for review - -[source,bash] ----- - export MY_GIT_USER= - mvn generate-resources - docs=`pwd`/target/site/reference/html - pushd /tmp - mkdir $$ - cd $$ - # see https://docs.github.com/en/pages/getting-started-with-github-pages/creating-a-github-pages-site - # this examples uses a repository named "staged" - git clone git@github.com:${MY_GIT_USER}/staged.git -b gh-pages - cd staged - cp -R $docs/* . - git add . - git commit --message "stage for review" - git push origin gh-pages - popd ----- - -The generated documentation is available from `target/site/reference/html/index.html`. - -=== Building and staging reference documentation for review - -[source,bash] ----- - export MY_GIT_USER= - mvn generate-resources - docs=`pwd`/target/site/reference/html - pushd /tmp - mkdir $$ - cd $$ - # see https://docs.github.com/en/pages/getting-started-with-github-pages/creating-a-github-pages-site - # this examples uses a repository named "staged" - git clone git@github.com:${MY_GIT_USER}/staged.git -b gh-pages - cd staged - cp -R $docs/* . - git add . - git commit --message "stage for review" - git push origin gh-pages - popd ----- - -The generated documentation is available from `target/site/reference/html/index.html`. - -=== Building and staging reference documentation for review - -[source,bash] ----- - export MY_GIT_USER= - mvn generate-resources - docs=`pwd`/target/site/reference/html - pushd /tmp - mkdir $$ - cd $$ - # see https://docs.github.com/en/pages/getting-started-with-github-pages/creating-a-github-pages-site - # this examples uses a repository named "staged" - git clone git@github.com:${MY_GIT_USER}/staged.git -b gh-pages - cd staged - cp -R $docs/* . - git add . - git commit --message "stage for review" - git push origin gh-pages - popd ----- - The generated documentation is available from `target/site/reference/html/index.html`. === Building and staging reference documentation for review diff --git a/spring-data-testapp/HELP.md b/spring-data-testapp/HELP.md new file mode 100644 index 000000000..b54a59088 --- /dev/null +++ b/spring-data-testapp/HELP.md @@ -0,0 +1,10 @@ +# Getting Started + +### Reference Documentation +For further reference, please consider the following sections: + +* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html) +* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.5.2/maven-plugin/reference/html/) +* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.5.2/maven-plugin/reference/html/#build-image) +* [Spring Data Couchbase](https://docs.spring.io/spring-boot/docs/2.5.2/reference/htmlsingle/#boot-features-couchbase) + diff --git a/spring-data-testapp/mvnw b/spring-data-testapp/mvnw new file mode 100644 index 000000000..a16b5431b --- /dev/null +++ b/spring-data-testapp/mvnw @@ -0,0 +1,310 @@ +#!/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 /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="`which 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/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.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" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$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 \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/spring-data-testapp/mvnw.cmd b/spring-data-testapp/mvnw.cmd new file mode 100644 index 000000000..c8d43372c --- /dev/null +++ b/spring-data-testapp/mvnw.cmd @@ -0,0 +1,182 @@ +@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 "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\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/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "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%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.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 "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\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% + +exit /B %ERROR_CODE% diff --git a/spring-data-testapp/pom.xml b/spring-data-testapp/pom.xml new file mode 100644 index 000000000..f9624e705 --- /dev/null +++ b/spring-data-testapp/pom.xml @@ -0,0 +1,95 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.0.0-SNAPSHOT + + + com.example + demo + 0.0.1-SNAPSHOT + demo + Demo project for Spring Boot + + 11 + + + + org.springframework.boot + spring-boot-starter-data-couchbase + + + + + org.springframework.data + spring-data-couchbase + 5.0.0-SNAPSHOT + + + + org.springframework.boot + spring-boot-starter-test + test + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + 2.10.1 + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + + spring-libs-snapshot + https://repo.spring.io/libs-snapshot + + + sonatype-snapshot + https://oss.sonatype.org/content/repositories/snapshots + + true + + + false + + + + + + + spring-snapshots + https://repo.spring.io/snapshot + + + spring-milestones + https://repo.spring.io/milestone + + + + + + diff --git a/spring-data-testapp/src/main/java/com/example/demo/Airport.java b/spring-data-testapp/src/main/java/com/example/demo/Airport.java new file mode 100644 index 000000000..fd12eedc4 --- /dev/null +++ b/spring-data-testapp/src/main/java/com/example/demo/Airport.java @@ -0,0 +1,116 @@ +/* + * Copyright 2017-2021 the original author or authors. + * + * Licensed 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. + */ + +package com.example.demo; + +import org.springframework.data.annotation.CreatedBy; +import org.springframework.data.annotation.Id; +import org.springframework.data.annotation.PersistenceConstructor; +import org.springframework.data.annotation.TypeAlias; +import org.springframework.data.annotation.Version; +import org.springframework.data.couchbase.core.mapping.Document; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * Airport entity + * + * @author Michael Nitschinger + * @author Michael Reiche + */ +@Document +@TypeAlias("airport") +public class Airport { + @Id String id; + String iata; + String icao; + LocalDateTime openDate; + Long gates; + String _class; + @Version Number version; + @CreatedBy private String createdBy; + + public Airport() {} + + //@PersistenceConstructor + public Airport(String id, String iata, String icao) { + this.id = id; + this.iata = iata; + this.icao = icao; + this.openDate = null; // LocalDateTime.now(); + this.gates = Long.valueOf(200); + } + + public String getId() { + return id; + } + + public String getIata() { + return iata; + } + + public String getIcao() { + return icao; + } + + public Long getGates() { + return gates; + } + + public String get_class() { + return _class; + } + + public LocalDateTime getOpenDate() { + return openDate; + } + + /* + public Airport withId(String id) { + return new Airport(id, this.iata, this.icao); + } + + public Airport withIcao(String icao) { + return new Airport(this.getId(), this.iata, icao); + } + + public Airport withIata(String iata) { + return new Airport(this.getId(), iata, this.icao); + } + */ + public Airport clearVersion() { + version = Long.valueOf(0); + return this; + } + + public String getCreatedBy() { + return createdBy; + } + + public String toString() { + StringBuffer sb = new StringBuffer(); + sb.append("{ "); + sb.append(" id: " + id); + sb.append(" iata: " + iata); + sb.append(" icao: " + icao); + sb.append(" gates: " + gates); + sb.append(" open: "+openDate); + // sb.append(" date: "+openDate); + sb.append(" }"); + return sb.toString(); + } +} diff --git a/spring-data-testapp/src/main/java/com/example/demo/AirportRepository.java b/spring-data-testapp/src/main/java/com/example/demo/AirportRepository.java new file mode 100644 index 000000000..73731a4c1 --- /dev/null +++ b/spring-data-testapp/src/main/java/com/example/demo/AirportRepository.java @@ -0,0 +1,96 @@ +/* + * Copyright 2017-2021 the original author or authors. + * + * Licensed 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. + */ + +package com.example.demo; + +import com.couchbase.client.java.query.QueryScanConsistency; +import org.springframework.data.couchbase.core.RemoveResult; +import org.springframework.data.couchbase.core.mapping.Document; +import org.springframework.data.couchbase.repository.CouchbaseRepository; +import org.springframework.data.couchbase.repository.Query; +import org.springframework.data.couchbase.repository.ScanConsistency; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Optional; + +/** + * Airport repository for testing
+ */ +@Repository +@Document +// @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS) +public interface AirportRepository extends CouchbaseRepository { + + // override an annotate with REQUEST_PLUS + @Override + @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS) + List findAll(); + + @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS) + List findAllByIata(String iata); + + @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS) + Airport findByIata(String iata); + + @ScanConsistency(query = QueryScanConsistency.NOT_BOUNDED) + Airport iata(String iata); + + @Query("#{#n1ql.selectEntity} where iata = $1") + @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS) + List getAllByIata(String iata); + + @Query("#{#n1ql.delete} WHERE #{#n1ql.filter} and iata = $1 #{#n1ql.returning}") + @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS) + List deleteByIata(String iata); + + @Query("SELECT __cas, * from `#{#n1ql.bucket}` where iata = $1") + @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS) + List getAllByIataNoID(String iata); + + @Query("SELECT __id, * from `#{#n1ql.bucket}` where iata = $1") + @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS) + List getAllByIataNoCAS(String iata); + + @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS) + long countByIataIn(String... iata); + + @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS) + long countByIcaoAndIataIn(String icao, String... iata); + + @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS) + long countByIcaoOrIataIn(String icao, String... iata); + + @Override + @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS) + long count(); + + @Query("#{#n1ql.selectEntity} WHERE #{#n1ql.filter} #{#projectIds != null ? 'AND iata IN $1' : ''} " + + " #{#planIds != null ? 'AND icao IN $2' : ''} #{#active != null ? 'AND false = $3' : ''} ") + @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS) + Long countFancyExpression(@Param("projectIds") List projectIds, @Param("planIds") List planIds, + @Param("active") Boolean active); + + @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS) + Page findAllByIataNot(String iata, Pageable pageable); + + @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS) + Optional findByIdAndIata(String id, String iata); + +} diff --git a/spring-data-testapp/src/main/java/com/example/demo/AirportService.java b/spring-data-testapp/src/main/java/com/example/demo/AirportService.java new file mode 100644 index 000000000..bb6043304 --- /dev/null +++ b/spring-data-testapp/src/main/java/com/example/demo/AirportService.java @@ -0,0 +1,36 @@ +package com.example.demo; + +import com.couchbase.client.java.transactions.TransactionResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.couchbase.core.CouchbaseTemplate; +import org.springframework.data.couchbase.core.TransactionalSupport; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.Assert; + +@Service +@Transactional +public class AirportService { + + public AirportService(CouchbaseTemplate template){ + this.template = template; + } + + CouchbaseTemplate template; + public void transferGates(String fromId, String toId, int gatesToTransfer) { + TransactionalSupport.checkForTransactionInThreadLocalStorage() + .map( (h) -> { if ( ! h.isPresent() ) throw new RuntimeException("not in transaction!"); return h; } ); + + TransactionalSupport.checkForTransactionInThreadLocalStorage().map(stat -> { + Assert.isTrue(stat.isPresent(), "Not in transaction"); + return stat; + }); + Airport fromAirport = template.findById(Airport.class).one(fromId); + Airport toAirport = template.findById(Airport.class).one(toId); + toAirport.gates += gatesToTransfer; + fromAirport.gates -= gatesToTransfer; + template.save(fromAirport); + template.save(toAirport); + } +} diff --git a/spring-data-testapp/src/main/java/com/example/demo/CmdRunner.java b/spring-data-testapp/src/main/java/com/example/demo/CmdRunner.java new file mode 100644 index 000000000..25a5e66eb --- /dev/null +++ b/spring-data-testapp/src/main/java/com/example/demo/CmdRunner.java @@ -0,0 +1,67 @@ +package com.example.demo; + +import com.couchbase.client.java.transactions.TransactionResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.CommandLineRunner; +import org.springframework.data.couchbase.CouchbaseClientFactory; +import org.springframework.data.couchbase.core.CouchbaseTemplate; +import org.springframework.stereotype.Component; + +/** + * Components of the type CommandLineRunner are called right after the application start up. So the method *run* is + * called as soon as the application starts. + */ +@Component +public class CmdRunner implements CommandLineRunner { + + @Autowired AirportRepository airportRepository; + @Autowired + IndexDetailRepository indexDetailRepository; + @Autowired CouchbaseTemplate template; + @Autowired CouchbaseClientFactory couchbaseClientFactory; + @Autowired AirportService airportService; + + @Override + public void run(String... strings) throws Exception { + + try { + template.removeById(Airport.class).one("1"); + } catch (Exception e){} + try { + template.removeById(Airport.class).one("2"); + } catch (Exception e){} + + Airport new_1 = new Airport("1", "JFK", "jfk"); + Airport saved_1 = airportRepository.save(new_1); + Airport found_1 = airportRepository.findById(saved_1.getId()).get(); + System.out.println("found using repository by id: " + found_1); + + Airport new_2 = new Airport("2", "LGA", "lga"); + Airport saved_2 = airportRepository.save(new_2); + Airport found_2 = airportRepository.findById(saved_2.getId()).get(); + System.out.println("found using repository by id: " + found_2); + Airport found_3 = airportRepository.findByIata("JFK"); + System.out.println("founding using repository findByIata: "+found_3); + + + airportService.transferGates(new_1.getId(), new_2.getId(), 50); + + System.out.println("found after transferGates: "+airportRepository.findById(saved_1.getId()).get()); + System.out.println("found after transferGates: "+airportRepository.findById(saved_2.getId()).get()); + } + + + public void transferGatesDeprecated(String fromId, String toId, int gatesToTransfer) { + TransactionResult txResult = template.getCouchbaseClientFactory().getCluster().transactions().run(ctx -> { + + Airport fromAirport = template.findById(Airport.class).one(fromId); + Airport toAirport = template.findById(Airport.class).one(toId); + toAirport.gates += gatesToTransfer; + fromAirport.gates -= gatesToTransfer; + template.save(fromAirport); + template.save(toAirport); + }); + + } + +} diff --git a/spring-data-testapp/src/main/java/com/example/demo/Config.java b/spring-data-testapp/src/main/java/com/example/demo/Config.java new file mode 100644 index 000000000..87777033a --- /dev/null +++ b/spring-data-testapp/src/main/java/com/example/demo/Config.java @@ -0,0 +1,58 @@ +package com.example.demo; + +import com.couchbase.client.core.env.IoEnvironment; +import com.couchbase.client.core.env.SecurityConfig; +import com.couchbase.client.core.msg.kv.DurabilityLevel; +import com.couchbase.client.java.codec.JacksonJsonSerializer; +import com.couchbase.client.java.env.ClusterEnvironment; +import com.couchbase.client.java.json.JsonValueModule; +import com.couchbase.client.java.transactions.config.TransactionsConfig; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.couchbase.config.AbstractCouchbaseConfiguration; +import org.springframework.data.couchbase.repository.config.EnableCouchbaseRepositories; + +import java.time.Duration; + +@Configuration +@EnableCouchbaseRepositories({"com.example.demo", "com.wu.onep.ordnrt.cbviewsrch.repository"}) +public class Config extends AbstractCouchbaseConfiguration { + @Override + public String getConnectionString() { + return "127.0.0.1"; + } + + @Override + public String getUserName() { + return "Administrator"; + } + + @Override + public String getPassword() { + return "password"; + } + + @Override + public String getBucketName() { + return "travel-sample"; + } + + @Override + public void configureEnvironment(ClusterEnvironment.Builder builder){ + builder.jsonSerializer(getSerializer()) + .securityConfig(SecurityConfig.enableNativeTls(false)) + .ioEnvironment(IoEnvironment.enableNativeIo(false)); + // builder.transactionsConfig(TransactionsConfig.durabilityLevel(DurabilityLevel.NONE)); + } + + private static JacksonJsonSerializer getSerializer() { + ObjectMapper mapper = new ObjectMapper(); + mapper.registerModule(new JsonValueModule()); + mapper.registerModule(new JavaTimeModule()); // this handles LocalDateTime + mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); + return JacksonJsonSerializer.create(mapper); + } + +} diff --git a/spring-data-testapp/src/main/java/com/example/demo/DemoApplication.java b/spring-data-testapp/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 000000000..3a221c4cb --- /dev/null +++ b/spring-data-testapp/src/main/java/com/example/demo/DemoApplication.java @@ -0,0 +1,19 @@ +package com.example.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; + +@SpringBootApplication +public class DemoApplication { + + char a = '\u00A0'; + public static void main(String[] args) { + new SpringApplicationBuilder ( DemoApplication.class) + .properties("spring.main.allow-bean-definition-overriding=true") + .build() + .run(args); + } + + +} diff --git a/spring-data-testapp/src/main/java/com/example/demo/Iata.java b/spring-data-testapp/src/main/java/com/example/demo/Iata.java new file mode 100644 index 000000000..d14ee25ec --- /dev/null +++ b/spring-data-testapp/src/main/java/com/example/demo/Iata.java @@ -0,0 +1,6 @@ +package com.example.demo; + +public enum Iata { + vie, // must be lower-case to match "vie" as airport.iata is always specified in lowercase + xxx +} diff --git a/spring-data-testapp/src/main/resources/application.properties b/spring-data-testapp/src/main/resources/application.properties new file mode 100644 index 000000000..8e91b0ca8 --- /dev/null +++ b/spring-data-testapp/src/main/resources/application.properties @@ -0,0 +1 @@ +#spring.main.allow-bean-definition-overriding=true diff --git a/spring-data-testapp/src/main/resources/logback.xml b/spring-data-testapp/src/main/resources/logback.xml new file mode 100644 index 000000000..6d412e44e --- /dev/null +++ b/spring-data-testapp/src/main/resources/logback.xml @@ -0,0 +1,30 @@ + + + + + + %d %5p %40.40c:%4L - %m%n + + + + + + + + + + + + " + + " + + + diff --git a/spring-data-testapp/src/test/java/com/example/demo/DemoApplicationTests.java b/spring-data-testapp/src/test/java/com/example/demo/DemoApplicationTests.java new file mode 100644 index 000000000..2778a6a7e --- /dev/null +++ b/spring-data-testapp/src/test/java/com/example/demo/DemoApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class DemoApplicationTests { + + @Test + void contextLoads() { + } + +}