Skip to content

Commit

Permalink
Re apply import ordering changes from commit ae1f6ef
Browse files Browse the repository at this point in the history
Signed-off-by: Nicolas NESMON (@NicoNes) <[email protected]>
  • Loading branch information
NicoNes committed Aug 31, 2023
1 parent e4c1371 commit e262184
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@

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;
import java.util.List;

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>
Expand Down
3 changes: 1 addition & 2 deletions jaxrs-api/src/main/java/jakarta/ws/rs/client/Client.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
15 changes: 8 additions & 7 deletions jaxrs-api/src/test/java/jakarta/ws/rs/SerializationTest.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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.
*
Expand Down
8 changes: 4 additions & 4 deletions jaxrs-api/src/test/java/jakarta/ws/rs/core/MediaTypeTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions jaxrs-api/src/test/java/jakarta/ws/rs/core/VariantTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
*
Expand Down

0 comments on commit e262184

Please sign in to comment.