From 286485c826284a9180c421e700054e7578caa2a2 Mon Sep 17 00:00:00 2001 From: Peter Selby Date: Tue, 2 Aug 2022 11:01:29 -0400 Subject: [PATCH] java 11 upgrade and POM edits --- pom-cli.xml | 284 +++++++------- pom.xml | 348 +++++++++--------- .../brapicomp/AppServletContextListener.java | 13 +- .../bridge/brapicomp/ApplicationConfig.java | 13 +- .../bit/bi/bridge/brapicomp/Config.java | 8 +- .../bit/bi/bridge/brapicomp/HeadlessMain.java | 170 ++++----- .../brapicomp/apiresources/AdminResource.java | 34 +- .../ContinuousIntegrationResource.java | 34 +- .../apiresources/PublicResoucesResource.java | 20 +- .../apiresources/SingleTestResource.java | 22 +- .../apiresources/TestReportResource.java | 20 +- .../bi/bridge/brapicomp/ci/EmailManager.java | 6 +- .../bi/bridge/brapicomp/ci/EmailSender.java | 121 +++--- .../brapicomp/dbentities/ResourceService.java | 13 +- .../bridge/brapicomp/scheduling/DailyJob.java | 6 +- .../brapicomp/scheduling/MonthlyJob.java | 6 +- .../brapicomp/scheduling/WeeklyJob.java | 6 +- .../testing/reports/VariableStorage.java | 6 +- .../testing/runner/TestItemRunner.java | 6 +- .../brapicomp/utils/ApiResourceService.java | 12 +- .../brapicomp/utils/DataSourceManager.java | 2 +- .../bridge/brapicomp/utils/RunnerService.java | 6 +- src/main/webapp/WEB-INF/web.xml | 2 +- 23 files changed, 570 insertions(+), 588 deletions(-) diff --git a/pom-cli.xml b/pom-cli.xml index e86051f..0f14d45 100644 --- a/pom-cli.xml +++ b/pom-cli.xml @@ -8,87 +8,18 @@ 1.0-SNAPSHOT BrAPI-validator http://maven.apache.org + - 2.2 src/main/webapp ${maven.build.timestamp} yyyy-MM-dd HH:mm - 9.4.17.v20190418 - 2.24 - 3.0.5 + 11.0.11 + 3.0.5 + 5.1.1 + 3.10.1 - - - BrAPI-validator - src/main/java - - - - pl.project13.maven - git-commit-id-plugin - 2.2.4 - - - get-the-git-infos - - revision - - - - - ${project.basedir}/.git - git - false - true - ${project.build.outputDirectory}/git.properties - json - - false - false - -dirty - - - - - - - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.3 - - - - de.ipk_gatersleben.bit.bi.bridge.brapicomp.HeadlessMain - - - BrAPI-Validator-Headless - - - - package - - shade - - - - - - io.rest-assured @@ -101,9 +32,26 @@ ${rest-assured-version} - org.glassfish.jersey.bundles - jaxrs-ri - ${jersey-version} + com.github.java-json-tools + json-schema-validator + 2.2.14 + + + com.sun.mail + mailapi + + + + + com.sun.mail + javax.mail + 1.6.2 + + + javax.activation + activation + + org.glassfish.jersey.core @@ -126,9 +74,31 @@ ${jersey-version} - org.eclipse.jetty - jetty-server - ${jetty-version} + org.glassfish.jersey.inject + jersey-hk2 + ${jersey-version} + + + org.glassfish.jaxb + jaxb-runtime + 4.0.0 + runtime + + + jakarta.activation + jakarta.activation-api + + + org.eclipse.angus + angus-activation + + + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + 5.0.2 + provided org.eclipse.jetty @@ -143,7 +113,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + ${maven-compiler-version} com.google.collections @@ -154,102 +124,116 @@ com.h2database h2 - 1.4.196 - - - com.j256.ormlite - ormlite-core - 5.0 + 2.1.210 com.j256.ormlite ormlite-jdbc - 5.0 - - - com.github.fge - json-schema-validator - 2.2.6 - - - javax.mail - mailapi - - + 6.1 org.apache.commons commons-lang3 - 3.4 - - - com.sun.mail - javax.mail - 1.5.4 + 3.12.0 org.quartz-scheduler quartz - 2.2.1 + 2.3.2 org.quartz-scheduler quartz-jobs - 2.2.1 + 2.3.2 junit junit - 4.12 + 4.13.1 test - - javax.xml.bind - jaxb-api - 2.2.12 - - - com.sun.xml.bind - jaxb-core - 2.3.0 - - - com.sun.xml.bind - jaxb-impl - 2.3.2 - - - javax.activation - activation - 1.1.1 - commons-cli commons-cli - 1.4 + 1.5.0 - - - - - - - + + + + BrAPI-validator + src/main/java + + + + pl.project13.maven + git-commit-id-plugin + 4.9.10 + + + get-the-git-infos + + revision + + + + + + ${project.basedir}/.git + git + false + true + ${project.build.outputDirectory}/git.properties + json + + false + false + -dirty + + + + + + + maven-compiler-plugin + ${maven-compiler-version} + + 11 + 11 + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.2 + + + org.apache.maven.plugins + maven-shade-plugin + 3.3.0 + + + + de.ipk_gatersleben.bit.bi.bridge.brapicomp.HeadlessMain + + + BrAPI-Validator-Headless + + + + package + + shade + + + + + + diff --git a/pom.xml b/pom.xml index f4c0f40..4edbea6 100644 --- a/pom.xml +++ b/pom.xml @@ -8,120 +8,19 @@ 1.0-SNAPSHOT BrAPI-validator https://maven.apache.org + + - 2.2 src/main/webapp ${maven.build.timestamp} yyyy-MM-dd HH:mm - 9.4.41.v20210516 - 2.24 - 3.0.5 + 11.0.11 + 3.0.5 + 5.1.1 + 3.10.1 - - - BrAPI-validator - src/main/java - - - - pl.project13.maven - git-commit-id-plugin - 2.2.4 - - - get-the-git-infos - - revision - - - - - - ${project.basedir}/.git - git - false - true - ${project.build.outputDirectory}/git.properties - json - - false - false - -dirty - - - - - - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - maven-war-plugin - 2.4 - - - - src/main/resources/schemas - schemas - - - true - src/main/webapp/advanced - - **/index.html - - - - ${webappHome}/advanced - true - - - - org.eclipse.jetty - jetty-maven-plugin - 9.4.15.v20190215 - - 1 - - - ${webappHome} - - **/*.xml - **/*.properties - **/*.html - **/*.js - **/*.css - - - - - /brapivalidator - ${project.basedir}/src/main/webapp/WEB-INF/web.xml - - - ${project.basedir}/${webappHome}/advanced - - - - - org.apache.tomcat.maven - tomcat7-maven-plugin - ${tomcat7-maven-plugin.version} - - ${appserver.name} - ${appserver.path} - true - ${appserver.url} - - - - io.rest-assured @@ -134,9 +33,26 @@ ${rest-assured-version} - org.glassfish.jersey.bundles - jaxrs-ri - ${jersey-version} + com.github.java-json-tools + json-schema-validator + 2.2.14 + + + com.sun.mail + mailapi + + + + + com.sun.mail + javax.mail + 1.6.2 + + + javax.activation + activation + + org.glassfish.jersey.core @@ -159,9 +75,31 @@ ${jersey-version} - org.eclipse.jetty - jetty-server - ${jetty-version} + org.glassfish.jersey.inject + jersey-hk2 + ${jersey-version} + + + org.glassfish.jaxb + jaxb-runtime + 4.0.0 + runtime + + + jakarta.activation + jakarta.activation-api + + + org.eclipse.angus + angus-activation + + + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + 5.0.2 + provided org.eclipse.jetty @@ -176,7 +114,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + ${maven-compiler-version} com.google.collections @@ -189,36 +127,15 @@ h2 2.1.210 - - com.j256.ormlite - ormlite-core - 5.0 - com.j256.ormlite ormlite-jdbc - 5.0 - - - com.github.fge - json-schema-validator - 2.2.6 - - - javax.mail - mailapi - - + 6.1 org.apache.commons commons-lang3 - 3.4 - - - com.sun.mail - javax.mail - 1.5.4 + 3.12.0 org.quartz-scheduler @@ -236,53 +153,126 @@ 4.13.1 test - - javax.xml.bind - jaxb-api - 2.2.12 - - - com.sun.xml.bind - jaxb-core - 2.3.0 - - - com.sun.xml.bind - jaxb-impl - 2.3.2 - - - javax.activation - activation - 1.1.1 - commons-cli commons-cli - 1.4 + 1.5.0 - - - - - - - + + + + BrAPI-validator + src/main/java + + + pl.project13.maven + git-commit-id-plugin + 4.9.10 + + + get-the-git-infos + + revision + + + + + + ${project.basedir}/.git + git + false + true + ${project.build.outputDirectory}/git.properties + json + + false + false + -dirty + + + + + + + maven-compiler-plugin + ${maven-compiler-version} + + 11 + 11 + + + + + maven-war-plugin + 3.3.2 + + + + src/main/resources/schemas + schemas + + + true + src/main/webapp/advanced + + **/index.html + + + + ${webappHome}/advanced + true + + + + + org.eclipse.jetty + jetty-maven-plugin + ${jetty-version} + + ${basedir}/target/BrAPI-validator.war + 1 + + + ${webappHome} + + **/*.xml + **/*.properties + **/*.html + **/*.js + **/*.css + + + + + /brapivalidator + ${project.basedir}/src/main/webapp/WEB-INF/web.xml + + + ${project.basedir}/${webappHome}/advanced + + + + + org.eclipse.jetty + jetty-server + ${jetty-version} + runtime + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + + + + + + + + diff --git a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/AppServletContextListener.java b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/AppServletContextListener.java index a4f1db2..d30a4e0 100644 --- a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/AppServletContextListener.java +++ b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/AppServletContextListener.java @@ -6,10 +6,10 @@ import java.io.IOException; import java.sql.SQLException; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.annotation.WebListener; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; +import jakarta.servlet.annotation.WebListener; import org.quartz.DateBuilder; import org.quartz.JobDetail; @@ -19,6 +19,7 @@ import org.quartz.impl.StdSchedulerFactory; import com.j256.ormlite.jdbc.JdbcPooledConnectionSource; +import com.j256.ormlite.jdbc.db.OracleDatabaseType; import com.j256.ormlite.support.ConnectionSource; import de.ipk_gatersleben.bit.bi.bridge.brapicomp.dbentities.Provider; @@ -46,6 +47,8 @@ public void contextDestroyed(ServletContextEvent arg0) { } catch (IOException | SchedulerException e) { e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); } } } @@ -76,7 +79,7 @@ private static void createDatabaseConnection(ServletContext servletContext) { ((JdbcPooledConnectionSource) connectionSource).setUsername(Config.get("dbuser")); ((JdbcPooledConnectionSource) connectionSource).setPassword(Config.get("dbpass")); if (connectionSource.getDatabaseType().getClass() - .equals(com.j256.ormlite.db.OracleDatabaseType.class)) { + .equals(OracleDatabaseType.class)) { Cache.addToCache("dbType", "oracle"); } else { Cache.addToCache("dbType", "other"); diff --git a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/ApplicationConfig.java b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/ApplicationConfig.java index 0d2cb85..81fe9e3 100644 --- a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/ApplicationConfig.java +++ b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/ApplicationConfig.java @@ -3,20 +3,21 @@ import java.io.IOException; import java.sql.SQLException; -import javax.servlet.ServletContext; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Context; +import jakarta.servlet.ServletContext; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Context; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import org.glassfish.jersey.server.ResourceConfig; + /** * Servlet application config. */ @ApplicationPath("/") public class ApplicationConfig extends ResourceConfig { - private static final Logger LOGGER = LogManager.getLogger(ApplicationConfig.class.getName()); + private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationConfig.class.getName()); public ApplicationConfig(@Context ServletContext servletContext) throws SQLException, IOException { LOGGER.info("Server initialized."); diff --git a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/Config.java b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/Config.java index ff51d06..b6e1981 100644 --- a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/Config.java +++ b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/Config.java @@ -4,8 +4,8 @@ import java.io.InputStream; import java.util.Properties; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; import java.util.Arrays; @@ -14,7 +14,7 @@ * Helper class to get values from config file. */ public class Config { - private static final Logger LOGGER = LogManager.getLogger(Config.class); + private static final Logger LOGGER = LoggerFactory.getLogger(Config.class); private static Properties prop = new Properties(); protected static void init() { @@ -27,7 +27,7 @@ protected static void init() { LOGGER.error("No /config.properties found on CLASSPATH."); throw e; } catch (IOException e) { - LOGGER.error(e); + LOGGER.error("", e); } finally { if (input != null) { try { diff --git a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/HeadlessMain.java b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/HeadlessMain.java index 00018d8..ba68b4d 100644 --- a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/HeadlessMain.java +++ b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/HeadlessMain.java @@ -7,7 +7,7 @@ import java.text.SimpleDateFormat; import java.util.Date; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLineParser; @@ -16,20 +16,20 @@ import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import de.ipk_gatersleben.bit.bi.bridge.brapicomp.apiresources.SingleTestResource; import de.ipk_gatersleben.bit.bi.bridge.brapicomp.apiresources.TestReportResource; import de.ipk_gatersleben.bit.bi.bridge.brapicomp.dbentities.TestReport; public class HeadlessMain { - private static final Logger LOGGER = LogManager.getLogger(HeadlessMain.class.getName()); + private static final Logger LOGGER = LoggerFactory.getLogger(HeadlessMain.class.getName()); public static void main(String[] args) { CommandLine cmd = parseArgs(args); Config.init(); - + String url = cmd.getOptionValue("url"); String token = ""; if (cmd.hasOption("token")) { @@ -43,15 +43,15 @@ public static void main(String[] args) { if (cmd.hasOption("strict")) { strict = "on"; } - + SingleTestResource testRunner = new SingleTestResource(); Response response = testRunner.callTest(url, token, version, strict); - + if (response.getStatus() == 200) { report(response, cmd); } else { LOGGER.error("Error: Response status code: " + response.getStatus()); - LOGGER.error(response.getEntity()); + LOGGER.error(response.getEntity().toString()); } } @@ -62,41 +62,41 @@ private static void report(Response response, CommandLine cmd) { SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy_hh-mm-ss"); String reportName = "BRAVA_Test_Report_" + sdf.format(new Date()); - if(cmd.hasOption("csv")) { + if (cmd.hasOption("csv")) { String csvReport = reportGenerator.generateCSVReport(report); - if(cmd.hasOption("output")) { + if (cmd.hasOption("output")) { String outputDir = cmd.getOptionValue("output"); createFile(csvReport, outputDir, reportName + ".csv"); - }else { + } else { LOGGER.info(csvReport); } } - if(cmd.hasOption("json")) { + if (cmd.hasOption("json")) { String jsonReport = reportGenerator.generateJSONReport(report); - if(cmd.hasOption("output")) { + if (cmd.hasOption("output")) { String outputDir = cmd.getOptionValue("output"); createFile(jsonReport, outputDir, reportName + ".json"); - }else { + } else { LOGGER.info(jsonReport); } } - if(!cmd.hasOption("json") && !cmd.hasOption("csv")) { + if (!cmd.hasOption("json") && !cmd.hasOption("csv")) { String miniReportStr = "\n\nTest Summary "; miniReportStr += "\n Total Tests Run: " + report.getMiniReport().getTotalTests().size(); miniReportStr += "\n Passed: " + report.getMiniReport().getPassedTests().size(); miniReportStr += "\n Warning: " + report.getMiniReport().getWarningTests().size(); miniReportStr += "\n Failed: " + report.getMiniReport().getFailedTests().size(); - + if (report.getMiniReport().getFailedTests().size() > 0) { miniReportStr += "\n\n Failed Tests List: "; - for (String fail: report.getMiniReport().getFailedTests()) { + for (String fail : report.getMiniReport().getFailedTests()) { miniReportStr += "\n " + fail; } } - if(cmd.hasOption("output")) { + if (cmd.hasOption("output")) { String outputDir = cmd.getOptionValue("output"); createFile(miniReportStr, outputDir, reportName + ".txt"); - }else { + } else { LOGGER.info(miniReportStr); } } @@ -112,77 +112,79 @@ private static void createFile(String content, String path, String fileName) { LOGGER.info("Writing report: " + reportFile.getAbsolutePath()); reportFile.createNewFile(); BufferedWriter writer = new BufferedWriter(new FileWriter(reportFile)); - writer.write(content); - writer.close(); + writer.write(content); + writer.close(); } catch (IOException e) { LOGGER.error("Error: Writing report file " + path, e); } } private static CommandLine parseArgs(String[] args) { - Options options = new Options(); - - Option url = new Option("u", "url", true, "The base URL to test. Should end with '/brapi/v1' or similar."); - url.setRequired(true); - options.addOption(url); - - Option token = new Option("t", "token", true, "(Default None) Authorization token to be sent with every request."); - token.setRequired(false); - options.addOption(token); - - Option version = new Option("v", "version", true, "(Default 'v2.0') The BrAPI Version to test."); - version.setRequired(false); - options.addOption(version); - - Option strict = new Option("s", "strict", false, "If used, the validator will not allow extra fields in response objects."); - strict.setRequired(false); - options.addOption(strict); - - Option csv = new Option("c", "csv", false, "Generate a CSV test report"); - csv.setRequired(false); - options.addOption(csv); - - Option json = new Option("j", "json", false, "Generate a JSON test report"); - json.setRequired(false); - options.addOption(json); - - Option output = new Option("o", "output", true, "Output directory to dump test report files"); - output.setRequired(false); - options.addOption(output); - - Option help = new Option("h", "help", false, "Print this help menu"); - help.setRequired(false); - options.addOption(help); - - CommandLineParser parser = new DefaultParser(); - HelpFormatter formatter = new HelpFormatter(); - CommandLine cmd = null; - - try { - cmd = parser.parse(options, args); - } catch (ParseException e) { - System.out.println(e.getMessage()); - formatter.printHelp("BRAVA CLI", options); - System.exit(1); - } - - if (cmd.hasOption("help")) { - formatter.printHelp("BRAVA CLI", options); - System.exit(0); - } - - if (cmd.hasOption("output")) { - File outputDir = new File(cmd.getOptionValue("output")); - if(!outputDir.exists() || !outputDir.isDirectory()) { - LOGGER.error("Error: output directory not found " + outputDir.getAbsolutePath()); - System.exit(1); - }else if(!outputDir.canWrite()) { - LOGGER.error("Error: output directory access denied " + outputDir.getAbsolutePath()); - System.exit(1); - } - } - - return cmd; + Options options = new Options(); + + Option url = new Option("u", "url", true, "The base URL to test. Should end with '/brapi/v1' or similar."); + url.setRequired(true); + options.addOption(url); + + Option token = new Option("t", "token", true, + "(Default None) Authorization token to be sent with every request."); + token.setRequired(false); + options.addOption(token); + + Option version = new Option("v", "version", true, "(Default 'v2.0') The BrAPI Version to test."); + version.setRequired(false); + options.addOption(version); + + Option strict = new Option("s", "strict", false, + "If used, the validator will not allow extra fields in response objects."); + strict.setRequired(false); + options.addOption(strict); + + Option csv = new Option("c", "csv", false, "Generate a CSV test report"); + csv.setRequired(false); + options.addOption(csv); + + Option json = new Option("j", "json", false, "Generate a JSON test report"); + json.setRequired(false); + options.addOption(json); + + Option output = new Option("o", "output", true, "Output directory to dump test report files"); + output.setRequired(false); + options.addOption(output); + + Option help = new Option("h", "help", false, "Print this help menu"); + help.setRequired(false); + options.addOption(help); + + CommandLineParser parser = new DefaultParser(); + HelpFormatter formatter = new HelpFormatter(); + CommandLine cmd = null; + + try { + cmd = parser.parse(options, args); + } catch (ParseException e) { + System.out.println(e.getMessage()); + formatter.printHelp("BRAVA CLI", options); + System.exit(1); + } + + if (cmd.hasOption("help")) { + formatter.printHelp("BRAVA CLI", options); + System.exit(0); + } + + if (cmd.hasOption("output")) { + File outputDir = new File(cmd.getOptionValue("output")); + if (!outputDir.exists() || !outputDir.isDirectory()) { + LOGGER.error("Error: output directory not found " + outputDir.getAbsolutePath()); + System.exit(1); + } else if (!outputDir.canWrite()) { + LOGGER.error("Error: output directory access denied " + outputDir.getAbsolutePath()); + System.exit(1); + } + } + + return cmd; } } diff --git a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/apiresources/AdminResource.java b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/apiresources/AdminResource.java index 03acfaa..43491b4 100644 --- a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/apiresources/AdminResource.java +++ b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/apiresources/AdminResource.java @@ -11,21 +11,21 @@ import java.util.List; import java.util.UUID; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; - -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; + +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import org.glassfish.jersey.process.internal.RequestScoped; import com.fasterxml.jackson.core.JsonProcessingException; @@ -39,9 +39,9 @@ import de.ipk_gatersleben.bit.bi.bridge.brapicomp.dbentities.Resource; import de.ipk_gatersleben.bit.bi.bridge.brapicomp.dbentities.ResourceService; import de.ipk_gatersleben.bit.bi.bridge.brapicomp.testing.config.TestCollection; +import de.ipk_gatersleben.bit.bi.bridge.brapicomp.utils.ApiResourceService; import de.ipk_gatersleben.bit.bi.bridge.brapicomp.utils.DataSourceManager; import de.ipk_gatersleben.bit.bi.bridge.brapicomp.utils.JsonMessageManager; -import de.ipk_gatersleben.bit.bi.bridge.brapicomp.utils.ApiResourceService; import de.ipk_gatersleben.bit.bi.bridge.brapicomp.utils.RunnerService; /** @@ -53,7 +53,7 @@ @RequestScoped public class AdminResource { - private static final Logger LOGGER = LogManager.getLogger(AdminResource.class.getName()); + private static final Logger LOGGER = LoggerFactory.getLogger(AdminResource.class.getName()); /** * Register new public endpoint diff --git a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/apiresources/ContinuousIntegrationResource.java b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/apiresources/ContinuousIntegrationResource.java index b4fdfdd..c5b666f 100644 --- a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/apiresources/ContinuousIntegrationResource.java +++ b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/apiresources/ContinuousIntegrationResource.java @@ -5,22 +5,22 @@ import java.sql.SQLException; import java.util.UUID; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; - -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; + +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import org.glassfish.jersey.process.internal.RequestScoped; import com.j256.ormlite.dao.Dao; @@ -41,7 +41,7 @@ @RequestScoped public class ContinuousIntegrationResource { - private static final Logger LOGGER = LogManager.getLogger(ContinuousIntegrationResource.class.getName()); + private static final Logger LOGGER = LoggerFactory.getLogger(ContinuousIntegrationResource.class.getName()); /** diff --git a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/apiresources/PublicResoucesResource.java b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/apiresources/PublicResoucesResource.java index 97077b8..1e498b8 100644 --- a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/apiresources/PublicResoucesResource.java +++ b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/apiresources/PublicResoucesResource.java @@ -2,15 +2,15 @@ import java.sql.SQLException; import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; - -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; + +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import org.glassfish.jersey.process.internal.RequestScoped; import de.ipk_gatersleben.bit.bi.bridge.brapicomp.Config; @@ -23,7 +23,7 @@ @RequestScoped public class PublicResoucesResource { - private static final Logger LOGGER = LogManager.getLogger(PublicResoucesResource.class.getName()); + private static final Logger LOGGER = LoggerFactory.getLogger(PublicResoucesResource.class.getName()); /** diff --git a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/apiresources/SingleTestResource.java b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/apiresources/SingleTestResource.java index ab04c86..a98f089 100644 --- a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/apiresources/SingleTestResource.java +++ b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/apiresources/SingleTestResource.java @@ -5,17 +5,17 @@ import java.util.Arrays; import java.util.List; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import org.glassfish.jersey.process.internal.RequestScoped; import com.fasterxml.jackson.databind.ObjectMapper; @@ -36,7 +36,7 @@ @RequestScoped public class SingleTestResource { - private static final Logger LOGGER = LogManager.getLogger(SingleTestResource.class.getName()); + private static final Logger LOGGER = LoggerFactory.getLogger(SingleTestResource.class.getName()); private static final List brapiVersions = Config.getBrAPIVersions(); /** diff --git a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/apiresources/TestReportResource.java b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/apiresources/TestReportResource.java index 78e8c37..7cfc34a 100644 --- a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/apiresources/TestReportResource.java +++ b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/apiresources/TestReportResource.java @@ -6,16 +6,16 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import org.glassfish.jersey.process.internal.RequestScoped; import com.fasterxml.jackson.core.JsonProcessingException; @@ -36,7 +36,7 @@ @RequestScoped public class TestReportResource { - private static final Logger LOGGER = LogManager.getLogger(TestReportResource.class.getName()); + private static final Logger LOGGER = LoggerFactory.getLogger(TestReportResource.class.getName()); @GET @Path("/testreport/{reportId}") diff --git a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/ci/EmailManager.java b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/ci/EmailManager.java index f6fd3bd..3dc7437 100644 --- a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/ci/EmailManager.java +++ b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/ci/EmailManager.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.Map; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import de.ipk_gatersleben.bit.bi.bridge.brapicomp.Config; import de.ipk_gatersleben.bit.bi.bridge.brapicomp.dbentities.Resource; @@ -19,7 +19,7 @@ * Runs a test on an resource and sends an email to the owner. */ public class EmailManager { - private static final Logger LOGGER = LogManager.getLogger(EmailManager.class.getName()); + private static final Logger LOGGER = LoggerFactory.getLogger(EmailManager.class.getName()); private Resource resource; private List prevReports; diff --git a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/ci/EmailSender.java b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/ci/EmailSender.java index 1bf48c8..42a10b2 100644 --- a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/ci/EmailSender.java +++ b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/ci/EmailSender.java @@ -8,102 +8,99 @@ import javax.mail.MessagingException; import javax.mail.Multipart; import javax.mail.PasswordAuthentication; +import javax.mail.Session; import javax.mail.Transport; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import de.ipk_gatersleben.bit.bi.bridge.brapicomp.Config; class EmailSender { - private static final Logger LOGGER = LogManager.getLogger(EmailSender.class.getName()); + private static final Logger LOGGER = LoggerFactory.getLogger(EmailSender.class.getName()); - static void sendEmail(final String message, final String subject, final String emailAddress) { + static void sendEmail(final String message, final String subject, final String emailAddress) { - javax.mail.Session session; + Session session; - InternetAddress addressFrom = null; + InternetAddress addressFrom = null; - final Properties properties = new Properties(); + final Properties properties = new Properties(); - properties.put("mail.smtp.host", Config.get("mailSmtpHost")); - - if (Config.get("mailSmtpPort") != null) { - properties.put("mail.smtp.port", Config.get("mailSmtpPort")); - } + properties.put("mail.smtp.host", Config.get("mailSmtpHost")); - if (Config.get("mailSmtpLogin") == null - || Config.get("mailSmtpLogin").isEmpty()) { + if (Config.get("mailSmtpPort") != null) { + properties.put("mail.smtp.port", Config.get("mailSmtpPort")); + } - session = javax.mail.Session.getDefaultInstance(properties); + if (Config.get("mailSmtpLogin") == null || Config.get("mailSmtpLogin").isEmpty()) { - try { - addressFrom = new InternetAddress(Config.get("fromEmailAddress"), - Config.get("fromPersonalName")); - } catch (final UnsupportedEncodingException e) { - e.printStackTrace(); + session = Session.getDefaultInstance(properties); - LOGGER.warn(emailAddress + " : " + e.getMessage()); - } + try { + addressFrom = new InternetAddress(Config.get("fromEmailAddress"), Config.get("fromPersonalName")); + } catch (final UnsupportedEncodingException e) { + e.printStackTrace(); - } else { + LOGGER.warn(emailAddress + " : " + e.getMessage()); + } - properties.put("mail.smtp.auth", "true"); + } else { - final Authenticator authenticator = new Authenticator() { - private PasswordAuthentication authentication; + properties.put("mail.smtp.auth", "true"); - { - this.authentication = new PasswordAuthentication(Config.get("mailSmtpLogin"), - Config.get("mailSmtpPassword")); - } + final Authenticator authenticator = new Authenticator() { + private PasswordAuthentication authentication; - @Override - protected PasswordAuthentication getPasswordAuthentication() { - return this.authentication; - } - }; + { + this.authentication = new PasswordAuthentication(Config.get("mailSmtpLogin"), + Config.get("mailSmtpPassword")); + } - session = javax.mail.Session.getInstance(properties, authenticator); + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return this.authentication; + } + }; - try { - addressFrom = new InternetAddress(Config.get("fromEmailAddress"), - Config.get("fromPersonalName")); - } catch (final UnsupportedEncodingException e) { - e.printStackTrace(); - LOGGER.warn(emailAddress + " : " + e.getMessage()); - } + session = Session.getInstance(properties, authenticator); - } + try { + addressFrom = new InternetAddress(Config.get("fromEmailAddress"), Config.get("fromPersonalName")); + } catch (final UnsupportedEncodingException e) { + e.printStackTrace(); + LOGGER.warn(emailAddress + " : " + e.getMessage()); + } - try { - final Message mail = new MimeMessage(session); + } - final InternetAddress addressTo = new InternetAddress(emailAddress); - mail.setRecipient(Message.RecipientType.TO, addressTo); - mail.setSubject(subject); - mail.setFrom(addressFrom); + try { + final Message mail = new MimeMessage(session); - Multipart multipart = new MimeMultipart(); + final InternetAddress addressTo = new InternetAddress(emailAddress); + mail.setRecipient(Message.RecipientType.TO, addressTo); + mail.setSubject(subject); + mail.setFrom(addressFrom); - MimeBodyPart content = new MimeBodyPart(); - content.setText(message, "UTF-8", "html"); + Multipart multipart = new MimeMultipart(); - multipart.addBodyPart(content); + MimeBodyPart content = new MimeBodyPart(); + content.setText(message, "UTF-8", "html"); + multipart.addBodyPart(content); - mail.setContent(multipart); - Transport.send(mail); - //System.out.println(message); + mail.setContent(multipart); + Transport.send(mail); + // System.out.println(message); - } catch (final MessagingException e) { - e.printStackTrace(); + } catch (final MessagingException e) { + e.printStackTrace(); - LOGGER.warn(emailAddress + " : " + e.getMessage()); - } - } + LOGGER.warn(emailAddress + " : " + e.getMessage()); + } + } } diff --git a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/dbentities/ResourceService.java b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/dbentities/ResourceService.java index 42422cb..188583f 100644 --- a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/dbentities/ResourceService.java +++ b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/dbentities/ResourceService.java @@ -1,6 +1,7 @@ package de.ipk_gatersleben.bit.bi.bridge.brapicomp.dbentities; import java.sql.SQLException; +import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -155,10 +156,14 @@ public static Resource getPublicEndpoint(String id) throws SQLException { } public static List getAllPublicEndpoints() throws SQLException { - Dao endpointDao = DataSourceManager.getDao(Resource.class); - return endpointDao.queryBuilder().where() - .eq(Resource.ISPUBLIC_FIELD_NAME, true) - .query(); + List resources = new ArrayList<>(); + Dao endpointDao = DataSourceManager.getDao(Resource.class); + if(endpointDao != null) { + resources = endpointDao.queryBuilder().where() + .eq(Resource.ISPUBLIC_FIELD_NAME, true) + .query(); + } + return resources; } } diff --git a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/scheduling/DailyJob.java b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/scheduling/DailyJob.java index 6d825d9..ad0302a 100644 --- a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/scheduling/DailyJob.java +++ b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/scheduling/DailyJob.java @@ -4,8 +4,8 @@ import java.io.InputStream; import java.sql.SQLException; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -16,7 +16,7 @@ import de.ipk_gatersleben.bit.bi.bridge.brapicomp.utils.RunnerService; public class DailyJob implements org.quartz.Job { - private static final Logger LOGGER = LogManager.getLogger(DailyJob.class.getName()); + private static final Logger LOGGER = LoggerFactory.getLogger(DailyJob.class.getName()); public DailyJob() { } diff --git a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/scheduling/MonthlyJob.java b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/scheduling/MonthlyJob.java index cf24ff7..bf211ce 100644 --- a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/scheduling/MonthlyJob.java +++ b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/scheduling/MonthlyJob.java @@ -4,8 +4,8 @@ import java.io.InputStream; import java.sql.SQLException; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -16,7 +16,7 @@ import de.ipk_gatersleben.bit.bi.bridge.brapicomp.utils.RunnerService; public class MonthlyJob implements org.quartz.Job { - private static final Logger LOGGER = LogManager.getLogger(MonthlyJob.class.getName()); + private static final Logger LOGGER = LoggerFactory.getLogger(MonthlyJob.class.getName()); public MonthlyJob() { } diff --git a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/scheduling/WeeklyJob.java b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/scheduling/WeeklyJob.java index 4490cb6..35023e6 100644 --- a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/scheduling/WeeklyJob.java +++ b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/scheduling/WeeklyJob.java @@ -4,8 +4,8 @@ import java.io.InputStream; import java.sql.SQLException; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -16,7 +16,7 @@ import de.ipk_gatersleben.bit.bi.bridge.brapicomp.utils.RunnerService; public class WeeklyJob implements org.quartz.Job { - private static final Logger LOGGER = LogManager.getLogger(WeeklyJob.class.getName()); + private static final Logger LOGGER = LoggerFactory.getLogger(WeeklyJob.class.getName()); public WeeklyJob() { } diff --git a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/testing/reports/VariableStorage.java b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/testing/reports/VariableStorage.java index fc6a259..a8dbfd2 100644 --- a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/testing/reports/VariableStorage.java +++ b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/testing/reports/VariableStorage.java @@ -5,8 +5,8 @@ import java.util.HashMap; import java.util.List; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -16,7 +16,7 @@ * Variables can also be used to compare against results from the query */ public class VariableStorage { - private static final Logger LOGGER = LogManager.getLogger(VariableStorage.class.getName()); + private static final Logger LOGGER = LoggerFactory.getLogger(VariableStorage.class.getName()); private HashMap variables; private HashMap variablesAsString; diff --git a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/testing/runner/TestItemRunner.java b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/testing/runner/TestItemRunner.java index 72fce55..dce8867 100644 --- a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/testing/runner/TestItemRunner.java +++ b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/testing/runner/TestItemRunner.java @@ -15,8 +15,8 @@ import org.apache.commons.lang3.StringUtils; import org.apache.http.ConnectionClosedException; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import org.hamcrest.Matcher; import com.fasterxml.jackson.core.JsonParseException; @@ -41,7 +41,7 @@ * Run tests for an item element. */ public class TestItemRunner { - private static final Logger LOGGER = LogManager.getLogger(TestItemRunner.class.getName()); + private static final Logger LOGGER = LoggerFactory.getLogger(TestItemRunner.class.getName()); private String url; private ValidatableResponse vr; private Item item; diff --git a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/utils/ApiResourceService.java b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/utils/ApiResourceService.java index 0457ccc..3432c2c 100644 --- a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/utils/ApiResourceService.java +++ b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/utils/ApiResourceService.java @@ -2,14 +2,14 @@ import java.io.IOException; import java.io.InputStream; +import java.util.Base64; import java.util.List; import java.util.NoSuchElementException; import java.util.StringTokenizer; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; -import org.glassfish.jersey.internal.util.Base64; +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; @@ -19,7 +19,7 @@ * Helper functions for the resource classes. */ public class ApiResourceService { - private static final Logger LOGGER = LogManager.getLogger(ApiResourceService.class.getName()); + private static final Logger LOGGER = LoggerFactory.getLogger(ApiResourceService.class.getName()); /** * Finds a test collection file given a test collection name using the info stored in tests.json @@ -74,7 +74,7 @@ public static String[] getAuth(HttpHeaders headers) { final String encodedUserPassword = authorization.get(0).replaceFirst("Basic ", ""); //Decode username and password - String usernameAndPassword = new String(Base64.decode(encodedUserPassword.getBytes())); + String usernameAndPassword = new String(Base64.getDecoder().decode(encodedUserPassword.getBytes())); ; //Split username and password tokens diff --git a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/utils/DataSourceManager.java b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/utils/DataSourceManager.java index 44691a5..e0e7509 100644 --- a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/utils/DataSourceManager.java +++ b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/utils/DataSourceManager.java @@ -70,7 +70,7 @@ public static void setConnectionSource(ConnectionSource s) { source = s; } - public static void closeConnectionSource() throws IOException { + public static void closeConnectionSource() throws Exception { source.close(); } } diff --git a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/utils/RunnerService.java b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/utils/RunnerService.java index 438c1ac..ddc2f30 100644 --- a/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/utils/RunnerService.java +++ b/src/main/java/de/ipk_gatersleben/bit/bi/bridge/brapicomp/utils/RunnerService.java @@ -4,8 +4,8 @@ import java.util.List; import org.apache.commons.lang3.text.StrSubstitutor; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.Logger; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -23,7 +23,7 @@ * Various tester and helper functions for the Runner classes. */ public class RunnerService { - private static final Logger LOGGER = LogManager.getLogger(RunnerService.class.getName()); + private static final Logger LOGGER = LoggerFactory.getLogger(RunnerService.class.getName()); /** * Test a single endpoint and return report diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index ef04550..7adee5d 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -8,7 +8,7 @@ BrapiValidator org.glassfish.jersey.servlet.ServletContainer - javax.ws.rs.Application + jakarta.ws.rs.Application de.ipk_gatersleben.bit.bi.bridge.brapicomp.ApplicationConfig