diff --git a/.gitignore b/.gitignore index dfdc047..340b3ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,5 @@ *.class -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - # Package Files # *.jar *.war @@ -15,7 +12,7 @@ hs_err_pid* .idea/ *.properties target/ -!maven-wrapper.properties -!maven-wrapper.jar +build/ !system.properties +.gradle/ !src/test/resources/credentials.properties diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 9cc84ea..0000000 Binary files a/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index 588d95f..0000000 --- a/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -distributionUrl=http://ftp.tudelft.nl/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip diff --git a/.travis.yml b/.travis.yml index 152281e..cb89926 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,22 @@ language: java jdk: - - openjdk13 + - openjdk14 addons: sonarcloud: organization: "benjaminkomen-github" +before_cache: + - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock + - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ + cache: directories: - '$HOME/.m2/repository' - '$HOME/.sonar/cache' + - '$HOME/.gradle/' + - '.gradle' # the dependency benjaminkomen/jwiki recides in GitHub Packages, for which you need credentials to download. # They are set here, with the GITHUB_TOKEN in Travis. @@ -18,4 +24,5 @@ install: - cp .travis.settings.xml $HOME/.m2/settings.xml script: - - ./mvnw clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar + # - ./gradlew clean build sonarqube ## FIXME enable when the java/util/jar/Pack200 bug has been fixed + - ./gradlew clean build diff --git a/Dockerfile b/Dockerfile index 49c1fff..8551da3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +1,19 @@ -FROM maven:3.6.2-jdk-13 as builder +FROM gradle:6.3.0-jdk14 as builder # Copy local code to the container image. WORKDIR /app -COPY pom.xml . +COPY build.gradle . COPY src ./src ARG GITHUB_TOKEN ENV GITHUB_TOKEN=${GITHUB_TOKEN} -COPY .travis.settings.xml /root/.m2/settings.xml # Build a release artifact. -RUN mvn package -DskipTests +RUN gradle build --no-daemon -FROM adoptopenjdk/openjdk13:jdk-13_33-alpine-slim +FROM adoptopenjdk/openjdk14:jdk-14.0.1_7-alpine-slim -COPY --from=builder /app/target/TibiaWikiApi.jar /TibiaWikiApi.jar +COPY --from=builder /app/build/libs/app-*.jar /TibiaWikiApi.jar # Run the web service on container startup. -CMD ["java","-Djava.security.egd=file:/dev/./urandom","-Dserver.port=${PORT}","-jar","/TibiaWikiApi.jar"] +CMD [ "java","-Djava.security.egd=file:/dev/./urandom","-Dserver.port=${PORT}","--enable-preview","-jar","/TibiaWikiApi.jar"] diff --git a/LICENSE b/LICENSE index ae6acb5..bb89050 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 Benjamin Komen +Copyright (c) 2020 Benjamin Komen Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index bd64192..b3ce7fd 100644 --- a/README.md +++ b/README.md @@ -3,15 +3,14 @@ [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=com.tibiawiki%3ATibiaWikiApi&metric=coverage)](https://sonarcloud.io/dashboard?id=com.tibiawiki%3ATibiaWikiApi) # TibiaWikiApi - Gets data from http://tibia.wikia.com and exposes this data using a RESTful JSON API. ## View online Navigate to https://tibiawiki.dev to view the Swagger API of this project. ## Run locally -Clone this git project to your local computer and compile it using: `mvn clean install` from your favourite command line -terminal. Then execute: `mvn spring-boot:run` and open your browser on http://localhost:8080 +Clone this git project to your local computer and compile it using: `./gradlew build` from your favourite command line +terminal. Then execute: `./gradlew bootRun` and open your browser on http://localhost:8080 Note that you need to add the [sample settings.xml](.travis.settings.xml) to your $HOME/.m2/settings.xml directory with a valid username and github token with read packages scope. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..d2d4525 --- /dev/null +++ b/build.gradle @@ -0,0 +1,112 @@ +plugins { + id 'org.springframework.boot' version '2.2.6.RELEASE' + id 'java' + id 'idea' + id 'jacoco' + id "org.sonarqube" version "2.8" +} + +group = 'com.tibiawiki' +version = '1.8.1' +description = 'TibiaWikiApi' +sourceCompatibility = '14' +targetCompatibility = '14' + +repositories { + mavenLocal() + mavenCentral() + + maven { + url = 'https://maven.pkg.github.com/benjaminkomen/jwiki' + credentials { + username = 'benjaminkomen' + password = System.getenv("GITHUB_TOKEN") + } + } +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter:2.2.6.RELEASE' + implementation 'org.springframework.boot:spring-boot-starter-jersey:2.2.6.RELEASE' + implementation 'org.springframework.boot:spring-boot-starter-web:2.2.6.RELEASE' + implementation 'benjaminkomen:jwiki:2.2.0' + implementation 'org.slf4j:slf4j-api:1.7.30' + implementation 'org.slf4j:slf4j-log4j12:1.7.30' + implementation 'org.json:json:20190722' + implementation 'org.jetbrains:annotations:19.0.0' + implementation 'one.util:streamex:0.7.2' + implementation 'javax.xml.bind:jaxb-api:2.3.1' + implementation 'javax.activation:activation:1.1.1' + implementation 'com.google.guava:guava:29.0-jre' + implementation 'io.swagger:swagger-jersey2-jaxrs:1.6.1' + implementation 'io.vavr:vavr:0.10.2' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.2' + testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.6.2' + testImplementation 'org.mockito:mockito-core:3.3.3' + testImplementation 'org.hamcrest:hamcrest:2.2' + testImplementation 'org.springframework.boot:spring-boot-starter-test:2.2.6.RELEASE' + annotationProcessor 'org.projectlombok:lombok:1.18.12' + compileOnly 'org.projectlombok:lombok:1.18.12' +} + +sonarqube { + properties { + property "sonar.projectName", "TibiaWikiApi" + property "sonar.projectKey", "com.tibiawiki:TibiaWikiApi" + } +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' + options.compilerArgs += '--enable-preview' +} + +tasks.withType(Test) { + jvmArgs += "--enable-preview" + useJUnitPlatform() + + testLogging { + events "passed", "skipped", "failed" + } +} + +tasks.withType(JavaExec) { + jvmArgs += '--enable-preview' +} + +jar { + manifest { + attributes 'Main-Class': 'com/tibiawiki/TibiaWikiApiApplication' + } +} + +sourceSets { + integrationTest { + compileClasspath += sourceSets.main.output + configurations.testCompile + runtimeClasspath += output + compileClasspath + configurations.testRuntime + } +} + +configurations { + integrationTestImplementation.extendsFrom implementation + integrationTestImplementation.extendsFrom testImplementation +} + +idea { + module { + testSourceDirs += sourceSets.integrationTest.java.srcDirs + testResourceDirs += sourceSets.integrationTest.resources.srcDirs + scopes.TEST.plus += [configurations.integrationTestCompile] + } +} + +task integrationTest(type: Test) { + description = 'Runs the integration tests.' + group = 'verification' + testClassesDirs = sourceSets.integrationTest.output.classesDirs + classpath = sourceSets.integrationTest.runtimeClasspath + outputs.upToDateWhen { false } + mustRunAfter test +} + +check.dependsOn integrationTest diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..490fda8 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..d8c1479 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sat May 02 12:23:41 CEST 2020 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..2fe81a7 --- /dev/null +++ b/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 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. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +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 +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +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 + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..62bd9b9 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,103 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem 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, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/mvnw b/mvnw deleted file mode 100755 index 5bf251c..0000000 --- a/mvnw +++ /dev/null @@ -1,225 +0,0 @@ -#!/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 -# -# http://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. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven2 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 Migwn, 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)`" - # TODO classpath? -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 - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -echo $MAVEN_PROJECTBASEDIR -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 - -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/mvnw.cmd b/mvnw.cmd deleted file mode 100644 index 019bd74..0000000 --- a/mvnw.cmd +++ /dev/null @@ -1,143 +0,0 @@ -@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 http://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 Maven2 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 key stroke 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 enable echoing my 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 - -%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/pom.xml b/pom.xml deleted file mode 100644 index 2fb1bca..0000000 --- a/pom.xml +++ /dev/null @@ -1,263 +0,0 @@ - - 4.0.0 - - com.tibiawiki - TibiaWikiApi - 1.8.0 - jar - TibiaWikiApi - https://github.com/benjaminkomen/TibiaWikiApi - - - org.springframework.boot - spring-boot-starter-parent - 2.2.6.RELEASE - - - - - - github - https://maven.pkg.github.com/benjaminkomen/jwiki - - - - - UTF-8 - UTF-8 - 1.7.30 - 20190722 - 1.18.12 - 19.0.0 - 0.7.2 - 5.6.2 - 3.3.3 - 2.2 - 2.22.2 - 2.22.2 - 3.8.1 - 3.1.0 - 2.2.0 - 29.0-jre - 1.6.1 - 1.1.1 - 0.10.2 - - - - - - org.springframework.boot - spring-boot-starter - - - logback-classic - ch.qos.logback - - - log4j-over-slf4j - org.slf4j - - - - - - org.springframework.boot - spring-boot-starter-jersey - - - - - org.springframework.boot - spring-boot-starter-web - - - - - benjaminkomen - jwiki - ${jwiki.version} - - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - - - org.json - json - ${json.version} - - - - - org.projectlombok - lombok - ${lombok.version} - provided - - - - - org.jetbrains - annotations - ${jetbrains.version} - - - - - one.util - streamex - ${streamex.version} - - - - - javax.xml.bind - jaxb-api - - - - javax.activation - activation - ${javax.activation.version} - - - - com.google.guava - guava - ${guava.version} - - - - - io.swagger - swagger-jersey2-jaxrs - ${swagger.jersey2.jaxrs.version} - - - - - io.vavr - vavr - ${vavr.version} - - - - - - - - org.junit.jupiter - junit-jupiter - ${junit.jupiter.version} - test - - - - org.mockito - mockito-core - ${mockito.version} - test - - - - org.hamcrest - hamcrest - ${hamcrest.version} - test - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.plugin.version} - - - 13 - 13 - - - - - maven-surefire-plugin - ${maven.surefire.plugin.version} - - - - org.codehaus.mojo - build-helper-maven-plugin - ${build.helper.maven.plugin.version} - - - add-test-source - process-resources - - add-test-source - - - - src/it/java - - - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${maven.failsafe.plugin.version} - - - integration-test - - integration-test - - - - verify - - verify - - - - - - - - diff --git a/scripts/deploy.sh b/scripts/deploy.sh index ca59006..d870d8c 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -1,4 +1,4 @@ #!/bin/bash gcloud builds submit --tag gcr.io/tibiawikiapi-246008/tibiawikiapi --project tibiawikiapi-246008 -gcloud beta run deploy tibiawikiapi --image gcr.io/tibiawikiapi-246008/tibiawikiapi --platform managed --region europe-west1 --memory 1Gi --project tibiawikiapi-246008 +gcloud run deploy tibiawikiapi --image gcr.io/tibiawikiapi-246008/tibiawikiapi --platform managed --region europe-west1 --memory 1Gi --project tibiawikiapi-246008 diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..c91a756 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'TibiaWikiApi' diff --git a/src/it/java/com/tibiawiki/domain/factories/JsonFactoryIT.java b/src/integrationTest/java/com/tibiawiki/domain/factories/JsonFactoryIT.java similarity index 100% rename from src/it/java/com/tibiawiki/domain/factories/JsonFactoryIT.java rename to src/integrationTest/java/com/tibiawiki/domain/factories/JsonFactoryIT.java diff --git a/src/it/java/com/tibiawiki/serviceinterface/AchievementsResourceIT.java b/src/integrationTest/java/com/tibiawiki/serviceinterface/AchievementsResourceIT.java similarity index 100% rename from src/it/java/com/tibiawiki/serviceinterface/AchievementsResourceIT.java rename to src/integrationTest/java/com/tibiawiki/serviceinterface/AchievementsResourceIT.java diff --git a/src/it/java/com/tibiawiki/serviceinterface/BooksResourceIT.java b/src/integrationTest/java/com/tibiawiki/serviceinterface/BooksResourceIT.java similarity index 100% rename from src/it/java/com/tibiawiki/serviceinterface/BooksResourceIT.java rename to src/integrationTest/java/com/tibiawiki/serviceinterface/BooksResourceIT.java diff --git a/src/it/java/com/tibiawiki/serviceinterface/CreaturesResourceIT.java b/src/integrationTest/java/com/tibiawiki/serviceinterface/CreaturesResourceIT.java similarity index 100% rename from src/it/java/com/tibiawiki/serviceinterface/CreaturesResourceIT.java rename to src/integrationTest/java/com/tibiawiki/serviceinterface/CreaturesResourceIT.java diff --git a/src/it/java/com/tibiawiki/serviceinterface/ItemsResourceIT.java b/src/integrationTest/java/com/tibiawiki/serviceinterface/ItemsResourceIT.java similarity index 100% rename from src/it/java/com/tibiawiki/serviceinterface/ItemsResourceIT.java rename to src/integrationTest/java/com/tibiawiki/serviceinterface/ItemsResourceIT.java diff --git a/src/it/java/com/tibiawiki/serviceinterface/LootStatisticsResourceIT.java b/src/integrationTest/java/com/tibiawiki/serviceinterface/LootStatisticsResourceIT.java similarity index 100% rename from src/it/java/com/tibiawiki/serviceinterface/LootStatisticsResourceIT.java rename to src/integrationTest/java/com/tibiawiki/serviceinterface/LootStatisticsResourceIT.java diff --git a/src/it/java/com/tibiawiki/serviceinterface/LootStatisticsV2ResourceIT.java b/src/integrationTest/java/com/tibiawiki/serviceinterface/LootStatisticsV2ResourceIT.java similarity index 100% rename from src/it/java/com/tibiawiki/serviceinterface/LootStatisticsV2ResourceIT.java rename to src/integrationTest/java/com/tibiawiki/serviceinterface/LootStatisticsV2ResourceIT.java diff --git a/src/main/java/com/tibiawiki/serviceinterface/config/JerseyConfig.java b/src/main/java/com/tibiawiki/serviceinterface/config/JerseyConfig.java index 4674ab8..866831f 100644 --- a/src/main/java/com/tibiawiki/serviceinterface/config/JerseyConfig.java +++ b/src/main/java/com/tibiawiki/serviceinterface/config/JerseyConfig.java @@ -61,7 +61,7 @@ private void configureSwagger() { BeanConfig beanConfig = new BeanConfig(); beanConfig.setConfigId("tibiawikiapi"); beanConfig.setTitle("TibiaWikiApi"); - beanConfig.setVersion("1.8.0"); + beanConfig.setVersion("1.8.1"); beanConfig.setContact("B. Komen"); beanConfig.setSchemes(new String[]{"https"}); beanConfig.setBasePath(this.apiPath); // location where dynamically created swagger.json is reachable diff --git a/system.properties b/system.properties deleted file mode 100644 index f7a43b4..0000000 --- a/system.properties +++ /dev/null @@ -1 +0,0 @@ -java.runtime.version=13 \ No newline at end of file