From 7569516916e10b2e1178cad479fcf57e164745a7 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Thu, 2 Feb 2023 00:04:46 +0100 Subject: [PATCH] [DEV] update jakarta --- back/src/org/kar/karideo/WebLauncher.java | 10 ++-------- back/src/org/kar/karideo/api/Front.java | 2 +- back/src/org/kar/karideo/api/HealthCheck.java | 6 +++--- back/src/org/kar/karideo/api/SeasonResource.java | 6 +++--- back/src/org/kar/karideo/api/SeriesResource.java | 6 +++--- back/src/org/kar/karideo/api/TypeResource.java | 6 +++--- back/src/org/kar/karideo/api/UserResource.java | 8 ++++---- back/src/org/kar/karideo/api/VideoResource.java | 6 +++--- 8 files changed, 22 insertions(+), 28 deletions(-) diff --git a/back/src/org/kar/karideo/WebLauncher.java b/back/src/org/kar/karideo/WebLauncher.java index 385e611..bf95c10 100755 --- a/back/src/org/kar/karideo/WebLauncher.java +++ b/back/src/org/kar/karideo/WebLauncher.java @@ -27,7 +27,7 @@ import org.kar.archidata.model.User; import org.kar.archidata.util.ConfigBaseVariable; import org.glassfish.jersey.jackson.JacksonFeature; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import java.net.URI; public class WebLauncher { @@ -85,17 +85,11 @@ public class WebLauncher { rc.registerClasses(HealthCheck.class); rc.registerClasses(Front.class); - // add jackson to be discover when we are ins standalone server + // add jackson to be discover when we are ins stand-alone server rc.register(JacksonFeature.class); // enable this to show low level request //rc.property(LoggingFeature.LOGGING_FEATURE_LOGGER_LEVEL_SERVER, Level.WARNING.getName()); - //System.out.println("Connect on the BDD:"); - //System.out.println(" getDBHost: '" + ConfigVariable.getDBHost() + "'"); - //System.out.println(" getDBPort: '" + ConfigVariable.getDBPort() + "'"); - //System.out.println(" getDBLogin: '" + ConfigVariable.getDBLogin() + "'"); - //System.out.println(" getDBPassword: '" + ConfigVariable.getDBPassword() + "'"); - //System.out.println(" getDBName: '" + ConfigVariable.getDBName() + "'"); System.out.println(" ==> " + GlobalConfiguration.dbConfig); System.out.println("OAuth service " + getBaseURI()); HttpServer server = GrizzlyHttpServerFactory.createHttpServer(getBaseURI(), rc); diff --git a/back/src/org/kar/karideo/api/Front.java b/back/src/org/kar/karideo/api/Front.java index 9e8df47..319f969 100644 --- a/back/src/org/kar/karideo/api/Front.java +++ b/back/src/org/kar/karideo/api/Front.java @@ -3,7 +3,7 @@ package org.kar.karideo.api; import org.kar.archidata.api.FrontGeneric; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import org.kar.karideo.util.ConfigVariable; diff --git a/back/src/org/kar/karideo/api/HealthCheck.java b/back/src/org/kar/karideo/api/HealthCheck.java index c428496..00a30f7 100644 --- a/back/src/org/kar/karideo/api/HealthCheck.java +++ b/back/src/org/kar/karideo/api/HealthCheck.java @@ -1,9 +1,9 @@ package org.kar.karideo.api; import org.kar.archidata.annotation.security.PermitAll; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.kar.archidata.util.JWTWrapper; diff --git a/back/src/org/kar/karideo/api/SeasonResource.java b/back/src/org/kar/karideo/api/SeasonResource.java index fda1981..d416b41 100644 --- a/back/src/org/kar/karideo/api/SeasonResource.java +++ b/back/src/org/kar/karideo/api/SeasonResource.java @@ -7,9 +7,9 @@ import org.kar.archidata.SqlWrapper; import org.kar.archidata.annotation.security.RolesAllowed; import org.kar.archidata.util.DataTools; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.io.InputStream; import java.util.List; diff --git a/back/src/org/kar/karideo/api/SeriesResource.java b/back/src/org/kar/karideo/api/SeriesResource.java index bf25895..6da56f6 100644 --- a/back/src/org/kar/karideo/api/SeriesResource.java +++ b/back/src/org/kar/karideo/api/SeriesResource.java @@ -8,9 +8,9 @@ import org.kar.archidata.SqlWrapper; import org.kar.archidata.annotation.security.RolesAllowed; import org.kar.archidata.util.DataTools; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.io.InputStream; import java.util.List; diff --git a/back/src/org/kar/karideo/api/TypeResource.java b/back/src/org/kar/karideo/api/TypeResource.java index 4e020de..e050cf9 100644 --- a/back/src/org/kar/karideo/api/TypeResource.java +++ b/back/src/org/kar/karideo/api/TypeResource.java @@ -7,9 +7,9 @@ import org.kar.archidata.SqlWrapper; import org.kar.archidata.annotation.security.RolesAllowed; import org.kar.archidata.util.DataTools; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.io.InputStream; import java.util.List; diff --git a/back/src/org/kar/karideo/api/UserResource.java b/back/src/org/kar/karideo/api/UserResource.java index 4775cc5..426d430 100755 --- a/back/src/org/kar/karideo/api/UserResource.java +++ b/back/src/org/kar/karideo/api/UserResource.java @@ -6,10 +6,10 @@ import org.kar.archidata.model.User; import org.kar.karideo.model.UserKarideo; import org.kar.archidata.annotation.security.RolesAllowed; -import javax.ws.rs.*; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.SecurityContext; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.SecurityContext; import java.util.List; diff --git a/back/src/org/kar/karideo/api/VideoResource.java b/back/src/org/kar/karideo/api/VideoResource.java index eca2110..8420f08 100644 --- a/back/src/org/kar/karideo/api/VideoResource.java +++ b/back/src/org/kar/karideo/api/VideoResource.java @@ -12,9 +12,9 @@ import org.kar.archidata.SqlWrapper; import org.kar.archidata.annotation.security.RolesAllowed; import org.kar.archidata.api.DataResource; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.io.IOException; import java.io.InputStream;