Skip to content

Commit

Permalink
Organized imports
Browse files Browse the repository at this point in the history
Signed-off-by: Markus KARG <markus@headcrashing.eu>
  • Loading branch information
mkarg committed Apr 14, 2018
1 parent 50cab0b commit 38772e3
Show file tree
Hide file tree
Showing 16 changed files with 49 additions and 35 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@

package javax.ws.rs;

import static javax.ws.rs.core.HttpHeaders.WWW_AUTHENTICATE;
import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import javax.ws.rs.core.Response;
import static javax.ws.rs.core.HttpHeaders.WWW_AUTHENTICATE;
import static javax.ws.rs.core.Response.Status.UNAUTHORIZED;

/**
* A runtime exception indicating request authorization failure caused by one of the following
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@

package javax.ws.rs;

import static javax.ws.rs.core.HttpHeaders.RETRY_AFTER;
import static javax.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE;

import java.util.Date;

import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.RuntimeDelegate;
import static javax.ws.rs.core.HttpHeaders.RETRY_AFTER;
import static javax.ws.rs.core.Response.Status.SERVICE_UNAVAILABLE;

/**
* A runtime exception indicating that the requested resource
Expand Down
5 changes: 2 additions & 3 deletions jaxrs-api/src/main/java/javax/ws/rs/client/Client.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,12 @@

import java.net.URI;

import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
import javax.ws.rs.core.Configurable;
import javax.ws.rs.core.Link;
import javax.ws.rs.core.UriBuilder;

import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;

/**
* Client is the main entry point to the fluent API used to build and execute client
* requests in order to consume responses returned.
Expand Down
7 changes: 3 additions & 4 deletions jaxrs-api/src/main/java/javax/ws/rs/client/ClientBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,13 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;

import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
import javax.ws.rs.ProcessingException;
import javax.ws.rs.core.Configurable;
import javax.ws.rs.core.Configuration;
import javax.ws.rs.sse.SseEventSource;

import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;

/**
* Main entry point to the client API used to bootstrap {@link javax.ws.rs.client.Client}
* instances.
Expand Down Expand Up @@ -243,7 +242,7 @@ public ClientBuilder keyStore(final KeyStore keyStore, final String password) {
* Provided executor service will be used for executing scheduled asynchronous tasks.
* <p>
* When running in a Java EE container, implementations are required to use the container-managed
* scheduled executor service by default. In Java SE the default is implementation-specific. In
* scheduled executor service by default. In Java SE the default is implementation-specific. In
* either case, calling this method will override the default.
*
* @param scheduledExecutorService executor service to be used for scheduled async invocations.
Expand Down
1 change: 0 additions & 1 deletion jaxrs-api/src/main/java/javax/ws/rs/core/Link.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import java.util.Map.Entry;

import javax.ws.rs.ext.RuntimeDelegate;

import javax.xml.bind.annotation.XmlAnyAttribute;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.adapters.XmlAdapter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

package javax.ws.rs.core;

import org.junit.Test;

import static junit.framework.Assert.fail;

import org.junit.Test;

/**
* AbstractMultivaluedMap unit tests.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@

package javax.ws.rs.core;

import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;

import javax.ws.rs.ext.RuntimeDelegate;

import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;

/**
* {@link javax.ws.rs.core.CacheControl} unit tests.
Expand Down
5 changes: 3 additions & 2 deletions jaxrs-api/src/test/java/javax/ws/rs/core/CookieTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@

package javax.ws.rs.core;

import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

import javax.ws.rs.ext.RuntimeDelegate;

import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

public class CookieTest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@

package javax.ws.rs.core;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

import java.lang.reflect.GenericArrayType;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
Expand All @@ -28,7 +32,6 @@
import java.util.Set;

import org.junit.Test;
import static org.junit.Assert.*;

public class GenericEntityTest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@

package javax.ws.rs.core;

import static org.junit.Assert.assertEquals;

import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;

import org.junit.Test;
import static org.junit.Assert.assertEquals;

/**
* Type literal construction unit tests.
Expand Down
7 changes: 4 additions & 3 deletions jaxrs-api/src/test/java/javax/ws/rs/core/JaxbLinkTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@

package javax.ws.rs.core;

import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;

import java.io.StringReader;
import java.io.StringWriter;
import java.net.URI;
Expand All @@ -30,9 +34,6 @@
import javax.xml.transform.stream.StreamSource;

import org.junit.Test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;

/**
* Unit test for JAX-RS Link marshalling and unmarshalling via JAXB.
Expand Down
3 changes: 2 additions & 1 deletion jaxrs-api/src/test/java/javax/ws/rs/core/MediaTypeTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@

package javax.ws.rs.core;

import static org.junit.Assert.assertEquals;

import java.util.Map;

import org.junit.Test;
import static org.junit.Assert.assertEquals;

/**
* {@link MediaType} unit test.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,22 @@

package javax.ws.rs.core;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;

import javax.ws.rs.ext.RuntimeDelegate;

import org.junit.After;
import org.junit.Before;
import org.junit.Test;

import java.io.*;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;

public class MultivaluedHashMapTest {

@Before
Expand Down
5 changes: 3 additions & 2 deletions jaxrs-api/src/test/java/javax/ws/rs/core/NewCookieTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@

package javax.ws.rs.core;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;

import javax.ws.rs.ext.RuntimeDelegate;

import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;

public class NewCookieTest {

Expand Down
3 changes: 2 additions & 1 deletion jaxrs-api/src/test/java/javax/ws/rs/core/VariantTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@

package javax.ws.rs.core;

import org.junit.Test;
import static org.junit.Assert.assertNull;

import org.junit.Test;

/**
* Variant regression unit tests.
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package javax.ws.rs.ext;

import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;

import static org.junit.Assert.*;
import org.junit.Test;

/**
* {@link javax.ws.rs.ext.RuntimeDelegate} unit tests.
Expand Down

0 comments on commit 38772e3

Please sign in to comment.