Merge pull request #23 from Conjur-Enterprise/jakarta-migration-java8-tests

CNJR-0000: Community PR: Jakarta migration java8 tests

Author: gl-johnson

README.md

@@ -603,14 +603,14 @@ Conjur conjur = new Conjur();
 String secret = conjur.variables().retrieveSecret("<VARIABLE_ID>");
 ```
 
-## JAX-RS Implementations
-
-The Conjur API client uses the JAX-RS standard to make requests to the Conjur web services.
-In the future we plan to remove this dependency, but for the time being you may need to
-change the JAX-RS implementation to conform to your environment and application dependencies.
-Conjur API uses Apache CXF by default but for example, in a JBoss server environment, you
-should use the RESTlet implementation. You can replace that dependency in `pom.xml` to use an
-alternative implementation.
+## Jakarta REST (JAX-RS) Implementations
+The Conjur API client uses the Jakarta REST (formerly JAX-RS) standard to make requests to the Conjur web services.
+It is compatible with Jakarta EE environments and may not work in Java EE environments that still use the
+older javax.ws.rs packages.
+
+Conjur API uses Jersey as the default Jakarta REST implementation for client requests. While it is broadly compatible,
+some application servers (e.g., JBoss EAP or WildFly) may require overriding the Jersey dependency in `pom.xml` to
+avoid conflicts.
 
 ## Troubleshooting
 

src/test/java/com/cyberark/conjur/api/ConjurTest.java

@@ -1,12 +1,9 @@
 package com.cyberark.conjur.api;
 
 import org.junit.Assert;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import jakarta.ws.rs.ProcessingException;
 import jakarta.ws.rs.WebApplicationException;
+
 import java.util.UUID;
 
 /**
@@ -66,26 +63,27 @@ public void testAddSecretAndRetrieveSecret() {
 
     @Test
     public void testSetVariableWithoutVariableInPolicy() {
-        expectedException.expect(WebApplicationException.class);
-        expectedException.expectMessage(NOT_FOUND_STATUS_CODE);
-
-        Conjur conjur = new Conjur();
-
-        conjur.variables().addSecret(NON_EXISTING_VARIABLE_KEY, VARIABLE_VALUE);
+        WebApplicationException thrown = Assert.assertThrows(
+            WebApplicationException.class,
+            () -> {
+                Conjur conjur = new Conjur();
+                conjur.variables().addSecret(NON_EXISTING_VARIABLE_KEY, VARIABLE_VALUE);
+            }
+        );
+        Assert.assertTrue(thrown.getMessage().contains(NOT_FOUND_STATUS_CODE));
     }
 
     @Test
     public void testLogonWithAlterativeAuthenticator() {
-        expectedException.expect(ProcessingException.class);
-        expectedException.expectMessage(UNAUTHORIZED_STATUS_CODE);
-
         String authnUrl = System.getProperty(APPLIANCE_URL_PROPERTY) + ALTERNATIVE_AUTHN_ENDPOINT;
 
-        Conjur conjur = new Conjur(ALTERNATIVE_USERNAME, ALTERNATIVE_API_KEY, authnUrl);
-        conjur.variables().retrieveSecret(VARIABLE_KEY);
+        WebApplicationException thrown = Assert.assertThrows(
+            WebApplicationException.class,
+            () -> {
+                Conjur conjur = new Conjur(ALTERNATIVE_USERNAME, ALTERNATIVE_API_KEY, authnUrl);
+                conjur.variables().retrieveSecret(VARIABLE_KEY);
+            }
+        );
+        Assert.assertTrue(thrown.getMessage().contains(UNAUTHORIZED_STATUS_CODE));
     }
-
-
-    @Rule
-    public ExpectedException expectedException = ExpectedException.none();
 }