diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a508772..e89896f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,11 +18,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 21 uses: actions/setup-java@v2 with: distribution: 'adopt' - java-version: '11' + java-version: '21' - name: Grant execute permission for gradlew run: chmod +x gradlew diff --git a/.github/workflows/manually-release.yml b/.github/workflows/manually-release.yml index cb97bea..796b291 100644 --- a/.github/workflows/manually-release.yml +++ b/.github/workflows/manually-release.yml @@ -27,11 +27,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 21 uses: actions/setup-java@v2 with: distribution: 'adopt' - java-version: '11' + java-version: '21' - name: Grant execute permission for gradlew run: chmod +x gradlew diff --git a/.github/workflows/promote.yml b/.github/workflows/promote.yml index 631f2d9..901c951 100644 --- a/.github/workflows/promote.yml +++ b/.github/workflows/promote.yml @@ -33,11 +33,11 @@ jobs: steps: - - name: Set up JDK 11 + - name: Set up JDK 21 uses: actions/setup-java@v2 with: distribution: 'adopt' - java-version: '11' + java-version: '21' - name: Get variables run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 578bed7..a8e10f2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ on: env: GH_USER_NAME: github.actor SCRIPTS_VERSION: 5.12.0 - BOM_VERSION: 5.12.3 + BOM_VERSION: 5.13.0 jobs: release: @@ -21,11 +21,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 21 uses: actions/setup-java@v2 with: distribution: 'adopt' - java-version: '11' + java-version: '21' - name: Grant execute permission for gradlew run: chmod +x gradlew diff --git a/build.gradle b/build.gradle index f67fd00..74dc1cf 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ plugins { - id "io.spring.dependency-management" version "1.0.9.RELEASE" + id 'io.spring.dependency-management' version '1.1.6' id 'java' id 'java-library' - id "org.owasp.dependencycheck" version "5.3.1" + id 'org.owasp.dependencycheck' version '11.1.0' } project.ext { @@ -18,8 +18,10 @@ apply from: scriptsUrl + '/release-commons.gradle' apply from: scriptsUrl + '/signing.gradle' //apply from: scriptsUrl + '/build-quality.gradle' -sourceCompatibility = JavaVersion.VERSION_11 -targetCompatibility = JavaVersion.VERSION_11 +java { + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 +} repositories { mavenCentral { url "https://repo1.maven.org/maven2" } @@ -31,23 +33,23 @@ repositories { dependencyManagement { imports { mavenBom 'org.springframework.boot:spring-boot-dependencies:2.1.5.RELEASE' - mavenBom('com.epam.reportportal:commons-bom:5.12.3') + mavenBom('com.epam.reportportal:commons-bom:5.13.0') } } dependencies { if (releaseMode) { - api 'com.epam.reportportal:commons-reporting:5.12.3' + api 'com.epam.reportportal:commons-reporting:5.13.0' } else { - api 'com.github.reportportal:commons-reporting:1eaa63a' + api 'com.github.reportportal:commons-reporting:develop-SNAPSHOT' } api 'org.springframework:spring-webmvc' api 'org.springframework.security:spring-security-core' api 'org.apache.tika:tika-core' implementation "org.springdoc:springdoc-openapi-data-rest:${sprindocAnnotationsVersion}" - implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}" - implementation "javax.validation:validation-api:${validationApiVersion}" + api "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}" + api "javax.validation:validation-api:${validationApiVersion}" implementation "org.apache.commons:commons-lang3:${commonsLangVersion}" implementation group: 'com.google.guava', name: 'guava', version: '28.2-jre' implementation 'javax.servlet:javax.servlet-api' @@ -72,7 +74,7 @@ dependencies { } wrapper { - gradleVersion = '8.5' + gradleVersion = '8.10' } tasks.preTagCommit.enabled = false diff --git a/gradle.properties b/gradle.properties index 3161d9f..9618691 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ -version=5.12.3 +version=5.13.0 description=EPAM Report portal common libs -hibernateValidatorVersion=6.1.2.Final +hibernateValidatorVersion=6.2.0.Final validationApiVersion=2.0.1.Final -junitVersion=4.12 +junitVersion=4.13.1 elApiVersion=3.0.0 sprindocAnnotationsVersion=1.7.0 commonsLangVersion=3.9 mockitoJunitJupiter=2.23.0 -jacksonVersion=2.10.2 +jacksonVersion=2.13.4.2 lombokVersion=1.18.30 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5c2d1cf..a4b76b9 100755 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b70689f..9355b41 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Mon Mar 16 18:41:59 MSK 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index b0d6d0a..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -1,13 +1,13 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original 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 # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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, @@ -15,80 +15,116 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # 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 +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac 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"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # 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 - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -97,92 +133,120 @@ 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. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + 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 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 +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac 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 +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; 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\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg 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" +# 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"' -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 9991c50..9d21a21 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -5,7 +5,7 @@ @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 http://www.apache.org/licenses/LICENSE-2.0 +@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, @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,10 +27,14 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused 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" @@ -37,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute -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. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -51,48 +57,36 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute -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. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 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% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 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 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/jitpack.yml b/jitpack.yml new file mode 100644 index 0000000..a202792 --- /dev/null +++ b/jitpack.yml @@ -0,0 +1,2 @@ +jdk: + - openjdk21 \ No newline at end of file diff --git a/src/main/java/com/epam/reportportal/annotations/In.java b/src/main/java/com/epam/reportportal/annotations/In.java deleted file mode 100644 index 291048d..0000000 --- a/src/main/java/com/epam/reportportal/annotations/In.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2019 EPAM Systems - * - * 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 - * - * 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. - */ - -package com.epam.reportportal.annotations; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import javax.validation.Constraint; - -/** - * Can be used with strings. Checks if string value is contained in allowed values ignoring case. - *

- * {@code null} - valid value. - * - * @author Ihar Kahadouski - */ -@Documented -@Constraint(validatedBy = {InValidator.class, InCollectionValidator.class}) -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.FIELD, ElementType.PARAMETER}) -public @interface In { - - String message() default "Value is not allowed"; - - Class[] groups() default {}; - - Class[] payload() default {}; - - String[] allowedValues() default {}; -} diff --git a/src/main/java/com/epam/reportportal/annotations/InCollectionValidator.java b/src/main/java/com/epam/reportportal/annotations/InCollectionValidator.java deleted file mode 100644 index 9939085..0000000 --- a/src/main/java/com/epam/reportportal/annotations/InCollectionValidator.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2019 EPAM Systems - * - * 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 - * - * 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. - */ - -package com.epam.reportportal.annotations; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - -/** - * @author Ihar Kahadouski - */ -public class InCollectionValidator implements ConstraintValidator> { - - private String[] allowedValues; - - @Override - public void initialize(In constraintAnnotation) { - allowedValues = new String[constraintAnnotation.allowedValues().length]; - for (int i = 0; i < constraintAnnotation.allowedValues().length; i++) { - allowedValues[i] = constraintAnnotation.allowedValues()[i].toUpperCase(); - } - } - - @Override - public boolean isValid(Collection value, ConstraintValidatorContext context) { - List upperCaseList = new ArrayList<>(); - for (String next : value) { - upperCaseList.add(next.toUpperCase()); - } - return Arrays.asList(allowedValues).containsAll(upperCaseList); - } -} diff --git a/src/main/java/com/epam/reportportal/annotations/InValidator.java b/src/main/java/com/epam/reportportal/annotations/InValidator.java deleted file mode 100644 index 3754ae8..0000000 --- a/src/main/java/com/epam/reportportal/annotations/InValidator.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2019 EPAM Systems - * - * 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 - * - * 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. - */ - -package com.epam.reportportal.annotations; - -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - -/** - * @author Ihar Kahadouski - */ -public class InValidator implements ConstraintValidator { - - private String[] allowedValues; - - @Override - public void initialize(In constraintAnnotation) { - allowedValues = constraintAnnotation.allowedValues(); - } - - @Override - public boolean isValid(String value, ConstraintValidatorContext context) { - if (null == value) { - return true; - } - for (String next : allowedValues) { - if (value.equalsIgnoreCase(next)) { - return true; - } - } - return false; - } -} diff --git a/src/main/java/com/epam/reportportal/annotations/NotBlankWithSize.java b/src/main/java/com/epam/reportportal/annotations/NotBlankWithSize.java deleted file mode 100644 index 375b1d1..0000000 --- a/src/main/java/com/epam/reportportal/annotations/NotBlankWithSize.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2019 EPAM Systems - * - * 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 - * - * 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. - */ - -package com.epam.reportportal.annotations; - - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static org.apache.commons.lang3.StringUtils.EMPTY; - -import com.epam.reportportal.model.validation.NotBlankWithSizeValidator; -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; - -/** - * @author Tatyana Gladysheva - */ -@Target({FIELD, METHOD}) -@Documented -@Constraint(validatedBy = NotBlankWithSizeValidator.class) -@Retention(RUNTIME) -public @interface NotBlankWithSize { - - String message() default EMPTY; - - Class[] groups() default {}; - - Class[] payload() default {}; - - int min() default 0; - - int max() default Integer.MAX_VALUE; -} diff --git a/src/main/java/com/epam/reportportal/model/project/AnalyzerConfig.java b/src/main/java/com/epam/reportportal/model/project/AnalyzerConfig.java index 19b73eb..208d4ed 100644 --- a/src/main/java/com/epam/reportportal/model/project/AnalyzerConfig.java +++ b/src/main/java/com/epam/reportportal/model/project/AnalyzerConfig.java @@ -20,7 +20,7 @@ import static com.epam.reportportal.model.ValidationConstraints.MIN_NUMBER_OF_LOG_LINES; import static com.epam.reportportal.model.ValidationConstraints.MIN_SHOULD_MATCH; -import com.epam.reportportal.annotations.In; +import com.epam.ta.reportportal.ws.annotations.In; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/epam/reportportal/model/validation/NotBlankWithSizeValidator.java b/src/main/java/com/epam/reportportal/model/validation/NotBlankWithSizeValidator.java index 0f4169f..7063648 100644 --- a/src/main/java/com/epam/reportportal/model/validation/NotBlankWithSizeValidator.java +++ b/src/main/java/com/epam/reportportal/model/validation/NotBlankWithSizeValidator.java @@ -16,7 +16,7 @@ package com.epam.reportportal.model.validation; -import com.epam.reportportal.annotations.NotBlankWithSize; +import com.epam.ta.reportportal.ws.annotations.NotBlankWithSize; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; import org.apache.commons.lang3.StringUtils; diff --git a/src/test/java/com/epam/reportportal/annotations/InValidatorTest.java b/src/test/java/com/epam/reportportal/annotations/InValidatorTest.java deleted file mode 100644 index 1b9954a..0000000 --- a/src/test/java/com/epam/reportportal/annotations/InValidatorTest.java +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Copyright 2019 EPAM Systems - * - * 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 - * - * 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. - */ - -package com.epam.reportportal.annotations; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.util.Arrays; -import java.util.List; -import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * @author Ihar Kahadouski - */ -public class InValidatorTest { - - private static Validator validator; - - @BeforeClass - public static void init() { - validator = Validation.buildDefaultValidatorFactory().getValidator(); - } - - @Test - public void testNegative() { - StringTestEntity stringTestEntity = new StringTestEntity(); - stringTestEntity.setField("notAllowed"); - - Set> constraints = validator.validate(stringTestEntity); - - boolean found = false; - for (ConstraintViolation cv : constraints) { - if ("field".equals(cv.getPropertyPath().iterator().next().getName()) && cv.getMessage() - .contains("not allowed")) { - found = true; - break; - } - } - - assertTrue(found); - } - - @Test - public void testPositive() { - StringTestEntity stringTestEntity = new StringTestEntity(); - stringTestEntity.setField("ALLowed1"); - - Set> constraints = validator.validate(stringTestEntity); - - boolean found = false; - for (ConstraintViolation cv : constraints) { - if ("field".equals(cv.getPropertyPath().iterator().next().getName()) && cv.getMessage() - .contains("not allowed")) { - found = true; - break; - } - } - - assertFalse(found); - } - - @Test - public void testNull() { - StringTestEntity stringTestEntity = new StringTestEntity(); - stringTestEntity.setField(null); - - Set> constraints = validator.validate(stringTestEntity); - - boolean found = false; - for (ConstraintViolation cv : constraints) { - if ("field".equals(cv.getPropertyPath().iterator().next().getName()) && cv.getMessage() - .contains("not allowed")) { - found = true; - break; - } - } - - assertFalse(found); - } - - @Test - public void testCollectionPositive() { - CollectionTestEntity collectionTestEntity = new CollectionTestEntity(); - collectionTestEntity.setField(Arrays.asList("ALLOWED1", "allowed2")); - - Set> constaints = validator.validate( - collectionTestEntity); - - assertTrue(constaints.isEmpty()); - } - - @Test - public void testCollectionNegative() { - CollectionTestEntity collectionTestEntity = new CollectionTestEntity(); - collectionTestEntity.setField(Arrays.asList("notAllowed", "allowed1", "allowed2")); - - Set> constaints = validator.validate( - collectionTestEntity); - - assertFalse(constaints.isEmpty()); - } - - private static class StringTestEntity { - - @In(allowedValues = {"allowed1", "allowed2"}) - private String field; - - public String getField() { - return field; - } - - public void setField(String field) { - this.field = field; - } - } - - private static class CollectionTestEntity { - - @In(allowedValues = {"allowed1", "allowed2"}) - private List field; - - public List getField() { - return field; - } - - public void setField(List field) { - this.field = field; - } - } -} \ No newline at end of file diff --git a/src/test/java/com/epam/reportportal/model/validation/NotBlankWithSizeValidatorTest.java b/src/test/java/com/epam/reportportal/model/validation/NotBlankWithSizeValidatorTest.java deleted file mode 100644 index 690eba3..0000000 --- a/src/test/java/com/epam/reportportal/model/validation/NotBlankWithSizeValidatorTest.java +++ /dev/null @@ -1,352 +0,0 @@ -/* - * Copyright 2019 EPAM Systems - * - * 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 - * - * 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. - */ - -package com.epam.reportportal.model.validation; - -import static org.apache.commons.lang3.StringUtils.EMPTY; -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; - -import com.epam.reportportal.annotations.NotBlankWithSize; -import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * @author Tatyana Gladysheva - */ -public class NotBlankWithSizeValidatorTest { - - private static final String NOT_NULL_PROPERTY = "Field ''{0}'' should not be null."; - private static final String NOT_BLANK_PROPERTY = "Field ''{0}'' should not contain only white spaces and shouldn''t be empty."; - private static final String SIZE_PROPERTY = "Field ''{0}'' should have size from ''{2}'' to ''{1}''."; - - private static final String VALID_NAME = "Valid name"; - private static final String SPACE = " "; - private static final String WHITESPACES_NAME = " "; - private static final String INVALID_NAME_WITH_LESS_CHARACTERS = "cc"; - private static final String INVALID_NAME_WITH_MORE_CHARACTERS = - "tttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt" - + "ttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt"; - private static final String VALID_NAME_WITH_NUMBER_OF_CHARS_EQUAL_TO_MIN = "ccc"; - private static final String VALID_NAME_WITH_NUMBER_OF_CHARS_EQUAL_TO_MAX = - "ttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt" - + "ttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt"; - - private static Validator validator; - - @BeforeClass - public static void init() { - validator = Validation.buildDefaultValidatorFactory().getValidator(); - } - - @Test - public void validateShouldReturnNoViolationsWhenNameIsValidAndValidationIsOnField() { - //GIVEN - AnnotationOnFieldClass testObject = new AnnotationOnFieldClass(); - testObject.setName(VALID_NAME); - - //WHEN - Set> violations = validator.validate(testObject); - - //THEN - assertThat(violations.isEmpty(), is(true)); - } - - @Test - public void validateShouldReturnOneViolationWithNotNullMessageWhenNameIsNullAndValidationIsOnField() { - //GIVEN - AnnotationOnFieldClass testObject = new AnnotationOnFieldClass(); - testObject.setName(null); - - //WHEN - Set> violations = validator.validate(testObject); - - //THEN - assertThat(violations.size(), is(1)); - - ConstraintViolation violation = violations.iterator().next(); - String actualMessage = violation.getMessage(); - - assertThat(actualMessage, is(NOT_NULL_PROPERTY)); - } - - @Test - public void validateShouldReturnOneViolationWithNotBlankMessageWhenNameIsEmptyAndValidationIsOnField() { - //GIVEN - AnnotationOnFieldClass testObject = new AnnotationOnFieldClass(); - testObject.setName(EMPTY); - - String expectedMessage = NOT_BLANK_PROPERTY + SPACE + SIZE_PROPERTY; - - //WHEN - Set> violations = validator.validate(testObject); - - //THEN - assertThat(violations.size(), is(1)); - - ConstraintViolation violation = violations.iterator().next(); - String actualMessage = violation.getMessage(); - - assertThat(actualMessage, is(expectedMessage)); - } - - @Test - public void validateShouldReturnOneViolationWithNotBlankMessageWhenNameConsistsOfWhitespacesAndValidationIsOnField() { - //GIVEN - AnnotationOnFieldClass testObject = new AnnotationOnFieldClass(); - testObject.setName(WHITESPACES_NAME); - - String expectedMessage = NOT_BLANK_PROPERTY + SPACE + SIZE_PROPERTY; - - //WHEN - Set> violations = validator.validate(testObject); - - //THEN - assertThat(violations.size(), is(1)); - - ConstraintViolation violation = violations.iterator().next(); - String actualMessage = violation.getMessage(); - - assertThat(actualMessage, is(expectedMessage)); - } - - @Test - public void validateShouldReturnOneViolationWithSizeMessageWhenNameHasLessThanMinNumberOfCharactersAndValidationIsOnField() { - //GIVEN - AnnotationOnFieldClass testObject = new AnnotationOnFieldClass(); - testObject.setName(INVALID_NAME_WITH_LESS_CHARACTERS); - - //WHEN - Set> violations = validator.validate(testObject); - - //THEN - assertThat(violations.size(), is(1)); - - ConstraintViolation violation = violations.iterator().next(); - String actualMessage = violation.getMessage(); - - assertThat(actualMessage, is(SIZE_PROPERTY)); - } - - @Test - public void validateShouldReturnOneViolationWithSizeMessageWhenNameHasMoreThanMaxNumberOfCharactersAndValidationIsOnField() { - //GIVEN - AnnotationOnFieldClass testObject = new AnnotationOnFieldClass(); - testObject.setName(INVALID_NAME_WITH_MORE_CHARACTERS); - - //WHEN - Set> violations = validator.validate(testObject); - - //THEN - assertThat(violations.size(), is(1)); - - ConstraintViolation violation = violations.iterator().next(); - String actualMessage = violation.getMessage(); - - assertThat(actualMessage, is(SIZE_PROPERTY)); - } - - @Test - public void validateShouldReturnNoViolationsWhenNameHasNumberOfCharactersEqualToMinAndValidationIsOnField() { - //GIVEN - AnnotationOnFieldClass testObject = new AnnotationOnFieldClass(); - testObject.setName(VALID_NAME_WITH_NUMBER_OF_CHARS_EQUAL_TO_MIN); - - //WHEN - Set> violations = validator.validate(testObject); - - //THEN - assertThat(violations.isEmpty(), is(true)); - } - - @Test - public void validateShouldReturnNoViolationsWhenNameHasNumberOfCharactersEqualToMaxAndValidationIsOnField() { - //GIVEN - AnnotationOnFieldClass testObject = new AnnotationOnFieldClass(); - testObject.setName(VALID_NAME_WITH_NUMBER_OF_CHARS_EQUAL_TO_MAX); - - //WHEN - Set> violations = validator.validate(testObject); - - //THEN - assertThat(violations.isEmpty(), is(true)); - } - - private static class AnnotationOnFieldClass { - - @NotBlankWithSize(min = 3, max = 128) - private String name; - - public String getName() { - return name; - } - - void setName(String name) { - this.name = name; - } - } - - @Test - public void validateShouldReturnNoViolationsWhenNameIsValidAndValidationIsOnMethod() { - //GIVEN - AnnotationOnMethodClass testObject = new AnnotationOnMethodClass(); - testObject.setName(VALID_NAME); - - //WHEN - Set> violations = validator.validate(testObject); - - //THEN - assertThat(violations.isEmpty(), is(true)); - } - - @Test - public void validateShouldReturnOneViolationWithNotNullMessageWhenNameIsNullAndValidationIsOnMethod() { - //GIVEN - AnnotationOnMethodClass testObject = new AnnotationOnMethodClass(); - testObject.setName(null); - - //WHEN - Set> violations = validator.validate(testObject); - - //THEN - assertThat(violations.size(), is(1)); - - ConstraintViolation violation = violations.iterator().next(); - String actualMessage = violation.getMessage(); - - assertThat(actualMessage, is(NOT_NULL_PROPERTY)); - } - - @Test - public void validateShouldReturnOneViolationWithNotBlankMessageWhenNameIsEmptyAndValidationIsOnMethod() { - //GIVEN - AnnotationOnMethodClass testObject = new AnnotationOnMethodClass(); - testObject.setName(EMPTY); - - String expectedMessage = NOT_BLANK_PROPERTY + SPACE + SIZE_PROPERTY; - - //WHEN - Set> violations = validator.validate(testObject); - - //THEN - assertThat(violations.size(), is(1)); - - ConstraintViolation violation = violations.iterator().next(); - String actualMessage = violation.getMessage(); - - assertThat(actualMessage, is(expectedMessage)); - } - - @Test - public void validateShouldReturnOneViolationWithNotBlankMessageWhenNameConsistsOfWhitespacesAndValidationIsOnMethod() { - //GIVEN - AnnotationOnMethodClass testObject = new AnnotationOnMethodClass(); - testObject.setName(WHITESPACES_NAME); - - String expectedMessage = NOT_BLANK_PROPERTY + SPACE + SIZE_PROPERTY; - - //WHEN - Set> violations = validator.validate(testObject); - - //THEN - assertThat(violations.size(), is(1)); - - ConstraintViolation violation = violations.iterator().next(); - String actualMessage = violation.getMessage(); - - assertThat(actualMessage, is(expectedMessage)); - } - - @Test - public void validateShouldReturnOneViolationWithSizeMessageWhenNameHasLessThanMinNumberOfCharactersAndValidationIsOnMethod() { - //GIVEN - AnnotationOnMethodClass testObject = new AnnotationOnMethodClass(); - testObject.setName(INVALID_NAME_WITH_LESS_CHARACTERS); - - //WHEN - Set> violations = validator.validate(testObject); - - //THEN - assertThat(violations.size(), is(1)); - - ConstraintViolation violation = violations.iterator().next(); - String actualMessage = violation.getMessage(); - - assertThat(actualMessage, is(SIZE_PROPERTY)); - } - - @Test - public void validateShouldReturnOneViolationWithSizeMessageWhenNameHasMoreThanMaxNumberOfCharactersAndValidationIsOnMethod() { - //GIVEN - AnnotationOnMethodClass testObject = new AnnotationOnMethodClass(); - testObject.setName(INVALID_NAME_WITH_MORE_CHARACTERS); - - //WHEN - Set> violations = validator.validate(testObject); - - //THEN - assertThat(violations.size(), is(1)); - - ConstraintViolation violation = violations.iterator().next(); - String actualMessage = violation.getMessage(); - - assertThat(actualMessage, is(SIZE_PROPERTY)); - } - - @Test - public void validateShouldReturnNoViolationsWhenNameHasNumberOfCharactersEqualToMinAndValidationIsOnMethod() { - //GIVEN - AnnotationOnMethodClass testObject = new AnnotationOnMethodClass(); - testObject.setName(VALID_NAME_WITH_NUMBER_OF_CHARS_EQUAL_TO_MIN); - - //WHEN - Set> violations = validator.validate(testObject); - - //THEN - assertThat(violations.isEmpty(), is(true)); - } - - @Test - public void validateShouldReturnNoViolationsWhenNameHasNumberOfCharactersEqualToMaxAndValidationIsOnMethod() { - //GIVEN - AnnotationOnMethodClass testObject = new AnnotationOnMethodClass(); - testObject.setName(VALID_NAME_WITH_NUMBER_OF_CHARS_EQUAL_TO_MAX); - - //WHEN - Set> violations = validator.validate(testObject); - - //THEN - assertThat(violations.isEmpty(), is(true)); - } - - private static class AnnotationOnMethodClass { - - private String name; - - @NotBlankWithSize(min = 3, max = 128) - public String getName() { - return name; - } - - void setName(String name) { - this.name = name; - } - } -} \ No newline at end of file