diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/build.gradle b/build.gradle
index fea9c40524451471a7892542a1ab426c71151ca3..a4cdacfc2a6d2d47cd204a59489fbd3a03afd642 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,3 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * This generated file contains a sample Java project to get you started.
- * For more details take a look at the Java Quickstart chapter in the Gradle
- * user guide available at https://docs.gradle.org/4.7/userguide/tutorial_java_projects.html
- */
-
plugins {
// Apply the java plugin to add support for Java
id 'java'
@@ -13,88 +5,97 @@ plugins {
// Apply the application plugin to add support for building an application
id 'application'
- id 'com.github.spotbugs' version "2.0.0"
+ id 'com.github.spotbugs' version '4.7.9'
id 'checkstyle'
- id "de.undercouch.download" version "4.0.0"
-
- id 'groovy'
+ // Used by 'downloadTests' task below
+ id 'de.undercouch.download' version '4.1.2'
}
-// Define the main class for the application
-mainClassName = 'de.hda.fbi.db2.Main'
+application {
+ // Define the main class for the application
+ mainClass.set('de.hda.fbi.db2.Main')
+}
-tasks.withType(com.github.spotbugs.SpotBugsTask) {
+spotbugs {
+ ignoreFailures = false
+ // Only cause failure for high priority issues
+ // Note: Currently this excludes all lower priority issues from report, see
+ // https://github.com/spotbugs/spotbugs-gradle-plugin/issues/14
+ reportLevel = 'high'
+ showStackTraces = false
+}
+tasks.withType(com.github.spotbugs.snom.SpotBugsTask) {
reports {
- xml.enabled = false
- html.enabled = true
+ xml.required = false
+ html.required = true
}
}
checkstyle {
- toolVersion "8.29"
- //configFile file("config/checkstyle/wso2_checks.xml")
- //configFile file("config/checkstyle/sun_checks.xml")
- configFile file("config/checkstyle/google_checks.xml")
+ toolVersion '8.29'
+ //configFile file('config/checkstyle/wso2_checks.xml')
+ //configFile file('config/checkstyle/sun_checks.xml')
+ configFile file('config/checkstyle/google_checks.xml')
}
tasks.withType(Checkstyle) {
reports {
- xml.enabled = false
- html.enabled = true
+ xml.required = false
+ html.required = true
}
}
-/*
-task downloadTests() {
- def unzipDir = new File('src/test/java/de/hda/fbi/db2/test')
- def gitURL = 'https://code.fbi.h-da.de/db2-praktikum/base-project/-/archive/master/base-project-master.zip?path=src%2Ftest%2Fjava%2Fde%2Fhda%2Ffbi%2Fdb2%2Ftest'
+tasks.register('downloadTestClasses') {
+ description('Replaces the local test classes with the test classes from the remote base '
+ + 'project. WARNING: This overwrites local changes!')
- download {
- src gitURL
- dest 'tests.zip'
- }
+ doLast {
+ def unzipDir = new File('src/test/java/de/hda/fbi/db2/test')
+ def gitURL = 'https://code.fbi.h-da.de/db2-praktikum/base-project/-/archive/master/base-project-master.zip?path=src%2Ftest%2Fjava%2Fde%2Fhda%2Ffbi%2Fdb2%2Ftest'
- copy {
- from zipTree('tests.zip').getFiles()
- into unzipDir
- }
+ download {
+ src gitURL
+ dest 'tests.zip'
+ }
- delete 'tests.zip'
-}
- */
+ copy {
+ from zipTree('tests.zip').getFiles()
+ into unzipDir
+ }
+ delete 'tests.zip'
+ }
+}
+// Specify Java version used to build this project
+java {
+ toolchain {
+ languageVersion = JavaLanguageVersion.of(11)
+ }
+}
dependencies {
-
- // This dependency is found on compile classpath of this component and consumers.
- compile 'com.google.guava:guava:23.0'
-
- compile group: 'org.eclipse.persistence', name: 'javax.persistence', version: '2.2.1'
-
// Use eclipselink JPA Implementation
- compile('org.eclipse.persistence:eclipselink:2.7.4') {
- exclude group: 'org.eclipse.persistence', module: 'jakarta.persistence'
- }
-
- //Oracle JDBC Driver and any other libraries from 'libs' folder since not available in public maven
- compile fileTree(dir: 'libs', include: ['*.jar'])
+ implementation 'org.eclipse.persistence:eclipselink:2.7.9'
// https://mvnrepository.com/artifact/org.postgresql/postgresql
- compile group: 'org.postgresql', name: 'postgresql', version: '42.2.1'
+ implementation 'org.postgresql:postgresql:42.3.1'
+
+ def spotBugsAnnotationsVersion = '4.5.0'
+ // SpotBugs annotations to suppress warnings about false positives
+ compileOnly "com.github.spotbugs:spotbugs-annotations:$spotBugsAnnotationsVersion"
+ testCompileOnly "com.github.spotbugs:spotbugs-annotations:$spotBugsAnnotationsVersion"
// Use JUnit test framework
- testCompile 'junit:junit:4.12'
+ testImplementation 'junit:junit:4.13.2'
}
// In this section you declare where to find the dependencies of your project
repositories {
- // Use jcenter for resolving your dependencies.
- // You can declare any Maven/Ivy/file repository here.
- jcenter()
+ mavenCentral()
}
// Attach stdin to gradle run
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 91ca28c8b802289c3a438766657a5e98f20eff03..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644
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 f4da6b115e697bc3f6909d72735eff845385d1f6..e750102e09269a4ac558e10a6612998e5ca4c0f2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sat Mar 09 13:39:39 CET 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
diff --git a/gradlew b/gradlew
index cccdd3d517fc5249beaefa600691cf150f2fa3e6..c53aefaa5fc898b78c7265ea99a3bdc09349a7d0 100755
--- a/gradlew
+++ b/gradlew
@@ -1,78 +1,129 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# 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
+#
+# 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
-##
+#
+# 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/master/subprojects/plugins/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_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${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=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# 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
@@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
- JAVACMD="java"
+ 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
@@ -89,84 +140,95 @@ 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
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ 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"
-
-# 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")"
-fi
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# 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 e95643d6a2ca62258464e83c72f5156dc941c609..ac1b06f93825db68fb0c0b5150917f340eaa5d02 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@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
@@ -13,15 +29,18 @@ 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=
+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
+if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ 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%
@@ -45,28 +64,14 @@ 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%
+"%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
diff --git a/src/main/java/de/hda/fbi/db2/api/Lab03Game.java b/src/main/java/de/hda/fbi/db2/api/Lab03Game.java
index 316741a53ddd0ddfbef8d34e798b5130c4b8fb9a..03c35a7e0b2c74ccf51f4248fbeb1dc2f52796dc 100644
--- a/src/main/java/de/hda/fbi/db2/api/Lab03Game.java
+++ b/src/main/java/de/hda/fbi/db2/api/Lab03Game.java
@@ -1,5 +1,6 @@
package de.hda.fbi.db2.api;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.util.List;
/**
@@ -35,6 +36,7 @@ public abstract class Lab03Game {
*
* @param lab02EntityManager lab02EntityManager
*/
+ @SuppressFBWarnings("EI_EXPOSE_REP2")
public final void setLab02EntityManager(Lab02EntityManager lab02EntityManager) {
this.lab02EntityManager = lab02EntityManager;
}
diff --git a/src/main/java/de/hda/fbi/db2/api/Lab04MassData.java b/src/main/java/de/hda/fbi/db2/api/Lab04MassData.java
index 656899a0ac3c0998f32fa820f6d0064e653377f3..2e3cded3263bc8a0d7a4bd3b6bff3063f1e241dd 100644
--- a/src/main/java/de/hda/fbi/db2/api/Lab04MassData.java
+++ b/src/main/java/de/hda/fbi/db2/api/Lab04MassData.java
@@ -1,5 +1,7 @@
package de.hda.fbi.db2.api;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
/**
* Api for MassData.
*/
@@ -38,6 +40,7 @@ public abstract class Lab04MassData {
*
* @param lab02EntityManager lab02EntityManager
*/
+ @SuppressFBWarnings("EI_EXPOSE_REP2")
public final void setLab02EntityManager(Lab02EntityManager lab02EntityManager) {
this.lab02EntityManager = lab02EntityManager;
}
@@ -47,6 +50,7 @@ public abstract class Lab04MassData {
*
* @param lab03Game lab03Game
*/
+ @SuppressFBWarnings("EI_EXPOSE_REP2")
public final void setLab03Game(Lab03Game lab03Game) {
this.lab03Game = lab03Game;
}
diff --git a/src/main/java/de/hda/fbi/db2/controller/Controller.java b/src/main/java/de/hda/fbi/db2/controller/Controller.java
index 79909a38f15cab2ec89da7b919c2c3325d94b17e..03c2f5c1396949769035150de97bc93ba5945599 100644
--- a/src/main/java/de/hda/fbi/db2/controller/Controller.java
+++ b/src/main/java/de/hda/fbi/db2/controller/Controller.java
@@ -4,6 +4,7 @@ import de.hda.fbi.db2.api.Lab01Data;
import de.hda.fbi.db2.api.Lab02EntityManager;
import de.hda.fbi.db2.api.Lab03Game;
import de.hda.fbi.db2.api.Lab04MassData;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Constructor;
@@ -175,14 +176,17 @@ public class Controller {
return lab01Data;
}
+ @SuppressFBWarnings("EI_EXPOSE_REP")
public Lab02EntityManager getLab02EntityManager() {
return lab02EntityManager;
}
+ @SuppressFBWarnings("EI_EXPOSE_REP")
public Lab03Game getLab03Game() {
return lab03Game;
}
+ @SuppressFBWarnings("EI_EXPOSE_REP")
public Lab04MassData getLab04MassData() {
return lab04MassData;
}
diff --git a/src/test/java/de/hda/fbi/db2/test/Lab02Test.java b/src/test/java/de/hda/fbi/db2/test/Lab02Test.java
index 791e9983c92ec7b996099b6520786364ad4e370a..3fc8ff2f6258fdc16b93311d4f2821421a962abe 100644
--- a/src/test/java/de/hda/fbi/db2/test/Lab02Test.java
+++ b/src/test/java/de/hda/fbi/db2/test/Lab02Test.java
@@ -9,6 +9,7 @@ import static org.junit.Assume.assumeNotNull;
import de.hda.fbi.db2.api.Lab02EntityManager;
import de.hda.fbi.db2.controller.Controller;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.util.List;
import javax.persistence.metamodel.Attribute;
import javax.persistence.metamodel.EntityType;
@@ -39,6 +40,7 @@ public class Lab02Test {
private static EntityType<?> questionEntity;
+ @SuppressFBWarnings("UWF_UNWRITTEN_FIELD")
private static EntityType<?> answerEntity;
private static Controller controller;
@@ -88,6 +90,7 @@ public class Lab02Test {
}
}
+ @SuppressFBWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
@Test
public void test1EntityManager() {
try {
@@ -100,6 +103,7 @@ public class Lab02Test {
}
}
+ @SuppressFBWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
@Test
public void test2FindCategory() {
if (metaData == null) {
@@ -123,6 +127,7 @@ public class Lab02Test {
fail("Could not find Category entity");
}
+ @SuppressFBWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
@Test
public void test3FindQuestion() {
if (metaData == null) {
@@ -229,6 +234,7 @@ public class Lab02Test {
}
// Explicitly want to test `equals` implementation; ignore IntelliJ warnings about `equals` misuse
+ @SuppressFBWarnings("EC_NULL_ARG")
@SuppressWarnings({"SimplifiableAssertion", "EqualsWithItself", "ConstantConditions"})
private static void assertEqualsImplementation(Object a, Object b) {
String className = a.getClass().getSimpleName();
diff --git a/src/test/java/de/hda/fbi/db2/test/Lab03Test.java b/src/test/java/de/hda/fbi/db2/test/Lab03Test.java
index 7f77dc49c2869e5d15e9dcc475a7a50902a24605..039cec7cf7331594fbdf425494cffeb74fa44f90 100644
--- a/src/test/java/de/hda/fbi/db2/test/Lab03Test.java
+++ b/src/test/java/de/hda/fbi/db2/test/Lab03Test.java
@@ -9,6 +9,7 @@ import static org.junit.Assume.assumeNotNull;
import de.hda.fbi.db2.api.Lab01Data;
import de.hda.fbi.db2.api.Lab03Game;
import de.hda.fbi.db2.controller.Controller;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.metamodel.EntityType;
@@ -97,6 +98,7 @@ public class Lab03Test {
gameController.persistGame(game);
}
+ @SuppressFBWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
@Test
public void test2FindGameEntity() {
if (metaData == null) {