b153-jakarta

eclipse · Mar 13, 2024 · e2c18ca · e2c18ca
1 parent 6a0ef9e
commit e2c18ca
Show file tree

Hide file tree

Showing 107 changed files with 1,014 additions and 1,142 deletions.
diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/IOslcClient.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/IOslcClient.java
@@ -14,8 +14,9 @@
 package org.eclipse.lyo.client;
 
 import java.util.Map;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.core.Response;
+
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.core.Response;
 
 /**
  * An OSLC Client that extends the JAX-RS 2.0 REST client with OSLC specific CRUD and

diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/JEEFormAuthenticator.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/JEEFormAuthenticator.java
@@ -13,26 +13,27 @@
  */
 package org.eclipse.lyo.client;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.ProcessingException;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.client.ClientResponseContext;
-import javax.ws.rs.client.ClientResponseFilter;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.core.Form;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.ws.rs.ProcessingException;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.client.ClientRequestFilter;
+import jakarta.ws.rs.client.ClientResponseContext;
+import jakarta.ws.rs.client.ClientResponseFilter;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.core.Form;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+
 /**
  * A filter that can be registered in order to non-preemptively handle JEE Form
  * based authentication challenges.

diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcClient.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcClient.java
@@ -13,6 +13,16 @@
  */
 package org.eclipse.lyo.client;
 
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 import org.apache.http.HttpHeaders;
 import org.apache.http.HttpStatus;
 import org.eclipse.lyo.client.exception.ResourceNotFoundException;
@@ -27,22 +37,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.Invocation.Builder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
 
 /**
  * An OSLC Client that extends the JAX-RS 2.0 REST client with OSLC specific CRUD and

diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcClientBuilder.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcClientBuilder.java
@@ -13,11 +13,11 @@
  */
 package org.eclipse.lyo.client;
 
-import javax.ws.rs.client.ClientBuilder;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.ws.rs.client.ClientBuilder;
+
 public class OslcClientBuilder {
     private String version;
     private ClientBuilder clientBuilder;

diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcOAuthClient.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcOAuthClient.java
@@ -21,20 +21,20 @@
 import java.util.Map;
 import java.util.Optional;
 
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.core.Response;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.HttpClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.core.Response;
 import net.oauth.OAuthAccessor;
 import net.oauth.OAuthException;
 import net.oauth.OAuthMessage;
 import net.oauth.client.OAuthClient;
 import net.oauth.client.httpclient4.HttpClient4;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.client.HttpClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class OslcOAuthClient implements IOslcClient {
 

diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcOAuthClientBuilder.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/OslcOAuthClientBuilder.java
@@ -13,11 +13,10 @@
  */
 package org.eclipse.lyo.client;
 
-import javax.ws.rs.client.ClientBuilder;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.ws.rs.client.ClientBuilder;
 import net.oauth.OAuthAccessor;
 import net.oauth.OAuthConsumer;
 import net.oauth.OAuthServiceProvider;

diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/RootServicesHelper.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/RootServicesHelper.java
@@ -13,7 +13,11 @@
  */
 package org.eclipse.lyo.client;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.StatusLine;
@@ -33,13 +37,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriBuilder;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriBuilder;
 
 /**
  * Helper class to assist in retrieval of attributes from the IBM Rational

diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/UnderlyingHttpClient.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/UnderlyingHttpClient.java
@@ -13,9 +13,10 @@
  */
 package org.eclipse.lyo.client;
 
-import javax.ws.rs.client.Client;
 import org.apache.http.client.HttpClient;
 
+import jakarta.ws.rs.client.Client;
+
 
 public interface UnderlyingHttpClient {
     /**

diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/query/OslcQuery.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/query/OslcQuery.java
@@ -14,12 +14,11 @@
 package org.eclipse.lyo.client.query;
 
 
-import javax.ws.rs.core.Response;
-
-import org.eclipse.lyo.client.OslcClient;
 import org.eclipse.lyo.client.OSLCConstants;
+import org.eclipse.lyo.client.OslcClient;
 
-import javax.ws.rs.client.WebTarget;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.Response;
 
 /**
  * Represents an OSLC query (HTTP GET) request to be made of a remote system.

diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/query/OslcQueryResult.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/query/OslcQueryResult.java
@@ -21,14 +21,6 @@
 
 import javax.xml.datatype.DatatypeConfigurationException;
 
-import javax.ws.rs.core.Response;
-
-import org.eclipse.lyo.client.OSLCConstants;
-import org.eclipse.lyo.oslc4j.core.exception.LyoModelException;
-import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException;
-import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
-import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper;
-
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.rdf.model.Property;
@@ -40,6 +32,13 @@
 import org.apache.jena.rdf.model.Statement;
 import org.apache.jena.rdf.model.StmtIterator;
 import org.apache.jena.vocabulary.RDFS;
+import org.eclipse.lyo.client.OSLCConstants;
+import org.eclipse.lyo.oslc4j.core.exception.LyoModelException;
+import org.eclipse.lyo.oslc4j.core.exception.OslcCoreApplicationException;
+import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
+import org.eclipse.lyo.oslc4j.provider.jena.JenaModelHelper;
+
+import jakarta.ws.rs.core.Response;
 
 
 /**

diff --git a/client/oslc-client/src/main/java/org/eclipse/lyo/client/resources/RmUtil.java b/client/oslc-client/src/main/java/org/eclipse/lyo/client/resources/RmUtil.java
@@ -13,19 +13,20 @@
  */
 package org.eclipse.lyo.client.resources;
 
-import net.oauth.OAuthException;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.eclipse.lyo.client.OSLCConstants;
 import org.eclipse.lyo.client.OslcClient;
 import org.eclipse.lyo.client.exception.ResourceNotFoundException;
-import org.eclipse.lyo.client.OSLCConstants;
 import org.eclipse.lyo.oslc4j.core.model.CreationFactory;
 import org.eclipse.lyo.oslc4j.core.model.ResourceShape;
 import org.eclipse.lyo.oslc4j.core.model.Service;
 import org.eclipse.lyo.oslc4j.core.model.ServiceProvider;
 
-import javax.ws.rs.core.Response;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
+import jakarta.ws.rs.core.Response;
+import net.oauth.OAuthException;
 
 @Deprecated
 public final class RmUtil {

diff --git a/client/oslc-client/src/test/java/org/eclipse/lyo/client/test/OslcClientTest.java b/client/oslc-client/src/test/java/org/eclipse/lyo/client/test/OslcClientTest.java
@@ -20,15 +20,16 @@
 import java.io.IOException;
 import java.net.URISyntaxException;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status.Family;
 import javax.xml.namespace.QName;
 
 import org.eclipse.lyo.client.OSLCConstants;
 import org.eclipse.lyo.client.OslcClient;
 import org.eclipse.lyo.oslc4j.core.model.ServiceProvider;
 import org.junit.jupiter.api.Test;
 
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status.Family;
+
 public class OslcClientTest {
     /*
      * Tests that the RDF/XML MessageBodyWriter doesn't go into an infinite loop when

diff --git a/client/oslc-client/src/test/java/org/eclipse/lyo/client/test/OslcQueryResultTest.java b/client/oslc-client/src/test/java/org/eclipse/lyo/client/test/OslcQueryResultTest.java
@@ -18,9 +18,6 @@
 
 import java.io.InputStream;
 
-
-import javax.ws.rs.core.Response;
-
 import org.eclipse.lyo.client.OslcClient;
 import org.eclipse.lyo.client.query.OslcQuery;
 import org.eclipse.lyo.client.query.OslcQueryParameters;
@@ -29,6 +26,8 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 
+import jakarta.ws.rs.core.Response;
+
 /**
  * @author Samuel Padgett <spadgett@us.ibm.com>
  */

diff --git a/core/lyo-core-settings/pom.xml b/core/lyo-core-settings/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>oslc4j-core-build</artifactId>
     <groupId>org.eclipse.lyo.oslc4j.core</groupId>
@@ -17,10 +17,8 @@
 
   <dependencies>
     <dependency>
-      <!--TODO: switch to https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api-->
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <scope>provided</scope>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
     </dependency>
     <dependency>
       <groupId>jakarta.ws.rs</groupId>

diff --git a/core/lyo-core-settings/src/main/java/org/eclipse/lyo/oslc4j/core/OSLC4JUtils.java b/core/lyo-core-settings/src/main/java/org/eclipse/lyo/oslc4j/core/OSLC4JUtils.java
@@ -27,8 +27,7 @@
 import java.util.Calendar;
 import java.util.HashSet;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.UriBuilder;
+
 import javax.xml.XMLConstants;
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
@@ -51,6 +50,9 @@
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.core.UriBuilder;
+
 // TODO: Lyo6 extract to LyoServletUriUtils
 public class OSLC4JUtils {
 

diff --git a/core/lyo-core-settings/src/test/java/org/eclipse/lyo/oslc4j/core/OSLC4JUtilsTest.java b/core/lyo-core-settings/src/test/java/org/eclipse/lyo/oslc4j/core/OSLC4JUtilsTest.java
@@ -13,16 +13,19 @@
  */
 package org.eclipse.lyo.oslc4j.core;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import java.net.MalformedURLException;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import static org.junit.Assert.*;
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import static org.mockito.Mockito.when;
+
+import jakarta.servlet.http.HttpServletRequest;
 
 public class OSLC4JUtilsTest {
 

diff --git a/core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/model/OslcMediaType.java b/core/oslc4j-core/src/main/java/org/eclipse/lyo/oslc4j/core/model/OslcMediaType.java
@@ -13,7 +13,7 @@
  */
 package org.eclipse.lyo.oslc4j.core.model;
 
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
 
 public interface OslcMediaType {