From e262184414428be048a8d78c466e11f9e1fd5923 Mon Sep 17 00:00:00 2001
From: "Nicolas NESMON (@NicoNes)" <nicolas.nesmon@gmail.com>
Date: Wed, 30 Aug 2023 22:24:02 -0400
Subject: [PATCH] Re apply import ordering changes from commit
 ae1f6ef7f4db9957079b8c383041a4537f33f35b

Signed-off-by: Nicolas NESMON (@NicoNes) <nicolas.nesmon@gmail.com>
---
 .../jakarta/ws/rs/NotAuthorizedException.java     |  6 +++---
 .../main/java/jakarta/ws/rs/client/Client.java    |  3 +--
 .../java/jakarta/ws/rs/SerializationTest.java     | 15 ++++++++-------
 .../jakarta/ws/rs/core/GenericEntityTest.java     |  8 ++++----
 .../java/jakarta/ws/rs/core/GenericTypeTest.java  |  6 +++---
 .../java/jakarta/ws/rs/core/MediaTypeTest.java    |  8 ++++----
 .../test/java/jakarta/ws/rs/core/VariantTest.java |  4 ++--
 .../jakarta/ws/rs/ext/RuntimeDelegateTest.java    |  4 ++--
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/jaxrs-api/src/main/java/jakarta/ws/rs/NotAuthorizedException.java b/jaxrs-api/src/main/java/jakarta/ws/rs/NotAuthorizedException.java
index ed045f1e5..f59cf6df2 100644
--- a/jaxrs-api/src/main/java/jakarta/ws/rs/NotAuthorizedException.java
+++ b/jaxrs-api/src/main/java/jakarta/ws/rs/NotAuthorizedException.java
@@ -16,9 +16,6 @@
 
 package jakarta.ws.rs;
 
-import static jakarta.ws.rs.core.HttpHeaders.WWW_AUTHENTICATE;
-import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -26,6 +23,9 @@
 
 import jakarta.ws.rs.core.Response;
 
+import static jakarta.ws.rs.core.HttpHeaders.WWW_AUTHENTICATE;
+import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED;
+
 /**
  * A runtime exception indicating request authorization failure caused by one of the following scenarios:
  * <ul>
diff --git a/jaxrs-api/src/main/java/jakarta/ws/rs/client/Client.java b/jaxrs-api/src/main/java/jakarta/ws/rs/client/Client.java
index a03fe84da..cf7481773 100644
--- a/jaxrs-api/src/main/java/jakarta/ws/rs/client/Client.java
+++ b/jaxrs-api/src/main/java/jakarta/ws/rs/client/Client.java
@@ -16,10 +16,9 @@
 
 package jakarta.ws.rs.client;
 
-import java.net.URI;
-
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
+import java.net.URI;
 
 import jakarta.ws.rs.core.Configurable;
 import jakarta.ws.rs.core.Link;
diff --git a/jaxrs-api/src/test/java/jakarta/ws/rs/SerializationTest.java b/jaxrs-api/src/test/java/jakarta/ws/rs/SerializationTest.java
index ff64f6e22..1048504af 100644
--- a/jaxrs-api/src/test/java/jakarta/ws/rs/SerializationTest.java
+++ b/jaxrs-api/src/test/java/jakarta/ws/rs/SerializationTest.java
@@ -1,12 +1,5 @@
 package jakarta.ws.rs;
 
-import jakarta.ws.rs.core.EntityTag;
-import jakarta.ws.rs.core.GenericType;
-import jakarta.ws.rs.core.Link;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.core.NewCookie;
-import jakarta.ws.rs.core.Response;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
@@ -16,6 +9,14 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+
+import jakarta.ws.rs.core.EntityTag;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.Link;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.NewCookie;
+import jakarta.ws.rs.core.Response;
 import org.junit.jupiter.api.Test;
 
 public class SerializationTest {
diff --git a/jaxrs-api/src/test/java/jakarta/ws/rs/core/GenericEntityTest.java b/jaxrs-api/src/test/java/jakarta/ws/rs/core/GenericEntityTest.java
index 387332ac5..619c9aa1d 100644
--- a/jaxrs-api/src/test/java/jakarta/ws/rs/core/GenericEntityTest.java
+++ b/jaxrs-api/src/test/java/jakarta/ws/rs/core/GenericEntityTest.java
@@ -16,10 +16,6 @@
 
 package jakarta.ws.rs.core;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
 import java.lang.reflect.GenericArrayType;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
@@ -33,6 +29,10 @@
 
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class GenericEntityTest {
 
     @Test
diff --git a/jaxrs-api/src/test/java/jakarta/ws/rs/core/GenericTypeTest.java b/jaxrs-api/src/test/java/jakarta/ws/rs/core/GenericTypeTest.java
index 8459a77f1..0111211f5 100644
--- a/jaxrs-api/src/test/java/jakarta/ws/rs/core/GenericTypeTest.java
+++ b/jaxrs-api/src/test/java/jakarta/ws/rs/core/GenericTypeTest.java
@@ -16,9 +16,6 @@
 
 package jakarta.ws.rs.core;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -27,6 +24,9 @@
 
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 /**
  * Type literal construction unit tests.
  *
diff --git a/jaxrs-api/src/test/java/jakarta/ws/rs/core/MediaTypeTest.java b/jaxrs-api/src/test/java/jakarta/ws/rs/core/MediaTypeTest.java
index b042cae2f..2c3f3a32a 100644
--- a/jaxrs-api/src/test/java/jakarta/ws/rs/core/MediaTypeTest.java
+++ b/jaxrs-api/src/test/java/jakarta/ws/rs/core/MediaTypeTest.java
@@ -16,16 +16,16 @@
 
 package jakarta.ws.rs.core;
 
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Map;
 
 import org.hamcrest.Description;
 import org.hamcrest.DiagnosingMatcher;
 import org.hamcrest.Matcher;
 import org.junit.jupiter.api.Test;
 
-import java.util.Map;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * {@link MediaType} unit test.
diff --git a/jaxrs-api/src/test/java/jakarta/ws/rs/core/VariantTest.java b/jaxrs-api/src/test/java/jakarta/ws/rs/core/VariantTest.java
index d1434cf98..19d0e7c6d 100644
--- a/jaxrs-api/src/test/java/jakarta/ws/rs/core/VariantTest.java
+++ b/jaxrs-api/src/test/java/jakarta/ws/rs/core/VariantTest.java
@@ -16,10 +16,10 @@
 
 package jakarta.ws.rs.core;
 
-import static org.junit.jupiter.api.Assertions.assertNull;
-
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 /**
  * Variant regression unit tests.
  *
diff --git a/jaxrs-api/src/test/java/jakarta/ws/rs/ext/RuntimeDelegateTest.java b/jaxrs-api/src/test/java/jakarta/ws/rs/ext/RuntimeDelegateTest.java
index 381141add..fd61ddc3c 100644
--- a/jaxrs-api/src/test/java/jakarta/ws/rs/ext/RuntimeDelegateTest.java
+++ b/jaxrs-api/src/test/java/jakarta/ws/rs/ext/RuntimeDelegateTest.java
@@ -1,10 +1,10 @@
 package jakarta.ws.rs.ext;
 
+import org.junit.jupiter.api.Test;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import org.junit.jupiter.api.Test;
-
 /**
  * {@link jakarta.ws.rs.ext.RuntimeDelegate} unit tests.
  *