diff --git a/.github/workflows/bootjar_testing.yml b/.github/workflows/bootjar_testing.yml index 380ac6a..5bec2ce 100644 --- a/.github/workflows/bootjar_testing.yml +++ b/.github/workflows/bootjar_testing.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-latest] - java: [17] + java: [17, 21] steps: - name: Checkout code diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 4c5c789..efa3943 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -19,7 +19,7 @@ jobs: matrix: operating-system: [ubuntu-latest, macOS-latest] # Use both LTS releases and latest one for tests - jdk: [ 17 ] + jdk: [ 17, 21 ] steps: - name: Checkout repo uses: actions/checkout@v4 diff --git a/build.gradle b/build.gradle index d435ec8..fa30e75 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { - id "org.springframework.boot" version "2.7.5" - id "io.spring.dependency-management" version "1.1.0" + id "org.springframework.boot" version "3.4.5" + id "io.spring.dependency-management" version "1.1.4" id "io.freefair.maven-publish-java" version "6.5.1" id "com.github.kt3k.coveralls" version "2.12.0" id "org.owasp.dependencycheck" version "7.3.0" @@ -31,11 +31,12 @@ configurations { ext { set('javersVersion', "6.8.0") - set('springBootVersion', "2.7.5") - set('springDocVersion', "1.6.9") + set('jenaVersion', "5.4.0") + set('springBootVersion', "3.4.5") + set('springDocVersion', "2.5.0") set('keycloakVersion', "19.0.0") - set('junitPlatformVersion', "1.2.0") - set('junitJupiterVersion', "5.2.0") + set('junitPlatformVersion', "1.11.4") + set('junitJupiterVersion', "5.11.4") // directory for generated code snippets during tests snippetsDir = file("build/generated-snippets") @@ -80,7 +81,7 @@ dependencies { //implementation "org.springframework.security:spring-security-web:5.7.5" //implementation "org.springframework.security:spring-security-config:5.7.5" - implementation "org.thymeleaf:thymeleaf-spring5" + implementation "org.thymeleaf:thymeleaf-spring6" // cloud support @@ -90,23 +91,21 @@ dependencies { //implementation 'de.codecentric:spring-boot-admin-starter-client:2.7.10' // springdoc - implementation "org.springdoc:springdoc-openapi-ui:${springDocVersion}" - implementation "org.springdoc:springdoc-openapi-data-rest:${springDocVersion}" - implementation "org.springdoc:springdoc-openapi-webmvc-core:${springDocVersion}" + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:${springDocVersion}" //Keycloak // implementation "org.keycloak:keycloak-spring-boot-starter:${keycloakVersion}" - implementation "com.nimbusds:nimbus-jose-jwt:9.24.3" + implementation 'com.nimbusds:nimbus-jose-jwt:9.37.2' implementation "io.jsonwebtoken:jjwt-api:0.11.5" implementation "io.jsonwebtoken:jjwt-impl:0.11.5" implementation "io.jsonwebtoken:jjwt-jackson:0.11.5" //Jena - implementation "org.apache.jena:apache-jena-libs:4.10.0" - implementation "org.apache.jena:jena-fuseki:4.10.0" - implementation "org.apache.jena:jena-fuseki-server:4.10.0" + implementation "org.apache.jena:apache-jena-libs:${jenaVersion}" + implementation "org.apache.jena:jena-fuseki:${jenaVersion}" + implementation "org.apache.jena:jena-fuseki-server:${jenaVersion}" - implementation "org.apache.jena:jena-commonsrdf:4.10.0" + implementation "org.apache.jena:jena-commonsrdf:${jenaVersion}" implementation "org.apache.thrift:libthrift:0.18.1" implementation "org.apache.commons:commons-rdf-jsonld-java:0.5.0" @@ -115,11 +114,11 @@ dependencies { implementation "org.apache.commons:commons-collections4:4.1" // driver for postgres - implementation "org.postgresql:postgresql:42.5.0" + implementation 'org.postgresql:postgresql:42.7.2' //driver for h2 - implementation "com.h2database:h2:2.1.214" + implementation 'com.h2database:h2:2.2.220' - testImplementation "org.springframework.restdocs:spring-restdocs-mockmvc:2.0.6.RELEASE" + testImplementation "org.springframework.restdocs:spring-restdocs-mockmvc:3.0.3" testImplementation "org.springframework.boot:spring-boot-starter-test" testImplementation "org.springframework:spring-test" // testImplementation "org.springframework.security:spring-security-test" @@ -131,7 +130,7 @@ dependencies { testImplementation "io.rest-assured:rest-assured" testImplementation "io.rest-assured:spring-mock-mvc" testImplementation "io.rest-assured:rest-assured" - testImplementation ("io.specto:hoverfly-java-junit5:0.17.1") { + testImplementation ("io.specto:hoverfly-java-junit5:0.20.0") { exclude group: 'ch.qos.logback', module: 'logback-classic' } @@ -168,7 +167,7 @@ test { environment "spring.config.location", "classpath:/test-config/" } -tasks.withType(Test) { +tasks.withType(Test).configureEach { testLogging { events 'started', 'passed' } @@ -183,13 +182,13 @@ bootJar { archiveFileName = "${archiveBaseName.get()}.${archiveExtension.get()}" duplicatesStrategy = DuplicatesStrategy.EXCLUDE manifest { - attributes 'Main-Class': 'org.springframework.boot.loader.PropertiesLauncher' + attributes 'Main-Class': 'org.springframework.boot.loader.launch.PropertiesLauncher' } launchScript() } // task for printing project name. -task printProjectName { +tasks.register('printProjectName') { doLast { println "${project.name}" } diff --git a/gradle/profile-complete.gradle b/gradle/profile-complete.gradle index 866be7c..eb45ecd 100644 --- a/gradle/profile-complete.gradle +++ b/gradle/profile-complete.gradle @@ -7,7 +7,7 @@ test { jacocoTestReport { dependsOn test reports { - xml.enabled true - html.enabled false + xml.required.set(true) + html.required.set(false) } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927..943f0cb 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 070cb70..3c44eb1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 1b6c787..65dcd68 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # 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 +# https://github.com/gradle/gradle/blob/HEAD/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/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # 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"' @@ -143,12 +143,16 @@ 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=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=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -205,6 +209,12 @@ set -- \ 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. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ 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% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :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/src/main/java/edu/kit/scc/dem/wapsrv/app/CorsFilter.java b/src/main/java/edu/kit/scc/dem/wapsrv/app/CorsFilter.java index a8ff9f2..f684314 100644 --- a/src/main/java/edu/kit/scc/dem/wapsrv/app/CorsFilter.java +++ b/src/main/java/edu/kit/scc/dem/wapsrv/app/CorsFilter.java @@ -4,14 +4,14 @@ import java.util.HashSet; import java.util.Set; import java.util.regex.Pattern; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; -import org.eclipse.jetty.servlets.CrossOriginFilter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; +import org.apache.jena.fuseki.servlets.CrossOriginFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/edu/kit/scc/dem/wapsrv/app/FusekiRunner.java b/src/main/java/edu/kit/scc/dem/wapsrv/app/FusekiRunner.java index f1a64c0..09a3261 100644 --- a/src/main/java/edu/kit/scc/dem/wapsrv/app/FusekiRunner.java +++ b/src/main/java/edu/kit/scc/dem/wapsrv/app/FusekiRunner.java @@ -3,10 +3,10 @@ import java.util.EnumSet; import java.util.List; import java.util.Vector; -import javax.servlet.DispatcherType; -import javax.servlet.FilterRegistration.Dynamic; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.FilterRegistration.Dynamic; import org.apache.jena.fuseki.main.FusekiServer; -import org.eclipse.jetty.servlets.CrossOriginFilter; +import org.apache.jena.fuseki.servlets.CrossOriginFilter; import org.apache.jena.tdb2.TDB2; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -151,7 +151,7 @@ private void addCorsFilter(FusekiServer fusekiServer, boolean writeable) { * @return A cross origin filter that enforces the given parameters */ private CrossOriginFilter createCrossOriginFilter(final int maxAge, final String allowedHeaders, - final String exposedHeaders) { + final String exposedHeaders) { // The jena/jetty implementation has some flaws we have to work around // Details are found within the CorsFilter class return new CorsFilter(maxAge, allowedHeaders, exposedHeaders); diff --git a/src/main/java/edu/kit/scc/dem/wapsrv/app/WapServerConfig.java b/src/main/java/edu/kit/scc/dem/wapsrv/app/WapServerConfig.java index 055c96a..7d49cb9 100644 --- a/src/main/java/edu/kit/scc/dem/wapsrv/app/WapServerConfig.java +++ b/src/main/java/edu/kit/scc/dem/wapsrv/app/WapServerConfig.java @@ -7,7 +7,7 @@ import java.util.HashSet; import java.util.Properties; import java.util.Set; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/edu/kit/scc/dem/wapsrv/controller/AnnotationController.java b/src/main/java/edu/kit/scc/dem/wapsrv/controller/AnnotationController.java index 1967899..1c314b1 100644 --- a/src/main/java/edu/kit/scc/dem/wapsrv/controller/AnnotationController.java +++ b/src/main/java/edu/kit/scc/dem/wapsrv/controller/AnnotationController.java @@ -2,7 +2,7 @@ import java.net.URI; import java.net.URISyntaxException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/edu/kit/scc/dem/wapsrv/controller/BackupController.java b/src/main/java/edu/kit/scc/dem/wapsrv/controller/BackupController.java index c2cbae2..834a93a 100644 --- a/src/main/java/edu/kit/scc/dem/wapsrv/controller/BackupController.java +++ b/src/main/java/edu/kit/scc/dem/wapsrv/controller/BackupController.java @@ -2,7 +2,7 @@ import java.util.Arrays; import java.util.HashSet; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/edu/kit/scc/dem/wapsrv/controller/BasicController.java b/src/main/java/edu/kit/scc/dem/wapsrv/controller/BasicController.java index 7877bfe..cbeb75d 100644 --- a/src/main/java/edu/kit/scc/dem/wapsrv/controller/BasicController.java +++ b/src/main/java/edu/kit/scc/dem/wapsrv/controller/BasicController.java @@ -1,6 +1,6 @@ package edu.kit.scc.dem.wapsrv.controller; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.http.HttpMethod; /** diff --git a/src/main/java/edu/kit/scc/dem/wapsrv/controller/CatchAllController.java b/src/main/java/edu/kit/scc/dem/wapsrv/controller/CatchAllController.java index 4dfe93e..e0948de 100644 --- a/src/main/java/edu/kit/scc/dem/wapsrv/controller/CatchAllController.java +++ b/src/main/java/edu/kit/scc/dem/wapsrv/controller/CatchAllController.java @@ -2,7 +2,7 @@ import java.util.Hashtable; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.eclipse.jetty.http.HttpMethod; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; diff --git a/src/main/java/edu/kit/scc/dem/wapsrv/controller/ContainerController.java b/src/main/java/edu/kit/scc/dem/wapsrv/controller/ContainerController.java index f22e862..2a7c278 100644 --- a/src/main/java/edu/kit/scc/dem/wapsrv/controller/ContainerController.java +++ b/src/main/java/edu/kit/scc/dem/wapsrv/controller/ContainerController.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.Set; import java.util.regex.Pattern; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/edu/kit/scc/dem/wapsrv/controller/JavadocController.java b/src/main/java/edu/kit/scc/dem/wapsrv/controller/JavadocController.java index b68e126..633ffed 100644 --- a/src/main/java/edu/kit/scc/dem/wapsrv/controller/JavadocController.java +++ b/src/main/java/edu/kit/scc/dem/wapsrv/controller/JavadocController.java @@ -1,6 +1,6 @@ package edu.kit.scc.dem.wapsrv.controller; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/edu/kit/scc/dem/wapsrv/controller/PageController.java b/src/main/java/edu/kit/scc/dem/wapsrv/controller/PageController.java index 59fbb63..199dcb0 100644 --- a/src/main/java/edu/kit/scc/dem/wapsrv/controller/PageController.java +++ b/src/main/java/edu/kit/scc/dem/wapsrv/controller/PageController.java @@ -1,6 +1,6 @@ package edu.kit.scc.dem.wapsrv.controller; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/edu/kit/scc/dem/wapsrv/controller/SimpleFolderServerController.java b/src/main/java/edu/kit/scc/dem/wapsrv/controller/SimpleFolderServerController.java index b885b3b..cb21499 100644 --- a/src/main/java/edu/kit/scc/dem/wapsrv/controller/SimpleFolderServerController.java +++ b/src/main/java/edu/kit/scc/dem/wapsrv/controller/SimpleFolderServerController.java @@ -8,7 +8,7 @@ import java.nio.file.Path; import java.util.Arrays; import java.util.HashSet; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpHeaders; diff --git a/src/main/java/edu/kit/scc/dem/wapsrv/controller/WebClientController.java b/src/main/java/edu/kit/scc/dem/wapsrv/controller/WebClientController.java index 9bdd01b..15e3c43 100644 --- a/src/main/java/edu/kit/scc/dem/wapsrv/controller/WebClientController.java +++ b/src/main/java/edu/kit/scc/dem/wapsrv/controller/WebClientController.java @@ -1,6 +1,6 @@ package edu.kit.scc.dem.wapsrv.controller; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/edu/kit/scc/dem/wapsrv/exceptions/WapResponseEntityExceptionHandler.java b/src/main/java/edu/kit/scc/dem/wapsrv/exceptions/WapResponseEntityExceptionHandler.java index 5dbe6f3..f931729 100644 --- a/src/main/java/edu/kit/scc/dem/wapsrv/exceptions/WapResponseEntityExceptionHandler.java +++ b/src/main/java/edu/kit/scc/dem/wapsrv/exceptions/WapResponseEntityExceptionHandler.java @@ -1,7 +1,7 @@ package edu.kit.scc.dem.wapsrv.exceptions; import java.util.Date; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/src/main/java/edu/kit/scc/dem/wapsrv/installer/JarUtilities.java b/src/main/java/edu/kit/scc/dem/wapsrv/installer/JarUtilities.java index bb46ed6..7452ff2 100644 --- a/src/main/java/edu/kit/scc/dem/wapsrv/installer/JarUtilities.java +++ b/src/main/java/edu/kit/scc/dem/wapsrv/installer/JarUtilities.java @@ -83,11 +83,11 @@ public static File getCurrentlyRunningJarFile() { // jar:file:/C:/Users/andreas/Desktop/TestInstall/PSE-AA-0.0.1-SNAPSHOT.jar!/BOOT-INF/classes!/ // linux : // mac : - String[] parts = uri.split(Pattern.quote("/")); + String[] parts = uri.split(Pattern.quote("!"))[0].split(Pattern.quote("/")); for (String part : parts) { - if (part.toLowerCase().endsWith(".jar!")) { + if (part.toLowerCase().endsWith(".jar")) { System.out.println("Part found : " + part); - return new File("./" + part.substring(0, part.length() - 1)); + return new File("./" + part); } } return guessJar(); diff --git a/src/main/java/edu/kit/scc/dem/wapsrv/model/ext/SequenceResource.java b/src/main/java/edu/kit/scc/dem/wapsrv/model/ext/SequenceResource.java index 565d649..043d7bf 100644 --- a/src/main/java/edu/kit/scc/dem/wapsrv/model/ext/SequenceResource.java +++ b/src/main/java/edu/kit/scc/dem/wapsrv/model/ext/SequenceResource.java @@ -17,10 +17,10 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; /** * diff --git a/src/main/java/edu/kit/scc/dem/wapsrv/repository/jena/JenaDataBase.java b/src/main/java/edu/kit/scc/dem/wapsrv/repository/jena/JenaDataBase.java index ab38bf9..eb30c5a 100644 --- a/src/main/java/edu/kit/scc/dem/wapsrv/repository/jena/JenaDataBase.java +++ b/src/main/java/edu/kit/scc/dem/wapsrv/repository/jena/JenaDataBase.java @@ -1,7 +1,7 @@ package edu.kit.scc.dem.wapsrv.repository.jena; import java.util.Calendar; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.apache.jena.query.Dataset; import org.apache.jena.query.ReadWrite; import org.apache.jena.rdf.model.Literal; diff --git a/src/main/java/edu/kit/scc/dem/wapsrv/repository/jena/JenaRdfBackend.java b/src/main/java/edu/kit/scc/dem/wapsrv/repository/jena/JenaRdfBackend.java index 8da4243..fb1c27e 100644 --- a/src/main/java/edu/kit/scc/dem/wapsrv/repository/jena/JenaRdfBackend.java +++ b/src/main/java/edu/kit/scc/dem/wapsrv/repository/jena/JenaRdfBackend.java @@ -72,7 +72,7 @@ public String getOutput(Dataset dataset, Format format) throws WapException { StringWriter writer = new StringWriter(); //Specifying format option to match behaviour of jsonld-java. Likely to break on dependency change / jena upgrade. See https://jena.apache.org/documentation/io/rdf-output.html#json-ld if(format == Format.JSON_LD) { - RDFDataMgr.write(writer, graph, RDFFormat.JSONLD_EXPAND_PRETTY); + RDFDataMgr.write(writer, graph, RDFFormat.JSONLD_PRETTY); return writer.toString(); } RDFDataMgr.write(writer, graph, lang); @@ -83,8 +83,8 @@ public String getOutput(Dataset dataset, Format format) throws WapException { @Override public Dataset readFromString(String serialization, final Format format) throws WapException { Lang lang = JenaFormatMapper.map(format); - //TODO: this solution is already deprecated. See https://github.com/apache/jena/issues/1765 - if(format == Format.JSON_LD) {lang = Lang.JSONLD10;} + //TODO: Does this still work as expected? See https://github.com/apache/jena/issues/1765 + if(format == Format.JSON_LD) {lang = Lang.JSONLD;} if (lang == null) { throw new FormatException("Format " + format + " not supported in jena RDF backend"); } diff --git a/src/main/java/edu/kit/scc/dem/wapsrv/repository/jena/JenaRepository.java b/src/main/java/edu/kit/scc/dem/wapsrv/repository/jena/JenaRepository.java index 5b96824..12e1e88 100644 --- a/src/main/java/edu/kit/scc/dem/wapsrv/repository/jena/JenaRepository.java +++ b/src/main/java/edu/kit/scc/dem/wapsrv/repository/jena/JenaRepository.java @@ -4,7 +4,8 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.List; -import javax.annotation.PostConstruct; + +import jakarta.annotation.PostConstruct; import org.apache.commons.rdf.api.RDF; import org.apache.jena.commonsrdf.JenaCommonsRDF; import org.apache.jena.commonsrdf.impl.JenaDataset; diff --git a/src/main/java/edu/kit/scc/dem/wapsrv/repository/jena/JenaRepository2.java b/src/main/java/edu/kit/scc/dem/wapsrv/repository/jena/JenaRepository2.java index 4075801..91fd3bf 100644 --- a/src/main/java/edu/kit/scc/dem/wapsrv/repository/jena/JenaRepository2.java +++ b/src/main/java/edu/kit/scc/dem/wapsrv/repository/jena/JenaRepository2.java @@ -5,7 +5,7 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.List; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.apache.commons.rdf.api.RDF; import org.apache.jena.commonsrdf.JenaCommonsRDF; import org.apache.jena.commonsrdf.JenaRDF; diff --git a/src/test/java/edu/kit/scc/dem/wapsrv/controller/BasicControllerTest.java b/src/test/java/edu/kit/scc/dem/wapsrv/controller/BasicControllerTest.java index b5a13d1..080b871 100644 --- a/src/test/java/edu/kit/scc/dem/wapsrv/controller/BasicControllerTest.java +++ b/src/test/java/edu/kit/scc/dem/wapsrv/controller/BasicControllerTest.java @@ -1,7 +1,7 @@ package edu.kit.scc.dem.wapsrv.controller; import static org.junit.jupiter.api.Assertions.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.junit.jupiter.api.Test; import org.springframework.http.HttpMethod; diff --git a/src/test/java/edu/kit/scc/dem/wapsrv/controller/HttpServletRequestAdapter.java b/src/test/java/edu/kit/scc/dem/wapsrv/controller/HttpServletRequestAdapter.java index 3f0aab6..a2630c8 100644 --- a/src/test/java/edu/kit/scc/dem/wapsrv/controller/HttpServletRequestAdapter.java +++ b/src/test/java/edu/kit/scc/dem/wapsrv/controller/HttpServletRequestAdapter.java @@ -8,20 +8,14 @@ import java.util.Enumeration; import java.util.Locale; import java.util.Map; -import javax.servlet.AsyncContext; -import javax.servlet.DispatcherType; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpUpgradeHandler; -import javax.servlet.http.Part; + +import jakarta.servlet.*; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpUpgradeHandler; +import jakarta.servlet.http.Part; /** * @author Matthias Dressel @@ -104,7 +98,7 @@ public HttpServletRequestAdapter(String url, String httpMethod, Map getAttributeNames() { @@ -122,7 +116,7 @@ public Enumeration getAttributeNames() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getCharacterEncoding() + * @see jakarta.servlet.ServletRequest#getCharacterEncoding() */ @Override public String getCharacterEncoding() { @@ -131,7 +125,7 @@ public String getCharacterEncoding() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#setCharacterEncoding(java.lang.String) + * @see jakarta.servlet.ServletRequest#setCharacterEncoding(java.lang.String) */ @Override public void setCharacterEncoding(String env) throws UnsupportedEncodingException { @@ -139,7 +133,7 @@ public void setCharacterEncoding(String env) throws UnsupportedEncodingException /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getContentLength() + * @see jakarta.servlet.ServletRequest#getContentLength() */ @Override public int getContentLength() { @@ -148,7 +142,7 @@ public int getContentLength() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getContentLengthLong() + * @see jakarta.servlet.ServletRequest#getContentLengthLong() */ @Override public long getContentLengthLong() { @@ -157,7 +151,7 @@ public long getContentLengthLong() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getContentType() + * @see jakarta.servlet.ServletRequest#getContentType() */ @Override public String getContentType() { @@ -166,7 +160,7 @@ public String getContentType() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getInputStream() + * @see jakarta.servlet.ServletRequest#getInputStream() */ @Override public ServletInputStream getInputStream() throws IOException { @@ -175,7 +169,7 @@ public ServletInputStream getInputStream() throws IOException { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getParameter(java.lang.String) + * @see jakarta.servlet.ServletRequest#getParameter(java.lang.String) */ @Override public String getParameter(String name) { @@ -191,7 +185,7 @@ public String getParameter(String name) { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getParameterNames() + * @see jakarta.servlet.ServletRequest#getParameterNames() */ @Override public Enumeration getParameterNames() { @@ -200,7 +194,7 @@ public Enumeration getParameterNames() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getParameterValues(java.lang.String) + * @see jakarta.servlet.ServletRequest#getParameterValues(java.lang.String) */ @Override public String[] getParameterValues(String name) { @@ -209,7 +203,7 @@ public String[] getParameterValues(String name) { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getParameterMap() + * @see jakarta.servlet.ServletRequest#getParameterMap() */ @Override public Map getParameterMap() { @@ -218,7 +212,7 @@ public Map getParameterMap() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getProtocol() + * @see jakarta.servlet.ServletRequest#getProtocol() */ @Override public String getProtocol() { @@ -227,7 +221,7 @@ public String getProtocol() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getScheme() + * @see jakarta.servlet.ServletRequest#getScheme() */ @Override public String getScheme() { @@ -236,7 +230,7 @@ public String getScheme() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getServerName() + * @see jakarta.servlet.ServletRequest#getServerName() */ @Override public String getServerName() { @@ -245,7 +239,7 @@ public String getServerName() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getServerPort() + * @see jakarta.servlet.ServletRequest#getServerPort() */ @Override public int getServerPort() { @@ -254,7 +248,7 @@ public int getServerPort() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getReader() + * @see jakarta.servlet.ServletRequest#getReader() */ @Override public BufferedReader getReader() throws IOException { @@ -263,7 +257,7 @@ public BufferedReader getReader() throws IOException { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getRemoteAddr() + * @see jakarta.servlet.ServletRequest#getRemoteAddr() */ @Override public String getRemoteAddr() { @@ -272,7 +266,7 @@ public String getRemoteAddr() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getRemoteHost() + * @see jakarta.servlet.ServletRequest#getRemoteHost() */ @Override public String getRemoteHost() { @@ -281,7 +275,7 @@ public String getRemoteHost() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#setAttribute(java.lang.String, java.lang.Object) + * @see jakarta.servlet.ServletRequest#setAttribute(java.lang.String, java.lang.Object) */ @Override public void setAttribute(String name, Object o) { @@ -289,7 +283,7 @@ public void setAttribute(String name, Object o) { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#removeAttribute(java.lang.String) + * @see jakarta.servlet.ServletRequest#removeAttribute(java.lang.String) */ @Override public void removeAttribute(String name) { @@ -297,7 +291,7 @@ public void removeAttribute(String name) { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getLocale() + * @see jakarta.servlet.ServletRequest#getLocale() */ @Override public Locale getLocale() { @@ -306,7 +300,7 @@ public Locale getLocale() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getLocales() + * @see jakarta.servlet.ServletRequest#getLocales() */ @Override public Enumeration getLocales() { @@ -315,7 +309,7 @@ public Enumeration getLocales() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#isSecure() + * @see jakarta.servlet.ServletRequest#isSecure() */ @Override public boolean isSecure() { @@ -324,7 +318,7 @@ public boolean isSecure() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getRequestDispatcher(java.lang.String) + * @see jakarta.servlet.ServletRequest#getRequestDispatcher(java.lang.String) */ @Override public RequestDispatcher getRequestDispatcher(String path) { @@ -333,16 +327,7 @@ public RequestDispatcher getRequestDispatcher(String path) { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getRealPath(java.lang.String) - */ - @Override - public String getRealPath(String path) { - return null; - } - - /* - * (non-Javadoc) - * @see javax.servlet.ServletRequest#getRemotePort() + * @see jakarta.servlet.ServletRequest#getRemotePort() */ @Override public int getRemotePort() { @@ -351,7 +336,7 @@ public int getRemotePort() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getLocalName() + * @see jakarta.servlet.ServletRequest#getLocalName() */ @Override public String getLocalName() { @@ -360,7 +345,7 @@ public String getLocalName() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getLocalAddr() + * @see jakarta.servlet.ServletRequest#getLocalAddr() */ @Override public String getLocalAddr() { @@ -369,7 +354,7 @@ public String getLocalAddr() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getLocalPort() + * @see jakarta.servlet.ServletRequest#getLocalPort() */ @Override public int getLocalPort() { @@ -378,7 +363,7 @@ public int getLocalPort() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getServletContext() + * @see jakarta.servlet.ServletRequest#getServletContext() */ @Override public ServletContext getServletContext() { @@ -387,7 +372,7 @@ public ServletContext getServletContext() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#startAsync() + * @see jakarta.servlet.ServletRequest#startAsync() */ @Override public AsyncContext startAsync() throws IllegalStateException { @@ -396,7 +381,7 @@ public AsyncContext startAsync() throws IllegalStateException { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#startAsync(javax.servlet.ServletRequest, javax.servlet.ServletResponse) + * @see jakarta.servlet.ServletRequest#startAsync(javax.servlet.ServletRequest, javax.servlet.ServletResponse) */ @Override public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) @@ -406,7 +391,7 @@ public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse se /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#isAsyncStarted() + * @see jakarta.servlet.ServletRequest#isAsyncStarted() */ @Override public boolean isAsyncStarted() { @@ -415,7 +400,7 @@ public boolean isAsyncStarted() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#isAsyncSupported() + * @see jakarta.servlet.ServletRequest#isAsyncSupported() */ @Override public boolean isAsyncSupported() { @@ -424,7 +409,7 @@ public boolean isAsyncSupported() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getAsyncContext() + * @see jakarta.servlet.ServletRequest#getAsyncContext() */ @Override public AsyncContext getAsyncContext() { @@ -433,16 +418,31 @@ public AsyncContext getAsyncContext() { /* * (non-Javadoc) - * @see javax.servlet.ServletRequest#getDispatcherType() + * @see jakarta.servlet.ServletRequest#getDispatcherType() */ @Override public DispatcherType getDispatcherType() { return null; } + @Override + public String getRequestId() { + return ""; + } + + @Override + public String getProtocolRequestId() { + return ""; + } + + @Override + public ServletConnection getServletConnection() { + return null; + } + /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#getAuthType() + * @see jakarta.servlet.http.HttpServletRequest#getAuthType() */ @Override public String getAuthType() { @@ -451,7 +451,7 @@ public String getAuthType() { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#getCookies() + * @see jakarta.servlet.http.HttpServletRequest#getCookies() */ @Override public Cookie[] getCookies() { @@ -460,7 +460,7 @@ public Cookie[] getCookies() { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#getDateHeader(java.lang.String) + * @see jakarta.servlet.http.HttpServletRequest#getDateHeader(java.lang.String) */ @Override public long getDateHeader(String name) { @@ -469,7 +469,7 @@ public long getDateHeader(String name) { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#getHeader(java.lang.String) + * @see jakarta.servlet.http.HttpServletRequest#getHeader(java.lang.String) */ @Override public String getHeader(String name) { @@ -480,7 +480,7 @@ public String getHeader(String name) { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#getHeaders(java.lang.String) + * @see jakarta.servlet.http.HttpServletRequest#getHeaders(java.lang.String) */ @Override public Enumeration getHeaders(String name) { @@ -489,7 +489,7 @@ public Enumeration getHeaders(String name) { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#getHeaderNames() + * @see jakarta.servlet.http.HttpServletRequest#getHeaderNames() */ @Override public Enumeration getHeaderNames() { @@ -498,7 +498,7 @@ public Enumeration getHeaderNames() { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#getIntHeader(java.lang.String) + * @see jakarta.servlet.http.HttpServletRequest#getIntHeader(java.lang.String) */ @Override public int getIntHeader(String name) { @@ -507,7 +507,7 @@ public int getIntHeader(String name) { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#getMethod() + * @see jakarta.servlet.http.HttpServletRequest#getMethod() */ @Override public String getMethod() { @@ -516,7 +516,7 @@ public String getMethod() { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#getPathInfo() + * @see jakarta.servlet.http.HttpServletRequest#getPathInfo() */ @Override public String getPathInfo() { @@ -525,7 +525,7 @@ public String getPathInfo() { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#getPathTranslated() + * @see jakarta.servlet.http.HttpServletRequest#getPathTranslated() */ @Override public String getPathTranslated() { @@ -534,7 +534,7 @@ public String getPathTranslated() { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#getContextPath() + * @see jakarta.servlet.http.HttpServletRequest#getContextPath() */ @Override public String getContextPath() { @@ -543,7 +543,7 @@ public String getContextPath() { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#getQueryString() + * @see jakarta.servlet.http.HttpServletRequest#getQueryString() */ @Override public String getQueryString() { @@ -552,7 +552,7 @@ public String getQueryString() { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#getRemoteUser() + * @see jakarta.servlet.http.HttpServletRequest#getRemoteUser() */ @Override public String getRemoteUser() { @@ -561,7 +561,7 @@ public String getRemoteUser() { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#isUserInRole(java.lang.String) + * @see jakarta.servlet.http.HttpServletRequest#isUserInRole(java.lang.String) */ @Override public boolean isUserInRole(String role) { @@ -570,7 +570,7 @@ public boolean isUserInRole(String role) { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#getUserPrincipal() + * @see jakarta.servlet.http.HttpServletRequest#getUserPrincipal() */ @Override public Principal getUserPrincipal() { @@ -579,7 +579,7 @@ public Principal getUserPrincipal() { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#getRequestedSessionId() + * @see jakarta.servlet.http.HttpServletRequest#getRequestedSessionId() */ @Override public String getRequestedSessionId() { @@ -588,7 +588,7 @@ public String getRequestedSessionId() { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#getRequestURI() + * @see jakarta.servlet.http.HttpServletRequest#getRequestURI() */ @Override public String getRequestURI() { @@ -597,7 +597,7 @@ public String getRequestURI() { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#getRequestURL() + * @see jakarta.servlet.http.HttpServletRequest#getRequestURL() */ @Override public StringBuffer getRequestURL() { @@ -609,7 +609,7 @@ public StringBuffer getRequestURL() { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#getServletPath() + * @see jakarta.servlet.http.HttpServletRequest#getServletPath() */ @Override public String getServletPath() { @@ -618,7 +618,7 @@ public String getServletPath() { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#getSession(boolean) + * @see jakarta.servlet.http.HttpServletRequest#getSession(boolean) */ @Override public HttpSession getSession(boolean create) { @@ -627,7 +627,7 @@ public HttpSession getSession(boolean create) { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#getSession() + * @see jakarta.servlet.http.HttpServletRequest#getSession() */ @Override public HttpSession getSession() { @@ -636,7 +636,7 @@ public HttpSession getSession() { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#changeSessionId() + * @see jakarta.servlet.http.HttpServletRequest#changeSessionId() */ @Override public String changeSessionId() { @@ -645,7 +645,7 @@ public String changeSessionId() { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdValid() + * @see jakarta.servlet.http.HttpServletRequest#isRequestedSessionIdValid() */ @Override public boolean isRequestedSessionIdValid() { @@ -654,7 +654,7 @@ public boolean isRequestedSessionIdValid() { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromCookie() + * @see jakarta.servlet.http.HttpServletRequest#isRequestedSessionIdFromCookie() */ @Override public boolean isRequestedSessionIdFromCookie() { @@ -663,7 +663,7 @@ public boolean isRequestedSessionIdFromCookie() { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromURL() + * @see jakarta.servlet.http.HttpServletRequest#isRequestedSessionIdFromURL() */ @Override public boolean isRequestedSessionIdFromURL() { @@ -672,16 +672,7 @@ public boolean isRequestedSessionIdFromURL() { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromUrl() - */ - @Override - public boolean isRequestedSessionIdFromUrl() { - return false; - } - - /* - * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#authenticate(javax.servlet.http.HttpServletResponse) + * @see jakarta.servlet.http.HttpServletRequest#authenticate(javax.servlet.http.HttpServletResponse) */ @Override public boolean authenticate(HttpServletResponse response) throws IOException, ServletException { @@ -690,7 +681,7 @@ public boolean authenticate(HttpServletResponse response) throws IOException, Se /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#login(java.lang.String, java.lang.String) + * @see jakarta.servlet.http.HttpServletRequest#login(java.lang.String, java.lang.String) */ @Override public void login(String username, String password) throws ServletException { @@ -698,7 +689,7 @@ public void login(String username, String password) throws ServletException { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#logout() + * @see jakarta.servlet.http.HttpServletRequest#logout() */ @Override public void logout() throws ServletException { @@ -706,7 +697,7 @@ public void logout() throws ServletException { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#getParts() + * @see jakarta.servlet.http.HttpServletRequest#getParts() */ @Override public Collection getParts() throws IOException, ServletException { @@ -715,7 +706,7 @@ public Collection getParts() throws IOException, ServletException { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#getPart(java.lang.String) + * @see jakarta.servlet.http.HttpServletRequest#getPart(java.lang.String) */ @Override public Part getPart(String name) throws IOException, ServletException { @@ -724,7 +715,7 @@ public Part getPart(String name) throws IOException, ServletException { /* * (non-Javadoc) - * @see javax.servlet.http.HttpServletRequest#upgrade(java.lang.Class) + * @see jakarta.servlet.http.HttpServletRequest#upgrade(java.lang.Class) */ @Override public T upgrade(Class handlerClass) throws IOException, ServletException { diff --git a/src/test/java/edu/kit/scc/dem/wapsrv/controller/JavadocControllerTest.java b/src/test/java/edu/kit/scc/dem/wapsrv/controller/JavadocControllerTest.java index c71d9aa..188d1ba 100644 --- a/src/test/java/edu/kit/scc/dem/wapsrv/controller/JavadocControllerTest.java +++ b/src/test/java/edu/kit/scc/dem/wapsrv/controller/JavadocControllerTest.java @@ -3,10 +3,13 @@ import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mockito; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit.jupiter.SpringExtension; import edu.kit.scc.dem.wapsrv.app.WapServerConfig; +import jakarta.servlet.http.HttpServletRequest; + /** * Tests the class JavadocController. This test is quite simple, as no own functionality beside @@ -41,12 +44,11 @@ final void testJavadocController() { final void testGetFileResponse() { WapServerConfig paramWapServerConfig = WapServerConfig.getInstance(); JavadocController actual = new JavadocController(paramWapServerConfig); - actual.getFileResponse(new HttpServletRequestAdapter() { - @Override - public StringBuffer getRequestURL() { - return new StringBuffer(paramWapServerConfig.getBaseUrl() + JavadocController.PATH); - } - }, null); // headers not used + HttpServletRequest mockRequest = Mockito.mock(HttpServletRequest.class); + Mockito.when(mockRequest.getRequestURL()).thenReturn( + new StringBuffer(paramWapServerConfig.getBaseUrl() + JavadocController.PATH) + ); + actual.getFileResponse(mockRequest, null); // headers not used } /** diff --git a/src/test/java/edu/kit/scc/dem/wapsrv/exceptions/WapResponseEntityExceptionHandlerTest.java b/src/test/java/edu/kit/scc/dem/wapsrv/exceptions/WapResponseEntityExceptionHandlerTest.java index 95745c3..0ae884f 100644 --- a/src/test/java/edu/kit/scc/dem/wapsrv/exceptions/WapResponseEntityExceptionHandlerTest.java +++ b/src/test/java/edu/kit/scc/dem/wapsrv/exceptions/WapResponseEntityExceptionHandlerTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.when; import java.util.Properties; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.springframework.http.ResponseEntity; diff --git a/src/test/java/edu/kit/scc/dem/wapsrv/testscommon/ApacheJenaTests.java b/src/test/java/edu/kit/scc/dem/wapsrv/testscommon/ApacheJenaTests.java index f52c2d1..5d2c365 100644 --- a/src/test/java/edu/kit/scc/dem/wapsrv/testscommon/ApacheJenaTests.java +++ b/src/test/java/edu/kit/scc/dem/wapsrv/testscommon/ApacheJenaTests.java @@ -115,7 +115,7 @@ public void jenaOutput() throws FileNotFoundException { res.addLiteral(DCTerms.created, "2018-06-5T00:23:00Z"); res = ResourceUtils.renameResource(res, "http://wapserver.dem.scc.kit.edu/tristrant/anno1"); } - RDFDataMgr.write(System.out, readModel, RDFFormat.JSONLD_COMPACT_PRETTY); + RDFDataMgr.write(System.out, readModel, RDFFormat.JSONLD_PRETTY); } /** diff --git a/src/test/java/edu/kit/scc/dem/wapsrv/testscommon/FusekiSparqlTests.java b/src/test/java/edu/kit/scc/dem/wapsrv/testscommon/FusekiSparqlTests.java index 6ba0e86..5087f44 100644 --- a/src/test/java/edu/kit/scc/dem/wapsrv/testscommon/FusekiSparqlTests.java +++ b/src/test/java/edu/kit/scc/dem/wapsrv/testscommon/FusekiSparqlTests.java @@ -91,7 +91,7 @@ public void datasetReads() throws FileNotFoundException { Dataset ds = this.createDataset(); ds.begin(ReadWrite.READ); Resource model2 = ds.getDefaultModel().getResource("http://data.dem.scc.kit.edu/wap/persons/person1"); - RDFDataMgr.write(System.out, model2.getModel(), RDFFormat.JSONLD_COMPACT_PRETTY); + RDFDataMgr.write(System.out, model2.getModel(), RDFFormat.JSONLD_PRETTY); ds.end(); }