The route planner uses {@link ProxySelectorRoutePlanner} with {@link
* ProxySelector#getDefault()}, which uses the proxy settings from system
@@ -170,13 +161,13 @@ public static DefaultHttpClient newDefaultHttpClient() {
}
/**
- * Creates a new instance of the Apache HTTP client that is used by the
- * {@link #ApacheHttpTransport()} constructor.
+ * Creates a new instance of the Apache HTTP client that is used by the {@link
+ * #ApacheHttpTransport()} constructor.
*
* @param socketFactory SSL socket factory
* @param params HTTP parameters
- * @param proxySelector HTTP proxy selector to use {@link ProxySelectorRoutePlanner} or
- * {@code null} for {@link DefaultHttpRoutePlanner}
+ * @param proxySelector HTTP proxy selector to use {@link ProxySelectorRoutePlanner} or {@code
+ * null} for {@link DefaultHttpRoutePlanner}
* @return new instance of the Apache HTTP client
*/
static DefaultHttpClient newDefaultHttpClient(
@@ -245,9 +236,7 @@ public HttpClient getHttpClient() {
/**
* Builder for {@link ApacheHttpTransport}.
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.13
*/
@@ -260,27 +249,23 @@ public static final class Builder {
private final HttpParams params = newDefaultHttpParams();
/**
- * HTTP proxy selector to use {@link ProxySelectorRoutePlanner} or {@code null} for
- * {@link DefaultHttpRoutePlanner}.
+ * HTTP proxy selector to use {@link ProxySelectorRoutePlanner} or {@code null} for {@link
+ * DefaultHttpRoutePlanner}.
*/
private ProxySelector proxySelector = ProxySelector.getDefault();
/**
- * Sets the HTTP proxy to use {@link DefaultHttpRoutePlanner} or {@code null} to use
- * {@link #setProxySelector(ProxySelector)} with {@link ProxySelector#getDefault()}.
+ * Sets the HTTP proxy to use {@link DefaultHttpRoutePlanner} or {@code null} to use {@link
+ * #setProxySelector(ProxySelector)} with {@link ProxySelector#getDefault()}.
*
- *
- * By default it is {@code null}, which uses the proxy settings from By default it is {@code null}, which uses the proxy settings from system
* properties .
- *
*
- *
- * For example:
- *
+ * For example:
*
*
- setProxy(new HttpHost("127.0.0.1", 8080))
+ * setProxy(new HttpHost("127.0.0.1", 8080))
*
*/
public Builder setProxy(HttpHost proxy) {
@@ -295,11 +280,9 @@ public Builder setProxy(HttpHost proxy) {
* Sets the HTTP proxy selector to use {@link ProxySelectorRoutePlanner} or {@code null} for
* {@link DefaultHttpRoutePlanner}.
*
- *
- * By default it is {@link ProxySelector#getDefault()} which uses the proxy settings from By default it is {@link ProxySelector#getDefault()} which uses the proxy settings from system
* properties .
- *
*/
public Builder setProxySelector(ProxySelector proxySelector) {
this.proxySelector = proxySelector;
@@ -311,16 +294,14 @@ public Builder setProxySelector(ProxySelector proxySelector) {
/**
* Sets the SSL socket factory based on root certificates in a Java KeyStore.
*
- *
- * Example usage:
- *
+ * Example usage:
*
*
- trustCertificatesFromJavaKeyStore(new FileInputStream("certs.jks"), "password");
+ * trustCertificatesFromJavaKeyStore(new FileInputStream("certs.jks"), "password");
*
*
* @param keyStoreStream input stream to the key store (closed at the end of this method in a
- * finally block)
+ * finally block)
* @param storePass password protecting the key store file
* @since 1.14
*/
@@ -335,12 +316,10 @@ public Builder trustCertificatesFromJavaKeyStore(InputStream keyStoreStream, Str
* Sets the SSL socket factory based root certificates generated from the specified stream using
* {@link CertificateFactory#generateCertificates(InputStream)}.
*
- *
- * Example usage:
- *
+ * Example usage:
*
*
- trustCertificatesFromStream(new FileInputStream("certs.pem"));
+ * trustCertificatesFromStream(new FileInputStream("certs.pem"));
*
*
* @param certificateStream certificate stream
@@ -359,8 +338,7 @@ public Builder trustCertificatesFromStream(InputStream certificateStream)
* Sets the SSL socket factory based on a root certificate trust store.
*
* @param trustStore certificate trust store (use for example {@link SecurityUtils#loadKeyStore}
- * or {@link SecurityUtils#loadKeyStoreFromCertificates})
- *
+ * or {@link SecurityUtils#loadKeyStoreFromCertificates})
* @since 1.14
*/
public Builder trustCertificates(KeyStore trustStore) throws GeneralSecurityException {
@@ -370,15 +348,13 @@ public Builder trustCertificates(KeyStore trustStore) throws GeneralSecurityExce
}
/**
- * {@link Beta}
- * Be careful! Disabling certificate validation is dangerous and should only be done in testing
- * environments.
- *
+ * Be careful! Disabling certificate validation is dangerous and should only be done in
+ * testing environments.
*/
@Beta
public Builder doNotValidateCertificate() throws GeneralSecurityException {
diff --git a/google-http-client-apache-legacy/src/main/java/com/google/api/client/http/apache/ContentEntity.java b/google-http-client-apache-legacy/src/main/java/com/google/api/client/http/apache/ContentEntity.java
index 293f8a908..343b35c50 100644
--- a/google-http-client-apache-legacy/src/main/java/com/google/api/client/http/apache/ContentEntity.java
+++ b/google-http-client-apache-legacy/src/main/java/com/google/api/client/http/apache/ContentEntity.java
@@ -21,9 +21,7 @@
import java.io.OutputStream;
import org.apache.http.entity.AbstractHttpEntity;
-/**
- * @author Yaniv Inbar
- */
+/** @author Yaniv Inbar */
final class ContentEntity extends AbstractHttpEntity {
/** Content length or less than zero if not known. */
diff --git a/google-http-client-apache-legacy/src/main/java/com/google/api/client/http/apache/SSLSocketFactoryExtension.java b/google-http-client-apache-legacy/src/main/java/com/google/api/client/http/apache/SSLSocketFactoryExtension.java
index 809849fcb..4b9a624f2 100644
--- a/google-http-client-apache-legacy/src/main/java/com/google/api/client/http/apache/SSLSocketFactoryExtension.java
+++ b/google-http-client-apache-legacy/src/main/java/com/google/api/client/http/apache/SSLSocketFactoryExtension.java
@@ -36,11 +36,10 @@ final class SSLSocketFactoryExtension extends SSLSocketFactory {
/** Wrapped Java SSL socket factory. */
private final javax.net.ssl.SSLSocketFactory socketFactory;
- /**
- * @param sslContext SSL context
- */
- SSLSocketFactoryExtension(SSLContext sslContext) throws KeyManagementException,
- UnrecoverableKeyException, NoSuchAlgorithmException, KeyStoreException {
+ /** @param sslContext SSL context */
+ SSLSocketFactoryExtension(SSLContext sslContext)
+ throws KeyManagementException, UnrecoverableKeyException, NoSuchAlgorithmException,
+ KeyStoreException {
super((KeyStore) null);
socketFactory = sslContext.getSocketFactory();
}
diff --git a/google-http-client-apache-legacy/src/main/java/com/google/api/client/http/apache/package-info.java b/google-http-client-apache-legacy/src/main/java/com/google/api/client/http/apache/package-info.java
index e0f5be089..0c2c23b4f 100644
--- a/google-http-client-apache-legacy/src/main/java/com/google/api/client/http/apache/package-info.java
+++ b/google-http-client-apache-legacy/src/main/java/com/google/api/client/http/apache/package-info.java
@@ -18,6 +18,4 @@
* @since 1.0
* @author Yaniv Inbar
*/
-
package com.google.api.client.http.apache;
-
diff --git a/google-http-client-apache-legacy/src/test/java/com/google/api/client/http/apache/ApacheHttpTransportTest.java b/google-http-client-apache-legacy/src/test/java/com/google/api/client/http/apache/ApacheHttpTransportTest.java
index 21aa27357..8176166db 100644
--- a/google-http-client-apache-legacy/src/test/java/com/google/api/client/http/apache/ApacheHttpTransportTest.java
+++ b/google-http-client-apache-legacy/src/test/java/com/google/api/client/http/apache/ApacheHttpTransportTest.java
@@ -88,7 +88,8 @@ private void subtestUnsupportedRequestsWithContent(ApacheHttpRequest request, St
fail("expected " + IllegalArgumentException.class);
} catch (IllegalArgumentException e) {
// expected
- assertEquals(e.getMessage(),
+ assertEquals(
+ e.getMessage(),
"Apache HTTP client does not support " + method + " requests with content.");
}
}
diff --git a/google-http-client-apache/src/test/java/com/google/api/client/http/apache/ApacheHttpTransportTest.java b/google-http-client-apache/src/test/java/com/google/api/client/http/apache/ApacheHttpTransportTest.java
index 21aa27357..8176166db 100644
--- a/google-http-client-apache/src/test/java/com/google/api/client/http/apache/ApacheHttpTransportTest.java
+++ b/google-http-client-apache/src/test/java/com/google/api/client/http/apache/ApacheHttpTransportTest.java
@@ -88,7 +88,8 @@ private void subtestUnsupportedRequestsWithContent(ApacheHttpRequest request, St
fail("expected " + IllegalArgumentException.class);
} catch (IllegalArgumentException e) {
// expected
- assertEquals(e.getMessage(),
+ assertEquals(
+ e.getMessage(),
"Apache HTTP client does not support " + method + " requests with content.");
}
}
diff --git a/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/datastore/AppEngineDataStoreFactory.java b/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/datastore/AppEngineDataStoreFactory.java
index 5fca5a684..0894d8192 100644
--- a/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/datastore/AppEngineDataStoreFactory.java
+++ b/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/datastore/AppEngineDataStoreFactory.java
@@ -34,7 +34,6 @@
import com.google.appengine.api.memcache.Expiration;
import com.google.appengine.api.memcache.MemcacheService;
import com.google.appengine.api.memcache.MemcacheServiceFactory;
-
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.Serializable;
@@ -50,18 +49,13 @@
* Thread-safe Google App Engine implementation of a data store factory that directly uses the App
* Engine Data Store API.
*
- *
- * For convenience, a default global instance is provided in {@link #getDefaultInstance()}.
- *
+ * For convenience, a default global instance is provided in {@link #getDefaultInstance()}.
*
- *
- * By default, it uses the Memcache API as an in-memory data cache. To disable it, call
- * {@link Builder#setDisableMemcache(boolean)}. The Memcache is only read to check if a key already
- * has a value inside {@link DataStore#get(String)}. The values in the Memcache are updated in the
- * {@link DataStore#get(String)}, {@link DataStore#set(String, Serializable)},
- * {@link DataStore#delete(String)}, {@link DataStore#values()}, and {@link DataStore#clear()}
- * methods.
- *
+ * By default, it uses the Memcache API as an in-memory data cache. To disable it, call {@link
+ * Builder#setDisableMemcache(boolean)}. The Memcache is only read to check if a key already has a
+ * value inside {@link DataStore#get(String)}. The values in the Memcache are updated in the {@link
+ * DataStore#get(String)}, {@link DataStore#set(String, Serializable)}, {@link
+ * DataStore#delete(String)}, {@link DataStore#values()}, and {@link DataStore#clear()} methods.
*
* @since 1.16
* @author Yaniv Inbar
@@ -83,9 +77,7 @@ public AppEngineDataStoreFactory() {
this(new Builder());
}
- /**
- * @param builder builder
- */
+ /** @param builder builder */
public AppEngineDataStoreFactory(Builder builder) {
disableMemcache = builder.disableMemcache;
memcacheExpiration = builder.memcacheExpiration;
@@ -97,8 +89,8 @@ public boolean getDisableMemcache() {
}
/**
- * Returns a global thread-safe instance based on the default constructor
- * {@link #AppEngineDataStoreFactory()}.
+ * Returns a global thread-safe instance based on the default constructor {@link
+ * #AppEngineDataStoreFactory()}.
*/
public static AppEngineDataStoreFactory getDefaultInstance() {
return InstanceHolder.INSTANCE;
@@ -296,9 +288,7 @@ private Iterable query(boolean keysOnly) {
/**
* App Engine data store factory builder.
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.16
*/
@@ -318,10 +308,8 @@ public final boolean getDisableMemcache() {
/**
* Sets whether to disable the memcache ({@code false} by default).
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Builder setDisableMemcache(boolean disableMemcache) {
this.disableMemcache = disableMemcache;
@@ -336,10 +324,8 @@ public final Expiration getMemcacheExpiration() {
/**
* Sets the Memcache expiration policy on puts.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Builder setMemcacheExpiration(Expiration memcacheExpiration) {
this.memcacheExpiration = memcacheExpiration;
diff --git a/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/datastore/package-info.java b/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/datastore/package-info.java
index fd9acf785..b81c6c4bc 100644
--- a/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/datastore/package-info.java
+++ b/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/datastore/package-info.java
@@ -19,4 +19,3 @@
* @author Yaniv Inbar
*/
package com.google.api.client.extensions.appengine.datastore;
-
diff --git a/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/UrlFetchRequest.java b/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/UrlFetchRequest.java
index f79b93c6f..903b2cc43 100644
--- a/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/UrlFetchRequest.java
+++ b/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/UrlFetchRequest.java
@@ -23,14 +23,11 @@
import com.google.appengine.api.urlfetch.HTTPResponse;
import com.google.appengine.api.urlfetch.URLFetchService;
import com.google.appengine.api.urlfetch.URLFetchServiceFactory;
-
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.net.URL;
-/**
- * @author Yaniv Inbar
- */
+/** @author Yaniv Inbar */
final class UrlFetchRequest extends LowLevelHttpRequest {
private final HTTPRequest request;
@@ -46,8 +43,12 @@ public void addHeader(String name, String value) {
@Override
public void setTimeout(int connectTimeout, int readTimeout) {
- request.getFetchOptions().setDeadline(connectTimeout == 0 || readTimeout == 0
- ? Double.MAX_VALUE : (connectTimeout + readTimeout) / 1000.0);
+ request
+ .getFetchOptions()
+ .setDeadline(
+ connectTimeout == 0 || readTimeout == 0
+ ? Double.MAX_VALUE
+ : (connectTimeout + readTimeout) / 1000.0);
}
@Override
diff --git a/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/UrlFetchResponse.java b/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/UrlFetchResponse.java
index c10fdee6c..19e6a1ef3 100644
--- a/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/UrlFetchResponse.java
+++ b/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/UrlFetchResponse.java
@@ -17,7 +17,6 @@
import com.google.api.client.http.LowLevelHttpResponse;
import com.google.appengine.api.urlfetch.HTTPHeader;
import com.google.appengine.api.urlfetch.HTTPResponse;
-
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.ArrayList;
diff --git a/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/UrlFetchTransport.java b/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/UrlFetchTransport.java
index a7ba1b940..b6dfa8d3d 100644
--- a/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/UrlFetchTransport.java
+++ b/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/UrlFetchTransport.java
@@ -19,7 +19,6 @@
import com.google.api.client.util.Preconditions;
import com.google.appengine.api.urlfetch.FetchOptions;
import com.google.appengine.api.urlfetch.HTTPMethod;
-
import java.io.IOException;
import java.net.HttpURLConnection;
import java.util.Arrays;
@@ -28,21 +27,18 @@
* Thread-safe HTTP transport for Google App Engine based on URL Fetch .
*
- *
- * Implementation is thread-safe. For maximum efficiency, applications should use a single
+ *
Implementation is thread-safe. For maximum efficiency, applications should use a single
* globally-shared instance of the HTTP transport.
- *
*
- *
- * URL Fetch is only available on Google App Engine (not on any other Java environment), and is the
- * underlying HTTP transport used for App Engine. Their implementation of {@link HttpURLConnection}
- * is simply an abstraction layer on top of URL Fetch. By implementing a transport that directly
- * uses URL Fetch, we can optimize the behavior slightly, and can potentially take advantage of
- * features in URL Fetch that are not available in {@link HttpURLConnection}. Furthermore, there is
- * currently a serious bug in how HTTP headers are processed in the App Engine implementation of
- * {@link HttpURLConnection}, which we are able to avoid using this implementation. Therefore, this
- * is the recommended transport to use on App Engine.
- *
+ * URL Fetch is only available on Google App Engine (not on any other Java environment), and is
+ * the underlying HTTP transport used for App Engine. Their implementation of {@link
+ * HttpURLConnection} is simply an abstraction layer on top of URL Fetch. By implementing a
+ * transport that directly uses URL Fetch, we can optimize the behavior slightly, and can
+ * potentially take advantage of features in URL Fetch that are not available in {@link
+ * HttpURLConnection}. Furthermore, there is currently a serious bug in how HTTP headers are
+ * processed in the App Engine implementation of {@link HttpURLConnection}, which we are able to
+ * avoid using this implementation. Therefore, this is the recommended transport to use on App
+ * Engine.
*
* @since 1.10
* @author Yaniv Inbar
@@ -54,16 +50,24 @@ public final class UrlFetchTransport extends HttpTransport {
* {@link FetchOptions#validateCertificate()}.
*/
enum CertificateValidationBehavior {
- DEFAULT, VALIDATE, DO_NOT_VALIDATE
+ DEFAULT,
+ VALIDATE,
+ DO_NOT_VALIDATE
}
/**
* All valid request methods as specified in {@link HTTPMethod}, sorted in ascending alphabetical
* order.
*/
- private static final String[] SUPPORTED_METHODS =
- {HttpMethods.DELETE, HttpMethods.GET, HttpMethods.HEAD, HttpMethods.POST,
- HttpMethods.PUT, HttpMethods.PATCH};
+ private static final String[] SUPPORTED_METHODS = {
+ HttpMethods.DELETE,
+ HttpMethods.GET,
+ HttpMethods.HEAD,
+ HttpMethods.POST,
+ HttpMethods.PUT,
+ HttpMethods.PATCH
+ };
+
static {
Arrays.sort(SUPPORTED_METHODS);
}
@@ -74,17 +78,13 @@ enum CertificateValidationBehavior {
/**
* Constructor with the default fetch options.
*
- *
- * Use {@link Builder} to modify fetch options.
- *
+ * Use {@link Builder} to modify fetch options.
*/
public UrlFetchTransport() {
this(new Builder());
}
- /**
- * @param builder builder
- */
+ /** @param builder builder */
UrlFetchTransport(Builder builder) {
certificateValidationBehavior = builder.certificateValidationBehavior;
}
@@ -144,9 +144,7 @@ protected UrlFetchRequest buildRequest(String method, String url) throws IOExcep
/**
* Builder for {@link UrlFetchTransport}.
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.13
*/
@@ -160,10 +158,8 @@ public static final class Builder {
* Sets whether to use {@link FetchOptions#doNotValidateCertificate()} ({@code false} by
* default).
*
- *
- * Be careful! Disabling certificate validation is dangerous and should be done in testing
+ *
Be careful! Disabling certificate validation is dangerous and should be done in testing
* environments only.
- *
*/
public Builder doNotValidateCertificate() {
this.certificateValidationBehavior = CertificateValidationBehavior.DO_NOT_VALIDATE;
diff --git a/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/package-info.java b/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/package-info.java
index ef321de84..e9c6e9b31 100644
--- a/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/package-info.java
+++ b/google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/package-info.java
@@ -14,11 +14,10 @@
/**
* HTTP Transport library for Google API's based on URL Fetch in Google App Engine .
+ * href="https://cloud.google.com/appengine/docs/standard/java/issue-requests">URL Fetch in Google
+ * App Engine
.
*
* @since 1.10
* @author Yaniv Inbar
*/
-
package com.google.api.client.extensions.appengine.http;
-
diff --git a/google-http-client-appengine/src/test/java/com/google/api/client/extensions/appengine/datastore/AppEngineNoMemcacheDataStoreFactoryTest.java b/google-http-client-appengine/src/test/java/com/google/api/client/extensions/appengine/datastore/AppEngineNoMemcacheDataStoreFactoryTest.java
index 2fb1594ec..33d1fc468 100644
--- a/google-http-client-appengine/src/test/java/com/google/api/client/extensions/appengine/datastore/AppEngineNoMemcacheDataStoreFactoryTest.java
+++ b/google-http-client-appengine/src/test/java/com/google/api/client/extensions/appengine/datastore/AppEngineNoMemcacheDataStoreFactoryTest.java
@@ -17,8 +17,8 @@
import com.google.api.client.util.store.DataStoreFactory;
/**
- * Tests {@link AppEngineDataStoreFactory} with
- * {@link AppEngineDataStoreFactory.Builder#setDisableMemcache(boolean)}.
+ * Tests {@link AppEngineDataStoreFactory} with {@link
+ * AppEngineDataStoreFactory.Builder#setDisableMemcache(boolean)}.
*
* @author Yaniv Inbar
*/
diff --git a/google-http-client-findbugs/src/main/java/com/google/api/client/findbugs/BetaDetector.java b/google-http-client-findbugs/src/main/java/com/google/api/client/findbugs/BetaDetector.java
index 97e138be3..791d37f39 100644
--- a/google-http-client-findbugs/src/main/java/com/google/api/client/findbugs/BetaDetector.java
+++ b/google-http-client-findbugs/src/main/java/com/google/api/client/findbugs/BetaDetector.java
@@ -15,7 +15,6 @@
package com.google.api.client.findbugs;
import com.google.api.client.util.Beta;
-
import edu.umd.cs.findbugs.BugInstance;
import edu.umd.cs.findbugs.BugReporter;
import edu.umd.cs.findbugs.bcel.OpcodeStackDetector;
@@ -36,19 +35,13 @@ public class BetaDetector extends OpcodeStackDetector {
/** Beta annotation "signature". */
private static final String BETA_ANNOTATION = "Lcom/google/api/client/util/Beta;";
- /**
- * A message indicating there is a usage of a method annotated with Beta annotation.
- */
+ /** A message indicating there is a usage of a method annotated with Beta annotation. */
private static final String BETA_METHOD_USAGE = "BETA_METHOD_USAGE";
- /**
- * A message indicating there is a usage of a field annotated with Beta annotation.
- */
+ /** A message indicating there is a usage of a field annotated with Beta annotation. */
private static final String BETA_FIELD_USAGE = "BETA_FIELD_USAGE";
- /**
- * A message indicating there is a usage of a class annotated with Beta annotation.
- */
+ /** A message indicating there is a usage of a class annotated with Beta annotation. */
private static final String BETA_CLASS_USAGE = "BETA_CLASS_USAGE";
/** The bug reporter is used to report errors. */
@@ -96,7 +89,7 @@ public void sawOpcode(int seen) {
break;
default:
- // DO NOTHING
+ // DO NOTHING
}
}
@@ -115,9 +108,7 @@ private static boolean isBeta(AnnotationEntry[] annotationEntries) {
* class, it's not {@link Beta} and it doesn't appear in other {@link Beta} section. Otherwise
* returns {@code null}.
*
- *
- * Reports a bug in case the class is {@link Beta}.
- *
+ * Reports a bug in case the class is {@link Beta}.
*/
private JavaClass checkClass() {
// TODO(peleyal): check if caching the beta state of every class could improve
@@ -167,9 +158,7 @@ private JavaClass getSuperclass(JavaClass javaClass) {
/**
* Reports bug in case the method defined by the given name and signature is {@link Beta}.
*
- *
- * The method is searched in current class and all super classses as well.
- *
+ * The method is searched in current class and all super classses as well.
*/
private void checkMethod(String methodName, String signature) {
JavaClass javaClass = checkClass();
@@ -197,9 +186,7 @@ private void checkMethod(String methodName, String signature) {
/**
* Reports bug in case the field defined by the given name is {@link Beta}.
*
- *
- * The field is searched in current class and all super classses as well.
- *
+ * The field is searched in current class and all super classses as well.
*/
private void checkField(String fieldName) {
JavaClass javaClass = checkClass();
diff --git a/google-http-client-gson/src/main/java/com/google/api/client/json/gson/GsonFactory.java b/google-http-client-gson/src/main/java/com/google/api/client/json/gson/GsonFactory.java
index b604a8414..391dbf3d4 100644
--- a/google-http-client-gson/src/main/java/com/google/api/client/json/gson/GsonFactory.java
+++ b/google-http-client-gson/src/main/java/com/google/api/client/json/gson/GsonFactory.java
@@ -21,7 +21,6 @@
import com.google.api.client.util.Charsets;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
-
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
@@ -34,10 +33,8 @@
/**
* Low-level JSON library implementation based on GSON.
*
- *
- * Implementation is thread-safe, and sub-classes must be thread-safe. For maximum efficiency,
+ *
Implementation is thread-safe, and sub-classes must be thread-safe. For maximum efficiency,
* applications should use a single globally-shared instance of the JSON factory.
- *
*
* @since 1.3
* @author Yaniv Inbar
@@ -45,7 +42,7 @@
public class GsonFactory extends JsonFactory {
/**
- * {@link Beta}
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @author Yaniv Inbar
*/
diff --git a/google-http-client-gson/src/main/java/com/google/api/client/json/gson/GsonParser.java b/google-http-client-gson/src/main/java/com/google/api/client/json/gson/GsonParser.java
index d7bbee1aa..1527660d5 100644
--- a/google-http-client-gson/src/main/java/com/google/api/client/json/gson/GsonParser.java
+++ b/google-http-client-gson/src/main/java/com/google/api/client/json/gson/GsonParser.java
@@ -29,9 +29,7 @@
/**
* Low-level JSON serializer implementation based on GSON.
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @author Yaniv Inbar
*/
@@ -82,7 +80,6 @@ public short getShortValue() {
return Short.parseShort(currentText);
}
-
@Override
public int getIntValue() {
checkNumber();
@@ -194,8 +191,10 @@ public JsonToken nextToken() throws IOException {
break;
case NUMBER:
currentText = reader.nextString();
- currentToken = currentText.indexOf('.') == -1
- ? JsonToken.VALUE_NUMBER_INT : JsonToken.VALUE_NUMBER_FLOAT;
+ currentToken =
+ currentText.indexOf('.') == -1
+ ? JsonToken.VALUE_NUMBER_INT
+ : JsonToken.VALUE_NUMBER_FLOAT;
break;
case NAME:
currentText = reader.nextName();
diff --git a/google-http-client-gson/src/main/java/com/google/api/client/json/gson/package-info.java b/google-http-client-gson/src/main/java/com/google/api/client/json/gson/package-info.java
index 943323c45..a68f6c97c 100644
--- a/google-http-client-gson/src/main/java/com/google/api/client/json/gson/package-info.java
+++ b/google-http-client-gson/src/main/java/com/google/api/client/json/gson/package-info.java
@@ -19,6 +19,4 @@
* @since 1.3
* @author Yaniv Inbar
*/
-
package com.google.api.client.json.gson;
-
diff --git a/google-http-client-gson/src/test/java/com/google/api/client/json/gson/GsonFactoryTest.java b/google-http-client-gson/src/test/java/com/google/api/client/json/gson/GsonFactoryTest.java
index 1dd970070..57d98041e 100644
--- a/google-http-client-gson/src/test/java/com/google/api/client/json/gson/GsonFactoryTest.java
+++ b/google-http-client-gson/src/test/java/com/google/api/client/json/gson/GsonFactoryTest.java
@@ -18,7 +18,6 @@
import com.google.api.client.json.JsonParser;
import com.google.api.client.test.json.AbstractJsonFactoryTest;
import com.google.common.base.Charsets;
-
import java.io.ByteArrayInputStream;
import java.util.ArrayList;
@@ -33,11 +32,26 @@ public class GsonFactoryTest extends AbstractJsonFactoryTest {
private static final String JSON_ENTRY_PRETTY =
"{" + GSON_LINE_SEPARATOR + " \"title\": \"foo\"" + GSON_LINE_SEPARATOR + "}";
- private static final String JSON_FEED_PRETTY = "{" + GSON_LINE_SEPARATOR + " \"entries\": ["
- + GSON_LINE_SEPARATOR + " {" + GSON_LINE_SEPARATOR + " \"title\": \"foo\""
- + GSON_LINE_SEPARATOR + " }," + GSON_LINE_SEPARATOR + " {"
- + GSON_LINE_SEPARATOR + " \"title\": \"bar\"" + GSON_LINE_SEPARATOR + " }"
- + GSON_LINE_SEPARATOR + " ]" + GSON_LINE_SEPARATOR + "}";
+ private static final String JSON_FEED_PRETTY =
+ "{"
+ + GSON_LINE_SEPARATOR
+ + " \"entries\": ["
+ + GSON_LINE_SEPARATOR
+ + " {"
+ + GSON_LINE_SEPARATOR
+ + " \"title\": \"foo\""
+ + GSON_LINE_SEPARATOR
+ + " },"
+ + GSON_LINE_SEPARATOR
+ + " {"
+ + GSON_LINE_SEPARATOR
+ + " \"title\": \"bar\""
+ + GSON_LINE_SEPARATOR
+ + " }"
+ + GSON_LINE_SEPARATOR
+ + " ]"
+ + GSON_LINE_SEPARATOR
+ + "}";
public GsonFactoryTest(String name) {
super(name);
diff --git a/google-http-client-jackson/src/main/java/com/google/api/client/json/jackson/JacksonFactory.java b/google-http-client-jackson/src/main/java/com/google/api/client/json/jackson/JacksonFactory.java
index 817bdbb14..c44ebc7fa 100644
--- a/google-http-client-jackson/src/main/java/com/google/api/client/json/jackson/JacksonFactory.java
+++ b/google-http-client-jackson/src/main/java/com/google/api/client/json/jackson/JacksonFactory.java
@@ -19,7 +19,6 @@
import com.google.api.client.json.JsonParser;
import com.google.api.client.json.JsonToken;
import com.google.api.client.util.Preconditions;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -30,10 +29,8 @@
/**
* Low-level JSON library implementation based on Jackson.
*
- *
- * Implementation is thread-safe, and sub-classes must be thread-safe. For maximum efficiency,
+ *
Implementation is thread-safe, and sub-classes must be thread-safe. For maximum efficiency,
* applications should use a single globally-shared instance of the JSON factory.
- *
*
* @since 1.3
* @author Yaniv Inbar
@@ -44,6 +41,7 @@ public final class JacksonFactory extends JsonFactory {
/** JSON factory. */
private final org.codehaus.jackson.JsonFactory factory = new org.codehaus.jackson.JsonFactory();
+
{
// don't auto-close JSON content in order to ensure consistent behavior across JSON factories
// TODO(rmistry): Should we disable the JsonGenerator.Feature.AUTO_CLOSE_TARGET feature?
diff --git a/google-http-client-jackson/src/main/java/com/google/api/client/json/jackson/JacksonGenerator.java b/google-http-client-jackson/src/main/java/com/google/api/client/json/jackson/JacksonGenerator.java
index 64c0eed57..096b892ac 100644
--- a/google-http-client-jackson/src/main/java/com/google/api/client/json/jackson/JacksonGenerator.java
+++ b/google-http-client-jackson/src/main/java/com/google/api/client/json/jackson/JacksonGenerator.java
@@ -15,7 +15,6 @@
package com.google.api.client.json.jackson;
import com.google.api.client.json.JsonGenerator;
-
import java.io.IOException;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -23,9 +22,7 @@
/**
* Low-level JSON serializer implementation based on Jackson.
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @author Yaniv Inbar
* @deprecated As of release 1.28, please use Jackson2 and google-http-client-jackson2.
diff --git a/google-http-client-jackson/src/main/java/com/google/api/client/json/jackson/JacksonParser.java b/google-http-client-jackson/src/main/java/com/google/api/client/json/jackson/JacksonParser.java
index 9a246d185..529582075 100644
--- a/google-http-client-jackson/src/main/java/com/google/api/client/json/jackson/JacksonParser.java
+++ b/google-http-client-jackson/src/main/java/com/google/api/client/json/jackson/JacksonParser.java
@@ -16,7 +16,6 @@
import com.google.api.client.json.JsonParser;
import com.google.api.client.json.JsonToken;
-
import java.io.IOException;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -24,9 +23,7 @@
/**
* Low-level JSON serializer implementation based on Jackson.
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @author Yaniv Inbar
* @deprecated As of release 1.28, please use Jackson2 and google-http-client-jackson2.
diff --git a/google-http-client-jackson/src/main/java/com/google/api/client/json/jackson/package-info.java b/google-http-client-jackson/src/main/java/com/google/api/client/json/jackson/package-info.java
index 81ca7adb7..eabec34a6 100644
--- a/google-http-client-jackson/src/main/java/com/google/api/client/json/jackson/package-info.java
+++ b/google-http-client-jackson/src/main/java/com/google/api/client/json/jackson/package-info.java
@@ -21,4 +21,3 @@
* @deprecated As of release 1.28, please use Jackson2 and google-http-client-jackson2.
*/
package com.google.api.client.json.jackson;
-
diff --git a/google-http-client-jackson/src/test/java/com/google/api/client/json/jackson/JacksonFactoryTest.java b/google-http-client-jackson/src/test/java/com/google/api/client/json/jackson/JacksonFactoryTest.java
index 84502d37b..892d5b3b6 100644
--- a/google-http-client-jackson/src/test/java/com/google/api/client/json/jackson/JacksonFactoryTest.java
+++ b/google-http-client-jackson/src/test/java/com/google/api/client/json/jackson/JacksonFactoryTest.java
@@ -19,7 +19,6 @@
import com.google.api.client.test.json.AbstractJsonFactoryTest;
import com.google.api.client.util.StringUtils;
import com.google.common.base.Charsets;
-
import java.io.ByteArrayInputStream;
import java.util.ArrayList;
@@ -32,10 +31,20 @@ public class JacksonFactoryTest extends AbstractJsonFactoryTest {
private static final String JSON_ENTRY_PRETTY =
"{" + StringUtils.LINE_SEPARATOR + " \"title\" : \"foo\"" + StringUtils.LINE_SEPARATOR + "}";
- private static final String JSON_FEED_PRETTY = "{" + StringUtils.LINE_SEPARATOR
- + " \"entries\" : [ {" + StringUtils.LINE_SEPARATOR + " \"title\" : \"foo\""
- + StringUtils.LINE_SEPARATOR + " }, {" + StringUtils.LINE_SEPARATOR + " \"title\" : \"bar\""
- + StringUtils.LINE_SEPARATOR + " } ]" + StringUtils.LINE_SEPARATOR + "}";
+ private static final String JSON_FEED_PRETTY =
+ "{"
+ + StringUtils.LINE_SEPARATOR
+ + " \"entries\" : [ {"
+ + StringUtils.LINE_SEPARATOR
+ + " \"title\" : \"foo\""
+ + StringUtils.LINE_SEPARATOR
+ + " }, {"
+ + StringUtils.LINE_SEPARATOR
+ + " \"title\" : \"bar\""
+ + StringUtils.LINE_SEPARATOR
+ + " } ]"
+ + StringUtils.LINE_SEPARATOR
+ + "}";
public JacksonFactoryTest(String name) {
super(name);
diff --git a/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonFactory.java b/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonFactory.java
index 6eacfa8bb..62bc14ec7 100644
--- a/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonFactory.java
+++ b/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonFactory.java
@@ -19,7 +19,6 @@
import com.google.api.client.json.JsonParser;
import com.google.api.client.json.JsonToken;
import com.google.api.client.util.Preconditions;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -30,10 +29,8 @@
/**
* Low-level JSON library implementation based on Jackson 2.
*
- *
- * Implementation is thread-safe, and sub-classes must be thread-safe. For maximum efficiency,
+ *
Implementation is thread-safe, and sub-classes must be thread-safe. For maximum efficiency,
* applications should use a single globally-shared instance of the JSON factory.
- *
*
* @since 1.11
* @author Yaniv Inbar
@@ -43,6 +40,7 @@ public final class JacksonFactory extends JsonFactory {
/** JSON factory. */
private final com.fasterxml.jackson.core.JsonFactory factory =
new com.fasterxml.jackson.core.JsonFactory();
+
{
// don't auto-close JSON content in order to ensure consistent behavior across JSON factories
// TODO(rmistry): Should we disable the JsonGenerator.Feature.AUTO_CLOSE_TARGET feature?
diff --git a/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonGenerator.java b/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonGenerator.java
index 7288a442a..fd02c54c3 100644
--- a/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonGenerator.java
+++ b/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonGenerator.java
@@ -15,7 +15,6 @@
package com.google.api.client.json.jackson2;
import com.google.api.client.json.JsonGenerator;
-
import java.io.IOException;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -23,9 +22,7 @@
/**
* Low-level JSON serializer implementation based on Jackson.
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @author Yaniv Inbar
*/
diff --git a/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonParser.java b/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonParser.java
index 76f3f4a76..5de53112f 100644
--- a/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonParser.java
+++ b/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonParser.java
@@ -16,7 +16,6 @@
import com.google.api.client.json.JsonParser;
import com.google.api.client.json.JsonToken;
-
import java.io.IOException;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -24,9 +23,7 @@
/**
* Low-level JSON serializer implementation based on Jackson.
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @author Yaniv Inbar
*/
diff --git a/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/package-info.java b/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/package-info.java
index 02d2b4191..3c1bc0c3f 100644
--- a/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/package-info.java
+++ b/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/package-info.java
@@ -19,6 +19,4 @@
* @since 1.11
* @author Yaniv Inbar
*/
-
package com.google.api.client.json.jackson2;
-
diff --git a/google-http-client-jackson2/src/test/java/com/google/api/client/json/jackson2/JacksonFactoryTest.java b/google-http-client-jackson2/src/test/java/com/google/api/client/json/jackson2/JacksonFactoryTest.java
index 68152aecc..86d13783c 100644
--- a/google-http-client-jackson2/src/test/java/com/google/api/client/json/jackson2/JacksonFactoryTest.java
+++ b/google-http-client-jackson2/src/test/java/com/google/api/client/json/jackson2/JacksonFactoryTest.java
@@ -19,7 +19,6 @@
import com.google.api.client.test.json.AbstractJsonFactoryTest;
import com.google.api.client.util.StringUtils;
import com.google.common.base.Charsets;
-
import java.io.ByteArrayInputStream;
import java.util.ArrayList;
@@ -32,10 +31,20 @@ public class JacksonFactoryTest extends AbstractJsonFactoryTest {
private static final String JSON_ENTRY_PRETTY =
"{" + StringUtils.LINE_SEPARATOR + " \"title\" : \"foo\"" + StringUtils.LINE_SEPARATOR + "}";
- private static final String JSON_FEED_PRETTY = "{" + StringUtils.LINE_SEPARATOR
- + " \"entries\" : [ {" + StringUtils.LINE_SEPARATOR + " \"title\" : \"foo\""
- + StringUtils.LINE_SEPARATOR + " }, {" + StringUtils.LINE_SEPARATOR + " \"title\" : \"bar\""
- + StringUtils.LINE_SEPARATOR + " } ]" + StringUtils.LINE_SEPARATOR + "}";
+ private static final String JSON_FEED_PRETTY =
+ "{"
+ + StringUtils.LINE_SEPARATOR
+ + " \"entries\" : [ {"
+ + StringUtils.LINE_SEPARATOR
+ + " \"title\" : \"foo\""
+ + StringUtils.LINE_SEPARATOR
+ + " }, {"
+ + StringUtils.LINE_SEPARATOR
+ + " \"title\" : \"bar\""
+ + StringUtils.LINE_SEPARATOR
+ + " } ]"
+ + StringUtils.LINE_SEPARATOR
+ + "}";
public JacksonFactoryTest(String name) {
super(name);
diff --git a/google-http-client-protobuf/src/main/java/com/google/api/client/http/protobuf/ProtoHttpContent.java b/google-http-client-protobuf/src/main/java/com/google/api/client/http/protobuf/ProtoHttpContent.java
index c4fca7f58..c25f2793e 100644
--- a/google-http-client-protobuf/src/main/java/com/google/api/client/http/protobuf/ProtoHttpContent.java
+++ b/google-http-client-protobuf/src/main/java/com/google/api/client/http/protobuf/ProtoHttpContent.java
@@ -20,28 +20,23 @@
import com.google.api.client.util.Beta;
import com.google.api.client.util.Preconditions;
import com.google.protobuf.MessageLite;
-
import java.io.IOException;
import java.io.OutputStream;
/**
- * {@link Beta}
- * Sample usage:
- *
+ * Sample usage:
*
*
- static HttpRequest buildPostRequest(
- HttpRequestFactory requestFactory, GenericUrl url, MessageLite message) throws IOException {
- return requestFactory.buildPostRequest(url, new ProtoHttpContent(message));
- }
+ * static HttpRequest buildPostRequest(
+ * HttpRequestFactory requestFactory, GenericUrl url, MessageLite message) throws IOException {
+ * return requestFactory.buildPostRequest(url, new ProtoHttpContent(message));
+ * }
*
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.5
* @author Yaniv Inbar
@@ -52,9 +47,7 @@ public class ProtoHttpContent extends AbstractHttpContent {
/** Message to serialize. */
private final MessageLite message;
- /**
- * @param message message to serialize
- */
+ /** @param message message to serialize */
public ProtoHttpContent(MessageLite message) {
super(ProtocolBuffers.CONTENT_TYPE);
this.message = Preconditions.checkNotNull(message);
diff --git a/google-http-client-protobuf/src/main/java/com/google/api/client/http/protobuf/package-info.java b/google-http-client-protobuf/src/main/java/com/google/api/client/http/protobuf/package-info.java
index 7f028cb3d..b786dba70 100644
--- a/google-http-client-protobuf/src/main/java/com/google/api/client/http/protobuf/package-info.java
+++ b/google-http-client-protobuf/src/main/java/com/google/api/client/http/protobuf/package-info.java
@@ -13,9 +13,9 @@
*/
/**
- * {@link com.google.api.client.util.Beta} Protocol Buffer format
- * based on the pluggable HTTP library.
+ * {@link com.google.api.client.util.Beta} Protocol Buffer
+ * format based on the pluggable HTTP library.
*
* @since 1.5
* @author Yaniv Inbar
diff --git a/google-http-client-protobuf/src/main/java/com/google/api/client/protobuf/ProtoObjectParser.java b/google-http-client-protobuf/src/main/java/com/google/api/client/protobuf/ProtoObjectParser.java
index 37b1e87f8..60ed3f46a 100644
--- a/google-http-client-protobuf/src/main/java/com/google/api/client/protobuf/ProtoObjectParser.java
+++ b/google-http-client-protobuf/src/main/java/com/google/api/client/protobuf/ProtoObjectParser.java
@@ -17,7 +17,6 @@
import com.google.api.client.util.Beta;
import com.google.api.client.util.ObjectParser;
import com.google.protobuf.MessageLite;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
@@ -25,20 +24,14 @@
import java.nio.charset.Charset;
/**
- * {@link Beta}
- * Implementation is immutable and therefore thread-safe.
- *
+ * Implementation is immutable and therefore thread-safe.
*
- *
- * Data-classes are expected to extend {@link MessageLite}.
- *
+ * Data-classes are expected to extend {@link MessageLite}.
*
- *
- * All Charset parameters are ignored for protocol buffers.
- *
+ * All Charset parameters are ignored for protocol buffers.
*
* @author Matthias Linder (mlinder)
* @since 1.10
diff --git a/google-http-client-protobuf/src/main/java/com/google/api/client/protobuf/ProtocolBuffers.java b/google-http-client-protobuf/src/main/java/com/google/api/client/protobuf/ProtocolBuffers.java
index aa2138ea3..b9b383d1d 100644
--- a/google-http-client-protobuf/src/main/java/com/google/api/client/protobuf/ProtocolBuffers.java
+++ b/google-http-client-protobuf/src/main/java/com/google/api/client/protobuf/ProtocolBuffers.java
@@ -17,21 +17,18 @@
import com.google.api.client.util.Beta;
import com.google.api.client.util.Throwables;
import com.google.protobuf.MessageLite;
-
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Method;
/**
- * {@link Beta}
- * There is no official media type for protocol buffers registered with the IANA .
- * {@link #CONTENT_TYPE} and {@link #ALT_CONTENT_TYPE} are some of the more popular choices being
- * used today, but other media types are also in use.
- *
+ * There is no official media type for protocol buffers registered with the IANA . {@link
+ * #CONTENT_TYPE} and {@link #ALT_CONTENT_TYPE} are some of the more popular choices being used
+ * today, but other media types are also in use.
*
* @since 1.5
* @author Yaniv Inbar
@@ -51,7 +48,7 @@ public class ProtocolBuffers {
*
* @param destination message type
* @param messageClass destination message class that has a {@code parseFrom(InputStream)} public
- * static method
+ * static method
* @return new instance of the parsed destination message class
*/
public static T parseAndClose(
@@ -69,6 +66,5 @@ public static T parseAndClose(
}
}
- private ProtocolBuffers() {
- }
+ private ProtocolBuffers() {}
}
diff --git a/google-http-client-protobuf/src/main/java/com/google/api/client/protobuf/package-info.java b/google-http-client-protobuf/src/main/java/com/google/api/client/protobuf/package-info.java
index deec6ea8d..c6b19b0a2 100644
--- a/google-http-client-protobuf/src/main/java/com/google/api/client/protobuf/package-info.java
+++ b/google-http-client-protobuf/src/main/java/com/google/api/client/protobuf/package-info.java
@@ -13,12 +13,12 @@
*/
/**
- * {@link com.google.api.client.util.Beta} Protocol Buffer format.
+ * {@link com.google.api.client.util.Beta} Protocol Buffer
+ * format.
*
* @since 1.5
* @author Yaniv Inbar
*/
@com.google.api.client.util.Beta
package com.google.api.client.protobuf;
-
diff --git a/google-http-client-protobuf/src/test/java/com/google/api/client/protobuf/ProtocolBuffersTest.java b/google-http-client-protobuf/src/test/java/com/google/api/client/protobuf/ProtocolBuffersTest.java
index c8c5c6ec9..94d7d1391 100644
--- a/google-http-client-protobuf/src/test/java/com/google/api/client/protobuf/ProtocolBuffersTest.java
+++ b/google-http-client-protobuf/src/test/java/com/google/api/client/protobuf/ProtocolBuffersTest.java
@@ -25,14 +25,16 @@
public class ProtocolBuffersTest extends TestCase {
public void testParseAndClose() throws Exception {
- SimpleProto.TestMessage mockResponse = SimpleProto.TestMessage.newBuilder()
- .setStatus(SimpleProto.TestStatus.SUCCESS)
- .setName("This is a test!")
- .setValue(123454321)
- .build();
+ SimpleProto.TestMessage mockResponse =
+ SimpleProto.TestMessage.newBuilder()
+ .setStatus(SimpleProto.TestStatus.SUCCESS)
+ .setName("This is a test!")
+ .setValue(123454321)
+ .build();
// Create the parser and test it with our mock response
- SimpleProto.TestMessage parsedResponse = ProtocolBuffers.parseAndClose(
- new ByteArrayInputStream(mockResponse.toByteArray()), SimpleProto.TestMessage.class);
+ SimpleProto.TestMessage parsedResponse =
+ ProtocolBuffers.parseAndClose(
+ new ByteArrayInputStream(mockResponse.toByteArray()), SimpleProto.TestMessage.class);
// Validate the parser properly parsed the response
// (i.e. it matches the original mock response)
assertEquals(mockResponse.getSerializedSize(), parsedResponse.getSerializedSize());
diff --git a/google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonFactoryTest.java b/google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonFactoryTest.java
index ee3386eaf..8bf518109 100644
--- a/google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonFactoryTest.java
+++ b/google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonFactoryTest.java
@@ -69,8 +69,12 @@ public AbstractJsonFactoryTest(String name) {
protected abstract JsonFactory newFactory();
private static final String EMPTY = "";
- private static final String JSON_THREE_ELEMENTS = "{" + " \"one\": { \"num\": 1 }"
- + ", \"two\": { \"num\": 2 }" + ", \"three\": { \"num\": 3 }" + "}";
+ private static final String JSON_THREE_ELEMENTS =
+ "{"
+ + " \"one\": { \"num\": 1 }"
+ + ", \"two\": { \"num\": 2 }"
+ + ", \"three\": { \"num\": 3 }"
+ + "}";
public void testParse_empty() throws Exception {
JsonParser parser = newFactory().createJsonParser(EMPTY);
@@ -262,18 +266,15 @@ public void testCurrentToken() throws Exception {
}
public static class Entry {
- @Key
- public String title;
+ @Key public String title;
}
public static class Feed {
- @Key
- public Collection entries;
+ @Key public Collection entries;
}
public static class A {
- @Key
- public Map map;
+ @Key public Map map;
}
static final String CONTAINED_MAP = "{\"map\":{\"title\":\"foo\"}}";
@@ -286,114 +287,69 @@ public void testParse() throws Exception {
}
public static class NumberTypes {
- @Key
- byte byteValue;
- @Key
- Byte byteObjValue;
- @Key
- short shortValue;
- @Key
- Short shortObjValue;
- @Key
- int intValue;
- @Key
- Integer intObjValue;
- @Key
- float floatValue;
- @Key
- Float floatObjValue;
- @Key
- long longValue;
- @Key
- Long longObjValue;
- @Key
- double doubleValue;
- @Key
- Double doubleObjValue;
- @Key
- BigInteger bigIntegerValue;
- @Key
- BigDecimal bigDecimalValue;
+ @Key byte byteValue;
+ @Key Byte byteObjValue;
+ @Key short shortValue;
+ @Key Short shortObjValue;
+ @Key int intValue;
+ @Key Integer intObjValue;
+ @Key float floatValue;
+ @Key Float floatObjValue;
+ @Key long longValue;
+ @Key Long longObjValue;
+ @Key double doubleValue;
+ @Key Double doubleObjValue;
+ @Key BigInteger bigIntegerValue;
+ @Key BigDecimal bigDecimalValue;
+
@Key("yetAnotherBigDecimalValue")
BigDecimal anotherBigDecimalValue;
- @Key
- List longListValue;
+ @Key List longListValue;
- @Key
- Map longMapValue;
+ @Key Map longMapValue;
}
public static class NumberTypesAsString {
- @Key
- @JsonString
- byte byteValue;
- @Key
- @JsonString
- Byte byteObjValue;
- @Key
- @JsonString
- short shortValue;
- @Key
- @JsonString
- Short shortObjValue;
- @Key
- @JsonString
- int intValue;
- @Key
- @JsonString
- Integer intObjValue;
- @Key
- @JsonString
- float floatValue;
- @Key
- @JsonString
- Float floatObjValue;
- @Key
- @JsonString
- long longValue;
- @Key
- @JsonString
- Long longObjValue;
- @Key
- @JsonString
- double doubleValue;
- @Key
- @JsonString
- Double doubleObjValue;
- @Key
- @JsonString
- BigInteger bigIntegerValue;
- @Key
- @JsonString
- BigDecimal bigDecimalValue;
+ @Key @JsonString byte byteValue;
+ @Key @JsonString Byte byteObjValue;
+ @Key @JsonString short shortValue;
+ @Key @JsonString Short shortObjValue;
+ @Key @JsonString int intValue;
+ @Key @JsonString Integer intObjValue;
+ @Key @JsonString float floatValue;
+ @Key @JsonString Float floatObjValue;
+ @Key @JsonString long longValue;
+ @Key @JsonString Long longObjValue;
+ @Key @JsonString double doubleValue;
+ @Key @JsonString Double doubleObjValue;
+ @Key @JsonString BigInteger bigIntegerValue;
+ @Key @JsonString BigDecimal bigDecimalValue;
+
@Key("yetAnotherBigDecimalValue")
@JsonString
BigDecimal anotherBigDecimalValue;
- @Key
- @JsonString
- List longListValue;
+ @Key @JsonString List longListValue;
- @Key
- @JsonString
- Map longMapValue;
+ @Key @JsonString Map longMapValue;
}
static final String NUMBER_TYPES =
"{\"bigDecimalValue\":1.0,\"bigIntegerValue\":1,\"byteObjValue\":1,\"byteValue\":1,"
- + "\"doubleObjValue\":1.0,\"doubleValue\":1.0,\"floatObjValue\":1.0,\"floatValue\":1.0,"
- + "\"intObjValue\":1,\"intValue\":1,\"longListValue\":[1],\"longMapValue\":{\"a\":1},"
- + "\"longObjValue\":1,\"longValue\":1,\"shortObjValue\":1,\"shortValue\":1,"
- + "\"yetAnotherBigDecimalValue\":1}";
+ + "\"doubleObjValue\":1.0,\"doubleValue\":1.0,\"floatObjValue\":1.0,\"floatValue\":1.0,"
+ + "\"intObjValue\":1,\"intValue\":1,\"longListValue\":[1],\"longMapValue\":{\"a\":1},"
+ + "\"longObjValue\":1,\"longValue\":1,\"shortObjValue\":1,\"shortValue\":1,"
+ + "\"yetAnotherBigDecimalValue\":1}";
static final String NUMBER_TYPES_AS_STRING =
"{\"bigDecimalValue\":\"1.0\",\"bigIntegerValue\":\"1\",\"byteObjValue\":\"1\","
- + "\"byteValue\":\"1\",\"doubleObjValue\":\"1.0\",\"doubleValue\":\"1.0\","
- + "\"floatObjValue\":\"1.0\",\"floatValue\":\"1.0\",\"intObjValue\":\"1\","
- + "\"intValue\":\"1\",\"longListValue\":[\"1\"],\"longMapValue\":{\"a\":\"1\"},"
- + "\"longObjValue\":\"1\",\"longValue\":\"1\"," + "\"shortObjValue\":\"1\","
- + "\"shortValue\":\"1\",\"yetAnotherBigDecimalValue\":\"1\"}";
+ + "\"byteValue\":\"1\",\"doubleObjValue\":\"1.0\",\"doubleValue\":\"1.0\","
+ + "\"floatObjValue\":\"1.0\",\"floatValue\":\"1.0\",\"intObjValue\":\"1\","
+ + "\"intValue\":\"1\",\"longListValue\":[\"1\"],\"longMapValue\":{\"a\":\"1\"},"
+ + "\"longObjValue\":\"1\",\"longValue\":\"1\","
+ + "\"shortObjValue\":\"1\","
+ + "\"shortValue\":\"1\",\"yetAnotherBigDecimalValue\":\"1\"}";
public void testParser_numberTypes() throws Exception {
JsonFactory factory = newFactory();
@@ -445,22 +401,17 @@ public void testToFromString_UTF8() throws Exception {
}
public static class AnyType {
- @Key
- public Object arr;
- @Key
- public Object bool;
- @Key
- public Object num;
- @Key
- public Object obj;
- @Key
- public Object str;
- @Key
- public Object nul;
+ @Key public Object arr;
+ @Key public Object bool;
+ @Key public Object num;
+ @Key public Object obj;
+ @Key public Object str;
+ @Key public Object nul;
}
- static final String ANY_TYPE = "{\"arr\":[1],\"bool\":true,\"nul\":null,\"num\":5,"
- + "\"obj\":{\"key\":\"value\"},\"str\":\"value\"}";
+ static final String ANY_TYPE =
+ "{\"arr\":[1],\"bool\":true,\"nul\":null,\"num\":5,"
+ + "\"obj\":{\"key\":\"value\"},\"str\":\"value\"}";
public void testParser_anyType() throws Exception {
JsonFactory factory = newFactory();
@@ -472,14 +423,11 @@ public void testParser_anyType() throws Exception {
}
public static class ArrayType {
- @Key
- int[] arr;
+ @Key int[] arr;
- @Key
- int[][] arr2;
+ @Key int[][] arr2;
- @Key
- public Integer[] integerArr;
+ @Key public Integer[] integerArr;
}
static final String ARRAY_TYPE = "{\"arr\":[4,5],\"arr2\":[[1,2],[3]],\"integerArr\":[6,7]}";
@@ -510,8 +458,7 @@ public void testParser_arrayType() throws Exception {
}
public static class CollectionOfCollectionType {
- @Key
- public LinkedList> arr;
+ @Key public LinkedList> arr;
}
static final String COLLECTION_TYPE = "{\"arr\":[[\"a\",\"b\"],[\"c\"]]}";
@@ -530,8 +477,7 @@ public void testParser_collectionType() throws Exception {
}
public static class MapOfMapType {
- @Key
- public Map>[] value;
+ @Key public Map>[] value;
}
static final String MAP_TYPE =
@@ -577,23 +523,17 @@ public void testParser_hashmapForMapType() throws Exception {
}
public static class WildCardTypes {
- @Key
- public Collection[] lower;
- @Key
- public Map map;
- @Key
- public Collection> mapInWild;
- @Key
- public Map mapUpper;
- @Key
- public Collection[] simple;
- @Key
- public Collection[] upper;
+ @Key public Collection[] lower;
+ @Key public Map map;
+ @Key public Collection> mapInWild;
+ @Key public Map mapUpper;
+ @Key public Collection[] simple;
+ @Key public Collection[] upper;
}
static final String WILDCARD_TYPE =
"{\"lower\":[[1,2,3]],\"map\":{\"v\":1},\"mapInWild\":[{\"v\":1}],"
- + "\"mapUpper\":{\"v\":1},\"simple\":[[1,2,3]],\"upper\":[[1,2,3]]}";
+ + "\"mapUpper\":{\"v\":1},\"simple\":[[1,2,3]],\"upper\":[[1,2,3]]}";
@SuppressWarnings("unchecked")
public void testParser_wildCardType() throws Exception {
@@ -633,30 +573,22 @@ public void testParser_wildCardType() throws Exception {
public static class TypeVariableType {
- @Key
- public T[][] arr;
+ @Key public T[][] arr;
- @Key
- public LinkedList> list;
+ @Key public LinkedList> list;
- @Key
- public T nullValue;
+ @Key public T nullValue;
- @Key
- public T value;
+ @Key public T value;
}
- public static class IntegerTypeVariableType extends TypeVariableType {
- }
+ public static class IntegerTypeVariableType extends TypeVariableType {}
- public static class IntArrayTypeVariableType extends TypeVariableType {
- }
+ public static class IntArrayTypeVariableType extends TypeVariableType {}
- public static class DoubleListTypeVariableType extends TypeVariableType> {
- }
+ public static class DoubleListTypeVariableType extends TypeVariableType> {}
- public static class FloatMapTypeVariableType extends TypeVariableType> {
- }
+ public static class FloatMapTypeVariableType extends TypeVariableType> {}
static final String INTEGER_TYPE_VARIABLE_TYPE =
"{\"arr\":[null,[null,1]],\"list\":[null,[null,1]],\"nullValue\":null,\"value\":1}";
@@ -666,11 +598,11 @@ public static class FloatMapTypeVariableType extends TypeVariableType {
- @Key
- Y y;
+ @Key Y y;
}
public static class Y {
- @Key
- Z z;
+ @Key Z z;
}
public static class Z {
- @Key
- ZT f;
+ @Key ZT f;
}
- public static class TypeVariablesPassedAround extends X> {
- }
+ public static class TypeVariablesPassedAround extends X> {}
static final String TYPE_VARS = "{\"y\":{\"z\":{\"f\":[\"abc\"]}}}";
@@ -1147,16 +1069,23 @@ public void testParser_nullReader() throws Exception {
public void testObjectParserParse_entry() throws Exception {
@SuppressWarnings("serial")
- Entry entry = (Entry) newFactory().createJsonObjectParser()
- .parseAndClose(new StringReader(JSON_ENTRY), new TypeToken() {}.getType());
+ Entry entry =
+ (Entry)
+ newFactory()
+ .createJsonObjectParser()
+ .parseAndClose(new StringReader(JSON_ENTRY), new TypeToken() {}.getType());
assertEquals("foo", entry.title);
}
public void testObjectParserParse_stringList() throws Exception {
JsonFactory factory = newFactory();
@SuppressWarnings({"unchecked", "serial"})
- List result = (List) factory.createJsonObjectParser()
- .parseAndClose(new StringReader(STRING_ARRAY), new TypeToken>() {}.getType());
+ List result =
+ (List)
+ factory
+ .createJsonObjectParser()
+ .parseAndClose(
+ new StringReader(STRING_ARRAY), new TypeToken>() {}.getType());
result.get(0);
assertEquals(STRING_ARRAY, factory.toString(result));
// check types and values
@@ -1232,8 +1161,7 @@ public final void testParse_array() throws Exception {
}
public static class TestClass {
- public TestClass() {
- }
+ public TestClass() {}
@Key("foo")
public int foo;
@@ -1284,9 +1212,7 @@ public final void testGenerate_infinityOrNanError() throws Exception {
}
public static class ExtendsGenericJson extends GenericJson {
- @Key
- @JsonString
- Long numAsString;
+ @Key @JsonString Long numAsString;
@Override
public ExtendsGenericJson set(String fieldName, Object value) {
@@ -1307,8 +1233,7 @@ public void testParser_extendsGenericJson() throws Exception {
}
public static class Simple {
- @Key
- String a;
+ @Key String a;
}
static final String SIMPLE = "{\"a\":\"b\"}";
@@ -1324,8 +1249,11 @@ public void testJsonObjectParser_reader() throws Exception {
public void testJsonObjectParser_inputStream() throws Exception {
JsonFactory factory = newFactory();
JsonObjectParser parser = new JsonObjectParser(factory);
- Simple simple = parser.parseAndClose(
- new ByteArrayInputStream(StringUtils.getBytesUtf8(SIMPLE)), Charsets.UTF_8, Simple.class);
+ Simple simple =
+ parser.parseAndClose(
+ new ByteArrayInputStream(StringUtils.getBytesUtf8(SIMPLE)),
+ Charsets.UTF_8,
+ Simple.class);
assertEquals("b", simple.a);
}
@@ -1341,9 +1269,11 @@ public void testJsonObjectParser_inputStreamWrapped() throws Exception {
JsonFactory factory = newFactory();
JsonObjectParser parser =
new JsonObjectParser.Builder(factory).setWrapperKeys(Collections.singleton("d")).build();
- Simple simple = parser.parseAndClose(
- new ByteArrayInputStream(StringUtils.getBytesUtf8(SIMPLE_WRAPPED)), Charsets.UTF_8,
- Simple.class);
+ Simple simple =
+ parser.parseAndClose(
+ new ByteArrayInputStream(StringUtils.getBytesUtf8(SIMPLE_WRAPPED)),
+ Charsets.UTF_8,
+ Simple.class);
assertEquals("b", simple.a);
}
@@ -1368,10 +1298,8 @@ public void testJsonHttpContent_wrapped() throws Exception {
}
public static class V {
- @Key
- Void v;
- @Key
- String s;
+ @Key Void v;
+ @Key String s;
}
public void testParse_void() throws Exception {
@@ -1396,10 +1324,8 @@ public void subtestParse_void(String value) throws Exception {
}
public static class BooleanTypes {
- @Key
- Boolean boolObj;
- @Key
- boolean bool;
+ @Key Boolean boolObj;
+ @Key boolean bool;
}
public static final String BOOLEAN_TYPE_EMPTY = "{}";
@@ -1442,21 +1368,25 @@ public void testParse_boolean() throws Exception {
}
public abstract static class Animal {
- @Key
- public String name;
+ @Key public String name;
+
@Key("legCount")
public int numberOfLegs;
+
@Key
- @JsonPolymorphicTypeMap(typeDefinitions = {@TypeDef(key = "dog", ref = Dog.class),
- @TypeDef(key = "bug", ref = Centipede.class), @TypeDef(key = "human", ref = Human.class),
- @TypeDef(key = "dogwithfamily", ref = DogWithFamily.class),
- @TypeDef(key = "human with pets", ref = HumanWithPets.class)})
+ @JsonPolymorphicTypeMap(
+ typeDefinitions = {
+ @TypeDef(key = "dog", ref = Dog.class),
+ @TypeDef(key = "bug", ref = Centipede.class),
+ @TypeDef(key = "human", ref = Human.class),
+ @TypeDef(key = "dogwithfamily", ref = DogWithFamily.class),
+ @TypeDef(key = "human with pets", ref = HumanWithPets.class)
+ })
public String type;
}
public static class Dog extends Animal {
- @Key
- public int tricksKnown;
+ @Key public int tricksKnown;
}
public static class Centipede extends Animal {
@@ -1479,10 +1409,10 @@ public static class Centipede extends Animal {
// Test heterogeneous scheme with additional, unused information:
public static final String DOG_EXTRA_INFO =
"{\"name\":\"Fido\",\"legCount\":4,\"unusedInfo\":\"this is not being used!\","
- + "\"tricksKnown\":3,\"type\":\"dog\",\"unused\":{\"foo\":200}}";
+ + "\"tricksKnown\":3,\"type\":\"dog\",\"unused\":{\"foo\":200}}";
public static final String CENTIPEDE_EXTRA_INFO =
"{\"unused\":0, \"bodyColor\":\"green\",\"name\":\"Mr. Icky\",\"legCount\":68,\"type\":"
- + "\"bug\"}";
+ + "\"bug\"}";
public void testParser_heterogeneousSchemata() throws Exception {
testParser_heterogeneousSchemata_Helper(DOG, CENTIPEDE);
@@ -1534,8 +1464,7 @@ public void testParser_heterogeneousSchema_missingType() throws Exception {
}
public static class Human extends Animal {
- @Key
- public Dog bestFriend;
+ @Key public Dog bestFriend;
}
// Test a subclass with an additional object in it.
@@ -1560,23 +1489,23 @@ public void testParser_heterogeneousSchema_withObject() throws Exception {
}
public static class AnimalGenericJson extends GenericJson {
- @Key
- public String name;
+ @Key public String name;
+
@Key("legCount")
public int numberOfLegs;
+
@Key
@JsonPolymorphicTypeMap(typeDefinitions = {@TypeDef(key = "dog", ref = DogGenericJson.class)})
public String type;
}
public static class DogGenericJson extends AnimalGenericJson {
- @Key
- public int tricksKnown;
+ @Key public int tricksKnown;
}
public static final String DOG_EXTRA_INFO_ORDERED =
"{\"legCount\":4,\"name\":\"Fido\",\"tricksKnown\":3,\"type\":\"dog\","
- + "\"unusedInfo\":\"this is not being used!\",\"unused\":{\"foo\":200}}";
+ + "\"unusedInfo\":\"this is not being used!\",\"unused\":{\"foo\":200}}";
@SuppressWarnings("unchecked")
public void testParser_heterogeneousSchema_genericJson() throws Exception {
@@ -1594,15 +1523,17 @@ public void testParser_heterogeneousSchema_genericJson() throws Exception {
assertEquals(200, foo.intValue());
}
- public static final String DOG_WITH_FAMILY = "{\"children\":[" + DOG + "," + CENTIPEDE
- + "],\"legCount\":4,\"name\":\"Bob\",\"nicknames\":[\"Fluffy\",\"Hey, you\"],"
- + "\"tricksKnown\":10,\"type\":\"dogwithfamily\"}";
+ public static final String DOG_WITH_FAMILY =
+ "{\"children\":["
+ + DOG
+ + ","
+ + CENTIPEDE
+ + "],\"legCount\":4,\"name\":\"Bob\",\"nicknames\":[\"Fluffy\",\"Hey, you\"],"
+ + "\"tricksKnown\":10,\"type\":\"dogwithfamily\"}";
public static class DogWithFamily extends Dog {
- @Key
- public String[] nicknames;
- @Key
- public Animal[] children;
+ @Key public String[] nicknames;
+ @Key public Animal[] children;
}
public void testParser_heterogeneousSchema_withArrays() throws Exception {
@@ -1643,13 +1574,14 @@ public void testParser_heterogeneousSchema_withNullArrays() throws Exception {
}
public static class PolymorphicWithMultipleAnnotations {
- @Key
- String a;
+ @Key String a;
+
@Key
@JsonPolymorphicTypeMap(typeDefinitions = {@TypeDef(key = "dog", ref = Dog.class)})
String b;
- @Key
- String c;
+
+ @Key String c;
+
@Key
@JsonPolymorphicTypeMap(typeDefinitions = {@TypeDef(key = "bug", ref = Centipede.class)})
String d;
@@ -1666,22 +1598,24 @@ public void testParser_polymorphicClass_tooManyAnnotations() throws Exception {
} catch (IllegalArgumentException e) {
return; // expected
}
- fail("Expected IllegalArgumentException on class with multiple @JsonPolymorphicTypeMap"
- + " annotations.");
+ fail(
+ "Expected IllegalArgumentException on class with multiple @JsonPolymorphicTypeMap"
+ + " annotations.");
}
public static class PolymorphicWithNumericType {
@Key
- @JsonPolymorphicTypeMap(typeDefinitions = {
- @TypeDef(key = "1", ref = NumericTypedSubclass1.class),
- @TypeDef(key = "2", ref = NumericTypedSubclass2.class)})
+ @JsonPolymorphicTypeMap(
+ typeDefinitions = {
+ @TypeDef(key = "1", ref = NumericTypedSubclass1.class),
+ @TypeDef(key = "2", ref = NumericTypedSubclass2.class)
+ })
Integer type;
}
- public static class NumericTypedSubclass1 extends PolymorphicWithNumericType {
- }
- public static class NumericTypedSubclass2 extends PolymorphicWithNumericType {
- }
+ public static class NumericTypedSubclass1 extends PolymorphicWithNumericType {}
+
+ public static class NumericTypedSubclass2 extends PolymorphicWithNumericType {}
public static final String POLYMORPHIC_NUMERIC_TYPE_1 = "{\"foo\":\"bar\",\"type\":1}";
public static final String POLYMORPHIC_NUMERIC_TYPE_2 = "{\"foo\":\"bar\",\"type\":2}";
@@ -1700,16 +1634,17 @@ public void testParser_heterogeneousSchema_numericType() throws Exception {
public static class PolymorphicWithNumericValueType {
@Key
- @JsonPolymorphicTypeMap(typeDefinitions = {
- @TypeDef(key = "1", ref = NumericValueTypedSubclass1.class),
- @TypeDef(key = "2", ref = NumericValueTypedSubclass2.class)})
+ @JsonPolymorphicTypeMap(
+ typeDefinitions = {
+ @TypeDef(key = "1", ref = NumericValueTypedSubclass1.class),
+ @TypeDef(key = "2", ref = NumericValueTypedSubclass2.class)
+ })
int type;
}
- public static class NumericValueTypedSubclass1 extends PolymorphicWithNumericValueType {
- }
- public static class NumericValueTypedSubclass2 extends PolymorphicWithNumericValueType {
- }
+ public static class NumericValueTypedSubclass1 extends PolymorphicWithNumericValueType {}
+
+ public static class NumericValueTypedSubclass2 extends PolymorphicWithNumericValueType {}
public static final String POLYMORPHIC_NUMERIC_UNSPECIFIED_TYPE = "{\"foo\":\"bar\"}";
@@ -1736,8 +1671,11 @@ public void testParser_heterogeneousSchema_numericValueType() throws Exception {
public static class PolymorphicWithIllegalValueType {
@Key
- @JsonPolymorphicTypeMap(typeDefinitions = {
- @TypeDef(key = "foo", ref = Object.class), @TypeDef(key = "bar", ref = Object.class)})
+ @JsonPolymorphicTypeMap(
+ typeDefinitions = {
+ @TypeDef(key = "foo", ref = Object.class),
+ @TypeDef(key = "bar", ref = Object.class)
+ })
Object type;
}
@@ -1752,11 +1690,13 @@ public void testParser_heterogeneousSchema_illegalValueType() throws Exception {
fail("Expected IllegalArgumentException on class with illegal @JsonPolymorphicTypeMap type");
}
-
public static class PolymorphicWithDuplicateTypeKeys {
@Key
- @JsonPolymorphicTypeMap(typeDefinitions = {
- @TypeDef(key = "foo", ref = Object.class), @TypeDef(key = "foo", ref = Object.class)})
+ @JsonPolymorphicTypeMap(
+ typeDefinitions = {
+ @TypeDef(key = "foo", ref = Object.class),
+ @TypeDef(key = "foo", ref = Object.class)
+ })
String type;
}
@@ -1790,8 +1730,8 @@ public static class PolymorphicSelfReferencing {
@JsonPolymorphicTypeMap(
typeDefinitions = {@TypeDef(key = "self", ref = PolymorphicSelfReferencing.class)})
String type;
- @Key
- String info;
+
+ @Key String info;
}
public static final String POLYMORPHIC_SELF_REFERENCING = "{\"info\":\"blah\",\"type\":\"self\"}";
@@ -1807,18 +1747,23 @@ public void testParser_polymorphicClass_selfReferencing() throws Exception {
}
public static class HumanWithPets extends Human {
- @Key
- Map pets;
+ @Key Map pets;
}
- public static final String HUMAN_WITH_PETS = "{\"bestFriend\":" + DOG
- + ",\"legCount\":2,\"name\":\"Joe\",\"pets\":{\"first\":" + CENTIPEDE
- + ",\"second\":{\"type\":\"dog\"}},\"type\":\"human with pets\",\"unused\":\"foo\"}";
+ public static final String HUMAN_WITH_PETS =
+ "{\"bestFriend\":"
+ + DOG
+ + ",\"legCount\":2,\"name\":\"Joe\",\"pets\":{\"first\":"
+ + CENTIPEDE
+ + ",\"second\":{\"type\":\"dog\"}},\"type\":\"human with pets\",\"unused\":\"foo\"}";
- public static final String HUMAN_WITH_PETS_PARSED = "{\"bestFriend\":" + DOG
- + ",\"legCount\":2,\"name\":\"Joe\",\"pets\":{\"first\":" + CENTIPEDE
- + ",\"second\":{\"legCount\":0,\"tricksKnown\":0,\"type\":\"dog\"}},"
- + "\"type\":\"human with pets\"}";
+ public static final String HUMAN_WITH_PETS_PARSED =
+ "{\"bestFriend\":"
+ + DOG
+ + ",\"legCount\":2,\"name\":\"Joe\",\"pets\":{\"first\":"
+ + CENTIPEDE
+ + ",\"second\":{\"legCount\":0,\"tricksKnown\":0,\"type\":\"dog\"}},"
+ + "\"type\":\"human with pets\"}";
public void testParser_polymorphicClass_mapOfPolymorphicClasses() throws Exception {
JsonFactory factory = newFactory();
@@ -1839,6 +1784,4 @@ public void testParser_polymorphicClass_mapOfPolymorphicClasses() throws Excepti
assertEquals(0, ((Dog) humanWithPets.pets.get("second")).tricksKnown);
assertEquals(2, humanWithPets.pets.size());
}
-
-
}
diff --git a/google-http-client-test/src/main/java/com/google/api/client/test/json/package-info.java b/google-http-client-test/src/main/java/com/google/api/client/test/json/package-info.java
index 53de2931e..e633d85cf 100644
--- a/google-http-client-test/src/main/java/com/google/api/client/test/json/package-info.java
+++ b/google-http-client-test/src/main/java/com/google/api/client/test/json/package-info.java
@@ -17,6 +17,4 @@
*
* @author Ravi Mistry
*/
-
package com.google.api.client.test.json;
-
diff --git a/google-http-client-test/src/main/java/com/google/api/client/test/util/store/AbstractDataStoreFactoryTest.java b/google-http-client-test/src/main/java/com/google/api/client/test/util/store/AbstractDataStoreFactoryTest.java
index 1986c6204..e1e8e4061 100644
--- a/google-http-client-test/src/main/java/com/google/api/client/test/util/store/AbstractDataStoreFactoryTest.java
+++ b/google-http-client-test/src/main/java/com/google/api/client/test/util/store/AbstractDataStoreFactoryTest.java
@@ -56,8 +56,7 @@ public void tearDown() throws Exception {
}
private static void assertContentsAnyOrder(Collection c, Object... elts) {
- assertEquals(Sets.newHashSet(c),
- Sets.newHashSet(Arrays.asList(elts)));
+ assertEquals(Sets.newHashSet(c), Sets.newHashSet(Arrays.asList(elts)));
}
public void testId() throws Exception {
diff --git a/google-http-client-test/src/main/java/com/google/api/client/test/util/store/package-info.java b/google-http-client-test/src/main/java/com/google/api/client/test/util/store/package-info.java
index ef5f485ec..fb4d33427 100644
--- a/google-http-client-test/src/main/java/com/google/api/client/test/util/store/package-info.java
+++ b/google-http-client-test/src/main/java/com/google/api/client/test/util/store/package-info.java
@@ -18,4 +18,3 @@
* @author Yaniv Inbar
*/
package com.google.api.client.test.util.store;
-
diff --git a/google-http-client-test/src/test/java/com/google/api/client/test/util/store/FileDataStoreFactoryTest.java b/google-http-client-test/src/test/java/com/google/api/client/test/util/store/FileDataStoreFactoryTest.java
index 63685d33e..46918d765 100644
--- a/google-http-client-test/src/test/java/com/google/api/client/test/util/store/FileDataStoreFactoryTest.java
+++ b/google-http-client-test/src/test/java/com/google/api/client/test/util/store/FileDataStoreFactoryTest.java
@@ -14,12 +14,10 @@
package com.google.api.client.test.util.store;
-import com.google.api.client.test.util.store.AbstractDataStoreFactoryTest;
import com.google.api.client.util.store.DataStore;
import com.google.api.client.util.store.FileDataStoreFactory;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.Files;
-
import java.io.File;
import java.io.IOException;
@@ -41,7 +39,8 @@ public void testSave() throws IOException {
FileDataStoreFactory factory = newDataStoreFactory();
DataStore store = factory.getDataStore("foo");
store.set("k", "v");
- assertEquals(ImmutableSet.of("k"),
+ assertEquals(
+ ImmutableSet.of("k"),
new FileDataStoreFactory(factory.getDataDirectory()).getDataStore("foo").keySet());
store.clear();
assertTrue(new FileDataStoreFactory(factory.getDataDirectory()).getDataStore("foo").isEmpty());
diff --git a/google-http-client-test/src/test/java/com/google/api/client/test/util/store/MemoryDataStoreFactoryTest.java b/google-http-client-test/src/test/java/com/google/api/client/test/util/store/MemoryDataStoreFactoryTest.java
index bdee074d5..a18384a10 100644
--- a/google-http-client-test/src/test/java/com/google/api/client/test/util/store/MemoryDataStoreFactoryTest.java
+++ b/google-http-client-test/src/test/java/com/google/api/client/test/util/store/MemoryDataStoreFactoryTest.java
@@ -14,7 +14,6 @@
package com.google.api.client.test.util.store;
-import com.google.api.client.test.util.store.AbstractDataStoreFactoryTest;
import com.google.api.client.util.store.DataStoreFactory;
import com.google.api.client.util.store.MemoryDataStoreFactory;
diff --git a/google-http-client-xml/src/main/java/com/google/api/client/http/xml/AbstractXmlHttpContent.java b/google-http-client-xml/src/main/java/com/google/api/client/http/xml/AbstractXmlHttpContent.java
index 643fa8369..792138bfe 100644
--- a/google-http-client-xml/src/main/java/com/google/api/client/http/xml/AbstractXmlHttpContent.java
+++ b/google-http-client-xml/src/main/java/com/google/api/client/http/xml/AbstractXmlHttpContent.java
@@ -25,12 +25,10 @@
import org.xmlpull.v1.XmlSerializer;
/**
- * {@link Beta}
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.0
* @author Yaniv Inbar
diff --git a/google-http-client-xml/src/main/java/com/google/api/client/http/xml/XmlHttpContent.java b/google-http-client-xml/src/main/java/com/google/api/client/http/xml/XmlHttpContent.java
index 5184aed3e..db3802d84 100644
--- a/google-http-client-xml/src/main/java/com/google/api/client/http/xml/XmlHttpContent.java
+++ b/google-http-client-xml/src/main/java/com/google/api/client/http/xml/XmlHttpContent.java
@@ -22,23 +22,19 @@
import org.xmlpull.v1.XmlSerializer;
/**
- * {@link Beta}
- * Sample usage:
- *
+ * Sample usage:
*
*
- static void setContent(HttpRequest request, XmlNamespaceDictionary namespaceDictionary,
- String elementName, Object data) {
- request.setContent(new XmlHttpContent(namespaceDictionary, elementName, data));
- }
+ * static void setContent(HttpRequest request, XmlNamespaceDictionary namespaceDictionary,
+ * String elementName, Object data) {
+ * request.setContent(new XmlHttpContent(namespaceDictionary, elementName, data));
+ * }
*
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.0
* @author Yaniv Inbar
@@ -51,7 +47,7 @@ public class XmlHttpContent extends AbstractXmlHttpContent {
*
* @param namespaceDictionary XML namespace dictionary
* @param elementName XML element local name, optionally prefixed by its namespace alias, for
- * example {@code "atom:entry"}
+ * example {@code "atom:entry"}
* @param data Key/value pair data
* @since 1.5
*/
@@ -63,8 +59,8 @@ public XmlHttpContent(
}
/**
- * XML element local name, optionally prefixed by its namespace alias, for example
- * {@code "atom:entry"}.
+ * XML element local name, optionally prefixed by its namespace alias, for example {@code
+ * "atom:entry"}.
*/
private final String elementName;
diff --git a/google-http-client-xml/src/main/java/com/google/api/client/http/xml/atom/AtomContent.java b/google-http-client-xml/src/main/java/com/google/api/client/http/xml/atom/AtomContent.java
index 7badc9e62..5f1f5d254 100644
--- a/google-http-client-xml/src/main/java/com/google/api/client/http/xml/atom/AtomContent.java
+++ b/google-http-client-xml/src/main/java/com/google/api/client/http/xml/atom/AtomContent.java
@@ -24,32 +24,26 @@
import org.xmlpull.v1.XmlSerializer;
/**
- * {@link Beta}
- * Default value for {@link #getType()} is {@link Atom#MEDIA_TYPE}.
- *
+ * Default value for {@link #getType()} is {@link Atom#MEDIA_TYPE}.
*
- *
- * Sample usages:
- *
+ * Sample usages:
*
*
- static void setAtomEntryContent(
- HttpRequest request, XmlNamespaceDictionary namespaceDictionary, Object entry) {
- request.setContent(AtomContent.forEntry(namespaceDictionary, entry));
- }
-
- static void setAtomBatchContent(
- HttpRequest request, XmlNamespaceDictionary namespaceDictionary, Object batchFeed) {
- request.setContent(AtomContent.forFeed(namespaceDictionary, batchFeed));
- }
+ * static void setAtomEntryContent(
+ * HttpRequest request, XmlNamespaceDictionary namespaceDictionary, Object entry) {
+ * request.setContent(AtomContent.forEntry(namespaceDictionary, entry));
+ * }
+ *
+ * static void setAtomBatchContent(
+ * HttpRequest request, XmlNamespaceDictionary namespaceDictionary, Object batchFeed) {
+ * request.setContent(AtomContent.forFeed(namespaceDictionary, batchFeed));
+ * }
*
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.4
* @author Yaniv Inbar
diff --git a/google-http-client-xml/src/main/java/com/google/api/client/http/xml/atom/AtomFeedParser.java b/google-http-client-xml/src/main/java/com/google/api/client/http/xml/atom/AtomFeedParser.java
index 71a032429..e3542bdae 100644
--- a/google-http-client-xml/src/main/java/com/google/api/client/http/xml/atom/AtomFeedParser.java
+++ b/google-http-client-xml/src/main/java/com/google/api/client/http/xml/atom/AtomFeedParser.java
@@ -28,12 +28,10 @@
import org.xmlpull.v1.XmlPullParserException;
/**
- * {@link Beta}
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @param feed type
* @param entry type
@@ -53,8 +51,12 @@ public final class AtomFeedParser extends AbstractAtomFeedParser {
* @param feedClass feed class to parse
* @since 1.5
*/
- public AtomFeedParser(XmlNamespaceDictionary namespaceDictionary, XmlPullParser parser,
- InputStream inputStream, Class feedClass, Class entryClass) {
+ public AtomFeedParser(
+ XmlNamespaceDictionary namespaceDictionary,
+ XmlPullParser parser,
+ InputStream inputStream,
+ Class feedClass,
+ Class entryClass) {
super(namespaceDictionary, parser, inputStream, feedClass);
this.entryClass = Preconditions.checkNotNull(entryClass);
}
@@ -94,8 +96,11 @@ public final Class getEntryClass() {
* @throws IOException I/O exception
* @throws XmlPullParserException XML pull parser exception
*/
- public static AtomFeedParser create(HttpResponse response,
- XmlNamespaceDictionary namespaceDictionary, Class feedClass, Class entryClass)
+ public static AtomFeedParser create(
+ HttpResponse response,
+ XmlNamespaceDictionary namespaceDictionary,
+ Class feedClass,
+ Class entryClass)
throws IOException, XmlPullParserException {
InputStream content = response.getContent();
try {
diff --git a/google-http-client-xml/src/main/java/com/google/api/client/http/xml/atom/package-info.java b/google-http-client-xml/src/main/java/com/google/api/client/http/xml/atom/package-info.java
index a94a6c93d..810f86c60 100644
--- a/google-http-client-xml/src/main/java/com/google/api/client/http/xml/atom/package-info.java
+++ b/google-http-client-xml/src/main/java/com/google/api/client/http/xml/atom/package-info.java
@@ -13,7 +13,7 @@
*/
/**
- * {@link com.google.api.client.util.Beta}
- * Each data key name maps into the name of the XPath expression value for the XML element,
+ *
Each data key name maps into the name of the XPath expression value for the XML element,
* attribute, or text content (using {@code "text()"}). Subclasses can declare fields for known XML
* content using the {@link Key} annotation. Each field can be of any visibility (private, package
* private, protected, or public) and must not be static. {@code null} unknown data key names are
* not allowed, but {@code null} data values are allowed.
- *
*
- *
- * Implementation is not thread-safe. For a thread-safe choice instead use an implementation of
+ *
Implementation is not thread-safe. For a thread-safe choice instead use an implementation of
* {@link ConcurrentMap}.
- *
*
* @since 1.0
* @author Yaniv Inbar
diff --git a/google-http-client-xml/src/main/java/com/google/api/client/xml/Xml.java b/google-http-client-xml/src/main/java/com/google/api/client/xml/Xml.java
index 935eee30b..3955c5e18 100644
--- a/google-http-client-xml/src/main/java/com/google/api/client/xml/Xml.java
+++ b/google-http-client-xml/src/main/java/com/google/api/client/xml/Xml.java
@@ -37,7 +37,7 @@
import org.xmlpull.v1.XmlSerializer;
/**
- * {@link Beta}
- * Use {@link HttpMediaType#equalsIgnoreParameters} for comparing media types.
- *
+ * Use {@link HttpMediaType#equalsIgnoreParameters} for comparing media types.
*
* @since 1.10
*/
@@ -66,12 +64,12 @@ public class Xml {
private static synchronized XmlPullParserFactory getParserFactory()
throws XmlPullParserException {
if (factory == null) {
- factory = XmlPullParserFactory.newInstance(
- System.getProperty(XmlPullParserFactory.PROPERTY_NAME), null);
+ factory =
+ XmlPullParserFactory.newInstance(
+ System.getProperty(XmlPullParserFactory.PROPERTY_NAME), null);
factory.setNamespaceAware(true);
}
return factory;
-
}
/**
@@ -95,12 +93,11 @@ public static XmlPullParser createParser() throws XmlPullParserException {
/**
* Shows a debug string representation of an element data object of key/value pairs.
*
- *
- * It will make up something for the element name and XML namespaces. If those are known, it is
+ *
It will make up something for the element name and XML namespaces. If those are known, it is
* better to use {@link XmlNamespaceDictionary#toStringOf(String, Object)}.
*
* @param element element data object of key/value pairs ({@link GenericXml}, {@link Map}, or any
- * object with public fields)
+ * object with public fields)
*/
public static String toStringOf(Object element) {
return new XmlNamespaceDictionary().toStringOf(null, element);
@@ -112,15 +109,16 @@ public static String toStringOf(Object element) {
* @param stringValue string value
* @param field field to set or {@code null} if not applicable
* @param valueType value type (class, parameterized type, or generic array type) or {@code null}
- * for none
+ * for none
* @param context context list, going from least specific to most specific type context, for
- * example container class and its field
+ * example container class and its field
* @param destination destination object or {@code null} for none
* @param genericXml generic XML or {@code null} if not applicable
* @param destinationMap destination map or {@code null} if not applicable
* @param name key name
*/
- private static void parseAttributeOrTextContent(String stringValue,
+ private static void parseAttributeOrTextContent(
+ String stringValue,
Field field,
Type valueType,
List context,
@@ -145,7 +143,8 @@ private static void parseAttributeOrTextContent(String stringValue,
* @param destinationMap destination map or {@code null} if not applicable
* @param name key name
*/
- private static void setValue(Object value,
+ private static void setValue(
+ Object value,
Field field,
Object destination,
GenericXml genericXml,
@@ -164,10 +163,8 @@ private static void setValue(Object value,
* Customizes the behavior of XML parsing. Subclasses may override any methods they need to
* customize behavior.
*
- *
- * Implementation has no fields and therefore thread-safe, but sub-classes are not necessarily
+ *
Implementation has no fields and therefore thread-safe, but sub-classes are not necessarily
* thread-safe.
- *
*/
public static class CustomizeParser {
/**
@@ -184,8 +181,8 @@ public boolean stopBeforeStartTag(String namespace, String localName) {
/**
* Returns whether to stop parsing when reaching the end tag of an XML element after it has been
- * processed. Only called if the element is actually being processed. By default, returns
- * {@code false}, but subclasses may override.
+ * processed. Only called if the element is actually being processed. By default, returns {@code
+ * false}, but subclasses may override.
*
* @param namespace XML element's namespace URI
* @param localName XML element's local name
@@ -198,21 +195,22 @@ public boolean stopAfterEndTag(String namespace, String localName) {
/**
* Parses an XML element using the given XML pull parser into the given destination object.
*
- *
- * Requires the the current event be {@link XmlPullParser#START_TAG} (skipping any initial
+ *
Requires the the current event be {@link XmlPullParser#START_TAG} (skipping any initial
* {@link XmlPullParser#START_DOCUMENT}) of the element being parsed. At normal parsing
* completion, the current event will either be {@link XmlPullParser#END_TAG} of the element being
* parsed, or the {@link XmlPullParser#START_TAG} of the requested {@code atom:entry}.
- *
*
* @param parser XML pull parser
* @param destination optional destination object to parser into or {@code null} to ignore XML
- * content
+ * content
* @param namespaceDictionary XML namespace dictionary to store unknown namespaces
* @param customizeParser optional parser customizer or {@code null} for none
*/
- public static void parseElement(XmlPullParser parser, Object destination,
- XmlNamespaceDictionary namespaceDictionary, CustomizeParser customizeParser)
+ public static void parseElement(
+ XmlPullParser parser,
+ Object destination,
+ XmlNamespaceDictionary namespaceDictionary,
+ CustomizeParser customizeParser)
throws IOException, XmlPullParserException {
ArrayList context = new ArrayList();
if (destination != null) {
@@ -223,15 +221,17 @@ public static void parseElement(XmlPullParser parser, Object destination,
/**
* Returns whether the customize parser has requested to stop or reached end of document.
- * Otherwise, identical to
- * {@link #parseElement(XmlPullParser, Object, XmlNamespaceDictionary, CustomizeParser)} .
+ * Otherwise, identical to {@link #parseElement(XmlPullParser, Object, XmlNamespaceDictionary,
+ * CustomizeParser)} .
*/
- private static boolean parseElementInternal(XmlPullParser parser,
+ private static boolean parseElementInternal(
+ XmlPullParser parser,
ArrayList context,
Object destination,
Type valueType,
XmlNamespaceDictionary namespaceDictionary,
- CustomizeParser customizeParser) throws IOException, XmlPullParserException {
+ CustomizeParser customizeParser)
+ throws IOException, XmlPullParserException {
// TODO(yanivi): method is too long; needs to be broken down into smaller methods and comment
// better
GenericXml genericXml = destination instanceof GenericXml ? (GenericXml) destination : null;
@@ -261,11 +261,14 @@ private static boolean parseElementInternal(XmlPullParser parser,
// TODO(yanivi): can have repeating attribute values, e.g. "@a=value1 @a=value2"?
String attributeName = parser.getAttributeName(i);
String attributeNamespace = parser.getAttributeNamespace(i);
- String attributeAlias = attributeNamespace.length() == 0
- ? "" : namespaceDictionary.getNamespaceAliasForUriErrorOnUnknown(attributeNamespace);
+ String attributeAlias =
+ attributeNamespace.length() == 0
+ ? ""
+ : namespaceDictionary.getNamespaceAliasForUriErrorOnUnknown(attributeNamespace);
String fieldName = getFieldName(true, attributeAlias, attributeNamespace, attributeName);
Field field = classInfo == null ? null : classInfo.getField(fieldName);
- parseAttributeOrTextContent(parser.getAttributeValue(i),
+ parseAttributeOrTextContent(
+ parser.getAttributeValue(i),
field,
valueType,
context,
@@ -279,21 +282,24 @@ private static boolean parseElementInternal(XmlPullParser parser,
ArrayValueMap arrayValueMap = new ArrayValueMap(destination);
boolean isStopped = false;
// TODO(yanivi): support Void type as "ignore" element/attribute
- main: while (true) {
+ main:
+ while (true) {
int event = parser.next();
switch (event) {
case XmlPullParser.END_DOCUMENT:
isStopped = true;
break main;
case XmlPullParser.END_TAG:
- isStopped = customizeParser != null
- && customizeParser.stopAfterEndTag(parser.getNamespace(), parser.getName());
+ isStopped =
+ customizeParser != null
+ && customizeParser.stopAfterEndTag(parser.getNamespace(), parser.getName());
break main;
case XmlPullParser.TEXT:
// parse text content
if (destination != null) {
field = classInfo == null ? null : classInfo.getField(TEXT_CONTENT);
- parseAttributeOrTextContent(parser.getText(),
+ parseAttributeOrTextContent(
+ parser.getText(),
field,
valueType,
context,
@@ -350,7 +356,8 @@ private static boolean parseElementInternal(XmlPullParser parser,
break;
case XmlPullParser.TEXT:
if (!ignore && level == 1) {
- parseAttributeOrTextContent(parser.getText(),
+ parseAttributeOrTextContent(
+ parser.getText(),
field,
valueType,
context,
@@ -364,23 +371,27 @@ private static boolean parseElementInternal(XmlPullParser parser,
break;
}
}
- } else if (fieldType == null || fieldClass != null
- && Types.isAssignableToOrFrom(fieldClass, Map.class)) {
+ } else if (fieldType == null
+ || fieldClass != null && Types.isAssignableToOrFrom(fieldClass, Map.class)) {
// store the element as a map
Map mapValue = Data.newMapInstance(fieldClass);
int contextSize = context.size();
if (fieldType != null) {
context.add(fieldType);
}
- Type subValueType = fieldType != null && Map.class.isAssignableFrom(fieldClass)
- ? Types.getMapValueParameter(fieldType) : null;
+ Type subValueType =
+ fieldType != null && Map.class.isAssignableFrom(fieldClass)
+ ? Types.getMapValueParameter(fieldType)
+ : null;
subValueType = Data.resolveWildcardTypeOrTypeVariable(context, subValueType);
- isStopped = parseElementInternal(parser,
- context,
- mapValue,
- subValueType,
- namespaceDictionary,
- customizeParser);
+ isStopped =
+ parseElementInternal(
+ parser,
+ context,
+ mapValue,
+ subValueType,
+ namespaceDictionary,
+ customizeParser);
if (fieldType != null) {
context.remove(contextSize);
}
@@ -424,8 +435,10 @@ private static boolean parseElementInternal(XmlPullParser parser,
// TODO(yanivi): some duplicate code here; isolate into reusable methods
FieldInfo fieldInfo = FieldInfo.of(field);
Object elementValue = null;
- Type subFieldType = isArray
- ? Types.getArrayComponentType(fieldType) : Types.getIterableParameter(fieldType);
+ Type subFieldType =
+ isArray
+ ? Types.getArrayComponentType(fieldType)
+ : Types.getIterableParameter(fieldType);
Class rawArrayComponentType =
Types.getRawArrayComponentType(context, subFieldType);
subFieldType = Data.resolveWildcardTypeOrTypeVariable(context, subFieldType);
@@ -437,23 +450,27 @@ private static boolean parseElementInternal(XmlPullParser parser,
boolean isSubEnum = subFieldClass != null && subFieldClass.isEnum();
if (Data.isPrimitive(subFieldType) || isSubEnum) {
elementValue = parseTextContentForElement(parser, context, false, subFieldType);
- } else if (subFieldType == null || subFieldClass != null
- && Types.isAssignableToOrFrom(subFieldClass, Map.class)) {
+ } else if (subFieldType == null
+ || subFieldClass != null
+ && Types.isAssignableToOrFrom(subFieldClass, Map.class)) {
elementValue = Data.newMapInstance(subFieldClass);
int contextSize = context.size();
if (subFieldType != null) {
context.add(subFieldType);
}
- Type subValueType = subFieldType != null
- && Map.class.isAssignableFrom(subFieldClass) ? Types.getMapValueParameter(
- subFieldType) : null;
+ Type subValueType =
+ subFieldType != null && Map.class.isAssignableFrom(subFieldClass)
+ ? Types.getMapValueParameter(subFieldType)
+ : null;
subValueType = Data.resolveWildcardTypeOrTypeVariable(context, subValueType);
- isStopped = parseElementInternal(parser,
- context,
- elementValue,
- subValueType,
- namespaceDictionary,
- customizeParser);
+ isStopped =
+ parseElementInternal(
+ parser,
+ context,
+ elementValue,
+ subValueType,
+ namespaceDictionary,
+ customizeParser);
if (subFieldType != null) {
context.remove(contextSize);
}
@@ -461,12 +478,9 @@ private static boolean parseElementInternal(XmlPullParser parser,
elementValue = Types.newInstance(rawArrayComponentType);
int contextSize = context.size();
context.add(fieldType);
- isStopped = parseElementInternal(parser,
- context,
- elementValue,
- null,
- namespaceDictionary,
- customizeParser);
+ isStopped =
+ parseElementInternal(
+ parser, context, elementValue, null, namespaceDictionary, customizeParser);
context.remove(contextSize);
}
if (isArray) {
@@ -479,16 +493,15 @@ private static boolean parseElementInternal(XmlPullParser parser,
} else {
// collection: add new element to collection
@SuppressWarnings("unchecked")
- Collection collectionValue = (Collection) (field == null
- ? destinationMap.get(fieldName) : fieldInfo.getValue(destination));
+ Collection collectionValue =
+ (Collection)
+ (field == null
+ ? destinationMap.get(fieldName)
+ : fieldInfo.getValue(destination));
if (collectionValue == null) {
collectionValue = Data.newCollectionInstance(fieldType);
- setValue(collectionValue,
- field,
- destination,
- genericXml,
- destinationMap,
- fieldName);
+ setValue(
+ collectionValue, field, destination, genericXml, destinationMap, fieldName);
}
collectionValue.add(elementValue);
}
@@ -497,12 +510,9 @@ private static boolean parseElementInternal(XmlPullParser parser,
Object value = Types.newInstance(fieldClass);
int contextSize = context.size();
context.add(fieldType);
- isStopped = parseElementInternal(parser,
- context,
- value,
- null,
- namespaceDictionary,
- customizeParser);
+ isStopped =
+ parseElementInternal(
+ parser, context, value, null, namespaceDictionary, customizeParser);
context.remove(contextSize);
setValue(value, field, destination, genericXml, destinationMap, fieldName);
}
@@ -592,8 +602,10 @@ private static void parseNamespacesForElement(
XmlPullParser parser, XmlNamespaceDictionary namespaceDictionary)
throws XmlPullParserException {
int eventType = parser.getEventType();
- Preconditions.checkState(eventType == XmlPullParser.START_TAG,
- "expected start of XML element, but got something else (event type %s)", eventType);
+ Preconditions.checkState(
+ eventType == XmlPullParser.START_TAG,
+ "expected start of XML element, but got something else (event type %s)",
+ eventType);
int depth = parser.getDepth();
int nsStart = parser.getNamespaceCount(depth - 1);
int nsEnd = parser.getNamespaceCount(depth);
@@ -615,6 +627,5 @@ private static void parseNamespacesForElement(
}
}
- private Xml() {
- }
+ private Xml() {}
}
diff --git a/google-http-client-xml/src/main/java/com/google/api/client/xml/XmlNamespaceDictionary.java b/google-http-client-xml/src/main/java/com/google/api/client/xml/XmlNamespaceDictionary.java
index ae32fe5e4..c500e2f83 100644
--- a/google-http-client-xml/src/main/java/com/google/api/client/xml/XmlNamespaceDictionary.java
+++ b/google-http-client-xml/src/main/java/com/google/api/client/xml/XmlNamespaceDictionary.java
@@ -32,31 +32,26 @@
import org.xmlpull.v1.XmlSerializer;
/**
- * {@link Beta}
- * Implementation is thread-safe. For maximum efficiency, applications should use a single
+ *
Implementation is thread-safe. For maximum efficiency, applications should use a single
* globally-shared instance of the XML namespace dictionary.
- *
*
- *
- * A namespace alias is uniquely mapped to a single namespace URI, and a namespace URI is uniquely
- * mapped to a single namespace alias. In other words, it is not possible to have duplicates.
- *
+ * A namespace alias is uniquely mapped to a single namespace URI, and a namespace URI is
+ * uniquely mapped to a single namespace alias. In other words, it is not possible to have
+ * duplicates.
*
- *
- * Sample usage:
- *
+ * Sample usage:
*
*
{@code
- static final XmlNamespaceDictionary DICTIONARY = new XmlNamespaceDictionary()
- .set("", "http://www.w3.org/2005/Atom")
- .set("activity", "http://activitystrea.ms/spec/1.0/")
- .set("georss", "http://www.georss.org/georss")
- .set("media", "http://search.yahoo.com/mrss/")
- .set("thr", "http://purl.org/syndication/thread/1.0");
- *}
+ * static final XmlNamespaceDictionary DICTIONARY = new XmlNamespaceDictionary()
+ * .set("", "http://www.w3.org/2005/Atom")
+ * .set("activity", "http://activitystrea.ms/spec/1.0/")
+ * .set("georss", "http://www.georss.org/georss")
+ * .set("media", "http://search.yahoo.com/mrss/")
+ * .set("thr", "http://purl.org/syndication/thread/1.0");
+ * }
*
* @since 1.0
* @author Yaniv Inbar
@@ -119,12 +114,10 @@ public synchronized Map getUriToAliasMap() {
/**
* Adds a namespace of the given alias and URI.
*
- *
- * If the uri is {@code null}, the namespace alias will be removed. Similarly, if the alias is
+ *
If the uri is {@code null}, the namespace alias will be removed. Similarly, if the alias is
* {@code null}, the namespace URI will be removed. Otherwise, if the alias is already mapped to a
* different URI, it will be remapped to the new URI. Similarly, if a URI is already mapped to a
* different alias, it will be remapped to the new alias.
- *
*
* @param alias alias or {@code null} to remove the namespace URI
* @param uri namespace URI or {@code null} to remove the namespace alias
@@ -141,8 +134,9 @@ public synchronized XmlNamespaceDictionary set(String alias, String uri) {
} else if (alias == null) {
previousAlias = namespaceUriToAliasMap.remove(uri);
} else {
- previousUri = namespaceAliasToUriMap.put(
- Preconditions.checkNotNull(alias), Preconditions.checkNotNull(uri));
+ previousUri =
+ namespaceAliasToUriMap.put(
+ Preconditions.checkNotNull(alias), Preconditions.checkNotNull(uri));
if (!uri.equals(previousUri)) {
previousAlias = namespaceUriToAliasMap.put(uri, alias);
} else {
@@ -162,9 +156,9 @@ public synchronized XmlNamespaceDictionary set(String alias, String uri) {
* Shows a debug string representation of an element data object of key/value pairs.
*
* @param element element data object ({@link GenericXml}, {@link Map}, or any object with public
- * fields)
+ * fields)
* @param elementName optional XML element local name prefixed by its namespace alias -- for
- * example {@code "atom:entry"} -- or {@code null} to make up something
+ * example {@code "atom:entry"} -- or {@code null} to make up something
*/
public String toStringOf(String elementName, Object element) {
try {
@@ -182,7 +176,7 @@ public String toStringOf(String elementName, Object element) {
* Shows a debug string representation of an element data object of key/value pairs.
*
* @param element element data object ({@link GenericXml}, {@link Map}, or any object with public
- * fields)
+ * fields)
* @param elementNamespaceUri XML namespace URI or {@code null} for no namespace
* @param elementLocalName XML local name
* @throws IOException I/O exception
@@ -197,7 +191,7 @@ public void serialize(
* Shows a debug string representation of an element data object of key/value pairs.
*
* @param element element data object ({@link GenericXml}, {@link Map}, or any object with public
- * fields)
+ * fields)
* @param elementName XML element local name prefixed by its namespace alias
* @throws IOException I/O exception
*/
@@ -206,11 +200,16 @@ public void serialize(XmlSerializer serializer, String elementName, Object eleme
serialize(serializer, elementName, element, true);
}
- private void serialize(XmlSerializer serializer, String elementNamespaceUri,
- String elementLocalName, Object element, boolean errorOnUnknown) throws IOException {
+ private void serialize(
+ XmlSerializer serializer,
+ String elementNamespaceUri,
+ String elementLocalName,
+ Object element,
+ boolean errorOnUnknown)
+ throws IOException {
String elementAlias = elementNamespaceUri == null ? null : getAliasForUri(elementNamespaceUri);
- startDoc(serializer, element, errorOnUnknown, elementAlias).serialize(
- serializer, elementNamespaceUri, elementLocalName);
+ startDoc(serializer, element, errorOnUnknown, elementAlias)
+ .serialize(serializer, elementNamespaceUri, elementLocalName);
serializer.endDocument();
}
@@ -257,7 +256,7 @@ private void computeAliases(Object element, SortedSet aliases) {
aliases.add(alias);
}
Class valueClass = value.getClass();
- if (!isAttribute && !Data.isPrimitive(valueClass) && !valueClass.isEnum() ) {
+ if (!isAttribute && !Data.isPrimitive(valueClass) && !valueClass.isEnum()) {
if (value instanceof Iterable || valueClass.isArray()) {
for (Object subValue : Types.iterableOf(value)) {
computeAliases(subValue, aliases);
@@ -275,18 +274,16 @@ private void computeAliases(Object element, SortedSet aliases) {
* Returns the namespace URI to use for serialization for a given namespace alias, possibly using
* a predictable made-up namespace URI if the alias is not recognized.
*
- *
- * Specifically, if the namespace alias is not recognized, the namespace URI returned will be
+ *
Specifically, if the namespace alias is not recognized, the namespace URI returned will be
* {@code "http://unknown/"} plus the alias, unless {@code errorOnUnknown} is {@code true} in
* which case it will throw an {@link IllegalArgumentException}.
- *
*
* @param errorOnUnknown whether to thrown an exception if the namespace alias is not recognized
* @param alias namespace alias
* @return namespace URI, using a predictable made-up namespace URI if the namespace alias is not
- * recognized
+ * recognized
* @throws IllegalArgumentException if the namespace alias is not recognized and {@code
- * errorOnUnkown} is {@code true}
+ * errorOnUnkown} is {@code true}
*/
String getNamespaceUriForAliasHandlingUnknown(boolean errorOnUnknown, String alias) {
String result = getUriForAlias(alias);
@@ -307,10 +304,12 @@ String getNamespaceUriForAliasHandlingUnknown(boolean errorOnUnknown, String ali
*/
String getNamespaceAliasForUriErrorOnUnknown(String namespaceUri) {
String result = getAliasForUri(namespaceUri);
- Preconditions.checkArgument(result != null,
+ Preconditions.checkArgument(
+ result != null,
"invalid XML: no alias declared for namesapce <%s>; "
+ "work-around by setting XML namepace directly by calling the set method of %s",
- namespaceUri, XmlNamespaceDictionary.class.getName());
+ namespaceUri,
+ XmlNamespaceDictionary.class.getName());
return result;
}
@@ -328,8 +327,8 @@ class ElementSerializer {
Class valueClass = elementValue.getClass();
if (Data.isPrimitive(valueClass) && !Data.isNull(elementValue)) {
textValue = elementValue;
- } else if (valueClass.isEnum() && !Data.isNull(elementValue)){
- textValue = elementValue;
+ } else if (valueClass.isEnum() && !Data.isNull(elementValue)) {
+ textValue = elementValue;
} else {
for (Map.Entry entry : Data.mapOf(elementValue).entrySet()) {
Object fieldValue = entry.getValue();
@@ -377,8 +376,11 @@ void serialize(XmlSerializer serializer, String elementNamespaceUri, String elem
String attributeName = attributeNames.get(i);
int colon = attributeName.indexOf(':');
String attributeLocalName = attributeName.substring(colon + 1);
- String attributeNamespaceUri = colon == -1 ? null : getNamespaceUriForAliasHandlingUnknown(
- errorOnUnknown, attributeName.substring(0, colon));
+ String attributeNamespaceUri =
+ colon == -1
+ ? null
+ : getNamespaceUriForAliasHandlingUnknown(
+ errorOnUnknown, attributeName.substring(0, colon));
serializer.attribute(
attributeNamespaceUri, attributeLocalName, toSerializedValue(attributeValues.get(i)));
}
@@ -395,13 +397,13 @@ void serialize(XmlSerializer serializer, String elementNamespaceUri, String elem
if (subElementValue instanceof Iterable || valueClass.isArray()) {
for (Object subElement : Types.iterableOf(subElementValue)) {
if (subElement != null && !Data.isNull(subElement)) {
- new ElementSerializer(subElement, errorOnUnknown).serialize(
- serializer, subElementName);
+ new ElementSerializer(subElement, errorOnUnknown)
+ .serialize(serializer, subElementName);
}
}
} else {
- new ElementSerializer(subElementValue, errorOnUnknown).serialize(
- serializer, subElementName);
+ new ElementSerializer(subElementValue, errorOnUnknown)
+ .serialize(serializer, subElementName);
}
}
serializer.endTag(elementNamespaceUri, elementLocalName);
diff --git a/google-http-client-xml/src/main/java/com/google/api/client/xml/XmlObjectParser.java b/google-http-client-xml/src/main/java/com/google/api/client/xml/XmlObjectParser.java
index 2c0a173b5..b29717922 100644
--- a/google-http-client-xml/src/main/java/com/google/api/client/xml/XmlObjectParser.java
+++ b/google-http-client-xml/src/main/java/com/google/api/client/xml/XmlObjectParser.java
@@ -27,21 +27,17 @@
import org.xmlpull.v1.XmlPullParserException;
/**
- * {@link Beta}
- * Implementation is thread-safe.
- *
+ * Implementation is thread-safe.
*
- *
- * Sample usage:
- *
+ * Sample usage:
*
*
- static void setParser(HttpRequest request, XmlNamespaceDictionary namespaceDictionary) {
- request.setParser(new XmlObjectParser(namespaceDictionary));
- }
+ * static void setParser(HttpRequest request, XmlNamespaceDictionary namespaceDictionary) {
+ * request.setParser(new XmlObjectParser(namespaceDictionary));
+ * }
*
*
* @since 1.10
@@ -61,9 +57,7 @@ public XmlObjectParser(XmlNamespaceDictionary namespaceDictionary) {
this.namespaceDictionary = Preconditions.checkNotNull(namespaceDictionary);
}
- /**
- * Returns the XML namespace dictionary.
- */
+ /** Returns the XML namespace dictionary. */
public final XmlNamespaceDictionary getNamespaceDictionary() {
return namespaceDictionary;
}
@@ -82,8 +76,7 @@ public T parseAndClose(InputStream in, Charset charset, Class dataClass)
return (T) parseAndClose(in, charset, (Type) dataClass);
}
- public Object parseAndClose(InputStream in, Charset charset, Type dataType)
- throws IOException {
+ public Object parseAndClose(InputStream in, Charset charset, Type dataType) throws IOException {
try {
// Initialize the parser
XmlPullParser parser = Xml.createParser();
diff --git a/google-http-client-xml/src/main/java/com/google/api/client/xml/atom/AbstractAtomFeedParser.java b/google-http-client-xml/src/main/java/com/google/api/client/xml/atom/AbstractAtomFeedParser.java
index c68453f57..041f04860 100644
--- a/google-http-client-xml/src/main/java/com/google/api/client/xml/atom/AbstractAtomFeedParser.java
+++ b/google-http-client-xml/src/main/java/com/google/api/client/xml/atom/AbstractAtomFeedParser.java
@@ -25,12 +25,10 @@
import org.xmlpull.v1.XmlPullParserException;
/**
- * {@link Beta}
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @param feed type
* @since 1.0
@@ -61,8 +59,11 @@ public abstract class AbstractAtomFeedParser {
* @param feedClass feed class to parse
* @since 1.5
*/
- protected AbstractAtomFeedParser(XmlNamespaceDictionary namespaceDictionary, XmlPullParser parser,
- InputStream inputStream, Class feedClass) {
+ protected AbstractAtomFeedParser(
+ XmlNamespaceDictionary namespaceDictionary,
+ XmlPullParser parser,
+ InputStream inputStream,
+ Class feedClass) {
this.namespaceDictionary = Preconditions.checkNotNull(namespaceDictionary);
this.parser = Preconditions.checkNotNull(parser);
this.inputStream = Preconditions.checkNotNull(inputStream);
diff --git a/google-http-client-xml/src/main/java/com/google/api/client/xml/atom/Atom.java b/google-http-client-xml/src/main/java/com/google/api/client/xml/atom/Atom.java
index fe5575c84..85b39b0a9 100644
--- a/google-http-client-xml/src/main/java/com/google/api/client/xml/atom/Atom.java
+++ b/google-http-client-xml/src/main/java/com/google/api/client/xml/atom/Atom.java
@@ -22,11 +22,10 @@
import com.google.api.client.util.Preconditions;
import com.google.api.client.util.escape.PercentEscaper;
import com.google.api.client.xml.Xml;
-
import java.util.Arrays;
/**
- * {@link Beta}
- * Use {@link HttpMediaType#equalsIgnoreParameters} for comparing media types.
- *
+ * Use {@link HttpMediaType#equalsIgnoreParameters} for comparing media types.
*
* @since 1.10
*/
@@ -64,8 +61,7 @@ public boolean stopBeforeStartTag(String namespace, String localName) {
}
}
- private Atom() {
- }
+ private Atom() {}
/**
* Checks the given content type matches the Atom content type specified in {@link #MEDIA_TYPE}.
@@ -74,8 +70,10 @@ private Atom() {
*/
public static void checkContentType(String contentType) {
Preconditions.checkArgument(contentType != null); // for backwards compatibility
- Preconditions.checkArgument(HttpMediaType.equalsIgnoreParameters(MEDIA_TYPE, contentType),
- "Wrong content type: expected <" + MEDIA_TYPE + "> but got <%s>", contentType);
+ Preconditions.checkArgument(
+ HttpMediaType.equalsIgnoreParameters(MEDIA_TYPE, contentType),
+ "Wrong content type: expected <" + MEDIA_TYPE + "> but got <%s>",
+ contentType);
}
/**
diff --git a/google-http-client-xml/src/main/java/com/google/api/client/xml/atom/package-info.java b/google-http-client-xml/src/main/java/com/google/api/client/xml/atom/package-info.java
index e210800fa..afb992a0b 100644
--- a/google-http-client-xml/src/main/java/com/google/api/client/xml/atom/package-info.java
+++ b/google-http-client-xml/src/main/java/com/google/api/client/xml/atom/package-info.java
@@ -13,7 +13,7 @@
*/
/**
- * {@link com.google.api.client.util.Beta} Example Feed 2003-12-13T18:31:02Z "
+ + "John Doe urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6"
+ + " Atom-Powered Robots Run Amok urn:uuid:1225c695-cfb8-4ebb-aaaa"
+ + "-80da344efa6a 2003-12-13T18:30:02Z Some text"
+ + ". Atom-Powered Robots Run Amok! urn:uuid:1225c695-cfb8-4ebb"
+ + "-aaaa-80da344efa62 2003-12-13T18:32:02Z Some "
+ + "other text. ";
- private static final String SAMPLE_FEED = " Example Feed 2003-12-13T18:31:02Z " +
- "John Doe urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6" +
- " Atom-Powered Robots Run Amok urn:uuid:1225c695-cfb8-4ebb-aaaa" +
- "-80da344efa6a 2003-12-13T18:30:02Z Some text" +
- ". Atom-Powered Robots Run Amok! urn:uuid:1225c695-cfb8-4ebb" +
- "-aaaa-80da344efa62 2003-12-13T18:32:02Z Some " +
- "other text. ";
-
- /**
- * Test for checking the Slug Header
- */
+ /** Test for checking the Slug Header */
@Test
public void testSetSlugHeader() {
HttpHeaders headers = new HttpHeaders();
assertNull(headers.get("Slug"));
subtestSetSlugHeader(headers, "value", "value");
- subtestSetSlugHeader(headers, " !\"#$&'()*+,-./:;<=>?@[\\]^_`{|}~", " !\"#$&'()*+,-./:;" +
- "<=>?@[\\]^_`{|}~");
+ subtestSetSlugHeader(
+ headers, " !\"#$&'()*+,-./:;<=>?@[\\]^_`{|}~", " !\"#$&'()*+,-./:;" + "<=>?@[\\]^_`{|}~");
subtestSetSlugHeader(headers, "%D7%99%D7%A0%D7%99%D7%91", "×™× ×™×‘");
subtestSetSlugHeader(headers, null, null);
}
@@ -74,8 +73,8 @@ public void subtestSetSlugHeader(HttpHeaders headers, String expectedValue, Stri
if (value == null) {
assertNull(headers.get("Slug"));
} else {
- Assert.assertArrayEquals(new String[]{expectedValue},
- ((List) headers.get("Slug")).toArray());
+ Assert.assertArrayEquals(
+ new String[] {expectedValue}, ((List) headers.get("Slug")).toArray());
}
}
@@ -83,7 +82,7 @@ public void subtestSetSlugHeader(HttpHeaders headers, String expectedValue, Stri
* This tests parses a simple Atom Feed given as a constant. All elements are asserted, to see if
* everything works fine. For parsing a dedicated {@link AtomFeedParser} is used.
*
- * The purpose of this test is to test the {@link AtomFeedParser#parseFeed} and {@link
+ * The purpose of this test is to test the {@link AtomFeedParser#parseFeed} and {@link
* AtomFeedParser#parseNextEntry} and see if the mapping of the XML element to the entity classes
* is done correctly.
*/
@@ -94,8 +93,9 @@ public void testAtomFeedUsingCustomizedParser() throws Exception {
parser.setInput(new StringReader(SAMPLE_FEED));
InputStream stream = new ByteArrayInputStream(SAMPLE_FEED.getBytes());
XmlNamespaceDictionary namespaceDictionary = new XmlNamespaceDictionary();
- AbstractAtomFeedParser atomParser = new AtomFeedParser(namespaceDictionary,
- parser, stream, Feed.class, FeedEntry.class);
+ AbstractAtomFeedParser atomParser =
+ new AtomFeedParser(
+ namespaceDictionary, parser, stream, Feed.class, FeedEntry.class);
Feed feed = (Feed) atomParser.parseFeed();
assertEquals("John Doe", feed.author.name);
@@ -105,7 +105,7 @@ public void testAtomFeedUsingCustomizedParser() throws Exception {
assertEquals("http://example.org/", feed.link.href);
FeedEntry entry1 = (FeedEntry) atomParser.parseNextEntry();
- //assertNotNull(feed.entry);
+ // assertNotNull(feed.entry);
assertEquals("urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a", entry1.id);
assertEquals("2003-12-13T18:30:02Z", entry1.updated);
assertEquals("Some text.", entry1.summary);
@@ -126,10 +126,10 @@ public void testAtomFeedUsingCustomizedParser() throws Exception {
}
/**
- * Tests of a constant string to see if the data structure can be parsed using the standard
- * method {@link Xml#parseElement}
+ * Tests of a constant string to see if the data structure can be parsed using the standard method
+ * {@link Xml#parseElement}
*
- * The purpose of this test is to assert, if the parsed elements are correctly parsed using a
+ * The purpose of this test is to assert, if the parsed elements are correctly parsed using a
* {@link AtomFeedParser}.
*/
@Test
@@ -149,7 +149,7 @@ public void testAtomFeedUsingStandardParser() throws Exception {
assertEquals("http://example.org/", feed.link.href);
FeedEntry entry1 = feed.entry[0];
- //assertNotNull(feed.entry);
+ // assertNotNull(feed.entry);
assertEquals("urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a", entry1.id);
assertEquals("2003-12-13T18:30:02Z", entry1.updated);
assertEquals("Some text.", entry1.summary);
@@ -168,7 +168,7 @@ public void testAtomFeedUsingStandardParser() throws Exception {
* Read an XML ATOM Feed from a file to a string and assert if all the {@link FeedEntry}s are
* present. No detailed assertion of each element
*
- * The purpose of this test is to read a bunch of elements which contain additional elements
+ *
The purpose of this test is to read a bunch of elements which contain additional elements
* (HTML in this case), that are not part of the {@link FeedEntry} and to see if there is an issue
* if we parse some more entries.
*/
@@ -179,8 +179,13 @@ public void testSampleFeedParser() throws Exception {
String read = Resources.toString(url, Charsets.UTF_8);
parser.setInput(new StringReader(read));
XmlNamespaceDictionary namespaceDictionary = new XmlNamespaceDictionary();
- AbstractAtomFeedParser atomParser = new AtomFeedParser(namespaceDictionary,
- parser, new ByteArrayInputStream(read.getBytes()), Feed.class, FeedEntry.class);
+ AbstractAtomFeedParser atomParser =
+ new AtomFeedParser(
+ namespaceDictionary,
+ parser,
+ new ByteArrayInputStream(read.getBytes()),
+ Feed.class,
+ FeedEntry.class);
Feed feed = (Feed) atomParser.parseFeed();
assertNotNull(feed);
@@ -204,9 +209,11 @@ public void testSampleFeedParser() throws Exception {
assertNotNull(entry.link);
assertNotNull(entry.updated);
assertNotNull(entry.content);
- assertEquals("aäb cde fgh ijk lmn oöpoöp tuü vwx yz AÄBC DEF GHI JKL MNO ÖPQ RST UÜV WXYZ " +
- "!\"§ $%& /() =?* '<> #|; ²³~ @`´ ©«» ¼× {} aäb cde fgh ijk lmn oöp qrsß tuü vwx yz " +
- "AÄBC DEF GHI JKL MNO", entry.content);
+ assertEquals(
+ "aäb cde fgh ijk lmn oöpoöp tuü vwx yz AÄBC DEF GHI JKL MNO ÖPQ RST UÜV WXYZ "
+ + "!\"§ $%& /() =?* '<> #|; ²³~ @`´ ©«» ¼× {} aäb cde fgh ijk lmn oöp qrsß tuü vwx yz "
+ + "AÄBC DEF GHI JKL MNO",
+ entry.content);
// validate feed 3 -- Missing Content
entry = (FeedEntry) atomParser.parseNextEntry();
@@ -245,22 +252,14 @@ public void testSampleFeedParser() throws Exception {
atomParser.close();
}
- /**
- * Feed Element to map the XML to
- */
+ /** Feed Element to map the XML to */
public static class Feed {
- @Key
- private String title;
- @Key
- private Link link;
- @Key
- private String updated;
- @Key
- private Author author;
- @Key
- private String id;
- @Key
- private FeedEntry[] entry;
+ @Key private String title;
+ @Key private Link link;
+ @Key private String updated;
+ @Key private Author author;
+ @Key private String id;
+ @Key private FeedEntry[] entry;
}
/**
@@ -268,8 +267,7 @@ public static class Feed {
* this needs to be public.
*/
public static class Author {
- @Key
- private String name;
+ @Key private String name;
}
/**
@@ -282,22 +280,15 @@ public static class Link {
}
/**
- * Entry Element to cover the Entries of a Atom {@link Feed}. As this is sub-element,
- * this needs to be public.
+ * Entry Element to cover the Entries of a Atom {@link Feed}. As this is sub-element, this needs
+ * to be public.
*/
public static class FeedEntry {
- @Key
- private String title;
- @Key
- private Link link;
- @Key
- private String updated;
- @Key
- private String summary;
- @Key
- private String id;
- @Key
- private String content;
+ @Key private String title;
+ @Key private Link link;
+ @Key private String updated;
+ @Key private String summary;
+ @Key private String id;
+ @Key private String content;
}
}
-
diff --git a/google-http-client-xml/src/test/java/com/google/api/client/xml/GenericXmlListTest.java b/google-http-client-xml/src/test/java/com/google/api/client/xml/GenericXmlListTest.java
index 6d2ec0769..0172fccb7 100644
--- a/google-http-client-xml/src/test/java/com/google/api/client/xml/GenericXmlListTest.java
+++ b/google-http-client-xml/src/test/java/com/google/api/client/xml/GenericXmlListTest.java
@@ -16,7 +16,9 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+
+import com.google.api.client.util.ArrayMap;
+import com.google.api.client.util.Key;
import java.io.ByteArrayOutputStream;
import java.io.StringReader;
import java.util.ArrayList;
@@ -24,42 +26,41 @@
import org.junit.Test;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlSerializer;
-import com.google.api.client.util.ArrayMap;
-import com.google.api.client.util.Key;
/**
* Tests List and Arrays of {@link GenericXml}.
*
- * Tests are copies from {@link XmlListTest}, but the dedicated classes are derived from {@link
+ * Tests are copies from {@link XmlListTest}, but the dedicated classes are derived from {@link
* GenericXml}
*
- *
* @author Gerald Madlmayr
*/
-
public class GenericXmlListTest {
-
- private static final String MULTI_TYPE_WITH_CLASS_TYPE = "content1 rep10 " +
- "rep11 value1 content2 rep20 rep21"
- + " value2 content3 rep30 rep31" +
- " value3 rep1 rep2 1 2 1something 2 ENUM_1 ENUM_2 a b c d content1 rep10 "
+ + "rep11 value1 content2 rep20 rep21"
+ + " value2 content3 rep30 rep31"
+ + " value3 rep1 rep2 1 2 1something 2 ENUM_1 ENUM_2 a b c d > elem0 = (ArrayList>) rep[0].elem;
assertEquals(1, elem0.size());
- assertEquals("content1", elem0.get(0)
- .get("text()"));
+ assertEquals("content1", elem0.get(0).get("text()"));
ArrayList> elem1 = (ArrayList>) rep[1].elem;
assertEquals(1, elem1.size());
- assertEquals("content2", elem1.get(0)
- .get("text()"));
+ assertEquals("content2", elem1.get(0).get("text()"));
ArrayList> elem2 = (ArrayList>) rep[2].elem;
assertEquals(1, elem2.size());
- assertEquals("content3", elem2.get(0)
- .get("text()"));
+ assertEquals("content3", elem2.get(0).get("text()"));
// serialize
XmlSerializer serializer = Xml.createSerializer();
@@ -118,9 +116,7 @@ public void testParseCollectionWithClassType() throws Exception {
assertEquals(MULTI_TYPE_WITH_CLASS_TYPE, out.toString());
}
- /**
- * The purpose of this test is to map an XML with an Array of {@link XmlTest.AnyType} objects.
- */
+ /** The purpose of this test is to map an XML with an Array of {@link XmlTest.AnyType} objects. */
@SuppressWarnings("unchecked")
@Test
public void testParseMultiGenericWithClassType() throws Exception {
@@ -133,18 +129,30 @@ public void testParseMultiGenericWithClassType() throws Exception {
GenericXml[] rep = xml.rep;
assertNotNull(rep);
assertEquals(3, rep.length);
- assertEquals("text()", ((ArrayMap) (rep[0].values()
- .toArray(new ArrayList[]{})[0].get(0))).getKey(0));
- assertEquals("content1", ((ArrayMap) (rep[0].values()
- .toArray(new ArrayList[]{})[0].get(0))).getValue(0));
- assertEquals("text()", ((ArrayMap) (rep[1].values()
- .toArray(new ArrayList[]{})[0].get(0))).getKey(0));
- assertEquals("content2", ((ArrayMap) (rep[1].values()
- .toArray(new ArrayList[]{})[0].get(0))).getValue(0));
- assertEquals("text()", ((ArrayMap) (rep[2].values()
- .toArray(new ArrayList[]{})[0].get(0))).getKey(0));
- assertEquals("content3", ((ArrayMap) (rep[2].values()
- .toArray(new ArrayList[]{})[0].get(0))).getValue(0));
+ assertEquals(
+ "text()",
+ ((ArrayMap) (rep[0].values().toArray(new ArrayList[] {})[0].get(0)))
+ .getKey(0));
+ assertEquals(
+ "content1",
+ ((ArrayMap) (rep[0].values().toArray(new ArrayList[] {})[0].get(0)))
+ .getValue(0));
+ assertEquals(
+ "text()",
+ ((ArrayMap) (rep[1].values().toArray(new ArrayList[] {})[0].get(0)))
+ .getKey(0));
+ assertEquals(
+ "content2",
+ ((ArrayMap) (rep[1].values().toArray(new ArrayList[] {})[0].get(0)))
+ .getValue(0));
+ assertEquals(
+ "text()",
+ ((ArrayMap) (rep[2].values().toArray(new ArrayList[] {})[0].get(0)))
+ .getKey(0));
+ assertEquals(
+ "content3",
+ ((ArrayMap) (rep[2].values().toArray(new ArrayList[] {})[0].get(0)))
+ .getValue(0));
// serialize
XmlSerializer serializer = Xml.createSerializer();
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -153,9 +161,7 @@ public void testParseMultiGenericWithClassType() throws Exception {
assertEquals(MULTI_TYPE_WITH_CLASS_TYPE, out.toString());
}
- /**
- * The purpose of this test is to map an XML with an Array of {@link XmlTest.AnyType} objects.
- */
+ /** The purpose of this test is to map an XML with an Array of {@link XmlTest.AnyType} objects. */
@SuppressWarnings("unchecked")
@Test
public void testParseMultiGenericWithClassTypeGeneric() throws Exception {
@@ -168,18 +174,30 @@ public void testParseMultiGenericWithClassTypeGeneric() throws Exception {
GenericXml[] rep = xml.rep;
assertNotNull(rep);
assertEquals(3, rep.length);
- assertEquals("text()", ((ArrayMap) (rep[0].values()
- .toArray(new ArrayList[]{})[0].get(0))).getKey(0));
- assertEquals("content1", ((ArrayMap) (rep[0].values()
- .toArray(new ArrayList[]{})[0].get(0))).getValue(0));
- assertEquals("text()", ((ArrayMap) (rep[1].values()
- .toArray(new ArrayList[]{})[0].get(0))).getKey(0));
- assertEquals("content2", ((ArrayMap) (rep[1].values()
- .toArray(new ArrayList[]{})[0].get(0))).getValue(0));
- assertEquals("text()", ((ArrayMap) (rep[2].values()
- .toArray(new ArrayList[]{})[0].get(0))).getKey(0));
- assertEquals("content3", ((ArrayMap) (rep[2].values()
- .toArray(new ArrayList[]{})[0].get(0))).getValue(0));
+ assertEquals(
+ "text()",
+ ((ArrayMap) (rep[0].values().toArray(new ArrayList[] {})[0].get(0)))
+ .getKey(0));
+ assertEquals(
+ "content1",
+ ((ArrayMap) (rep[0].values().toArray(new ArrayList[] {})[0].get(0)))
+ .getValue(0));
+ assertEquals(
+ "text()",
+ ((ArrayMap) (rep[1].values().toArray(new ArrayList[] {})[0].get(0)))
+ .getKey(0));
+ assertEquals(
+ "content2",
+ ((ArrayMap) (rep[1].values().toArray(new ArrayList[] {})[0].get(0)))
+ .getValue(0));
+ assertEquals(
+ "text()",
+ ((ArrayMap) (rep[2].values().toArray(new ArrayList[] {})[0].get(0)))
+ .getKey(0));
+ assertEquals(
+ "content3",
+ ((ArrayMap) (rep[2].values().toArray(new ArrayList[] {})[0].get(0)))
+ .getValue(0));
// serialize
XmlSerializer serializer = Xml.createSerializer();
@@ -189,9 +207,7 @@ public void testParseMultiGenericWithClassTypeGeneric() throws Exception {
assertEquals(MULTI_TYPE_WITH_CLASS_TYPE, out.toString());
}
- /**
- * The purpose of this test is to map an XML with a {@link Collection} of {@link String}.
- */
+ /** The purpose of this test is to map an XML with a {@link Collection} of {@link String}. */
@Test
public void testParseCollectionTypeString() throws Exception {
CollectionTypeStringGeneric xml = new CollectionTypeStringGeneric();
@@ -201,8 +217,8 @@ public void testParseCollectionTypeString() throws Exception {
Xml.parseElement(parser, xml, namespaceDictionary, null);
// check type
assertEquals(2, xml.rep.size());
- assertEquals("rep1", xml.rep.toArray(new String[]{})[0]);
- assertEquals("rep2", xml.rep.toArray(new String[]{})[1]);
+ assertEquals("rep1", xml.rep.toArray(new String[] {})[0]);
+ assertEquals("rep2", xml.rep.toArray(new String[] {})[1]);
// serialize
XmlSerializer serializer = Xml.createSerializer();
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -211,9 +227,7 @@ public void testParseCollectionTypeString() throws Exception {
assertEquals(MULTIPLE_STRING_ELEMENT, out.toString());
}
- /**
- * The purpose of this test is to map an XML with an Array of {@link String} objects.
- */
+ /** The purpose of this test is to map an XML with an Array of {@link String} objects. */
@Test
public void testParseArrayTypeString() throws Exception {
ArrayTypeStringGeneric xml = new ArrayTypeStringGeneric();
@@ -245,8 +259,8 @@ public void testParseCollectionTypeInteger() throws Exception {
Xml.parseElement(parser, xml, namespaceDictionary, null);
// check type
assertEquals(2, xml.rep.size());
- assertEquals(1, xml.rep.toArray(new Integer[]{})[0].intValue());
- assertEquals(2, xml.rep.toArray(new Integer[]{})[1].intValue());
+ assertEquals(1, xml.rep.toArray(new Integer[] {})[0].intValue());
+ assertEquals(2, xml.rep.toArray(new Integer[] {})[1].intValue());
// serialize
XmlSerializer serializer = Xml.createSerializer();
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -255,9 +269,7 @@ public void testParseCollectionTypeInteger() throws Exception {
assertEquals(MULTIPLE_INTEGER_ELEMENT, out.toString());
}
- /**
- * The purpose of this test is to map an XML with an Array of {@link Integer} objects.
- */
+ /** The purpose of this test is to map an XML with an Array of {@link Integer} objects. */
@Test
public void testParseArrayTypeInteger() throws Exception {
ArrayTypeIntegerGeneric xml = new ArrayTypeIntegerGeneric();
@@ -277,9 +289,7 @@ public void testParseArrayTypeInteger() throws Exception {
assertEquals(MULTIPLE_INTEGER_ELEMENT, out.toString());
}
- /**
- * The purpose of this test is to map an XML with an Array of {@code int} types.
- */
+ /** The purpose of this test is to map an XML with an Array of {@code int} types. */
@Test
public void testParseArrayTypeInt() throws Exception {
ArrayTypeIntGeneric xml = new ArrayTypeIntGeneric();
@@ -311,8 +321,8 @@ public void testParseCollectionTypeWithEnum() throws Exception {
Xml.parseElement(parser, xml, namespaceDictionary, null);
// check type
assertEquals(2, xml.rep.size());
- assertEquals(XmlEnumTest.AnyEnum.ENUM_1, xml.rep.toArray(new XmlEnumTest.AnyEnum[]{})[0]);
- assertEquals(XmlEnumTest.AnyEnum.ENUM_2, xml.rep.toArray(new XmlEnumTest.AnyEnum[]{})[1]);
+ assertEquals(XmlEnumTest.AnyEnum.ENUM_1, xml.rep.toArray(new XmlEnumTest.AnyEnum[] {})[0]);
+ assertEquals(XmlEnumTest.AnyEnum.ENUM_2, xml.rep.toArray(new XmlEnumTest.AnyEnum[] {})[1]);
// serialize
XmlSerializer serializer = Xml.createSerializer();
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -343,9 +353,7 @@ public void testParseArrayTypeWithEnum() throws Exception {
assertEquals(MULTIPLE_ENUM_ELEMENT, out.toString());
}
- /**
- * The purpose is to have an Array of {@link java.lang.reflect.ParameterizedType} elements.
- */
+ /** The purpose is to have an Array of {@link java.lang.reflect.ParameterizedType} elements. */
@Test
public void testParseToArrayOfArrayMaps() throws Exception {
ArrayOfArrayMapsTypeGeneric xml = new ArrayOfArrayMapsTypeGeneric();
@@ -383,14 +391,14 @@ public void testParseToCollectionOfArrayMaps() throws Exception {
Xml.parseElement(parser, xml, namespaceDictionary, null);
// check type
assertEquals(2, xml.rep.size());
- assertEquals("a", xml.rep.toArray(new ArrayMap[]{})[0].getValue(0));
- assertEquals("a", xml.rep.toArray(new ArrayMap[]{})[0].getKey(0));
- assertEquals("b", xml.rep.toArray(new ArrayMap[]{})[0].getValue(1));
- assertEquals("b", xml.rep.toArray(new ArrayMap[]{})[0].getKey(1));
- assertEquals("c", xml.rep.toArray(new ArrayMap[]{})[1].getValue(0));
- assertEquals("c", xml.rep.toArray(new ArrayMap[]{})[1].getKey(0));
- assertEquals("d", xml.rep.toArray(new ArrayMap[]{})[1].getValue(1));
- assertEquals("d", xml.rep.toArray(new ArrayMap[]{})[1].getKey(1));
+ assertEquals("a", xml.rep.toArray(new ArrayMap[] {})[0].getValue(0));
+ assertEquals("a", xml.rep.toArray(new ArrayMap[] {})[0].getKey(0));
+ assertEquals("b", xml.rep.toArray(new ArrayMap[] {})[0].getValue(1));
+ assertEquals("b", xml.rep.toArray(new ArrayMap[] {})[0].getKey(1));
+ assertEquals("c", xml.rep.toArray(new ArrayMap[] {})[1].getValue(0));
+ assertEquals("c", xml.rep.toArray(new ArrayMap[] {})[1].getKey(0));
+ assertEquals("d", xml.rep.toArray(new ArrayMap[] {})[1].getValue(1));
+ assertEquals("d", xml.rep.toArray(new ArrayMap[] {})[1].getKey(1));
// serialize
XmlSerializer serializer = Xml.createSerializer();
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -400,68 +408,54 @@ public void testParseToCollectionOfArrayMaps() throws Exception {
}
private static class CollectionOfArrayMapsTypeGeneric extends GenericXml {
- @Key
- public Collection> rep;
+ @Key public Collection> rep;
}
private static class ArrayOfArrayMapsTypeGeneric extends GenericXml {
- @Key
- public ArrayMap[] rep;
+ @Key public ArrayMap[] rep;
}
private static class ArrayWithClassTypeGeneric extends GenericXml {
- @Key
- public XmlTest.AnyType[] rep;
+ @Key public XmlTest.AnyType[] rep;
}
private static class CollectionWithClassTypeGeneric extends GenericXml {
- @Key
- public Collection rep;
+ @Key public Collection rep;
}
private static class MultiGenericWithClassType {
- @Key
- public GenericXml[] rep;
+ @Key public GenericXml[] rep;
}
private static class MultiGenericWithClassTypeGeneric extends GenericXml {
- @Key
- public GenericXml[] rep;
+ @Key public GenericXml[] rep;
}
private static class CollectionTypeStringGeneric extends GenericXml {
- @Key
- public Collection rep;
+ @Key public Collection rep;
}
private static class ArrayTypeStringGeneric extends GenericXml {
- @Key
- public String[] rep;
+ @Key public String[] rep;
}
private static class CollectionTypeIntegerGeneric extends GenericXml {
- @Key
- public Collection rep;
+ @Key public Collection rep;
}
private static class ArrayTypeIntegerGeneric extends GenericXml {
- @Key
- public Integer[] rep;
+ @Key public Integer[] rep;
}
private static class ArrayTypeIntGeneric extends GenericXml {
- @Key
- public int[] rep;
+ @Key public int[] rep;
}
private static class CollectionTypeEnumGeneric extends GenericXml {
- @Key
- public Collection rep;
+ @Key public Collection rep;
}
private static class ArrayTypeEnumGeneric extends GenericXml {
- @Key
- public XmlEnumTest.AnyEnum[] rep;
+ @Key public XmlEnumTest.AnyEnum[] rep;
}
-
}
diff --git a/google-http-client-xml/src/test/java/com/google/api/client/xml/GenericXmlTest.java b/google-http-client-xml/src/test/java/com/google/api/client/xml/GenericXmlTest.java
index 0c98646b3..02a85cfa9 100644
--- a/google-http-client-xml/src/test/java/com/google/api/client/xml/GenericXmlTest.java
+++ b/google-http-client-xml/src/test/java/com/google/api/client/xml/GenericXmlTest.java
@@ -17,6 +17,9 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+
+import com.google.api.client.util.ArrayMap;
+import com.google.api.client.util.Key;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.StringReader;
@@ -28,13 +31,11 @@
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer;
-import com.google.api.client.util.ArrayMap;
-import com.google.api.client.util.Key;
/**
* Tests {@link GenericXml}.
*
- * Tests are copies from {@link XmlTest}, but the dedicated Objects are derived from {@link
+ * Tests are copies from {@link XmlTest}, but the dedicated Objects are derived from {@link
* GenericXml}
*
* @author Yaniv Inbar
@@ -42,33 +43,39 @@
*/
public class GenericXmlTest {
- private static final String XML = "One Two rep1 rep2 content One Two rep1 rep2 content test ";
private static final String SIMPLE_XML_NUMERIC = "1 ";
- private static final String ANY_TYPE_XML = "content rep1 rep2content 11 2" +
- " ";
- private static final String ANY_TYPE_XML_PRIMITIVE_STR = "1+11+1 2" +
- "+1 ";
- private static final String ALL_TYPE = "content rep1
rep2
rep3
rep4
content content rep1 rep2content 11 2"
+ + " ";
+ private static final String ANY_TYPE_XML_PRIMITIVE_STR =
+ "1+11+1 2"
+ + "+1 ";
+ private static final String ALL_TYPE =
+ "content rep1
rep2
rep3
rep4
content expected = ArrayMap.of("gd", "http://schemas.google.com/g/2005", "",
- "http://www.w3.org/2005/Atom");
+ ArrayMap expected =
+ ArrayMap.of("gd", "http://schemas.google.com/g/2005", "", "http://www.w3.org/2005/Atom");
assertEquals(expected, namespaceDictionary.getAliasToUriMap());
assertEquals("feed", xml.name);
Collection foo = (Collection) xml.get("entry");
@@ -91,21 +98,19 @@ public void testParseToGenericXml() throws Exception {
ArrayMap singleElementOne = ArrayMap.of("text()", "One");
List> testOne = new ArrayList>();
testOne.add(singleElementOne);
- assertEquals("abc", foo.toArray(new ArrayMap[]{})[0].get("@gd:etag"));
- assertEquals(testOne, foo.toArray(new ArrayMap[]{})[0].get("title"));
- ArrayMap singleElementTwoAttrib = ArrayMap.of("@attribute", "someattribute",
- "text()", "Two");
- //ArrayMap singleElementTwoValue =ArrayMap.of();
+ assertEquals("abc", foo.toArray(new ArrayMap[] {})[0].get("@gd:etag"));
+ assertEquals(testOne, foo.toArray(new ArrayMap[] {})[0].get("title"));
+ ArrayMap singleElementTwoAttrib =
+ ArrayMap.of("@attribute", "someattribute", "text()", "Two");
+ // ArrayMap singleElementTwoValue =ArrayMap.of();
List> testTwo = new ArrayList>();
testTwo.add(singleElementTwoAttrib);
- //testTwo.add(singleElementTwoValue);
- assertEquals("def", foo.toArray(new ArrayMap[]{})[1].get("@gd:etag"));
- assertEquals(testTwo, foo.toArray(new ArrayMap[]{})[1].get("title"));
+ // testTwo.add(singleElementTwoValue);
+ assertEquals("def", foo.toArray(new ArrayMap[] {})[1].get("@gd:etag"));
+ assertEquals(testTwo, foo.toArray(new ArrayMap[] {})[1].get("title"));
}
- /**
- * The purpose of this test is map a generic XML to an element inside a dedicated element.
- */
+ /** The purpose of this test is map a generic XML to an element inside a dedicated element. */
@SuppressWarnings("unchecked")
@Test
public void testParseAnyGenericType() throws Exception {
@@ -120,28 +125,58 @@ public void testParseAnyGenericType() throws Exception {
Collection repValue = (Collection) xml.elem.get("value");
assertEquals(1, repValue.size());
// 1st rep element
- assertEquals("@attr", ((Map.Entry) repList.toArray(new ArrayMap[]{})[0].entrySet()
- .toArray(new Map.Entry[]{})[0]).getKey());
- assertEquals("param1", ((Map.Entry) repList.toArray(new ArrayMap[]{})[0].entrySet()
- .toArray(new Map.Entry[]{})[0]).getValue());
- assertEquals("text()", ((Map.Entry) repList.toArray(new ArrayMap[]{})[0].entrySet()
- .toArray(new Map.Entry[]{})[1]).getKey());
- assertEquals("rep1", ((Map.Entry) repList.toArray(new ArrayMap[]{})[0].entrySet()
- .toArray(new Map.Entry[]{})[1]).getValue());
+ assertEquals(
+ "@attr",
+ ((Map.Entry)
+ repList.toArray(new ArrayMap[] {})[0].entrySet().toArray(new Map.Entry[] {})[0])
+ .getKey());
+ assertEquals(
+ "param1",
+ ((Map.Entry)
+ repList.toArray(new ArrayMap[] {})[0].entrySet().toArray(new Map.Entry[] {})[0])
+ .getValue());
+ assertEquals(
+ "text()",
+ ((Map.Entry)
+ repList.toArray(new ArrayMap[] {})[0].entrySet().toArray(new Map.Entry[] {})[1])
+ .getKey());
+ assertEquals(
+ "rep1",
+ ((Map.Entry)
+ repList.toArray(new ArrayMap[] {})[0].entrySet().toArray(new Map.Entry[] {})[1])
+ .getValue());
// 2nd rep element
- assertEquals("@attr", ((Map.Entry) repList.toArray(new ArrayMap[]{})[1].entrySet()
- .toArray(new Map.Entry[]{})[0]).getKey());
- assertEquals("param2", ((Map.Entry) repList.toArray(new ArrayMap[]{})[1].entrySet()
- .toArray(new Map.Entry[]{})[0]).getValue());
- assertEquals("text()", ((Map.Entry) repList.toArray(new ArrayMap[]{})[1].entrySet()
- .toArray(new Map.Entry[]{})[1]).getKey());
- assertEquals("rep2", ((Map.Entry) repList.toArray(new ArrayMap[]{})[1].entrySet()
- .toArray(new Map.Entry[]{})[1]).getValue());
+ assertEquals(
+ "@attr",
+ ((Map.Entry)
+ repList.toArray(new ArrayMap[] {})[1].entrySet().toArray(new Map.Entry[] {})[0])
+ .getKey());
+ assertEquals(
+ "param2",
+ ((Map.Entry)
+ repList.toArray(new ArrayMap[] {})[1].entrySet().toArray(new Map.Entry[] {})[0])
+ .getValue());
+ assertEquals(
+ "text()",
+ ((Map.Entry)
+ repList.toArray(new ArrayMap[] {})[1].entrySet().toArray(new Map.Entry[] {})[1])
+ .getKey());
+ assertEquals(
+ "rep2",
+ ((Map.Entry)
+ repList.toArray(new ArrayMap[] {})[1].entrySet().toArray(new Map.Entry[] {})[1])
+ .getValue());
// value element
- assertEquals("text()", ((Map.Entry) repValue.toArray(new ArrayMap[]{})[0].entrySet()
- .toArray(new Map.Entry[]{})[0]).getKey());
- assertEquals("content", ((Map.Entry) repValue.toArray(new ArrayMap[]{})[0].entrySet()
- .toArray(new Map.Entry[]{})[0]).getValue());
+ assertEquals(
+ "text()",
+ ((Map.Entry)
+ repValue.toArray(new ArrayMap[] {})[0].entrySet().toArray(new Map.Entry[] {})[0])
+ .getKey());
+ assertEquals(
+ "content",
+ ((Map.Entry)
+ repValue.toArray(new ArrayMap[] {})[0].entrySet().toArray(new Map.Entry[] {})[0])
+ .getValue());
// serialize
XmlSerializer serializer = Xml.createSerializer();
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -151,8 +186,7 @@ public void testParseAnyGenericType() throws Exception {
}
/**
- * The purpose of this test is to map a {@link GenericXml} to the String element in the
- * object.
+ * The purpose of this test is to map a {@link GenericXml} to the String element in the object.
*/
@Test
public void testParseSimpleTypeAsValueString() throws Exception {
@@ -173,8 +207,7 @@ public void testParseSimpleTypeAsValueString() throws Exception {
}
/**
- * The purpose of this test is to map a {@link GenericXml} to the String element in the
- * object.
+ * The purpose of this test is to map a {@link GenericXml} to the String element in the object.
*/
@Test
public void testParseSimpleTypeAsValueInteger() throws Exception {
@@ -195,8 +228,7 @@ public void testParseSimpleTypeAsValueInteger() throws Exception {
}
/**
- * The purpose of this test is to map a {@link GenericXml} to the String element in the
- * object.
+ * The purpose of this test is to map a {@link GenericXml} to the String element in the object.
*/
@Test
public void testParseToAnyType() throws Exception {
@@ -204,8 +236,7 @@ public void testParseToAnyType() throws Exception {
}
/**
- * The purpose of this test is to map a {@link GenericXml} to the String element in the
- * object.
+ * The purpose of this test is to map a {@link GenericXml} to the String element in the object.
*/
@Test
public void testParseToAnyTypeMissingField() throws Exception {
@@ -221,15 +252,14 @@ public void testParseToAnyTypeMissingField() throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
serializer.setOutput(out, "UTF-8");
namespaceDictionary.serialize(serializer, "any", xml);
- assertEquals("content content rep1 rep2 content content rep1 rep2 ENUM_2content rep1 rep2 ENUM_1 ENUM_2 ENUM_3 ENUM_2something ENUM_2content rep1 rep2 ENUM_1 ENUM_2 ENUM_3 ENUM_2something content1 rep10 rep11 value1 content2 rep20 rep21 value2 content3 rep30 rep31 value3 rep1 rep2 rep1 rep2 1 2 ENUM_1 ENUM_2 a b c d content1 rep10 rep11 value1 content2 rep20 rep21 value2 content3 rep30 rep31 value3 rep1 rep2 rep1 rep2 1 2 ENUM_1 ENUM_2 a b c d > elem0 = (ArrayList>) rep[0].elem;
assertEquals(1, elem0.size());
- assertEquals("content1", elem0.get(0)
- .get("text()"));
+ assertEquals("content1", elem0.get(0).get("text()"));
ArrayList> elem1 = (ArrayList>) rep[1].elem;
assertEquals(1, elem1.size());
- assertEquals("content2", elem1.get(0)
- .get("text()"));
+ assertEquals("content2", elem1.get(0).get("text()"));
ArrayList> elem2 = (ArrayList>) rep[2].elem;
assertEquals(1, elem2.size());
- assertEquals("content3", elem2.get(0)
- .get("text()"));
+ assertEquals("content3", elem2.get(0).get("text()"));
// serialize
XmlSerializer serializer = Xml.createSerializer();
@@ -114,9 +114,7 @@ public void testParseCollectionWithClassType() throws Exception {
assertEquals(MULTI_TYPE_WITH_CLASS_TYPE, out.toString());
}
- /**
- * The purpose of this test is to map an XML with a {@link Collection} of {@link String}.
- */
+ /** The purpose of this test is to map an XML with a {@link Collection} of {@link String}. */
@Test
public void testParseCollectionTypeString() throws Exception {
CollectionTypeString xml = new CollectionTypeString();
@@ -126,8 +124,8 @@ public void testParseCollectionTypeString() throws Exception {
Xml.parseElement(parser, xml, namespaceDictionary, null);
// check type
assertEquals(2, xml.rep.size());
- assertEquals("rep1", xml.rep.toArray(new String[]{})[0]);
- assertEquals("rep2", xml.rep.toArray(new String[]{})[1]);
+ assertEquals("rep1", xml.rep.toArray(new String[] {})[0]);
+ assertEquals("rep2", xml.rep.toArray(new String[] {})[1]);
// serialize
XmlSerializer serializer = Xml.createSerializer();
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -136,9 +134,7 @@ public void testParseCollectionTypeString() throws Exception {
assertEquals(MULTIPLE_STRING_ELEMENT, out.toString());
}
- /**
- * The purpose of this test is to map an XML with an Array of {@link String} objects.
- */
+ /** The purpose of this test is to map an XML with an Array of {@link String} objects. */
@Test
public void testParseArrayTypeString() throws Exception {
ArrayTypeString xml = new ArrayTypeString();
@@ -158,8 +154,8 @@ public void testParseArrayTypeString() throws Exception {
assertEquals(MULTIPLE_STRING_ELEMENT, out.toString());
}
/**
- * The purpose of this test is to map an XML with a sub element of a {@link Collection} of
- * {@link String} objects.
+ * The purpose of this test is to map an XML with a sub element of a {@link Collection} of {@link
+ * String} objects.
*/
@Test
public void testParseAnyTypeWithACollectionString() throws Exception {
@@ -190,8 +186,8 @@ public void testParseCollectionTypeInteger() throws Exception {
Xml.parseElement(parser, xml, namespaceDictionary, null);
// check type
assertEquals(2, xml.rep.size());
- assertEquals(1, xml.rep.toArray(new Integer[]{})[0].intValue());
- assertEquals(2, xml.rep.toArray(new Integer[]{})[1].intValue());
+ assertEquals(1, xml.rep.toArray(new Integer[] {})[0].intValue());
+ assertEquals(2, xml.rep.toArray(new Integer[] {})[1].intValue());
// serialize
XmlSerializer serializer = Xml.createSerializer();
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -200,9 +196,7 @@ public void testParseCollectionTypeInteger() throws Exception {
assertEquals(MULTIPLE_INTEGER_ELEMENT, out.toString());
}
- /**
- * The purpose of this test is to map an XML with an Array of {@link Integer} objects.
- */
+ /** The purpose of this test is to map an XML with an Array of {@link Integer} objects. */
@Test
public void testParseArrayTypeInteger() throws Exception {
ArrayTypeInteger xml = new ArrayTypeInteger();
@@ -222,9 +216,7 @@ public void testParseArrayTypeInteger() throws Exception {
assertEquals(MULTIPLE_INTEGER_ELEMENT, out.toString());
}
- /**
- * The purpose of this test is to map an XML with an Array of {@code int} types.
- */
+ /** The purpose of this test is to map an XML with an Array of {@code int} types. */
@Test
public void testParseArrayTypeInt() throws Exception {
ArrayTypeInt xml = new ArrayTypeInt();
@@ -256,8 +248,8 @@ public void testParseCollectionTypeWithEnum() throws Exception {
Xml.parseElement(parser, xml, namespaceDictionary, null);
// check type
assertEquals(2, xml.rep.size());
- assertEquals(XmlEnumTest.AnyEnum.ENUM_1, xml.rep.toArray(new XmlEnumTest.AnyEnum[]{})[0]);
- assertEquals(XmlEnumTest.AnyEnum.ENUM_2, xml.rep.toArray(new XmlEnumTest.AnyEnum[]{})[1]);
+ assertEquals(XmlEnumTest.AnyEnum.ENUM_1, xml.rep.toArray(new XmlEnumTest.AnyEnum[] {})[0]);
+ assertEquals(XmlEnumTest.AnyEnum.ENUM_2, xml.rep.toArray(new XmlEnumTest.AnyEnum[] {})[1]);
// serialize
XmlSerializer serializer = Xml.createSerializer();
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -266,9 +258,7 @@ public void testParseCollectionTypeWithEnum() throws Exception {
assertEquals(MULTIPLE_ENUM_ELEMENT, out.toString());
}
- /**
- * The purpose of this test is to map an XML with an Array of {@link Enum} objects.
- */
+ /** The purpose of this test is to map an XML with an Array of {@link Enum} objects. */
@Test
public void testParseArrayTypeWithEnum() throws Exception {
ArrayTypeEnum xml = new ArrayTypeEnum();
@@ -288,9 +278,7 @@ public void testParseArrayTypeWithEnum() throws Exception {
assertEquals(MULTIPLE_ENUM_ELEMENT, out.toString());
}
- /**
- * The purpose is to have an Array of {@link java.lang.reflect.ParameterizedType} elements.
- */
+ /** The purpose is to have an Array of {@link java.lang.reflect.ParameterizedType} elements. */
@Test
public void testParseToArrayOfArrayMaps() throws Exception {
ArrayOfArrayMapsType xml = new ArrayOfArrayMapsType();
@@ -328,14 +316,14 @@ public void testParseToCollectionOfArrayMaps() throws Exception {
Xml.parseElement(parser, xml, namespaceDictionary, null);
// check type
assertEquals(2, xml.rep.size());
- assertEquals("a", xml.rep.toArray(new ArrayMap[]{})[0].getValue(0));
- assertEquals("a", xml.rep.toArray(new ArrayMap[]{})[0].getKey(0));
- assertEquals("b", xml.rep.toArray(new ArrayMap[]{})[0].getValue(1));
- assertEquals("b", xml.rep.toArray(new ArrayMap[]{})[0].getKey(1));
- assertEquals("c", xml.rep.toArray(new ArrayMap[]{})[1].getValue(0));
- assertEquals("c", xml.rep.toArray(new ArrayMap[]{})[1].getKey(0));
- assertEquals("d", xml.rep.toArray(new ArrayMap[]{})[1].getValue(1));
- assertEquals("d", xml.rep.toArray(new ArrayMap[]{})[1].getKey(1));
+ assertEquals("a", xml.rep.toArray(new ArrayMap[] {})[0].getValue(0));
+ assertEquals("a", xml.rep.toArray(new ArrayMap[] {})[0].getKey(0));
+ assertEquals("b", xml.rep.toArray(new ArrayMap[] {})[0].getValue(1));
+ assertEquals("b", xml.rep.toArray(new ArrayMap[] {})[0].getKey(1));
+ assertEquals("c", xml.rep.toArray(new ArrayMap[] {})[1].getValue(0));
+ assertEquals("c", xml.rep.toArray(new ArrayMap[] {})[1].getKey(0));
+ assertEquals("d", xml.rep.toArray(new ArrayMap[] {})[1].getValue(1));
+ assertEquals("d", xml.rep.toArray(new ArrayMap[] {})[1].getKey(1));
// serialize
XmlSerializer serializer = Xml.createSerializer();
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -345,66 +333,51 @@ public void testParseToCollectionOfArrayMaps() throws Exception {
}
private static class CollectionOfArrayMapsType {
- @Key
- public Collection> rep;
+ @Key public Collection> rep;
}
private static class ArrayOfArrayMapsType {
- @Key
- public ArrayMap[] rep;
+ @Key public ArrayMap[] rep;
}
private static class ArrayWithClassType {
- @Key
- public XmlTest.AnyType[] rep;
+ @Key public XmlTest.AnyType[] rep;
}
private static class CollectionWithClassType {
- @Key
- public Collection rep;
+ @Key public Collection rep;
}
- /**
- * Needs to be public, this is referenced in another element.
- */
+ /** Needs to be public, this is referenced in another element. */
public static class CollectionTypeString {
- @Key
- public Collection rep;
+ @Key public Collection rep;
}
private static class ArrayTypeString {
- @Key
- public String[] rep;
+ @Key public String[] rep;
}
private static class AnyTypeWithCollectionString {
- @Key
- public CollectionTypeString coll;
+ @Key public CollectionTypeString coll;
}
private static class CollectionTypeInteger {
- @Key
- public Collection rep;
+ @Key public Collection rep;
}
private static class ArrayTypeInteger {
- @Key
- public Integer[] rep;
+ @Key public Integer[] rep;
}
private static class ArrayTypeInt {
- @Key
- public int[] rep;
+ @Key public int[] rep;
}
private static class CollectionTypeEnum {
- @Key
- public Collection rep;
+ @Key public Collection rep;
}
private static class ArrayTypeEnum {
- @Key
- public XmlEnumTest.AnyEnum[] rep;
+ @Key public XmlEnumTest.AnyEnum[] rep;
}
-
}
diff --git a/google-http-client-xml/src/test/java/com/google/api/client/xml/XmlNamespaceDictionaryTest.java b/google-http-client-xml/src/test/java/com/google/api/client/xml/XmlNamespaceDictionaryTest.java
index 4c03f7028..569477010 100644
--- a/google-http-client-xml/src/test/java/com/google/api/client/xml/XmlNamespaceDictionaryTest.java
+++ b/google-http-client-xml/src/test/java/com/google/api/client/xml/XmlNamespaceDictionaryTest.java
@@ -14,14 +14,14 @@
package com.google.api.client.xml;
-import java.io.StringWriter;
-import java.util.Collection;
-import java.util.TreeSet;
-import org.xmlpull.v1.XmlSerializer;
import com.google.api.client.util.Key;
import com.google.api.client.xml.atom.Atom;
import com.google.common.collect.ImmutableMap;
+import java.io.StringWriter;
+import java.util.Collection;
+import java.util.TreeSet;
import junit.framework.TestCase;
+import org.xmlpull.v1.XmlSerializer;
/**
* Tests {@link XmlNamespaceDictionary}.
@@ -30,21 +30,22 @@
*/
public class XmlNamespaceDictionaryTest extends TestCase {
- private static final String EXPECTED = "One Two One" +
- " Two One Two One"
+ + " Two {
- @Key
- public String title;
+ @Key public String title;
@Key("@gd:etag")
public String etag;
@@ -215,7 +213,5 @@ public int compareTo(Entry other) {
public static class Feed {
@Key("entry")
public Collection entries;
-
}
-
}
diff --git a/google-http-client-xml/src/test/java/com/google/api/client/xml/XmlTest.java b/google-http-client-xml/src/test/java/com/google/api/client/xml/XmlTest.java
index 0462a2c3b..b1345f15c 100644
--- a/google-http-client-xml/src/test/java/com/google/api/client/xml/XmlTest.java
+++ b/google-http-client-xml/src/test/java/com/google/api/client/xml/XmlTest.java
@@ -19,6 +19,9 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+
+import com.google.api.client.util.ArrayMap;
+import com.google.api.client.util.Key;
import java.io.ByteArrayOutputStream;
import java.io.StringReader;
import java.util.ArrayList;
@@ -27,8 +30,6 @@
import org.junit.Test;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlSerializer;
-import com.google.api.client.util.ArrayMap;
-import com.google.api.client.util.Key;
/**
* Tests {@link Xml}.
@@ -38,51 +39,60 @@
*/
public class XmlTest {
-
private static final String SIMPLE_XML = "test ";
private static final String SIMPLE_XML_NUMERIC = "1 ";
private static final String START_WITH_TEXT = "start_with_text";
- private static final String MISSING_END_ELEMENT = "" +
- "missing_end_element";
- private static final String START_WITH_END_ELEMENT = "
start_with_end_elemtn ";
- private static final String START_WITH_END_ELEMENT_NESTED = "
start_with_end_element_nested";
- private static final String ANY_TYPE_XML = "content rep1 rep2" +
- " content content content 11 2" +
- " ";
- private static final String ANY_TYPE_XML_PRIMITIVE_STR = "1+11+1 2" +
- "+1 ";
- private static final String NESTED_NS = "2011-08-09T04:38" +
- ":14.017Z 2011-08-09T04:38:14.017Z -INFINF -INF INF" +
- " " +
- "ENUM_1 ENUM_2 TitleTest
11 2 str1arr1 arr2 ";
- private static final String ANY_TYPE_XML_NESTED_ARRAY = "content rep1
rep2
rep3
rep4
content " + "missing_end_element";
+ private static final String START_WITH_END_ELEMENT =
+ "
start_with_end_elemtn ";
+ private static final String START_WITH_END_ELEMENT_NESTED =
+ "
start_with_end_element_nested";
+ private static final String ANY_TYPE_XML =
+ "content rep1 rep2"
+ + " content content content 11 2"
+ + " ";
+ private static final String ANY_TYPE_XML_PRIMITIVE_STR =
+ "1+11+1 2"
+ + "+1 ";
+ private static final String NESTED_NS =
+ "2011-08-09T04:38"
+ + ":14.017Z 2011-08-09T04:38:14.017Z -INFINF -INF INF"
+ + " "
+ + "ENUM_1 ENUM_2 TitleTest
11 2 str1arr1 arr2 ";
+ private static final String ANY_TYPE_XML_NESTED_ARRAY =
+ "content rep1
rep2
rep3
rep4
content 1 ", out.toString());
}
- /**
- * Negative test to check for text without a start-element.
- */
+ /** Negative test to check for text without a start-element. */
@Test
public void testWithTextFail() throws Exception {
SimpleTypeString xml = new SimpleTypeString();
@@ -136,15 +143,14 @@ public void testWithTextFail() throws Exception {
Xml.parseElement(parser, xml, namespaceDictionary, null);
fail();
} catch (final Exception e) {
- assertEquals("only whitespace content allowed before start tag and not s (position: " +
- "START_DOCUMENT seen s... @1:22)", e.getMessage()
- .trim());
+ assertEquals(
+ "only whitespace content allowed before start tag and not s (position: "
+ + "START_DOCUMENT seen s... @1:22)",
+ e.getMessage().trim());
}
}
- /**
- * Negative test to check for missing end-element.
- */
+ /** Negative test to check for missing end-element. */
@Test
public void testWithMissingEndElementFail() throws Exception {
SimpleTypeString xml = new SimpleTypeString();
@@ -155,16 +161,15 @@ public void testWithMissingEndElementFail() throws Exception {
Xml.parseElement(parser, xml, namespaceDictionary, null);
fail();
} catch (final Exception e) {
- assertEquals("no more data available - expected end tag to close start tag from line 1, parser stopped on START_TAG seen ...missing_end_element... @1:54", e.getMessage()
- .trim());
+ assertEquals(
+ "no more data available - expected end tag to close start tag from line 1, parser stopped on START_TAG seen ...missing_end_element... @1:54",
+ e.getMessage().trim());
}
}
- /**
- * Negative test with that start with a end-element.
- */
+ /** Negative test with that start with a end-element. */
@Test
public void testWithEndElementStarting() throws Exception {
SimpleTypeString xml = new SimpleTypeString();
@@ -175,15 +180,14 @@ public void testWithEndElementStarting() throws Exception {
Xml.parseElement(parser, xml, namespaceDictionary, null);
fail();
} catch (final Exception e) {
- assertEquals("expected start tag name and not / (position: START_DOCUMENT seen must match start tag name from line 1 (position:" +
- " START_TAG seen ...
... @1:39)", e.getMessage()
- .trim());
+ assertEquals(
+ "end tag name
must match start tag name from line 1 (position:"
+ + " START_TAG seen ...
... @1:39)",
+ e.getMessage().trim());
}
}
- /**
- * Negative test that maps a string to an integer and causes an exception.
- */
+ /** Negative test that maps a string to an integer and causes an exception. */
@Test
public void testFailMappingOfDataType() throws Exception {
SimpleTypeNumeric xml = new SimpleTypeNumeric();
@@ -213,8 +216,7 @@ public void testFailMappingOfDataType() throws Exception {
Xml.parseElement(parser, xml, namespaceDictionary, null);
fail();
} catch (final Exception e) {
- assertEquals("For input string: \"test\"", e.getMessage()
- .trim());
+ assertEquals("For input string: \"test\"", e.getMessage().trim());
}
}
@@ -306,8 +308,8 @@ public void testParseToAnyTypeWithNullDestination() throws Exception {
}
/**
- * The purpose of this test is to see, if parsing works with a {@link Xml.CustomizeParser}.
- * The XML will be mapped to {@link AnyType}.
+ * The purpose of this test is to see, if parsing works with a {@link Xml.CustomizeParser}. The
+ * XML will be mapped to {@link AnyType}.
*/
@Test
public void testParseAnyTypeWithCustomParser() throws Exception {
@@ -330,9 +332,9 @@ public void testParseAnyTypeWithCustomParser() throws Exception {
}
/**
- * The purpose of this test it to parse elements which will be mapped to a
- * {@link javax.lang.model.type.PrimitiveType}. Therefore {@code int}s are mapped to attributes,
- * elements and element arrays.
+ * The purpose of this test it to parse elements which will be mapped to a {@link
+ * javax.lang.model.type.PrimitiveType}. Therefore {@code int}s are mapped to attributes, elements
+ * and element arrays.
*/
@Test
public void testParseToAnyTypePrimitiveInt() throws Exception {
@@ -355,9 +357,9 @@ public void testParseToAnyTypePrimitiveInt() throws Exception {
}
/**
- * The purpose of this test it to parse elements which will be mapped to a Java
- * {@link javax.lang.model.type.PrimitiveType}. Therefore {@code int}s are mapped to attributes,
- * elements and element arrays.
+ * The purpose of this test it to parse elements which will be mapped to a Java {@link
+ * javax.lang.model.type.PrimitiveType}. Therefore {@code int}s are mapped to attributes, elements
+ * and element arrays.
*/
@Test
public void testParseToAnyTypeStringOnly() throws Exception {
@@ -379,9 +381,7 @@ public void testParseToAnyTypeStringOnly() throws Exception {
assertEquals(ANY_TYPE_XML_PRIMITIVE_STR, out.toString());
}
- /**
- * The purpose of this test is to map nested elements with a namespace attribute.
- */
+ /** The purpose of this test is to map nested elements with a namespace attribute. */
@Test
public void testParseOfNestedNs() throws Exception {
XmlPullParser parser = Xml.createParser();
@@ -399,8 +399,8 @@ public void testParseOfNestedNs() throws Exception {
}
/**
- * The purpose of this test is to map the infinity values of both {@code doubles} and
- * {@code floats}.
+ * The purpose of this test is to map the infinity values of both {@code doubles} and {@code
+ * floats}.
*/
@Test
public void testParseInfiniteValues() throws Exception {
@@ -446,8 +446,9 @@ public void testParseEmptyElements() throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
serializer.setOutput(out, "UTF-8");
namespaceDictionary.serialize(serializer, "any", xml);
- assertEquals("0 0 integerCollection;
+ @Key public int integer;
+ @Key public String str;
+ @Key public GenericXml genericXml;
+ @Key public XmlEnumTest.AnyEnum[] anyEnum;
+ @Key public String[] stringArray;
+ @Key public List integerCollection;
}
}
-
diff --git a/google-http-client/src/main/java/com/google/api/client/http/AbstractHttpContent.java b/google-http-client/src/main/java/com/google/api/client/http/AbstractHttpContent.java
index 46fcabd45..fdd9a768e 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/AbstractHttpContent.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/AbstractHttpContent.java
@@ -17,16 +17,13 @@
import com.google.api.client.util.Charsets;
import com.google.api.client.util.IOUtils;
import com.google.api.client.util.StreamingContent;
-
import java.io.IOException;
import java.nio.charset.Charset;
/**
* Abstract implementation of an HTTP content with typical options.
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.5
* @author Yaniv Inbar
@@ -41,7 +38,7 @@ public abstract class AbstractHttpContent implements HttpContent {
/**
* @param mediaType Media type string (for example "type/subtype") this content represents or
- * {@code null} to leave out. Can also contain parameters like {@code "charset=utf-8"}
+ * {@code null} to leave out. Can also contain parameters like {@code "charset=utf-8"}
* @since 1.10
*/
protected AbstractHttpContent(String mediaType) {
@@ -79,10 +76,8 @@ public final HttpMediaType getMediaType() {
/**
* Sets the media type to use for the Content-Type header, or {@code null} if unspecified.
*
- *
- * This will also overwrite any previously set parameter of the media type (for example
- * {@code "charset"}), and therefore might change other properties as well.
- *
+ * This will also overwrite any previously set parameter of the media type (for example {@code
+ * "charset"}), and therefore might change other properties as well.
*
* @since 1.10
*/
@@ -98,7 +93,8 @@ public AbstractHttpContent setMediaType(HttpMediaType mediaType) {
*/
protected final Charset getCharset() {
return mediaType == null || mediaType.getCharsetParameter() == null
- ? Charsets.ISO_8859_1 : mediaType.getCharsetParameter();
+ ? Charsets.ISO_8859_1
+ : mediaType.getCharsetParameter();
}
public String getType() {
@@ -108,10 +104,8 @@ public String getType() {
/**
* Computes and returns the content length or less than zero if not known.
*
- *
- * Subclasses may override, but by default this computes the length by calling
- * {@link #computeLength(HttpContent)}.
- *
+ * Subclasses may override, but by default this computes the length by calling {@link
+ * #computeLength(HttpContent)}.
*/
protected long computeLength() throws IOException {
return computeLength(this);
@@ -129,7 +123,6 @@ public boolean retrySupported() {
*
* @param content HTTP content
* @return computed content length or {@code -1} if retry is not supported
- *
* @since 1.14
*/
public static long computeLength(HttpContent content) throws IOException {
diff --git a/google-http-client/src/main/java/com/google/api/client/http/AbstractInputStreamContent.java b/google-http-client/src/main/java/com/google/api/client/http/AbstractInputStreamContent.java
index 29a37d984..789fab5ec 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/AbstractInputStreamContent.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/AbstractInputStreamContent.java
@@ -16,7 +16,6 @@
import com.google.api.client.util.ByteStreams;
import com.google.api.client.util.IOUtils;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -24,17 +23,15 @@
/**
* Serializes HTTP request content from an input stream into an output stream.
*
- *
- * The {@link #type} field is required. Subclasses should implement the {@link #getLength()},
+ *
The {@link #type} field is required. Subclasses should implement the {@link #getLength()},
* {@link #getInputStream()}, and {@link #retrySupported()} for their specific type of input stream.
* By default, all content is read from the input stream. If instead you want to limit the maximum
- * amount of content read from the input stream, you may use
- * {@link ByteStreams#limit(InputStream, long)}.
- *
+ * amount of content read from the input stream, you may use {@link ByteStreams#limit(InputStream,
+ * long)}.
*
*
- * Implementations don't need to be thread-safe.
- *
+ *
+ * Implementations don't need to be thread-safe.
*
* @since 1.4
* @author moshenko@google.com (Jacob Moshenko)
@@ -45,8 +42,8 @@ public abstract class AbstractInputStreamContent implements HttpContent {
private String type;
/**
- * Whether the input stream should be closed at the end of {@link #writeTo}. Default is
- * {@code true}.
+ * Whether the input stream should be closed at the end of {@link #writeTo}. Default is {@code
+ * true}.
*/
private boolean closeInputStream = true;
@@ -59,10 +56,10 @@ public AbstractInputStreamContent(String type) {
}
/**
- * Return an input stream for the specific implementation type of
- * {@link AbstractInputStreamContent}. If the specific implementation will return {@code true} for
- * {@link #retrySupported()} this should be a factory function which will create a new
- * {@link InputStream} from the source data whenever invoked.
+ * Return an input stream for the specific implementation type of {@link
+ * AbstractInputStreamContent}. If the specific implementation will return {@code true} for {@link
+ * #retrySupported()} this should be a factory function which will create a new {@link
+ * InputStream} from the source data whenever invoked.
*
* @since 1.7
*/
diff --git a/google-http-client/src/main/java/com/google/api/client/http/BackOffPolicy.java b/google-http-client/src/main/java/com/google/api/client/http/BackOffPolicy.java
index d06304011..704c9f85a 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/BackOffPolicy.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/BackOffPolicy.java
@@ -15,48 +15,41 @@
package com.google.api.client.http;
import com.google.api.client.util.Beta;
-
import java.io.IOException;
/**
- * {@link Beta}
- * Implementations may want to back off on server or product-specific errors.
- *
+ * Implementations may want to back off on server or product-specific errors.
*
* @param statusCode HTTP status code
*/
public boolean isBackOffRequired(int statusCode);
- /**
- * Reset Back off counters (if any) in an implementation-specific fashion.
- */
+ /** Reset Back off counters (if any) in an implementation-specific fashion. */
public void reset();
/**
* Gets the number of milliseconds to wait before retrying an HTTP request. If {@link #STOP} is
* returned, no retries should be made.
*
- * This method should be used as follows:
+ *
This method should be used as follows:
*
*
* long backoffTime = backoffPolicy.getNextBackoffMs();
@@ -65,10 +58,10 @@ public interface BackOffPolicy {
* } else {
* // Retry after backoffTime.
* }
- *
+ *
*
* @return the number of milliseconds to wait when backing off requests, or {@link #STOP} if no
- * more retries should be made
+ * more retries should be made
*/
public long getNextBackOffMillis() throws IOException;
}
diff --git a/google-http-client/src/main/java/com/google/api/client/http/BasicAuthentication.java b/google-http-client/src/main/java/com/google/api/client/http/BasicAuthentication.java
index 8da4bd985..0e55cea4c 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/BasicAuthentication.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/BasicAuthentication.java
@@ -15,19 +15,16 @@
package com.google.api.client.http;
import com.google.api.client.util.Preconditions;
-
import java.io.IOException;
/**
* Basic authentication HTTP request initializer as specified in Basic Authentication Scheme
*
- *
- * Implementation is immutable and thread-safe. It can be used as either an HTTP request initializer
- * or an HTTP request execute interceptor. {@link #initialize(HttpRequest)} only sets itself as the
- * interceptor. Authentication is actually done in {@link #intercept(HttpRequest)}, which is
- * implemented using {@link HttpHeaders#setBasicAuthentication(String, String)}.
- *
+ * Implementation is immutable and thread-safe. It can be used as either an HTTP request
+ * initializer or an HTTP request execute interceptor. {@link #initialize(HttpRequest)} only sets
+ * itself as the interceptor. Authentication is actually done in {@link #intercept(HttpRequest)},
+ * which is implemented using {@link HttpHeaders#setBasicAuthentication(String, String)}.
*
* @since 1.7
* @author Yaniv Inbar
diff --git a/google-http-client/src/main/java/com/google/api/client/http/ByteArrayContent.java b/google-http-client/src/main/java/com/google/api/client/http/ByteArrayContent.java
index cf4166934..bd934fb5d 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/ByteArrayContent.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/ByteArrayContent.java
@@ -16,7 +16,6 @@
import com.google.api.client.util.Preconditions;
import com.google.api.client.util.StringUtils;
-
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -24,21 +23,17 @@
* Concrete implementation of {@link AbstractInputStreamContent} that generates repeatable input
* streams based on the contents of byte array.
*
- *
- * Sample use:
- *
+ * Sample use:
*
*
*
- static void setJsonContent(HttpRequest request, byte[] json) {
- request.setContent(new ByteArrayContent("application/json", json));
- }
+ * static void setJsonContent(HttpRequest request, byte[] json) {
+ * request.setContent(new ByteArrayContent("application/json", json));
+ * }
*
*
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.4
* @author moshenko@google.com (Jacob Moshenko)
@@ -78,8 +73,12 @@ public ByteArrayContent(String type, byte[] array) {
public ByteArrayContent(String type, byte[] array, int offset, int length) {
super(type);
this.byteArray = Preconditions.checkNotNull(array);
- Preconditions.checkArgument(offset >= 0 && length >= 0 && offset + length <= array.length,
- "offset %s, length %s, array length %s", offset, length, array.length);
+ Preconditions.checkArgument(
+ offset >= 0 && length >= 0 && offset + length <= array.length,
+ "offset %s, length %s, array length %s",
+ offset,
+ length,
+ array.length);
this.offset = offset;
this.length = length;
}
@@ -87,15 +86,14 @@ public ByteArrayContent(String type, byte[] array, int offset, int length) {
/**
* Returns a new instance with the UTF-8 encoding (using {@link StringUtils#getBytesUtf8(String)})
* of the given content string.
- *
- * Sample use:
- *
+ *
+ * Sample use:
*
*
*
- static void setJsonContent(HttpRequest request, String json) {
- request.setContent(ByteArrayContent.fromString("application/json", json));
- }
+ * static void setJsonContent(HttpRequest request, String json) {
+ * request.setContent(ByteArrayContent.fromString("application/json", json));
+ * }
*
*
*
diff --git a/google-http-client/src/main/java/com/google/api/client/http/EmptyContent.java b/google-http-client/src/main/java/com/google/api/client/http/EmptyContent.java
index 7dad5881d..492c4cb2a 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/EmptyContent.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/EmptyContent.java
@@ -21,12 +21,10 @@
* Empty HTTP content of length zero just to force {@link HttpRequest#execute()} to add the header
* {@code Content-Length: 0}.
*
- *
- * Note that there is no {@code Content-Length} header if the HTTP request content is {@code null} .
- * However, when making a request like PUT or POST without a {@code Content-Length} header, some
- * servers may respond with a {@code 411 Length Required} error. Specifying the
- * {@code Content-Length: 0} header may work around that problem.
- *
+ * Note that there is no {@code Content-Length} header if the HTTP request content is {@code
+ * null} . However, when making a request like PUT or POST without a {@code Content-Length} header,
+ * some servers may respond with a {@code 411 Length Required} error. Specifying the {@code
+ * Content-Length: 0} header may work around that problem.
*
* @since 1.11
* @author Yaniv Inbar
diff --git a/google-http-client/src/main/java/com/google/api/client/http/ExponentialBackOffPolicy.java b/google-http-client/src/main/java/com/google/api/client/http/ExponentialBackOffPolicy.java
index 90e8d0058..2384c8a89 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/ExponentialBackOffPolicy.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/ExponentialBackOffPolicy.java
@@ -17,41 +17,34 @@
import com.google.api.client.util.Beta;
import com.google.api.client.util.ExponentialBackOff;
import com.google.api.client.util.NanoClock;
-
import java.io.IOException;
/**
- * {@link Beta}
- * {@link #getNextBackOffMillis()} is calculated using the following formula:
+ *
{@link #getNextBackOffMillis()} is calculated using the following formula:
*
*
* randomized_interval =
* retry_interval * (random value in range [1 - randomization_factor, 1 + randomization_factor])
*
+ *
* In other words {@link #getNextBackOffMillis()} will range between the randomization factor
* percentage below and above the retry interval. For example, using 2 seconds as the base retry
* interval and 0.5 as the randomization factor, the actual back off period used in the next retry
* attempt will be between 1 and 3 seconds.
- *
*
- *
- * Note: max_interval caps the retry_interval and not the randomized_interval.
- *
+ * Note: max_interval caps the retry_interval and not the randomized_interval.
*
- *
- * If the time elapsed since an {@link ExponentialBackOffPolicy} instance is created goes past the
- * max_elapsed_time then the method {@link #getNextBackOffMillis()} starts returning
- * {@link BackOffPolicy#STOP}. The elapsed time can be reset by calling {@link #reset()}.
- *
+ * If the time elapsed since an {@link ExponentialBackOffPolicy} instance is created goes past
+ * the max_elapsed_time then the method {@link #getNextBackOffMillis()} starts returning {@link
+ * BackOffPolicy#STOP}. The elapsed time can be reset by calling {@link #reset()}.
*
- *
- * Example: The default retry_interval is .5 seconds, default randomization_factor is 0.5, default
- * multiplier is 1.5 and the default max_interval is 1 minute. For 10 requests the sequence will be
- * (values in seconds) and assuming we go over the max_elapsed_time on the 10th request:
+ *
Example: The default retry_interval is .5 seconds, default randomization_factor is 0.5,
+ * default multiplier is 1.5 and the default max_interval is 1 minute. For 10 requests the sequence
+ * will be (values in seconds) and assuming we go over the max_elapsed_time on the 10th request:
*
*
* request# retry_interval randomized_interval
@@ -67,24 +60,19 @@
* 9 12.807 [6.403, 19.210]
* 10 19.210 {@link BackOffPolicy#STOP}
*
- *
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.7
* @author Ravi Mistry
* @deprecated (scheduled to be removed in 1.18). Use {@link HttpBackOffUnsuccessfulResponseHandler}
- * with {@link ExponentialBackOff} instead.
+ * with {@link ExponentialBackOff} instead.
*/
@Beta
@Deprecated
public class ExponentialBackOffPolicy implements BackOffPolicy {
- /**
- * The default initial interval value in milliseconds (0.5 seconds).
- */
+ /** The default initial interval value in milliseconds (0.5 seconds). */
public static final int DEFAULT_INITIAL_INTERVAL_MILLIS =
ExponentialBackOff.DEFAULT_INITIAL_INTERVAL_MILLIS;
@@ -95,20 +83,14 @@ public class ExponentialBackOffPolicy implements BackOffPolicy {
public static final double DEFAULT_RANDOMIZATION_FACTOR =
ExponentialBackOff.DEFAULT_RANDOMIZATION_FACTOR;
- /**
- * The default multiplier value (1.5 which is 50% increase per back off).
- */
+ /** The default multiplier value (1.5 which is 50% increase per back off). */
public static final double DEFAULT_MULTIPLIER = ExponentialBackOff.DEFAULT_MULTIPLIER;
- /**
- * The default maximum back off time in milliseconds (1 minute).
- */
+ /** The default maximum back off time in milliseconds (1 minute). */
public static final int DEFAULT_MAX_INTERVAL_MILLIS =
ExponentialBackOff.DEFAULT_MAX_INTERVAL_MILLIS;
- /**
- * The default maximum elapsed time in milliseconds (15 minutes).
- */
+ /** The default maximum elapsed time in milliseconds (15 minutes). */
public static final int DEFAULT_MAX_ELAPSED_TIME_MILLIS =
ExponentialBackOff.DEFAULT_MAX_ELAPSED_TIME_MILLIS;
@@ -118,12 +100,13 @@ public class ExponentialBackOffPolicy implements BackOffPolicy {
/**
* Creates an instance of ExponentialBackOffPolicy using default values. To override the defaults
* use {@link #builder}.
+ *
*
- * {@code initialIntervalMillis} is defaulted to {@link #DEFAULT_INITIAL_INTERVAL_MILLIS}
- * {@code randomizationFactor} is defaulted to {@link #DEFAULT_RANDOMIZATION_FACTOR}
- * {@code multiplier} is defaulted to {@link #DEFAULT_MULTIPLIER}
- * {@code maxIntervalMillis} is defaulted to {@link #DEFAULT_MAX_INTERVAL_MILLIS}
- * {@code maxElapsedTimeMillis} is defaulted in {@link #DEFAULT_MAX_ELAPSED_TIME_MILLIS}
+ * {@code initialIntervalMillis} is defaulted to {@link #DEFAULT_INITIAL_INTERVAL_MILLIS}
+ * {@code randomizationFactor} is defaulted to {@link #DEFAULT_RANDOMIZATION_FACTOR}
+ * {@code multiplier} is defaulted to {@link #DEFAULT_MULTIPLIER}
+ * {@code maxIntervalMillis} is defaulted to {@link #DEFAULT_MAX_INTERVAL_MILLIS}
+ * {@code maxElapsedTimeMillis} is defaulted in {@link #DEFAULT_MAX_ELAPSED_TIME_MILLIS}
*
*/
public ExponentialBackOffPolicy() {
@@ -132,7 +115,6 @@ public ExponentialBackOffPolicy() {
/**
* @param builder builder
- *
* @since 1.14
*/
protected ExponentialBackOffPolicy(Builder builder) {
@@ -142,15 +124,11 @@ protected ExponentialBackOffPolicy(Builder builder) {
/**
* Determines if back off is required based on the specified status code.
*
- *
- * The idea is that the servers are only temporarily unavailable, and they should not be
+ *
The idea is that the servers are only temporarily unavailable, and they should not be
* overwhelmed when they are trying to get back up.
- *
*
- *
- * The default implementation requires back off for 500 and 503 status codes. Subclasses may
+ *
The default implementation requires back off for 500 and 503 status codes. Subclasses may
* override if different status codes are required.
- *
*/
public boolean isBackOffRequired(int statusCode) {
switch (statusCode) {
@@ -162,9 +140,7 @@ public boolean isBackOffRequired(int statusCode) {
}
}
- /**
- * Sets the interval back to the initial retry interval and restarts the timer.
- */
+ /** Sets the interval back to the initial retry interval and restarts the timer. */
public final void reset() {
exponentialBackOff.reset();
}
@@ -173,25 +149,19 @@ public final void reset() {
* Gets the number of milliseconds to wait before retrying an HTTP request. If {@link #STOP} is
* returned, no retries should be made.
*
- *
- * This method calculates the next back off interval using the formula: randomized_interval =
+ *
This method calculates the next back off interval using the formula: randomized_interval =
* retry_interval +/- (randomization_factor * retry_interval)
- *
*
- *
- * Subclasses may override if a different algorithm is required.
- *
+ * Subclasses may override if a different algorithm is required.
*
* @return the number of milliseconds to wait when backing off requests, or {@link #STOP} if no
- * more retries should be made
+ * more retries should be made
*/
public long getNextBackOffMillis() throws IOException {
return exponentialBackOff.nextBackOffMillis();
}
- /**
- * Returns the initial retry interval in milliseconds.
- */
+ /** Returns the initial retry interval in milliseconds. */
public final int getInitialIntervalMillis() {
return exponentialBackOff.getInitialIntervalMillis();
}
@@ -199,25 +169,19 @@ public final int getInitialIntervalMillis() {
/**
* Returns the randomization factor to use for creating a range around the retry interval.
*
- *
- * A randomization factor of 0.5 results in a random period ranging between 50% below and 50%
+ *
A randomization factor of 0.5 results in a random period ranging between 50% below and 50%
* above the retry interval.
- *
*/
public final double getRandomizationFactor() {
return exponentialBackOff.getRandomizationFactor();
}
- /**
- * Returns the current retry interval in milliseconds.
- */
+ /** Returns the current retry interval in milliseconds. */
public final int getCurrentIntervalMillis() {
return exponentialBackOff.getCurrentIntervalMillis();
}
- /**
- * Returns the value to multiply the current interval with for each retry attempt.
- */
+ /** Returns the value to multiply the current interval with for each retry attempt. */
public final double getMultiplier() {
return exponentialBackOff.getMultiplier();
}
@@ -233,11 +197,9 @@ public final int getMaxIntervalMillis() {
/**
* Returns the maximum elapsed time in milliseconds.
*
- *
- * If the time elapsed since an {@link ExponentialBackOffPolicy} instance is created goes past the
- * max_elapsed_time then the method {@link #getNextBackOffMillis()} starts returning
- * {@link BackOffPolicy#STOP}. The elapsed time can be reset by calling {@link #reset()}.
- *
+ * If the time elapsed since an {@link ExponentialBackOffPolicy} instance is created goes past
+ * the max_elapsed_time then the method {@link #getNextBackOffMillis()} starts returning {@link
+ * BackOffPolicy#STOP}. The elapsed time can be reset by calling {@link #reset()}.
*/
public final int getMaxElapsedTimeMillis() {
return exponentialBackOff.getMaxElapsedTimeMillis();
@@ -247,28 +209,22 @@ public final int getMaxElapsedTimeMillis() {
* Returns the elapsed time in milliseconds since an {@link ExponentialBackOffPolicy} instance is
* created and is reset when {@link #reset()} is called.
*
- *
- * The elapsed time is computed using {@link System#nanoTime()}.
- *
+ * The elapsed time is computed using {@link System#nanoTime()}.
*/
public final long getElapsedTimeMillis() {
return exponentialBackOff.getElapsedTimeMillis();
}
- /**
- * Returns an instance of a new builder.
- */
+ /** Returns an instance of a new builder. */
public static Builder builder() {
return new Builder();
}
/**
- * {@link Beta}
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.7
*/
@@ -279,8 +235,7 @@ public static class Builder {
/** Exponential back-off builder. */
final ExponentialBackOff.Builder exponentialBackOffBuilder = new ExponentialBackOff.Builder();
- protected Builder() {
- }
+ protected Builder() {}
/** Builds a new instance of {@link ExponentialBackOffPolicy}. */
public ExponentialBackOffPolicy build() {
@@ -288,21 +243,19 @@ public ExponentialBackOffPolicy build() {
}
/**
- * Returns the initial retry interval in milliseconds. The default value is
- * {@link #DEFAULT_INITIAL_INTERVAL_MILLIS}.
+ * Returns the initial retry interval in milliseconds. The default value is {@link
+ * #DEFAULT_INITIAL_INTERVAL_MILLIS}.
*/
public final int getInitialIntervalMillis() {
return exponentialBackOffBuilder.getInitialIntervalMillis();
}
/**
- * Sets the initial retry interval in milliseconds. The default value is
- * {@link #DEFAULT_INITIAL_INTERVAL_MILLIS}. Must be {@code > 0}.
+ * Sets the initial retry interval in milliseconds. The default value is {@link
+ * #DEFAULT_INITIAL_INTERVAL_MILLIS}. Must be {@code > 0}.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Builder setInitialIntervalMillis(int initialIntervalMillis) {
exponentialBackOffBuilder.setInitialIntervalMillis(initialIntervalMillis);
@@ -313,15 +266,11 @@ public Builder setInitialIntervalMillis(int initialIntervalMillis) {
* Returns the randomization factor to use for creating a range around the retry interval. The
* default value is {@link #DEFAULT_RANDOMIZATION_FACTOR}.
*
- *
- * A randomization factor of 0.5 results in a random period ranging between 50% below and 50%
+ *
A randomization factor of 0.5 results in a random period ranging between 50% below and 50%
* above the retry interval.
- *
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public final double getRandomizationFactor() {
return exponentialBackOffBuilder.getRandomizationFactor();
@@ -329,18 +278,14 @@ public final double getRandomizationFactor() {
/**
* Sets the randomization factor to use for creating a range around the retry interval. The
- * default value is {@link #DEFAULT_RANDOMIZATION_FACTOR}. Must fall in the range
- * {@code 0 <= randomizationFactor < 1}.
+ * default value is {@link #DEFAULT_RANDOMIZATION_FACTOR}. Must fall in the range {@code 0 <=
+ * randomizationFactor < 1}.
*
- *
- * A randomization factor of 0.5 results in a random period ranging between 50% below and 50%
+ *
A randomization factor of 0.5 results in a random period ranging between 50% below and 50%
* above the retry interval.
- *
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Builder setRandomizationFactor(double randomizationFactor) {
exponentialBackOffBuilder.setRandomizationFactor(randomizationFactor);
@@ -359,10 +304,8 @@ public final double getMultiplier() {
* Sets the value to multiply the current interval with for each retry attempt. The default
* value is {@link #DEFAULT_MULTIPLIER}. Must be {@code >= 1}.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Builder setMultiplier(double multiplier) {
exponentialBackOffBuilder.setMultiplier(multiplier);
@@ -371,8 +314,8 @@ public Builder setMultiplier(double multiplier) {
/**
* Returns the maximum value of the back off period in milliseconds. Once the current interval
- * reaches this value it stops increasing. The default value is
- * {@link #DEFAULT_MAX_INTERVAL_MILLIS}. Must be {@code >= initialInterval}.
+ * reaches this value it stops increasing. The default value is {@link
+ * #DEFAULT_MAX_INTERVAL_MILLIS}. Must be {@code >= initialInterval}.
*/
public final int getMaxIntervalMillis() {
return exponentialBackOffBuilder.getMaxIntervalMillis();
@@ -380,13 +323,11 @@ public final int getMaxIntervalMillis() {
/**
* Sets the maximum value of the back off period in milliseconds. Once the current interval
- * reaches this value it stops increasing. The default value is
- * {@link #DEFAULT_MAX_INTERVAL_MILLIS}.
+ * reaches this value it stops increasing. The default value is {@link
+ * #DEFAULT_MAX_INTERVAL_MILLIS}.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Builder setMaxIntervalMillis(int maxIntervalMillis) {
exponentialBackOffBuilder.setMaxIntervalMillis(maxIntervalMillis);
@@ -394,33 +335,27 @@ public Builder setMaxIntervalMillis(int maxIntervalMillis) {
}
/**
- * Returns the maximum elapsed time in milliseconds. The default value is
- * {@link #DEFAULT_MAX_ELAPSED_TIME_MILLIS}.
+ * Returns the maximum elapsed time in milliseconds. The default value is {@link
+ * #DEFAULT_MAX_ELAPSED_TIME_MILLIS}.
*
- *
- * If the time elapsed since an {@link ExponentialBackOffPolicy} instance is created goes past
- * the max_elapsed_time then the method {@link #getNextBackOffMillis()} starts returning
+ *
If the time elapsed since an {@link ExponentialBackOffPolicy} instance is created goes
+ * past the max_elapsed_time then the method {@link #getNextBackOffMillis()} starts returning
* {@link BackOffPolicy#STOP}. The elapsed time can be reset by calling {@link #reset()}.
- *
*/
public final int getMaxElapsedTimeMillis() {
return exponentialBackOffBuilder.getMaxElapsedTimeMillis();
}
/**
- * Sets the maximum elapsed time in milliseconds. The default value is
- * {@link #DEFAULT_MAX_ELAPSED_TIME_MILLIS}. Must be {@code > 0}.
+ * Sets the maximum elapsed time in milliseconds. The default value is {@link
+ * #DEFAULT_MAX_ELAPSED_TIME_MILLIS}. Must be {@code > 0}.
*
- *
- * If the time elapsed since an {@link ExponentialBackOffPolicy} instance is created goes past
- * the max_elapsed_time then the method {@link #getNextBackOffMillis()} starts returning
+ *
If the time elapsed since an {@link ExponentialBackOffPolicy} instance is created goes
+ * past the max_elapsed_time then the method {@link #getNextBackOffMillis()} starts returning
* {@link BackOffPolicy#STOP}. The elapsed time can be reset by calling {@link #reset()}.
- *
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Builder setMaxElapsedTimeMillis(int maxElapsedTimeMillis) {
exponentialBackOffBuilder.setMaxElapsedTimeMillis(maxElapsedTimeMillis);
@@ -439,10 +374,8 @@ public final NanoClock getNanoClock() {
/**
* Sets the nano clock ({@link NanoClock#SYSTEM} by default).
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.14
*/
diff --git a/google-http-client/src/main/java/com/google/api/client/http/FileContent.java b/google-http-client/src/main/java/com/google/api/client/http/FileContent.java
index 9f1f22075..5d951c520 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/FileContent.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/FileContent.java
@@ -15,7 +15,6 @@
package com.google.api.client.http;
import com.google.api.client.util.Preconditions;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -25,21 +24,17 @@
* Concrete implementation of {@link AbstractInputStreamContent} that generates repeatable input
* streams based on the contents of a file.
*
- *
- * Sample use:
- *
+ * Sample use:
*
*
*
- private static void setRequestJpegContent(HttpRequest request, File jpegFile) {
- request.setContent(new FileContent("image/jpeg", jpegFile));
- }
+ * private static void setRequestJpegContent(HttpRequest request, File jpegFile) {
+ * request.setContent(new FileContent("image/jpeg", jpegFile));
+ * }
*
*
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.4
* @author moshenko@google.com (Jacob Moshenko)
diff --git a/google-http-client/src/main/java/com/google/api/client/http/GZipEncoding.java b/google-http-client/src/main/java/com/google/api/client/http/GZipEncoding.java
index 07e17b3db..28574a80d 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/GZipEncoding.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/GZipEncoding.java
@@ -15,7 +15,6 @@
package com.google.api.client.http;
import com.google.api.client.util.StreamingContent;
-
import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.OutputStream;
@@ -35,16 +34,18 @@ public String getName() {
public void encode(StreamingContent content, OutputStream out) throws IOException {
// must not close the underlying output stream
- OutputStream out2 = new BufferedOutputStream(out) {
- @Override
- public void close() throws IOException {
- // copy implementation of super.close(), except do not close the underlying output stream
- try {
- flush();
- } catch (IOException ignored) {
- }
- }
- };
+ OutputStream out2 =
+ new BufferedOutputStream(out) {
+ @Override
+ public void close() throws IOException {
+ // copy implementation of super.close(), except do not close the underlying output
+ // stream
+ try {
+ flush();
+ } catch (IOException ignored) {
+ }
+ }
+ };
GZIPOutputStream zipper = new GZIPOutputStream(out2);
content.writeTo(zipper);
// cannot call just zipper.finish() because that would cause a severe memory leak
diff --git a/google-http-client/src/main/java/com/google/api/client/http/GenericUrl.java b/google-http-client/src/main/java/com/google/api/client/http/GenericUrl.java
index 9f70ac120..e18810c89 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/GenericUrl.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/GenericUrl.java
@@ -20,7 +20,6 @@
import com.google.api.client.util.escape.CharEscapers;
import com.google.api.client.util.escape.Escaper;
import com.google.api.client.util.escape.PercentEscaper;
-
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -39,20 +38,14 @@
* the specification RFC 3986: Uniform Resource
* Identifier (URI) .
*
- *
- * The query parameters are specified with the data key name as the parameter name, and the data
+ *
The query parameters are specified with the data key name as the parameter name, and the data
* value as the parameter value. Subclasses can declare fields for known query parameters using the
* {@link Key} annotation. {@code null} parameter names are not allowed, but {@code null} query
* values are allowed.
- *
*
- *
- * Query parameter values are parsed using {@link UrlEncodedParser#parse(String, Object)}.
- *
+ * Query parameter values are parsed using {@link UrlEncodedParser#parse(String, Object)}.
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.0
* @author Yaniv Inbar
@@ -77,36 +70,30 @@ public class GenericUrl extends GenericData {
/**
* Decoded path component by parts with each part separated by a {@code '/'} or {@code null} for
* none, for example {@code "/m8/feeds/contacts/default/full"} is represented by {@code "", "m8",
- *"feeds", "contacts", "default", "full"}.
- *
- * Use {@link #appendRawPath(String)} to append to the path, which ensures that no extra slash is
- * added.
- *
+ * "feeds", "contacts", "default", "full"}.
+ *
+ * Use {@link #appendRawPath(String)} to append to the path, which ensures that no extra slash
+ * is added.
*/
private List pathParts;
/** Fragment component or {@code null} for none. */
private String fragment;
- public GenericUrl() {
- }
+ public GenericUrl() {}
/**
* Constructs from an encoded URL.
*
- *
- * Any known query parameters with pre-defined fields as data keys will be parsed based on their
- * data type. Any unrecognized query parameter will always be parsed as a string.
- *
+ * Any known query parameters with pre-defined fields as data keys will be parsed based on
+ * their data type. Any unrecognized query parameter will always be parsed as a string.
*
- *
- * Any {@link MalformedURLException} is wrapped in an {@link IllegalArgumentException}.
- *
+ * Any {@link MalformedURLException} is wrapped in an {@link IllegalArgumentException}.
*
- *
Upgrade warning: starting in version 1.18 this parses the encodedUrl using
- * new URL(encodedUrl). In previous versions it used new URI(encodedUrl).
- * In particular, this means that only a limited set of schemes are allowed such as "http" and
- * "https", but that parsing is compliant with, at least, RFC 3986.
+ * Upgrade warning: starting in version 1.18 this parses the encodedUrl using new
+ * URL(encodedUrl). In previous versions it used new URI(encodedUrl). In particular, this means
+ * that only a limited set of schemes are allowed such as "http" and "https", but that parsing is
+ * compliant with, at least, RFC 3986.
*
* @param encodedUrl encoded URL, including any existing query parameters that should be parsed
* @throws IllegalArgumentException if URL has a syntax error
@@ -119,11 +106,11 @@ public GenericUrl(String encodedUrl) {
* Constructs from a URI.
*
* @param uri URI
- *
* @since 1.14
*/
public GenericUrl(URI uri) {
- this(uri.getScheme(),
+ this(
+ uri.getScheme(),
uri.getHost(),
uri.getPort(),
uri.getRawPath(),
@@ -136,11 +123,11 @@ public GenericUrl(URI uri) {
* Constructs from a URL.
*
* @param url URL
- *
* @since 1.14
*/
public GenericUrl(URL url) {
- this(url.getProtocol(),
+ this(
+ url.getProtocol(),
url.getHost(),
url.getPort(),
url.getPath(),
@@ -149,7 +136,8 @@ public GenericUrl(URL url) {
url.getUserInfo());
}
- private GenericUrl(String scheme,
+ private GenericUrl(
+ String scheme,
String host,
int port,
String path,
@@ -279,8 +267,8 @@ public final void setPort(int port) {
}
/**
- * Returns the decoded path component by parts with each part separated by a {@code '/'} or
- * {@code null} for none.
+ * Returns the decoded path component by parts with each part separated by a {@code '/'} or {@code
+ * null} for none.
*
* @since 1.5
*/
@@ -289,18 +277,14 @@ public List getPathParts() {
}
/**
- * Sets the decoded path component by parts with each part separated by a {@code '/'} or
- * {@code null} for none.
+ * Sets the decoded path component by parts with each part separated by a {@code '/'} or {@code
+ * null} for none.
*
- *
- * For example {@code "/m8/feeds/contacts/default/full"} is represented by {@code "", "m8",
- *"feeds", "contacts", "default", "full"}.
- *
+ * For example {@code "/m8/feeds/contacts/default/full"} is represented by {@code "", "m8",
+ * "feeds", "contacts", "default", "full"}.
*
- *
- * Use {@link #appendRawPath(String)} to append to the path, which ensures that no extra slash is
- * added.
- *
+ * Use {@link #appendRawPath(String)} to append to the path, which ensures that no extra slash
+ * is added.
*
* @since 1.5
*/
@@ -327,8 +311,8 @@ public final void setFragment(String fragment) {
}
/**
- * Constructs the string representation of the URL, including the path specified by
- * {@link #pathParts} and the query parameters specified by this generic URL.
+ * Constructs the string representation of the URL, including the path specified by {@link
+ * #pathParts} and the query parameters specified by this generic URL.
*/
public final String build() {
return buildAuthority() + buildRelativeUrl();
@@ -337,10 +321,8 @@ public final String build() {
/**
* Constructs the portion of the URL containing the scheme, host and port.
*
- *
- * For the URL {@code "http://example.com/something?action=add"} this method would return
+ *
For the URL {@code "http://example.com/something?action=add"} this method would return
* {@code "http://example.com"}.
- *
*
* @return scheme://[user-info@]host[:port]
* @since 1.9
@@ -364,10 +346,8 @@ public final String buildAuthority() {
/**
* Constructs the portion of the URL beginning at the rooted path.
*
- *
- * For the URL {@code "http://example.com/something?action=add"} this method would return
+ *
For the URL {@code "http://example.com/something?action=add"} this method would return
* {@code "/something?action=add"}.
- *
*
* @return path with with leading '/' if the path is non-empty, query parameters and fragment
* @since 1.9
@@ -390,12 +370,9 @@ public final String buildRelativeUrl() {
/**
* Constructs the URI based on the string representation of the URL from {@link #build()}.
*
- *
- * Any {@link URISyntaxException} is wrapped in an {@link IllegalArgumentException}.
- *
+ * Any {@link URISyntaxException} is wrapped in an {@link IllegalArgumentException}.
*
* @return new URI instance
- *
* @since 1.14
*/
public final URI toURI() {
@@ -405,12 +382,9 @@ public final URI toURI() {
/**
* Constructs the URL based on the string representation of the URL from {@link #build()}.
*
- *
- * Any {@link MalformedURLException} is wrapped in an {@link IllegalArgumentException}.
- *
+ * Any {@link MalformedURLException} is wrapped in an {@link IllegalArgumentException}.
*
* @return new URL instance
- *
* @since 1.14
*/
public final URL toURL() {
@@ -421,12 +395,9 @@ public final URL toURL() {
* Constructs the URL based on {@link URL#URL(URL, String)} with this URL representation from
* {@link #toURL()} and a relative url.
*
- *
- * Any {@link MalformedURLException} is wrapped in an {@link IllegalArgumentException}.
- *
+ * Any {@link MalformedURLException} is wrapped in an {@link IllegalArgumentException}.
*
* @return new URL instance
- *
* @since 1.14
*/
public final URL toURL(String relativeUrl) {
@@ -477,8 +448,8 @@ public Collection getAll(String name) {
/**
* Returns the raw encoded path computed from the {@link #pathParts}.
*
- * @return raw encoded path computed from the {@link #pathParts} or {@code null} if
- * {@link #pathParts} is {@code null}
+ * @return raw encoded path computed from the {@link #pathParts} or {@code null} if {@link
+ * #pathParts} is {@code null}
*/
public String getRawPath() {
List pathParts = this.pathParts;
@@ -502,11 +473,10 @@ public void setRawPath(String encodedPath) {
/**
* Appends the given raw encoded path to the current {@link #pathParts}, setting field only if it
* is {@code null} or empty.
- *
- * The last part of the {@link #pathParts} is merged with the first part of the path parts
+ *
+ *
The last part of the {@link #pathParts} is merged with the first part of the path parts
* computed from the given encoded path. Thus, if the current raw encoded path is {@code "a"}, and
* the given encoded path is {@code "b"}, then the resulting raw encoded path is {@code "ab"}.
- *
*
* @param encodedPath raw encoded path or {@code null} to ignore
*/
@@ -526,11 +496,11 @@ public void appendRawPath(String encodedPath) {
/**
* Returns the decoded path parts for the given encoded path.
*
- * @param encodedPath slash-prefixed encoded path, for example
- * {@code "/m8/feeds/contacts/default/full"}
+ * @param encodedPath slash-prefixed encoded path, for example {@code
+ * "/m8/feeds/contacts/default/full"}
* @return decoded path parts, with each part assumed to be preceded by a {@code '/'}, for example
- * {@code "", "m8", "feeds", "contacts", "default", "full"}, or {@code null} for
- * {@code null} or {@code ""} input
+ * {@code "", "m8", "feeds", "contacts", "default", "full"}, or {@code null} for {@code null}
+ * or {@code ""} input
*/
public static List toPathParts(String encodedPath) {
if (encodedPath == null || encodedPath.length() == 0) {
@@ -567,9 +537,7 @@ private void appendRawPathFromParts(StringBuilder buf) {
}
}
- /**
- * Adds query parameters from the provided entrySet into the buffer.
- */
+ /** Adds query parameters from the provided entrySet into the buffer. */
static void addQueryParams(Set> entrySet, StringBuilder buf) {
// (similar to UrlEncodedContent)
boolean first = true;
@@ -607,9 +575,7 @@ private static boolean appendParam(boolean first, StringBuilder buf, String name
/**
* Returns the URI for the given encoded URL.
*
- *
- * Any {@link URISyntaxException} is wrapped in an {@link IllegalArgumentException}.
- *
+ * Any {@link URISyntaxException} is wrapped in an {@link IllegalArgumentException}.
*
* @param encodedUrl encoded URL
* @return URI
@@ -625,9 +591,7 @@ private static URI toURI(String encodedUrl) {
/**
* Returns the URI for the given encoded URL.
*
- *
- * Any {@link MalformedURLException} is wrapped in an {@link IllegalArgumentException}.
- *
+ * Any {@link MalformedURLException} is wrapped in an {@link IllegalArgumentException}.
*
* @param encodedUrl encoded URL
* @return URL
diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpBackOffIOExceptionHandler.java b/google-http-client/src/main/java/com/google/api/client/http/HttpBackOffIOExceptionHandler.java
index 35fca7346..253cc613e 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/HttpBackOffIOExceptionHandler.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/HttpBackOffIOExceptionHandler.java
@@ -19,35 +19,26 @@
import com.google.api.client.util.Beta;
import com.google.api.client.util.Preconditions;
import com.google.api.client.util.Sleeper;
-
import java.io.IOException;
/**
- * {@link Beta}
- * It is designed to work with only one {@link HttpRequest} at a time. As a result you MUST create a
- * new instance of {@link HttpBackOffIOExceptionHandler} with a new instance of {@link BackOff} for
- * each instance of {@link HttpRequest}.
- *
+ * It is designed to work with only one {@link HttpRequest} at a time. As a result you MUST
+ * create a new instance of {@link HttpBackOffIOExceptionHandler} with a new instance of {@link
+ * BackOff} for each instance of {@link HttpRequest}.
*
- *
- * Sample usage:
- *
+ * Sample usage:
*
*
- request.setIOExceptionHandler(new HttpBackOffIOExceptionHandler(new ExponentialBackOff());
+ * request.setIOExceptionHandler(new HttpBackOffIOExceptionHandler(new ExponentialBackOff());
*
*
- *
- * Note: Implementation doesn't call {@link BackOff#reset} at all, since it expects a new
- * {@link BackOff} instance.
- *
+ * Note: Implementation doesn't call {@link BackOff#reset} at all, since it expects a new {@link
+ * BackOff} instance.
*
- *
- * Implementation is not thread-safe
- *
+ * Implementation is not thread-safe
*
* @author Eyal Peled
* @since 1.15
@@ -83,14 +74,10 @@ public final Sleeper getSleeper() {
/**
* Sets the sleeper.
*
- *
- * The default value is {@link Sleeper#DEFAULT}.
- *
+ * The default value is {@link Sleeper#DEFAULT}.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public HttpBackOffIOExceptionHandler setSleeper(Sleeper sleeper) {
this.sleeper = Preconditions.checkNotNull(sleeper);
@@ -100,10 +87,8 @@ public HttpBackOffIOExceptionHandler setSleeper(Sleeper sleeper) {
/**
* {@inheritDoc}
*
- *
- * Handles the request with {@link BackOff}. That means that if back-off is required a call to
+ *
Handles the request with {@link BackOff}. That means that if back-off is required a call to
* {@link Sleeper#sleep(long)} will be made.
- *
*/
public boolean handleIOException(HttpRequest request, boolean supportsRetry) throws IOException {
if (!supportsRetry) {
diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpBackOffUnsuccessfulResponseHandler.java b/google-http-client/src/main/java/com/google/api/client/http/HttpBackOffUnsuccessfulResponseHandler.java
index b9875273f..5e1ae2cc6 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/HttpBackOffUnsuccessfulResponseHandler.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/HttpBackOffUnsuccessfulResponseHandler.java
@@ -22,32 +22,24 @@
import java.io.IOException;
/**
- * {@link Beta}
- * It is designed to work with only one {@link HttpRequest} at a time. As a result you MUST create a
- * new instance of {@link HttpBackOffUnsuccessfulResponseHandler} with a new instance of
+ *
It is designed to work with only one {@link HttpRequest} at a time. As a result you MUST
+ * create a new instance of {@link HttpBackOffUnsuccessfulResponseHandler} with a new instance of
* {@link BackOff} for each instance of {@link HttpRequest}.
- *
*
- *
- * Sample usage:
- *
+ * Sample usage:
*
*
- request.setUnsuccessfulResponseHandler(
- new HttpBackOffUnsuccessfulResponseHandler(new ExponentialBackOff()));
+ * request.setUnsuccessfulResponseHandler(
+ * new HttpBackOffUnsuccessfulResponseHandler(new ExponentialBackOff()));
*
*
- *
- * Note: Implementation doesn't call {@link BackOff#reset} at all, since it expects a new
- * {@link BackOff} instance.
- *
+ * Note: Implementation doesn't call {@link BackOff#reset} at all, since it expects a new {@link
+ * BackOff} instance.
*
- *
- * Implementation is not thread-safe
- *
+ * Implementation is not thread-safe
*
* @author Eyal Peled
* @since 1.15
@@ -90,14 +82,10 @@ public final BackOffRequired getBackOffRequired() {
* Sets the {@link BackOffRequired} instance which determines if back-off is required based on an
* abnormal HTTP response.
*
- *
- * The default value is {@link BackOffRequired#ON_SERVER_ERROR}.
- *
+ * The default value is {@link BackOffRequired#ON_SERVER_ERROR}.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public HttpBackOffUnsuccessfulResponseHandler setBackOffRequired(
BackOffRequired backOffRequired) {
@@ -113,14 +101,10 @@ public final Sleeper getSleeper() {
/**
* Sets the sleeper.
*
- *
- * The default value is {@link Sleeper#DEFAULT}.
- *
+ * The default value is {@link Sleeper#DEFAULT}.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public HttpBackOffUnsuccessfulResponseHandler setSleeper(Sleeper sleeper) {
this.sleeper = Preconditions.checkNotNull(sleeper);
@@ -151,7 +135,7 @@ public boolean handleResponse(HttpRequest request, HttpResponse response, boolea
}
/**
- * {@link Beta}
- * Implementations don't need to be thread-safe.
- *
+ * Implementations don't need to be thread-safe.
*
* @since 1.0
* @author Yaniv Inbar
diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpEncoding.java b/google-http-client/src/main/java/com/google/api/client/http/HttpEncoding.java
index 154132d28..38702b82e 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/HttpEncoding.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/HttpEncoding.java
@@ -15,16 +15,13 @@
package com.google.api.client.http;
import com.google.api.client.util.StreamingContent;
-
import java.io.IOException;
import java.io.OutputStream;
/**
* HTTP content encoding.
*
- *
- * Implementations don't need to be thread-safe.
- *
+ * Implementations don't need to be thread-safe.
*
* @since 1.14
* @author Yaniv Inbar
@@ -37,11 +34,9 @@ public interface HttpEncoding {
/**
* Encodes the streaming content into the output stream.
*
- *
- * Implementations must not close the output stream, and instead should flush the output stream.
- * Some callers may assume that the the output stream has not been closed, and will fail to work
- * if it has been closed.
- *
+ * Implementations must not close the output stream, and instead should flush the output
+ * stream. Some callers may assume that the the output stream has not been closed, and will fail
+ * to work if it has been closed.
*
* @param content streaming content
* @param out output stream
diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpEncodingStreamingContent.java b/google-http-client/src/main/java/com/google/api/client/http/HttpEncodingStreamingContent.java
index 6da9a6848..b8a83dfb4 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/HttpEncodingStreamingContent.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/HttpEncodingStreamingContent.java
@@ -16,16 +16,13 @@
import com.google.api.client.util.Preconditions;
import com.google.api.client.util.StreamingContent;
-
import java.io.IOException;
import java.io.OutputStream;
/**
* Streaming content based on an HTTP encoding.
*
- *
- * Implementation is thread-safe only if the streaming content and HTTP encoding are thread-safe.
- *
+ * Implementation is thread-safe only if the streaming content and HTTP encoding are thread-safe.
*
* @since 1.14
* @author Yaniv Inbar
diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpExecuteInterceptor.java b/google-http-client/src/main/java/com/google/api/client/http/HttpExecuteInterceptor.java
index 514961784..21fc247a9 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/HttpExecuteInterceptor.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/HttpExecuteInterceptor.java
@@ -20,55 +20,47 @@
* HTTP request execute interceptor to intercept the start of {@link HttpRequest#execute()} before
* executing the HTTP request.
*
- *
- * For example, this might be used to sign a request for OAuth:
- *
+ * For example, this might be used to sign a request for OAuth:
*
*
- public class OAuthSigner implements HttpExecuteInterceptor {
- public void intercept(HttpRequest request) throws IOException {
- // sign request...
- }
- }
+ * public class OAuthSigner implements HttpExecuteInterceptor {
+ * public void intercept(HttpRequest request) throws IOException {
+ * // sign request...
+ * }
+ * }
*
*
- *
- * Sample usage with a request factory:
- *
+ * Sample usage with a request factory:
*
*
- public static HttpRequestFactory createRequestFactory(HttpTransport transport) {
- final OAuthSigner signer = new OAuthSigner(...);
- return transport.createRequestFactory(new HttpRequestInitializer() {
- public void initialize(HttpRequest request) {
- request.setInterceptor(signer);
- }
- });
- }
+ * public static HttpRequestFactory createRequestFactory(HttpTransport transport) {
+ * final OAuthSigner signer = new OAuthSigner(...);
+ * return transport.createRequestFactory(new HttpRequestInitializer() {
+ * public void initialize(HttpRequest request) {
+ * request.setInterceptor(signer);
+ * }
+ * });
+ * }
*
*
- *
- * More complex usage example:
- *
+ * More complex usage example:
*
*
- public static HttpRequestFactory createRequestFactory2(HttpTransport transport) {
- final OAuthSigner signer = new OAuthSigner(...);
- return transport.createRequestFactory(new HttpRequestInitializer() {
- public void initialize(HttpRequest request) {
- request.setInterceptor(new HttpExecuteInterceptor() {
- public void intercept(HttpRequest request) throws IOException {
- signer.intercept(request);
- }
- });
- }
- });
- }
+ * public static HttpRequestFactory createRequestFactory2(HttpTransport transport) {
+ * final OAuthSigner signer = new OAuthSigner(...);
+ * return transport.createRequestFactory(new HttpRequestInitializer() {
+ * public void initialize(HttpRequest request) {
+ * request.setInterceptor(new HttpExecuteInterceptor() {
+ * public void intercept(HttpRequest request) throws IOException {
+ * signer.intercept(request);
+ * }
+ * });
+ * }
+ * });
+ * }
*
*
- *
- * Implementations should normally be thread-safe.
- *
+ * Implementations should normally be thread-safe.
*
* @since 1.0
* @author Yaniv Inbar
diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpHeaders.java b/google-http-client/src/main/java/com/google/api/client/http/HttpHeaders.java
index cd60cd3e1..caa88c99e 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/HttpHeaders.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/HttpHeaders.java
@@ -25,7 +25,6 @@
import com.google.api.client.util.StringUtils;
import com.google.api.client.util.Throwables;
import com.google.api.client.util.Types;
-
import java.io.IOException;
import java.io.Writer;
import java.lang.reflect.Type;
@@ -45,13 +44,9 @@
* Stores HTTP headers used in an HTTP request or response, as defined in Header Field Definitions .
*
- *
- * {@code null} is not allowed as a name or value of a header. Names are case-insensitive.
- *
+ * {@code null} is not allowed as a name or value of a header. Names are case-insensitive.
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.0
* @author Yaniv Inbar
@@ -192,10 +187,8 @@ public final String getAccept() {
/**
* Sets the {@code "Accept"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -216,9 +209,7 @@ public final String getAcceptEncoding() {
/**
* Sets the {@code "Accept-Encoding"} header or {@code null} for none.
*
- *
- * By default, this is {@code "gzip"}.
- *
+ * By default, this is {@code "gzip"}.
*
* @since 1.5
*/
@@ -248,10 +239,8 @@ public final List getAuthorizationAsList() {
/**
* Sets the {@code "Authorization"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -262,10 +251,8 @@ public HttpHeaders setAuthorization(String authorization) {
/**
* Sets the {@code "Authorization"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.13
*/
@@ -286,10 +273,8 @@ public final String getCacheControl() {
/**
* Sets the {@code "Cache-Control"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -310,10 +295,8 @@ public final String getContentEncoding() {
/**
* Sets the {@code "Content-Encoding"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -334,10 +317,8 @@ public final Long getContentLength() {
/**
* Sets the {@code "Content-Length"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -358,10 +339,8 @@ public final String getContentMD5() {
/**
* Sets the {@code "Content-MD5"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -382,10 +361,8 @@ public final String getContentRange() {
/**
* Sets the {@code "Content-Range"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -406,10 +383,8 @@ public final String getContentType() {
/**
* Sets the {@code "Content-Type"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -421,9 +396,7 @@ public HttpHeaders setContentType(String contentType) {
/**
* Returns the first {@code "Cookie"} header or {@code null} for none.
*
- *
- * See Cookie Specification.
- *
+ * See Cookie Specification.
*
* @since 1.6
*/
@@ -434,10 +407,8 @@ public final String getCookie() {
/**
* Sets the {@code "Cookie"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.6
*/
@@ -458,10 +429,8 @@ public final String getDate() {
/**
* Sets the {@code "Date"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -482,10 +451,8 @@ public final String getETag() {
/**
* Sets the {@code "ETag"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -506,10 +473,8 @@ public final String getExpires() {
/**
* Sets the {@code "Expires"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -530,10 +495,8 @@ public final String getIfModifiedSince() {
/**
* Sets the {@code "If-Modified-Since"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -554,10 +517,8 @@ public final String getIfMatch() {
/**
* Sets the {@code "If-Match"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -578,10 +539,8 @@ public final String getIfNoneMatch() {
/**
* Sets the {@code "If-None-Match"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -602,10 +561,8 @@ public final String getIfUnmodifiedSince() {
/**
* Sets the {@code "If-Unmodified-Since"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -626,10 +583,8 @@ public final String getIfRange() {
/**
* Sets the {@code "If-Range"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.14
*/
@@ -650,10 +605,8 @@ public final String getLastModified() {
/**
* Sets the {@code "Last-Modified"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -674,10 +627,8 @@ public final String getLocation() {
/**
* Sets the {@code "Location"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -698,10 +649,8 @@ public final String getMimeVersion() {
/**
* Sets the {@code "MIME-Version"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -722,10 +671,8 @@ public final String getRange() {
/**
* Sets the {@code "Range"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -746,10 +693,8 @@ public final String getRetryAfter() {
/**
* Sets the {@code "Retry-After"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -770,10 +715,8 @@ public final String getUserAgent() {
/**
* Sets the {@code "User-Agent"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -803,10 +746,8 @@ public final List getAuthenticateAsList() {
/**
* Sets the {@code "WWW-Authenticate"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -856,10 +797,8 @@ public final Long getAge() {
/**
* Sets the {@code "Age"} header or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.14
*/
@@ -872,10 +811,8 @@ public HttpHeaders setAge(Long age) {
* Sets the {@link #authorization} header as specified in Basic Authentication Scheme .
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.2
*/
@@ -886,13 +823,15 @@ public HttpHeaders setBasicAuthentication(String username, String password) {
return setAuthorization("Basic " + encoded);
}
- private static void addHeader(Logger logger,
+ private static void addHeader(
+ Logger logger,
StringBuilder logbuf,
StringBuilder curlbuf,
LowLevelHttpRequest lowLevelHttpRequest,
String name,
Object value,
- Writer writer) throws IOException {
+ Writer writer)
+ throws IOException {
// ignore nulls
if (value == null || Data.isNull(value)) {
return;
@@ -926,12 +865,11 @@ private static void addHeader(Logger logger,
}
}
- /**
- * Returns the string header value for the given header value as an object.
- */
+ /** Returns the string header value for the given header value as an object. */
private static String toStringValue(Object headerValue) {
return headerValue instanceof Enum
- ? FieldInfo.of((Enum) headerValue).getName() : headerValue.toString();
+ ? FieldInfo.of((Enum) headerValue).getName()
+ : headerValue.toString();
}
/**
@@ -941,12 +879,17 @@ private static String toStringValue(Object headerValue) {
* @param logbuf log buffer or {@code null} for none
* @param curlbuf log buffer for logging curl requests or {@code null} for none
* @param logger logger or {@code null} for none. Logger must be specified if log buffer is
- * specified
+ * specified
* @param lowLevelHttpRequest low level HTTP request where HTTP headers will be serialized to or
- * {@code null} for none
+ * {@code null} for none
*/
- static void serializeHeaders(HttpHeaders headers, StringBuilder logbuf, StringBuilder curlbuf,
- Logger logger, LowLevelHttpRequest lowLevelHttpRequest) throws IOException {
+ static void serializeHeaders(
+ HttpHeaders headers,
+ StringBuilder logbuf,
+ StringBuilder curlbuf,
+ Logger logger,
+ LowLevelHttpRequest lowLevelHttpRequest)
+ throws IOException {
serializeHeaders(headers, logbuf, curlbuf, logger, lowLevelHttpRequest, null);
}
@@ -956,9 +899,8 @@ static void serializeHeaders(HttpHeaders headers, StringBuilder logbuf, StringBu
* @param headers HTTP headers
* @param logbuf log buffer or {@code null} for none
* @param logger logger or {@code null} for none. Logger must be specified if log buffer is
- * specified
+ * specified
* @param writer Writer where HTTP headers will be serialized to or {@code null} for none
- *
* @since 1.9
*/
public static void serializeHeadersForMultipartRequests(
@@ -966,17 +908,21 @@ public static void serializeHeadersForMultipartRequests(
serializeHeaders(headers, logbuf, null, logger, null, writer);
}
- static void serializeHeaders(HttpHeaders headers,
+ static void serializeHeaders(
+ HttpHeaders headers,
StringBuilder logbuf,
StringBuilder curlbuf,
Logger logger,
LowLevelHttpRequest lowLevelHttpRequest,
- Writer writer) throws IOException {
+ Writer writer)
+ throws IOException {
HashSet headerNames = new HashSet();
for (Map.Entry headerEntry : headers.entrySet()) {
String name = headerEntry.getKey();
- Preconditions.checkArgument(headerNames.add(name),
- "multiple headers of the same name (headers are case insensitive): %s", name);
+ Preconditions.checkArgument(
+ headerNames.add(name),
+ "multiple headers of the same name (headers are case insensitive): %s",
+ name);
Object value = headerEntry.getValue();
if (value != null) {
// compute the display name from the declared field name to fix capitalization
@@ -988,13 +934,8 @@ static void serializeHeaders(HttpHeaders headers,
Class valueClass = value.getClass();
if (value instanceof Iterable || valueClass.isArray()) {
for (Object repeatedValue : Types.iterableOf(value)) {
- addHeader(logger,
- logbuf,
- curlbuf,
- lowLevelHttpRequest,
- displayName,
- repeatedValue,
- writer);
+ addHeader(
+ logger, logbuf, curlbuf, lowLevelHttpRequest, displayName, repeatedValue, writer);
}
} else {
addHeader(logger, logbuf, curlbuf, lowLevelHttpRequest, displayName, value, writer);
@@ -1011,7 +952,7 @@ static void serializeHeaders(HttpHeaders headers,
*
* @param response Response from which the headers are copied
* @param logger {@link StringBuilder} to which logging output is added or {@code null} to disable
- * logging
+ * logging
* @since 1.10
*/
public final void fromHttpResponse(LowLevelHttpResponse response, StringBuilder logger)
@@ -1151,9 +1092,7 @@ public ParseHeaderState(HttpHeaders headers, StringBuilder logger) {
this.arrayValueMap = new ArrayValueMap(headers);
}
- /**
- * Finishes the parsing-process by setting all array-values.
- */
+ /** Finishes the parsing-process by setting all array-values. */
void finish() {
arrayValueMap.setValues();
}
@@ -1178,7 +1117,9 @@ void parseHeader(String headerName, String headerValue, ParseHeaderState state)
// array that can handle repeating values
Class rawArrayComponentType =
Types.getRawArrayComponentType(context, Types.getArrayComponentType(type));
- arrayValueMap.put(fieldInfo.getField(), rawArrayComponentType,
+ arrayValueMap.put(
+ fieldInfo.getField(),
+ rawArrayComponentType,
parseValue(rawArrayComponentType, context, headerValue));
} else if (Types.isAssignableToOrFrom(
Types.getRawArrayComponentType(context, type), Iterable.class)) {
diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpIOExceptionHandler.java b/google-http-client/src/main/java/com/google/api/client/http/HttpIOExceptionHandler.java
index 4020a136e..f37cfef5e 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/HttpIOExceptionHandler.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/HttpIOExceptionHandler.java
@@ -16,32 +16,29 @@
import com.google.api.client.util.BackOff;
import com.google.api.client.util.Beta;
-
import java.io.IOException;
/**
- * {@link Beta}
- * For example, this might be used to handle an {@link IOException} with {@link BackOff} policy.
- *
+ * For example, this might be used to handle an {@link IOException} with {@link BackOff} policy.
*
*
- public static class HttpBackOffIOExceptionHandler implements HttpIOExceptionHandler {
- BackOff backOff;
- Sleeper sleeper;
- public boolean handle(HttpRequest request, boolean supportsRetry) throws IOException {
- if (!supportsRetry) {
- return false;
- }
- try {
- return BackOffUtils.next(sleeper, backOff);
- } catch (InterruptedException exception) {
- return false;
- }
- }
- }
+ * public static class HttpBackOffIOExceptionHandler implements HttpIOExceptionHandler {
+ * BackOff backOff;
+ * Sleeper sleeper;
+ * public boolean handle(HttpRequest request, boolean supportsRetry) throws IOException {
+ * if (!supportsRetry) {
+ * return false;
+ * }
+ * try {
+ * return BackOffUtils.next(sleeper, backOff);
+ * } catch (InterruptedException exception) {
+ * return false;
+ * }
+ * }
+ * }
*
*
* @author Eyal Peled
@@ -53,18 +50,16 @@ public interface HttpIOExceptionHandler {
/**
* Invoked when an {@link IOException} is thrown during an HTTP request.
*
- *
- * There is a simple rule that one must follow: If you modify the request object or modify its
+ *
There is a simple rule that one must follow: If you modify the request object or modify its
* execute interceptors in a way that should resolve the error, you must return {@code true} to
* issue a retry.
- *
*
* @param request request object that can be read from for context or modified before retry
* @param supportsRetry whether there will actually be a retry if this handler return {@code true}
- * . Some handlers may want to have an effect only when there will actually be a retry
- * after they handle their event (e.g. a handler that implements backoff policy).
+ * . Some handlers may want to have an effect only when there will actually be a retry after
+ * they handle their event (e.g. a handler that implements backoff policy).
* @return whether or not this handler has made a change that will require the request to be
- * re-sent.
+ * re-sent.
*/
boolean handleIOException(HttpRequest request, boolean supportsRetry) throws IOException;
}
diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpMediaType.java b/google-http-client/src/main/java/com/google/api/client/http/HttpMediaType.java
index 3dc9c8245..9bab77b13 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/HttpMediaType.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/HttpMediaType.java
@@ -15,7 +15,6 @@
package com.google.api.client.http;
import com.google.api.client.util.Preconditions;
-
import java.nio.charset.Charset;
import java.util.Collections;
import java.util.Locale;
@@ -27,12 +26,10 @@
import java.util.regex.Pattern;
/**
- * HTTP Media-type as specified in the HTTP RFC (
- * {@link "http://tools.ietf.org/html/rfc2616#section-3.7"}).
+ * HTTP Media-type as specified in the HTTP RFC ( {@link
+ * "http://tools.ietf.org/html/rfc2616#section-3.7"}).
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @author Matthias Linder (mlinder)
* @since 1.10
@@ -79,22 +76,39 @@ public final class HttpMediaType {
// detection can be done on a per-type/parameter basis.
String typeOrKey = "[^\\s/=;\"]+"; // only disallow separators
String wholeParameterSection = ";.*";
- FULL_MEDIA_TYPE_REGEX = Pattern.compile(
- "\\s*(" + typeOrKey + ")/(" + typeOrKey + ")" + // main type (G1)/sub type (G2)
- "\\s*(" + wholeParameterSection + ")?", Pattern.DOTALL); // parameters (G3) or null
+ FULL_MEDIA_TYPE_REGEX =
+ Pattern.compile(
+ "\\s*("
+ + typeOrKey
+ + ")/("
+ + typeOrKey
+ + ")"
+ + // main type (G1)/sub type (G2)
+ "\\s*("
+ + wholeParameterSection
+ + ")?",
+ Pattern.DOTALL); // parameters (G3) or null
// PARAMETER_REGEX: Semi-restrictive regex matching each parameter in the parameter section.
// We also allow multipart values here (http://www.w3.org/Protocols/rfc1341/7_2_Multipart.html)
// although those do not fully conform to the HTTP spec.
String quotedParameterValue = "\"([^\"]*)\"";
String unquotedParameterValue = "[^\\s;\"]*";
- String parameterValue = quotedParameterValue + "|" + unquotedParameterValue;
- PARAMETER_REGEX = Pattern.compile("\\s*;\\s*(" + typeOrKey + ")" + // parameter key (G1)
- "=(" + parameterValue + ")"); // G2 (if quoted) and else G3
+ String parameterValue = quotedParameterValue + "|" + unquotedParameterValue;
+ PARAMETER_REGEX =
+ Pattern.compile(
+ "\\s*;\\s*("
+ + typeOrKey
+ + ")"
+ + // parameter key (G1)
+ "=("
+ + parameterValue
+ + ")"); // G2 (if quoted) and else G3
}
/**
* Initializes the {@link HttpMediaType} by setting the specified media type.
+ *
* @param type main media type, for example {@code "text"}
* @param subType sub media type, for example {@code "plain"}
*/
@@ -125,9 +139,7 @@ public HttpMediaType setType(String type) {
return this;
}
- /**
- * Returns the main media type, for example {@code "text"}, or {@code null} for '*'.
- */
+ /** Returns the main media type, for example {@code "text"}, or {@code null} for '*'. */
public String getType() {
return type;
}
@@ -145,21 +157,17 @@ public HttpMediaType setSubType(String subType) {
return this;
}
- /**
- * Returns the sub media type, for example {@code "plain"} when using {@code "text"}.
- */
+ /** Returns the sub media type, for example {@code "plain"} when using {@code "text"}. */
public String getSubType() {
return subType;
}
/**
- * Sets the full media type by parsing a full content-type string, for example
- * {@code "text/plain; foo=bar"}.
+ * Sets the full media type by parsing a full content-type string, for example {@code "text/plain;
+ * foo=bar"}.
*
- *
- * This method will not clear existing parameters. Use {@link #clearParameters()} if this behavior
- * is required.
- *
+ * This method will not clear existing parameters. Use {@link #clearParameters()} if this
+ * behavior is required.
*
* @param combinedType full media type in the {@code "maintype/subtype; key=value"} format.
*/
@@ -225,9 +233,7 @@ public HttpMediaType removeParameter(String name) {
return this;
}
- /**
- * Removes all set parameters from this media type.
- */
+ /** Removes all set parameters from this media type. */
public void clearParameters() {
cachedBuildResult = null;
parameters.clear();
@@ -255,9 +261,7 @@ private static String quoteString(String unquotedString) {
return "\"" + escapedString + "\"";
}
- /**
- * Builds the full media type string which can be passed in the Content-Type header.
- */
+ /** Builds the full media type string which can be passed in the Content-Type header. */
public String build() {
if (cachedBuildResult != null) {
return cachedBuildResult;
@@ -286,11 +290,12 @@ public String toString() {
}
/**
- * Returns {@code true} if the specified media type has both the same type and subtype, or
- * {@code false} if they don't match or the media type is {@code null}.
+ * Returns {@code true} if the specified media type has both the same type and subtype, or {@code
+ * false} if they don't match or the media type is {@code null}.
*/
public boolean equalsIgnoreParameters(HttpMediaType mediaType) {
- return mediaType != null && getType().equalsIgnoreCase(mediaType.getType())
+ return mediaType != null
+ && getType().equalsIgnoreCase(mediaType.getType())
&& getSubType().equalsIgnoreCase(mediaType.getSubType());
}
@@ -300,8 +305,10 @@ public boolean equalsIgnoreParameters(HttpMediaType mediaType) {
*/
public static boolean equalsIgnoreParameters(String mediaTypeA, String mediaTypeB) {
// TODO(mlinder): Make the HttpMediaType.isSameType implementation more performant.
- return (mediaTypeA == null && mediaTypeB == null) || mediaTypeA != null && mediaTypeB != null
- && new HttpMediaType(mediaTypeA).equalsIgnoreParameters(new HttpMediaType(mediaTypeB));
+ return (mediaTypeA == null && mediaTypeB == null)
+ || mediaTypeA != null
+ && mediaTypeB != null
+ && new HttpMediaType(mediaTypeA).equalsIgnoreParameters(new HttpMediaType(mediaTypeB));
}
/**
@@ -314,9 +321,7 @@ public HttpMediaType setCharsetParameter(Charset charset) {
return this;
}
- /**
- * Returns the specified charset or {@code null} if unset.
- */
+ /** Returns the specified charset or {@code null} if unset. */
public Charset getCharsetParameter() {
String value = getParameter("charset");
return value == null ? null : Charset.forName(value);
diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpMethods.java b/google-http-client/src/main/java/com/google/api/client/http/HttpMethods.java
index 0ca55d325..34726362e 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/HttpMethods.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/HttpMethods.java
@@ -52,6 +52,5 @@ public final class HttpMethods {
/** HTTP TRACE method. */
public static final String TRACE = "TRACE";
- private HttpMethods() {
- }
+ private HttpMethods() {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java b/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java
index 2e949625e..05d6cc906 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java
@@ -22,14 +22,12 @@
import com.google.api.client.util.Sleeper;
import com.google.api.client.util.StreamingContent;
import com.google.api.client.util.StringUtils;
-
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import io.opencensus.common.Scope;
import io.opencensus.contrib.http.util.HttpTraceAttributeConstants;
import io.opencensus.trace.AttributeValue;
import io.opencensus.trace.Span;
import io.opencensus.trace.Tracer;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.concurrent.Callable;
@@ -43,9 +41,7 @@
/**
* HTTP request.
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.0
* @author Yaniv Inbar
@@ -62,10 +58,9 @@ public final class HttpRequest {
/**
* User agent suffix for all requests.
*
- *
- * Includes a {@code "(gzip)"} suffix in case the server -- as Google's servers may do -- checks
- * the {@code User-Agent} header to try to detect if the client accepts gzip-encoded responses.
- *
+ * Includes a {@code "(gzip)"} suffix in case the server -- as Google's servers may do --
+ * checks the {@code User-Agent} header to try to detect if the client accepts gzip-encoded
+ * responses.
*
* @since 1.4
*/
@@ -92,49 +87,39 @@ public final class HttpRequest {
/**
* HTTP response headers.
*
- *
- * For example, this can be used if you want to use a subclass of {@link HttpHeaders} called
+ *
For example, this can be used if you want to use a subclass of {@link HttpHeaders} called
* MyHeaders to process the response:
- *
*
*
- static String executeAndGetValueOfSomeCustomHeader(HttpRequest request) {
- MyHeaders responseHeaders = new MyHeaders();
- request.responseHeaders = responseHeaders;
- HttpResponse response = request.execute();
- return responseHeaders.someCustomHeader;
- }
+ * static String executeAndGetValueOfSomeCustomHeader(HttpRequest request) {
+ * MyHeaders responseHeaders = new MyHeaders();
+ * request.responseHeaders = responseHeaders;
+ * HttpResponse response = request.execute();
+ * return responseHeaders.someCustomHeader;
+ * }
*
*/
private HttpHeaders responseHeaders = new HttpHeaders();
/**
* The number of retries that will be allowed to execute before the request will be terminated or
- * {@code 0} to not retry requests. Retries occur as a result of either
- * {@link HttpUnsuccessfulResponseHandler} or {@link HttpIOExceptionHandler} which handles
- * abnormal HTTP response or the I/O exception.
+ * {@code 0} to not retry requests. Retries occur as a result of either {@link
+ * HttpUnsuccessfulResponseHandler} or {@link HttpIOExceptionHandler} which handles abnormal HTTP
+ * response or the I/O exception.
*/
private int numRetries = DEFAULT_NUMBER_OF_RETRIES;
/**
* Determines the limit to the content size that will be logged during {@link #execute()}.
*
- *
- * Content will only be logged if {@link #isLoggingEnabled} is {@code true}.
- *
+ * Content will only be logged if {@link #isLoggingEnabled} is {@code true}.
*
- *
- * If the content size is greater than this limit then it will not be logged.
- *
+ * If the content size is greater than this limit then it will not be logged.
*
- *
- * Can be set to {@code 0} to disable content logging. This is useful for example if content has
- * sensitive data such as authentication information.
- *
+ * Can be set to {@code 0} to disable content logging. This is useful for example if content
+ * has sensitive data such as authentication information.
*
- *
- * Defaults to 16KB.
- *
+ * Defaults to 16KB.
*/
private int contentLoggingLimit = 0x4000;
@@ -165,17 +150,14 @@ static String executeAndGetValueOfSomeCustomHeader(HttpRequest request) {
*/
private int readTimeout = 20 * 1000;
- /**
- * Timeout in milliseconds to set POST/PUT data or {@code 0} for an infinite timeout.
- */
+ /** Timeout in milliseconds to set POST/PUT data or {@code 0} for an infinite timeout. */
private int writeTimeout = 0;
/** HTTP unsuccessful (non-2XX) response handler or {@code null} for none. */
private HttpUnsuccessfulResponseHandler unsuccessfulResponseHandler;
/** HTTP I/O exception handler or {@code null} for none. */
- @Beta
- private HttpIOExceptionHandler ioExceptionHandler;
+ @Beta private HttpIOExceptionHandler ioExceptionHandler;
/** HTTP response interceptor or {@code null} for none. */
private HttpResponseInterceptor responseInterceptor;
@@ -186,12 +168,8 @@ static String executeAndGetValueOfSomeCustomHeader(HttpRequest request) {
/** HTTP content encoding or {@code null} for none. */
private HttpEncoding encoding;
- /**
- * The {@link BackOffPolicy} to use between retry attempts or {@code null} for none.
- */
- @Deprecated
- @Beta
- private BackOffPolicy backOffPolicy;
+ /** The {@link BackOffPolicy} to use between retry attempts or {@code null} for none. */
+ @Deprecated @Beta private BackOffPolicy backOffPolicy;
/** Whether to automatically follow redirects ({@code true} by default). */
private boolean followRedirects = true;
@@ -203,19 +181,15 @@ static String executeAndGetValueOfSomeCustomHeader(HttpRequest request) {
private boolean throwExceptionOnExecuteError = true;
/**
- * Whether to retry the request if an {@link IOException} is encountered in
- * {@link LowLevelHttpRequest#execute()}.
+ * Whether to retry the request if an {@link IOException} is encountered in {@link
+ * LowLevelHttpRequest#execute()}.
*/
- @Deprecated
- @Beta
- private boolean retryOnExecuteIOException = false;
+ @Deprecated @Beta private boolean retryOnExecuteIOException = false;
/**
* Whether to not add the suffix {@link #USER_AGENT_SUFFIX} to the User-Agent header.
*
- *
- * It is {@code false} by default.
- *
+ * It is {@code false} by default.
*/
private boolean suppressUserAgentSuffix;
@@ -226,12 +200,10 @@ static String executeAndGetValueOfSomeCustomHeader(HttpRequest request) {
private final Tracer tracer = OpenCensusUtils.getTracer();
/**
- * Determines whether {@link HttpResponse#getContent()} of this request should return raw
- * input stream or not.
+ * Determines whether {@link HttpResponse#getContent()} of this request should return raw input
+ * stream or not.
*
- *
- * It is {@code false} by default.
- *
+ * It is {@code false} by default.
*/
private boolean responseReturnRawInputStream = false;
@@ -331,13 +303,13 @@ public HttpRequest setEncoding(HttpEncoding encoding) {
}
/**
- * {@link Beta}
- * If the content size is greater than this limit then it will not be logged.
- *
+ * If the content size is greater than this limit then it will not be logged.
*
- *
- * Content will only be logged if {@link #isLoggingEnabled} is {@code true}.
- *
+ * Content will only be logged if {@link #isLoggingEnabled} is {@code true}.
*
- *
- * Can be set to {@code 0} to disable content logging. This is useful for example if content has
- * sensitive data such as authentication information.
- *
+ * Can be set to {@code 0} to disable content logging. This is useful for example if content
+ * has sensitive data such as authentication information.
*
- *
- * Defaults to 16KB.
- *
+ * Defaults to 16KB.
*
* @since 1.7
*/
@@ -390,22 +354,14 @@ public int getContentLoggingLimit() {
/**
* Set the limit to the content size that will be logged during {@link #execute()}.
*
- *
- * If the content size is greater than this limit then it will not be logged.
- *
+ * If the content size is greater than this limit then it will not be logged.
*
- *
- * Content will only be logged if {@link #isLoggingEnabled} is {@code true}.
- *
+ * Content will only be logged if {@link #isLoggingEnabled} is {@code true}.
*
- *
- * Can be set to {@code 0} to disable content logging. This is useful for example if content has
- * sensitive data such as authentication information.
- *
+ * Can be set to {@code 0} to disable content logging. This is useful for example if content
+ * has sensitive data such as authentication information.
*
- *
- * Defaults to 16KB.
- *
+ * Defaults to 16KB.
*
* @since 1.7
*/
@@ -419,9 +375,7 @@ public HttpRequest setContentLoggingLimit(int contentLoggingLimit) {
/**
* Returns whether logging should be enabled for this request.
*
- *
- * Defaults to {@code true}.
- *
+ * Defaults to {@code true}.
*
* @since 1.9
*/
@@ -432,9 +386,7 @@ public boolean isLoggingEnabled() {
/**
* Sets whether logging should be enabled for this request.
*
- *
- * Defaults to {@code true}.
- *
+ * Defaults to {@code true}.
*
* @since 1.9
*/
@@ -455,9 +407,7 @@ public boolean isCurlLoggingEnabled() {
/**
* Sets whether logging in form of curl commands should be enabled for this request.
*
- *
- * Defaults to {@code true}.
- *
+ * Defaults to {@code true}.
*
* @since 1.11
*/
@@ -480,9 +430,7 @@ public int getConnectTimeout() {
* Sets the timeout in milliseconds to establish a connection or {@code 0} for an infinite
* timeout.
*
- *
- * By default it is 20000 (20 seconds).
- *
+ * By default it is 20000 (20 seconds).
*
* @since 1.5
*/
@@ -496,9 +444,7 @@ public HttpRequest setConnectTimeout(int connectTimeout) {
* Returns the timeout in milliseconds to read data from an established connection or {@code 0}
* for an infinite timeout.
*
- *
- * By default it is 20000 (20 seconds).
- *
+ * By default it is 20000 (20 seconds).
*
* @since 1.5
*/
@@ -521,9 +467,7 @@ public HttpRequest setReadTimeout(int readTimeout) {
/**
* Returns the timeout in milliseconds to send POST/PUT data or {@code 0} for an infinite timeout.
*
- *
- * By default it is 0 (infinite).
- *
+ * By default it is 0 (infinite).
*
* @since 1.27
*/
@@ -554,9 +498,7 @@ public HttpHeaders getHeaders() {
/**
* Sets the HTTP request headers.
*
- *
- * By default, this is a new unmodified instance of {@link HttpHeaders}.
- *
+ * By default, this is a new unmodified instance of {@link HttpHeaders}.
*
* @since 1.5
*/
@@ -577,22 +519,18 @@ public HttpHeaders getResponseHeaders() {
/**
* Sets the HTTP response headers.
*
- *
- * By default, this is a new unmodified instance of {@link HttpHeaders}.
- *
+ * By default, this is a new unmodified instance of {@link HttpHeaders}.
*
- *
- * For example, this can be used if you want to use a subclass of {@link HttpHeaders} called
+ *
For example, this can be used if you want to use a subclass of {@link HttpHeaders} called
* MyHeaders to process the response:
- *
*
*
- static String executeAndGetValueOfSomeCustomHeader(HttpRequest request) {
- MyHeaders responseHeaders = new MyHeaders();
- request.responseHeaders = responseHeaders;
- HttpResponse response = request.execute();
- return responseHeaders.someCustomHeader;
- }
+ * static String executeAndGetValueOfSomeCustomHeader(HttpRequest request) {
+ * MyHeaders responseHeaders = new MyHeaders();
+ * request.responseHeaders = responseHeaders;
+ * HttpResponse response = request.execute();
+ * return responseHeaders.someCustomHeader;
+ * }
*
*
* @since 1.5
@@ -644,7 +582,7 @@ public HttpRequest setUnsuccessfulResponseHandler(
}
/**
- * {@link Beta}
- * The default value is {@link #DEFAULT_NUMBER_OF_RETRIES}.
- *
+ * The default value is {@link #DEFAULT_NUMBER_OF_RETRIES}.
*
* @since 1.5
*/
@@ -720,9 +655,7 @@ public HttpRequest setNumberOfRetries(int numRetries) {
* Sets the {@link ObjectParser} used to parse the response to this request or {@code null} for
* none.
*
- *
- * This parser will be preferred over any registered HttpParser.
- *
+ * This parser will be preferred over any registered HttpParser.
*
* @since 1.10
*/
@@ -752,9 +685,7 @@ public boolean getFollowRedirects() {
/**
* Sets whether to follow redirects automatically.
*
- *
- * The default value is {@code true}.
- *
+ * The default value is {@code true}.
*
* @since 1.6
*/
@@ -777,9 +708,7 @@ public boolean getThrowExceptionOnExecuteError() {
* Sets whether to throw an exception at the end of {@link #execute()} on a HTTP error code
* (non-2XX) after all retries and response handlers have been exhausted.
*
- *
- * The default value is {@code true}.
- *
+ * The default value is {@code true}.
*
* @since 1.7
*/
@@ -789,13 +718,13 @@ public HttpRequest setThrowExceptionOnExecuteError(boolean throwExceptionOnExecu
}
/**
- * {@link Beta}
- * The default value is {@code false}.
- *
+ * The default value is {@code false}.
*
* @since 1.9
- * @deprecated (scheduled to be removed in 1.18) Use
- * {@link #setIOExceptionHandler(HttpIOExceptionHandler)} instead.
+ * @deprecated (scheduled to be removed in 1.18) Use {@link
+ * #setIOExceptionHandler(HttpIOExceptionHandler)} instead.
*/
@Deprecated
@Beta
@@ -835,9 +762,7 @@ public boolean getSuppressUserAgentSuffix() {
/**
* Sets whether to not add the suffix {@link #USER_AGENT_SUFFIX} to the User-Agent header.
*
- *
- * The default value is {@code false}.
- *
+ * The default value is {@code false}.
*
* @since 1.11
*/
@@ -857,12 +782,9 @@ public boolean getResponseReturnRawInputStream() {
}
/**
- * Sets whether {@link HttpResponse#getContent()} should return raw input stream for this
- * request.
+ * Sets whether {@link HttpResponse#getContent()} should return raw input stream for this request.
*
- *
- * The default value is {@code false}.
- *
+ * The default value is {@code false}.
*
* @since 1.29
*/
@@ -874,43 +796,35 @@ public HttpRequest setResponseReturnRawInputStream(boolean responseReturnRawInpu
/**
* Execute the HTTP request and returns the HTTP response.
*
- *
- * Note that regardless of the returned status code, the HTTP response content has not been parsed
- * yet, and must be parsed by the calling code.
- *
+ * Note that regardless of the returned status code, the HTTP response content has not been
+ * parsed yet, and must be parsed by the calling code.
*
- *
- * Note that when calling to this method twice or more, the state of this HTTP request object
+ *
Note that when calling to this method twice or more, the state of this HTTP request object
* isn't cleared, so the request will continue where it was left. For example, the state of the
* {@link HttpUnsuccessfulResponseHandler} attached to this HTTP request will remain the same as
* it was left after last execute.
- *
*
- *
- * Almost all details of the request and response are logged if {@link Level#CONFIG} is loggable.
- * The only exception is the value of the {@code Authorization} header which is only logged if
- * {@link Level#ALL} is loggable.
- *
+ * Almost all details of the request and response are logged if {@link Level#CONFIG} is
+ * loggable. The only exception is the value of the {@code Authorization} header which is only
+ * logged if {@link Level#ALL} is loggable.
*
- *
- * Callers should call {@link HttpResponse#disconnect} when the returned HTTP response object is
- * no longer needed. However, {@link HttpResponse#disconnect} does not have to be called if the
+ *
Callers should call {@link HttpResponse#disconnect} when the returned HTTP response object
+ * is no longer needed. However, {@link HttpResponse#disconnect} does not have to be called if the
* response stream is properly closed. Example usage:
- *
*
*
- HttpResponse response = request.execute();
- try {
- // process the HTTP response object
- } finally {
- response.disconnect();
- }
+ * HttpResponse response = request.execute();
+ * try {
+ * // process the HTTP response object
+ * } finally {
+ * response.disconnect();
+ * }
*
*
- * @return HTTP response for an HTTP success response (or HTTP error response if
- * {@link #getThrowExceptionOnExecuteError()} is {@code false})
- * @throws HttpResponseException for an HTTP error response (only if
- * {@link #getThrowExceptionOnExecuteError()} is {@code true})
+ * @return HTTP response for an HTTP success response (or HTTP error response if {@link
+ * #getThrowExceptionOnExecuteError()} is {@code false})
+ * @throws HttpResponseException for an HTTP error response (only if {@link
+ * #getThrowExceptionOnExecuteError()} is {@code true})
* @see HttpResponse#isSuccessStatusCode()
*/
@SuppressWarnings("deprecation")
@@ -928,10 +842,11 @@ public HttpResponse execute() throws IOException {
Preconditions.checkNotNull(requestMethod);
Preconditions.checkNotNull(url);
- Span span = tracer
- .spanBuilder(OpenCensusUtils.SPAN_NAME_HTTP_REQUEST_EXECUTE)
- .setRecordEvents(OpenCensusUtils.isRecordEvent())
- .startSpan();
+ Span span =
+ tracer
+ .spanBuilder(OpenCensusUtils.SPAN_NAME_HTTP_REQUEST_EXECUTE)
+ .setRecordEvents(OpenCensusUtils.isRecordEvent())
+ .startSpan();
do {
span.addAnnotation("retry #" + (numRetries - retriesRemaining));
// Cleanup any unneeded response from a previous iteration
@@ -962,8 +877,11 @@ public HttpResponse execute() throws IOException {
if (loggable) {
logbuf = new StringBuilder();
logbuf.append("-------------- REQUEST --------------").append(StringUtils.LINE_SEPARATOR);
- logbuf.append(requestMethod)
- .append(' ').append(urlString).append(StringUtils.LINE_SEPARATOR);
+ logbuf
+ .append(requestMethod)
+ .append(' ')
+ .append(urlString)
+ .append(StringUtils.LINE_SEPARATOR);
// setup curl logging
if (curlLoggingEnabled) {
@@ -1003,8 +921,9 @@ public HttpResponse execute() throws IOException {
final String contentType = content.getType();
// log content
if (loggable) {
- streamingContent = new LoggingStreamingContent(
- streamingContent, HttpTransport.LOGGER, Level.CONFIG, contentLoggingLimit);
+ streamingContent =
+ new LoggingStreamingContent(
+ streamingContent, HttpTransport.LOGGER, Level.CONFIG, contentLoggingLimit);
}
// encoding
if (encoding == null) {
@@ -1091,8 +1010,9 @@ public HttpResponse execute() throws IOException {
}
}
} catch (IOException e) {
- if (!retryOnExecuteIOException && (ioExceptionHandler == null
- || !ioExceptionHandler.handleIOException(this, retryRequest))) {
+ if (!retryOnExecuteIOException
+ && (ioExceptionHandler == null
+ || !ioExceptionHandler.handleIOException(this, retryRequest))) {
throw e;
}
// Save the exception in case the retries do not work and we need to re-throw it later.
@@ -1120,7 +1040,8 @@ public HttpResponse execute() throws IOException {
if (handleRedirect(response.getStatusCode(), response.getHeaders())) {
// The unsuccessful request's error could not be handled and it is a redirect request.
errorHandled = true;
- } else if (retryRequest && backOffPolicy != null
+ } else if (retryRequest
+ && backOffPolicy != null
&& backOffPolicy.isBackOffRequired(response.getStatusCode())) {
// The unsuccessful request's error could not be handled and should be backed off
// before retrying
@@ -1179,7 +1100,7 @@ public HttpResponse execute() throws IOException {
}
/**
- * {@link Beta} executeAsync(Executor executor) {
- FutureTask future = new FutureTask(new Callable() {
+ FutureTask future =
+ new FutureTask(
+ new Callable() {
- public HttpResponse call() throws Exception {
- return execute();
- }
- });
+ public HttpResponse call() throws Exception {
+ return execute();
+ }
+ });
executor.execute(future);
return future;
}
/**
- * {@link Beta} executeAsync() {
* Sets up this request object to handle the necessary redirect if redirects are turned on, it is
* a redirect status code and the header has a location.
*
- *
- * When the status code is {@code 303} the method on the request is changed to a GET as per the
+ *
When the status code is {@code 303} the method on the request is changed to a GET as per the
* RFC2616 specification. On a redirect, it also removes the {@code "Authorization"} and all
* {@code "If-*"} request headers.
- *
*
- *
- * Upgrade warning: When handling a status code of 303, {@link #handleRedirect(int, HttpHeaders)}
- * now correctly removes any content from the body of the new request, as GET requests should not
- * have content. It did not do this in prior version 1.16.
- *
+ * Upgrade warning: When handling a status code of 303, {@link #handleRedirect(int,
+ * HttpHeaders)} now correctly removes any content from the body of the new request, as GET
+ * requests should not have content. It did not do this in prior version 1.16.
*
* @return whether the redirect was successful
* @since 1.11
*/
public boolean handleRedirect(int statusCode, HttpHeaders responseHeaders) {
String redirectLocation = responseHeaders.getLocation();
- if (getFollowRedirects() && HttpStatusCodes.isRedirect(statusCode)
+ if (getFollowRedirects()
+ && HttpStatusCodes.isRedirect(statusCode)
&& redirectLocation != null) {
// resolve the redirect location relative to the current location
setUrl(new GenericUrl(url.toURL(redirectLocation)));
diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpRequestFactory.java b/google-http-client/src/main/java/com/google/api/client/http/HttpRequestFactory.java
index 8f5ec2550..a14058c8b 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/HttpRequestFactory.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/HttpRequestFactory.java
@@ -16,23 +16,20 @@
import java.io.IOException;
-
/**
* Thread-safe light-weight HTTP request factory layer on top of the HTTP transport that has an
* optional {@link HttpRequestInitializer HTTP request initializer} for initializing requests.
*
- *
- * For example, to use a particular authorization header across all requests, use:
- *
+ * For example, to use a particular authorization header across all requests, use:
*
*
- public static HttpRequestFactory createRequestFactory(HttpTransport transport) {
- return transport.createRequestFactory(new HttpRequestInitializer() {
- public void initialize(HttpRequest request) throws IOException {
- request.getHeaders().setAuthorization("...");
- }
- });
- }
+ * public static HttpRequestFactory createRequestFactory(HttpTransport transport) {
+ * return transport.createRequestFactory(new HttpRequestInitializer() {
+ * public void initialize(HttpRequest request) throws IOException {
+ * request.getHeaders().setAuthorization("...");
+ * }
+ * });
+ * }
*
*
* @since 1.4
@@ -67,9 +64,7 @@ public HttpTransport getTransport() {
/**
* Returns the HTTP request initializer or {@code null} for none.
*
- *
- * This initializer is invoked before setting its method, URL, or content.
- *
+ * This initializer is invoked before setting its method, URL, or content.
*
* @since 1.5
*/
diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpRequestInitializer.java b/google-http-client/src/main/java/com/google/api/client/http/HttpRequestInitializer.java
index c0f854558..4ee946907 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/HttpRequestInitializer.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/HttpRequestInitializer.java
@@ -19,47 +19,39 @@
/**
* HTTP request initializer.
*
- *
- * For example, this might be used to disable request timeouts:
- *
+ * For example, this might be used to disable request timeouts:
*
*
- public class DisableTimeout implements HttpRequestInitializer {
- public void initialize(HttpRequest request) {
- request.setConnectTimeout(0);
- request.setReadTimeout(0);
- }
- }
+ * public class DisableTimeout implements HttpRequestInitializer {
+ * public void initialize(HttpRequest request) {
+ * request.setConnectTimeout(0);
+ * request.setReadTimeout(0);
+ * }
+ * }
*
*
- *
- * Sample usage with a request factory:
- *
+ * Sample usage with a request factory:
*
*
- public static HttpRequestFactory createRequestFactory(HttpTransport transport) {
- return transport.createRequestFactory(new DisableTimeout());
- }
+ * public static HttpRequestFactory createRequestFactory(HttpTransport transport) {
+ * return transport.createRequestFactory(new DisableTimeout());
+ * }
*
*
- *
- * More complex usage example:
- *
+ * More complex usage example:
*
*
- public static HttpRequestFactory createRequestFactory2(HttpTransport transport) {
- final DisableTimeout disableTimeout = new DisableTimeout();
- return transport.createRequestFactory(new HttpRequestInitializer() {
- public void initialize(HttpRequest request) {
- disableTimeout.initialize(request);
- }
- });
- }
+ * public static HttpRequestFactory createRequestFactory2(HttpTransport transport) {
+ * final DisableTimeout disableTimeout = new DisableTimeout();
+ * return transport.createRequestFactory(new HttpRequestInitializer() {
+ * public void initialize(HttpRequest request) {
+ * disableTimeout.initialize(request);
+ * }
+ * });
+ * }
*
*
- *
- * Implementations should normally be thread-safe.
- *
+ * Implementations should normally be thread-safe.
*
* @since 1.4
* @author Yaniv Inbar
diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpResponse.java b/google-http-client/src/main/java/com/google/api/client/http/HttpResponse.java
index 01aea6d83..90c3812f0 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/HttpResponse.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/HttpResponse.java
@@ -19,7 +19,6 @@
import com.google.api.client.util.LoggingInputStream;
import com.google.api.client.util.Preconditions;
import com.google.api.client.util.StringUtils;
-
import java.io.ByteArrayOutputStream;
import java.io.EOFException;
import java.io.IOException;
@@ -34,24 +33,20 @@
/**
* HTTP response.
*
- *
- * Callers should call {@link #disconnect} when the HTTP response object is no longer needed.
+ *
Callers should call {@link #disconnect} when the HTTP response object is no longer needed.
* However, {@link #disconnect} does not have to be called if the response stream is properly
* closed. Example usage:
- *
*
*
- HttpResponse response = request.execute();
- try {
- // process the HTTP response object
- } finally {
- response.disconnect();
- }
+ * HttpResponse response = request.execute();
+ * try {
+ * // process the HTTP response object
+ * } finally {
+ * response.disconnect();
+ * }
*
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.0
* @author Yaniv Inbar
@@ -88,31 +83,21 @@ public final class HttpResponse {
/**
* Determines the limit to the content size that will be logged during {@link #getContent()}.
*
- *
- * Content will only be logged if {@link #isLoggingEnabled} is {@code true}.
- *
+ * Content will only be logged if {@link #isLoggingEnabled} is {@code true}.
*
- *
- * If the content size is greater than this limit then it will not be logged.
- *
+ * If the content size is greater than this limit then it will not be logged.
*
- *
- * Can be set to {@code 0} to disable content logging. This is useful for example if content has
- * sensitive data such as authentication information.
- *
+ * Can be set to {@code 0} to disable content logging. This is useful for example if content
+ * has sensitive data such as authentication information.
*
- *
- * Defaults to {@link HttpRequest#getContentLoggingLimit()}.
- *
+ * Defaults to {@link HttpRequest#getContentLoggingLimit()}.
*/
private int contentLoggingLimit;
/**
* Determines whether logging should be enabled on this response.
*
- *
- * Defaults to {@link HttpRequest#isLoggingEnabled()}.
- *
+ * Defaults to {@link HttpRequest#isLoggingEnabled()}.
*/
private boolean loggingEnabled;
@@ -169,22 +154,14 @@ public final class HttpResponse {
/**
* Returns the limit to the content size that will be logged during {@link #getContent()}.
*
- *
- * Content will only be logged if {@link #isLoggingEnabled} is {@code true}.
- *
+ * Content will only be logged if {@link #isLoggingEnabled} is {@code true}.
*
- *
- * If the content size is greater than this limit then it will not be logged.
- *
+ * If the content size is greater than this limit then it will not be logged.
*
- *
- * Can be set to {@code 0} to disable content logging. This is useful for example if content has
- * sensitive data such as authentication information.
- *
+ * Can be set to {@code 0} to disable content logging. This is useful for example if content
+ * has sensitive data such as authentication information.
*
- *
- * Defaults to {@link HttpRequest#getContentLoggingLimit()}.
- *
+ * Defaults to {@link HttpRequest#getContentLoggingLimit()}.
*
* @since 1.7
*/
@@ -195,22 +172,14 @@ public int getContentLoggingLimit() {
/**
* Set the limit to the content size that will be logged during {@link #getContent()}.
*
- *
- * Content will only be logged if {@link #isLoggingEnabled} is {@code true}.
- *
+ * Content will only be logged if {@link #isLoggingEnabled} is {@code true}.
*
- *
- * If the content size is greater than this limit then it will not be logged.
- *
+ * If the content size is greater than this limit then it will not be logged.
*
- *
- * Can be set to {@code 0} to disable content logging. This is useful for example if content has
- * sensitive data such as authentication information.
- *
+ * Can be set to {@code 0} to disable content logging. This is useful for example if content
+ * has sensitive data such as authentication information.
*
- *
- * Defaults to {@link HttpRequest#getContentLoggingLimit()}.
- *
+ * Defaults to {@link HttpRequest#getContentLoggingLimit()}.
*
* @since 1.7
*/
@@ -224,9 +193,7 @@ public HttpResponse setContentLoggingLimit(int contentLoggingLimit) {
/**
* Returns whether logging should be enabled on this response.
*
- *
- * Defaults to {@link HttpRequest#isLoggingEnabled()}.
- *
+ * Defaults to {@link HttpRequest#isLoggingEnabled()}.
*
* @since 1.9
*/
@@ -237,9 +204,7 @@ public boolean isLoggingEnabled() {
/**
* Sets whether logging should be enabled on this response.
*
- *
- * Defaults to {@link HttpRequest#isLoggingEnabled()}.
- *
+ * Defaults to {@link HttpRequest#isLoggingEnabled()}.
*
* @since 1.9
*/
@@ -286,8 +251,8 @@ public HttpHeaders getHeaders() {
}
/**
- * Returns whether received a successful HTTP status code {@code >= 200 && < 300} (see
- * {@link #getStatusCode()}).
+ * Returns whether received a successful HTTP status code {@code >= 200 && < 300} (see {@link
+ * #getStatusCode()}).
*
* @since 1.5
*/
@@ -333,22 +298,22 @@ public HttpRequest getRequest() {
/**
* Returns the content of the HTTP response.
- *
- * The result is cached, so subsequent calls will be fast.
- *
- * Callers should call {@link InputStream#close} after the returned {@link InputStream} is no
+ *
+ *
The result is cached, so subsequent calls will be fast.
+ *
+ *
Callers should call {@link InputStream#close} after the returned {@link InputStream} is no
* longer needed. Example usage:
*
*
- InputStream is = response.getContent();
- try {
- // Process the input stream..
- } finally {
- is.close();
- }
+ * InputStream is = response.getContent();
+ * try {
+ * // Process the input stream..
+ * } finally {
+ * is.close();
+ * }
*
- *
- * {@link HttpResponse#disconnect} does not have to be called if the content is closed.
+ *
+ *
{@link HttpResponse#disconnect} does not have to be called if the content is closed.
*
* @return input stream content of the HTTP response or {@code null} for none
* @throws IOException I/O exception
@@ -363,15 +328,17 @@ public InputStream getContent() throws IOException {
try {
// gzip encoding (wrap content with GZipInputStream)
String contentEncoding = this.contentEncoding;
- if (!returnRawInputStream && contentEncoding != null && contentEncoding
- .contains("gzip")) {
+ if (!returnRawInputStream
+ && contentEncoding != null
+ && contentEncoding.contains("gzip")) {
lowLevelResponseContent = new GZIPInputStream(lowLevelResponseContent);
}
// logging (wrap content with LoggingInputStream)
Logger logger = HttpTransport.LOGGER;
if (loggingEnabled && logger.isLoggable(Level.CONFIG)) {
- lowLevelResponseContent = new LoggingInputStream(
- lowLevelResponseContent, logger, Level.CONFIG, contentLoggingLimit);
+ lowLevelResponseContent =
+ new LoggingInputStream(
+ lowLevelResponseContent, logger, Level.CONFIG, contentLoggingLimit);
}
content = lowLevelResponseContent;
contentProcessed = true;
@@ -392,30 +359,23 @@ public InputStream getContent() throws IOException {
/**
* Writes the content of the HTTP response into the given destination output stream.
*
- *
- * Sample usage:
+ *
Sample usage:
*
*
- HttpRequest request = requestFactory.buildGetRequest(
- new GenericUrl("https://www.google.com/images/srpr/logo3w.png"));
- OutputStream outputStream = new FileOutputStream(new File("/tmp/logo3w.png"));
- try {
- HttpResponse response = request.execute();
- response.download(outputStream);
- } finally {
- outputStream.close();
- }
-
- *
- *
- *
- *
- * This method closes the content of the HTTP response from {@link #getContent()}.
- *
- *
- *
- * This method does not close the given output stream.
- *
+ * HttpRequest request = requestFactory.buildGetRequest(
+ * new GenericUrl("https://www.google.com/images/srpr/logo3w.png"));
+ * OutputStream outputStream = new FileOutputStream(new File("/tmp/logo3w.png"));
+ * try {
+ * HttpResponse response = request.execute();
+ * response.download(outputStream);
+ * } finally {
+ * outputStream.close();
+ * }
+ *
+ *
+ * This method closes the content of the HTTP response from {@link #getContent()}.
+ *
+ *
This method does not close the given output stream.
*
* @param outputStream destination output stream
* @throws IOException I/O exception
@@ -426,9 +386,7 @@ public void download(OutputStream outputStream) throws IOException {
IOUtils.copy(inputStream, outputStream);
}
- /**
- * Closes the content of the HTTP response from {@link #getContent()}, ignoring any content.
- */
+ /** Closes the content of the HTTP response from {@link #getContent()}, ignoring any content. */
public void ignore() throws IOException {
InputStream content = getContent();
if (content != null) {
@@ -437,8 +395,8 @@ public void ignore() throws IOException {
}
/**
- * Close the HTTP response content using {@link #ignore}, and disconnect using
- * {@link LowLevelHttpResponse#disconnect()}.
+ * Close the HTTP response content using {@link #ignore}, and disconnect using {@link
+ * LowLevelHttpResponse#disconnect()}.
*
* @since 1.4
*/
@@ -451,9 +409,7 @@ public void disconnect() throws IOException {
* Parses the content of the HTTP response from {@link #getContent()} and reads it into a data
* class of key/value pairs using the parser returned by {@link HttpRequest#getParser()}.
*
- *
- * Reference: http://tools.ietf.org/html/rfc2616#section-4.3
- *
+ * Reference: http://tools.ietf.org/html/rfc2616#section-4.3
*
* @return parsed data class or {@code null} for no content
*/
@@ -470,7 +426,8 @@ public T parseAs(Class dataClass) throws IOException {
*/
private boolean hasMessageBody() throws IOException {
int statusCode = getStatusCode();
- if (getRequest().getRequestMethod().equals(HttpMethods.HEAD) || statusCode / 100 == 1
+ if (getRequest().getRequestMethod().equals(HttpMethods.HEAD)
+ || statusCode / 100 == 1
|| statusCode == HttpStatusCodes.STATUS_CODE_NO_CONTENT
|| statusCode == HttpStatusCodes.STATUS_CODE_NOT_MODIFIED) {
ignore();
@@ -496,17 +453,13 @@ public Object parseAs(Type dataType) throws IOException {
/**
* Parses the content of the HTTP response from {@link #getContent()} and reads it into a string.
*
- *
- * Since this method returns {@code ""} for no content, a simpler check for no content is to check
- * if {@link #getContent()} is {@code null}.
- *
+ * Since this method returns {@code ""} for no content, a simpler check for no content is to
+ * check if {@link #getContent()} is {@code null}.
*
- *
- * All content is read from the input content stream rather than being limited by the
+ *
All content is read from the input content stream rather than being limited by the
* Content-Length. For the character set, it follows the specification by parsing the "charset"
* parameter of the Content-Type header or by default {@code "ISO-8859-1"} if the parameter is
* missing.
- *
*
* @return parsed string or {@code ""} for no content
* @throws IOException I/O exception
@@ -522,13 +475,14 @@ public String parseAsString() throws IOException {
}
/**
- * Returns the {@link Charset} specified in the Content-Type of this response or the
- * {@code "ISO-8859-1"} charset as a default.
+ * Returns the {@link Charset} specified in the Content-Type of this response or the {@code
+ * "ISO-8859-1"} charset as a default.
*
* @since 1.10
- * */
+ */
public Charset getContentCharset() {
return mediaType == null || mediaType.getCharsetParameter() == null
- ? Charsets.ISO_8859_1 : mediaType.getCharsetParameter();
+ ? Charsets.ISO_8859_1
+ : mediaType.getCharsetParameter();
}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpResponseException.java b/google-http-client/src/main/java/com/google/api/client/http/HttpResponseException.java
index 6526ac2d6..6e5349e18 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/HttpResponseException.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/HttpResponseException.java
@@ -16,15 +16,12 @@
import com.google.api.client.util.Preconditions;
import com.google.api.client.util.StringUtils;
-
import java.io.IOException;
/**
* Exception thrown when an error status code is detected in an HTTP response.
*
- *
- * Implementation is not thread safe.
- *
+ * Implementation is not thread safe.
*
* @since 1.0
* @author Yaniv Inbar
@@ -49,17 +46,15 @@ public class HttpResponseException extends IOException {
* Constructor that constructs a detail message from the given HTTP response that includes the
* status code, status message and HTTP response content.
*
- *
- * Callers of this constructor should call {@link HttpResponse#disconnect} after
- * {@link HttpResponseException} is instantiated. Example usage:
- *
+ * Callers of this constructor should call {@link HttpResponse#disconnect} after {@link
+ * HttpResponseException} is instantiated. Example usage:
*
*
- try {
- throw new HttpResponseException(response);
- } finally {
- response.disconnect();
- }
+ * try {
+ * throw new HttpResponseException(response);
+ * } finally {
+ * response.disconnect();
+ * }
*
*
* @param response HTTP response
@@ -70,7 +65,6 @@ public HttpResponseException(HttpResponse response) {
/**
* @param builder builder
- *
* @since 1.14
*/
protected HttpResponseException(Builder builder) {
@@ -82,8 +76,8 @@ protected HttpResponseException(Builder builder) {
}
/**
- * Returns whether received a successful HTTP status code {@code >= 200 && < 300} (see
- * {@link #getStatusCode()}).
+ * Returns whether received a successful HTTP status code {@code >= 200 && < 300} (see {@link
+ * #getStatusCode()}).
*
* @since 1.7
*/
@@ -130,10 +124,7 @@ public final String getContent() {
/**
* Builder.
*
- *
- * Implementation is not thread safe.
- *
- *
+ * Implementation is not thread safe.
*
* @since 1.14
*/
@@ -165,9 +156,7 @@ public Builder(int statusCode, String statusMessage, HttpHeaders headers) {
setHeaders(headers);
}
- /**
- * @param response HTTP response
- */
+ /** @param response HTTP response */
public Builder(HttpResponse response) {
this(response.getStatusCode(), response.getStatusMessage(), response.getHeaders());
// content
@@ -198,10 +187,8 @@ public final String getMessage() {
/**
* Sets the detail message to use or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Builder setMessage(String message) {
this.message = message;
@@ -216,10 +203,8 @@ public final int getStatusCode() {
/**
* Sets the HTTP status code or {@code 0} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Builder setStatusCode(int statusCode) {
Preconditions.checkArgument(statusCode >= 0);
@@ -235,10 +220,8 @@ public final String getStatusMessage() {
/**
* Sets the HTTP status message or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Builder setStatusMessage(String statusMessage) {
this.statusMessage = statusMessage;
@@ -253,10 +236,8 @@ public HttpHeaders getHeaders() {
/**
* Sets the HTTP response headers.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Builder setHeaders(HttpHeaders headers) {
this.headers = Preconditions.checkNotNull(headers);
@@ -271,10 +252,8 @@ public final String getContent() {
/**
* Sets the HTTP response content or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Builder setContent(String content) {
this.content = content;
diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpResponseInterceptor.java b/google-http-client/src/main/java/com/google/api/client/http/HttpResponseInterceptor.java
index 0873399b1..a37b0b1b1 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/HttpResponseInterceptor.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/HttpResponseInterceptor.java
@@ -20,62 +20,54 @@
* HTTP response interceptor to intercept the end of {@link HttpRequest#execute()} before returning
* a successful response or throwing an exception for an unsuccessful response.
*
- *
- * For example, this might be used to add a simple timer on requests:
- *
+ * For example, this might be used to add a simple timer on requests:
*
*
- public static class TimerResponseInterceptor implements HttpResponseInterceptor {
-
- private final long startTime = System.nanoTime();
-
- public void interceptResponse(HttpResponse response) {
- long elapsedNanos = System.nanoTime() - startTime;
- System.out.println("elapsed seconds: " + TimeUnit.NANOSECONDS.toSeconds(elapsedNanos) + "s");
- }
- }
+ * public static class TimerResponseInterceptor implements HttpResponseInterceptor {
+ *
+ * private final long startTime = System.nanoTime();
+ *
+ * public void interceptResponse(HttpResponse response) {
+ * long elapsedNanos = System.nanoTime() - startTime;
+ * System.out.println("elapsed seconds: " + TimeUnit.NANOSECONDS.toSeconds(elapsedNanos) + "s");
+ * }
+ * }
*
*
- *
- * Sample usage with a request factory:
- *
+ * Sample usage with a request factory:
*
*
- public static HttpRequestFactory createRequestFactory(HttpTransport transport) {
- return transport.createRequestFactory(new HttpRequestInitializer() {
-
- {@literal @}Override
- public void initialize(HttpRequest request) {
- request.setResponseInterceptor(new TimerResponseInterceptor());
- }
- });
- }
+ * public static HttpRequestFactory createRequestFactory(HttpTransport transport) {
+ * return transport.createRequestFactory(new HttpRequestInitializer() {
+ *
+ * {@literal @}Override
+ * public void initialize(HttpRequest request) {
+ * request.setResponseInterceptor(new TimerResponseInterceptor());
+ * }
+ * });
+ * }
*
*
- *
- * More complex usage example:
- *
+ * More complex usage example:
*
*
- public static HttpRequestFactory createRequestFactory2(HttpTransport transport) {
- final HttpResponseInterceptor responseInterceptor = new TimerResponseInterceptor();
- return transport.createRequestFactory(new HttpRequestInitializer() {
-
- public void initialize(HttpRequest request) {
- request.setResponseInterceptor(new HttpResponseInterceptor() {
-
- public void interceptResponse(HttpResponse response) throws IOException {
- responseInterceptor.interceptResponse(response);
- }
- });
- }
- });
- }
+ * public static HttpRequestFactory createRequestFactory2(HttpTransport transport) {
+ * final HttpResponseInterceptor responseInterceptor = new TimerResponseInterceptor();
+ * return transport.createRequestFactory(new HttpRequestInitializer() {
+ *
+ * public void initialize(HttpRequest request) {
+ * request.setResponseInterceptor(new HttpResponseInterceptor() {
+ *
+ * public void interceptResponse(HttpResponse response) throws IOException {
+ * responseInterceptor.interceptResponse(response);
+ * }
+ * });
+ * }
+ * });
+ * }
*
*
- *
- * Implementations should normally be thread-safe.
- *
+ * Implementations should normally be thread-safe.
*
* @author Yaniv Inbar
* @since 1.13
@@ -86,12 +78,10 @@ public interface HttpResponseInterceptor {
* Invoked at the end of {@link HttpRequest#execute()} before returning a successful response or
* throwing an exception for an unsuccessful response.
*
- *
- * Do not read from the content stream unless you intend to throw an exception. Otherwise, it
+ *
Do not read from the content stream unless you intend to throw an exception. Otherwise, it
* would prevent the caller of {@link HttpRequest#execute()} to be able to read the stream from
* {@link HttpResponse#getContent()}. If you intend to throw an exception, you should parse the
* response, or alternatively pass the response as part of the exception.
- *
*
* @param response HTTP response
*/
diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpStatusCodes.java b/google-http-client/src/main/java/com/google/api/client/http/HttpStatusCodes.java
index 0dd63ca2b..1f46eaadc 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/HttpStatusCodes.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/HttpStatusCodes.java
@@ -26,16 +26,10 @@ public class HttpStatusCodes {
/** Status code for a successful request. */
public static final int STATUS_CODE_OK = 200;
- /**
- * Status code for a successful request that has been fulfilled
- * to create a new resource.
- */
+ /** Status code for a successful request that has been fulfilled to create a new resource. */
public static final int STATUS_CODE_CREATED = 201;
- /**
- * Status code for a successful request that has been received
- * but not yet acted upon.
- */
+ /** Status code for a successful request that has been received but not yet acted upon. */
public static final int STATUS_CODE_ACCEPTED = 202;
/**
@@ -75,15 +69,15 @@ public class HttpStatusCodes {
/** Status code for a server that has not found anything matching the Request-URI. */
public static final int STATUS_CODE_NOT_FOUND = 404;
- /**
- * Status code for a method specified in the Request-Line is not allowed for the resource
- * identified by the Request-URI.
- * */
+ /**
+ * Status code for a method specified in the Request-Line is not allowed for the resource
+ * identified by the Request-URI.
+ */
public static final int STATUS_CODE_METHOD_NOT_ALLOWED = 405;
-
+
/** Status code for a request that could not be completed due to a resource conflict. */
public static final int STATUS_CODE_CONFLICT = 409;
-
+
/** Status code for a request for which one of the conditions it was made under has failed. */
public static final int STATUS_CODE_PRECONDITION_FAILED = 412;
@@ -114,8 +108,8 @@ public static boolean isSuccess(int statusCode) {
}
/**
- * Returns whether the given HTTP response status code is a redirect code
- * {@code 301, 302, 303, 307}.
+ * Returns whether the given HTTP response status code is a redirect code {@code 301, 302, 303,
+ * 307}.
*
* @since 1.11
*/
diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpTransport.java b/google-http-client/src/main/java/com/google/api/client/http/HttpTransport.java
index 5fa036f7b..d8b858c8e 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/HttpTransport.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/HttpTransport.java
@@ -21,59 +21,49 @@
/**
* Thread-safe abstract HTTP transport.
*
- *
- * Implementation is thread-safe, and sub-classes must be thread-safe. For maximum efficiency,
+ *
Implementation is thread-safe, and sub-classes must be thread-safe. For maximum efficiency,
* applications should use a single globally-shared instance of the HTTP transport.
- *
*
- *
- * The recommended concrete implementation HTTP transport library to use depends on what environment
- * you are running in:
- *
- *
*
- *
- * Some HTTP transports do not support all HTTP methods. Use {@link #supportsMethod(String)} to
+ *
Some HTTP transports do not support all HTTP methods. Use {@link #supportsMethod(String)} to
* check if a certain HTTP method is supported. Calling {@link #buildRequest()} on a method that is
* not supported will result in an {@link IllegalArgumentException}.
- *
*
- *
- * Subclasses should override {@link #supportsMethod(String)} and
- * {@link #buildRequest(String, String)} to build requests and specify which HTTP methods are
- * supported.
- *
+ * Subclasses should override {@link #supportsMethod(String)} and {@link #buildRequest(String,
+ * String)} to build requests and specify which HTTP methods are supported.
*
* @since 1.0
* @author Yaniv Inbar
@@ -86,8 +76,10 @@ public abstract class HttpTransport {
* All valid request methods as specified in {@link #supportsMethod(String)}, sorted in ascending
* alphabetical order.
*/
- private static final String[] SUPPORTED_METHODS =
- {HttpMethods.DELETE, HttpMethods.GET, HttpMethods.POST, HttpMethods.PUT};
+ private static final String[] SUPPORTED_METHODS = {
+ HttpMethods.DELETE, HttpMethods.GET, HttpMethods.POST, HttpMethods.PUT
+ };
+
static {
Arrays.sort(SUPPORTED_METHODS);
}
@@ -126,10 +118,8 @@ HttpRequest buildRequest() {
/**
* Returns whether a specified HTTP method is supported by this transport.
*
- *
- * Default implementation returns true if and only if the request method is {@code "DELETE"},
+ *
Default implementation returns true if and only if the request method is {@code "DELETE"},
* {@code "GET"}, {@code "POST"}, or {@code "PUT"}. Subclasses should override.
- *
*
* @param method HTTP method
* @throws IOException I/O exception
@@ -157,6 +147,5 @@ public boolean supportsMethod(String method) throws IOException {
* @throws IOException I/O exception
* @since 1.4
*/
- public void shutdown() throws IOException {
- }
+ public void shutdown() throws IOException {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpUnsuccessfulResponseHandler.java b/google-http-client/src/main/java/com/google/api/client/http/HttpUnsuccessfulResponseHandler.java
index ec0eb4b1b..0a6fc6f7c 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/HttpUnsuccessfulResponseHandler.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/HttpUnsuccessfulResponseHandler.java
@@ -19,56 +19,50 @@
/**
* Interface which handles abnormal HTTP responses (in other words not 2XX).
*
- *
- * For example, this might be used to refresh an OAuth 2 token:
- *
+ * For example, this might be used to refresh an OAuth 2 token:
*
*
- public static class RefreshTokenHandler implements HttpUnsuccessfulResponseHandler {
- public boolean handleResponse(
- HttpRequest request, HttpResponse response, boolean retrySupported) throws IOException {
- if (response.getStatusCode() == HttpStatusCodes.STATUS_CODE_UNAUTHORIZED) {
- refreshToken();
- }
- return false;
- }
- }
+ * public static class RefreshTokenHandler implements HttpUnsuccessfulResponseHandler {
+ * public boolean handleResponse(
+ * HttpRequest request, HttpResponse response, boolean retrySupported) throws IOException {
+ * if (response.getStatusCode() == HttpStatusCodes.STATUS_CODE_UNAUTHORIZED) {
+ * refreshToken();
+ * }
+ * return false;
+ * }
+ * }
*
*
- *
- * Sample usage with a request factory:
- *
+ * Sample usage with a request factory:
*
*
- public static HttpRequestFactory createRequestFactory(HttpTransport transport) {
- final RefreshTokenHandler handler = new RefreshTokenHandler();
- return transport.createRequestFactory(new HttpRequestInitializer() {
- public void initialize(HttpRequest request) {
- request.setUnsuccessfulResponseHandler(handler);
- }
- });
- }
+ * public static HttpRequestFactory createRequestFactory(HttpTransport transport) {
+ * final RefreshTokenHandler handler = new RefreshTokenHandler();
+ * return transport.createRequestFactory(new HttpRequestInitializer() {
+ * public void initialize(HttpRequest request) {
+ * request.setUnsuccessfulResponseHandler(handler);
+ * }
+ * });
+ * }
*
*
- *
- * More complex usage example:
- *
+ * More complex usage example:
*
*
- public static HttpRequestFactory createRequestFactory2(HttpTransport transport) {
- final RefreshTokenHandler handler = new RefreshTokenHandler();
- return transport.createRequestFactory(new HttpRequestInitializer() {
- public void initialize(HttpRequest request) {
- request.setUnsuccessfulResponseHandler(new HttpUnsuccessfulResponseHandler() {
- public boolean handleResponse(
- HttpRequest request, HttpResponse response, boolean retrySupported)
- throws IOException {
- return handler.handleResponse(request, response, retrySupported);
- }
- });
- }
- });
- }
+ * public static HttpRequestFactory createRequestFactory2(HttpTransport transport) {
+ * final RefreshTokenHandler handler = new RefreshTokenHandler();
+ * return transport.createRequestFactory(new HttpRequestInitializer() {
+ * public void initialize(HttpRequest request) {
+ * request.setUnsuccessfulResponseHandler(new HttpUnsuccessfulResponseHandler() {
+ * public boolean handleResponse(
+ * HttpRequest request, HttpResponse response, boolean retrySupported)
+ * throws IOException {
+ * return handler.handleResponse(request, response, retrySupported);
+ * }
+ * });
+ * }
+ * });
+ * }
*
*
* @author moshenko@google.com (Jacob Moshenko)
@@ -79,20 +73,21 @@ public interface HttpUnsuccessfulResponseHandler {
/**
* Handler that will be invoked when an abnormal response is received. There are a few simple
* rules that one must follow:
+ *
*
- * If you modify the request object or modify its execute interceptors in a way that should
- * resolve the error, you must return true to issue a retry.
- * Do not read from the content stream, this will prevent the eventual end user from having
- * access to it.
+ * If you modify the request object or modify its execute interceptors in a way that should
+ * resolve the error, you must return true to issue a retry.
+ * Do not read from the content stream, this will prevent the eventual end user from having
+ * access to it.
*
*
* @param request Request object that can be read from for context or modified before retry
* @param response Response to process
* @param supportsRetry Whether there will actually be a retry if this handler return {@code
- * true}. Some handlers may want to have an effect only when there will actually be a retry
- * after they handle their event (e.g. a handler that implements exponential backoff).
+ * true}. Some handlers may want to have an effect only when there will actually be a retry
+ * after they handle their event (e.g. a handler that implements exponential backoff).
* @return Whether or not this handler has made a change that will require the request to be
- * re-sent.
+ * re-sent.
*/
boolean handleResponse(HttpRequest request, HttpResponse response, boolean supportsRetry)
throws IOException;
diff --git a/google-http-client/src/main/java/com/google/api/client/http/InputStreamContent.java b/google-http-client/src/main/java/com/google/api/client/http/InputStreamContent.java
index e026e3349..14ee7d259 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/InputStreamContent.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/InputStreamContent.java
@@ -15,7 +15,6 @@
package com.google.api.client.http;
import com.google.api.client.util.Preconditions;
-
import java.io.InputStream;
import java.io.OutputStream;
@@ -25,24 +24,19 @@
* be re-opened and retried. If you have a stream that it is possible to recreate please create a
* new subclass of {@link AbstractInputStreamContent}.
*
- *
- * The input stream is guaranteed to be closed at the end of {@link #writeTo(OutputStream)}.
- *
+ * The input stream is guaranteed to be closed at the end of {@link #writeTo(OutputStream)}.
*
- *
- * Sample use with a URL:
+ *
Sample use with a URL:
*
*
*
- private static void setRequestJpegContent(HttpRequest request, URL jpegUrl) throws IOException {
- request.setContent(new InputStreamContent("image/jpeg", jpegUrl.openStream()));
- }
+ * private static void setRequestJpegContent(HttpRequest request, URL jpegUrl) throws IOException {
+ * request.setContent(new InputStreamContent("image/jpeg", jpegUrl.openStream()));
+ * }
*
*
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.0
* @author Yaniv Inbar
@@ -79,10 +73,8 @@ public boolean retrySupported() {
/**
* Sets whether or not retry is supported. Defaults to {@code false}.
*
- *
- * Should be set to {@code true} if {@link #getInputStream} is called to reset to the original
+ *
Should be set to {@code true} if {@link #getInputStream} is called to reset to the original
* position of the input stream.
- *
*
* @since 1.7
*/
@@ -109,9 +101,7 @@ public InputStreamContent setCloseInputStream(boolean closeInputStream) {
/**
* Sets the content length or less than zero if not known.
*
- *
- * Defaults to {@code -1}.
- *
+ * Defaults to {@code -1}.
*
* @since 1.5
*/
diff --git a/google-http-client/src/main/java/com/google/api/client/http/LowLevelHttpRequest.java b/google-http-client/src/main/java/com/google/api/client/http/LowLevelHttpRequest.java
index 36e6c3c22..b13e2a040 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/LowLevelHttpRequest.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/LowLevelHttpRequest.java
@@ -15,21 +15,16 @@
package com.google.api.client.http;
import com.google.api.client.util.StreamingContent;
-
import java.io.IOException;
/**
* Low-level HTTP request.
*
- *
- * This allows providing a different implementation of the HTTP request that is more compatible with
- * the Java environment used.
- *
+ * This allows providing a different implementation of the HTTP request that is more compatible
+ * with the Java environment used.
*
- *
- * Implementation has no fields and therefore thread-safe, but sub-classes are not necessarily
+ *
Implementation has no fields and therefore thread-safe, but sub-classes are not necessarily
* thread-safe.
- *
*
* @since 1.0
* @author Yaniv Inbar
@@ -51,10 +46,8 @@ public abstract class LowLevelHttpRequest {
/**
* Adds a header to the HTTP request.
*
- *
- * Note that multiple headers of the same name need to be supported, in which case
- * {@link #addHeader} will be called for each instance of the header.
- *
+ * Note that multiple headers of the same name need to be supported, in which case {@link
+ * #addHeader} will be called for each instance of the header.
*
* @param name header name
* @param value header value
@@ -64,9 +57,7 @@ public abstract class LowLevelHttpRequest {
/**
* Sets the content length or less than zero if not known.
*
- *
- * Default value is {@code -1}.
- *
+ * Default value is {@code -1}.
*
* @throws IOException I/O exception
* @since 1.14
@@ -128,8 +119,7 @@ public final String getContentType() {
* @throws IOException I/O exception
* @since 1.14
*/
- public final void setStreamingContent(StreamingContent streamingContent)
- throws IOException {
+ public final void setStreamingContent(StreamingContent streamingContent) throws IOException {
this.streamingContent = streamingContent;
}
@@ -145,34 +135,28 @@ public final StreamingContent getStreamingContent() {
/**
* Sets the connection and read timeouts.
*
- *
- * Default implementation does nothing, but subclasses should normally override.
- *
+ * Default implementation does nothing, but subclasses should normally override.
*
* @param connectTimeout timeout in milliseconds to establish a connection or {@code 0} for an
- * infinite timeout
+ * infinite timeout
* @param readTimeout Timeout in milliseconds to read data from an established connection or
- * {@code 0} for an infinite timeout
+ * {@code 0} for an infinite timeout
* @throws IOException I/O exception
* @since 1.4
*/
- public void setTimeout(int connectTimeout, int readTimeout) throws IOException {
- }
+ public void setTimeout(int connectTimeout, int readTimeout) throws IOException {}
/**
* Sets the write timeout for POST/PUT requests.
*
- *
- * Default implementation does nothing, but subclasses should normally override.
- *
+ * Default implementation does nothing, but subclasses should normally override.
*
* @param writeTimeout timeout in milliseconds to establish a connection or {@code 0} for an
- * infinite timeout
+ * infinite timeout
* @throws IOException I/O exception
* @since 1.27
*/
- public void setWriteTimeout(int writeTimeout) throws IOException {
- }
+ public void setWriteTimeout(int writeTimeout) throws IOException {}
/** Executes the request and returns a low-level HTTP response object. */
public abstract LowLevelHttpResponse execute() throws IOException;
diff --git a/google-http-client/src/main/java/com/google/api/client/http/LowLevelHttpResponse.java b/google-http-client/src/main/java/com/google/api/client/http/LowLevelHttpResponse.java
index 94e444ebd..c4e86ffec 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/LowLevelHttpResponse.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/LowLevelHttpResponse.java
@@ -20,15 +20,11 @@
/**
* Low-level HTTP response.
*
- *
- * This allows providing a different implementation of the HTTP response that is more compatible
+ *
This allows providing a different implementation of the HTTP response that is more compatible
* with the Java environment used.
- *
*
- *
- * Implementation has no fields and therefore thread-safe, but sub-classes are not necessarily
+ *
Implementation has no fields and therefore thread-safe, but sub-classes are not necessarily
* thread-safe.
- *
*
* @since 1.0
* @author Yaniv Inbar
@@ -63,10 +59,8 @@ public abstract class LowLevelHttpResponse {
/**
* Returns the number of HTTP response headers.
*
- *
- * Note that multiple headers of the same name need to be supported, in which case each header
+ *
Note that multiple headers of the same name need to be supported, in which case each header
* value is treated as a separate header.
- *
*/
public abstract int getHeaderCount() throws IOException;
@@ -83,6 +77,5 @@ public abstract class LowLevelHttpResponse {
* @throws IOException I/O exception
* @since 1.4
*/
- public void disconnect() throws IOException {
- }
+ public void disconnect() throws IOException {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/http/MultipartContent.java b/google-http-client/src/main/java/com/google/api/client/http/MultipartContent.java
index 7108ebeee..4fdc0b586 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/MultipartContent.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/MultipartContent.java
@@ -16,7 +16,6 @@
import com.google.api.client.util.Preconditions;
import com.google.api.client.util.StreamingContent;
-
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
@@ -32,15 +31,11 @@
* and RFC 2046: Multipurpose Internet
* Mail Extensions: The Multipart/mixed (primary) subtype .
*
- *
- * By default the media type is {@code "multipart/related; boundary=__END_OF_PART__"}, but this may
- * be customized by calling {@link #setMediaType(HttpMediaType)}, {@link #getMediaType()}, or
+ *
By default the media type is {@code "multipart/related; boundary=__END_OF_PART__"}, but this
+ * may be customized by calling {@link #setMediaType(HttpMediaType)}, {@link #getMediaType()}, or
* {@link #setBoundary(String)}.
- *
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.14
* @author Yaniv Inbar
@@ -66,7 +61,8 @@ public void writeTo(OutputStream out) throws IOException {
if (part.headers != null) {
headers.fromHttpHeaders(part.headers);
}
- headers.setContentEncoding(null)
+ headers
+ .setContentEncoding(null)
.setUserAgent(null)
.setContentType(null)
.setContentLength(null)
@@ -141,10 +137,8 @@ public final Collection getParts() {
/**
* Adds an HTTP multipart part.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public MultipartContent addPart(Part part) {
parts.add(Preconditions.checkNotNull(part));
@@ -154,10 +148,8 @@ public MultipartContent addPart(Part part) {
/**
* Sets the parts of the HTTP multipart request.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public MultipartContent setParts(Collection parts) {
this.parts = new ArrayList(parts);
@@ -168,10 +160,8 @@ public MultipartContent setParts(Collection parts) {
* Sets the HTTP content parts of the HTTP multipart request, where each part is assumed to have
* no HTTP headers and no encoding.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public MultipartContent setContentParts(Collection contentParts) {
this.parts = new ArrayList(contentParts.size());
@@ -189,14 +179,10 @@ public final String getBoundary() {
/**
* Sets the boundary string to use.
*
- *
- * Defaults to {@code "END_OF_PART"}.
- *
+ * Defaults to {@code "END_OF_PART"}.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public MultipartContent setBoundary(String boundary) {
getMediaType().setParameter("boundary", Preconditions.checkNotNull(boundary));
@@ -206,9 +192,7 @@ public MultipartContent setBoundary(String boundary) {
/**
* Single part of a multi-part request.
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*/
public static final class Part {
@@ -225,9 +209,7 @@ public Part() {
this(null);
}
- /**
- * @param content HTTP content or {@code null} for none
- */
+ /** @param content HTTP content or {@code null} for none */
public Part(HttpContent content) {
this(null, content);
}
diff --git a/google-http-client/src/main/java/com/google/api/client/http/OpenCensusUtils.java b/google-http-client/src/main/java/com/google/api/client/http/OpenCensusUtils.java
index 1de900725..e7ecd3dc0 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/OpenCensusUtils.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/OpenCensusUtils.java
@@ -17,7 +17,6 @@
import com.google.api.client.util.Beta;
import com.google.api.client.util.Preconditions;
import com.google.common.annotations.VisibleForTesting;
-
import com.google.common.collect.ImmutableList;
import io.opencensus.contrib.http.util.HttpPropagationUtil;
import io.opencensus.trace.BlankSpan;
@@ -29,14 +28,13 @@
import io.opencensus.trace.Tracer;
import io.opencensus.trace.Tracing;
import io.opencensus.trace.propagation.TextFormat;
-
import java.util.concurrent.atomic.AtomicLong;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.annotation.Nullable;
/**
- * {@link Beta}
This API allows users of google-http-client to specify other text format, or disable context
* propagation by setting it to {@code null}. It should be used along with {@link
- * #setPropagationTextFormatSetter} for setting purpose.
+ * #setPropagationTextFormatSetter} for setting purpose.
*
* @param textFormat the text format.
*/
@@ -101,7 +85,7 @@ public static void setPropagationTextFormat(@Nullable TextFormat textFormat) {
*
* This API allows users of google-http-client to specify other text format setter, or disable
* context propagation by setting it to {@code null}. It should be used along with {@link
- * #setPropagationTextFormat} for setting purpose.
+ * #setPropagationTextFormat} for setting purpose.
*
* @param textFormatSetter the {@code TextFormat.Setter} for the text format.
*/
@@ -112,7 +96,7 @@ public static void setPropagationTextFormatSetter(@Nullable TextFormat.Setter te
/**
* Sets whether spans should be recorded locally.
*
- * This API allows users of google-http-client to turn on/off local span collection.
+ * This API allows users of google-http-client to turn on/off local span collection.
*
* @param recordEvent record span locally if true.
*/
@@ -231,22 +215,23 @@ static void recordMessageEvent(Span span, long size, Type eventType) {
if (size < 0) {
size = 0;
}
- MessageEvent event = MessageEvent
- .builder(eventType, idGenerator.getAndIncrement())
- .setUncompressedMessageSize(size)
- .build();
+ MessageEvent event =
+ MessageEvent.builder(eventType, idGenerator.getAndIncrement())
+ .setUncompressedMessageSize(size)
+ .build();
span.addMessageEvent(event);
}
static {
try {
propagationTextFormat = HttpPropagationUtil.getCloudTraceFormat();
- propagationTextFormatSetter = new TextFormat.Setter() {
- @Override
- public void put(HttpHeaders carrier, String key, String value) {
- carrier.set(key, value);
- }
- };
+ propagationTextFormatSetter =
+ new TextFormat.Setter() {
+ @Override
+ public void put(HttpHeaders carrier, String key, String value) {
+ carrier.set(key, value);
+ }
+ };
} catch (Exception e) {
logger.log(
Level.WARNING, "Cannot initialize default OpenCensus HTTP propagation text format.", e);
@@ -257,8 +242,7 @@ public void put(HttpHeaders carrier, String key, String value) {
.getSampledSpanStore()
.registerSpanNamesForCollection(ImmutableList.of(SPAN_NAME_HTTP_REQUEST_EXECUTE));
} catch (Exception e) {
- logger.log(
- Level.WARNING, "Cannot register default OpenCensus span names for collection.", e);
+ logger.log(Level.WARNING, "Cannot register default OpenCensus span names for collection.", e);
}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/http/UriTemplate.java b/google-http-client/src/main/java/com/google/api/client/http/UriTemplate.java
index 433fb9d39..f3e7d63d1 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/UriTemplate.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/UriTemplate.java
@@ -20,7 +20,6 @@
import com.google.api.client.util.Types;
import com.google.api.client.util.escape.CharEscapers;
import com.google.common.base.Splitter;
-
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -30,49 +29,26 @@
/**
* Expands URI Templates.
*
- * This Class supports Level 1 templates and all Level 4 composite templates as described in:
- * RFC 6570 .
+ * This Class supports Level 1 templates and all Level 4 composite templates as described in: RFC 6570 .
*
- * Specifically, for the variables:
- * var := "value"
- * list := ["red", "green", "blue"]
- * keys := [("semi", ";"),("dot", "."),("comma", ",")]
+ *
Specifically, for the variables: var := "value" list := ["red", "green", "blue"] keys :=
+ * [("semi", ";"),("dot", "."),("comma", ",")]
*
- * The following templates results in the following expansions:
- * {var} -> value
- * {list} -> red,green,blue
- * {list*} -> red,green,blue
- * {keys} -> semi,%3B,dot,.,comma,%2C
- * {keys*} -> semi=%3B,dot=.,comma=%2C
- * {+list} -> red,green,blue
- * {+list*} -> red,green,blue
- * {+keys} -> semi,;,dot,.,comma,,
- * {+keys*} -> semi=;,dot=.,comma=,
- * {#list} -> #red,green,blue
- * {#list*} -> #red,green,blue
- * {#keys} -> #semi,;,dot,.,comma,,
- * {#keys*} -> #semi=;,dot=.,comma=,
- * X{.list} -> X.red,green,blue
- * X{.list*} -> X.red.green.blue
- * X{.keys} -> X.semi,%3B,dot,.,comma,%2C
- * X{.keys*} -> X.semi=%3B.dot=..comma=%2C
- * {/list} -> /red,green,blue
- * {/list*} -> /red/green/blue
- * {/keys} -> /semi,%3B,dot,.,comma,%2C
- * {/keys*} -> /semi=%3B/dot=./comma=%2C
- * {;list} -> ;list=red,green,blue
- * {;list*} -> ;list=red;list=green;list=blue
- * {;keys} -> ;keys=semi,%3B,dot,.,comma,%2C
- * {;keys*} -> ;semi=%3B;dot=.;comma=%2C
- * {?list} -> ?list=red,green,blue
- * {?list*} -> ?list=red&list=green&list=blue
- * {?keys} -> ?keys=semi,%3B,dot,.,comma,%2C
- * {?keys*} -> ?semi=%3B&dot=.&comma=%2C
- * {&list} -> &list=red,green,blue
- * {&list*} -> &list=red&list=green&list=blue
- * {&keys} -> &keys=semi,%3B,dot,.,comma,%2C
- * {&keys*} -> &semi=%3B&dot=.&comma=%2C
- * {?var,list} -> ?var=value&list=red,green,blue
+ *
The following templates results in the following expansions: {var} -> value {list} ->
+ * red,green,blue {list*} -> red,green,blue {keys} -> semi,%3B,dot,.,comma,%2C {keys*} ->
+ * semi=%3B,dot=.,comma=%2C {+list} -> red,green,blue {+list*} -> red,green,blue {+keys} ->
+ * semi,;,dot,.,comma,, {+keys*} -> semi=;,dot=.,comma=, {#list} -> #red,green,blue {#list*} ->
+ * #red,green,blue {#keys} -> #semi,;,dot,.,comma,, {#keys*} -> #semi=;,dot=.,comma=, X{.list} ->
+ * X.red,green,blue X{.list*} -> X.red.green.blue X{.keys} -> X.semi,%3B,dot,.,comma,%2C X{.keys*}
+ * -> X.semi=%3B.dot=..comma=%2C {/list} -> /red,green,blue {/list*} -> /red/green/blue {/keys} ->
+ * /semi,%3B,dot,.,comma,%2C {/keys*} -> /semi=%3B/dot=./comma=%2C {;list} -> ;list=red,green,blue
+ * {;list*} -> ;list=red;list=green;list=blue {;keys} -> ;keys=semi,%3B,dot,.,comma,%2C {;keys*} ->
+ * ;semi=%3B;dot=.;comma=%2C {?list} -> ?list=red,green,blue {?list*} ->
+ * ?list=red&list=green&list=blue {?keys} -> ?keys=semi,%3B,dot,.,comma,%2C {?keys*} ->
+ * ?semi=%3B&dot=.&comma=%2C {&list} -> &list=red,green,blue {&list*} ->
+ * &list=red&list=green&list=blue {&keys} -> &keys=semi,%3B,dot,.,comma,%2C {&keys*} ->
+ * &semi=%3B&dot=.&comma=%2C {?var,list} -> ?var=value&list=red,green,blue
*
* @since 1.6
* @author Ravi Mistry
@@ -88,9 +64,7 @@ public class UriTemplate {
private static final String COMPOSITE_NON_EXPLODE_JOINER = ",";
- /**
- * Contains information on how to output a composite value.
- */
+ /** Contains information on how to output a composite value. */
private enum CompositeOutput {
/** Reserved expansion. */
@@ -125,16 +99,20 @@ private enum CompositeOutput {
/**
* @param propertyPrefix The prefix of a parameter or {@code null} for none. In {+var} the
- * prefix is '+'
+ * prefix is '+'
* @param outputPrefix The string that should be prefixed to the expanded template.
* @param explodeJoiner The delimiter used to join composite values.
- * @param requiresVarAssignment Denotes whether or not the expanded template should contain
- * an assignment with the variable.
- * @param reservedExpansion Reserved expansion allows pct-encoded triplets and characters in
- * the reserved set.
+ * @param requiresVarAssignment Denotes whether or not the expanded template should contain an
+ * assignment with the variable.
+ * @param reservedExpansion Reserved expansion allows pct-encoded triplets and characters in the
+ * reserved set.
*/
- CompositeOutput(Character propertyPrefix, String outputPrefix, String explodeJoiner,
- boolean requiresVarAssignment, boolean reservedExpansion) {
+ CompositeOutput(
+ Character propertyPrefix,
+ String outputPrefix,
+ String explodeJoiner,
+ boolean requiresVarAssignment,
+ boolean reservedExpansion) {
this.propertyPrefix = propertyPrefix;
this.outputPrefix = Preconditions.checkNotNull(outputPrefix);
this.explodeJoiner = Preconditions.checkNotNull(explodeJoiner);
@@ -145,22 +123,18 @@ private enum CompositeOutput {
}
}
- /**
- * Returns the string that should be prefixed to the expanded template.
- */
+ /** Returns the string that should be prefixed to the expanded template. */
String getOutputPrefix() {
return outputPrefix;
}
- /**
- * Returns the delimiter used to join composite values.
- */
+ /** Returns the delimiter used to join composite values. */
String getExplodeJoiner() {
return explodeJoiner;
}
/**
- * Returns whether or not the expanded template should contain an assignment with the variable.
+ * Returns whether or not the expanded template should contain an assignment with the variable.
*/
boolean requiresVarAssignment() {
return requiresVarAssignment;
@@ -175,11 +149,10 @@ int getVarNameStartIndex() {
}
/**
- * Encodes the specified value. If reserved expansion is turned on then
- * pct-encoded triplets and characters are allowed in the reserved set.
+ * Encodes the specified value. If reserved expansion is turned on then pct-encoded triplets and
+ * characters are allowed in the reserved set.
*
* @param value The string to be encoded.
- *
* @return The encoded string.
*/
String getEncodedValue(String value) {
@@ -206,9 +179,7 @@ static CompositeOutput getCompositeOutput(String propertyName) {
/**
* Constructs a new {@code Map} from an {@code Object}.
*
- *
- * There are no null values in the returned map.
- *
+ * There are no null values in the returned map.
*/
private static Map getMap(Object obj) {
// Using a LinkedHashMap to maintain the original order of insertions. This is done to help
@@ -226,28 +197,24 @@ private static Map getMap(Object obj) {
/**
* Expands templates in a URI template that is relative to a base URL.
*
- *
- * If the URI template starts with a "/" the raw path from the base URL is stripped out. If the
+ *
If the URI template starts with a "/" the raw path from the base URL is stripped out. If the
* URI template is a full URL then it is used instead of the base URL.
- *
*
- *
- * Supports Level 1 templates and all Level 4 composite templates as described in:
- * RFC 6570 .
- *
+ * Supports Level 1 templates and all Level 4 composite templates as described in: RFC 6570 .
*
* @param baseUrl The base URL which the URI component is relative to.
* @param uriTemplate URI component. It may contain one or more sequences of the form "{name}",
- * where "name" must be a key in variableMap.
+ * where "name" must be a key in variableMap.
* @param parameters an object with parameters designated by Key annotations. If the template has
- * no variable references, parameters may be {@code null}.
+ * no variable references, parameters may be {@code null}.
* @param addUnusedParamsAsQueryParams If true then parameters that do not match the template are
- * appended to the expanded template as query parameters.
+ * appended to the expanded template as query parameters.
* @return The expanded template
* @since 1.7
*/
- public static String expand(String baseUrl, String uriTemplate, Object parameters,
- boolean addUnusedParamsAsQueryParams) {
+ public static String expand(
+ String baseUrl, String uriTemplate, Object parameters, boolean addUnusedParamsAsQueryParams) {
String pathUri;
if (uriTemplate.startsWith("/")) {
// Remove the base path from the base URL.
@@ -265,22 +232,20 @@ public static String expand(String baseUrl, String uriTemplate, Object parameter
/**
* Expands templates in a URI.
*
- *
- * Supports Level 1 templates and all Level 4 composite templates as described in:
- * RFC 6570 .
- *
+ * Supports Level 1 templates and all Level 4 composite templates as described in: RFC 6570 .
*
* @param pathUri URI component. It may contain one or more sequences of the form "{name}", where
- * "name" must be a key in variableMap
+ * "name" must be a key in variableMap
* @param parameters an object with parameters designated by Key annotations. If the template has
- * no variable references, parameters may be {@code null}.
+ * no variable references, parameters may be {@code null}.
* @param addUnusedParamsAsQueryParams If true then parameters that do not match the template are
- * appended to the expanded template as query parameters.
+ * appended to the expanded template as query parameters.
* @return The expanded template
* @since 1.6
*/
- public static String expand(String pathUri, Object parameters,
- boolean addUnusedParamsAsQueryParams) {
+ public static String expand(
+ String pathUri, Object parameters, boolean addUnusedParamsAsQueryParams) {
Map variableMap = getMap(parameters);
StringBuilder pathBuf = new StringBuilder();
int cur = 0;
@@ -308,8 +273,8 @@ public static String expand(String pathUri, Object parameters,
String template = templateIterator.next();
boolean containsExplodeModifier = template.endsWith("*");
- int varNameStartIndex = templateIterator.nextIndex() == 1
- ? compositeOutput.getVarNameStartIndex() : 0;
+ int varNameStartIndex =
+ templateIterator.nextIndex() == 1 ? compositeOutput.getVarNameStartIndex() : 0;
int varNameEndIndex = template.length();
if (containsExplodeModifier) {
// The expression contains an explode modifier '*' at the end, update end index.
@@ -366,9 +331,8 @@ private static String getSimpleValue(String name, String value, CompositeOutput
}
/**
- * Expand the template of a composite list property.
- * Eg: If d := ["red", "green", "blue"]
- * then {/d*} is expanded to "/red/green/blue"
+ * Expand the template of a composite list property. Eg: If d := ["red", "green", "blue"] then
+ * {/d*} is expanded to "/red/green/blue"
*
* @param varName The name of the variable the value corresponds to. Eg: "d"
* @param iterator The iterator over list values. Eg: ["red", "green", "blue"]
@@ -378,8 +342,11 @@ private static String getSimpleValue(String name, String value, CompositeOutput
* @return The expanded list template
* @throws IllegalArgumentException if the required list path parameter is empty
*/
- private static String getListPropertyValue(String varName, Iterator iterator,
- boolean containsExplodeModifier, CompositeOutput compositeOutput) {
+ private static String getListPropertyValue(
+ String varName,
+ Iterator iterator,
+ boolean containsExplodeModifier,
+ CompositeOutput compositeOutput) {
if (!iterator.hasNext()) {
return "";
}
@@ -408,9 +375,8 @@ private static String getListPropertyValue(String varName, Iterator iterator,
}
/**
- * Expand the template of a composite map property.
- * Eg: If d := [("semi", ";"),("dot", "."),("comma", ",")]
- * then {/d*} is expanded to "/semi=%3B/dot=./comma=%2C"
+ * Expand the template of a composite map property. Eg: If d := [("semi", ";"),("dot",
+ * "."),("comma", ",")] then {/d*} is expanded to "/semi=%3B/dot=./comma=%2C"
*
* @param varName The name of the variable the value corresponds to. Eg: "d"
* @param map The map property value. Eg: [("semi", ";"),("dot", "."),("comma", ",")]
@@ -420,8 +386,11 @@ private static String getListPropertyValue(String varName, Iterator iterator,
* @return The expanded map template
* @throws IllegalArgumentException if the required list path parameter is map
*/
- private static String getMapPropertyValue(String varName, Map map,
- boolean containsExplodeModifier, CompositeOutput compositeOutput) {
+ private static String getMapPropertyValue(
+ String varName,
+ Map map,
+ boolean containsExplodeModifier,
+ CompositeOutput compositeOutput) {
if (map.isEmpty()) {
return "";
}
@@ -440,7 +409,7 @@ private static String getMapPropertyValue(String varName, Map ma
}
}
for (Iterator> mapIterator = map.entrySet().iterator();
- mapIterator.hasNext();) {
+ mapIterator.hasNext(); ) {
Map.Entry entry = mapIterator.next();
String encodedKey = compositeOutput.getEncodedValue(entry.getKey());
String encodedValue = compositeOutput.getEncodedValue(entry.getValue().toString());
diff --git a/google-http-client/src/main/java/com/google/api/client/http/UrlEncodedContent.java b/google-http-client/src/main/java/com/google/api/client/http/UrlEncodedContent.java
index 79741670a..eb6428b18 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/UrlEncodedContent.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/UrlEncodedContent.java
@@ -19,7 +19,6 @@
import com.google.api.client.util.Preconditions;
import com.google.api.client.util.Types;
import com.google.api.client.util.escape.CharEscapers;
-
import java.io.BufferedWriter;
import java.io.IOException;
import java.io.OutputStream;
@@ -29,23 +28,19 @@
import java.util.Map;
/**
- * Implements support for HTTP form content encoding serialization of type
- * {@code application/x-www-form-urlencoded} as specified in the HTML 4.0 Specification .
*
- *
- * Sample usage:
- *
+ * Sample usage:
*
*
- static void setContent(HttpRequest request, Object item) {
- request.setContent(new UrlEncodedContent(item));
- }
+ * static void setContent(HttpRequest request, Object item) {
+ * request.setContent(new UrlEncodedContent(item));
+ * }
*
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.0
* @author Yaniv Inbar
@@ -55,9 +50,7 @@ public class UrlEncodedContent extends AbstractHttpContent {
/** Key name/value data. */
private Object data;
- /**
- * @param data key name/value data
- */
+ /** @param data key name/value data */
public UrlEncodedContent(Object data) {
super(UrlEncodedParser.MEDIA_TYPE);
setData(data);
@@ -101,10 +94,8 @@ public final Object getData() {
/**
* Sets the key name/value data.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.5
*/
@@ -120,8 +111,8 @@ public UrlEncodedContent setData(Object data) {
*
* @param request HTTP request
* @return URL-encoded content
- * @throws ClassCastException if the HTTP request has a content defined that is not
- * {@link UrlEncodedContent}
+ * @throws ClassCastException if the HTTP request has a content defined that is not {@link
+ * UrlEncodedContent}
* @since 1.7
*/
public static UrlEncodedContent getContent(HttpRequest request) {
@@ -147,8 +138,9 @@ private static boolean appendParam(boolean first, Writer writer, String name, Ob
writer.write("&");
}
writer.write(name);
- String stringValue = CharEscapers.escapeUri(
- value instanceof Enum ? FieldInfo.of((Enum) value).getName() : value.toString());
+ String stringValue =
+ CharEscapers.escapeUri(
+ value instanceof Enum ? FieldInfo.of((Enum) value).getName() : value.toString());
if (stringValue.length() != 0) {
writer.write("=");
writer.write(stringValue);
diff --git a/google-http-client/src/main/java/com/google/api/client/http/UrlEncodedParser.java b/google-http-client/src/main/java/com/google/api/client/http/UrlEncodedParser.java
index 52209740b..cd5e8a63a 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/UrlEncodedParser.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/UrlEncodedParser.java
@@ -25,7 +25,6 @@
import com.google.api.client.util.Throwables;
import com.google.api.client.util.Types;
import com.google.api.client.util.escape.CharEscapers;
-
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@@ -42,27 +41,21 @@
import java.util.Map;
/**
- * Implements support for HTTP form content encoding parsing of type
- * {@code application/x-www-form-urlencoded} as specified in the HTML 4.0
* Specification .
*
- *
- * Implementation is thread-safe.
- *
+ * Implementation is thread-safe.
*
- *
- * The data is parsed using {@link #parse(String, Object)}.
- *
+ * The data is parsed using {@link #parse(String, Object)}.
*
- *
- * Sample usage:
- *
+ * Sample usage:
*
*
- static void setParser(HttpTransport transport) {
- transport.addParser(new UrlEncodedParser());
- }
+ * static void setParser(HttpTransport transport) {
+ * transport.addParser(new UrlEncodedParser());
+ * }
*
*
* @since 1.0
@@ -104,24 +97,20 @@ public static void parse(String content, Object data) {
* Parses the given URL-encoded content into the given data object of data key name/value pairs,
* including support for repeating data key names.
*
- *
- * Declared fields of a "primitive" type (as defined by {@link Data#isPrimitive(Type)} are parsed
- * using {@link Data#parsePrimitiveValue(Type, String)} where the {@link Class} parameter is the
- * declared field class. Declared fields of type {@link Collection} are used to support repeating
- * data key names, so each member of the collection is an additional data key value. They are
- * parsed the same as "primitive" fields, except that the generic type parameter of the collection
- * is used as the {@link Class} parameter.
- *
+ * Declared fields of a "primitive" type (as defined by {@link Data#isPrimitive(Type)} are
+ * parsed using {@link Data#parsePrimitiveValue(Type, String)} where the {@link Class} parameter
+ * is the declared field class. Declared fields of type {@link Collection} are used to support
+ * repeating data key names, so each member of the collection is an additional data key value.
+ * They are parsed the same as "primitive" fields, except that the generic type parameter of the
+ * collection is used as the {@link Class} parameter.
*
- *
- * If there is no declared field for an input parameter name, it will be ignored unless the input
- * {@code data} parameter is a {@link Map}. If it is a map, the parameter value will be stored
- * either as a string, or as a {@link ArrayList}<String> in the case of repeated parameters.
- *
+ * If there is no declared field for an input parameter name, it will be ignored unless the
+ * input {@code data} parameter is a {@link Map}. If it is a map, the parameter value will be
+ * stored either as a string, or as a {@link ArrayList}<String> in the case of repeated
+ * parameters.
*
* @param reader URL-encoded reader
* @param data data key name/value pairs
- *
* @since 1.14
*/
public static void parse(Reader reader, Object data) throws IOException {
@@ -135,11 +124,12 @@ public static void parse(Reader reader, Object data) throws IOException {
StringWriter nameWriter = new StringWriter();
StringWriter valueWriter = new StringWriter();
boolean readingName = true;
- mainLoop: while (true) {
+ mainLoop:
+ while (true) {
int read = reader.read();
switch (read) {
case -1:
- // falls through
+ // falls through
case '&':
// parse name/value pair
String name = CharEscapers.decodeUri(nameWriter.toString());
@@ -155,7 +145,9 @@ public static void parse(Reader reader, Object data) throws IOException {
// array that can handle repeating values
Class rawArrayComponentType =
Types.getRawArrayComponentType(context, Types.getArrayComponentType(type));
- arrayValueMap.put(fieldInfo.getField(), rawArrayComponentType,
+ arrayValueMap.put(
+ fieldInfo.getField(),
+ rawArrayComponentType,
parseValue(rawArrayComponentType, context, stringValue));
} else if (Types.isAssignableToOrFrom(
Types.getRawArrayComponentType(context, type), Iterable.class)) {
diff --git a/google-http-client/src/main/java/com/google/api/client/http/apache/ApacheHttpRequest.java b/google-http-client/src/main/java/com/google/api/client/http/apache/ApacheHttpRequest.java
index f498b7150..230d9b0f5 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/apache/ApacheHttpRequest.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/apache/ApacheHttpRequest.java
@@ -23,9 +23,7 @@
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.HttpRequestBase;
-/**
- * @author Yaniv Inbar
- */
+/** @author Yaniv Inbar */
final class ApacheHttpRequest extends LowLevelHttpRequest {
private final HttpClient httpClient;
@@ -46,14 +44,14 @@ public void addHeader(String name, String value) {
@Override
public void setTimeout(int connectTimeout, int readTimeout) throws IOException {
- requestConfig.setConnectionRequestTimeout(connectTimeout)
- .setSocketTimeout(readTimeout);
+ requestConfig.setConnectionRequestTimeout(connectTimeout).setSocketTimeout(readTimeout);
}
@Override
public LowLevelHttpResponse execute() throws IOException {
if (getStreamingContent() != null) {
- Preconditions.checkArgument(request instanceof HttpEntityEnclosingRequest,
+ Preconditions.checkArgument(
+ request instanceof HttpEntityEnclosingRequest,
"Apache HTTP client does not support %s requests with content.",
request.getRequestLine().getMethod());
ContentEntity entity = new ContentEntity(getContentLength(), getStreamingContent());
diff --git a/google-http-client/src/main/java/com/google/api/client/http/apache/ApacheHttpTransport.java b/google-http-client/src/main/java/com/google/api/client/http/apache/ApacheHttpTransport.java
index 50e74dc87..946f5e718 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/apache/ApacheHttpTransport.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/apache/ApacheHttpTransport.java
@@ -61,20 +61,16 @@
/**
* Thread-safe HTTP transport based on the Apache HTTP Client library.
*
- *
- * Implementation is thread-safe, as long as any parameter modification to the
- * {@link #getHttpClient() Apache HTTP Client} is only done at initialization time. For maximum
- * efficiency, applications should use a single globally-shared instance of the HTTP transport.
- *
+ * Implementation is thread-safe, as long as any parameter modification to the {@link
+ * #getHttpClient() Apache HTTP Client} is only done at initialization time. For maximum efficiency,
+ * applications should use a single globally-shared instance of the HTTP transport.
*
- *
- * Default settings are specified in {@link #newDefaultHttpClient()}. Use the
- * {@link #ApacheHttpTransport(HttpClient)} constructor to override the Apache HTTP Client used.
+ *
Default settings are specified in {@link #newDefaultHttpClient()}. Use the {@link
+ * #ApacheHttpTransport(HttpClient)} constructor to override the Apache HTTP Client used.
* Alternatively, use {@link #ApacheHttpTransport()} and change the {@link #getHttpClient()}. Please
* read the Apache HTTP
* Client connection management tutorial for more complex configuration options.
- *
*
* @since 1.0
* @author Yaniv Inbar
@@ -87,9 +83,7 @@ public final class ApacheHttpTransport extends HttpTransport {
/**
* Constructor that uses {@link #newDefaultHttpClient()} for the Apache HTTP client.
*
- *
- * Use {@link Builder} to modify HTTP client options.
- *
+ * Use {@link Builder} to modify HTTP client options.
*
* @since 1.3
*/
@@ -100,25 +94,22 @@ public ApacheHttpTransport() {
/**
* Constructor that allows an alternative Apache HTTP client to be used.
*
- *
- * Note that a few settings are overridden:
- *
+ * Note that a few settings are overridden:
+ *
*
- * HTTP version is set to 1.1 using {@link HttpProtocolParams#setVersion} with
- * {@link HttpVersion#HTTP_1_1}.
- * Redirects are disabled using {@link ClientPNames#HANDLE_REDIRECTS}.
- * {@link ConnManagerParams#setTimeout} and {@link HttpConnectionParams#setConnectionTimeout}
- * are set on each request based on {@link HttpRequest#getConnectTimeout()}.
- * {@link HttpConnectionParams#setSoTimeout} is set on each request based on
- * {@link HttpRequest#getReadTimeout()}.
+ * HTTP version is set to 1.1 using {@link HttpProtocolParams#setVersion} with {@link
+ * HttpVersion#HTTP_1_1}.
+ * Redirects are disabled using {@link ClientPNames#HANDLE_REDIRECTS}.
+ * {@link ConnManagerParams#setTimeout} and {@link
+ * HttpConnectionParams#setConnectionTimeout} are set on each request based on {@link
+ * HttpRequest#getConnectTimeout()}.
+ * {@link HttpConnectionParams#setSoTimeout} is set on each request based on {@link
+ * HttpRequest#getReadTimeout()}.
*
*
- *
- * Use {@link Builder} for a more user-friendly way to modify the HTTP client options.
- *
+ * Use {@link Builder} for a more user-friendly way to modify the HTTP client options.
*
* @param httpClient Apache HTTP client to use
- *
* @since 1.6
*/
public ApacheHttpTransport(HttpClient httpClient) {
@@ -132,22 +123,21 @@ public ApacheHttpTransport(HttpClient httpClient) {
}
/**
- * Creates a new instance of the Apache HTTP client that is used by the
- * {@link #ApacheHttpTransport()} constructor.
+ * Creates a new instance of the Apache HTTP client that is used by the {@link
+ * #ApacheHttpTransport()} constructor.
+ *
+ *
Use this constructor if you want to customize the default Apache HTTP client. Settings:
*
- *
- * Use this constructor if you want to customize the default Apache HTTP client. Settings:
- *
*
- * The client connection manager is set to {@link ThreadSafeClientConnManager}.
- * The socket buffer size is set to 8192 using
- * {@link HttpConnectionParams#setSocketBufferSize}.
- *
- * The route planner uses {@link ProxySelectorRoutePlanner} with
- * {@link ProxySelector#getDefault()}, which uses the proxy settings from system
- * properties .
+ * The client connection manager is set to {@link ThreadSafeClientConnManager}.
+ * The socket buffer size is set to 8192 using {@link
+ * HttpConnectionParams#setSocketBufferSize}.
+ * The route planner uses {@link ProxySelectorRoutePlanner} with {@link
+ * ProxySelector#getDefault()}, which uses the proxy settings from system
+ * properties .
*
*
* @return new instance of the Apache HTTP client
@@ -171,13 +161,13 @@ static HttpParams newDefaultHttpParams() {
}
/**
- * Creates a new instance of the Apache HTTP client that is used by the
- * {@link #ApacheHttpTransport()} constructor.
+ * Creates a new instance of the Apache HTTP client that is used by the {@link
+ * #ApacheHttpTransport()} constructor.
*
* @param socketFactory SSL socket factory
* @param params HTTP parameters
- * @param proxySelector HTTP proxy selector to use {@link ProxySelectorRoutePlanner} or
- * {@code null} for {@link DefaultHttpRoutePlanner}
+ * @param proxySelector HTTP proxy selector to use {@link ProxySelectorRoutePlanner} or {@code
+ * null} for {@link DefaultHttpRoutePlanner}
* @return new instance of the Apache HTTP client
*/
static DefaultHttpClient newDefaultHttpClient(
@@ -246,9 +236,7 @@ public HttpClient getHttpClient() {
/**
* Builder for {@link ApacheHttpTransport}.
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.13
*/
@@ -261,27 +249,23 @@ public static final class Builder {
private HttpParams params = newDefaultHttpParams();
/**
- * HTTP proxy selector to use {@link ProxySelectorRoutePlanner} or {@code null} for
- * {@link DefaultHttpRoutePlanner}.
+ * HTTP proxy selector to use {@link ProxySelectorRoutePlanner} or {@code null} for {@link
+ * DefaultHttpRoutePlanner}.
*/
private ProxySelector proxySelector = ProxySelector.getDefault();
/**
- * Sets the HTTP proxy to use {@link DefaultHttpRoutePlanner} or {@code null} to use
- * {@link #setProxySelector(ProxySelector)} with {@link ProxySelector#getDefault()}.
+ * Sets the HTTP proxy to use {@link DefaultHttpRoutePlanner} or {@code null} to use {@link
+ * #setProxySelector(ProxySelector)} with {@link ProxySelector#getDefault()}.
*
- *
- * By default it is {@code null}, which uses the proxy settings from By default it is {@code null}, which uses the proxy settings from system
* properties .
- *
*
- *
- * For example:
- *
+ * For example:
*
*
- setProxy(new HttpHost("127.0.0.1", 8080))
+ * setProxy(new HttpHost("127.0.0.1", 8080))
*
*/
public Builder setProxy(HttpHost proxy) {
@@ -296,11 +280,9 @@ public Builder setProxy(HttpHost proxy) {
* Sets the HTTP proxy selector to use {@link ProxySelectorRoutePlanner} or {@code null} for
* {@link DefaultHttpRoutePlanner}.
*
- *
- * By default it is {@link ProxySelector#getDefault()} which uses the proxy settings from By default it is {@link ProxySelector#getDefault()} which uses the proxy settings from system
* properties .
- *
*/
public Builder setProxySelector(ProxySelector proxySelector) {
this.proxySelector = proxySelector;
@@ -312,16 +294,14 @@ public Builder setProxySelector(ProxySelector proxySelector) {
/**
* Sets the SSL socket factory based on root certificates in a Java KeyStore.
*
- *
- * Example usage:
- *
+ * Example usage:
*
*
- trustCertificatesFromJavaKeyStore(new FileInputStream("certs.jks"), "password");
+ * trustCertificatesFromJavaKeyStore(new FileInputStream("certs.jks"), "password");
*
*
* @param keyStoreStream input stream to the key store (closed at the end of this method in a
- * finally block)
+ * finally block)
* @param storePass password protecting the key store file
* @since 1.14
*/
@@ -336,12 +316,10 @@ public Builder trustCertificatesFromJavaKeyStore(InputStream keyStoreStream, Str
* Sets the SSL socket factory based root certificates generated from the specified stream using
* {@link CertificateFactory#generateCertificates(InputStream)}.
*
- *
- * Example usage:
- *
+ * Example usage:
*
*
- trustCertificatesFromStream(new FileInputStream("certs.pem"));
+ * trustCertificatesFromStream(new FileInputStream("certs.pem"));
*
*
* @param certificateStream certificate stream
@@ -360,8 +338,7 @@ public Builder trustCertificatesFromStream(InputStream certificateStream)
* Sets the SSL socket factory based on a root certificate trust store.
*
* @param trustStore certificate trust store (use for example {@link SecurityUtils#loadKeyStore}
- * or {@link SecurityUtils#loadKeyStoreFromCertificates})
- *
+ * or {@link SecurityUtils#loadKeyStoreFromCertificates})
* @since 1.14
*/
public Builder trustCertificates(KeyStore trustStore) throws GeneralSecurityException {
@@ -371,15 +348,13 @@ public Builder trustCertificates(KeyStore trustStore) throws GeneralSecurityExce
}
/**
- * {@link Beta}
- * Be careful! Disabling certificate validation is dangerous and should only be done in testing
- * environments.
- *
+ * Be careful! Disabling certificate validation is dangerous and should only be done in
+ * testing environments.
*/
@Beta
public Builder doNotValidateCertificate() throws GeneralSecurityException {
diff --git a/google-http-client/src/main/java/com/google/api/client/http/apache/ContentEntity.java b/google-http-client/src/main/java/com/google/api/client/http/apache/ContentEntity.java
index 293f8a908..343b35c50 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/apache/ContentEntity.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/apache/ContentEntity.java
@@ -21,9 +21,7 @@
import java.io.OutputStream;
import org.apache.http.entity.AbstractHttpEntity;
-/**
- * @author Yaniv Inbar
- */
+/** @author Yaniv Inbar */
final class ContentEntity extends AbstractHttpEntity {
/** Content length or less than zero if not known. */
diff --git a/google-http-client/src/main/java/com/google/api/client/http/apache/SSLSocketFactoryExtension.java b/google-http-client/src/main/java/com/google/api/client/http/apache/SSLSocketFactoryExtension.java
index 3d507371b..18d9ebc58 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/apache/SSLSocketFactoryExtension.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/apache/SSLSocketFactoryExtension.java
@@ -37,11 +37,10 @@ final class SSLSocketFactoryExtension extends SSLSocketFactory {
/** Wrapped Java SSL socket factory. */
private final javax.net.ssl.SSLSocketFactory socketFactory;
- /**
- * @param sslContext SSL context
- */
- SSLSocketFactoryExtension(SSLContext sslContext) throws KeyManagementException,
- UnrecoverableKeyException, NoSuchAlgorithmException, KeyStoreException {
+ /** @param sslContext SSL context */
+ SSLSocketFactoryExtension(SSLContext sslContext)
+ throws KeyManagementException, UnrecoverableKeyException, NoSuchAlgorithmException,
+ KeyStoreException {
super((KeyStore) null);
socketFactory = sslContext.getSocketFactory();
}
diff --git a/google-http-client/src/main/java/com/google/api/client/http/apache/package-info.java b/google-http-client/src/main/java/com/google/api/client/http/apache/package-info.java
index e0f5be089..0c2c23b4f 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/apache/package-info.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/apache/package-info.java
@@ -18,6 +18,4 @@
* @since 1.0
* @author Yaniv Inbar
*/
-
package com.google.api.client.http.apache;
-
diff --git a/google-http-client/src/main/java/com/google/api/client/http/javanet/ConnectionFactory.java b/google-http-client/src/main/java/com/google/api/client/http/javanet/ConnectionFactory.java
index 49479303b..2ee5a718b 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/javanet/ConnectionFactory.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/javanet/ConnectionFactory.java
@@ -4,9 +4,7 @@
import java.net.HttpURLConnection;
import java.net.URL;
-/**
- * Given a {@link URL} instance, produces an {@link HttpURLConnection}.
- */
+/** Given a {@link URL} instance, produces an {@link HttpURLConnection}. */
public interface ConnectionFactory {
/**
diff --git a/google-http-client/src/main/java/com/google/api/client/http/javanet/DefaultConnectionFactory.java b/google-http-client/src/main/java/com/google/api/client/http/javanet/DefaultConnectionFactory.java
index 9bca36848..d4151261d 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/javanet/DefaultConnectionFactory.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/javanet/DefaultConnectionFactory.java
@@ -19,8 +19,8 @@ public DefaultConnectionFactory() {
/**
* @param proxy HTTP proxy or {@code null} to use the proxy settings from
- * system properties
+ * href="http://docs.oracle.com/javase/7/docs/api/java/net/doc-files/net-properties.html">
+ * system properties
*/
public DefaultConnectionFactory(Proxy proxy) {
this.proxy = proxy;
diff --git a/google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpRequest.java b/google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpRequest.java
index 58850b794..e497f882c 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpRequest.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpRequest.java
@@ -17,7 +17,6 @@
import com.google.api.client.http.LowLevelHttpRequest;
import com.google.api.client.http.LowLevelHttpResponse;
import com.google.api.client.util.Preconditions;
-
import com.google.api.client.util.StreamingContent;
import com.google.common.annotations.VisibleForTesting;
import java.io.IOException;
@@ -32,17 +31,13 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-/**
- * @author Yaniv Inbar
- */
+/** @author Yaniv Inbar */
final class NetHttpRequest extends LowLevelHttpRequest {
private final HttpURLConnection connection;
private int writeTimeout;
- /**
- * @param connection HTTP URL connection
- */
+ /** @param connection HTTP URL connection */
NetHttpRequest(HttpURLConnection connection) {
this.connection = connection;
this.writeTimeout = 0;
@@ -172,13 +167,14 @@ private void writeContentToOutputStream(final OutputWriter outputWriter, final O
} else {
// do it with timeout
final StreamingContent content = getStreamingContent();
- final Callable writeContent = new Callable() {
- @Override
- public Boolean call() throws IOException {
- outputWriter.write(out, content);
- return Boolean.TRUE;
- }
- };
+ final Callable writeContent =
+ new Callable() {
+ @Override
+ public Boolean call() throws IOException {
+ outputWriter.write(out, content);
+ return Boolean.TRUE;
+ }
+ };
final ExecutorService executor = Executors.newSingleThreadExecutor();
final Future future = executor.submit(new FutureTask(writeContent), null);
diff --git a/google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpResponse.java b/google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpResponse.java
index 3580957c1..7114f6391 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpResponse.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpResponse.java
@@ -15,7 +15,6 @@
package com.google.api.client.http.javanet;
import com.google.api.client.http.LowLevelHttpResponse;
-
import java.io.FilterInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -60,28 +59,22 @@ public int getStatusCode() {
/**
* {@inheritDoc}
*
- *
- * Returns {@link HttpURLConnection#getInputStream} when it doesn't throw {@link IOException},
+ *
Returns {@link HttpURLConnection#getInputStream} when it doesn't throw {@link IOException},
* otherwise it returns {@link HttpURLConnection#getErrorStream}.
- *
*
- *
- * Upgrade warning: in prior version 1.16 {@link #getContent()} returned
- * {@link HttpURLConnection#getInputStream} only when the status code was successful. Starting
- * with version 1.17 it returns {@link HttpURLConnection#getInputStream} when it doesn't throw
- * {@link IOException}, otherwise it returns {@link HttpURLConnection#getErrorStream}
- *
+ * Upgrade warning: in prior version 1.16 {@link #getContent()} returned {@link
+ * HttpURLConnection#getInputStream} only when the status code was successful. Starting with
+ * version 1.17 it returns {@link HttpURLConnection#getInputStream} when it doesn't throw {@link
+ * IOException}, otherwise it returns {@link HttpURLConnection#getErrorStream}
*
- *
- * Upgrade warning: in versions prior to 1.20 {@link #getContent()} returned
- * {@link HttpURLConnection#getInputStream()} or {@link HttpURLConnection#getErrorStream()}, both
- * of which silently returned -1 for read() calls when the connection got closed in the middle
- * of receiving a response. This is highly likely a bug from JDK's {@link HttpURLConnection}.
- * Since version 1.20, the bytes read off the wire will be checked and an {@link IOException} will
- * be thrown if the response is not fully delivered when the connection is closed by server for
+ *
Upgrade warning: in versions prior to 1.20 {@link #getContent()} returned {@link
+ * HttpURLConnection#getInputStream()} or {@link HttpURLConnection#getErrorStream()}, both of
+ * which silently returned -1 for read() calls when the connection got closed in the middle of
+ * receiving a response. This is highly likely a bug from JDK's {@link HttpURLConnection}. Since
+ * version 1.20, the bytes read off the wire will be checked and an {@link IOException} will be
+ * thrown if the response is not fully delivered when the connection is closed by server for
* whatever reason, e.g., server restarts. Note though that this is a best-effort check: when the
* response is chunk encoded, we have to rely on the underlying HTTP library to behave correctly.
- *
*/
@Override
public InputStream getContent() throws IOException {
@@ -162,7 +155,9 @@ public SizeValidatingInputStream(InputStream in) {
/**
* java.io.InputStream#read(byte[], int, int) swallows IOException thrown from read() so we have
* to override it.
- * @see "http://grepcode.com/file/repository.grepcode.com/java/root/jdk/openjdk/8-b132/java/io/InputStream.java#185"
+ *
+ * @see
+ * "http://grepcode.com/file/repository.grepcode.com/java/root/jdk/openjdk/8-b132/java/io/InputStream.java#185"
*/
@Override
public int read(byte[] b, int off, int len) throws IOException {
@@ -206,8 +201,11 @@ private void throwIfFalseEOF() throws IOException {
//
// See http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.4 for details.
if (bytesRead != 0 && bytesRead < contentLength) {
- throw new IOException("Connection closed prematurely: bytesRead = " + bytesRead
- + ", Content-Length = " + contentLength);
+ throw new IOException(
+ "Connection closed prematurely: bytesRead = "
+ + bytesRead
+ + ", Content-Length = "
+ + contentLength);
}
}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpTransport.java b/google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpTransport.java
index b0f751c07..3ba4eb676 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpTransport.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpTransport.java
@@ -38,22 +38,16 @@
/**
* Thread-safe HTTP low-level transport based on the {@code java.net} package.
*
- *
- * Users should consider modifying the keep alive property on {@link NetHttpTransport} to control
+ *
Users should consider modifying the keep alive property on {@link NetHttpTransport} to control
* whether the socket should be returned to a pool of connected sockets. More information is
* available here .
- *
*
- *
- * We honor the default global caching behavior. To change the default behavior use
- * {@link HttpURLConnection#setDefaultUseCaches(boolean)}.
- *
+ * We honor the default global caching behavior. To change the default behavior use {@link
+ * HttpURLConnection#setDefaultUseCaches(boolean)}.
*
- *
- * Implementation is thread-safe. For maximum efficiency, applications should use a single
+ *
Implementation is thread-safe. For maximum efficiency, applications should use a single
* globally-shared instance of the HTTP transport.
- *
*
* @since 1.0
* @author Yaniv Inbar
@@ -61,22 +55,26 @@
public final class NetHttpTransport extends HttpTransport {
private static Proxy defaultProxy() {
return new Proxy(
- Proxy.Type.HTTP, new InetSocketAddress(
- System.getProperty("https.proxyHost"),
- Integer.parseInt(System.getProperty("https.proxyPort"))));
+ Proxy.Type.HTTP,
+ new InetSocketAddress(
+ System.getProperty("https.proxyHost"),
+ Integer.parseInt(System.getProperty("https.proxyPort"))));
}
/**
* All valid request methods as specified in {@link HttpURLConnection#setRequestMethod}, sorted in
* ascending alphabetical order.
*/
- private static final String[] SUPPORTED_METHODS = {HttpMethods.DELETE,
- HttpMethods.GET,
- HttpMethods.HEAD,
- HttpMethods.OPTIONS,
- HttpMethods.POST,
- HttpMethods.PUT,
- HttpMethods.TRACE};
+ private static final String[] SUPPORTED_METHODS = {
+ HttpMethods.DELETE,
+ HttpMethods.GET,
+ HttpMethods.HEAD,
+ HttpMethods.OPTIONS,
+ HttpMethods.POST,
+ HttpMethods.PUT,
+ HttpMethods.TRACE
+ };
+
static {
Arrays.sort(SUPPORTED_METHODS);
}
@@ -95,9 +93,7 @@ Proxy.Type.HTTP, new InetSocketAddress(
/**
* Constructor with the default behavior.
*
- *
- * Instead use {@link Builder} to modify behavior.
- *
+ * Instead use {@link Builder} to modify behavior.
*/
public NetHttpTransport() {
this((ConnectionFactory) null, null, null);
@@ -105,8 +101,8 @@ public NetHttpTransport() {
/**
* @param proxy HTTP proxy or {@code null} to use the proxy settings from
- * system properties
+ * href="http://docs.oracle.com/javase/7/docs/api/java/net/doc-files/net-properties.html">
+ * system properties
* @param sslSocketFactory SSL socket factory or {@code null} for the default
* @param hostnameVerifier host name verifier or {@code null} for the default
*/
@@ -117,15 +113,16 @@ public NetHttpTransport() {
/**
* @param connectionFactory factory to produce connections from {@link URL}s; if {@code null} then
- * {@link DefaultConnectionFactory} is used
+ * {@link DefaultConnectionFactory} is used
* @param sslSocketFactory SSL socket factory or {@code null} for the default
* @param hostnameVerifier host name verifier or {@code null} for the default
* @since 1.20
*/
- NetHttpTransport(ConnectionFactory connectionFactory,
- SSLSocketFactory sslSocketFactory, HostnameVerifier hostnameVerifier) {
- this.connectionFactory =
- getConnectionFactory(connectionFactory);
+ NetHttpTransport(
+ ConnectionFactory connectionFactory,
+ SSLSocketFactory sslSocketFactory,
+ HostnameVerifier hostnameVerifier) {
+ this.connectionFactory = getConnectionFactory(connectionFactory);
this.sslSocketFactory = sslSocketFactory;
this.hostnameVerifier = hostnameVerifier;
}
@@ -168,9 +165,7 @@ protected NetHttpRequest buildRequest(String method, String url) throws IOExcept
/**
* Builder for {@link NetHttpTransport}.
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.13
*/
@@ -200,12 +195,10 @@ public static final class Builder {
* href="http://docs.oracle.com/javase/7/docs/api/java/net/doc-files/net-properties.html">system
* properties.
*
- *
- * For example:
- *
+ * For example:
*
*
- setProxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 8080)))
+ * setProxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 8080)))
*
*/
public Builder setProxy(Proxy proxy) {
@@ -217,10 +210,8 @@ public Builder setProxy(Proxy proxy) {
* Sets the {@link ConnectionFactory} or {@code null} to use a {@link DefaultConnectionFactory}.
* This value is ignored if the {@link #setProxy} has been called with a non-null value.
*
- *
- * If you wish to use a {@link Proxy}, it should be included in your {@link ConnectionFactory}
- * implementation.
- *
+ * If you wish to use a {@link Proxy}, it should be included in your {@link
+ * ConnectionFactory} implementation.
*
* @since 1.20
*/
@@ -232,16 +223,14 @@ public Builder setConnectionFactory(ConnectionFactory connectionFactory) {
/**
* Sets the SSL socket factory based on root certificates in a Java KeyStore.
*
- *
- * Example usage:
- *
+ * Example usage:
*
*
- trustCertificatesFromJavaKeyStore(new FileInputStream("certs.jks"), "password");
+ * trustCertificatesFromJavaKeyStore(new FileInputStream("certs.jks"), "password");
*
*
* @param keyStoreStream input stream to the key store (closed at the end of this method in a
- * finally block)
+ * finally block)
* @param storePass password protecting the key store file
* @since 1.14
*/
@@ -256,12 +245,10 @@ public Builder trustCertificatesFromJavaKeyStore(InputStream keyStoreStream, Str
* Sets the SSL socket factory based root certificates generated from the specified stream using
* {@link CertificateFactory#generateCertificates(InputStream)}.
*
- *
- * Example usage:
- *
+ * Example usage:
*
*
- trustCertificatesFromStream(new FileInputStream("certs.pem"));
+ * trustCertificatesFromStream(new FileInputStream("certs.pem"));
*
*
* @param certificateStream certificate stream
@@ -280,7 +267,7 @@ public Builder trustCertificatesFromStream(InputStream certificateStream)
* Sets the SSL socket factory based on a root certificate trust store.
*
* @param trustStore certificate trust store (use for example {@link SecurityUtils#loadKeyStore}
- * or {@link SecurityUtils#loadKeyStoreFromCertificates})
+ * or {@link SecurityUtils#loadKeyStoreFromCertificates})
* @since 1.14
*/
public Builder trustCertificates(KeyStore trustStore) throws GeneralSecurityException {
@@ -290,15 +277,13 @@ public Builder trustCertificates(KeyStore trustStore) throws GeneralSecurityExce
}
/**
- * {@link Beta}
- * Be careful! Disabling certificate validation is dangerous and should only be done in testing
- * environments.
- *
+ * Be careful! Disabling certificate validation is dangerous and should only be done in
+ * testing environments.
*/
@Beta
public Builder doNotValidateCertificate() throws GeneralSecurityException {
diff --git a/google-http-client/src/main/java/com/google/api/client/http/javanet/package-info.java b/google-http-client/src/main/java/com/google/api/client/http/javanet/package-info.java
index a40555024..48ae2ba7f 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/javanet/package-info.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/javanet/package-info.java
@@ -18,6 +18,4 @@
* @since 1.0
* @author Yaniv Inbar
*/
-
package com.google.api.client.http.javanet;
-
diff --git a/google-http-client/src/main/java/com/google/api/client/http/json/JsonHttpContent.java b/google-http-client/src/main/java/com/google/api/client/http/json/JsonHttpContent.java
index 29e743f59..04c2cf5c1 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/json/JsonHttpContent.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/json/JsonHttpContent.java
@@ -20,28 +20,23 @@
import com.google.api.client.json.JsonFactory;
import com.google.api.client.json.JsonGenerator;
import com.google.api.client.util.Preconditions;
-
import java.io.IOException;
import java.io.OutputStream;
/**
* Serializes JSON HTTP content based on the data key/value mapping object for an item.
*
- *
- * Sample usage:
- *
+ * Sample usage:
*
*
- *
- static void setContent(HttpRequest request, Object data) {
- request.setContent(new JsonHttpContent(new JacksonFactory(), data));
- }
+ *
+ * static void setContent(HttpRequest request, Object data) {
+ * request.setContent(new JsonHttpContent(new JacksonFactory(), data));
+ * }
*
*
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.0
* @author Yaniv Inbar
@@ -118,10 +113,8 @@ public final String getWrapperKey() {
/**
* Sets the wrapper key for the JSON content or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.14
*/
diff --git a/google-http-client/src/main/java/com/google/api/client/http/json/package-info.java b/google-http-client/src/main/java/com/google/api/client/http/json/package-info.java
index b89d35e3f..e46e9e069 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/json/package-info.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/json/package-info.java
@@ -18,6 +18,4 @@
* @since 1.0
* @author Yaniv Inbar
*/
-
package com.google.api.client.http.json;
-
diff --git a/google-http-client/src/main/java/com/google/api/client/http/package-info.java b/google-http-client/src/main/java/com/google/api/client/http/package-info.java
index 93b6fcb08..a689ea9b7 100644
--- a/google-http-client/src/main/java/com/google/api/client/http/package-info.java
+++ b/google-http-client/src/main/java/com/google/api/client/http/package-info.java
@@ -19,6 +19,4 @@
* @since 1.0
* @author Yaniv Inbar
*/
-
package com.google.api.client.http;
-
diff --git a/google-http-client/src/main/java/com/google/api/client/json/CustomizeJsonParser.java b/google-http-client/src/main/java/com/google/api/client/json/CustomizeJsonParser.java
index 581c0ed2f..83a30293b 100644
--- a/google-http-client/src/main/java/com/google/api/client/json/CustomizeJsonParser.java
+++ b/google-http-client/src/main/java/com/google/api/client/json/CustomizeJsonParser.java
@@ -15,23 +15,18 @@
package com.google.api.client.json;
import com.google.api.client.util.Beta;
-
import java.lang.reflect.Field;
import java.util.Collection;
/**
- * {@link Beta}
- * All methods have a default trivial implementation, so subclasses need only implement the methods
- * whose behavior needs customization.
- *
+ * All methods have a default trivial implementation, so subclasses need only implement the
+ * methods whose behavior needs customization.
*
- *
- * Implementation has no fields and therefore thread-safe, but sub-classes are not necessarily
+ *
Implementation has no fields and therefore thread-safe, but sub-classes are not necessarily
* thread-safe.
- *
*
* @since 1.0
* @author Yaniv Inbar
@@ -39,18 +34,13 @@
@Beta
public class CustomizeJsonParser {
- /**
- * Returns whether to stop parsing at the given key of the given context object.
- */
+ /** Returns whether to stop parsing at the given key of the given context object. */
public boolean stopAt(Object context, String key) {
return false;
}
- /**
- * Called when the given unrecognized key is encountered in the given context object.
- */
- public void handleUnrecognizedKey(Object context, String key) {
- }
+ /** Called when the given unrecognized key is encountered in the given context object. */
+ public void handleUnrecognizedKey(Object context, String key) {}
/**
* Returns a new instance value for the given field in the given context object for a JSON array
diff --git a/google-http-client/src/main/java/com/google/api/client/json/GenericJson.java b/google-http-client/src/main/java/com/google/api/client/json/GenericJson.java
index 40452e1f7..88faab2d3 100644
--- a/google-http-client/src/main/java/com/google/api/client/json/GenericJson.java
+++ b/google-http-client/src/main/java/com/google/api/client/json/GenericJson.java
@@ -17,22 +17,18 @@
import com.google.api.client.util.GenericData;
import com.google.api.client.util.Key;
import com.google.api.client.util.Throwables;
-
import java.io.IOException;
import java.util.concurrent.ConcurrentMap;
/**
* Generic JSON data that stores all unknown key name/value pairs.
*
- *
- * Subclasses can declare fields for known data keys using the {@link Key} annotation. Each field
+ *
Subclasses can declare fields for known data keys using the {@link Key} annotation. Each field
* can be of any visibility (private, package private, protected, or public) and must not be static.
* {@code null} unknown data key names are not allowed, but {@code null} data values are allowed.
*
- *
- * Implementation is not thread-safe. For a thread-safe choice instead use an implementation of
+ *
Implementation is not thread-safe. For a thread-safe choice instead use an implementation of
* {@link ConcurrentMap}.
- *
*
* @since 1.0
* @author Yaniv Inbar
@@ -73,8 +69,8 @@ public String toString() {
}
/**
- * Returns a pretty-printed serialized JSON string representation or {@link #toString()} if
- * {@link #getFactory()} is {@code null}.
+ * Returns a pretty-printed serialized JSON string representation or {@link #toString()} if {@link
+ * #getFactory()} is {@code null}.
*
* @since 1.6
*/
diff --git a/google-http-client/src/main/java/com/google/api/client/json/Json.java b/google-http-client/src/main/java/com/google/api/client/json/Json.java
index fcc722513..b0e4581f5 100644
--- a/google-http-client/src/main/java/com/google/api/client/json/Json.java
+++ b/google-http-client/src/main/java/com/google/api/client/json/Json.java
@@ -25,10 +25,8 @@ public class Json {
/**
* {@code "application/json; charset=utf-8"} media type used as a default for JSON parsing.
*
- *
- * Use {@link com.google.api.client.http.HttpMediaType#equalsIgnoreParameters} for comparing
+ *
Use {@link com.google.api.client.http.HttpMediaType#equalsIgnoreParameters} for comparing
* media types.
- *
*
* @since 1.10
*/
diff --git a/google-http-client/src/main/java/com/google/api/client/json/JsonFactory.java b/google-http-client/src/main/java/com/google/api/client/json/JsonFactory.java
index 849808414..b92a55a9c 100644
--- a/google-http-client/src/main/java/com/google/api/client/json/JsonFactory.java
+++ b/google-http-client/src/main/java/com/google/api/client/json/JsonFactory.java
@@ -15,7 +15,6 @@
package com.google.api.client.json;
import com.google.api.client.util.Charsets;
-
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -27,10 +26,8 @@
/**
* Abstract low-level JSON factory.
*
- *
- * Implementation is thread-safe, and sub-classes must be thread-safe. For maximum efficiency,
+ *
Implementation is thread-safe, and sub-classes must be thread-safe. For maximum efficiency,
* applications should use a single globally-shared instance of the JSON factory.
- *
*
* @since 1.3
* @author Yaniv Inbar
@@ -51,7 +48,7 @@ public abstract class JsonFactory {
*
* @param in input stream
* @param charset charset in which the input stream is encoded or {@code null} to let the parser
- * detect the charset
+ * detect the charset
* @return new instance of a low-level JSON parser
* @since 1.10
*/
@@ -102,8 +99,8 @@ public final JsonObjectParser createJsonObjectParser() {
}
/**
- * Returns a serialized JSON string representation for the given item using
- * {@link JsonGenerator#serialize(Object)}.
+ * Returns a serialized JSON string representation for the given item using {@link
+ * JsonGenerator#serialize(Object)}.
*
* @param item data key/value pairs
* @return serialized JSON string representation
@@ -113,14 +110,12 @@ public final String toString(Object item) throws IOException {
}
/**
- * Returns a pretty-printed serialized JSON string representation for the given item using
- * {@link JsonGenerator#serialize(Object)} with {@link JsonGenerator#enablePrettyPrint()}.
+ * Returns a pretty-printed serialized JSON string representation for the given item using {@link
+ * JsonGenerator#serialize(Object)} with {@link JsonGenerator#enablePrettyPrint()}.
*
- *
- * The specifics of how the JSON representation is made pretty is implementation dependent, and
- * should not be relied on. However, it is assumed to be legal, and in fact differs from
- * {@link #toString(Object)} only by adding whitespace that does not change its meaning.
- *
+ * The specifics of how the JSON representation is made pretty is implementation dependent, and
+ * should not be relied on. However, it is assumed to be legal, and in fact differs from {@link
+ * #toString(Object)} only by adding whitespace that does not change its meaning.
*
* @param item data key/value pairs
* @return serialized JSON string representation
@@ -143,8 +138,8 @@ public final byte[] toByteArray(Object item) throws IOException {
}
/**
- * Returns a serialized JSON string representation for the given item using
- * {@link JsonGenerator#serialize(Object)}.
+ * Returns a serialized JSON string representation for the given item using {@link
+ * JsonGenerator#serialize(Object)}.
*
* @param item data key/value pairs
* @param pretty whether to return a pretty representation
@@ -179,7 +174,7 @@ private ByteArrayOutputStream toByteStream(Object item, boolean pretty) throws I
*
* @param value JSON string value
* @param destinationClass destination class that has an accessible default constructor to use to
- * create a new instance
+ * create a new instance
* @return new instance of the parsed destination class
* @since 1.4
*/
@@ -191,13 +186,11 @@ public final T fromString(String value, Class destinationClass) throws IO
* Parse and close an input stream as a JSON object, array, or value into a new instance of the
* given destination class using {@link JsonParser#parseAndClose(Class)}.
*
- *
- * Tries to detect the charset of the input stream automatically.
- *
+ * Tries to detect the charset of the input stream automatically.
*
* @param inputStream JSON value in an input stream
* @param destinationClass destination class that has an accessible default constructor to use to
- * create a new instance
+ * create a new instance
* @return new instance of the parsed destination class
* @since 1.7
*/
@@ -213,7 +206,7 @@ public final T fromInputStream(InputStream inputStream, Class destination
* @param inputStream JSON value in an input stream
* @param charset Charset in which the stream is encoded
* @param destinationClass destination class that has an accessible default constructor to use to
- * create a new instance
+ * create a new instance
* @return new instance of the parsed destination class
* @since 1.10
*/
@@ -228,7 +221,7 @@ public final T fromInputStream(
*
* @param reader JSON value in a reader
* @param destinationClass destination class that has an accessible default constructor to use to
- * create a new instance
+ * create a new instance
* @return new instance of the parsed destination class
* @since 1.7
*/
diff --git a/google-http-client/src/main/java/com/google/api/client/json/JsonGenerator.java b/google-http-client/src/main/java/com/google/api/client/json/JsonGenerator.java
index 717a1a58d..2d1003390 100644
--- a/google-http-client/src/main/java/com/google/api/client/json/JsonGenerator.java
+++ b/google-http-client/src/main/java/com/google/api/client/json/JsonGenerator.java
@@ -21,7 +21,6 @@
import com.google.api.client.util.GenericData;
import com.google.api.client.util.Preconditions;
import com.google.api.client.util.Types;
-
import java.io.Closeable;
import java.io.Flushable;
import java.io.IOException;
@@ -33,10 +32,8 @@
/**
* Abstract low-level JSON serializer.
*
- *
- * Implementation has no fields and therefore thread-safe, but sub-classes are not necessarily
+ *
Implementation has no fields and therefore thread-safe, but sub-classes are not necessarily
* thread-safe.
- *
*
* @since 1.3
* @author Yaniv Inbar
@@ -141,8 +138,9 @@ private void serialize(boolean isJsonString, Object value) throws IOException {
writeBoolean((Boolean) value);
} else if (value instanceof DateTime) {
writeString(((DateTime) value).toStringRfc3339());
- } else if ((value instanceof Iterable || valueClass.isArray()) &&
- !(value instanceof Map) && !(value instanceof GenericData)) {
+ } else if ((value instanceof Iterable || valueClass.isArray())
+ && !(value instanceof Map)
+ && !(value instanceof GenericData)) {
writeStartArray();
for (Object o : Types.iterableOf(value)) {
serialize(isJsonString, o);
@@ -182,15 +180,11 @@ private void serialize(boolean isJsonString, Object value) throws IOException {
/**
* Requests that the output be pretty printed (by default it is not).
*
- *
- * Default implementation does nothing, but implementations may override to provide actual pretty
- * printing.
- *
+ * Default implementation does nothing, but implementations may override to provide actual
+ * pretty printing.
*
* @throws IOException possible I/O exception (unused in default implementation)
- *
* @since 1.6
*/
- public void enablePrettyPrint() throws IOException {
- }
+ public void enablePrettyPrint() throws IOException {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/json/JsonObjectParser.java b/google-http-client/src/main/java/com/google/api/client/json/JsonObjectParser.java
index 2d6951e14..dc3d43611 100644
--- a/google-http-client/src/main/java/com/google/api/client/json/JsonObjectParser.java
+++ b/google-http-client/src/main/java/com/google/api/client/json/JsonObjectParser.java
@@ -17,7 +17,6 @@
import com.google.api.client.util.ObjectParser;
import com.google.api.client.util.Preconditions;
import com.google.api.client.util.Sets;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
@@ -31,19 +30,15 @@
/**
* Parses JSON data into an data class of key/value pairs.
*
- *
- * Implementation is thread-safe.
- *
+ * Implementation is thread-safe.
*
- *
- * Sample usage:
- *
+ * Sample usage:
*
*
- *
- static void setParser(HttpRequest request) {
- request.setParser(new JsonObjectParser(new JacksonFactory()));
- }
+ *
+ * static void setParser(HttpRequest request) {
+ * request.setParser(new JsonObjectParser(new JacksonFactory()));
+ * }
*
*
*
@@ -58,16 +53,13 @@ public class JsonObjectParser implements ObjectParser {
/** Wrapper keys for the JSON content or empty for none. */
private final Set wrapperKeys;
- /**
- * @param jsonFactory JSON factory
- */
+ /** @param jsonFactory JSON factory */
public JsonObjectParser(JsonFactory jsonFactory) {
this(new Builder(jsonFactory));
}
/**
* @param builder builder
- *
* @since 1.14
*/
protected JsonObjectParser(Builder builder) {
@@ -124,8 +116,10 @@ private void initializeParser(JsonParser parser) throws IOException {
boolean failed = true;
try {
String match = parser.skipToKey(wrapperKeys);
- Preconditions.checkArgument(match != null && parser.getCurrentToken() != JsonToken.END_OBJECT,
- "wrapper key(s) not found: %s", wrapperKeys);
+ Preconditions.checkArgument(
+ match != null && parser.getCurrentToken() != JsonToken.END_OBJECT,
+ "wrapper key(s) not found: %s",
+ wrapperKeys);
failed = false;
} finally {
if (failed) {
@@ -137,9 +131,7 @@ private void initializeParser(JsonParser parser) throws IOException {
/**
* Builder.
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.14
*/
@@ -151,9 +143,7 @@ public static class Builder {
/** Wrapper keys for the JSON content or empty for none. */
Collection wrapperKeys = Sets.newHashSet();
- /**
- * @param jsonFactory JSON factory
- */
+ /** @param jsonFactory JSON factory */
public Builder(JsonFactory jsonFactory) {
this.jsonFactory = Preconditions.checkNotNull(jsonFactory);
}
@@ -176,10 +166,8 @@ public final Collection getWrapperKeys() {
/**
* Sets the wrapper keys for the JSON content.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Builder setWrapperKeys(Collection wrapperKeys) {
this.wrapperKeys = wrapperKeys;
diff --git a/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java b/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java
index e91c71306..75972a16c 100644
--- a/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java
+++ b/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java
@@ -23,7 +23,6 @@
import com.google.api.client.util.Preconditions;
import com.google.api.client.util.Sets;
import com.google.api.client.util.Types;
-
import java.io.Closeable;
import java.io.IOException;
import java.lang.reflect.Field;
@@ -44,19 +43,17 @@
import java.util.concurrent.locks.ReentrantLock;
/**
- * Abstract low-level JSON parser. See
- *
+ * Abstract low-level JSON parser. See
* https://developers.google.com/api-client-library/java/google-http-java-client/json
*
- *
- * Implementation has no fields and therefore thread-safe, but sub-classes are not necessarily
+ *
Implementation has no fields and therefore thread-safe, but sub-classes are not necessarily
* thread-safe.
- *
- *
+ *
*
- * If a JSON map is encountered while using a destination class of type Map, then an
- * {@link ArrayMap} is used by default for the parsed values.
- *
+ *
+ * If a JSON map is encountered while using a destination class of type Map, then an {@link
+ * ArrayMap} is used by default for the parsed values.
*
* @since 1.3
* @author Yaniv Inbar
@@ -97,15 +94,15 @@ public abstract class JsonParser implements Closeable {
public abstract String getCurrentName() throws IOException;
/**
- * Skips to the matching {@link JsonToken#END_ARRAY} if current token is
- * {@link JsonToken#START_ARRAY}, the matching {@link JsonToken#END_OBJECT} if the current token
- * is {@link JsonToken#START_OBJECT}, else does nothing.
+ * Skips to the matching {@link JsonToken#END_ARRAY} if current token is {@link
+ * JsonToken#START_ARRAY}, the matching {@link JsonToken#END_OBJECT} if the current token is
+ * {@link JsonToken#START_OBJECT}, else does nothing.
*/
public abstract JsonParser skipChildren() throws IOException;
/**
- * Returns a textual representation of the current token or {@code null} if
- * {@link #getCurrentToken()} is {@code null}.
+ * Returns a textual representation of the current token or {@code null} if {@link
+ * #getCurrentToken()} is {@code null}.
*/
public abstract String getText() throws IOException;
@@ -141,7 +138,7 @@ public abstract class JsonParser implements Closeable {
*
* @param destination class
* @param destinationClass destination class that has a public default constructor to use to
- * create a new instance
+ * create a new instance
* @return new instance of the parsed destination class
* @since 1.15
*/
@@ -150,13 +147,13 @@ public final T parseAndClose(Class destinationClass) throws IOException {
}
/**
- * {@link Beta} destination class
* @param destinationClass destination class that has a public default constructor to use to
- * create a new instance
+ * create a new instance
* @param customizeParser optional parser customizer or {@code null} for none
* @return new instance of the parsed destination class
*/
@@ -173,12 +170,10 @@ public final T parseAndClose(Class destinationClass, CustomizeJsonParser
/**
* Skips the values of all keys in the current object until it finds the given key.
*
- *
- * Before this method is called, the parser must either point to the start or end of a JSON object
- * or to a field name. After this method ends, the current token will either be the
- * {@link JsonToken#END_OBJECT} of the current object if the key is not found, or the value of the
- * key that was found.
- *
+ * Before this method is called, the parser must either point to the start or end of a JSON
+ * object or to a field name. After this method ends, the current token will either be the {@link
+ * JsonToken#END_OBJECT} of the current object if the key is not found, or the value of the key
+ * that was found.
*
* @param keyToFind key to find
*/
@@ -189,12 +184,10 @@ public final void skipToKey(String keyToFind) throws IOException {
/**
* Skips the values of all keys in the current object until it finds one of the given keys.
*
- *
- * Before this method is called, the parser must either point to the start or end of a JSON object
- * or to a field name. After this method ends, the current token will either be the
- * {@link JsonToken#END_OBJECT} of the current object if no matching key is found, or the value of
- * the key that was found.
- *
+ * Before this method is called, the parser must either point to the start or end of a JSON
+ * object or to a field name. After this method ends, the current token will either be the {@link
+ * JsonToken#END_OBJECT} of the current object if no matching key is found, or the value of the
+ * key that was found.
*
* @param keysToFind set of keys to look for
* @return name of the first matching key found or {@code null} if no match was found
@@ -229,13 +222,11 @@ private JsonToken startParsing() throws IOException {
* Starts parsing an object or array by making sure the parser points to an object field name,
* first array value or end of object or array.
*
- *
- * If the parser is at the start of input, {@link #nextToken()} is called. The current token must
- * then be {@link JsonToken#START_OBJECT}, {@link JsonToken#END_OBJECT},
- * {@link JsonToken#START_ARRAY}, {@link JsonToken#END_ARRAY}, or {@link JsonToken#FIELD_NAME}.
- * For an object only, after the method is called, the current token must be either
- * {@link JsonToken#FIELD_NAME} or {@link JsonToken#END_OBJECT}.
- *
+ * If the parser is at the start of input, {@link #nextToken()} is called. The current token
+ * must then be {@link JsonToken#START_OBJECT}, {@link JsonToken#END_OBJECT}, {@link
+ * JsonToken#START_ARRAY}, {@link JsonToken#END_ARRAY}, or {@link JsonToken#FIELD_NAME}. For an
+ * object only, after the method is called, the current token must be either {@link
+ * JsonToken#FIELD_NAME} or {@link JsonToken#END_OBJECT}.
*/
private JsonToken startParsingObjectOrArray() throws IOException {
JsonToken currentToken = startParsing();
@@ -259,10 +250,8 @@ private JsonToken startParsingObjectOrArray() throws IOException {
* Parse a JSON Object from the given JSON parser -- which is closed after parsing completes --
* into the given destination object.
*
- *
- * Before this method is called, the parser must either point to the start or end of a JSON object
- * or to a field name.
- *
+ * Before this method is called, the parser must either point to the start or end of a JSON
+ * object or to a field name.
*
* @param destination destination object
* @since 1.15
@@ -272,14 +261,12 @@ public final void parseAndClose(Object destination) throws IOException {
}
/**
- * {@link Beta}
- * Before this method is called, the parser must either point to the start or end of a JSON object
- * or to a field name.
- *
+ * Before this method is called, the parser must either point to the start or end of a JSON
+ * object or to a field name.
*
* @param destination destination object
* @param customizeParser optional parser customizer or {@code null} for none
@@ -297,15 +284,13 @@ public final void parseAndClose(Object destination, CustomizeJsonParser customiz
/**
* Parse a JSON object, array, or value into a new instance of the given destination class.
*
- *
- * If it parses an object, after this method ends, the current token will be the object's ending
- * {@link JsonToken#END_OBJECT}. If it parses an array, after this method ends, the current token
- * will be the array's ending {@link JsonToken#END_ARRAY}.
- *
+ * If it parses an object, after this method ends, the current token will be the object's
+ * ending {@link JsonToken#END_OBJECT}. If it parses an array, after this method ends, the current
+ * token will be the array's ending {@link JsonToken#END_ARRAY}.
*
* @param destination class
* @param destinationClass destination class that has a public default constructor to use to
- * create a new instance
+ * create a new instance
* @return new instance of the parsed destination class
* @since 1.15
*/
@@ -314,19 +299,17 @@ public final T parse(Class destinationClass) throws IOException {
}
/**
- * {@link Beta}
- * If it parses an object, after this method ends, the current token will be the object's ending
- * {@link JsonToken#END_OBJECT}. If it parses an array, after this method ends, the current token
- * will be the array's ending {@link JsonToken#END_ARRAY}.
- *
+ * If it parses an object, after this method ends, the current token will be the object's
+ * ending {@link JsonToken#END_OBJECT}. If it parses an array, after this method ends, the current
+ * token will be the array's ending {@link JsonToken#END_ARRAY}.
*
* @param destination class
* @param destinationClass destination class that has a public default constructor to use to
- * create a new instance
+ * create a new instance
* @param customizeParser optional parser customizer or {@code null} for none
* @return new instance of the parsed destination class
*/
@@ -341,11 +324,9 @@ public final T parse(Class destinationClass, CustomizeJsonParser customiz
/**
* Parse a JSON object, array, or value into a new instance of the given destination class.
*
- *
- * If it parses an object, after this method ends, the current token will be the object's ending
- * {@link JsonToken#END_OBJECT}. If it parses an array, after this method ends, the current token
- * will be the array's ending {@link JsonToken#END_ARRAY}.
- *
+ * If it parses an object, after this method ends, the current token will be the object's
+ * ending {@link JsonToken#END_OBJECT}. If it parses an array, after this method ends, the current
+ * token will be the array's ending {@link JsonToken#END_ARRAY}.
*
* @param dataType Type into which the JSON should be parsed
* @param close {@code true} if {@link #close()} should be called after parsing
@@ -357,15 +338,13 @@ public Object parse(Type dataType, boolean close) throws IOException {
}
/**
- * {@link Beta}
- * If it parses an object, after this method ends, the current token will be the object's ending
- * {@link JsonToken#END_OBJECT}. If it parses an array, after this method ends, the current token
- * will be the array's ending {@link JsonToken#END_ARRAY}.
- *
+ * If it parses an object, after this method ends, the current token will be the object's
+ * ending {@link JsonToken#END_OBJECT}. If it parses an array, after this method ends, the current
+ * token will be the array's ending {@link JsonToken#END_ARRAY}.
*
* @param dataType Type into which the JSON should be parsed
* @param close {@code true} if {@link #close()} should be called after parsing
@@ -391,11 +370,9 @@ public Object parse(Type dataType, boolean close, CustomizeJsonParser customizeP
/**
* Parse a JSON object from the given JSON parser into the given destination object.
*
- *
- * Before this method is called, the parser must either point to the start or end of a JSON object
- * or to a field name. After this method ends, the current token will be the
- * {@link JsonToken#END_OBJECT} of the current object.
- *
+ * Before this method is called, the parser must either point to the start or end of a JSON
+ * object or to a field name. After this method ends, the current token will be the {@link
+ * JsonToken#END_OBJECT} of the current object.
*
* @param destination destination object
* @since 1.15
@@ -405,15 +382,13 @@ public final void parse(Object destination) throws IOException {
}
/**
- * {@link Beta}
- * Before this method is called, the parser must either point to the start or end of a JSON object
- * or to a field name. After this method ends, the current token will be the
- * {@link JsonToken#END_OBJECT} of the current object.
- *
+ * Before this method is called, the parser must either point to the start or end of a JSON
+ * object or to a field name. After this method ends, the current token will be the {@link
+ * JsonToken#END_OBJECT} of the current object.
*
* @param destination destination object
* @param customizeParser optional parser customizer or {@code null} for none
@@ -431,7 +406,7 @@ public final void parse(Object destination, CustomizeJsonParser customizeParser)
*
* @param context destination context stack (possibly empty)
* @param destination destination object instance or {@code null} for none (for example empty
- * context stack)
+ * context stack)
* @param customizeParser optional parser customizer or {@code null} for none
*/
private void parse(
@@ -449,7 +424,11 @@ private void parse(
// using parseMap.
@SuppressWarnings("unchecked")
Map destinationMap = (Map) destination;
- parseMap(null, destinationMap, Types.getMapValueParameter(destinationClass), context,
+ parseMap(
+ null,
+ destinationMap,
+ Types.getMapValueParameter(destinationClass),
+ context,
customizeParser);
return;
}
@@ -470,12 +449,9 @@ private void parse(
Field field = fieldInfo.getField();
int contextSize = context.size();
context.add(field.getGenericType());
- Object fieldValue = parseValue(field,
- fieldInfo.getGenericType(),
- context,
- destination,
- customizeParser,
- true);
+ Object fieldValue =
+ parseValue(
+ field, fieldInfo.getGenericType(), context, destination, customizeParser, true);
context.remove(contextSize);
fieldInfo.setValue(destination, fieldValue);
} else if (isGenericData) {
@@ -498,9 +474,9 @@ private void parse(
* the given destination collection.
*
* @param destinationCollectionClass class of destination collection (must have a public default
- * constructor)
+ * constructor)
* @param destinationItemClass class of destination collection item (must have a public default
- * constructor)
+ * constructor)
* @since 1.15
*/
public final Collection parseArrayAndClose(
@@ -509,19 +485,22 @@ public final Collection parseArrayAndClose(
}
/**
- * {@link Beta} Collection parseArrayAndClose(Class destinationCollectionClass,
- Class destinationItemClass, CustomizeJsonParser customizeParser) throws IOException {
+ public final Collection parseArrayAndClose(
+ Class destinationCollectionClass,
+ Class destinationItemClass,
+ CustomizeJsonParser customizeParser)
+ throws IOException {
try {
return parseArray(destinationCollectionClass, destinationItemClass, customizeParser);
} finally {
@@ -535,7 +514,7 @@ public final Collection parseArrayAndClose(Class destinationCollection
*
* @param destinationCollection destination collection
* @param destinationItemClass class of destination collection item (must have a public default
- * constructor)
+ * constructor)
* @since 1.15
*/
public final void parseArrayAndClose(
@@ -545,18 +524,21 @@ public final void parseArrayAndClose(
}
/**
- * {@link Beta} void parseArrayAndClose(Collection destinationCollection,
- Class destinationItemClass, CustomizeJsonParser customizeParser) throws IOException {
+ public final void parseArrayAndClose(
+ Collection destinationCollection,
+ Class destinationItemClass,
+ CustomizeJsonParser customizeParser)
+ throws IOException {
try {
parseArray(destinationCollection, destinationItemClass, customizeParser);
} finally {
@@ -568,9 +550,9 @@ public final void parseArrayAndClose(Collection destinationCollec
* Parse a JSON Array from the given JSON parser into the given destination collection.
*
* @param destinationCollectionClass class of destination collection (must have a public default
- * constructor)
+ * constructor)
* @param destinationItemClass class of destination collection item (must have a public default
- * constructor)
+ * constructor)
* @since 1.15
*/
public final Collection parseArray(
@@ -579,19 +561,22 @@ public final Collection parseArray(
}
/**
- * {@link Beta} Collection parseArray(Class destinationCollectionClass,
- Class destinationItemClass, CustomizeJsonParser customizeParser) throws IOException {
+ public final Collection parseArray(
+ Class destinationCollectionClass,
+ Class destinationItemClass,
+ CustomizeJsonParser customizeParser)
+ throws IOException {
@SuppressWarnings("unchecked")
Collection destinationCollection =
(Collection) Data.newCollectionInstance(destinationCollectionClass);
@@ -604,7 +589,7 @@ public final Collection parseArray(Class destinationCollectionClass,
*
* @param destinationCollection destination collection
* @param destinationItemClass class of destination collection item (must have a public default
- * constructor)
+ * constructor)
* @since 1.15
*/
public final void parseArray(
@@ -614,18 +599,21 @@ public final void parseArray(
}
/**
- * {@link Beta} void parseArray(Collection destinationCollection,
- Class destinationItemClass, CustomizeJsonParser customizeParser) throws IOException {
+ public final void parseArray(
+ Collection destinationCollection,
+ Class destinationItemClass,
+ CustomizeJsonParser customizeParser)
+ throws IOException {
parseArray(
null, destinationCollection, destinationItemClass, new ArrayList(), customizeParser);
}
@@ -640,18 +628,25 @@ public final void parseArray(Collection destinationCollection,
* @param context destination context stack (possibly empty)
* @param customizeParser optional parser customizer or {@code null} for none
*/
- private void parseArray(Field fieldContext, Collection destinationCollection,
- Type destinationItemType, ArrayList context, CustomizeJsonParser customizeParser)
+ private void parseArray(
+ Field fieldContext,
+ Collection destinationCollection,
+ Type destinationItemType,
+ ArrayList context,
+ CustomizeJsonParser customizeParser)
throws IOException {
JsonToken curToken = startParsingObjectOrArray();
while (curToken != JsonToken.END_ARRAY) {
@SuppressWarnings("unchecked")
- T parsedValue = (T) parseValue(fieldContext,
- destinationItemType,
- context,
- destinationCollection,
- customizeParser,
- true);
+ T parsedValue =
+ (T)
+ parseValue(
+ fieldContext,
+ destinationItemType,
+ context,
+ destinationCollection,
+ customizeParser,
+ true);
destinationCollection.add(parsedValue);
curToken = nextToken();
}
@@ -667,8 +662,13 @@ private void parseArray(Field fieldContext, Collection destinationCollect
* @param context destination context stack (possibly empty)
* @param customizeParser optional parser customizer or {@code null} for none
*/
- private void parseMap(Field fieldContext, Map destinationMap, Type valueType,
- ArrayList context, CustomizeJsonParser customizeParser) throws IOException {
+ private void parseMap(
+ Field fieldContext,
+ Map destinationMap,
+ Type valueType,
+ ArrayList context,
+ CustomizeJsonParser customizeParser)
+ throws IOException {
JsonToken curToken = startParsingObjectOrArray();
while (curToken == JsonToken.FIELD_NAME) {
String key = getText();
@@ -691,17 +691,19 @@ private void parseMap(Field fieldContext, Map destinationMap, Ty
* @param valueType value type or {@code null} if not known (for example into a map)
* @param context destination context stack (possibly empty)
* @param destination destination object instance or {@code null} for none (for example empty
- * context stack)
+ * context stack)
* @param customizeParser customize parser or {@code null} for none
* @param handlePolymorphic whether or not to check for polymorphic schema
* @return parsed value
*/
- private final Object parseValue(Field fieldContext,
+ private final Object parseValue(
+ Field fieldContext,
Type valueType,
ArrayList context,
Object destination,
CustomizeJsonParser customizeParser,
- boolean handlePolymorphic) throws IOException {
+ boolean handlePolymorphic)
+ throws IOException {
valueType = Data.resolveWildcardTypeOrTypeVariable(context, valueType);
// resolve a parameterized type to a class
@@ -721,9 +723,12 @@ private final Object parseValue(Field fieldContext,
case START_ARRAY:
case END_ARRAY:
boolean isArray = Types.isArray(valueType);
- Preconditions.checkArgument(valueType == null || isArray || valueClass != null
- && Types.isAssignableToOrFrom(valueClass, Collection.class),
- "expected collection or array type but got %s", valueType);
+ Preconditions.checkArgument(
+ valueType == null
+ || isArray
+ || valueClass != null && Types.isAssignableToOrFrom(valueClass, Collection.class),
+ "expected collection or array type but got %s",
+ valueType);
Collection collectionValue = null;
if (customizeParser != null && fieldContext != null) {
collectionValue = customizeParser.newInstanceForArray(destination, fieldContext);
@@ -770,8 +775,10 @@ private final Object parseValue(Field fieldContext,
context.add(valueType);
}
if (isMap && !GenericData.class.isAssignableFrom(valueClass)) {
- Type subValueType = Map.class.isAssignableFrom(valueClass)
- ? Types.getMapValueParameter(valueType) : null;
+ Type subValueType =
+ Map.class.isAssignableFrom(valueClass)
+ ? Types.getMapValueParameter(valueType)
+ : null;
if (subValueType != null) {
@SuppressWarnings("unchecked")
Map destinationMap = (Map) newInstance;
@@ -809,9 +816,12 @@ private final Object parseValue(Field fieldContext,
return parser.parseValue(fieldContext, typeClass, context, null, null, false);
case VALUE_TRUE:
case VALUE_FALSE:
- Preconditions.checkArgument(valueType == null || valueClass == boolean.class
- || valueClass != null && valueClass.isAssignableFrom(Boolean.class),
- "expected type Boolean or boolean but got %s", valueType);
+ Preconditions.checkArgument(
+ valueType == null
+ || valueClass == boolean.class
+ || valueClass != null && valueClass.isAssignableFrom(Boolean.class),
+ "expected type Boolean or boolean but got %s",
+ valueType);
return token == JsonToken.VALUE_TRUE ? Boolean.TRUE : Boolean.FALSE;
case VALUE_NUMBER_FLOAT:
case VALUE_NUMBER_INT:
@@ -844,22 +854,24 @@ private final Object parseValue(Field fieldContext,
}
throw new IllegalArgumentException("expected numeric type but got " + valueType);
case VALUE_STRING:
- //TODO(user): Maybe refactor this method in multiple mini-methods for readability?
+ // TODO(user): Maybe refactor this method in multiple mini-methods for readability?
String text = getText().trim().toLowerCase(Locale.US);
// If we are expecting a Float / Double and the Text is NaN (case insensitive)
// Then: Accept, even if the Annotation is JsonString.
// Otherwise: Check that the Annotation is not JsonString.
if (!(((valueClass == float.class || valueClass == Float.class)
- || (valueClass == double.class || valueClass == Double.class))
- && (text.equals("nan") || text.equals("infinity") || text.equals("-infinity")))) {
- Preconditions.checkArgument(valueClass == null
- || !Number.class.isAssignableFrom(valueClass) || fieldContext != null
- && fieldContext.getAnnotation(JsonString.class) != null,
- "number field formatted as a JSON string must use the @JsonString annotation");
+ || (valueClass == double.class || valueClass == Double.class))
+ && (text.equals("nan") || text.equals("infinity") || text.equals("-infinity")))) {
+ Preconditions.checkArgument(
+ valueClass == null
+ || !Number.class.isAssignableFrom(valueClass)
+ || fieldContext != null && fieldContext.getAnnotation(JsonString.class) != null,
+ "number field formatted as a JSON string must use the @JsonString annotation");
}
return Data.parsePrimitiveValue(valueType, getText());
case VALUE_NULL:
- Preconditions.checkArgument(valueClass == null || !valueClass.isPrimitive(),
+ Preconditions.checkArgument(
+ valueClass == null || !valueClass.isPrimitive(),
"primitive number field but found a JSON null");
if (valueClass != null
&& 0 != (valueClass.getModifiers() & (Modifier.ABSTRACT | Modifier.INTERFACE))) {
@@ -895,13 +907,11 @@ private final Object parseValue(Field fieldContext,
* Finds the {@link Field} on the given {@link Class} that has the {@link JsonPolymorphicTypeMap}
* annotation, or {@code null} if there is none.
*
- *
- * The class must contain exactly zero or one {@link JsonPolymorphicTypeMap} annotation.
- *
+ * The class must contain exactly zero or one {@link JsonPolymorphicTypeMap} annotation.
*
* @param key The {@link Class} to search in, or {@code null}
* @return The {@link Field} with the {@link JsonPolymorphicTypeMap} annotation, or {@code null}
- * either if there is none or if the key is {@code null}
+ * either if there is none or if the key is {@code null}
*/
private static Field getCachedTypemapFieldFor(Class key) {
if (key == null) {
@@ -922,11 +932,14 @@ private static Field getCachedTypemapFieldFor(Class key) {
JsonPolymorphicTypeMap typemapAnnotation =
field.getAnnotation(JsonPolymorphicTypeMap.class);
if (typemapAnnotation != null) {
- Preconditions.checkArgument(value == null,
+ Preconditions.checkArgument(
+ value == null,
"Class contains more than one field with @JsonPolymorphicTypeMap annotation: %s",
key);
- Preconditions.checkArgument(Data.isPrimitive(field.getType()),
- "Field which has the @JsonPolymorphicTypeMap, %s, is not a supported type: %s", key,
+ Preconditions.checkArgument(
+ Data.isPrimitive(field.getType()),
+ "Field which has the @JsonPolymorphicTypeMap, %s, is not a supported type: %s",
+ key,
field.getType());
value = field;
// Check for duplicate typeDef keys
@@ -935,8 +948,10 @@ private static Field getCachedTypemapFieldFor(Class key) {
Preconditions.checkArgument(
typeDefs.length > 0, "@JsonPolymorphicTypeMap must have at least one @TypeDef");
for (TypeDef typeDef : typeDefs) {
- Preconditions.checkArgument(typeDefKeys.add(typeDef.key()),
- "Class contains two @TypeDef annotations with identical key: %s", typeDef.key());
+ Preconditions.checkArgument(
+ typeDefKeys.add(typeDef.key()),
+ "Class contains two @TypeDef annotations with identical key: %s",
+ typeDef.key());
}
}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/json/JsonPolymorphicTypeMap.java b/google-http-client/src/main/java/com/google/api/client/json/JsonPolymorphicTypeMap.java
index 40132f332..69738d323 100644
--- a/google-http-client/src/main/java/com/google/api/client/json/JsonPolymorphicTypeMap.java
+++ b/google-http-client/src/main/java/com/google/api/client/json/JsonPolymorphicTypeMap.java
@@ -14,10 +14,8 @@
package com.google.api.client.json;
-
import com.google.api.client.util.Beta;
import com.google.api.client.util.Data;
-
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -25,15 +23,13 @@
import java.lang.reflect.Type;
/**
- * {@link Beta}
- * A data structure must have no more than one field with this annotation present. The annotated
+ *
A data structure must have no more than one field with this annotation present. The annotated
* field's type must be considered "primitive" by {@link Data#isPrimitive(Type)}. The field's value
* will be compared against the {@link TypeDef#key()} using {@link Object#toString()}.
- *
*
* @author Nick Miceli
* @since 1.16
@@ -46,9 +42,7 @@
/** The list of mappings from key value to a referenced {@link Class}. */
TypeDef[] typeDefinitions();
- /**
- * Declares a mapping between a key value and a referenced class.
- */
+ /** Declares a mapping between a key value and a referenced class. */
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
public @interface TypeDef {
@@ -59,5 +53,4 @@
/** The {@link Class} that is referenced by this key value. */
Class ref();
}
-
}
diff --git a/google-http-client/src/main/java/com/google/api/client/json/JsonString.java b/google-http-client/src/main/java/com/google/api/client/json/JsonString.java
index 36a2e8a44..6b93bbe21 100644
--- a/google-http-client/src/main/java/com/google/api/client/json/JsonString.java
+++ b/google-http-client/src/main/java/com/google/api/client/json/JsonString.java
@@ -22,44 +22,42 @@
/**
* Use this annotation to specify that a declared numeric Java field should map to a JSON string.
*
- *
- * By default declared Java numeric fields are stored as JSON numbers. For example:
+ *
By default declared Java numeric fields are stored as JSON numbers. For example:
*
*
*
-class A {
- @Key BigInteger value;
-}
+ * class A {
+ * @Key BigInteger value;
+ * }
*
*
*
- * can be used for this JSON content:
+ * can be used for this JSON content:
*
*
*
-{"value" : 12345768901234576890123457689012345768901234576890}
+ * {"value" : 12345768901234576890123457689012345768901234576890}
*
*
*
- * However, if instead the JSON content uses a JSON String to store the value, one needs to use the
+ * However, if instead the JSON content uses a JSON String to store the value, one needs to use the
* {@link JsonString} annotation. For example:
*
*
*
-class B {
- @Key @JsonString BigInteger value;
-}
+ * class B {
+ * @Key @JsonString BigInteger value;
+ * }
*
*
*
- * can be used for this JSON content:
+ * can be used for this JSON content:
*
*
*
-{"value" : "12345768901234576890123457689012345768901234576890"}
+ * {"value" : "12345768901234576890123457689012345768901234576890"}
*
*
- *
*
* @since 1.3
* @author Yaniv Inbar
@@ -68,5 +66,4 @@ class B {
// BigDecimalString?
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
-public @interface JsonString {
-}
+public @interface JsonString {}
diff --git a/google-http-client/src/main/java/com/google/api/client/json/package-info.java b/google-http-client/src/main/java/com/google/api/client/json/package-info.java
index 47aaa0aef..4a177f57c 100644
--- a/google-http-client/src/main/java/com/google/api/client/json/package-info.java
+++ b/google-http-client/src/main/java/com/google/api/client/json/package-info.java
@@ -20,9 +20,7 @@
* @since 1.0
* @author Yaniv Inbar
*/
-
@ReflectionSupport(value = ReflectionSupport.Level.FULL)
package com.google.api.client.json;
import com.google.j2objc.annotations.ReflectionSupport;
-
diff --git a/google-http-client/src/main/java/com/google/api/client/json/rpc2/JsonRpcRequest.java b/google-http-client/src/main/java/com/google/api/client/json/rpc2/JsonRpcRequest.java
index 8ca02dcec..c928a9738 100644
--- a/google-http-client/src/main/java/com/google/api/client/json/rpc2/JsonRpcRequest.java
+++ b/google-http-client/src/main/java/com/google/api/client/json/rpc2/JsonRpcRequest.java
@@ -19,12 +19,10 @@
import com.google.api.client.util.Key;
/**
- * {@link Beta}
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.0
* @author Yaniv Inbar
@@ -33,26 +31,22 @@
public class JsonRpcRequest extends GenericData {
/** Version of the JSON-RPC protocol which is {@code "2.0"}. */
- @Key
- private final String jsonrpc = "2.0";
+ @Key private final String jsonrpc = "2.0";
/**
* Identifier established by the client that must be a string or a number or {@code null} for a
* notification and therefore not expect to receive a response.
*/
- @Key
- private Object id;
+ @Key private Object id;
/** Name of the method to be invoked. */
- @Key
- private String method;
+ @Key private String method;
/**
* Structured value that holds the parameter values to be used during the invocation of the method
* or {@code null} for none.
*/
- @Key
- private Object params;
+ @Key private Object params;
/**
* Returns the version of the JSON-RPC protocol which is {@code "2.0"}.
diff --git a/google-http-client/src/main/java/com/google/api/client/json/rpc2/package-info.java b/google-http-client/src/main/java/com/google/api/client/json/rpc2/package-info.java
index 66cdb447b..46ec5ba19 100644
--- a/google-http-client/src/main/java/com/google/api/client/json/rpc2/package-info.java
+++ b/google-http-client/src/main/java/com/google/api/client/json/rpc2/package-info.java
@@ -13,7 +13,7 @@
*/
/**
- * {@link com.google.api.client.util.Beta} JSON-RPC 2.0 Specification
* and JSON-RPC over
@@ -24,4 +24,3 @@
*/
@com.google.api.client.util.Beta
package com.google.api.client.json.rpc2;
-
diff --git a/google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebSignature.java b/google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebSignature.java
index 4a15796be..4d5775c65 100644
--- a/google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebSignature.java
+++ b/google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebSignature.java
@@ -21,7 +21,6 @@
import com.google.api.client.util.Preconditions;
import com.google.api.client.util.SecurityUtils;
import com.google.api.client.util.StringUtils;
-
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.security.GeneralSecurityException;
@@ -34,7 +33,6 @@
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.List;
-
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;
@@ -43,20 +41,16 @@
* JSON Web Signature
* (JWS) .
*
- *
- * Sample usage:
- *
+ * Sample usage:
*
*
- public static void printPayload(JsonFactory jsonFactory, String tokenString) throws IOException {
- JsonWebSignature jws = JsonWebSignature.parse(jsonFactory, tokenString);
- System.out.println(jws.getPayload());
- }
+ * public static void printPayload(JsonFactory jsonFactory, String tokenString) throws IOException {
+ * JsonWebSignature jws = JsonWebSignature.parse(jsonFactory, tokenString);
+ * System.out.println(jws.getPayload());
+ * }
*
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.14 (since 1.7 as com.google.api.client.auth.jsontoken.JsonWebSignature)
* @author Yaniv Inbar
@@ -169,10 +163,8 @@ public final String getAlgorithm() {
* Sets the algorithm header parameter that identifies the cryptographic algorithm used to
* secure the JWS or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Header setAlgorithm(String algorithm) {
this.algorithm = algorithm;
@@ -193,10 +185,8 @@ public final String getJwkUrl() {
* for a set of JSON-encoded public keys, one of which corresponds to the key that was used to
* digitally sign the JWS or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Header setJwkUrl(String jwkUrl) {
this.jwkUrl = jwkUrl;
@@ -215,10 +205,8 @@ public final String getJwk() {
* Sets the JSON Web Key header parameter that is a public key that corresponds to the key used
* to digitally sign the JWS or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Header setJwk(String jwk) {
this.jwk = jwk;
@@ -237,10 +225,8 @@ public final String getKeyId() {
* Sets the key ID header parameter that is a hint indicating which specific key owned by the
* signer should be used to validate the digital signature or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Header setKeyId(String keyId) {
this.keyId = keyId;
@@ -261,10 +247,8 @@ public final String getX509Url() {
* X.509 public key certificate or certificate chain corresponding to the key used to digitally
* sign the JWS or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Header setX509Url(String x509Url) {
this.x509Url = x509Url;
@@ -285,10 +269,8 @@ public final String getX509Thumbprint() {
* SHA-1 thumbprint (a.k.a. digest) of the DER encoding of an X.509 certificate that can be used
* to match the certificate or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Header setX509Thumbprint(String x509Thumbprint) {
this.x509Thumbprint = x509Thumbprint;
@@ -325,13 +307,11 @@ public final List getX509Certificates() {
* Sets the X.509 certificate chain header parameter contains the X.509 public key certificate
* corresponding to the key used to digitally sign the JWS or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
- *
@deprecated Since release 1.19.1, replaced by
- * {@link #setX509Certificates(List x509Certificates)}.
+ *
@deprecated Since release 1.19.1, replaced by {@link #setX509Certificates(List
+ * x509Certificates)}.
*/
@Deprecated
public Header setX509Certificate(String x509Certificate) {
@@ -346,10 +326,8 @@ public Header setX509Certificate(String x509Certificate) {
* or certificate chain corresponding to the key used to digitally sign the JWS or {@code null}
* for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.19.1.
*/
@@ -372,10 +350,8 @@ public final List getCritical() {
* Sets the array listing the header parameter names that define extensions that are used in the
* JWS header that MUST be understood and processed or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*
* @since 1.16
*/
@@ -403,10 +379,8 @@ public Header getHeader() {
/**
* Verifies the signature of the content.
*
- *
- * Currently only {@code "RS256"} algorithm is verified, but others may be added in the future.
+ *
Currently only {@code "RS256"} algorithm is verified, but others may be added in the future.
* For any other algorithm it returns {@code false}.
- *
*
* @param publicKey public key
* @return whether the algorithm is recognized and it is verified
@@ -424,20 +398,16 @@ public final boolean verifySignature(PublicKey publicKey) throws GeneralSecurity
}
/**
- * {@link Beta}
- * Currently only {@code "RS256"} algorithm is verified, but others may be added in the future.
+ *
Currently only {@code "RS256"} algorithm is verified, but others may be added in the future.
* For any other algorithm it returns {@code null}.
- *
*
- *
- * The leaf certificate of the certificate chain must be an SSL server certificate.
- *
+ * The leaf certificate of the certificate chain must be an SSL server certificate.
*
* @param trustManager Trust manager used to verify the X509 certificate chain embedded in this
- * message.
+ * message.
* @return The signature certificate if the signature could be verified, null otherwise.
* @throws GeneralSecurityException
* @since 1.19.1.
@@ -456,26 +426,20 @@ public final X509Certificate verifySignature(X509TrustManager trustManager)
} else {
return null;
}
- return SecurityUtils.verify(signatureAlg, trustManager, x509Certificates, signatureBytes,
- signedContentBytes);
+ return SecurityUtils.verify(
+ signatureAlg, trustManager, x509Certificates, signatureBytes, signedContentBytes);
}
/**
- * {@link Beta}
- * Currently only {@code "RS256"} algorithm is verified, but others may be added in the future.
+ *
Currently only {@code "RS256"} algorithm is verified, but others may be added in the future.
* For any other algorithm it returns {@code null}.
- *
*
- *
- * The certificate chain is verified using the system default trust manager.
- *
+ * The certificate chain is verified using the system default trust manager.
*
- *
- * The leaf certificate of the certificate chain must be an SSL server certificate.
- *
+ * The leaf certificate of the certificate chain must be an SSL server certificate.
*
* @return The signature certificate if the signature could be verified, null otherwise.
* @throws GeneralSecurityException
@@ -538,9 +502,7 @@ public static Parser parser(JsonFactory jsonFactory) {
/**
* JWS parser.
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*/
public static final class Parser {
@@ -553,9 +515,7 @@ public static final class Parser {
/** Payload class to use for parsing. */
private Class payloadClass = Payload.class;
- /**
- * @param jsonFactory JSON factory
- */
+ /** @param jsonFactory JSON factory */
public Parser(JsonFactory jsonFactory) {
this.jsonFactory = Preconditions.checkNotNull(jsonFactory);
}
@@ -628,14 +588,20 @@ public JsonWebSignature parse(String tokenString) throws IOException {
* @return signed JWS string
* @since 1.14 (since 1.7 as com.google.api.client.auth.jsontoken.RsaSHA256Signer)
*/
- public static String signUsingRsaSha256(PrivateKey privateKey, JsonFactory jsonFactory,
- JsonWebSignature.Header header, JsonWebToken.Payload payload)
+ public static String signUsingRsaSha256(
+ PrivateKey privateKey,
+ JsonFactory jsonFactory,
+ JsonWebSignature.Header header,
+ JsonWebToken.Payload payload)
throws GeneralSecurityException, IOException {
- String content = Base64.encodeBase64URLSafeString(jsonFactory.toByteArray(header)) + "."
- + Base64.encodeBase64URLSafeString(jsonFactory.toByteArray(payload));
+ String content =
+ Base64.encodeBase64URLSafeString(jsonFactory.toByteArray(header))
+ + "."
+ + Base64.encodeBase64URLSafeString(jsonFactory.toByteArray(payload));
byte[] contentBytes = StringUtils.getBytesUtf8(content);
- byte[] signature = SecurityUtils.sign(
- SecurityUtils.getSha256WithRsaSignatureAlgorithm(), privateKey, contentBytes);
+ byte[] signature =
+ SecurityUtils.sign(
+ SecurityUtils.getSha256WithRsaSignatureAlgorithm(), privateKey, contentBytes);
return content + "." + Base64.encodeBase64URLSafeString(signature);
}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebToken.java b/google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebToken.java
index a42aff95f..f7c19d543 100644
--- a/google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebToken.java
+++ b/google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebToken.java
@@ -18,16 +18,13 @@
import com.google.api.client.util.Key;
import com.google.api.client.util.Objects;
import com.google.api.client.util.Preconditions;
-
import java.util.Collections;
import java.util.List;
/**
* JSON Web Token (JWT) .
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.14 (since 1.7 as com.google.api.client.auth.jsontoken.JsonWebToken)
* @author Yaniv Inbar
@@ -60,8 +57,8 @@ public static class Header extends GenericJson {
private String type;
/**
- * Content type header parameter used to declare structural information about the JWT or
- * {@code null} for none.
+ * Content type header parameter used to declare structural information about the JWT or {@code
+ * null} for none.
*/
@Key("cty")
private String contentType;
@@ -78,10 +75,8 @@ public final String getType() {
* Sets the type header parameter used to declare the type of this object or {@code null} for
* none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Header setType(String type) {
this.type = type;
@@ -100,10 +95,8 @@ public final String getContentType() {
* Sets the content type header parameter used to declare structural information about the JWT
* or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Header setContentType(String contentType) {
this.contentType = contentType;
@@ -143,8 +136,8 @@ public static class Payload extends GenericJson {
private Long notBeforeTimeSeconds;
/**
- * Issued at claim that identifies the time (in seconds) at which the JWT was issued or
- * {@code null} for none.
+ * Issued at claim that identifies the time (in seconds) at which the JWT was issued or {@code
+ * null} for none.
*/
@Key("iat")
private Long issuedAtTimeSeconds;
@@ -160,15 +153,13 @@ public static class Payload extends GenericJson {
@Key("aud")
private Object audience;
- /**
- * JWT ID claim that provides a unique identifier for the JWT or {@code null} for none.
- */
+ /** JWT ID claim that provides a unique identifier for the JWT or {@code null} for none. */
@Key("jti")
private String jwtId;
/**
- * Type claim that is used to declare a type for the contents of this JWT Claims Set or
- * {@code null} for none.
+ * Type claim that is used to declare a type for the contents of this JWT Claims Set or {@code
+ * null} for none.
*/
@Key("typ")
private String type;
@@ -192,10 +183,8 @@ public final Long getExpirationTimeSeconds() {
* Sets the expiration time claim that identifies the expiration time (in seconds) on or after
* which the token MUST NOT be accepted for processing or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Payload setExpirationTimeSeconds(Long expirationTimeSeconds) {
this.expirationTimeSeconds = expirationTimeSeconds;
@@ -214,10 +203,8 @@ public final Long getNotBeforeTimeSeconds() {
* Sets the not before claim that identifies the time (in seconds) before which the token MUST
* NOT be accepted for processing or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Payload setNotBeforeTimeSeconds(Long notBeforeTimeSeconds) {
this.notBeforeTimeSeconds = notBeforeTimeSeconds;
@@ -236,10 +223,8 @@ public final Long getIssuedAtTimeSeconds() {
* Sets the issued at claim that identifies the time (in seconds) at which the JWT was issued or
* {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Payload setIssuedAtTimeSeconds(Long issuedAtTimeSeconds) {
this.issuedAtTimeSeconds = issuedAtTimeSeconds;
@@ -258,10 +243,8 @@ public final String getIssuer() {
* Sets the issuer claim that identifies the principal that issued the JWT or {@code null} for
* none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Payload setIssuer(String issuer) {
this.issuer = issuer;
@@ -295,10 +278,8 @@ public final List getAudienceAsList() {
* Sets the audience claim that identifies the audience that the JWT is intended for (should
* either be a {@code String} or a {@code List}) or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Payload setAudience(Object audience) {
this.audience = audience;
@@ -316,10 +297,8 @@ public final String getJwtId() {
/**
* Sets the JWT ID claim that provides a unique identifier for the JWT or {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Payload setJwtId(String jwtId) {
this.jwtId = jwtId;
@@ -338,10 +317,8 @@ public final String getType() {
* Sets the type claim that is used to declare a type for the contents of this JWT Claims Set or
* {@code null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Payload setType(String type) {
this.type = type;
@@ -349,21 +326,19 @@ public Payload setType(String type) {
}
/**
- * Returns the subject claim identifying the principal that is the subject of the JWT or
- * {@code null} for none.
+ * Returns the subject claim identifying the principal that is the subject of the JWT or {@code
+ * null} for none.
*/
public final String getSubject() {
return subject;
}
/**
- * Sets the subject claim identifying the principal that is the subject of the JWT or
- * {@code null} for none.
+ * Sets the subject claim identifying the principal that is the subject of the JWT or {@code
+ * null} for none.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Payload setSubject(String subject) {
this.subject = subject;
@@ -389,10 +364,8 @@ public String toString() {
/**
* Returns the header.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Header getHeader() {
return header;
@@ -401,10 +374,8 @@ public Header getHeader() {
/**
* Returns the payload.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Payload getPayload() {
return payload;
diff --git a/google-http-client/src/main/java/com/google/api/client/json/webtoken/package-info.java b/google-http-client/src/main/java/com/google/api/client/json/webtoken/package-info.java
index 4b134cea0..209b5388d 100644
--- a/google-http-client/src/main/java/com/google/api/client/json/webtoken/package-info.java
+++ b/google-http-client/src/main/java/com/google/api/client/json/webtoken/package-info.java
@@ -13,7 +13,7 @@
*/
/**
- * {@link com.google.api.client.util.Beta} JSON Web Token (JWT)
* and JSON Web Signature
* (JWS) .
@@ -22,4 +22,3 @@
* @author Yaniv Inbar
*/
package com.google.api.client.json.webtoken;
-
diff --git a/google-http-client/src/main/java/com/google/api/client/testing/http/FixedClock.java b/google-http-client/src/main/java/com/google/api/client/testing/http/FixedClock.java
index a185fd95f..210a2fcfc 100644
--- a/google-http-client/src/main/java/com/google/api/client/testing/http/FixedClock.java
+++ b/google-http-client/src/main/java/com/google/api/client/testing/http/FixedClock.java
@@ -16,16 +16,13 @@
import com.google.api.client.util.Beta;
import com.google.api.client.util.Clock;
-
import java.util.concurrent.atomic.AtomicLong;
/**
- * {@link Beta}
- * Explicitly allows you to set the time to any arbitrary value.
- *
+ * Explicitly allows you to set the time to any arbitrary value.
*
* @since 1.9
* @author mlinder@google.com (Matthias Linder)
@@ -34,15 +31,14 @@
public class FixedClock implements Clock {
private AtomicLong currentTime;
- /**
- * Initializes the FixedClock with 0 millis as start time.
- */
+ /** Initializes the FixedClock with 0 millis as start time. */
public FixedClock() {
this(0L);
}
/**
* Initializes the FixedClock with the specified time.
+ *
* @param startTime time in milliseconds used for initialization.
*/
public FixedClock(long startTime) {
@@ -51,6 +47,7 @@ public FixedClock(long startTime) {
/**
* Changes the time value this time provider is returning.
+ *
* @param newTime New time in milliseconds.
*/
public FixedClock setTime(long newTime) {
diff --git a/google-http-client/src/main/java/com/google/api/client/testing/http/HttpTesting.java b/google-http-client/src/main/java/com/google/api/client/testing/http/HttpTesting.java
index 3c2defb40..174e2ba4b 100644
--- a/google-http-client/src/main/java/com/google/api/client/testing/http/HttpTesting.java
+++ b/google-http-client/src/main/java/com/google/api/client/testing/http/HttpTesting.java
@@ -18,7 +18,7 @@
import com.google.api.client.util.Beta;
/**
- * {@link Beta}
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @author Yaniv Inbar
* @since 1.3
@@ -73,9 +70,7 @@ public final byte[] getContent() {
/**
* Sets the HTTP content.
*
- *
- * Default value is an empty byte array.
- *
+ * Default value is an empty byte array.
*
* @since 1.5
*/
@@ -87,9 +82,7 @@ public MockHttpContent setContent(byte[] content) {
/**
* Returns the HTTP content length or {@code -1} for unknown.
*
- *
- * Default value is {@code -1}.
- *
+ * Default value is {@code -1}.
*
* @since 1.5
*/
diff --git a/google-http-client/src/main/java/com/google/api/client/testing/http/MockHttpTransport.java b/google-http-client/src/main/java/com/google/api/client/testing/http/MockHttpTransport.java
index 2ff06731e..1f5c316e2 100644
--- a/google-http-client/src/main/java/com/google/api/client/testing/http/MockHttpTransport.java
+++ b/google-http-client/src/main/java/com/google/api/client/testing/http/MockHttpTransport.java
@@ -18,19 +18,16 @@
import com.google.api.client.http.LowLevelHttpRequest;
import com.google.api.client.util.Beta;
import com.google.api.client.util.Preconditions;
-
import java.io.IOException;
import java.util.Collections;
import java.util.Set;
/**
- * {@link Beta}
- * Implementation is thread-safe. For maximum efficiency, applications should use a single
+ *
Implementation is thread-safe. For maximum efficiency, applications should use a single
* globally-shared instance of the HTTP transport.
- *
*
* @author Yaniv Inbar
* @since 1.3
@@ -42,26 +39,22 @@ public class MockHttpTransport extends HttpTransport {
private Set supportedMethods;
/**
- * The {@link MockLowLevelHttpRequest} to be returned by {@link #buildRequest}. If
- * this field is {@code null}, {@link #buildRequest} will create a new instance
- * from its arguments.
- * */
+ * The {@link MockLowLevelHttpRequest} to be returned by {@link #buildRequest}. If this field is
+ * {@code null}, {@link #buildRequest} will create a new instance from its arguments.
+ */
private MockLowLevelHttpRequest lowLevelHttpRequest;
/**
* The {@link MockLowLevelHttpResponse} to be returned when this {@link MockHttpTransport}
- * executes the associated request. Note that this field is ignored if the caller provided
- * a non-{@code null} {@link MockLowLevelHttpRequest} with this {@link MockHttpTransport}
- * was built.
+ * executes the associated request. Note that this field is ignored if the caller provided a
+ * non-{@code null} {@link MockLowLevelHttpRequest} with this {@link MockHttpTransport} was built.
*/
private MockLowLevelHttpResponse lowLevelHttpResponse;
- public MockHttpTransport() {
- }
+ public MockHttpTransport() {}
/**
* @param builder builder
- *
* @since 1.14
*/
protected MockHttpTransport(Builder builder) {
@@ -97,8 +90,8 @@ public final Set getSupportedMethods() {
}
/**
- * Returns the {@link MockLowLevelHttpRequest} that is associated with this {@link Builder},
- * or {@code null} if no such instance exists.
+ * Returns the {@link MockLowLevelHttpRequest} that is associated with this {@link Builder}, or
+ * {@code null} if no such instance exists.
*
* @since 1.18
*/
@@ -110,9 +103,8 @@ public final MockLowLevelHttpRequest getLowLevelHttpRequest() {
* Returns an instance of a new builder.
*
*
- * @deprecated (to be removed in the future) Use {@link Builder#Builder()} instead.
- *
*
+ * @deprecated (to be removed in the future) Use {@link Builder#Builder()} instead.
* @since 1.5
*/
@Deprecated
@@ -121,12 +113,10 @@ public static Builder builder() {
}
/**
- * {@link Beta}
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.5
*/
@@ -137,27 +127,24 @@ public static class Builder {
Set supportedMethods;
/**
- * The {@link MockLowLevelHttpRequest} to be returned by {@link #buildRequest}. If
- * this field is {@code null}, {@link #buildRequest} will create a new instance
- * from its arguments.
- * */
+ * The {@link MockLowLevelHttpRequest} to be returned by {@link #buildRequest}. If this field is
+ * {@code null}, {@link #buildRequest} will create a new instance from its arguments.
+ */
MockLowLevelHttpRequest lowLevelHttpRequest;
/**
- * The {@link MockLowLevelHttpResponse} that should be the result of the
- * {@link MockLowLevelHttpRequest} to be returned by {@link #buildRequest}. Note
- * that this field is ignored if the caller provides a {@link MockLowLevelHttpRequest}
- * via {@link #setLowLevelHttpRequest}.
+ * The {@link MockLowLevelHttpResponse} that should be the result of the {@link
+ * MockLowLevelHttpRequest} to be returned by {@link #buildRequest}. Note that this field is
+ * ignored if the caller provides a {@link MockLowLevelHttpRequest} via {@link
+ * #setLowLevelHttpRequest}.
*/
MockLowLevelHttpResponse lowLevelHttpResponse;
/**
- * Constructs a new {@link Builder}. Note that this constructor was {@code protected}
- * in version 1.17 and its predecessors, and was made {@code public} in version
- * 1.18.
+ * Constructs a new {@link Builder}. Note that this constructor was {@code protected} in version
+ * 1.17 and its predecessors, and was made {@code public} in version 1.18.
*/
- public Builder() {
- }
+ public Builder() {}
/** Builds a new instance of {@link MockHttpTransport}. */
public MockHttpTransport build() {
@@ -181,24 +168,25 @@ public final Builder setSupportedMethods(Set supportedMethods) {
/**
* Sets the {@link MockLowLevelHttpRequest} that will be returned by {@link #buildRequest}, if
- * non-{@code null}. If {@code null}, {@link #buildRequest} will create a new
- * {@link MockLowLevelHttpRequest} arguments.
+ * non-{@code null}. If {@code null}, {@link #buildRequest} will create a new {@link
+ * MockLowLevelHttpRequest} arguments.
*
- * Note that the user can set a low level HTTP Request only if a low level HTTP response
- * has not been set on this instance.
+ *
Note that the user can set a low level HTTP Request only if a low level HTTP response has
+ * not been set on this instance.
*
* @since 1.18
*/
public final Builder setLowLevelHttpRequest(MockLowLevelHttpRequest lowLevelHttpRequest) {
- Preconditions.checkState(lowLevelHttpResponse == null,
+ Preconditions.checkState(
+ lowLevelHttpResponse == null,
"Cannnot set a low level HTTP request when a low level HTTP response has been set.");
this.lowLevelHttpRequest = lowLevelHttpRequest;
return this;
}
/**
- * Returns the {@link MockLowLevelHttpRequest} that is associated with this {@link Builder},
- * or {@code null} if no such instance exists.
+ * Returns the {@link MockLowLevelHttpRequest} that is associated with this {@link Builder}, or
+ * {@code null} if no such instance exists.
*
* @since 1.18
*/
@@ -206,29 +194,27 @@ public final MockLowLevelHttpRequest getLowLevelHttpRequest() {
return lowLevelHttpRequest;
}
-
/**
- * Sets the {@link MockLowLevelHttpResponse} that will be the result when the
- * {@link MockLowLevelHttpRequest} returned by {@link #buildRequest} is executed.
- * Note that the response can be set only the caller has not provided a
- * {@link MockLowLevelHttpRequest} via {@link #setLowLevelHttpRequest}.
- *
- * @throws IllegalStateException if the caller has already set a {@link LowLevelHttpRequest}
- * in this instance
+ * Sets the {@link MockLowLevelHttpResponse} that will be the result when the {@link
+ * MockLowLevelHttpRequest} returned by {@link #buildRequest} is executed. Note that the
+ * response can be set only the caller has not provided a {@link MockLowLevelHttpRequest} via
+ * {@link #setLowLevelHttpRequest}.
*
+ * @throws IllegalStateException if the caller has already set a {@link LowLevelHttpRequest} in
+ * this instance
* @since 1.18
*/
public final Builder setLowLevelHttpResponse(MockLowLevelHttpResponse lowLevelHttpResponse) {
- Preconditions.checkState(lowLevelHttpRequest == null,
+ Preconditions.checkState(
+ lowLevelHttpRequest == null,
"Cannot set a low level HTTP response when a low level HTTP request has been set.");
this.lowLevelHttpResponse = lowLevelHttpResponse;
return this;
}
-
/**
- * Returns the {@link MockLowLevelHttpResponse} that is associated with this {@link Builder},
- * or {@code null} if no such instance exists.
+ * Returns the {@link MockLowLevelHttpResponse} that is associated with this {@link Builder}, or
+ * {@code null} if no such instance exists.
*
* @since 1.18
*/
diff --git a/google-http-client/src/main/java/com/google/api/client/testing/http/MockHttpUnsuccessfulResponseHandler.java b/google-http-client/src/main/java/com/google/api/client/testing/http/MockHttpUnsuccessfulResponseHandler.java
index efc68f821..b069cfb02 100644
--- a/google-http-client/src/main/java/com/google/api/client/testing/http/MockHttpUnsuccessfulResponseHandler.java
+++ b/google-http-client/src/main/java/com/google/api/client/testing/http/MockHttpUnsuccessfulResponseHandler.java
@@ -18,16 +18,13 @@
import com.google.api.client.http.HttpResponse;
import com.google.api.client.http.HttpUnsuccessfulResponseHandler;
import com.google.api.client.util.Beta;
-
import java.io.IOException;
/**
- * {@link Beta}
- * Contains an {@link #isCalled} method that returns true if {@link #handleResponse} is called.
- *
+ * Contains an {@link #isCalled} method that returns true if {@link #handleResponse} is called.
*
* @author Ravi Mistry
* @since 1.6
@@ -47,9 +44,7 @@ public MockHttpUnsuccessfulResponseHandler(boolean successfullyHandleResponse) {
this.successfullyHandleResponse = successfullyHandleResponse;
}
- /**
- * Returns whether the {@link #handleResponse} method was called or not.
- */
+ /** Returns whether the {@link #handleResponse} method was called or not. */
public boolean isCalled() {
return isCalled;
}
diff --git a/google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpRequest.java b/google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpRequest.java
index 6bdac5857..a85759138 100644
--- a/google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpRequest.java
+++ b/google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpRequest.java
@@ -20,7 +20,6 @@
import com.google.api.client.util.Beta;
import com.google.api.client.util.Charsets;
import com.google.api.client.util.IOUtils;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -35,12 +34,10 @@
import java.util.zip.GZIPInputStream;
/**
- * {@link Beta}
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @author Yaniv Inbar
* @since 1.3
@@ -57,14 +54,11 @@ public class MockLowLevelHttpRequest extends LowLevelHttpRequest {
/**
* HTTP response to return from {@link #execute()}.
*
- *
- * By default this is a new instance of {@link MockLowLevelHttpResponse}.
- *
+ * By default this is a new instance of {@link MockLowLevelHttpResponse}.
*/
private MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
- public MockLowLevelHttpRequest() {
- }
+ public MockLowLevelHttpRequest() {}
/**
* @param url Request URL or {@code null} for none
@@ -102,10 +96,8 @@ public String getUrl() {
/**
* Returns an unmodifiable view of the map of lowercase header name to values.
*
- *
- * Note that unlike this method, {@link #getFirstHeaderValue(String)} and
- * {@link #getHeaderValues(String)} are not case sensitive with respect to the input header name.
- *
+ * Note that unlike this method, {@link #getFirstHeaderValue(String)} and {@link
+ * #getHeaderValues(String)} are not case sensitive with respect to the input header name.
*
* @since 1.5
*/
@@ -148,9 +140,7 @@ public MockLowLevelHttpRequest setUrl(String url) {
/**
* Returns HTTP content as a string, taking care of any encodings of the content if necessary.
*
- *
- * Returns an empty string if there is no HTTP content.
- *
+ * Returns an empty string if there is no HTTP content.
*
* @since 1.12
*/
@@ -172,8 +162,10 @@ public String getContentAsString() throws IOException {
// determine charset parameter from content type
String contentType = getContentType();
HttpMediaType mediaType = contentType != null ? new HttpMediaType(contentType) : null;
- Charset charset = mediaType == null || mediaType.getCharsetParameter() == null
- ? Charsets.ISO_8859_1 : mediaType.getCharsetParameter();
+ Charset charset =
+ mediaType == null || mediaType.getCharsetParameter() == null
+ ? Charsets.ISO_8859_1
+ : mediaType.getCharsetParameter();
return out.toString(charset.name());
}
@@ -189,9 +181,7 @@ public MockLowLevelHttpResponse getResponse() {
/**
* Sets the HTTP response to return from {@link #execute()}.
*
- *
- * By default this is a new instance of {@link MockLowLevelHttpResponse}.
- *
+ * By default this is a new instance of {@link MockLowLevelHttpResponse}.
*/
public MockLowLevelHttpRequest setResponse(MockLowLevelHttpResponse response) {
this.response = response;
diff --git a/google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpResponse.java b/google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpResponse.java
index 1a7f26920..f713206e3 100644
--- a/google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpResponse.java
+++ b/google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpResponse.java
@@ -19,19 +19,16 @@
import com.google.api.client.util.Beta;
import com.google.api.client.util.Preconditions;
import com.google.api.client.util.StringUtils;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
/**
- * {@link Beta}
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @author Yaniv Inbar
* @since 1.3
@@ -81,10 +78,8 @@ public MockLowLevelHttpResponse addHeader(String name, String value) {
/**
* Sets the response content to the given content string.
*
- *
- * If the input string is {@code null}, it will set the content to {@code null}. Else, it will use
- * {@link TestableByteArrayInputStream} with the UTF-8 encoded string content.
- *
+ * If the input string is {@code null}, it will set the content to {@code null}. Else, it will
+ * use {@link TestableByteArrayInputStream} with the UTF-8 encoded string content.
*
* @param stringContent content string or {@code null} for none
*/
@@ -98,13 +93,9 @@ public MockLowLevelHttpResponse setContent(String stringContent) {
* Sets the response content to the given byte array.
*
* @param byteContent content byte array, or {@code null} for none.
- *
- *
- * If the byte array is {@code null}, the method invokes {@link #setZeroContent}.
- * Otherwise, {@code byteContent} is wrapped in a {@link TestableByteArrayInputStream}
- * and becomes this {@link MockLowLevelHttpResponse}'s contents.
- *
- *
+ * If the byte array is {@code null}, the method invokes {@link #setZeroContent}.
+ * Otherwise, {@code byteContent} is wrapped in a {@link TestableByteArrayInputStream} and
+ * becomes this {@link MockLowLevelHttpResponse}'s contents.
* @since 1.18
*/
public MockLowLevelHttpResponse setContent(byte[] byteContent) {
@@ -117,8 +108,8 @@ public MockLowLevelHttpResponse setContent(byte[] byteContent) {
}
/**
- * Sets the content to {@code null} and the content length to 0. Note that
- * the result will have a content length header whose value is 0.
+ * Sets the content to {@code null} and the content length to 0. Note that the result will have a
+ * content length header whose value is 0.
*
* @since 1.18
*/
@@ -195,9 +186,7 @@ public final List getHeaderNames() {
/**
* Sets the list of header names of HTTP response.
*
- *
- * Default value is an empty list.
- *
+ * Default value is an empty list.
*
* @since 1.5
*/
@@ -209,9 +198,7 @@ public MockLowLevelHttpResponse setHeaderNames(List headerNames) {
/**
* Returns the list of header values of HTTP response.
*
- *
- * Default value is an empty list.
- *
+ * Default value is an empty list.
*
* @since 1.5
*/
@@ -262,9 +249,7 @@ public MockLowLevelHttpResponse setContentEncoding(String contentEncoding) {
/**
* Sets the content length or {@code -1} for unknown.
*
- *
- * By default it is {@code -1}.
- *
+ * By default it is {@code -1}.
*
* @since 1.5
*/
@@ -277,9 +262,7 @@ public MockLowLevelHttpResponse setContentLength(long contentLength) {
/**
* Sets the status code of HTTP response.
*
- *
- * Default value is {@code 200}.
- *
+ * Default value is {@code 200}.
*
* @since 1.5
*/
diff --git a/google-http-client/src/main/java/com/google/api/client/testing/http/apache/MockHttpClient.java b/google-http-client/src/main/java/com/google/api/client/testing/http/apache/MockHttpClient.java
index 32e8a6617..32571a14a 100644
--- a/google-http-client/src/main/java/com/google/api/client/testing/http/apache/MockHttpClient.java
+++ b/google-http-client/src/main/java/com/google/api/client/testing/http/apache/MockHttpClient.java
@@ -40,12 +40,10 @@
import org.apache.http.protocol.HttpRequestExecutor;
/**
- * {@link Beta}
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.14
* @author Yaniv Inbar
@@ -57,12 +55,19 @@ public class MockHttpClient extends DefaultHttpClient {
int responseCode;
@Override
- protected RequestDirector createClientRequestDirector(HttpRequestExecutor requestExec,
- ClientConnectionManager conman, ConnectionReuseStrategy reustrat,
- ConnectionKeepAliveStrategy kastrat, HttpRoutePlanner rouplan, HttpProcessor httpProcessor,
- HttpRequestRetryHandler retryHandler, RedirectHandler redirectHandler,
- AuthenticationHandler targetAuthHandler, AuthenticationHandler proxyAuthHandler,
- UserTokenHandler stateHandler, HttpParams params) {
+ protected RequestDirector createClientRequestDirector(
+ HttpRequestExecutor requestExec,
+ ClientConnectionManager conman,
+ ConnectionReuseStrategy reustrat,
+ ConnectionKeepAliveStrategy kastrat,
+ HttpRoutePlanner rouplan,
+ HttpProcessor httpProcessor,
+ HttpRequestRetryHandler retryHandler,
+ RedirectHandler redirectHandler,
+ AuthenticationHandler targetAuthHandler,
+ AuthenticationHandler proxyAuthHandler,
+ UserTokenHandler stateHandler,
+ HttpParams params) {
return new RequestDirector() {
@Beta
public HttpResponse execute(HttpHost target, HttpRequest request, HttpContext context)
diff --git a/google-http-client/src/main/java/com/google/api/client/testing/http/apache/package-info.java b/google-http-client/src/main/java/com/google/api/client/testing/http/apache/package-info.java
index d05325514..1ca14ca3d 100644
--- a/google-http-client/src/main/java/com/google/api/client/testing/http/apache/package-info.java
+++ b/google-http-client/src/main/java/com/google/api/client/testing/http/apache/package-info.java
@@ -13,7 +13,7 @@
*/
/**
- * {@link com.google.api.client.util.Beta}
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.11
* @author Yaniv Inbar
@@ -47,19 +44,18 @@ public class MockHttpURLConnection extends HttpURLConnection {
private boolean doOutputCalled;
/**
- * Output stream or {@code null} to throw an {@link UnknownServiceException} when
- * {@link #getOutputStream()} is called.
+ * Output stream or {@code null} to throw an {@link UnknownServiceException} when {@link
+ * #getOutputStream()} is called.
*/
private OutputStream outputStream = new ByteArrayOutputStream(0);
/**
- * The input byte array which represents the content when the status code is less then
- * {@code 400}.
+ * The input byte array which represents the content when the status code is less then {@code
+ * 400}.
*
* @deprecated As of 1.20. Use {@link #setInputStream(InputStream)} instead.
*/
- @Deprecated
- public static final byte[] INPUT_BUF = new byte[1];
+ @Deprecated public static final byte[] INPUT_BUF = new byte[1];
/**
* The error byte array which represents the content when the status code is greater or equal to
@@ -67,8 +63,7 @@ public class MockHttpURLConnection extends HttpURLConnection {
*
* @deprecated As of 1.20. Use {@link #setErrorStream(InputStream)} instead.
*/
- @Deprecated
- public static final byte[] ERROR_BUF = new byte[5];
+ @Deprecated public static final byte[] ERROR_BUF = new byte[5];
/** The input stream. */
private InputStream inputStream = null;
@@ -78,16 +73,13 @@ public class MockHttpURLConnection extends HttpURLConnection {
private Map> headers = new LinkedHashMap>();
- /**
- * @param u the URL or {@code null} for none
- */
+ /** @param u the URL or {@code null} for none */
public MockHttpURLConnection(URL u) {
super(u);
}
@Override
- public void disconnect() {
- }
+ public void disconnect() {}
@Override
public boolean usingProxy() {
@@ -95,8 +87,7 @@ public boolean usingProxy() {
}
@Override
- public void connect() throws IOException {
- }
+ public void connect() throws IOException {}
@Override
public int getResponseCode() throws IOException {
@@ -122,12 +113,10 @@ public final boolean doOutputCalled() {
}
/**
- * Sets the output stream or {@code null} to throw an {@link UnknownServiceException} when
- * {@link #getOutputStream()} is called.
+ * Sets the output stream or {@code null} to throw an {@link UnknownServiceException} when {@link
+ * #getOutputStream()} is called.
*
- *
- * By default it is {@code null}.
- *
+ * By default it is {@code null}.
*/
public MockHttpURLConnection setOutputStream(OutputStream outputStream) {
this.outputStream = outputStream;
diff --git a/google-http-client/src/main/java/com/google/api/client/testing/http/javanet/package-info.java b/google-http-client/src/main/java/com/google/api/client/testing/http/javanet/package-info.java
index 501067c76..4f0934336 100644
--- a/google-http-client/src/main/java/com/google/api/client/testing/http/javanet/package-info.java
+++ b/google-http-client/src/main/java/com/google/api/client/testing/http/javanet/package-info.java
@@ -13,7 +13,7 @@
*/
/**
- * {@link com.google.api.client.util.Beta}
- * Implementation is thread-safe.
- *
+ * Implementation is thread-safe.
*
* @author rmistry@google.com (Ravi Mistry)
* @since 1.15 (since 1.11 as com.google.api.client.testing.http.json.MockJsonFactory)
diff --git a/google-http-client/src/main/java/com/google/api/client/testing/json/MockJsonGenerator.java b/google-http-client/src/main/java/com/google/api/client/testing/json/MockJsonGenerator.java
index 506bf1e7c..7bdd13bd4 100644
--- a/google-http-client/src/main/java/com/google/api/client/testing/json/MockJsonGenerator.java
+++ b/google-http-client/src/main/java/com/google/api/client/testing/json/MockJsonGenerator.java
@@ -17,18 +17,15 @@
import com.google.api.client.json.JsonFactory;
import com.google.api.client.json.JsonGenerator;
import com.google.api.client.util.Beta;
-
import java.io.IOException;
import java.math.BigDecimal;
import java.math.BigInteger;
/**
- * {@link Beta}
- * Implementation is thread-safe.
- *
+ * Implementation is thread-safe.
*
* @author rmistry@google.com (Ravi Mistry)
* @since 1.15 (since 1.11 as com.google.api.client.testing.http.json.MockJsonGenerator)
@@ -48,70 +45,53 @@ public JsonFactory getFactory() {
}
@Override
- public void flush() throws IOException {
- }
+ public void flush() throws IOException {}
@Override
- public void close() throws IOException {
- }
+ public void close() throws IOException {}
@Override
- public void writeStartArray() throws IOException {
- }
+ public void writeStartArray() throws IOException {}
@Override
- public void writeEndArray() throws IOException {
- }
+ public void writeEndArray() throws IOException {}
@Override
- public void writeStartObject() throws IOException {
- }
+ public void writeStartObject() throws IOException {}
@Override
- public void writeEndObject() throws IOException {
- }
+ public void writeEndObject() throws IOException {}
@Override
- public void writeFieldName(String name) throws IOException {
- }
+ public void writeFieldName(String name) throws IOException {}
@Override
- public void writeNull() throws IOException {
- }
+ public void writeNull() throws IOException {}
@Override
- public void writeString(String value) throws IOException {
- }
+ public void writeString(String value) throws IOException {}
@Override
- public void writeBoolean(boolean state) throws IOException {
- }
+ public void writeBoolean(boolean state) throws IOException {}
@Override
- public void writeNumber(int v) throws IOException {
- }
+ public void writeNumber(int v) throws IOException {}
@Override
- public void writeNumber(long v) throws IOException {
- }
+ public void writeNumber(long v) throws IOException {}
@Override
- public void writeNumber(BigInteger v) throws IOException {
- }
+ public void writeNumber(BigInteger v) throws IOException {}
@Override
- public void writeNumber(float v) throws IOException {
- }
+ public void writeNumber(float v) throws IOException {}
@Override
- public void writeNumber(double v) throws IOException {
- }
+ public void writeNumber(double v) throws IOException {}
@Override
- public void writeNumber(BigDecimal v) throws IOException {
- }
+ public void writeNumber(BigDecimal v) throws IOException {}
@Override
- public void writeNumber(String encodedValue) throws IOException {
- }
+ public void writeNumber(String encodedValue) throws IOException {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/testing/json/MockJsonParser.java b/google-http-client/src/main/java/com/google/api/client/testing/json/MockJsonParser.java
index 096e66476..422ddd962 100644
--- a/google-http-client/src/main/java/com/google/api/client/testing/json/MockJsonParser.java
+++ b/google-http-client/src/main/java/com/google/api/client/testing/json/MockJsonParser.java
@@ -18,18 +18,15 @@
import com.google.api.client.json.JsonParser;
import com.google.api.client.json.JsonToken;
import com.google.api.client.util.Beta;
-
import java.io.IOException;
import java.math.BigDecimal;
import java.math.BigInteger;
/**
- * {@link Beta}
- * Implementation is thread-safe.
- *
+ * Implementation is thread-safe.
*
* @author rmistry@google.com (Ravi Mistry)
* @since 1.15 (since 1.11 as com.google.api.client.testing.http.json.MockJsonParser)
diff --git a/google-http-client/src/main/java/com/google/api/client/testing/json/package-info.java b/google-http-client/src/main/java/com/google/api/client/testing/json/package-info.java
index 55dc1d881..b49fbbfa4 100644
--- a/google-http-client/src/main/java/com/google/api/client/testing/json/package-info.java
+++ b/google-http-client/src/main/java/com/google/api/client/testing/json/package-info.java
@@ -13,7 +13,7 @@
*/
/**
- * {@link com.google.api.client.util.Beta}
- * Contains a test certificate chain, the respective private keys and signed data.
+ *
+ *
Contains a test certificate chain, the respective private keys and signed data.
*
* @since 1.19.1.
*/
@@ -47,7 +45,7 @@
public class TestCertificates {
/**
- * {@link Beta}
* Issuer: CN=Root
* Subject: C=US, ST=California, L=Mountain View, O=Google Inc., CN=foo.bar.com
*
*/
- public static final CertData FOO_BAR_COM_CERT = new CertData(
- "-----BEGIN CERTIFICATE-----\n"
- + "MIIC6TCCAdECASowDQYJKoZIhvcNAQELBQAwDzENMAsGA1UEAwwEUm9vdDAeFw0x\n"
- + "NDExMTgxNjU0MDNaFw0zNDExMTMxNjU0MDNaMGYxCzAJBgNVBAYTAlVTMRMwEQYD\n"
- + "VQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRQwEgYDVQQK\n"
- + "DAtHb29nbGUgSW5jLjEUMBIGA1UEAwwLZm9vLmJhci5jb20wggEiMA0GCSqGSIb3\n"
- + "DQEBAQUAA4IBDwAwggEKAoIBAQCzFVKJOkqTmyyjMHWBOrLdpYmc0EcvG3MohaV+\n"
- + "UJrVrI2SDykY8YWSkTKz9BKmF8HP/GjPPDs3184Cej9b1WeyvVB8Rj3guH3oL+sJ\n"
- + "T3u9V2y4zyo5xO6FWMBYEQ6X8DkGlYtTp5theYbRrXNELul4lF+LtHTCaAANRMkO\n"
- + "l0NEoLa6BRhOG68gFfIAxx5lT8REE9utvPuy+rCaBHnfHOPf8pn0LSvceBijSIFo\n"
- + "S3Y5crjPVjyiPAZUHWnHTFAilfHnpLBlGxpCylePQhMKrPcgvDoD9nd0LA6xYLF7\n"
- + "DPXXSa8FLO+fPV8CNJCAsFuq9Rlf2Tt3SjLtWRYuh5LuctP7AgMBAAEwDQYJKoZI\n"
- + "hvcNAQELBQADggEBAEsMABZl+8Rlk0hqBktsDurri4nF/07CnSBe/zUbTiYhMpr7\n"
- + "VRIDlHLoe5lslLilfXzvaymcMFeH1uBxNwhf7IO7WvIwQeUHSV+rHyNygTTieO0J\n"
- + "n8Hw+4SCohHAdMvD5uWEwn3Lv+W4y7OhaSbzlhVCVCnFLVKicBayUXHtdJXJICok\n"
- + "R4+h/WNM7g0iKThakZOyfb8h1phy7TMTVlPFKrcVDo5m9+GhtPC4PNjGLok6r/jx\n"
- + "9CIOCapIqi8fXJEOxKvilYeAYqfjWvhx00juEUBHrpCQ8wT4TA+LlI02cRz5rxW4\n"
- + "FQAz1NdoG9HZDZWa+NNFTZdAmtWPJMLd+8L8sl4=\n"
- + "-----END CERTIFICATE-----");
+ public static final CertData FOO_BAR_COM_CERT =
+ new CertData(
+ "-----BEGIN CERTIFICATE-----\n"
+ + "MIIC6TCCAdECASowDQYJKoZIhvcNAQELBQAwDzENMAsGA1UEAwwEUm9vdDAeFw0x\n"
+ + "NDExMTgxNjU0MDNaFw0zNDExMTMxNjU0MDNaMGYxCzAJBgNVBAYTAlVTMRMwEQYD\n"
+ + "VQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRQwEgYDVQQK\n"
+ + "DAtHb29nbGUgSW5jLjEUMBIGA1UEAwwLZm9vLmJhci5jb20wggEiMA0GCSqGSIb3\n"
+ + "DQEBAQUAA4IBDwAwggEKAoIBAQCzFVKJOkqTmyyjMHWBOrLdpYmc0EcvG3MohaV+\n"
+ + "UJrVrI2SDykY8YWSkTKz9BKmF8HP/GjPPDs3184Cej9b1WeyvVB8Rj3guH3oL+sJ\n"
+ + "T3u9V2y4zyo5xO6FWMBYEQ6X8DkGlYtTp5theYbRrXNELul4lF+LtHTCaAANRMkO\n"
+ + "l0NEoLa6BRhOG68gFfIAxx5lT8REE9utvPuy+rCaBHnfHOPf8pn0LSvceBijSIFo\n"
+ + "S3Y5crjPVjyiPAZUHWnHTFAilfHnpLBlGxpCylePQhMKrPcgvDoD9nd0LA6xYLF7\n"
+ + "DPXXSa8FLO+fPV8CNJCAsFuq9Rlf2Tt3SjLtWRYuh5LuctP7AgMBAAEwDQYJKoZI\n"
+ + "hvcNAQELBQADggEBAEsMABZl+8Rlk0hqBktsDurri4nF/07CnSBe/zUbTiYhMpr7\n"
+ + "VRIDlHLoe5lslLilfXzvaymcMFeH1uBxNwhf7IO7WvIwQeUHSV+rHyNygTTieO0J\n"
+ + "n8Hw+4SCohHAdMvD5uWEwn3Lv+W4y7OhaSbzlhVCVCnFLVKicBayUXHtdJXJICok\n"
+ + "R4+h/WNM7g0iKThakZOyfb8h1phy7TMTVlPFKrcVDo5m9+GhtPC4PNjGLok6r/jx\n"
+ + "9CIOCapIqi8fXJEOxKvilYeAYqfjWvhx00juEUBHrpCQ8wT4TA+LlI02cRz5rxW4\n"
+ + "FQAz1NdoG9HZDZWa+NNFTZdAmtWPJMLd+8L8sl4=\n"
+ + "-----END CERTIFICATE-----");
- /**
- * Private key for {@code FOO_BAR_COM_CERT}.
- */
+ /** Private key for {@code FOO_BAR_COM_CERT}. */
public static final String FOO_BAR_COM_KEY =
"-----BEGIN PRIVATE KEY-----\n"
- + "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCzFVKJOkqTmyyj\n"
- + "MHWBOrLdpYmc0EcvG3MohaV+UJrVrI2SDykY8YWSkTKz9BKmF8HP/GjPPDs3184C\n"
- + "ej9b1WeyvVB8Rj3guH3oL+sJT3u9V2y4zyo5xO6FWMBYEQ6X8DkGlYtTp5theYbR\n"
- + "rXNELul4lF+LtHTCaAANRMkOl0NEoLa6BRhOG68gFfIAxx5lT8REE9utvPuy+rCa\n"
- + "BHnfHOPf8pn0LSvceBijSIFoS3Y5crjPVjyiPAZUHWnHTFAilfHnpLBlGxpCyleP\n"
- + "QhMKrPcgvDoD9nd0LA6xYLF7DPXXSa8FLO+fPV8CNJCAsFuq9Rlf2Tt3SjLtWRYu\n"
- + "h5LuctP7AgMBAAECggEBAJZQomue6vQEfq4nQaoL/BCBHwXp6KYIs1ti+msQ+zW4\n"
- + "1Ueww/001LoWd+mGR5T0QfDy24J++vG/iSKZO884TAdCUmlNiCi0krIubmjtN17R\n"
- + "H+frs3Sz8MUqnqANCSPNNgBpy32XJJvnppserK6hdcSJPb2E5bA8HTcF8oD1xDe4\n"
- + "CgPK9PKL2PxrR0ofs09RLGTSdh2+rPWvvefk1x1uBfg+wHRlfvqMSKpZ3SDabjhy\n"
- + "PgB21D86SlF5L1AfeqSTfQvmwMLtOpJCVjLK2WZmvdoY7kbwE416AMLxX4tw2a/l\n"
- + "vzVyo2T/B0Wc3be+5m2o96TctHRH1yEK4huEOJojvBECgYEA5RloFMOnYNMZdoEf\n"
- + "yl6TAPEmFD7vCYHXpSlQdFFKu988CNF5+grn9kjC7rF+JxPEYUsnNA11TFzFEfki\n"
- + "Lu0uXirJH+0gQzEp/qGd2SjDANCk+kORjeOOmefbxziG/Y74rnJ1A7gZjL8Abrie\n"
- + "K0mTfOk9DcgqX96PP4HXgX3+XYkCgYEAyBx28UNZoL3Dy8iquTV0VmXCOq2c5+aW\n"
- + "3YS2BKP9rAPy5mWWy6PR28yduomuUu04GxHYf2yw0+0UxpPyWu8TdQHJKjLX4On7\n"
- + "L+ZholvXpyqs51btsbBiRK022akh/MPnqdD9zt/RS2b1QM4yfEWN8kVE3zsMWxMP\n"
- + "gBf9EH4taGMCgYBfsD3ttk65vVI8UfBiSSAjW5WpDSQwF2BnpprpCm8pizL7B+tn\n"
- + "iZibIIbyxYXIcpQqgwZL0nc0vua8/A7QBNbCFCLPR+6awfUlWoGgi0rvkzXlJcWs\n"
- + "uuf71oDQdAbF7yplSn8fX4ykYb6fgFLoB6InoQ+UKw+v3Th9sRC/EE3m6QKBgDBN\n"
- + "RpyHwDufcoJe5m6cK3+rQk29mFEVhLblkLXgC5wYu+nG/bYbzcz7P9tF3nEf11oZ\n"
- + "XaOsTaZp5IjmLyqp6I1mp/LqoNcmQz5Vop15A73S/Dc+8VLhm2auVL4HKDAF7YY8\n"
- + "7vafabqEmJBS9Tav50piU/R6IUpeeHBX2frAKh+3AoGAPTLxTMMEbhZGJFs8GRP9\n"
- + "fFyWZeEkf3tgUK19tAAOk3TX+O0TNvD8UouXq7Z/EUaE1mYhKPf5LbI6nbYEVll4\n"
- + "mWLGd+o8FNFp6E5083O3Tgf0BI4l+sKnwpP/Sqg9BDGARTPS5taeX0SWtQ+HPYGC\n"
- + "4e5m59uhN7t8tHtDVcK0/Pk=\n"
- + "-----END PRIVATE KEY-----";
+ + "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCzFVKJOkqTmyyj\n"
+ + "MHWBOrLdpYmc0EcvG3MohaV+UJrVrI2SDykY8YWSkTKz9BKmF8HP/GjPPDs3184C\n"
+ + "ej9b1WeyvVB8Rj3guH3oL+sJT3u9V2y4zyo5xO6FWMBYEQ6X8DkGlYtTp5theYbR\n"
+ + "rXNELul4lF+LtHTCaAANRMkOl0NEoLa6BRhOG68gFfIAxx5lT8REE9utvPuy+rCa\n"
+ + "BHnfHOPf8pn0LSvceBijSIFoS3Y5crjPVjyiPAZUHWnHTFAilfHnpLBlGxpCyleP\n"
+ + "QhMKrPcgvDoD9nd0LA6xYLF7DPXXSa8FLO+fPV8CNJCAsFuq9Rlf2Tt3SjLtWRYu\n"
+ + "h5LuctP7AgMBAAECggEBAJZQomue6vQEfq4nQaoL/BCBHwXp6KYIs1ti+msQ+zW4\n"
+ + "1Ueww/001LoWd+mGR5T0QfDy24J++vG/iSKZO884TAdCUmlNiCi0krIubmjtN17R\n"
+ + "H+frs3Sz8MUqnqANCSPNNgBpy32XJJvnppserK6hdcSJPb2E5bA8HTcF8oD1xDe4\n"
+ + "CgPK9PKL2PxrR0ofs09RLGTSdh2+rPWvvefk1x1uBfg+wHRlfvqMSKpZ3SDabjhy\n"
+ + "PgB21D86SlF5L1AfeqSTfQvmwMLtOpJCVjLK2WZmvdoY7kbwE416AMLxX4tw2a/l\n"
+ + "vzVyo2T/B0Wc3be+5m2o96TctHRH1yEK4huEOJojvBECgYEA5RloFMOnYNMZdoEf\n"
+ + "yl6TAPEmFD7vCYHXpSlQdFFKu988CNF5+grn9kjC7rF+JxPEYUsnNA11TFzFEfki\n"
+ + "Lu0uXirJH+0gQzEp/qGd2SjDANCk+kORjeOOmefbxziG/Y74rnJ1A7gZjL8Abrie\n"
+ + "K0mTfOk9DcgqX96PP4HXgX3+XYkCgYEAyBx28UNZoL3Dy8iquTV0VmXCOq2c5+aW\n"
+ + "3YS2BKP9rAPy5mWWy6PR28yduomuUu04GxHYf2yw0+0UxpPyWu8TdQHJKjLX4On7\n"
+ + "L+ZholvXpyqs51btsbBiRK022akh/MPnqdD9zt/RS2b1QM4yfEWN8kVE3zsMWxMP\n"
+ + "gBf9EH4taGMCgYBfsD3ttk65vVI8UfBiSSAjW5WpDSQwF2BnpprpCm8pizL7B+tn\n"
+ + "iZibIIbyxYXIcpQqgwZL0nc0vua8/A7QBNbCFCLPR+6awfUlWoGgi0rvkzXlJcWs\n"
+ + "uuf71oDQdAbF7yplSn8fX4ykYb6fgFLoB6InoQ+UKw+v3Th9sRC/EE3m6QKBgDBN\n"
+ + "RpyHwDufcoJe5m6cK3+rQk29mFEVhLblkLXgC5wYu+nG/bYbzcz7P9tF3nEf11oZ\n"
+ + "XaOsTaZp5IjmLyqp6I1mp/LqoNcmQz5Vop15A73S/Dc+8VLhm2auVL4HKDAF7YY8\n"
+ + "7vafabqEmJBS9Tav50piU/R6IUpeeHBX2frAKh+3AoGAPTLxTMMEbhZGJFs8GRP9\n"
+ + "fFyWZeEkf3tgUK19tAAOk3TX+O0TNvD8UouXq7Z/EUaE1mYhKPf5LbI6nbYEVll4\n"
+ + "mWLGd+o8FNFp6E5083O3Tgf0BI4l+sKnwpP/Sqg9BDGARTPS5taeX0SWtQ+HPYGC\n"
+ + "4e5m59uhN7t8tHtDVcK0/Pk=\n"
+ + "-----END PRIVATE KEY-----";
/**
* Test CA Certificate.
+ *
*
* Issuer: CN=Root
* Subject: CN=Root
*
*/
- public static final CertData CA_CERT = new CertData(
- "-----BEGIN CERTIFICATE-----\n"
- + "MIIC8TCCAdmgAwIBAgIJAMNI15HrGylkMA0GCSqGSIb3DQEBCwUAMA8xDTALBgNV\n"
- + "BAMMBFJvb3QwHhcNMTQxMTE4MTY1NDAzWhcNMzQxMTEzMTY1NDAzWjAPMQ0wCwYD\n"
- + "VQQDDARSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzeUNc4bS\n"
- + "WHhOTU+5MQ/lOmmjQWpfBi+FJuxvoeOmQwi6frPKKsaKKYGfCTPlKE0dmrEP95bn\n"
- + "i/qL5xApP17orjUe6KRtJAwFNI5EZadIfjbh/q+85C1Cp2BS2YmuZQzXZHP63yyB\n"
- + "p05YcbMKwCBHXaAgYbmTTk+4+1pjNpHP6YiF2gCPvSfzokGyhbvBqnPbnTdI9w6f\n"
- + "jNBYAbr/uBOTU0vK4ktzlWk5lvsm51e8vsLSqWhoHADq0AriAelU4SHsSACkRUQS\n"
- + "xWV0K5hzTv4ecvCbG9dskiDCwWg+uTRSoAFeZOhONL000q7Vey3DZTcLl8/O4NQV\n"
- + "aZR5iAgVWlWcswIDAQABo1AwTjAdBgNVHQ4EFgQUsimlIRDcJR0ofR7oM8KwHFOH\n"
- + "+sIwHwYDVR0jBBgwFoAUsimlIRDcJR0ofR7oM8KwHFOH+sIwDAYDVR0TBAUwAwEB\n"
- + "/zANBgkqhkiG9w0BAQsFAAOCAQEAWQl8SmbQoBV3tjOJ8zMlcN0xOPpSSNbx0g7E\n"
- + "L/dQgJpet0McW62RHlgQAOKbS3PReo2nsRB/ZRyYDu4i13ZHZ8bMsGOES4BQpz13\n"
- + "mtmXg9RhsXqL0eDYfBcjjtlruUbxhnALp4VN1zVdyWAPCj0eu3MxpgMWcyn50Qmi\n"
- + "JSj/Equ/lLhve/wKvjG5WhnV8uRKRuFbFct0DHAHMnZqFHcGS5So0cYnSfK5fbBR\n"
- + "NelGflhpbbPp0V0aXiqinqD0Ye3OaZdFq+2rP1oC/a5/Ou4LspY3b5oD9rENdy7b\n"
- + "q0KewPFtgPvUkJrJ3TzbiwvpghZ7zG26bnJ5I7uc4y1VujqaOA==\n"
- + "-----END CERTIFICATE-----");
+ public static final CertData CA_CERT =
+ new CertData(
+ "-----BEGIN CERTIFICATE-----\n"
+ + "MIIC8TCCAdmgAwIBAgIJAMNI15HrGylkMA0GCSqGSIb3DQEBCwUAMA8xDTALBgNV\n"
+ + "BAMMBFJvb3QwHhcNMTQxMTE4MTY1NDAzWhcNMzQxMTEzMTY1NDAzWjAPMQ0wCwYD\n"
+ + "VQQDDARSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzeUNc4bS\n"
+ + "WHhOTU+5MQ/lOmmjQWpfBi+FJuxvoeOmQwi6frPKKsaKKYGfCTPlKE0dmrEP95bn\n"
+ + "i/qL5xApP17orjUe6KRtJAwFNI5EZadIfjbh/q+85C1Cp2BS2YmuZQzXZHP63yyB\n"
+ + "p05YcbMKwCBHXaAgYbmTTk+4+1pjNpHP6YiF2gCPvSfzokGyhbvBqnPbnTdI9w6f\n"
+ + "jNBYAbr/uBOTU0vK4ktzlWk5lvsm51e8vsLSqWhoHADq0AriAelU4SHsSACkRUQS\n"
+ + "xWV0K5hzTv4ecvCbG9dskiDCwWg+uTRSoAFeZOhONL000q7Vey3DZTcLl8/O4NQV\n"
+ + "aZR5iAgVWlWcswIDAQABo1AwTjAdBgNVHQ4EFgQUsimlIRDcJR0ofR7oM8KwHFOH\n"
+ + "+sIwHwYDVR0jBBgwFoAUsimlIRDcJR0ofR7oM8KwHFOH+sIwDAYDVR0TBAUwAwEB\n"
+ + "/zANBgkqhkiG9w0BAQsFAAOCAQEAWQl8SmbQoBV3tjOJ8zMlcN0xOPpSSNbx0g7E\n"
+ + "L/dQgJpet0McW62RHlgQAOKbS3PReo2nsRB/ZRyYDu4i13ZHZ8bMsGOES4BQpz13\n"
+ + "mtmXg9RhsXqL0eDYfBcjjtlruUbxhnALp4VN1zVdyWAPCj0eu3MxpgMWcyn50Qmi\n"
+ + "JSj/Equ/lLhve/wKvjG5WhnV8uRKRuFbFct0DHAHMnZqFHcGS5So0cYnSfK5fbBR\n"
+ + "NelGflhpbbPp0V0aXiqinqD0Ye3OaZdFq+2rP1oC/a5/Ou4LspY3b5oD9rENdy7b\n"
+ + "q0KewPFtgPvUkJrJ3TzbiwvpghZ7zG26bnJ5I7uc4y1VujqaOA==\n"
+ + "-----END CERTIFICATE-----");
- /**
- * Private key for {@code CA_CERT}.
- */
+ /** Private key for {@code CA_CERT}. */
public static final String CA_KEY =
"-----BEGIN PRIVATE KEY-----\n"
- + "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDN5Q1zhtJYeE5N\n"
- + "T7kxD+U6aaNBal8GL4Um7G+h46ZDCLp+s8oqxoopgZ8JM+UoTR2asQ/3lueL+ovn\n"
- + "ECk/XuiuNR7opG0kDAU0jkRlp0h+NuH+r7zkLUKnYFLZia5lDNdkc/rfLIGnTlhx\n"
- + "swrAIEddoCBhuZNOT7j7WmM2kc/piIXaAI+9J/OiQbKFu8Gqc9udN0j3Dp+M0FgB\n"
- + "uv+4E5NTS8riS3OVaTmW+ybnV7y+wtKpaGgcAOrQCuIB6VThIexIAKRFRBLFZXQr\n"
- + "mHNO/h5y8Jsb12ySIMLBaD65NFKgAV5k6E40vTTSrtV7LcNlNwuXz87g1BVplHmI\n"
- + "CBVaVZyzAgMBAAECggEANfRuP/X2rURpkIzxxM+bjGEebQgI+r/9LqQK5OuZKDvj\n"
- + "U0yeD/OTRSk4mdrFlHgQ5/a6bnFXIDF59AUiKf8fDnfRL7nW9/lGa+1UMydRMfID\n"
- + "6w/2efz6WI4/Z85SqxxgXWyfM1igaU14k+MNUCelS/2oPrO4zG7L1OJs2WIAj/vE\n"
- + "HnndSBa3rvTXmY37JclkChFokG0svuZMmaXWG1JI6JziSsvO4YZAYvZ10yCvbFzZ\n"
- + "iczMCyyGhRcUeG3wbVDK0lPp5f1jKtyfuQtR2uFhdRHUk2+cMY6s/o3hgdW5b/z9\n"
- + "Yddyw28tC6/uECHJs8dsmNM4hPc+n2+wCVwB9HbSMQKBgQD3V640Tv5UWiHM4lGq\n"
- + "pSdUViNsLgDLmNplWLB0aRbBgTsJLGlzI1sGqSEydlZORYZT4GBdLmTJdumBGBAn\n"
- + "4FxfyyAVjjn8WjYo9ocyMrIGLFKF3EvSyx4opsOX6QOyuyzdDhzt+BkY66Zb0Bgl\n"
- + "lzUQ4S6hhvvEQc5COiNmTuDT/QKBgQDVGfpp8yBamTyRgGQWTwRqIQuJC2QHOrhV\n"
- + "OKQ7NwMyMObyML0ZQm2SCu+Oo0qsMxz8Ix6sNtnJfxZxpUYCLG3HWc6EfaGT1hDR\n"
- + "EgWsdl9J/xP/KwgSzHuSqZTCuNQRTg/XbNfjXnMHy8UaTBL+0jHLAnmvczBrSnEM\n"
- + "r8RgkjoabwKBgQCkuklz3vQ1O33tVQEs1Cc4XNHkl1LCRb+V5ZZHQUH9h9LIjkKA\n"
- + "gxh5fCR21icuo9ENhY7IIEDRiBeFeYAw/pSm28I3eOyXa4FMkLuDrA2yXMxtCEWb\n"
- + "Utl4G3CCeJaU72G2q1KLDkOwvCikVxft2SFnZ4FF5H9CuszigJPY7EmCBQKBgD+/\n"
- + "fra1IWeY0ZKhOs+loadx7TZ47tpuyXfM8uw337/i+yNWSytEQOzgUptz48GxpKkU\n"
- + "hHd2DR6G4xrqGxBJZCmvhuUBhBVqgytX3dSisIy9PqkloUumWg0cp8C8c8wdcwW5\n"
- + "rLd6qKSbY4IjYcdS78xQGEDRD5n48eqepftRowoHAoGBAMdJ5/QwIymaTBhblYiL\n"
- + "nvzZZ6kvxqId+JF93skZJ4NdQ346CVcWWbjTwO/oaJ9ri3MsWY18t4uSIYeYyaCa\n"
- + "5dqQo3nObq2jqxFby92GWSNrwape2FvRGzJ7hnr44EkxUlQPeICod84RI/1mdOM8\n"
- + "E+VTo/KjRA8P2ogks9bltd6f\n"
- + "-----END PRIVATE KEY-----";
+ + "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDN5Q1zhtJYeE5N\n"
+ + "T7kxD+U6aaNBal8GL4Um7G+h46ZDCLp+s8oqxoopgZ8JM+UoTR2asQ/3lueL+ovn\n"
+ + "ECk/XuiuNR7opG0kDAU0jkRlp0h+NuH+r7zkLUKnYFLZia5lDNdkc/rfLIGnTlhx\n"
+ + "swrAIEddoCBhuZNOT7j7WmM2kc/piIXaAI+9J/OiQbKFu8Gqc9udN0j3Dp+M0FgB\n"
+ + "uv+4E5NTS8riS3OVaTmW+ybnV7y+wtKpaGgcAOrQCuIB6VThIexIAKRFRBLFZXQr\n"
+ + "mHNO/h5y8Jsb12ySIMLBaD65NFKgAV5k6E40vTTSrtV7LcNlNwuXz87g1BVplHmI\n"
+ + "CBVaVZyzAgMBAAECggEANfRuP/X2rURpkIzxxM+bjGEebQgI+r/9LqQK5OuZKDvj\n"
+ + "U0yeD/OTRSk4mdrFlHgQ5/a6bnFXIDF59AUiKf8fDnfRL7nW9/lGa+1UMydRMfID\n"
+ + "6w/2efz6WI4/Z85SqxxgXWyfM1igaU14k+MNUCelS/2oPrO4zG7L1OJs2WIAj/vE\n"
+ + "HnndSBa3rvTXmY37JclkChFokG0svuZMmaXWG1JI6JziSsvO4YZAYvZ10yCvbFzZ\n"
+ + "iczMCyyGhRcUeG3wbVDK0lPp5f1jKtyfuQtR2uFhdRHUk2+cMY6s/o3hgdW5b/z9\n"
+ + "Yddyw28tC6/uECHJs8dsmNM4hPc+n2+wCVwB9HbSMQKBgQD3V640Tv5UWiHM4lGq\n"
+ + "pSdUViNsLgDLmNplWLB0aRbBgTsJLGlzI1sGqSEydlZORYZT4GBdLmTJdumBGBAn\n"
+ + "4FxfyyAVjjn8WjYo9ocyMrIGLFKF3EvSyx4opsOX6QOyuyzdDhzt+BkY66Zb0Bgl\n"
+ + "lzUQ4S6hhvvEQc5COiNmTuDT/QKBgQDVGfpp8yBamTyRgGQWTwRqIQuJC2QHOrhV\n"
+ + "OKQ7NwMyMObyML0ZQm2SCu+Oo0qsMxz8Ix6sNtnJfxZxpUYCLG3HWc6EfaGT1hDR\n"
+ + "EgWsdl9J/xP/KwgSzHuSqZTCuNQRTg/XbNfjXnMHy8UaTBL+0jHLAnmvczBrSnEM\n"
+ + "r8RgkjoabwKBgQCkuklz3vQ1O33tVQEs1Cc4XNHkl1LCRb+V5ZZHQUH9h9LIjkKA\n"
+ + "gxh5fCR21icuo9ENhY7IIEDRiBeFeYAw/pSm28I3eOyXa4FMkLuDrA2yXMxtCEWb\n"
+ + "Utl4G3CCeJaU72G2q1KLDkOwvCikVxft2SFnZ4FF5H9CuszigJPY7EmCBQKBgD+/\n"
+ + "fra1IWeY0ZKhOs+loadx7TZ47tpuyXfM8uw337/i+yNWSytEQOzgUptz48GxpKkU\n"
+ + "hHd2DR6G4xrqGxBJZCmvhuUBhBVqgytX3dSisIy9PqkloUumWg0cp8C8c8wdcwW5\n"
+ + "rLd6qKSbY4IjYcdS78xQGEDRD5n48eqepftRowoHAoGBAMdJ5/QwIymaTBhblYiL\n"
+ + "nvzZZ6kvxqId+JF93skZJ4NdQ346CVcWWbjTwO/oaJ9ri3MsWY18t4uSIYeYyaCa\n"
+ + "5dqQo3nObq2jqxFby92GWSNrwape2FvRGzJ7hnr44EkxUlQPeICod84RI/1mdOM8\n"
+ + "E+VTo/KjRA8P2ogks9bltd6f\n"
+ + "-----END PRIVATE KEY-----";
/**
* CA certificate signed with a bogus key.
+ *
*
* Issuer: CN=Root
* Subject: CN=Root
*
*/
- public static final CertData BOGUS_CA_CERT = new CertData(
- "-----BEGIN CERTIFICATE-----\n"
- + "MIIC8TCCAdmgAwIBAgIJAP2af/EIgk6oMA0GCSqGSIb3DQEBCwUAMA8xDTALBgNV\n"
- + "BAMMBFJvb3QwHhcNMTQxMTE5MTEwNDMyWhcNMzQxMTE0MTEwNDMyWjAPMQ0wCwYD\n"
- + "VQQDDARSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtPB0EtUf\n"
- + "aVS9LRljaL4NTYp0tJooMrRTI4ht4ixIv7m6XTSbxVjOtY0228ZPWeUE/3wduezW\n"
- + "1rWNU4Uh4ezW0rw9CmW6m2zsMjjGwjY4A5ctMRDlgQtxzfHSPWPtTixtBr3YpdcP\n"
- + "mg9xVIYvSHZ+fA3x5dRFRxdNidVrndVINzUoaoD9hZ/sgCKg9c2hdDSO9prrTpXD\n"
- + "yatgLZ8LsFJO94HrkfFsQqquwxxvpixyWtjWUpnO28jnbDRC0ADOp/WZQ8exOP+a\n"
- + "XUcrHdIsC0RcB6csnM6EarfwEm1jnBwDi37Rxk2BFiBYyzEbCrn7M6QY/DQrZJbw\n"
- + "9gzSIvT2+5OvawIDAQABo1AwTjAdBgNVHQ4EFgQUYo97/In/SDI+pKRTSrSVhPyq\n"
- + "5UQwHwYDVR0jBBgwFoAUYo97/In/SDI+pKRTSrSVhPyq5UQwDAYDVR0TBAUwAwEB\n"
- + "/zANBgkqhkiG9w0BAQsFAAOCAQEABuUZ+sF4QD8H+PHvJLz+3+puXYvvE2IpcC65\n"
- + "RQznp5iq5Rs4oGJvYwyD1bVUbCNz1IoyB9Lfo5QmSuyV1JybalBZ9FCDzZunBT3O\n"
- + "4Tr6KfziVPHat3vYMNzzJY/IU3u6uLDmqm1J6qoSBkq4yL1AaHFon2j9gT3FXvVk\n"
- + "7f1DjztAplWQBC4ScepJbiIRJkLxThDmM2g1xKUtZ6LlPL5J5CmXutzWbV5YS1eo\n"
- + "uVrDRTmXr4wLzpcURWWB2gbPc0l7+1TfvTydVEp7YqN1EhvNmvsejiQCy+4Cq/D1\n"
- + "m4rBV4SLLaHstTQNqcK1djxy2FbpYD7j5Himdc0oUeYif9gZ9g==\n"
- + "-----END CERTIFICATE-----\n");
+ public static final CertData BOGUS_CA_CERT =
+ new CertData(
+ "-----BEGIN CERTIFICATE-----\n"
+ + "MIIC8TCCAdmgAwIBAgIJAP2af/EIgk6oMA0GCSqGSIb3DQEBCwUAMA8xDTALBgNV\n"
+ + "BAMMBFJvb3QwHhcNMTQxMTE5MTEwNDMyWhcNMzQxMTE0MTEwNDMyWjAPMQ0wCwYD\n"
+ + "VQQDDARSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtPB0EtUf\n"
+ + "aVS9LRljaL4NTYp0tJooMrRTI4ht4ixIv7m6XTSbxVjOtY0228ZPWeUE/3wduezW\n"
+ + "1rWNU4Uh4ezW0rw9CmW6m2zsMjjGwjY4A5ctMRDlgQtxzfHSPWPtTixtBr3YpdcP\n"
+ + "mg9xVIYvSHZ+fA3x5dRFRxdNidVrndVINzUoaoD9hZ/sgCKg9c2hdDSO9prrTpXD\n"
+ + "yatgLZ8LsFJO94HrkfFsQqquwxxvpixyWtjWUpnO28jnbDRC0ADOp/WZQ8exOP+a\n"
+ + "XUcrHdIsC0RcB6csnM6EarfwEm1jnBwDi37Rxk2BFiBYyzEbCrn7M6QY/DQrZJbw\n"
+ + "9gzSIvT2+5OvawIDAQABo1AwTjAdBgNVHQ4EFgQUYo97/In/SDI+pKRTSrSVhPyq\n"
+ + "5UQwHwYDVR0jBBgwFoAUYo97/In/SDI+pKRTSrSVhPyq5UQwDAYDVR0TBAUwAwEB\n"
+ + "/zANBgkqhkiG9w0BAQsFAAOCAQEABuUZ+sF4QD8H+PHvJLz+3+puXYvvE2IpcC65\n"
+ + "RQznp5iq5Rs4oGJvYwyD1bVUbCNz1IoyB9Lfo5QmSuyV1JybalBZ9FCDzZunBT3O\n"
+ + "4Tr6KfziVPHat3vYMNzzJY/IU3u6uLDmqm1J6qoSBkq4yL1AaHFon2j9gT3FXvVk\n"
+ + "7f1DjztAplWQBC4ScepJbiIRJkLxThDmM2g1xKUtZ6LlPL5J5CmXutzWbV5YS1eo\n"
+ + "uVrDRTmXr4wLzpcURWWB2gbPc0l7+1TfvTydVEp7YqN1EhvNmvsejiQCy+4Cq/D1\n"
+ + "m4rBV4SLLaHstTQNqcK1djxy2FbpYD7j5Himdc0oUeYif9gZ9g==\n"
+ + "-----END CERTIFICATE-----\n");
/**
- * A test JWS signature.
- *
- * The signed JSON is the following message:
+ * A test JWS signature.
+ *
+ *
The signed JSON is the following message:
+ *
*
* {"foo":"bar"}
*
+ *
* The message is signed using {@code FOO_BAR_COM_KEY}.
*/
public static final String JWS_SIGNATURE =
"eyJhbGciOiJSUzI1NiIsIng1YyI6WyJNSUlDNlRDQ0FkRUNBU293RFFZSktvWklo"
- + "dmNOQVFFTEJRQXdEekVOTUFzR0ExVUVBd3dFVW05dmREQWVGdzB4TkRFeE1UZ3hO"
- + "alUwTUROYUZ3MHpOREV4TVRNeE5qVTBNRE5hTUdZeEN6QUpCZ05WQkFZVEFsVlRN"
- + "Uk13RVFZRFZRUUlEQXBEWVd4cFptOXlibWxoTVJZd0ZBWURWUVFIREExTmIzVnVk"
- + "R0ZwYmlCV2FXVjNNUlF3RWdZRFZRUUtEQXRIYjI5bmJHVWdTVzVqTGpFVU1CSUdB"
- + "MVVFQXd3TFptOXZMbUpoY2k1amIyMHdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFB"
- + "NElCRHdBd2dnRUtBb0lCQVFDekZWS0pPa3FUbXl5ak1IV0JPckxkcFltYzBFY3ZH"
- + "M01vaGFWK1VKclZySTJTRHlrWThZV1NrVEt6OUJLbUY4SFAvR2pQUERzMzE4NENl"
- + "ajliMVdleXZWQjhSajNndUgzb0wrc0pUM3U5VjJ5NHp5bzV4TzZGV01CWUVRNlg4"
- + "RGtHbFl0VHA1dGhlWWJSclhORUx1bDRsRitMdEhUQ2FBQU5STWtPbDBORW9MYTZC"
- + "UmhPRzY4Z0ZmSUF4eDVsVDhSRUU5dXR2UHV5K3JDYUJIbmZIT1BmOHBuMExTdmNl"
- + "QmlqU0lGb1MzWTVjcmpQVmp5aVBBWlVIV25IVEZBaWxmSG5wTEJsR3hwQ3lsZVBR"
- + "aE1LclBjZ3ZEb0Q5bmQwTEE2eFlMRjdEUFhYU2E4RkxPK2ZQVjhDTkpDQXNGdXE5"
- + "UmxmMlR0M1NqTHRXUll1aDVMdWN0UDdBZ01CQUFFd0RRWUpLb1pJaHZjTkFRRUxC"
- + "UUFEZ2dFQkFFc01BQlpsKzhSbGswaHFCa3RzRHVycmk0bkYvMDdDblNCZS96VWJU"
- + "aVloTXByN1ZSSURsSExvZTVsc2xMaWxmWHp2YXltY01GZUgxdUJ4TndoZjdJTzdX"
- + "dkl3UWVVSFNWK3JIeU55Z1RUaWVPMEpuOEh3KzRTQ29oSEFkTXZENXVXRXduM0x2"
- + "K1c0eTdPaGFTYnpsaFZDVkNuRkxWS2ljQmF5VVhIdGRKWEpJQ29rUjQraC9XTk03"
- + "ZzBpS1RoYWtaT3lmYjhoMXBoeTdUTVRWbFBGS3JjVkRvNW05K0dodFBDNFBOakdM"
- + "b2s2ci9qeDlDSU9DYXBJcWk4ZlhKRU94S3ZpbFllQVlxZmpXdmh4MDBqdUVVQkhy"
- + "cENROHdUNFRBK0xsSTAyY1J6NXJ4VzRGUUF6MU5kb0c5SFpEWldhK05ORlRaZEFt"
- + "dFdQSk1MZCs4TDhzbDQ9IiwiTUlJQzhUQ0NBZG1nQXdJQkFnSUpBTU5JMTVIckd5"
- + "bGtNQTBHQ1NxR1NJYjNEUUVCQ3dVQU1BOHhEVEFMQmdOVkJBTU1CRkp2YjNRd0ho"
- + "Y05NVFF4TVRFNE1UWTFOREF6V2hjTk16UXhNVEV6TVRZMU5EQXpXakFQTVEwd0N3"
- + "WURWUVFEREFSU2IyOTBNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1J"
- + "SUJDZ0tDQVFFQXplVU5jNGJTV0hoT1RVKzVNUS9sT21talFXcGZCaStGSnV4dm9l"
- + "T21Rd2k2ZnJQS0tzYUtLWUdmQ1RQbEtFMGRtckVQOTVibmkvcUw1eEFwUDE3b3Jq"
- + "VWU2S1J0SkF3Rk5JNUVaYWRJZmpiaC9xKzg1QzFDcDJCUzJZbXVaUXpYWkhQNjN5"
- + "eUJwMDVZY2JNS3dDQkhYYUFnWWJtVFRrKzQrMXBqTnBIUDZZaUYyZ0NQdlNmem9r"
- + "R3loYnZCcW5QYm5UZEk5dzZmak5CWUFici91Qk9UVTB2SzRrdHpsV2s1bHZzbTUx"
- + "ZTh2c0xTcVdob0hBRHEwQXJpQWVsVTRTSHNTQUNrUlVRU3hXVjBLNWh6VHY0ZWN2"
- + "Q2JHOWRza2lEQ3dXZyt1VFJTb0FGZVpPaE9OTDAwMHE3VmV5M0RaVGNMbDgvTzRO"
- + "UVZhWlI1aUFnVldsV2Nzd0lEQVFBQm8xQXdUakFkQmdOVkhRNEVGZ1FVc2ltbElS"
- + "RGNKUjBvZlI3b004S3dIRk9IK3NJd0h3WURWUjBqQkJnd0ZvQVVzaW1sSVJEY0pS"
- + "MG9mUjdvTThLd0hGT0grc0l3REFZRFZSMFRCQVV3QXdFQi96QU5CZ2txaGtpRzl3"
- + "MEJBUXNGQUFPQ0FRRUFXUWw4U21iUW9CVjN0ak9KOHpNbGNOMHhPUHBTU05ieDBn"
- + "N0VML2RRZ0pwZXQwTWNXNjJSSGxnUUFPS2JTM1BSZW8ybnNSQi9aUnlZRHU0aTEz"
- + "WkhaOGJNc0dPRVM0QlFwejEzbXRtWGc5UmhzWHFMMGVEWWZCY2pqdGxydVVieGhu"
- + "QUxwNFZOMXpWZHlXQVBDajBldTNNeHBnTVdjeW41MFFtaUpTai9FcXUvbExodmUv"
- + "d0t2akc1V2huVjh1UktSdUZiRmN0MERIQUhNblpxRkhjR1M1U28wY1luU2ZLNWZi"
- + "QlJOZWxHZmxocGJiUHAwVjBhWGlxaW5xRDBZZTNPYVpkRnErMnJQMW9DL2E1L091"
- + "NExzcFkzYjVvRDlyRU5keTdicTBLZXdQRnRnUHZVa0pySjNUemJpd3ZwZ2haN3pH"
- + "MjZibko1STd1YzR5MVZ1anFhT0E9PSJdfQ.eyJmb28iOiJiYXIifQ.eWzIsJF4PE"
- + "xQap9HK6Vlz8DGlgGwoiLCtyOEK0Bfu_yHTAZeApn5rh6Uzfx06Gv6eHdM34YL_t"
- + "gLRb4bjuZVA8xvQ9uHNs8UtpBIOiUcagzvtKyyfCofk5U5sNb54GgVVYxa6p4A1O"
- + "bdJv1jjlUOnzR8keX5LsAM4Ia7xeqiFh0GER4l0ulVChy_bSn0IeNiKFW7HKcxtc"
- + "GO_zZTtlv4HiifuyPSk_ar2IDX1w599KXniVcWkQ_W1zcp5YuPDw8mIQDVCH2uQY"
- + "7qs2ejdZj5LIgIz4CbQ0wg53rlwE7DDQM6MNUgZLnzNmMSMfFrpE7_PQyxe2qJCs"
- + "ucHODzEHX4Tg";
+ + "dmNOQVFFTEJRQXdEekVOTUFzR0ExVUVBd3dFVW05dmREQWVGdzB4TkRFeE1UZ3hO"
+ + "alUwTUROYUZ3MHpOREV4TVRNeE5qVTBNRE5hTUdZeEN6QUpCZ05WQkFZVEFsVlRN"
+ + "Uk13RVFZRFZRUUlEQXBEWVd4cFptOXlibWxoTVJZd0ZBWURWUVFIREExTmIzVnVk"
+ + "R0ZwYmlCV2FXVjNNUlF3RWdZRFZRUUtEQXRIYjI5bmJHVWdTVzVqTGpFVU1CSUdB"
+ + "MVVFQXd3TFptOXZMbUpoY2k1amIyMHdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFB"
+ + "NElCRHdBd2dnRUtBb0lCQVFDekZWS0pPa3FUbXl5ak1IV0JPckxkcFltYzBFY3ZH"
+ + "M01vaGFWK1VKclZySTJTRHlrWThZV1NrVEt6OUJLbUY4SFAvR2pQUERzMzE4NENl"
+ + "ajliMVdleXZWQjhSajNndUgzb0wrc0pUM3U5VjJ5NHp5bzV4TzZGV01CWUVRNlg4"
+ + "RGtHbFl0VHA1dGhlWWJSclhORUx1bDRsRitMdEhUQ2FBQU5STWtPbDBORW9MYTZC"
+ + "UmhPRzY4Z0ZmSUF4eDVsVDhSRUU5dXR2UHV5K3JDYUJIbmZIT1BmOHBuMExTdmNl"
+ + "QmlqU0lGb1MzWTVjcmpQVmp5aVBBWlVIV25IVEZBaWxmSG5wTEJsR3hwQ3lsZVBR"
+ + "aE1LclBjZ3ZEb0Q5bmQwTEE2eFlMRjdEUFhYU2E4RkxPK2ZQVjhDTkpDQXNGdXE5"
+ + "UmxmMlR0M1NqTHRXUll1aDVMdWN0UDdBZ01CQUFFd0RRWUpLb1pJaHZjTkFRRUxC"
+ + "UUFEZ2dFQkFFc01BQlpsKzhSbGswaHFCa3RzRHVycmk0bkYvMDdDblNCZS96VWJU"
+ + "aVloTXByN1ZSSURsSExvZTVsc2xMaWxmWHp2YXltY01GZUgxdUJ4TndoZjdJTzdX"
+ + "dkl3UWVVSFNWK3JIeU55Z1RUaWVPMEpuOEh3KzRTQ29oSEFkTXZENXVXRXduM0x2"
+ + "K1c0eTdPaGFTYnpsaFZDVkNuRkxWS2ljQmF5VVhIdGRKWEpJQ29rUjQraC9XTk03"
+ + "ZzBpS1RoYWtaT3lmYjhoMXBoeTdUTVRWbFBGS3JjVkRvNW05K0dodFBDNFBOakdM"
+ + "b2s2ci9qeDlDSU9DYXBJcWk4ZlhKRU94S3ZpbFllQVlxZmpXdmh4MDBqdUVVQkhy"
+ + "cENROHdUNFRBK0xsSTAyY1J6NXJ4VzRGUUF6MU5kb0c5SFpEWldhK05ORlRaZEFt"
+ + "dFdQSk1MZCs4TDhzbDQ9IiwiTUlJQzhUQ0NBZG1nQXdJQkFnSUpBTU5JMTVIckd5"
+ + "bGtNQTBHQ1NxR1NJYjNEUUVCQ3dVQU1BOHhEVEFMQmdOVkJBTU1CRkp2YjNRd0ho"
+ + "Y05NVFF4TVRFNE1UWTFOREF6V2hjTk16UXhNVEV6TVRZMU5EQXpXakFQTVEwd0N3"
+ + "WURWUVFEREFSU2IyOTBNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1J"
+ + "SUJDZ0tDQVFFQXplVU5jNGJTV0hoT1RVKzVNUS9sT21talFXcGZCaStGSnV4dm9l"
+ + "T21Rd2k2ZnJQS0tzYUtLWUdmQ1RQbEtFMGRtckVQOTVibmkvcUw1eEFwUDE3b3Jq"
+ + "VWU2S1J0SkF3Rk5JNUVaYWRJZmpiaC9xKzg1QzFDcDJCUzJZbXVaUXpYWkhQNjN5"
+ + "eUJwMDVZY2JNS3dDQkhYYUFnWWJtVFRrKzQrMXBqTnBIUDZZaUYyZ0NQdlNmem9r"
+ + "R3loYnZCcW5QYm5UZEk5dzZmak5CWUFici91Qk9UVTB2SzRrdHpsV2s1bHZzbTUx"
+ + "ZTh2c0xTcVdob0hBRHEwQXJpQWVsVTRTSHNTQUNrUlVRU3hXVjBLNWh6VHY0ZWN2"
+ + "Q2JHOWRza2lEQ3dXZyt1VFJTb0FGZVpPaE9OTDAwMHE3VmV5M0RaVGNMbDgvTzRO"
+ + "UVZhWlI1aUFnVldsV2Nzd0lEQVFBQm8xQXdUakFkQmdOVkhRNEVGZ1FVc2ltbElS"
+ + "RGNKUjBvZlI3b004S3dIRk9IK3NJd0h3WURWUjBqQkJnd0ZvQVVzaW1sSVJEY0pS"
+ + "MG9mUjdvTThLd0hGT0grc0l3REFZRFZSMFRCQVV3QXdFQi96QU5CZ2txaGtpRzl3"
+ + "MEJBUXNGQUFPQ0FRRUFXUWw4U21iUW9CVjN0ak9KOHpNbGNOMHhPUHBTU05ieDBn"
+ + "N0VML2RRZ0pwZXQwTWNXNjJSSGxnUUFPS2JTM1BSZW8ybnNSQi9aUnlZRHU0aTEz"
+ + "WkhaOGJNc0dPRVM0QlFwejEzbXRtWGc5UmhzWHFMMGVEWWZCY2pqdGxydVVieGhu"
+ + "QUxwNFZOMXpWZHlXQVBDajBldTNNeHBnTVdjeW41MFFtaUpTai9FcXUvbExodmUv"
+ + "d0t2akc1V2huVjh1UktSdUZiRmN0MERIQUhNblpxRkhjR1M1U28wY1luU2ZLNWZi"
+ + "QlJOZWxHZmxocGJiUHAwVjBhWGlxaW5xRDBZZTNPYVpkRnErMnJQMW9DL2E1L091"
+ + "NExzcFkzYjVvRDlyRU5keTdicTBLZXdQRnRnUHZVa0pySjNUemJpd3ZwZ2haN3pH"
+ + "MjZibko1STd1YzR5MVZ1anFhT0E9PSJdfQ.eyJmb28iOiJiYXIifQ.eWzIsJF4PE"
+ + "xQap9HK6Vlz8DGlgGwoiLCtyOEK0Bfu_yHTAZeApn5rh6Uzfx06Gv6eHdM34YL_t"
+ + "gLRb4bjuZVA8xvQ9uHNs8UtpBIOiUcagzvtKyyfCofk5U5sNb54GgVVYxa6p4A1O"
+ + "bdJv1jjlUOnzR8keX5LsAM4Ia7xeqiFh0GER4l0ulVChy_bSn0IeNiKFW7HKcxtc"
+ + "GO_zZTtlv4HiifuyPSk_ar2IDX1w599KXniVcWkQ_W1zcp5YuPDw8mIQDVCH2uQY"
+ + "7qs2ejdZj5LIgIz4CbQ0wg53rlwE7DDQM6MNUgZLnzNmMSMfFrpE7_PQyxe2qJCs"
+ + "ucHODzEHX4Tg";
private static JsonWebSignature jsonWebSignature = null;
@@ -307,8 +309,8 @@ public static JsonWebSignature getJsonWebSignature() throws IOException {
int secondDot = JWS_SIGNATURE.indexOf('.', firstDot + 1);
byte[] signatureBytes = Base64.decodeBase64(JWS_SIGNATURE.substring(secondDot + 1));
byte[] signedContentBytes = StringUtils.getBytesUtf8(JWS_SIGNATURE.substring(0, secondDot));
- JsonWebSignature signature = new JsonWebSignature(
- header, payload, signatureBytes, signedContentBytes);
+ JsonWebSignature signature =
+ new JsonWebSignature(header, payload, signatureBytes, signedContentBytes);
jsonWebSignature = signature;
}
return jsonWebSignature;
diff --git a/google-http-client/src/main/java/com/google/api/client/testing/json/webtoken/package-info.java b/google-http-client/src/main/java/com/google/api/client/testing/json/webtoken/package-info.java
index d5fd7da84..893f89883 100644
--- a/google-http-client/src/main/java/com/google/api/client/testing/json/webtoken/package-info.java
+++ b/google-http-client/src/main/java/com/google/api/client/testing/json/webtoken/package-info.java
@@ -13,7 +13,7 @@
*/
/**
- * {@link com.google.api.client.util.Beta} messages() {
diff --git a/google-http-client/src/main/java/com/google/api/client/testing/util/MockBackOff.java b/google-http-client/src/main/java/com/google/api/client/testing/util/MockBackOff.java
index ba68370ad..cf036a83f 100644
--- a/google-http-client/src/main/java/com/google/api/client/testing/util/MockBackOff.java
+++ b/google-http-client/src/main/java/com/google/api/client/testing/util/MockBackOff.java
@@ -17,16 +17,13 @@
import com.google.api.client.util.BackOff;
import com.google.api.client.util.Beta;
import com.google.api.client.util.Preconditions;
-
import java.io.IOException;
/**
- * {@link Beta}
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @author Yaniv Inbar
* @since 1.15
@@ -58,10 +55,8 @@ public long nextBackOffMillis() throws IOException {
/**
* Sets the fixed back-off milliseconds (defaults to {@code 0}).
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public MockBackOff setBackOffMillis(long backOffMillis) {
Preconditions.checkArgument(backOffMillis == STOP || backOffMillis >= 0);
@@ -72,10 +67,8 @@ public MockBackOff setBackOffMillis(long backOffMillis) {
/**
* Sets the maximum number of tries before returning {@link #STOP} (defaults to {@code 10}).
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public MockBackOff setMaxTries(int maxTries) {
Preconditions.checkArgument(maxTries >= 0);
diff --git a/google-http-client/src/main/java/com/google/api/client/testing/util/MockSleeper.java b/google-http-client/src/main/java/com/google/api/client/testing/util/MockSleeper.java
index 0ac4afb11..dc8fff418 100644
--- a/google-http-client/src/main/java/com/google/api/client/testing/util/MockSleeper.java
+++ b/google-http-client/src/main/java/com/google/api/client/testing/util/MockSleeper.java
@@ -18,12 +18,10 @@
import com.google.api.client.util.Sleeper;
/**
- * {@link Beta}
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @author Yaniv Inbar
* @since 1.15
diff --git a/google-http-client/src/main/java/com/google/api/client/testing/util/SecurityTestUtils.java b/google-http-client/src/main/java/com/google/api/client/testing/util/SecurityTestUtils.java
index 29a39f31e..ca58c38b4 100644
--- a/google-http-client/src/main/java/com/google/api/client/testing/util/SecurityTestUtils.java
+++ b/google-http-client/src/main/java/com/google/api/client/testing/util/SecurityTestUtils.java
@@ -16,7 +16,6 @@
import com.google.api.client.util.Beta;
import com.google.api.client.util.SecurityUtils;
-
import java.security.GeneralSecurityException;
import java.security.KeyFactory;
import java.security.interfaces.RSAPrivateKey;
@@ -26,7 +25,7 @@
import java.security.spec.X509EncodedKeySpec;
/**
- * {@link Beta}
- * Overriding is supported, but overriding method must call the super implementation.
- *
+ * Overriding is supported, but overriding method must call the super implementation.
*/
@Override
public void close() throws IOException {
diff --git a/google-http-client/src/main/java/com/google/api/client/testing/util/TestableByteArrayOutputStream.java b/google-http-client/src/main/java/com/google/api/client/testing/util/TestableByteArrayOutputStream.java
index d1cbe25be..d8daee198 100644
--- a/google-http-client/src/main/java/com/google/api/client/testing/util/TestableByteArrayOutputStream.java
+++ b/google-http-client/src/main/java/com/google/api/client/testing/util/TestableByteArrayOutputStream.java
@@ -15,12 +15,11 @@
package com.google.api.client.testing.util;
import com.google.api.client.util.Beta;
-
import java.io.ByteArrayOutputStream;
import java.io.IOException;
/**
- * {@link Beta}
- * Overriding is supported, but overriding method must call the super implementation.
- *
+ * Overriding is supported, but overriding method must call the super implementation.
*/
@Override
public void close() throws IOException {
diff --git a/google-http-client/src/main/java/com/google/api/client/testing/util/package-info.java b/google-http-client/src/main/java/com/google/api/client/testing/util/package-info.java
index 55fe90904..de6f5502a 100644
--- a/google-http-client/src/main/java/com/google/api/client/testing/util/package-info.java
+++ b/google-http-client/src/main/java/com/google/api/client/testing/util/package-info.java
@@ -13,7 +13,7 @@
*/
/**
- * {@link com.google.api.client.util.Beta}
- * Supports null keys and values. Conceptually, the keys and values are stored in a simpler array in
- * order to minimize memory use and provide for fast access to a key/value at a certain index (for
- * example {@link #getKey(int)}). However, traditional mapping operations like {@link #get(Object)}
- * and {@link #put(Object, Object)} are slower because they need to look up all key/value pairs in
- * the worst case.
- *
+ * Supports null keys and values. Conceptually, the keys and values are stored in a simpler array
+ * in order to minimize memory use and provide for fast access to a key/value at a certain index
+ * (for example {@link #getKey(int)}). However, traditional mapping operations like {@link
+ * #get(Object)} and {@link #put(Object, Object)} are slower because they need to look up all
+ * key/value pairs in the worst case.
*
- *
- * Implementation is not thread-safe. For a thread-safe choice instead use an implementation of
+ *
Implementation is not thread-safe. For a thread-safe choice instead use an implementation of
* {@link ConcurrentMap}.
- *
*
* @param the type of keys maintained by this map
* @param the type of mapped values
- *
* @since 1.0
* @author Yaniv Inbar
*/
@@ -71,8 +66,8 @@ public static ArrayMap create(int initialCapacity) {
* Returns a new instance of an array map of the given key value pairs in alternating order. For
* example: {@code ArrayMap map = ArrayMap.of("key1", "value1", "key2", "value2",
* ...);}.
- *
- * WARNING: there is no compile-time checking of the {@code keyValuePairs} parameter to ensure
+ *
+ *
WARNING: there is no compile-time checking of the {@code keyValuePairs} parameter to ensure
* that the keys or values have the correct type, so if the wrong type is passed in, any problems
* will occur at runtime. Also, there is no checking that the keys are unique, which the caller
* must ensure is true.
@@ -116,10 +111,10 @@ public final V getValue(int index) {
/**
* Sets the key/value mapping at the given index, overriding any existing key/value mapping.
- *
- * There is no checking done to ensure that the key does not already exist. Therefore, this method
- * is dangerous to call unless the caller can be certain the key does not already exist in the
- * map.
+ *
+ *
There is no checking done to ensure that the key does not already exist. Therefore, this
+ * method is dangerous to call unless the caller can be certain the key does not already exist in
+ * the map.
*
* @return previous value or {@code null} for none
* @throws IndexOutOfBoundsException if index is negative
@@ -224,9 +219,7 @@ public final void trim() {
setDataCapacity(this.size << 1);
}
- /**
- * Ensures that the capacity of the internal arrays is at least a given capacity.
- */
+ /** Ensures that the capacity of the internal arrays is at least a given capacity. */
public final void ensureCapacity(int minCapacity) {
if (minCapacity < 0) {
throw new IndexOutOfBoundsException();
@@ -276,9 +269,7 @@ private V valueAtDataIndex(int dataIndex) {
return result;
}
- /**
- * Returns the data index of the given key or {@code -2} if there is no such key.
- */
+ /** Returns the data index of the given key or {@code -2} if there is no such key. */
private int getDataIndexOfKey(Object key) {
int dataSize = this.size << 1;
Object[] data = this.data;
diff --git a/google-http-client/src/main/java/com/google/api/client/util/ArrayValueMap.java b/google-http-client/src/main/java/com/google/api/client/util/ArrayValueMap.java
index 99d3c71aa..07119ab96 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/ArrayValueMap.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/ArrayValueMap.java
@@ -22,23 +22,17 @@
* Collects the array values of a key/value data object, writing the fields or map values only after
* all values have been collected.
*
- *
- * The typical application for this is when parsing JSON or XML when the value type is known to be
- * an array. It stores the values in a collection during the parsing, and only when the parsing of
- * an object is finished does it convert the collection into an array and stores it.
- *
+ * The typical application for this is when parsing JSON or XML when the value type is known to
+ * be an array. It stores the values in a collection during the parsing, and only when the parsing
+ * of an object is finished does it convert the collection into an array and stores it.
*
- *
- * Use {@link #put(String, Class, Object)} when the destination object is a map with string keys and
- * whose values accept an array of objects. Use {@link #put(Field, Class, Object)} when setting the
- * value of a field using reflection, assuming its type accepts an array of objects. One can
+ *
Use {@link #put(String, Class, Object)} when the destination object is a map with string keys
+ * and whose values accept an array of objects. Use {@link #put(Field, Class, Object)} when setting
+ * the value of a field using reflection, assuming its type accepts an array of objects. One can
* potentially use both {@code put} methods for example on an instance of {@link GenericData}.
- *
*
- *
- * Implementation is not thread-safe. For a thread-safe choice instead use an implementation of
+ *
Implementation is not thread-safe. For a thread-safe choice instead use an implementation of
* {@link ConcurrentMap}.
- *
*
* @since 1.4
* @author Yaniv Inbar
@@ -54,9 +48,7 @@ static class ArrayValue {
/** Values to be stored in the array. */
final ArrayList values = new ArrayList();
- /**
- * @param componentType array component type
- */
+ /** @param componentType array component type */
ArrayValue(Class componentType) {
this.componentType = componentType;
}
@@ -87,7 +79,7 @@ void addValue(Class componentType, Object value) {
/**
* @param destination destination object whose fields must be set, or destination map whose values
- * must be set
+ * must be set
*/
public ArrayValueMap(Object destination) {
this.destination = destination;
diff --git a/google-http-client/src/main/java/com/google/api/client/util/BackOff.java b/google-http-client/src/main/java/com/google/api/client/util/BackOff.java
index 8f02134e7..a48c2a570 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/BackOff.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/BackOff.java
@@ -34,17 +34,15 @@ public interface BackOff {
* Gets the number of milliseconds to wait before retrying the operation or {@link #STOP} to
* indicate that no retries should be made.
*
- *
- * Example usage:
- *
+ * Example usage:
*
*
- long backOffMillis = backoff.nextBackOffMillis();
- if (backOffMillis == Backoff.STOP) {
- // do not retry operation
- } else {
- // sleep for backOffMillis milliseconds and retry operation
- }
+ * long backOffMillis = backoff.nextBackOffMillis();
+ * if (backOffMillis == Backoff.STOP) {
+ * // do not retry operation
+ * } else {
+ * // sleep for backOffMillis milliseconds and retry operation
+ * }
*
*/
long nextBackOffMillis() throws IOException;
@@ -53,27 +51,27 @@ public interface BackOff {
* Fixed back-off policy whose back-off time is always zero, meaning that the operation is retried
* immediately without waiting.
*/
- BackOff ZERO_BACKOFF = new BackOff() {
+ BackOff ZERO_BACKOFF =
+ new BackOff() {
- public void reset() throws IOException {
- }
+ public void reset() throws IOException {}
- public long nextBackOffMillis() throws IOException {
- return 0;
- }
- };
+ public long nextBackOffMillis() throws IOException {
+ return 0;
+ }
+ };
/**
* Fixed back-off policy that always returns {@code #STOP} for {@link #nextBackOffMillis()},
* meaning that the operation should not be retried.
*/
- BackOff STOP_BACKOFF = new BackOff() {
+ BackOff STOP_BACKOFF =
+ new BackOff() {
- public void reset() throws IOException {
- }
+ public void reset() throws IOException {}
- public long nextBackOffMillis() throws IOException {
- return STOP;
- }
- };
+ public long nextBackOffMillis() throws IOException {
+ return STOP;
+ }
+ };
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/BackOffUtils.java b/google-http-client/src/main/java/com/google/api/client/util/BackOffUtils.java
index 543060820..8ad9d0ccf 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/BackOffUtils.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/BackOffUtils.java
@@ -17,7 +17,7 @@
import java.io.IOException;
/**
- * {@link Beta}
- * If {@code true}, it will call {@link Sleeper#sleep(long)} with the specified number of
+ *
If {@code true}, it will call {@link Sleeper#sleep(long)} with the specified number of
* milliseconds from {@link BackOff#nextBackOffMillis()}.
- *
*
* @param sleeper sleeper
* @param backOff back-off policy
- * @return whether to continue to back off; in other words, whether
- * {@link BackOff#nextBackOffMillis()} did not return {@link BackOff#STOP}
+ * @return whether to continue to back off; in other words, whether {@link
+ * BackOff#nextBackOffMillis()} did not return {@link BackOff#STOP}
* @throws InterruptedException if any thread has interrupted the current thread
*/
public static boolean next(Sleeper sleeper, BackOff backOff)
@@ -51,6 +49,5 @@ public static boolean next(Sleeper sleeper, BackOff backOff)
return true;
}
- private BackOffUtils() {
- }
+ private BackOffUtils() {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/Base64.java b/google-http-client/src/main/java/com/google/api/client/util/Base64.java
index ac3650f0a..305ab688c 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/Base64.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/Base64.java
@@ -30,7 +30,7 @@ public class Base64 {
*
* @param binaryData binary data to encode or {@code null} for {@code null} result
* @return byte[] containing Base64 characters in their UTF-8 representation or {@code null} for
- * {@code null} input
+ * {@code null} input
*/
public static byte[] encodeBase64(byte[] binaryData) {
return StringUtils.getBytesUtf8(encodeBase64String(binaryData));
@@ -46,14 +46,13 @@ public static String encodeBase64String(byte[] binaryData) {
return BaseEncoding.base64().encode(binaryData);
}
-
/**
* Encodes binary data using a URL-safe variation of the base64 algorithm but does not chunk the
* output. The url-safe variation emits - and _ instead of + and / characters.
*
* @param binaryData binary data to encode or {@code null} for {@code null} result
* @return byte[] containing Base64 characters in their UTF-8 representation or {@code null} for
- * {@code null} input
+ * {@code null} input
*/
public static byte[] encodeBase64URLSafe(byte[] binaryData) {
return StringUtils.getBytesUtf8(encodeBase64URLSafeString(binaryData));
@@ -71,8 +70,8 @@ public static String encodeBase64URLSafeString(byte[] binaryData) {
}
/**
- * Decodes Base64 data into octets. Note that this method handles both URL-safe and
- * non-URL-safe base 64 encoded inputs.
+ * Decodes Base64 data into octets. Note that this method handles both URL-safe and non-URL-safe
+ * base 64 encoded inputs.
*
* @param base64Data Byte array containing Base64 data or {@code null} for {@code null} result
* @return Array containing decoded data or {@code null} for {@code null} input
@@ -99,6 +98,5 @@ public static byte[] decodeBase64(String base64String) {
}
}
- private Base64() {
- }
+ private Base64() {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/Beta.java b/google-http-client/src/main/java/com/google/api/client/util/Beta.java
index 2ac456c75..c5f6e3d1b 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/Beta.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/Beta.java
@@ -21,40 +21,35 @@
/**
* Use this annotation to indicate that a public API (class, method or field) is beta.
*
- *
- * Beta API is subject to incompatible changes or removal in the future. It may also mean
- * that the server features it depends on are potentially subject to breakage at any time.
- *
+ * Beta API is subject to incompatible changes or removal in the future. It may also mean that
+ * the server features it depends on are potentially subject to breakage at any time.
*
- *
- * That API is exempt from any compatibility guarantees made by its containing library. Read
+ *
That API is exempt from any compatibility guarantees made by its containing library. Read
* carefully the JavaDoc of the API bearing this annotation for better understanding of the risk.
- *
*
- *
- * To provide a smoother upgrade path when we make incompatible changes to beta API,
- * whenever possible we try to deprecate the old beta API in the first minor release, and
- * then remove it in the second minor release.
- *
+ * To provide a smoother upgrade path when we make incompatible changes to beta API, whenever
+ * possible we try to deprecate the old beta API in the first minor release, and then remove it in
+ * the second minor release.
*
- *
- * It is generally inadvisable for other non-beta libraries to use beta API from
- * this library. The problem is that other libraries don't have control over the version of this
- * library being used in client applications, and if the wrong version of this library is used, it
- * has the potential to break client applications.
- *
+ * It is generally inadvisable for other non-beta libraries to use beta API from this library.
+ * The problem is that other libraries don't have control over the version of this library being
+ * used in client applications, and if the wrong version of this library is used, it has the
+ * potential to break client applications.
*
- *
- * You may use the google-http-client-findbugs plugin to find usages of API bearing this annotation.
- *
+ * You may use the google-http-client-findbugs plugin to find usages of API bearing this
+ * annotation.
*
* @since 1.15
* @author Eyal Peled
*/
-@Target(value = {
- ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.METHOD,
- ElementType.TYPE, ElementType.PACKAGE})
+@Target(
+ value = {
+ ElementType.ANNOTATION_TYPE,
+ ElementType.CONSTRUCTOR,
+ ElementType.FIELD,
+ ElementType.METHOD,
+ ElementType.TYPE,
+ ElementType.PACKAGE
+ })
@Documented
-public @interface Beta {
-
-}
+public @interface Beta {}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/ByteArrayStreamingContent.java b/google-http-client/src/main/java/com/google/api/client/util/ByteArrayStreamingContent.java
index 6ec69a488..24939307d 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/ByteArrayStreamingContent.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/ByteArrayStreamingContent.java
@@ -20,9 +20,7 @@
/**
* Streaming content whose source is a byte array.
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.14
* @author Yaniv Inbar
@@ -38,9 +36,7 @@ public class ByteArrayStreamingContent implements StreamingContent {
/** Length of bytes to read from byte array. */
private final int length;
- /**
- * @param byteArray byte array content
- */
+ /** @param byteArray byte array content */
public ByteArrayStreamingContent(byte[] byteArray) {
this(byteArray, 0, byteArray.length);
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/ByteStreams.java b/google-http-client/src/main/java/com/google/api/client/util/ByteStreams.java
index 7c3a4c3e7..00f7702cb 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/ByteStreams.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/ByteStreams.java
@@ -22,10 +22,8 @@
/**
* Provides utility methods for working with byte arrays and I/O streams.
*
- *
- * NOTE: this is a copy of a subset of Guava's {@link com.google.common.io.ByteStreams}. The
+ *
NOTE: this is a copy of a subset of Guava's {@link com.google.common.io.ByteStreams}. The
* implementation must match as closely as possible to Guava's implementation.
- *
*
* @since 1.14
* @author Yaniv Inbar
@@ -145,24 +143,18 @@ public long skip(long n) throws IOException {
/**
* Reads some bytes from an input stream and stores them into the buffer array {@code b}.
*
- *
- * This method blocks until {@code len} bytes of input data have been read into the array, or end
- * of file is detected. The number of bytes read is returned, possibly zero. Does not close the
- * stream.
- *
+ * This method blocks until {@code len} bytes of input data have been read into the array, or
+ * end of file is detected. The number of bytes read is returned, possibly zero. Does not close
+ * the stream.
*
- *
- * A caller can detect EOF if the number of bytes read is less than {@code len}. All subsequent
+ *
A caller can detect EOF if the number of bytes read is less than {@code len}. All subsequent
* calls on the same stream will return zero.
- *
*
- *
- * If {@code b} is null, a {@code NullPointerException} is thrown. If {@code off} is negative, or
- * {@code len} is negative, or {@code off+len} is greater than the length of the array {@code b},
- * then an {@code IndexOutOfBoundsException} is thrown. If {@code len} is zero, then no bytes are
- * read. Otherwise, the first byte read is stored into element {@code b[off]}, the next one into
- * {@code b[off+1]}, and so on. The number of bytes read is, at most, equal to {@code len}.
- *
+ * If {@code b} is null, a {@code NullPointerException} is thrown. If {@code off} is negative,
+ * or {@code len} is negative, or {@code off+len} is greater than the length of the array {@code
+ * b}, then an {@code IndexOutOfBoundsException} is thrown. If {@code len} is zero, then no bytes
+ * are read. Otherwise, the first byte read is stored into element {@code b[off]}, the next one
+ * into {@code b[off+1]}, and so on. The number of bytes read is, at most, equal to {@code len}.
*
* @param in the input stream to read from
* @param b the buffer into which the data is read
@@ -187,6 +179,5 @@ public static int read(InputStream in, byte[] b, int off, int len) throws IOExce
return total;
}
- private ByteStreams() {
- }
+ private ByteStreams() {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/Charsets.java b/google-http-client/src/main/java/com/google/api/client/util/Charsets.java
index 322fb9fc1..ecc460dec 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/Charsets.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/Charsets.java
@@ -20,10 +20,8 @@
* Contains constant definitions for some standard {@link Charset} instances that are guaranteed to
* be supported by all Java platform implementations.
*
- *
- * NOTE: this is a copy of a subset of Guava's {@link com.google.common.base.Charsets}. The
+ *
NOTE: this is a copy of a subset of Guava's {@link com.google.common.base.Charsets}. The
* implementation must match as closely as possible to Guava's implementation.
- *
*
* @since 1.14
* @author Yaniv Inbar
@@ -36,6 +34,5 @@ public final class Charsets {
/** ISO-8859-1 charset. */
public static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
- private Charsets() {
- }
+ private Charsets() {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/ClassInfo.java b/google-http-client/src/main/java/com/google/api/client/util/ClassInfo.java
index 16c71dda7..4fe7c891b 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/ClassInfo.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/ClassInfo.java
@@ -29,9 +29,7 @@
/**
* Computes class information to determine data key name/value pairs associated with the class.
*
- *
- * Implementation is thread-safe.
- *
+ * Implementation is thread-safe.
*
* @since 1.0
* @author Yaniv Inbar
@@ -150,8 +148,8 @@ public boolean isEnum() {
}
/**
- * Returns an unmodifiable sorted set (with any possible {@code null} member first) of
- * {@link FieldInfo#getName() names}.
+ * Returns an unmodifiable sorted set (with any possible {@code null} member first) of {@link
+ * FieldInfo#getName() names}.
*/
public Collection getNames() {
return names;
@@ -163,11 +161,15 @@ private ClassInfo(Class srcClass, boolean ignoreCase) {
Preconditions.checkArgument(
!ignoreCase || !srcClass.isEnum(), "cannot ignore case on an enum: " + srcClass);
// name set has a special comparator to keep null first
- TreeSet nameSet = new TreeSet(new Comparator() {
- public int compare(String s0, String s1) {
- return Objects.equal(s0, s1) ? 0 : s0 == null ? -1 : s1 == null ? 1 : s0.compareTo(s1);
- }
- });
+ TreeSet nameSet =
+ new TreeSet(
+ new Comparator() {
+ public int compare(String s0, String s1) {
+ return Objects.equal(s0, s1)
+ ? 0
+ : s0 == null ? -1 : s1 == null ? 1 : s0.compareTo(s1);
+ }
+ });
// iterate over declared fields
for (Field field : srcClass.getDeclaredFields()) {
FieldInfo fieldInfo = FieldInfo.of(field);
@@ -179,7 +181,8 @@ public int compare(String s0, String s1) {
fieldName = fieldName.toLowerCase(Locale.US).intern();
}
FieldInfo conflictingFieldInfo = nameToFieldInfoMap.get(fieldName);
- Preconditions.checkArgument(conflictingFieldInfo == null,
+ Preconditions.checkArgument(
+ conflictingFieldInfo == null,
"two fields have the same %sname <%s>: %s and %s",
ignoreCase ? "case-insensitive " : "",
fieldName,
@@ -200,17 +203,18 @@ public int compare(String s0, String s1) {
}
}
}
- names = nameSet.isEmpty() ? Collections.emptyList() : Collections.unmodifiableList(
- new ArrayList(nameSet));
+ names =
+ nameSet.isEmpty()
+ ? Collections.emptyList()
+ : Collections.unmodifiableList(new ArrayList(nameSet));
}
/**
* Returns an unmodifiable collection of the {@code FieldInfo}s for this class, without any
* guarantee of order.
*
- *
- * If you need sorted order, instead use {@link #getNames()} with {@link #getFieldInfo(String)}.
- *
+ * If you need sorted order, instead use {@link #getNames()} with {@link
+ * #getFieldInfo(String)}.
*
* @since 1.16
*/
diff --git a/google-http-client/src/main/java/com/google/api/client/util/Clock.java b/google-http-client/src/main/java/com/google/api/client/util/Clock.java
index d1d18b88f..61242dc76 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/Clock.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/Clock.java
@@ -17,10 +17,8 @@
/**
* Clock which can be used to get the amount of elapsed milliseconds in system time.
*
- *
- * The default system implementation can be accessed at {@link #SYSTEM}. Alternative implementations
- * may be used for testing.
- *
+ * The default system implementation can be accessed at {@link #SYSTEM}. Alternative
+ * implementations may be used for testing.
*
* @since 1.9
* @author mlinder@google.com (Matthias Linder)
@@ -33,12 +31,13 @@ public interface Clock {
long currentTimeMillis();
/**
- * Provides the default System implementation of a Clock by using
- * {@link System#currentTimeMillis()}.
+ * Provides the default System implementation of a Clock by using {@link
+ * System#currentTimeMillis()}.
*/
- Clock SYSTEM = new Clock() {
- public long currentTimeMillis() {
- return System.currentTimeMillis();
- }
- };
+ Clock SYSTEM =
+ new Clock() {
+ public long currentTimeMillis() {
+ return System.currentTimeMillis();
+ }
+ };
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/Collections2.java b/google-http-client/src/main/java/com/google/api/client/util/Collections2.java
index ee565c62b..5cd920446 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/Collections2.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/Collections2.java
@@ -19,10 +19,8 @@
/**
* Static utility methods pertaining to {@link Collection} instances.
*
- *
- * NOTE: this is a copy of a subset of Guava's {@link com.google.common.collect.Collections2}. The
- * implementation must match as closely as possible to Guava's implementation.
- *
+ * NOTE: this is a copy of a subset of Guava's {@link com.google.common.collect.Collections2}.
+ * The implementation must match as closely as possible to Guava's implementation.
*
* @since 1.14
* @author Yaniv Inbar
@@ -34,6 +32,5 @@ static Collection cast(Iterable iterable) {
return (Collection) iterable;
}
- private Collections2() {
- }
+ private Collections2() {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/Data.java b/google-http-client/src/main/java/com/google/api/client/util/Data.java
index d4b67e02c..88b294cea 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/Data.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/Data.java
@@ -83,6 +83,7 @@ public class Data {
/** Cache of the magic null object for the given Java class. */
private static final ConcurrentHashMap, Object> NULL_CACHE =
new ConcurrentHashMap, Object>();
+
static {
// special cases for some primitives
NULL_CACHE.put(Boolean.class, NULL_BOOLEAN);
@@ -159,17 +160,15 @@ public static boolean isNull(Object object) {
* Returns the map to use for the given data that is treated as a map from string key to some
* value.
*
- *
- * If the input is {@code null}, it returns an empty map. If the input is a map, it simply returns
- * the input. Otherwise, it will create a map view using reflection that is backed by the object,
- * so that any changes to the map will be reflected on the object. The map keys of that map view
- * are based on the {@link Key} annotation, and null is not a possible map value, although the
- * magic null instance is possible (see {@link #nullOf(Class)} and {@link #isNull(Object)}).
- * Iteration order of the data keys is based on the sorted (ascending) key names of the declared
- * fields. Note that since the map view is backed by the object, and that the object may change,
- * many methods in the map view must recompute the field values using reflection, for example
- * {@link Map#size()} must check the number of non-null fields.
- *
+ * If the input is {@code null}, it returns an empty map. If the input is a map, it simply
+ * returns the input. Otherwise, it will create a map view using reflection that is backed by the
+ * object, so that any changes to the map will be reflected on the object. The map keys of that
+ * map view are based on the {@link Key} annotation, and null is not a possible map value,
+ * although the magic null instance is possible (see {@link #nullOf(Class)} and {@link
+ * #isNull(Object)}). Iteration order of the data keys is based on the sorted (ascending) key
+ * names of the declared fields. Note that since the map view is backed by the object, and that
+ * the object may change, many methods in the map view must recompute the field values using
+ * reflection, for example {@link Map#size()} must check the number of non-null fields.
*
* @param data any key value data, represented by an object or a map, or {@code null}
* @return key/value map to use
@@ -190,16 +189,14 @@ public static Map mapOf(Object data) {
/**
* Returns a deep clone of the given key/value data, such that the result is a completely
* independent copy.
- *
- * This should not be used directly in the implementation of {@code Object.clone()}. Instead use
- * {@link #deepCopy(Object, Object)} for that purpose.
- *
- *
- * Final fields cannot be changed and therefore their value won't be copied.
- *
+ *
+ * This should not be used directly in the implementation of {@code Object.clone()}. Instead
+ * use {@link #deepCopy(Object, Object)} for that purpose.
+ *
+ *
Final fields cannot be changed and therefore their value won't be copied.
*
* @param data key/value data object or map to clone or {@code null} for a {@code null} return
- * value
+ * value
* @return deep clone or {@code null} for {@code null} input
*/
@SuppressWarnings("unchecked")
@@ -236,30 +233,27 @@ public static T clone(T data) {
* Makes a deep copy of the given source object into the destination object that is assumed to be
* constructed using {@code Object.clone()}.
*
- *
- * Example usage of this method in {@code Object.clone()}:
- *
+ * Example usage of this method in {@code Object.clone()}:
*
*
- @Override
- public MyObject clone() {
- try {
- @SuppressWarnings("unchecked")
- MyObject result = (MyObject) super.clone();
- Data.deepCopy(this, result);
- return result;
- } catch (CloneNotSupportedException e) {
- throw new IllegalStateException(e);
- }
- }
+ * @Override
+ * public MyObject clone() {
+ * try {
+ * @SuppressWarnings("unchecked")
+ * MyObject result = (MyObject) super.clone();
+ * Data.deepCopy(this, result);
+ * return result;
+ * } catch (CloneNotSupportedException e) {
+ * throw new IllegalStateException(e);
+ * }
+ * }
*
- *
- * Final fields cannot be changed and therefore their value won't be copied.
- *
+ *
+ * Final fields cannot be changed and therefore their value won't be copied.
*
* @param src source object
* @param dest destination object of identical type as source object, and any contained arrays
- * must be the same length
+ * must be the same length
*/
public static void deepCopy(Object src, Object dest) {
Class srcClass = src.getClass();
@@ -332,12 +326,10 @@ public static void deepCopy(Object src, Object dest) {
* Returns whether the given type is one of the supported primitive classes like number and
* date/time, or is a wildcard of one.
*
- *
- * A primitive class is any class for whom {@link Class#isPrimitive()} is true, as well as any
- * classes of type: {@link Character}, {@link String}, {@link Integer}, {@link Long},
- * {@link Short}, {@link Byte}, {@link Float}, {@link Double}, {@link BigInteger},
- * {@link BigDecimal}, {@link Boolean}, and {@link DateTime}.
- *
+ * A primitive class is any class for whom {@link Class#isPrimitive()} is true, as well as any
+ * classes of type: {@link Character}, {@link String}, {@link Integer}, {@link Long}, {@link
+ * Short}, {@link Byte}, {@link Float}, {@link Double}, {@link BigInteger}, {@link BigDecimal},
+ * {@link Boolean}, and {@link DateTime}.
*
* @param type type or {@code null} for {@code false} result
* @return whether it is a primitive
@@ -351,16 +343,24 @@ public static boolean isPrimitive(Type type) {
return false;
}
Class typeClass = (Class) type;
- return typeClass.isPrimitive() || typeClass == Character.class || typeClass == String.class
- || typeClass == Integer.class || typeClass == Long.class || typeClass == Short.class
- || typeClass == Byte.class || typeClass == Float.class || typeClass == Double.class
- || typeClass == BigInteger.class || typeClass == BigDecimal.class
- || typeClass == DateTime.class || typeClass == Boolean.class;
+ return typeClass.isPrimitive()
+ || typeClass == Character.class
+ || typeClass == String.class
+ || typeClass == Integer.class
+ || typeClass == Long.class
+ || typeClass == Short.class
+ || typeClass == Byte.class
+ || typeClass == Float.class
+ || typeClass == Double.class
+ || typeClass == BigInteger.class
+ || typeClass == BigDecimal.class
+ || typeClass == DateTime.class
+ || typeClass == Boolean.class;
}
/**
- * Returns whether to given value is {@code null} or its class is primitive as defined by
- * {@link Data#isPrimitive(Type)}.
+ * Returns whether to given value is {@code null} or its class is primitive as defined by {@link
+ * Data#isPrimitive(Type)}.
*/
public static boolean isValueOfPrimitiveType(Object fieldValue) {
return fieldValue == null || Data.isPrimitive(fieldValue.getClass());
@@ -368,29 +368,27 @@ public static boolean isValueOfPrimitiveType(Object fieldValue) {
/**
* Parses the given string value based on the given primitive type.
- *
- * Types are parsed as follows:
- *
+ *
+ * Types are parsed as follows:
+ *
*
- * {@link Void}: null
- * {@code null} or is assignable from {@link String} (like {@link Object}): no parsing
- * {@code char} or {@link Character}: {@link String#charAt(int) String.charAt}(0) (requires
- * length to be exactly 1)
- * {@code boolean} or {@link Boolean}: {@link Boolean#valueOf(String)}
- * {@code byte} or {@link Byte}: {@link Byte#valueOf(String)}
- * {@code short} or {@link Short}: {@link Short#valueOf(String)}
- * {@code int} or {@link Integer}: {@link Integer#valueOf(String)}
- * {@code long} or {@link Long}: {@link Long#valueOf(String)}
- * {@code float} or {@link Float}: {@link Float#valueOf(String)}
- * {@code double} or {@link Double}: {@link Double#valueOf(String)}
- * {@link BigInteger}: {@link BigInteger#BigInteger(String) BigInteger(String)}
- * {@link BigDecimal}: {@link BigDecimal#BigDecimal(String) BigDecimal(String)}
- * {@link DateTime}: {@link DateTime#parseRfc3339(String)}
+ * {@link Void}: null
+ * {@code null} or is assignable from {@link String} (like {@link Object}): no parsing
+ * {@code char} or {@link Character}: {@link String#charAt(int) String.charAt}(0) (requires
+ * length to be exactly 1)
+ * {@code boolean} or {@link Boolean}: {@link Boolean#valueOf(String)}
+ * {@code byte} or {@link Byte}: {@link Byte#valueOf(String)}
+ * {@code short} or {@link Short}: {@link Short#valueOf(String)}
+ * {@code int} or {@link Integer}: {@link Integer#valueOf(String)}
+ * {@code long} or {@link Long}: {@link Long#valueOf(String)}
+ * {@code float} or {@link Float}: {@link Float#valueOf(String)}
+ * {@code double} or {@link Double}: {@link Double#valueOf(String)}
+ * {@link BigInteger}: {@link BigInteger#BigInteger(String) BigInteger(String)}
+ * {@link BigDecimal}: {@link BigDecimal#BigDecimal(String) BigDecimal(String)}
+ * {@link DateTime}: {@link DateTime#parseRfc3339(String)}
*
*
- *
- * Note that this may not be the right behavior for some use cases.
- *
+ * Note that this may not be the right behavior for some use cases.
*
* @param type primitive type or {@code null} to parse as a string
* @param stringValue string value to parse or {@code null} for {@code null} result
@@ -403,7 +401,8 @@ public static Object parsePrimitiveValue(Type type, String stringValue) {
if (primitiveClass == Void.class) {
return null;
}
- if (stringValue == null || primitiveClass == null
+ if (stringValue == null
+ || primitiveClass == null
|| primitiveClass.isAssignableFrom(String.class)) {
return stringValue;
}
@@ -446,8 +445,8 @@ public static Object parsePrimitiveValue(Type type, String stringValue) {
}
if (primitiveClass.isEnum()) {
if (!ClassInfo.of(primitiveClass).names.contains(stringValue)) {
- throw new IllegalArgumentException(String.format("given enum name %s not part of " +
- "enumeration", stringValue));
+ throw new IllegalArgumentException(
+ String.format("given enum name %s not part of " + "enumeration", stringValue));
}
@SuppressWarnings({"unchecked", "rawtypes"})
Enum result = ClassInfo.of(primitiveClass).getFieldInfo(stringValue).enumValue();
@@ -459,15 +458,16 @@ public static Object parsePrimitiveValue(Type type, String stringValue) {
/**
* Returns a new collection instance for the given type.
- *
- * Creates a new collection instance specified for the first input collection class that matches
- * as follows:
+ *
+ *
Creates a new collection instance specified for the first input collection class that
+ * matches as follows:
+ *
*
- * {@code null} or an array or assignable from {@link ArrayList} (like {@link List} or
- * {@link Collection} or {@link Object}): returns an {@link ArrayList}
- * assignable from {@link HashSet}: returns a {@link HashSet}
- * assignable from {@link TreeSet}: returns a {@link TreeSet}
- * else: calls {@link Types#newInstance(Class)}
+ * {@code null} or an array or assignable from {@link ArrayList} (like {@link List} or
+ * {@link Collection} or {@link Object}): returns an {@link ArrayList}
+ * assignable from {@link HashSet}: returns a {@link HashSet}
+ * assignable from {@link TreeSet}: returns a {@link TreeSet}
+ * else: calls {@link Types#newInstance(Class)}
*
*
* @param type type or {@code null} for {@link ArrayList}.
@@ -482,8 +482,10 @@ public static Collection newCollectionInstance(Type type) {
type = ((ParameterizedType) type).getRawType();
}
Class collectionClass = type instanceof Class ? (Class) type : null;
- if (type == null || type instanceof GenericArrayType || collectionClass != null
- && (collectionClass.isArray() || collectionClass.isAssignableFrom(ArrayList.class))) {
+ if (type == null
+ || type instanceof GenericArrayType
+ || collectionClass != null
+ && (collectionClass.isArray() || collectionClass.isAssignableFrom(ArrayList.class))) {
return new ArrayList();
}
if (collectionClass == null) {
@@ -502,14 +504,14 @@ public static Collection newCollectionInstance(Type type) {
/**
* Returns a new instance of a map based on the given field class.
- *
- * Creates a new map instance specified for the first input map class that matches as follows:
- *
+ *
+ * Creates a new map instance specified for the first input map class that matches as follows:
+ *
*
- * {@code null} or assignable from {@link ArrayMap} (like {@link Map} or {@link Object}):
- * returns an {@link ArrayMap}
- * assignable from {@link TreeMap} (like {@link SortedMap}): returns a {@link TreeMap}
- * else: calls {@link Types#newInstance(Class)}
+ * {@code null} or assignable from {@link ArrayMap} (like {@link Map} or {@link Object}):
+ * returns an {@link ArrayMap}
+ * assignable from {@link TreeMap} (like {@link SortedMap}): returns a {@link TreeMap}
+ * else: calls {@link Types#newInstance(Class)}
*
*
* @param mapClass field class
@@ -533,10 +535,10 @@ public static Map newMapInstance(Class mapClass) {
* resolved.
*
* @param context context list, ordering from least specific to most specific type context, for
- * example container class and then its field
+ * example container class and then its field
* @param type type or {@code null} for {@code null} result
* @return resolved type (which may be class, parameterized type, or generic array type, but not
- * wildcard type or type variable) or {@code null} for {@code null} input
+ * wildcard type or type variable) or {@code null} for {@code null} input
*/
public static Type resolveWildcardTypeOrTypeVariable(List context, Type type) {
// first deal with a wildcard, e.g. ? extends Number
diff --git a/google-http-client/src/main/java/com/google/api/client/util/DataMap.java b/google-http-client/src/main/java/com/google/api/client/util/DataMap.java
index 3432c1827..a858bf1db 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/DataMap.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/DataMap.java
@@ -22,8 +22,8 @@
import java.util.NoSuchElementException;
/**
- * Map that uses {@link ClassInfo} to parse the key/value pairs into a map for use in
- * {@link Data#mapOf(Object)}.
+ * Map that uses {@link ClassInfo} to parse the key/value pairs into a map for use in {@link
+ * Data#mapOf(Object)}.
*
* @author Yaniv Inbar
*/
@@ -37,9 +37,7 @@ final class DataMap extends AbstractMap {
/** Object's class info. */
final ClassInfo classInfo;
- /**
- * @param object object being reflected
- */
+ /** @param object object being reflected */
DataMap(Object object, boolean ignoreCase) {
this.object = object;
classInfo = ClassInfo.of(object.getClass(), ignoreCase);
@@ -117,8 +115,8 @@ public boolean isEmpty() {
final class EntryIterator implements Iterator> {
/**
- * Next index into key names array computed in {@link #hasNext()} or {@code -1} before
- * {@link #hasNext()} has been called.
+ * Next index into key names array computed in {@link #hasNext()} or {@code -1} before {@link
+ * #hasNext()} has been called.
*/
private int nextKeyIndex = -1;
@@ -180,16 +178,14 @@ public void remove() {
/**
* Entry in the reflection map.
- *
- * Null key or value is not allowed.
- *
+ *
+ * Null key or value is not allowed.
*/
final class Entry implements Map.Entry {
/**
- * Current field value, possibly modified only by {@link #setValue(Object)}. As specified
- * {@link java.util.Map.Entry}, behavior is undefined if the field value is modified by other
- * means.
+ * Current field value, possibly modified only by {@link #setValue(Object)}. As specified {@link
+ * java.util.Map.Entry}, behavior is undefined if the field value is modified by other means.
*/
private Object fieldValue;
diff --git a/google-http-client/src/main/java/com/google/api/client/util/DateTime.java b/google-http-client/src/main/java/com/google/api/client/util/DateTime.java
index 0417b4282..bd071b327 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/DateTime.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/DateTime.java
@@ -27,9 +27,7 @@
* Immutable representation of a date with an optional time and an optional time zone based on RFC 3339 .
*
- *
- * Implementation is immutable and therefore thread-safe.
- *
+ * Implementation is immutable and therefore thread-safe.
*
* @since 1.0
* @author Yaniv Inbar
@@ -41,18 +39,18 @@ public final class DateTime implements Serializable {
private static final TimeZone GMT = TimeZone.getTimeZone("GMT");
/** Regular expression for parsing RFC3339 date/times. */
- private static final Pattern RFC3339_PATTERN = Pattern.compile(
- "^(\\d{4})-(\\d{2})-(\\d{2})" // yyyy-MM-dd
- + "([Tt](\\d{2}):(\\d{2}):(\\d{2})(\\.\\d+)?)?" // 'T'HH:mm:ss.milliseconds
- + "([Zz]|([+-])(\\d{2}):(\\d{2}))?"); // 'Z' or time zone shift HH:mm following '+' or '-'
+ private static final Pattern RFC3339_PATTERN =
+ Pattern.compile(
+ "^(\\d{4})-(\\d{2})-(\\d{2})" // yyyy-MM-dd
+ + "([Tt](\\d{2}):(\\d{2}):(\\d{2})(\\.\\d+)?)?" // 'T'HH:mm:ss.milliseconds
+ + "([Zz]|([+-])(\\d{2}):(\\d{2}))?"); // 'Z' or time zone shift HH:mm following '+' or
+ // '-'
/**
* Date/time value expressed as the number of ms since the Unix epoch.
*
- *
- * If the time zone is specified, this value is normalized to UTC, so to format this date/time
+ *
If the time zone is specified, this value is normalized to UTC, so to format this date/time
* value, the time zone shift has to be applied.
- *
*/
private final long value;
@@ -75,10 +73,8 @@ public DateTime(Date date, TimeZone zone) {
/**
* Instantiates {@link DateTime} from the number of milliseconds since the Unix epoch.
*
- *
- * The time zone is interpreted as {@code TimeZone.getDefault()}, which may vary with
+ *
The time zone is interpreted as {@code TimeZone.getDefault()}, which may vary with
* implementation.
- *
*
* @param value number of milliseconds since the Unix epoch (January 1, 1970, 00:00:00 GMT)
*/
@@ -89,10 +85,8 @@ public DateTime(long value) {
/**
* Instantiates {@link DateTime} from a {@link Date}.
*
- *
- * The time zone is interpreted as {@code TimeZone.getDefault()}, which may vary with
+ *
The time zone is interpreted as {@code TimeZone.getDefault()}, which may vary with
* implementation.
- *
*
* @param value date and time
*/
@@ -118,7 +112,7 @@ public DateTime(long value, int tzShift) {
* @param dateOnly specifies if this should represent a date-only value
* @param value number of milliseconds since the Unix epoch (January 1, 1970, 00:00:00 GMT)
* @param tzShift time zone, represented by the number of minutes off of UTC, or {@code null} for
- * {@code TimeZone.getDefault()}.
+ * {@code TimeZone.getDefault()}.
*/
public DateTime(boolean dateOnly, long value, Integer tzShift) {
this.dateOnly = dateOnly;
@@ -131,14 +125,12 @@ public DateTime(boolean dateOnly, long value, Integer tzShift) {
* Instantiates {@link DateTime} from an RFC 3339
* date/time value.
*
- *
- * Upgrade warning: in prior version 1.17, this method required milliseconds to be exactly 3
+ *
Upgrade warning: in prior version 1.17, this method required milliseconds to be exactly 3
* digits (if included), and did not throw an exception for all types of invalid input values, but
* starting in version 1.18, the parsing done by this method has become more strict to enforce
- * that only valid RFC3339 strings are entered, and if not, it throws a
- * {@link NumberFormatException}. Also, in accordance with the RFC3339 standard, any number of
+ * that only valid RFC3339 strings are entered, and if not, it throws a {@link
+ * NumberFormatException}. Also, in accordance with the RFC3339 standard, any number of
* milliseconds digits is now allowed.
- *
*
* @param value an RFC 3339 date/time value.
* @since 1.11
@@ -156,10 +148,8 @@ public DateTime(String value) {
/**
* Returns the date/time value expressed as the number of milliseconds since the Unix epoch.
*
- *
- * If the time zone is specified, this value is normalized to UTC, so to format this date/time
+ *
If the time zone is specified, this value is normalized to UTC, so to format this date/time
* value, the time zone shift has to be applied.
- *
*
* @since 1.5
*/
@@ -240,10 +230,8 @@ public String toString() {
/**
* {@inheritDoc}
*
- *
- * A check is added that the time zone is the same. If you ONLY want to check equality of time
+ *
A check is added that the time zone is the same. If you ONLY want to check equality of time
* value, check equality on the {@link #getValue()}.
- *
*/
@Override
public boolean equals(Object o) {
@@ -265,24 +253,20 @@ public int hashCode() {
/**
* Parses an RFC3339 date/time value.
*
- *
- * Upgrade warning: in prior version 1.17, this method required milliseconds to be exactly 3
+ *
Upgrade warning: in prior version 1.17, this method required milliseconds to be exactly 3
* digits (if included), and did not throw an exception for all types of invalid input values, but
* starting in version 1.18, the parsing done by this method has become more strict to enforce
- * that only valid RFC3339 strings are entered, and if not, it throws a
- * {@link NumberFormatException}. Also, in accordance with the RFC3339 standard, any number of
+ * that only valid RFC3339 strings are entered, and if not, it throws a {@link
+ * NumberFormatException}. Also, in accordance with the RFC3339 standard, any number of
* milliseconds digits is now allowed.
- *
*
- *
- * For the date-only case, the time zone is ignored and the hourOfDay, minute, second, and
+ *
For the date-only case, the time zone is ignored and the hourOfDay, minute, second, and
* millisecond parameters are set to zero.
- *
*
* @param str Date/time string in RFC3339 format
* @throws NumberFormatException if {@code str} doesn't match the RFC3339 standard format; an
- * exception is thrown if {@code str} doesn't match {@code RFC3339_REGEX} or if it
- * contains a time zone shift but no time.
+ * exception is thrown if {@code str} doesn't match {@code RFC3339_REGEX} or if it contains a
+ * time zone shift but no time.
*/
public static DateTime parseRfc3339(String str) throws NumberFormatException {
Matcher matcher = RFC3339_PATTERN.matcher(str);
@@ -303,8 +287,10 @@ public static DateTime parseRfc3339(String str) throws NumberFormatException {
Integer tzShiftInteger = null;
if (isTzShiftGiven && !isTimeGiven) {
- throw new NumberFormatException("Invalid date/time format, cannot specify time zone shift" +
- " without specifying time: " + str);
+ throw new NumberFormatException(
+ "Invalid date/time format, cannot specify time zone shift"
+ + " without specifying time: "
+ + str);
}
if (isTimeGiven) {
@@ -328,8 +314,9 @@ public static DateTime parseRfc3339(String str) throws NumberFormatException {
if (Character.toUpperCase(tzShiftRegexGroup.charAt(0)) == 'Z') {
tzShift = 0;
} else {
- tzShift = Integer.parseInt(matcher.group(11)) * 60 // time zone shift HH
- + Integer.parseInt(matcher.group(12)); // time zone shift mm
+ tzShift =
+ Integer.parseInt(matcher.group(11)) * 60 // time zone shift HH
+ + Integer.parseInt(matcher.group(12)); // time zone shift mm
if (matcher.group(10).charAt(0) == '-') { // time zone shift + or -
tzShift = -tzShift;
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/ExponentialBackOff.java b/google-http-client/src/main/java/com/google/api/client/util/ExponentialBackOff.java
index c949b6f23..12e744542 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/ExponentialBackOff.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/ExponentialBackOff.java
@@ -20,56 +20,44 @@
* Implementation of {@link BackOff} that increases the back off period for each retry attempt using
* a randomization function that grows exponentially.
*
- *
- * {@link #nextBackOffMillis()} is calculated using the following formula:
- *
+ * {@link #nextBackOffMillis()} is calculated using the following formula:
*
*
- randomized_interval =
- retry_interval * (random value in range [1 - randomization_factor, 1 + randomization_factor])
+ * randomized_interval =
+ * retry_interval * (random value in range [1 - randomization_factor, 1 + randomization_factor])
*
*
- *
- * In other words {@link #nextBackOffMillis()} will range between the randomization factor
+ *
In other words {@link #nextBackOffMillis()} will range between the randomization factor
* percentage below and above the retry interval. For example, using 2 seconds as the base retry
* interval and 0.5 as the randomization factor, the actual back off period used in the next retry
* attempt will be between 1 and 3 seconds.
- *
*
- *
- * Note: max_interval caps the retry_interval and not the randomized_interval.
- *
+ * Note: max_interval caps the retry_interval and not the randomized_interval.
*
- *
- * If the time elapsed since an {@link ExponentialBackOff} instance is created goes past the
- * max_elapsed_time then the method {@link #nextBackOffMillis()} starts returning
- * {@link BackOff#STOP}. The elapsed time can be reset by calling {@link #reset()}.
- *
+ * If the time elapsed since an {@link ExponentialBackOff} instance is created goes past the
+ * max_elapsed_time then the method {@link #nextBackOffMillis()} starts returning {@link
+ * BackOff#STOP}. The elapsed time can be reset by calling {@link #reset()}.
*
- *
- * Example: The default retry_interval is .5 seconds, default randomization_factor is 0.5, default
- * multiplier is 1.5 and the default max_interval is 1 minute. For 10 tries the sequence will be
- * (values in seconds) and assuming we go over the max_elapsed_time on the 10th try:
- *
+ * Example: The default retry_interval is .5 seconds, default randomization_factor is 0.5,
+ * default multiplier is 1.5 and the default max_interval is 1 minute. For 10 tries the sequence
+ * will be (values in seconds) and assuming we go over the max_elapsed_time on the 10th try:
*
*
- request# retry_interval randomized_interval
-
- 1 0.5 [0.25, 0.75]
- 2 0.75 [0.375, 1.125]
- 3 1.125 [0.562, 1.687]
- 4 1.687 [0.8435, 2.53]
- 5 2.53 [1.265, 3.795]
- 6 3.795 [1.897, 5.692]
- 7 5.692 [2.846, 8.538]
- 8 8.538 [4.269, 12.807]
- 9 12.807 [6.403, 19.210]
- 10 19.210 {@link BackOff#STOP}
+ * request# retry_interval randomized_interval
+ *
+ * 1 0.5 [0.25, 0.75]
+ * 2 0.75 [0.375, 1.125]
+ * 3 1.125 [0.562, 1.687]
+ * 4 1.687 [0.8435, 2.53]
+ * 5 2.53 [1.265, 3.795]
+ * 6 3.795 [1.897, 5.692]
+ * 7 5.692 [2.846, 8.538]
+ * 8 8.538 [4.269, 12.807]
+ * 9 12.807 [6.403, 19.210]
+ * 10 19.210 {@link BackOff#STOP}
*
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @since 1.15
* @author Ravi Mistry
@@ -103,10 +91,8 @@ public class ExponentialBackOff implements BackOff {
/**
* The randomization factor to use for creating a range around the retry interval.
*
- *
- * A randomization factor of 0.5 results in a random period ranging between 50% below and 50%
+ *
A randomization factor of 0.5 results in a random period ranging between 50% below and 50%
* above the retry interval.
- *
*/
private final double randomizationFactor;
@@ -126,8 +112,8 @@ public class ExponentialBackOff implements BackOff {
long startTimeNanos;
/**
- * The maximum elapsed time after instantiating {@link ExponentialBackOff} or calling
- * {@link #reset()} after which {@link #nextBackOffMillis()} returns {@link BackOff#STOP}.
+ * The maximum elapsed time after instantiating {@link ExponentialBackOff} or calling {@link
+ * #reset()} after which {@link #nextBackOffMillis()} returns {@link BackOff#STOP}.
*/
private final int maxElapsedTimeMillis;
@@ -137,25 +123,21 @@ public class ExponentialBackOff implements BackOff {
/**
* Creates an instance of ExponentialBackOffPolicy using default values.
*
- *
- * To override the defaults use {@link Builder}.
- *
+ * To override the defaults use {@link Builder}.
*
*
- * {@code initialIntervalMillis} defaults to {@link #DEFAULT_INITIAL_INTERVAL_MILLIS}
- * {@code randomizationFactor} defaults to {@link #DEFAULT_RANDOMIZATION_FACTOR}
- * {@code multiplier} defaults to {@link #DEFAULT_MULTIPLIER}
- * {@code maxIntervalMillis} defaults to {@link #DEFAULT_MAX_INTERVAL_MILLIS}
- * {@code maxElapsedTimeMillis} defaults in {@link #DEFAULT_MAX_ELAPSED_TIME_MILLIS}
+ * {@code initialIntervalMillis} defaults to {@link #DEFAULT_INITIAL_INTERVAL_MILLIS}
+ * {@code randomizationFactor} defaults to {@link #DEFAULT_RANDOMIZATION_FACTOR}
+ * {@code multiplier} defaults to {@link #DEFAULT_MULTIPLIER}
+ * {@code maxIntervalMillis} defaults to {@link #DEFAULT_MAX_INTERVAL_MILLIS}
+ * {@code maxElapsedTimeMillis} defaults in {@link #DEFAULT_MAX_ELAPSED_TIME_MILLIS}
*
*/
public ExponentialBackOff() {
this(new Builder());
}
- /**
- * @param builder builder
- */
+ /** @param builder builder */
protected ExponentialBackOff(Builder builder) {
initialIntervalMillis = builder.initialIntervalMillis;
randomizationFactor = builder.randomizationFactor;
@@ -180,14 +162,10 @@ public final void reset() {
/**
* {@inheritDoc}
*
- *
- * This method calculates the next back off interval using the formula: randomized_interval =
+ *
This method calculates the next back off interval using the formula: randomized_interval =
* retry_interval +/- (randomization_factor * retry_interval)
- *
*
- *
- * Subclasses may override if a different algorithm is required.
- *
+ * Subclasses may override if a different algorithm is required.
*/
public long nextBackOffMillis() throws IOException {
// Make sure we have not gone over the maximum elapsed time.
@@ -224,25 +202,19 @@ public final int getInitialIntervalMillis() {
/**
* Returns the randomization factor to use for creating a range around the retry interval.
*
- *
- * A randomization factor of 0.5 results in a random period ranging between 50% below and 50%
+ *
A randomization factor of 0.5 results in a random period ranging between 50% below and 50%
* above the retry interval.
- *
*/
public final double getRandomizationFactor() {
return randomizationFactor;
}
- /**
- * Returns the current retry interval in milliseconds.
- */
+ /** Returns the current retry interval in milliseconds. */
public final int getCurrentIntervalMillis() {
return currentIntervalMillis;
}
- /**
- * Returns the value to multiply the current interval with for each retry attempt.
- */
+ /** Returns the value to multiply the current interval with for each retry attempt. */
public final double getMultiplier() {
return multiplier;
}
@@ -258,11 +230,9 @@ public final int getMaxIntervalMillis() {
/**
* Returns the maximum elapsed time in milliseconds.
*
- *
- * If the time elapsed since an {@link ExponentialBackOff} instance is created goes past the
- * max_elapsed_time then the method {@link #nextBackOffMillis()} starts returning
- * {@link BackOff#STOP}. The elapsed time can be reset by calling {@link #reset()}.
- *
+ * If the time elapsed since an {@link ExponentialBackOff} instance is created goes past the
+ * max_elapsed_time then the method {@link #nextBackOffMillis()} starts returning {@link
+ * BackOff#STOP}. The elapsed time can be reset by calling {@link #reset()}.
*/
public final int getMaxElapsedTimeMillis() {
return maxElapsedTimeMillis;
@@ -272,17 +242,13 @@ public final int getMaxElapsedTimeMillis() {
* Returns the elapsed time in milliseconds since an {@link ExponentialBackOff} instance is
* created and is reset when {@link #reset()} is called.
*
- *
- * The elapsed time is computed using {@link System#nanoTime()}.
- *
+ * The elapsed time is computed using {@link System#nanoTime()}.
*/
public final long getElapsedTimeMillis() {
return (nanoClock.nanoTime() - startTimeNanos) / 1000000;
}
- /**
- * Increments the current interval by multiplying it with the multiplier.
- */
+ /** Increments the current interval by multiplying it with the multiplier. */
private void incrementCurrentInterval() {
// Check for overflow, if overflow is detected set the current interval to the max interval.
if (currentIntervalMillis >= maxIntervalMillis / multiplier) {
@@ -295,9 +261,7 @@ private void incrementCurrentInterval() {
/**
* Builder for {@link ExponentialBackOff}.
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*/
public static class Builder {
@@ -307,10 +271,8 @@ public static class Builder {
/**
* The randomization factor to use for creating a range around the retry interval.
*
- *
- * A randomization factor of 0.5 results in a random period ranging between 50% below and 50%
+ *
A randomization factor of 0.5 results in a random period ranging between 50% below and 50%
* above the retry interval.
- *
*/
double randomizationFactor = DEFAULT_RANDOMIZATION_FACTOR;
@@ -325,16 +287,15 @@ public static class Builder {
/**
* The maximum elapsed time in milliseconds after instantiating {@link ExponentialBackOff} or
- * calling {@link #reset()} after which {@link #nextBackOffMillis()} returns
- * {@link BackOff#STOP}.
+ * calling {@link #reset()} after which {@link #nextBackOffMillis()} returns {@link
+ * BackOff#STOP}.
*/
int maxElapsedTimeMillis = DEFAULT_MAX_ELAPSED_TIME_MILLIS;
/** Nano clock. */
NanoClock nanoClock = NanoClock.SYSTEM;
- public Builder() {
- }
+ public Builder() {}
/** Builds a new instance of {@link ExponentialBackOff}. */
public ExponentialBackOff build() {
@@ -342,21 +303,19 @@ public ExponentialBackOff build() {
}
/**
- * Returns the initial retry interval in milliseconds. The default value is
- * {@link #DEFAULT_INITIAL_INTERVAL_MILLIS}.
+ * Returns the initial retry interval in milliseconds. The default value is {@link
+ * #DEFAULT_INITIAL_INTERVAL_MILLIS}.
*/
public final int getInitialIntervalMillis() {
return initialIntervalMillis;
}
/**
- * Sets the initial retry interval in milliseconds. The default value is
- * {@link #DEFAULT_INITIAL_INTERVAL_MILLIS}. Must be {@code > 0}.
+ * Sets the initial retry interval in milliseconds. The default value is {@link
+ * #DEFAULT_INITIAL_INTERVAL_MILLIS}. Must be {@code > 0}.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Builder setInitialIntervalMillis(int initialIntervalMillis) {
this.initialIntervalMillis = initialIntervalMillis;
@@ -367,15 +326,11 @@ public Builder setInitialIntervalMillis(int initialIntervalMillis) {
* Returns the randomization factor to use for creating a range around the retry interval. The
* default value is {@link #DEFAULT_RANDOMIZATION_FACTOR}.
*
- *
- * A randomization factor of 0.5 results in a random period ranging between 50% below and 50%
+ *
A randomization factor of 0.5 results in a random period ranging between 50% below and 50%
* above the retry interval.
- *
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public final double getRandomizationFactor() {
return randomizationFactor;
@@ -383,18 +338,14 @@ public final double getRandomizationFactor() {
/**
* Sets the randomization factor to use for creating a range around the retry interval. The
- * default value is {@link #DEFAULT_RANDOMIZATION_FACTOR}. Must fall in the range
- * {@code 0 <= randomizationFactor < 1}.
+ * default value is {@link #DEFAULT_RANDOMIZATION_FACTOR}. Must fall in the range {@code 0 <=
+ * randomizationFactor < 1}.
*
- *
- * A randomization factor of 0.5 results in a random period ranging between 50% below and 50%
+ *
A randomization factor of 0.5 results in a random period ranging between 50% below and 50%
* above the retry interval.
- *
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Builder setRandomizationFactor(double randomizationFactor) {
this.randomizationFactor = randomizationFactor;
@@ -413,10 +364,8 @@ public final double getMultiplier() {
* Sets the value to multiply the current interval with for each retry attempt. The default
* value is {@link #DEFAULT_MULTIPLIER}. Must be {@code >= 1}.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Builder setMultiplier(double multiplier) {
this.multiplier = multiplier;
@@ -425,8 +374,8 @@ public Builder setMultiplier(double multiplier) {
/**
* Returns the maximum value of the back off period in milliseconds. Once the current interval
- * reaches this value it stops increasing. The default value is
- * {@link #DEFAULT_MAX_INTERVAL_MILLIS}. Must be {@code >= initialInterval}.
+ * reaches this value it stops increasing. The default value is {@link
+ * #DEFAULT_MAX_INTERVAL_MILLIS}. Must be {@code >= initialInterval}.
*/
public final int getMaxIntervalMillis() {
return maxIntervalMillis;
@@ -434,13 +383,11 @@ public final int getMaxIntervalMillis() {
/**
* Sets the maximum value of the back off period in milliseconds. Once the current interval
- * reaches this value it stops increasing. The default value is
- * {@link #DEFAULT_MAX_INTERVAL_MILLIS}.
+ * reaches this value it stops increasing. The default value is {@link
+ * #DEFAULT_MAX_INTERVAL_MILLIS}.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Builder setMaxIntervalMillis(int maxIntervalMillis) {
this.maxIntervalMillis = maxIntervalMillis;
@@ -448,33 +395,27 @@ public Builder setMaxIntervalMillis(int maxIntervalMillis) {
}
/**
- * Returns the maximum elapsed time in milliseconds. The default value is
- * {@link #DEFAULT_MAX_ELAPSED_TIME_MILLIS}.
+ * Returns the maximum elapsed time in milliseconds. The default value is {@link
+ * #DEFAULT_MAX_ELAPSED_TIME_MILLIS}.
*
- *
- * If the time elapsed since an {@link ExponentialBackOff} instance is created goes past the
- * max_elapsed_time then the method {@link #nextBackOffMillis()} starts returning
- * {@link BackOff#STOP}. The elapsed time can be reset by calling {@link #reset()}.
- *
+ * If the time elapsed since an {@link ExponentialBackOff} instance is created goes past the
+ * max_elapsed_time then the method {@link #nextBackOffMillis()} starts returning {@link
+ * BackOff#STOP}. The elapsed time can be reset by calling {@link #reset()}.
*/
public final int getMaxElapsedTimeMillis() {
return maxElapsedTimeMillis;
}
/**
- * Sets the maximum elapsed time in milliseconds. The default value is
- * {@link #DEFAULT_MAX_ELAPSED_TIME_MILLIS}. Must be {@code > 0}.
+ * Sets the maximum elapsed time in milliseconds. The default value is {@link
+ * #DEFAULT_MAX_ELAPSED_TIME_MILLIS}. Must be {@code > 0}.
*
- *
- * If the time elapsed since an {@link ExponentialBackOff} instance is created goes past the
- * max_elapsed_time then the method {@link #nextBackOffMillis()} starts returning
- * {@link BackOff#STOP}. The elapsed time can be reset by calling {@link #reset()}.
- *
+ * If the time elapsed since an {@link ExponentialBackOff} instance is created goes past the
+ * max_elapsed_time then the method {@link #nextBackOffMillis()} starts returning {@link
+ * BackOff#STOP}. The elapsed time can be reset by calling {@link #reset()}.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Builder setMaxElapsedTimeMillis(int maxElapsedTimeMillis) {
this.maxElapsedTimeMillis = maxElapsedTimeMillis;
@@ -489,10 +430,8 @@ public final NanoClock getNanoClock() {
/**
* Sets the nano clock ({@link NanoClock#SYSTEM} by default).
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public Builder setNanoClock(NanoClock nanoClock) {
this.nanoClock = Preconditions.checkNotNull(nanoClock);
diff --git a/google-http-client/src/main/java/com/google/api/client/util/FieldInfo.java b/google-http-client/src/main/java/com/google/api/client/util/FieldInfo.java
index 7204dd872..fb3599f98 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/FieldInfo.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/FieldInfo.java
@@ -28,9 +28,7 @@
/**
* Parses field information to determine data key name/value pair associated with the field.
*
- *
- * Implementation is thread-safe.
- *
+ * Implementation is thread-safe.
*
* @since 1.0
* @author Yaniv Inbar
@@ -65,7 +63,7 @@ public static FieldInfo of(Enum enumValue) {
*
* @param field field or {@code null} for {@code null} result
* @return field information or {@code null} if the field has no {@link #name} or for {@code null}
- * input
+ * input
*/
public static FieldInfo of(Field field) {
if (field == null) {
@@ -118,16 +116,14 @@ public static FieldInfo of(Field field) {
private final Field field;
/** Setters Method for field */
- private final Method []setters;
+ private final Method[] setters;
/**
* Data key name associated with the field for a non-enum-constant with a {@link Key} annotation,
* or data key value associated with the enum constant with a {@link Value} annotation or {@code
* null} for an enum constant with a {@link NullValue} annotation.
*
- *
- * This string is interned.
- *
+ * This string is interned.
*/
private final String name;
@@ -138,9 +134,7 @@ public static FieldInfo of(Field field) {
this.setters = settersMethodForField(field);
}
- /**
- * Creates list of setter methods for a field only in declaring class.
- */
+ /** Creates list of setter methods for a field only in declaring class. */
private Method[] settersMethodForField(Field field) {
List methods = new ArrayList<>();
for (Method method : field.getDeclaringClass().getDeclaredMethods()) {
@@ -166,9 +160,7 @@ public Field getField() {
* annotation, or data key value associated with the enum constant with a {@link Value} annotation
* or {@code null} for an enum constant with a {@link NullValue} annotation.
*
- *
- * This string is interned.
- *
+ * This string is interned.
*
* @since 1.4
*/
@@ -213,17 +205,16 @@ public boolean isPrimitive() {
return isPrimitive;
}
- /**
- * Returns the value of the field in the given object instance using reflection.
- */
+ /** Returns the value of the field in the given object instance using reflection. */
public Object getValue(Object obj) {
return getFieldValue(field, obj);
}
/**
* Sets this field in the given object to the given value using reflection.
- *
- * If the field is final, it checks that the value being set is identical to the existing value.
+ *
+ *
If the field is final, it checks that the value being set is identical to the existing
+ * value.
*/
public void setValue(Object obj, Object value) {
if (setters.length > 0) {
@@ -251,9 +242,7 @@ public > T enumValue() {
return Enum.valueOf((Class) field.getDeclaringClass(), field.getName());
}
- /**
- * Returns the value of the given field in the given object using reflection.
- */
+ /** Returns the value of the given field in the given object using reflection. */
public static Object getFieldValue(Field field, Object obj) {
try {
return field.get(obj);
@@ -264,16 +253,23 @@ public static Object getFieldValue(Field field, Object obj) {
/**
* Sets the given field in the given object to the given value using reflection.
- *
- * If the field is final, it checks that the value being set is identical to the existing value.
+ *
+ *
If the field is final, it checks that the value being set is identical to the existing
+ * value.
*/
public static void setFieldValue(Field field, Object obj, Object value) {
if (Modifier.isFinal(field.getModifiers())) {
Object finalValue = getFieldValue(field, obj);
if (value == null ? finalValue != null : !value.equals(finalValue)) {
throw new IllegalArgumentException(
- "expected final value <" + finalValue + "> but was <" + value + "> on "
- + field.getName() + " field in " + obj.getClass().getName());
+ "expected final value <"
+ + finalValue
+ + "> but was <"
+ + value
+ + "> on "
+ + field.getName()
+ + " field in "
+ + obj.getClass().getName());
}
} else {
try {
diff --git a/google-http-client/src/main/java/com/google/api/client/util/GenericData.java b/google-http-client/src/main/java/com/google/api/client/util/GenericData.java
index 7596a7b61..5ba12fe47 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/GenericData.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/GenericData.java
@@ -27,21 +27,15 @@
/**
* Generic data that stores all unknown data key name/value pairs.
*
- *
- * Subclasses can declare fields for known data keys using the {@link Key} annotation. Each field
+ *
Subclasses can declare fields for known data keys using the {@link Key} annotation. Each field
* can be of any visibility (private, package private, protected, or public) and must not be static.
* {@code null} unknown data key names are not allowed, but {@code null} data values are allowed.
- *
*
- *
- * Iteration order of the data keys is based on the sorted (ascending) key names of the declared
+ *
Iteration order of the data keys is based on the sorted (ascending) key names of the declared
* fields, followed by the iteration order of all of the unknown data key name/value pairs.
- *
*
- *
- * Implementation is not thread-safe. For a thread-safe choice instead use an implementation of
+ *
Implementation is not thread-safe. For a thread-safe choice instead use an implementation of
* {@link ConcurrentMap}.
- *
*
* @since 1.0
* @author Yaniv Inbar
@@ -56,15 +50,14 @@ public class GenericData extends AbstractMap implements Cloneabl
/** Class information. */
final ClassInfo classInfo;
- /**
- * Constructs with case-insensitive keys.
- */
+ /** Constructs with case-insensitive keys. */
public GenericData() {
this(EnumSet.noneOf(Flags.class));
}
/**
* Flags that impact behavior of generic data.
+ *
* @since 1.10
*/
public enum Flags {
@@ -113,13 +106,11 @@ public final Object put(String fieldName, Object value) {
/**
* Sets the given field value (may be {@code null}) for the given field name. Any existing value
- * for the field will be overwritten. It may be more slightly more efficient than
- * {@link #put(String, Object)} because it avoids accessing the field's original value.
+ * for the field will be overwritten. It may be more slightly more efficient than {@link
+ * #put(String, Object)} because it avoids accessing the field's original value.
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public GenericData set(String fieldName, Object value) {
FieldInfo fieldInfo = classInfo.getFieldInfo(fieldName);
diff --git a/google-http-client/src/main/java/com/google/api/client/util/IOUtils.java b/google-http-client/src/main/java/com/google/api/client/util/IOUtils.java
index fdf64751a..9ccad9886 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/IOUtils.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/IOUtils.java
@@ -37,23 +37,19 @@ public class IOUtils {
* Writes the content provided by the given source input stream into the given destination output
* stream.
*
- *
- * The input stream is guaranteed to be closed at the end of this method.
- *
+ * The input stream is guaranteed to be closed at the end of this method.
*
- *
- * Sample use:
- *
+ * Sample use:
*
*
- static void copy(InputStream inputStream, File file) throws IOException {
- FileOutputStream out = new FileOutputStream(file);
- try {
- IOUtils.copy(inputStream, out);
- } finally {
- out.close();
- }
- }
+ * static void copy(InputStream inputStream, File file) throws IOException {
+ * FileOutputStream out = new FileOutputStream(file);
+ * try {
+ * IOUtils.copy(inputStream, out);
+ * } finally {
+ * out.close();
+ * }
+ * }
*
*
* @param inputStream source input stream
@@ -63,24 +59,21 @@ public static void copy(InputStream inputStream, OutputStream outputStream) thro
copy(inputStream, outputStream, true);
}
-
/**
* Writes the content provided by the given source input stream into the given destination output
* stream, optionally closing the input stream.
*
- *
- * Sample use:
- *
+ * Sample use:
*
*
- static void copy(InputStream inputStream, File file) throws IOException {
- FileOutputStream out = new FileOutputStream(file);
- try {
- IOUtils.copy(inputStream, out, true);
- } finally {
- out.close();
- }
- }
+ * static void copy(InputStream inputStream, File file) throws IOException {
+ * FileOutputStream out = new FileOutputStream(file);
+ * try {
+ * IOUtils.copy(inputStream, out, true);
+ * } finally {
+ * out.close();
+ * }
+ * }
*
*
* @param inputStream source input stream
@@ -99,11 +92,9 @@ public static void copy(
}
}
-
/**
- * Computes and returns the byte content length for a streaming content by calling
- * {@link StreamingContent#writeTo(OutputStream)} on a fake output stream that only counts bytes
- * written.
+ * Computes and returns the byte content length for a streaming content by calling {@link
+ * StreamingContent#writeTo(OutputStream)} on a fake output stream that only counts bytes written.
*
* @param content streaming content
*/
diff --git a/google-http-client/src/main/java/com/google/api/client/util/Joiner.java b/google-http-client/src/main/java/com/google/api/client/util/Joiner.java
index a1ba8790c..3fce25e12 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/Joiner.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/Joiner.java
@@ -20,9 +20,7 @@
* An object which joins pieces of text (specified as an array, {@link Iterable}, varargs or even a
* {@link Map}) with a separator.
*
- *
- * NOTE: proxy for the Guava implementation of {@link com.google.common.base.Joiner}.
- *
+ * NOTE: proxy for the Guava implementation of {@link com.google.common.base.Joiner}.
*
* @since 1.14
* @author Yaniv Inbar
@@ -32,16 +30,12 @@ public final class Joiner {
/** Wrapped joiner. */
private final com.google.common.base.Joiner wrapped;
- /**
- * Returns a joiner which automatically places {@code separator} between consecutive elements.
- */
+ /** Returns a joiner which automatically places {@code separator} between consecutive elements. */
public static Joiner on(char separator) {
return new Joiner(com.google.common.base.Joiner.on(separator));
}
- /**
- * @param wrapped wrapped joiner
- */
+ /** @param wrapped wrapped joiner */
private Joiner(com.google.common.base.Joiner wrapped) {
this.wrapped = wrapped;
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/Key.java b/google-http-client/src/main/java/com/google/api/client/util/Key.java
index e8b9dc0af..dfc0dd454 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/Key.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/Key.java
@@ -22,24 +22,23 @@
/**
* Use this annotation to specify that a field is a data key, optionally providing the data key name
* to use.
- *
- * If the data key name is not specified, the default is the Java field's name. For example:
- *
+ *
+ * If the data key name is not specified, the default is the Java field's name. For example:
*
*
- public class A {
-
- // uses data key name of "dataKeyNameMatchesFieldName"
- @Key
- public String dataKeyNameMatchesFieldName;
-
- // uses data key name of "some_other_name"
- @Key("some_other_name")
- private String dataKeyNameIsOverriden;
-
- // not a data key
- private String notADataKey;
- }
+ * public class A {
+ *
+ * // uses data key name of "dataKeyNameMatchesFieldName"
+ * @Key
+ * public String dataKeyNameMatchesFieldName;
+ *
+ * // uses data key name of "some_other_name"
+ * @Key("some_other_name")
+ * private String dataKeyNameIsOverriden;
+ *
+ * // not a data key
+ * private String notADataKey;
+ * }
*
- * NOTE: this is a copy of a subset of Guava's {@link com.google.common.collect.Lists}. The
+ *
NOTE: this is a copy of a subset of Guava's {@link com.google.common.collect.Lists}. The
* implementation must match as closely as possible to Guava's implementation.
- *
*
* @since 1.14
* @author Yaniv Inbar
@@ -42,9 +40,9 @@ public static ArrayList newArrayList() {
* equivalent to {@link ArrayList#ArrayList(int)}.
*
* @param initialArraySize the exact size of the initial backing array for the returned array list
- * ({@code ArrayList} documentation calls this value the "capacity")
+ * ({@code ArrayList} documentation calls this value the "capacity")
* @return a new, empty {@code ArrayList} which is guaranteed not to resize itself unless its size
- * reaches {@code initialArraySize + 1}
+ * reaches {@code initialArraySize + 1}
* @throws IllegalArgumentException if {@code initialArraySize} is negative
*/
public static ArrayList newArrayListWithCapacity(int initialArraySize) {
@@ -59,7 +57,8 @@ public static ArrayList newArrayListWithCapacity(int initialArraySize) {
*/
public static ArrayList newArrayList(Iterable elements) {
return (elements instanceof Collection)
- ? new ArrayList(Collections2.cast(elements)) : newArrayList(elements.iterator());
+ ? new ArrayList(Collections2.cast(elements))
+ : newArrayList(elements.iterator());
}
/**
@@ -76,6 +75,5 @@ public static ArrayList newArrayList(Iterator elements) {
return list;
}
- private Lists() {
- }
+ private Lists() {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/LoggingByteArrayOutputStream.java b/google-http-client/src/main/java/com/google/api/client/util/LoggingByteArrayOutputStream.java
index 318b98fa0..412486c5e 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/LoggingByteArrayOutputStream.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/LoggingByteArrayOutputStream.java
@@ -23,15 +23,13 @@
/**
* Thread-safe byte array output stream that logs what was written to it when the stream is closed.
*
- *
- * Use this as a safe way to log a limited amount of content. As content is written to the stream,
- * it is stored as a byte array, up to the maximum number of bytes limit that was set in the
+ *
Use this as a safe way to log a limited amount of content. As content is written to the
+ * stream, it is stored as a byte array, up to the maximum number of bytes limit that was set in the
* constructor. Note that if the maximum limit is set too high, it risks an {@link OutOfMemoryError}
* on low-memory devices. This class also keeps track of the total number of bytes written,
* regardless of whether they were logged. On {@link #close()}, it then logs two records to the
* specified logger and logging level: the total number of bytes written, and the bounded content
* logged (assuming charset "UTF-8"). Any control characters are stripped out of the content.
- *
*
* @since 1.9
* @author Yaniv Inbar
@@ -57,7 +55,7 @@ public class LoggingByteArrayOutputStream extends ByteArrayOutputStream {
* @param logger logger
* @param loggingLevel logging level
* @param maximumBytesToLog maximum number of bytes to log (may be {@code 0} to avoid logging
- * content)
+ * content)
*/
public LoggingByteArrayOutputStream(Logger logger, Level loggingLevel, int maximumBytesToLog) {
this.logger = Preconditions.checkNotNull(logger);
@@ -106,7 +104,8 @@ public synchronized void close() throws IOException {
// log response content
if (count != 0) {
// strip out some unprintable control chars
- logger.log(loggingLevel,
+ logger.log(
+ loggingLevel,
toString("UTF-8").replaceAll("[\\x00-\\x09\\x0B\\x0C\\x0E-\\x1F\\x7F]", " "));
}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/LoggingInputStream.java b/google-http-client/src/main/java/com/google/api/client/util/LoggingInputStream.java
index 3076508fb..e48167a6c 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/LoggingInputStream.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/LoggingInputStream.java
@@ -37,7 +37,7 @@ public class LoggingInputStream extends FilterInputStream {
* @param logger logger
* @param loggingLevel logging level
* @param contentLoggingLimit maximum number of bytes to log (may be {@code 0} to avoid logging
- * content)
+ * content)
*/
public LoggingInputStream(
InputStream inputStream, Logger logger, Level loggingLevel, int contentLoggingLimit) {
diff --git a/google-http-client/src/main/java/com/google/api/client/util/LoggingOutputStream.java b/google-http-client/src/main/java/com/google/api/client/util/LoggingOutputStream.java
index bc4fd914f..731422773 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/LoggingOutputStream.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/LoggingOutputStream.java
@@ -14,7 +14,6 @@
package com.google.api.client.util;
-
import java.io.FilterOutputStream;
import java.io.IOException;
import java.io.OutputStream;
@@ -38,7 +37,7 @@ public class LoggingOutputStream extends FilterOutputStream {
* @param logger logger
* @param loggingLevel logging level
* @param contentLoggingLimit maximum number of bytes to log (may be {@code 0} to avoid logging
- * content)
+ * content)
*/
public LoggingOutputStream(
OutputStream outputStream, Logger logger, Level loggingLevel, int contentLoggingLimit) {
diff --git a/google-http-client/src/main/java/com/google/api/client/util/LoggingStreamingContent.java b/google-http-client/src/main/java/com/google/api/client/util/LoggingStreamingContent.java
index 53f4a4238..af4b88c36 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/LoggingStreamingContent.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/LoggingStreamingContent.java
@@ -23,9 +23,7 @@
* Wraps another streaming content without modifying the content, but also logging content using
* {@link LoggingOutputStream}.
*
- *
- * Implementation is not thread-safe.
- *
+ * Implementation is not thread-safe.
*
* @author Yaniv Inbar
* @since 1.14
diff --git a/google-http-client/src/main/java/com/google/api/client/util/Maps.java b/google-http-client/src/main/java/com/google/api/client/util/Maps.java
index a68f226fa..3fba9f812 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/Maps.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/Maps.java
@@ -22,10 +22,8 @@
/**
* Static utility methods pertaining to {@link Map} instances.
*
- *
- * NOTE: this is a copy of a subset of Guava's {@link com.google.common.collect.Maps}. The
+ *
NOTE: this is a copy of a subset of Guava's {@link com.google.common.collect.Maps}. The
* implementation must match as closely as possible to Guava's implementation.
- *
*
* @since 1.14
* @author Yaniv Inbar
@@ -50,6 +48,5 @@ public static , V> TreeMap newTreeMap() {
return new TreeMap();
}
- private Maps() {
- }
+ private Maps() {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/NanoClock.java b/google-http-client/src/main/java/com/google/api/client/util/NanoClock.java
index 1736ac880..16cb6c8ae 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/NanoClock.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/NanoClock.java
@@ -17,10 +17,8 @@
/**
* Nano clock which can be used to measure elapsed time in nanoseconds.
*
- *
- * The default system implementation can be accessed at {@link #SYSTEM}. Alternative implementations
- * may be used for testing.
- *
+ * The default system implementation can be accessed at {@link #SYSTEM}. Alternative
+ * implementations may be used for testing.
*
* @since 1.14
* @author Yaniv Inbar
@@ -36,9 +34,10 @@ public interface NanoClock {
/**
* Provides the default System implementation of a nano clock by using {@link System#nanoTime()}.
*/
- NanoClock SYSTEM = new NanoClock() {
- public long nanoTime() {
- return System.nanoTime();
- }
- };
+ NanoClock SYSTEM =
+ new NanoClock() {
+ public long nanoTime() {
+ return System.nanoTime();
+ }
+ };
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/NullValue.java b/google-http-client/src/main/java/com/google/api/client/util/NullValue.java
index 4c24f6068..e09c70d3c 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/NullValue.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/NullValue.java
@@ -20,17 +20,14 @@
import java.lang.annotation.Target;
/**
- * Use this annotation to specify that an enum constant is the "null" data value to use for
- * {@link Data#nullOf(Class)}.
- *
- * See {@link Value} for an example.
- *
+ * Use this annotation to specify that an enum constant is the "null" data value to use for {@link
+ * Data#nullOf(Class)}.
+ *
+ * See {@link Value} for an example.
*
* @since 1.4
* @author Yaniv Inbar
*/
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
-public @interface NullValue {
-
-}
+public @interface NullValue {}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/ObjectParser.java b/google-http-client/src/main/java/com/google/api/client/util/ObjectParser.java
index 929913770..548043189 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/ObjectParser.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/ObjectParser.java
@@ -23,9 +23,7 @@
/**
* Parses a data source into the specified data type.
*
- *
- * Implementations should normally be thread-safe.
- *
+ * Implementations should normally be thread-safe.
*
* @author Yaniv Inbar
* @since 1.10
@@ -38,7 +36,7 @@ public interface ObjectParser {
*
* @param in input stream which contains the data to parse
* @param charset charset which should be used to decode the input stream or {@code null} if
- * unknown
+ * unknown
* @param dataClass class into which the data is parsed
*/
T parseAndClose(InputStream in, Charset charset, Class dataClass) throws IOException;
@@ -49,7 +47,7 @@ public interface ObjectParser {
*
* @param in input stream which contains the data to parse
* @param charset charset which should be used to decode the input stream or {@code null} if
- * unknown
+ * unknown
* @param dataType type into which the data is parsed
*/
Object parseAndClose(InputStream in, Charset charset, Type dataType) throws IOException;
diff --git a/google-http-client/src/main/java/com/google/api/client/util/Objects.java b/google-http-client/src/main/java/com/google/api/client/util/Objects.java
index 3424a0a83..ab980d948 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/Objects.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/Objects.java
@@ -26,16 +26,14 @@ public final class Objects {
* Determines whether two possibly-null objects are equal. Returns:
*
*
- * {@code true} if {@code a} and {@code b} are both null.
- * {@code true} if {@code a} and {@code b} are both non-null and they are equal according to
- * {@link Object#equals(Object)}.
- * {@code false} in all other situations.
+ * {@code true} if {@code a} and {@code b} are both null.
+ * {@code true} if {@code a} and {@code b} are both non-null and they are equal according to
+ * {@link Object#equals(Object)}.
+ * {@code false} in all other situations.
*
*
- *
- * This assumes that any non-null objects passed to this function conform to the {@code equals()}
- * contract.
- *
+ * This assumes that any non-null objects passed to this function conform to the {@code
+ * equals()} contract.
*/
public static boolean equal(Object a, Object b) {
return com.google.common.base.Objects.equal(a, b);
@@ -44,41 +42,39 @@ public static boolean equal(Object a, Object b) {
/**
* Creates an instance of {@link ToStringHelper}.
*
- *
- * This is helpful for implementing {@link Object#toString()}. Specification by example:
- *
+ * This is helpful for implementing {@link Object#toString()}. Specification by example:
*
*
- // Returns "ClassName{}"
- Objects.toStringHelper(this)
- .toString();
-
- // Returns "ClassName{x=1}"
- Objects.toStringHelper(this)
- .add("x", 1)
- .toString();
-
- // Returns "MyObject{x=1}"
- Objects.toStringHelper("MyObject")
- .add("x", 1)
- .toString();
-
- // Returns "ClassName{x=1, y=foo}"
- Objects.toStringHelper(this)
- .add("x", 1)
- .add("y", "foo")
- .toString();
-
- // Returns "ClassName{x=1}"
- Objects.toStringHelper(this)
- .omitNullValues()
- .add("x", 1)
- .add("y", null)
- .toString();
+ * // Returns "ClassName{}"
+ * Objects.toStringHelper(this)
+ * .toString();
+ *
+ * // Returns "ClassName{x=1}"
+ * Objects.toStringHelper(this)
+ * .add("x", 1)
+ * .toString();
+ *
+ * // Returns "MyObject{x=1}"
+ * Objects.toStringHelper("MyObject")
+ * .add("x", 1)
+ * .toString();
+ *
+ * // Returns "ClassName{x=1, y=foo}"
+ * Objects.toStringHelper(this)
+ * .add("x", 1)
+ * .add("y", "foo")
+ * .toString();
+ *
+ * // Returns "ClassName{x=1}"
+ * Objects.toStringHelper(this)
+ * .omitNullValues()
+ * .add("x", 1)
+ * .add("y", null)
+ * .toString();
*
*
* @param self the object to generate the string for (typically {@code this}), used only for its
- * class name
+ * class name
*/
public static ToStringHelper toStringHelper(Object self) {
return new ToStringHelper(self.getClass().getSimpleName());
@@ -92,9 +88,7 @@ public static final class ToStringHelper {
private ValueHolder holderTail = holderHead;
private boolean omitNullValues;
- /**
- * @param wrapped wrapped object
- */
+ /** @param wrapped wrapped object */
ToStringHelper(String className) {
this.className = className;
}
@@ -160,6 +154,5 @@ private static final class ValueHolder {
}
}
- private Objects() {
- }
+ private Objects() {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/PemReader.java b/google-http-client/src/main/java/com/google/api/client/util/PemReader.java
index b4bdbd94f..a1f06a3bc 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/PemReader.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/PemReader.java
@@ -21,32 +21,27 @@
import java.util.regex.Pattern;
/**
- * {@link Beta}
- * Supports reading any PEM stream that contains Base64 encoded content stored inside
- * {@code "-----BEGIN ...-----"} and {@code "-----END ...-----"} tags. Each call to
- * {@link #readNextSection()} parses the next section in the PEM file. If you need a section of a
- * certain title use {@link #readNextSection(String)}, for example
- * {@code readNextSection("PRIVATE KEY")}. To ensure that the stream is closed properly, call
- * {@link #close()} in a finally block.
- *
+ * Supports reading any PEM stream that contains Base64 encoded content stored inside {@code
+ * "-----BEGIN ...-----"} and {@code "-----END ...-----"} tags. Each call to {@link
+ * #readNextSection()} parses the next section in the PEM file. If you need a section of a certain
+ * title use {@link #readNextSection(String)}, for example {@code readNextSection("PRIVATE KEY")}.
+ * To ensure that the stream is closed properly, call {@link #close()} in a finally block.
*
- *
- * As a convenience, use {@link #readFirstSectionAndClose(Reader)} or
- * {@link #readFirstSectionAndClose(Reader, String)} for the common case of only a single section in
- * a PEM file (or only a single section of a given title).
- *
+ * As a convenience, use {@link #readFirstSectionAndClose(Reader)} or {@link
+ * #readFirstSectionAndClose(Reader, String)} for the common case of only a single section in a PEM
+ * file (or only a single section of a given title).
+ *
+ *
Limitations:
*
- *
- * Limitations:
*
*
*
- * Assumes the PEM file section content is not encrypted and cannot handle the case of any
- * headers inside the BEGIN and END tag.
- * It also ignores any attributes associated with any PEM file section.
+ * Assumes the PEM file section content is not encrypted and cannot handle the case of any
+ * headers inside the BEGIN and END tag.
+ * It also ignores any attributes associated with any PEM file section.
*
*
* @since 1.14
@@ -61,9 +56,7 @@ public final class PemReader {
/** Reader. */
private BufferedReader reader;
- /**
- * @param reader reader
- */
+ /** @param reader reader */
public PemReader(Reader reader) {
this.reader = new BufferedReader(reader);
}
@@ -101,8 +94,8 @@ public Section readNextSection(String titleToLookFor) throws IOException {
Matcher m = END_PATTERN.matcher(line);
if (m.matches()) {
String endTitle = m.group(1);
- Preconditions.checkArgument(endTitle.equals(title),
- "end tag (%s) doesn't match begin tag (%s)", endTitle, title);
+ Preconditions.checkArgument(
+ endTitle.equals(title), "end tag (%s) doesn't match begin tag (%s)", endTitle, title);
return new Section(title, Base64.decodeBase64(keyBuilder.toString()));
}
keyBuilder.append(line);
@@ -141,9 +134,7 @@ public static Section readFirstSectionAndClose(Reader reader, String titleToLook
/**
* Closes the reader.
*
- *
- * To ensure that the stream is closed properly, call {@link #close()} in a finally block.
- *
+ * To ensure that the stream is closed properly, call {@link #close()} in a finally block.
*/
public void close() throws IOException {
reader.close();
diff --git a/google-http-client/src/main/java/com/google/api/client/util/Preconditions.java b/google-http-client/src/main/java/com/google/api/client/util/Preconditions.java
index b2ef960cd..880848289 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/Preconditions.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/Preconditions.java
@@ -18,9 +18,7 @@
* Simple static methods to be called at the start of your own methods to verify correct arguments
* and state.
*
- *
- * NOTE: proxy for the Guava implementation of {@link com.google.common.base.Preconditions}.
- *
+ * NOTE: proxy for the Guava implementation of {@link com.google.common.base.Preconditions}.
*
* @since 1.14
* @author Yaniv Inbar
@@ -42,7 +40,7 @@ public static void checkArgument(boolean expression) {
*
* @param expression a boolean expression
* @param errorMessage the exception message to use if the check fails; will be converted to a
- * string using {@link String#valueOf(Object)}
+ * string using {@link String#valueOf(Object)}
* @throws IllegalArgumentException if {@code expression} is false
*/
public static void checkArgument(boolean expression, Object errorMessage) {
@@ -54,15 +52,15 @@ public static void checkArgument(boolean expression, Object errorMessage) {
*
* @param expression a boolean expression
* @param errorMessageTemplate a template for the exception message should the check fail. The
- * message is formed by replacing each {@code %s} placeholder in the template with an
- * argument. These are matched by position - the first {@code %s} gets
- * {@code errorMessageArgs[0]}, etc. Unmatched arguments will be appended to the formatted
- * message in square braces. Unmatched placeholders will be left as-is.
+ * message is formed by replacing each {@code %s} placeholder in the template with an
+ * argument. These are matched by position - the first {@code %s} gets {@code
+ * errorMessageArgs[0]}, etc. Unmatched arguments will be appended to the formatted message in
+ * square braces. Unmatched placeholders will be left as-is.
* @param errorMessageArgs the arguments to be substituted into the message template. Arguments
- * are converted to strings using {@link String#valueOf(Object)}.
+ * are converted to strings using {@link String#valueOf(Object)}.
* @throws IllegalArgumentException if {@code expression} is false
* @throws NullPointerException if the check fails and either {@code errorMessageTemplate} or
- * {@code errorMessageArgs} is null (don't let this happen)
+ * {@code errorMessageArgs} is null (don't let this happen)
*/
public static void checkArgument(
boolean expression, String errorMessageTemplate, Object... errorMessageArgs) {
@@ -87,7 +85,7 @@ public static void checkState(boolean expression) {
*
* @param expression a boolean expression
* @param errorMessage the exception message to use if the check fails; will be converted to a
- * string using {@link String#valueOf(Object)}
+ * string using {@link String#valueOf(Object)}
* @throws IllegalStateException if {@code expression} is false
*/
public static void checkState(boolean expression, Object errorMessage) {
@@ -100,15 +98,15 @@ public static void checkState(boolean expression, Object errorMessage) {
*
* @param expression a boolean expression
* @param errorMessageTemplate a template for the exception message should the check fail. The
- * message is formed by replacing each {@code %s} placeholder in the template with an
- * argument. These are matched by position - the first {@code %s} gets
- * {@code errorMessageArgs[0]}, etc. Unmatched arguments will be appended to the formatted
- * message in square braces. Unmatched placeholders will be left as-is.
+ * message is formed by replacing each {@code %s} placeholder in the template with an
+ * argument. These are matched by position - the first {@code %s} gets {@code
+ * errorMessageArgs[0]}, etc. Unmatched arguments will be appended to the formatted message in
+ * square braces. Unmatched placeholders will be left as-is.
* @param errorMessageArgs the arguments to be substituted into the message template. Arguments
- * are converted to strings using {@link String#valueOf(Object)}.
+ * are converted to strings using {@link String#valueOf(Object)}.
* @throws IllegalStateException if {@code expression} is false
* @throws NullPointerException if the check fails and either {@code errorMessageTemplate} or
- * {@code errorMessageArgs} is null (don't let this happen)
+ * {@code errorMessageArgs} is null (don't let this happen)
*/
public static void checkState(
boolean expression, String errorMessageTemplate, Object... errorMessageArgs) {
@@ -132,7 +130,7 @@ public static T checkNotNull(T reference) {
*
* @param reference an object reference
* @param errorMessage the exception message to use if the check fails; will be converted to a
- * string using {@link String#valueOf(Object)}
+ * string using {@link String#valueOf(Object)}
* @return the non-null reference that was validated
* @throws NullPointerException if {@code reference} is null
*/
@@ -145,12 +143,12 @@ public static T checkNotNull(T reference, Object errorMessage) {
*
* @param reference an object reference
* @param errorMessageTemplate a template for the exception message should the check fail. The
- * message is formed by replacing each {@code %s} placeholder in the template with an
- * argument. These are matched by position - the first {@code %s} gets
- * {@code errorMessageArgs[0]}, etc. Unmatched arguments will be appended to the formatted
- * message in square braces. Unmatched placeholders will be left as-is.
+ * message is formed by replacing each {@code %s} placeholder in the template with an
+ * argument. These are matched by position - the first {@code %s} gets {@code
+ * errorMessageArgs[0]}, etc. Unmatched arguments will be appended to the formatted message in
+ * square braces. Unmatched placeholders will be left as-is.
* @param errorMessageArgs the arguments to be substituted into the message template. Arguments
- * are converted to strings using {@link String#valueOf(Object)}.
+ * are converted to strings using {@link String#valueOf(Object)}.
* @return the non-null reference that was validated
* @throws NullPointerException if {@code reference} is null
*/
@@ -160,6 +158,5 @@ public static T checkNotNull(
reference, errorMessageTemplate, errorMessageArgs);
}
- private Preconditions() {
- }
+ private Preconditions() {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/SecurityUtils.java b/google-http-client/src/main/java/com/google/api/client/util/SecurityUtils.java
index b28233c38..59d3af24e 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/SecurityUtils.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/SecurityUtils.java
@@ -32,7 +32,6 @@
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.util.List;
-
import javax.net.ssl.X509TrustManager;
/**
@@ -61,19 +60,16 @@ public static KeyStore getPkcs12KeyStore() throws KeyStoreException {
/**
* Loads a key store from a stream.
*
- *
- *
- * Example usage:
- *
+ * Example usage:
*
*
- KeyStore keyStore = SecurityUtils.getJavaKeyStore();
- SecurityUtils.loadKeyStore(keyStore, new FileInputStream("certs.jks"), "password");
+ * KeyStore keyStore = SecurityUtils.getJavaKeyStore();
+ * SecurityUtils.loadKeyStore(keyStore, new FileInputStream("certs.jks"), "password");
*
*
* @param keyStore key store
* @param keyStream input stream to the key store stream (closed at the end of this method in a
- * finally block)
+ * finally block)
* @param storePass password protecting the key store file
*/
public static void loadKeyStore(KeyStore keyStore, InputStream keyStream, String storePass)
@@ -103,7 +99,7 @@ public static PrivateKey getPrivateKey(KeyStore keyStore, String alias, String k
*
* @param keyStore key store
* @param keyStream input stream to the key store (closed at the end of this method in a finally
- * block)
+ * block)
* @param storePass password protecting the key store file
* @param alias alias under which the key is stored
* @param keyPass password protecting the key
@@ -175,14 +171,18 @@ public static boolean verify(
* @param signatureAlgorithm signature algorithm
* @param trustManager trust manager used to verify the certificate chain
* @param certChainBase64 Certificate chain used for verification. The certificates must be base64
- * encoded DER, the leaf certificate must be the first element.
+ * encoded DER, the leaf certificate must be the first element.
* @param signatureBytes signature bytes
* @param contentBytes content bytes
* @return The signature certificate if the signature could be verified, null otherwise.
* @since 1.19.1.
*/
- public static X509Certificate verify(Signature signatureAlgorithm, X509TrustManager trustManager,
- List certChainBase64, byte[] signatureBytes, byte[] contentBytes)
+ public static X509Certificate verify(
+ Signature signatureAlgorithm,
+ X509TrustManager trustManager,
+ List certChainBase64,
+ byte[] signatureBytes,
+ byte[] contentBytes)
throws InvalidKeyException, SignatureException {
CertificateFactory certificateFactory;
try {
@@ -223,28 +223,24 @@ public static CertificateFactory getX509CertificateFactory() throws CertificateE
}
/**
- * Loads a key store with certificates generated from the specified stream using
- * {@link CertificateFactory#generateCertificates(InputStream)}.
+ * Loads a key store with certificates generated from the specified stream using {@link
+ * CertificateFactory#generateCertificates(InputStream)}.
*
- *
- * For each certificate, {@link KeyStore#setCertificateEntry(String, Certificate)} is called with
- * an alias that is the string form of incrementing non-negative integers starting with 0 (0, 1,
- * 2, 3, ...).
- *
+ * For each certificate, {@link KeyStore#setCertificateEntry(String, Certificate)} is called
+ * with an alias that is the string form of incrementing non-negative integers starting with 0 (0,
+ * 1, 2, 3, ...).
*
- *
- * Example usage:
- *
+ * Example usage:
*
*
- KeyStore keyStore = SecurityUtils.getJavaKeyStore();
- SecurityUtils.loadKeyStoreFromCertificates(keyStore, SecurityUtils.getX509CertificateFactory(),
- new FileInputStream(pemFile));
+ * KeyStore keyStore = SecurityUtils.getJavaKeyStore();
+ * SecurityUtils.loadKeyStoreFromCertificates(keyStore, SecurityUtils.getX509CertificateFactory(),
+ * new FileInputStream(pemFile));
*
*
* @param keyStore key store (for example {@link #getJavaKeyStore()})
- * @param certificateFactory certificate factory (for example
- * {@link #getX509CertificateFactory()})
+ * @param certificateFactory certificate factory (for example {@link
+ * #getX509CertificateFactory()})
* @param certificateStream certificate stream
*/
public static void loadKeyStoreFromCertificates(
@@ -257,6 +253,5 @@ public static void loadKeyStoreFromCertificates(
}
}
- private SecurityUtils() {
- }
+ private SecurityUtils() {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/Sets.java b/google-http-client/src/main/java/com/google/api/client/util/Sets.java
index a253874d1..f159ccb0c 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/Sets.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/Sets.java
@@ -21,10 +21,8 @@
/**
* Static utility methods pertaining to {@link Set} instances.
*
- *
- * NOTE: this is a copy of a subset of Guava's {@link com.google.common.collect.Sets}. The
+ *
NOTE: this is a copy of a subset of Guava's {@link com.google.common.collect.Sets}. The
* implementation must match as closely as possible to Guava's implementation.
- *
*
* @since 1.14
* @author Yaniv Inbar
@@ -44,6 +42,5 @@ public static > TreeSet newTreeSet() {
return new TreeSet();
}
- private Sets() {
- }
+ private Sets() {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/Sleeper.java b/google-http-client/src/main/java/com/google/api/client/util/Sleeper.java
index 94d98e8a2..bd0c0f108 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/Sleeper.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/Sleeper.java
@@ -15,12 +15,10 @@
package com.google.api.client.util;
/**
- * Sleeper interface to use for requesting the current thread to sleep as specified in
- * {@link Thread#sleep(long)}.
+ * Sleeper interface to use for requesting the current thread to sleep as specified in {@link
+ * Thread#sleep(long)}.
*
- *
- * The default implementation can be accessed at {@link #DEFAULT}. Primarily used for testing.
- *
+ * The default implementation can be accessed at {@link #DEFAULT}. Primarily used for testing.
*
* @since 1.14
* @author Yaniv Inbar
@@ -37,11 +35,11 @@ public interface Sleeper {
void sleep(long millis) throws InterruptedException;
/** Provides the default implementation based on {@link Thread#sleep(long)}. */
- Sleeper DEFAULT = new Sleeper() {
-
- public void sleep(long millis) throws InterruptedException {
- Thread.sleep(millis);
- }
- };
+ Sleeper DEFAULT =
+ new Sleeper() {
+ public void sleep(long millis) throws InterruptedException {
+ Thread.sleep(millis);
+ }
+ };
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/SslUtils.java b/google-http-client/src/main/java/com/google/api/client/util/SslUtils.java
index eb4eb225b..d4ed4f7cf 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/SslUtils.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/SslUtils.java
@@ -19,7 +19,6 @@
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
-
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
@@ -96,11 +95,10 @@ public static KeyManagerFactory getPkixKeyManagerFactory() throws NoSuchAlgorith
* given trust store.
*
* @param sslContext SSL context (for example {@link SSLContext#getInstance})
- * @param trustStore key store for certificates to trust (for example
- * {@link SecurityUtils#getJavaKeyStore()})
- * @param trustManagerFactory trust manager factory (for example
- * {@link #getPkixTrustManagerFactory()})
- *
+ * @param trustStore key store for certificates to trust (for example {@link
+ * SecurityUtils#getJavaKeyStore()})
+ * @param trustManagerFactory trust manager factory (for example {@link
+ * #getPkixTrustManagerFactory()})
* @since 1.14
*/
public static SSLContext initSslContext(
@@ -112,43 +110,40 @@ public static SSLContext initSslContext(
}
/**
- * {@link Beta}
- * Be careful! Disabling SSL certificate validation is dangerous and should only be done in
+ *
Be careful! Disabling SSL certificate validation is dangerous and should only be done in
* testing environments.
- *
*/
@Beta
public static SSLContext trustAllSSLContext() throws GeneralSecurityException {
- TrustManager[] trustAllCerts = new TrustManager[] {new X509TrustManager() {
+ TrustManager[] trustAllCerts =
+ new TrustManager[] {
+ new X509TrustManager() {
- public void checkClientTrusted(X509Certificate[] chain, String authType)
- throws CertificateException {
- }
+ public void checkClientTrusted(X509Certificate[] chain, String authType)
+ throws CertificateException {}
- public void checkServerTrusted(X509Certificate[] chain, String authType)
- throws CertificateException {
- }
+ public void checkServerTrusted(X509Certificate[] chain, String authType)
+ throws CertificateException {}
- public X509Certificate[] getAcceptedIssuers() {
- return null;
- }
- }};
+ public X509Certificate[] getAcceptedIssuers() {
+ return null;
+ }
+ }
+ };
SSLContext context = getTlsSslContext();
context.init(null, trustAllCerts, null);
return context;
}
/**
- * {@link Beta}
- * Be careful! Disabling host name verification is dangerous and should only be done in testing
+ *
Be careful! Disabling host name verification is dangerous and should only be done in testing
* environments.
- *
*/
@Beta
public static HostnameVerifier trustAllHostnameVerifier() {
@@ -160,6 +155,5 @@ public boolean verify(String arg0, SSLSession arg1) {
};
}
- private SslUtils() {
- }
+ private SslUtils() {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/StreamingContent.java b/google-http-client/src/main/java/com/google/api/client/util/StreamingContent.java
index a855d9c13..a2a9f600d 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/StreamingContent.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/StreamingContent.java
@@ -20,9 +20,7 @@
/**
* Streaming content interface to write bytes to an output stream.
*
- *
- * Implementations don't need to be thread-safe.
- *
+ * Implementations don't need to be thread-safe.
*
* @since 1.14
* @author Yaniv Inbar
@@ -32,11 +30,9 @@ public interface StreamingContent {
/**
* Writes the byte content to the given output stream.
*
- *
- * Implementations must not close the output stream, and instead should flush the output stream.
- * Some callers may assume that the the output stream has not been closed, and will fail to work
- * if it has been closed.
- *
+ * Implementations must not close the output stream, and instead should flush the output
+ * stream. Some callers may assume that the the output stream has not been closed, and will fail
+ * to work if it has been closed.
*
* @param out output stream
*/
diff --git a/google-http-client/src/main/java/com/google/api/client/util/StringUtils.java b/google-http-client/src/main/java/com/google/api/client/util/StringUtils.java
index 80b1273cc..dc57990ef 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/StringUtils.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/StringUtils.java
@@ -17,7 +17,6 @@
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
-
/**
* Utilities for strings.
*
@@ -40,9 +39,9 @@ public class StringUtils {
* @param string the String to encode, may be null
* @return encoded bytes, or null if the input string was null
* @throws IllegalStateException Thrown when the charset is missing, which should be never
- * according the the Java specification.
+ * according the the Java specification.
* @see Standard charsets
+ * >Standard charsets
* @since 1.8
*/
public static byte[] getBytesUtf8(String string) {
@@ -58,9 +57,9 @@ public static byte[] getBytesUtf8(String string) {
*
* @param bytes The bytes to be decoded into characters
* @return A new String decoded from the specified array of bytes using the UTF-8
- * charset, or null if the input byte array was null.
+ * charset, or null if the input byte array was null.
* @throws IllegalStateException Thrown when a {@link UnsupportedEncodingException} is caught,
- * which should never happen since the charset is required.
+ * which should never happen since the charset is required.
* @since 1.8
*/
public static String newStringUtf8(byte[] bytes) {
@@ -70,6 +69,5 @@ public static String newStringUtf8(byte[] bytes) {
return new String(bytes, StandardCharsets.UTF_8);
}
- private StringUtils() {
- }
+ private StringUtils() {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/Strings.java b/google-http-client/src/main/java/com/google/api/client/util/Strings.java
index 9c4067285..ae3625848 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/Strings.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/Strings.java
@@ -17,9 +17,7 @@
/**
* Static utility methods pertaining to {@code String} instances.
*
- *
- * NOTE: proxy for the Guava implementation of {@link com.google.common.base.Strings}.
- *
+ * NOTE: proxy for the Guava implementation of {@link com.google.common.base.Strings}.
*
* @since 1.14
* @author Yaniv Inbar
@@ -36,6 +34,5 @@ public static boolean isNullOrEmpty(String string) {
return com.google.common.base.Strings.isNullOrEmpty(string);
}
- private Strings() {
- }
+ private Strings() {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/Throwables.java b/google-http-client/src/main/java/com/google/api/client/util/Throwables.java
index 32b01cdc8..605355b88 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/Throwables.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/Throwables.java
@@ -17,9 +17,7 @@
/**
* Static utility methods pertaining to instances of {@link Throwable}.
*
- *
- * NOTE: proxy for the Guava implementation of {@link com.google.common.base.Throwables}.
- *
+ * NOTE: proxy for the Guava implementation of {@link com.google.common.base.Throwables}.
*
* @since 1.14
* @author Yaniv Inbar
@@ -27,48 +25,46 @@
public final class Throwables {
/**
- * Propagates {@code throwable} as-is if it is an instance of {@link RuntimeException} or
- * {@link Error}, or else as a last resort, wraps it in a {@code RuntimeException} then
- * propagates.
- *
- * This method always throws an exception. The {@code RuntimeException} return type is only for
+ * Propagates {@code throwable} as-is if it is an instance of {@link RuntimeException} or {@link
+ * Error}, or else as a last resort, wraps it in a {@code RuntimeException} then propagates.
+ *
+ *
This method always throws an exception. The {@code RuntimeException} return type is only for
* client code to make Java type system happy in case a return value is required by the enclosing
* method. Example usage:
- *
*
*
- T doSomething() {
- try {
- return someMethodThatCouldThrowAnything();
- } catch (IKnowWhatToDoWithThisException e) {
- return handle(e);
- } catch (Throwable t) {
- throw Throwables.propagate(t);
- }
- }
- *
+ * T doSomething() {
+ * try {
+ * return someMethodThatCouldThrowAnything();
+ * } catch (IKnowWhatToDoWithThisException e) {
+ * return handle(e);
+ * } catch (Throwable t) {
+ * throw Throwables.propagate(t);
+ * }
+ * }
+ *
*
* @param throwable the Throwable to propagate
* @return nothing will ever be returned; this return type is only for your convenience, as
- * illustrated in the example above
+ * illustrated in the example above
*/
public static RuntimeException propagate(Throwable throwable) {
return com.google.common.base.Throwables.propagate(throwable);
}
/**
- * Propagates {@code throwable} exactly as-is, if and only if it is an instance of
- * {@link RuntimeException} or {@link Error}. Example usage:
+ * Propagates {@code throwable} exactly as-is, if and only if it is an instance of {@link
+ * RuntimeException} or {@link Error}. Example usage:
*
*
- try {
- someMethodThatCouldThrowAnything();
- } catch (IKnowWhatToDoWithThisException e) {
- handle(e);
- } catch (Throwable t) {
- Throwables.propagateIfPossible(t);
- throw new RuntimeException("unexpected", t);
- }
+ * try {
+ * someMethodThatCouldThrowAnything();
+ * } catch (IKnowWhatToDoWithThisException e) {
+ * handle(e);
+ * } catch (Throwable t) {
+ * Throwables.propagateIfPossible(t);
+ * throw new RuntimeException("unexpected", t);
+ * }
*
*
* @param throwable throwable (may be {@code null})
@@ -80,19 +76,19 @@ public static void propagateIfPossible(Throwable throwable) {
}
/**
- * Propagates {@code throwable} exactly as-is, if and only if it is an instance of
- * {@link RuntimeException}, {@link Error}, or {@code declaredType}. Example usage:
+ * Propagates {@code throwable} exactly as-is, if and only if it is an instance of {@link
+ * RuntimeException}, {@link Error}, or {@code declaredType}. Example usage:
*
*
- try {
- someMethodThatCouldThrowAnything();
- } catch (IKnowWhatToDoWithThisException e) {
- handle(e);
- } catch (Throwable t) {
- Throwables.propagateIfPossible(t, OtherException.class);
- throw new RuntimeException("unexpected", t);
- }
- *
+ * try {
+ * someMethodThatCouldThrowAnything();
+ * } catch (IKnowWhatToDoWithThisException e) {
+ * handle(e);
+ * } catch (Throwable t) {
+ * Throwables.propagateIfPossible(t, OtherException.class);
+ * throw new RuntimeException("unexpected", t);
+ * }
+ *
*
* @param throwable throwable (may be {@code null})
* @param declaredType the single checked exception type declared by the calling method
@@ -102,6 +98,5 @@ public static void propagateIfPossible(
com.google.common.base.Throwables.propagateIfPossible(throwable, declaredType);
}
- private Throwables() {
- }
+ private Throwables() {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/Types.java b/google-http-client/src/main/java/com/google/api/client/util/Types.java
index d977b026f..8a49b438e 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/Types.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/Types.java
@@ -14,7 +14,6 @@
package com.google.api.client.util;
-
import java.lang.reflect.Array;
import java.lang.reflect.GenericArrayType;
import java.lang.reflect.GenericDeclaration;
@@ -43,11 +42,9 @@ public class Types {
* Returns the parameterized type that is or extends the given type that matches the given super
* class.
*
- *
- * For example, if the input type is {@code HashMap} and the input super class is
- * {@code Map.class}, it will return the extended parameterized type {@link Map}, but which
+ * For example, if the input type is {@code HashMap} and the input super class
+ * is {@code Map.class}, it will return the extended parameterized type {@link Map}, but which
* retains the actual type information from the original {@code HashMap}.
- *
*
* @param type class or parameterized type
* @param superClass super class
@@ -55,7 +52,8 @@ public class Types {
*/
public static ParameterizedType getSuperParameterizedType(Type type, Class superClass) {
if (type instanceof Class || type instanceof ParameterizedType) {
- outer: while (type != null && type != Object.class) {
+ outer:
+ while (type != null && type != Object.class) {
Class rawType;
if (type instanceof Class) {
// type is a class
@@ -73,8 +71,9 @@ public static ParameterizedType getSuperParameterizedType(Type type, Class su
for (Type interfaceType : rawType.getGenericInterfaces()) {
// interface type is class or parameterized type
Class interfaceClass =
- interfaceType instanceof Class ? (Class) interfaceType : getRawClass(
- (ParameterizedType) interfaceType);
+ interfaceType instanceof Class
+ ? (Class) interfaceType
+ : getRawClass((ParameterizedType) interfaceType);
if (superClass.isAssignableFrom(interfaceClass)) {
type = interfaceType;
continue outer;
@@ -103,10 +102,8 @@ public static boolean isAssignableToOrFrom(Class classToCheck, Class anoth
/**
* Creates a new instance of the given class by invoking its default constructor.
*
- *
- * The given class must be public and must have a public default constructor, and must not be an
- * array or an interface or be abstract. If an enclosing class, it must be static.
- *
+ * The given class must be public and must have a public default constructor, and must not be
+ * an array or an interface or be abstract. If an enclosing class, it must be static.
*/
public static T newInstance(Class clazz) {
// TODO(yanivi): investigate "sneaky" options for allocating the class that GSON uses, like
@@ -167,28 +164,27 @@ private static IllegalArgumentException handleExceptionForNewInstance(
/** Returns whether the given type is an array. */
public static boolean isArray(Type type) {
- return type instanceof GenericArrayType || type instanceof Class
- && ((Class) type).isArray();
+ return type instanceof GenericArrayType
+ || type instanceof Class && ((Class) type).isArray();
}
/**
* Returns the component type of the given array type, assuming {@link #isArray(Type)}.
*
- *
- * Return type will either be class, parameterized type, generic array type, or type variable, but
- * not a wildcard type.
- *
+ * Return type will either be class, parameterized type, generic array type, or type variable,
+ * but not a wildcard type.
*
* @throws ClassCastException if {@link #isArray(Type)} is false
*/
public static Type getArrayComponentType(Type array) {
- return array instanceof GenericArrayType ? ((GenericArrayType) array).getGenericComponentType()
+ return array instanceof GenericArrayType
+ ? ((GenericArrayType) array).getGenericComponentType()
: ((Class) array).getComponentType();
}
/**
- * Returns the raw class for the given parameter type as defined in
- * {@link ParameterizedType#getRawType()}.
+ * Returns the raw class for the given parameter type as defined in {@link
+ * ParameterizedType#getRawType()}.
*
* @param parameterType parameter type
* @return raw class
@@ -214,17 +210,15 @@ public static Type getBound(WildcardType wildcardType) {
/**
* Resolves the actual type of the given type variable that comes from a field type based on the
* given context list.
- *
- * In case the type variable can be resolved partially, it will return the partially resolved type
- * variable.
- *
+ *
+ * In case the type variable can be resolved partially, it will return the partially resolved
+ * type variable.
*
* @param context context list, ordering from least specific to most specific type context, for
- * example container class and then its field
+ * example container class and then its field
* @param typeVariable type variable
* @return resolved or partially resolved actual type (type variable, class, parameterized type,
- * or generic array type, but not wildcard type) or {@code null} if unable to resolve at
- * all
+ * or generic array type, but not wildcard type) or {@code null} if unable to resolve at all
*/
public static Type resolveTypeVariable(List context, TypeVariable typeVariable) {
// determine where the type variable was declared
@@ -265,11 +259,11 @@ public static Type resolveTypeVariable(List context, TypeVariable typeV
}
/**
- * Returns the raw array component type to use -- for example for the first parameter of
- * {@link Array#newInstance(Class, int)} -- for the given component type.
+ * Returns the raw array component type to use -- for example for the first parameter of {@link
+ * Array#newInstance(Class, int)} -- for the given component type.
*
* @param context context list, ordering from least specific to most specific type context, for
- * example container class and then its field
+ * example container class and then its field
* @param componentType array component type or {@code null} for {@code Object.class} result
* @return raw array component type
*/
@@ -295,10 +289,8 @@ public static Class getRawArrayComponentType(List context, Type compone
/**
* Returns the type parameter of {@link Iterable} that is assignable from the given iterable type.
*
- *
- * For example, for the type {@code ArrayList} -- or for a class that extends {@code
+ * For example, for the type {@code ArrayList} -- or for a class that extends {@code
* ArrayList} -- it will return {@code Integer}.
- *
*
* @param iterableType iterable type (must extend {@link Iterable})
* @return type parameter, which may be any type
@@ -310,10 +302,8 @@ public static Type getIterableParameter(Type iterableType) {
/**
* Returns the value type parameter of {@link Map} that is assignable from the given map type.
*
- *
- * For example, for the type {@code Map} -- or for a class that extends {@code
+ * For example, for the type {@code Map} -- or for a class that extends {@code
* Map} -- it will return {@code Integer}.
- *
*
* @param mapType map type (must extend {@link Map})
* @return type parameter, which may be any type
@@ -342,10 +332,9 @@ private static Type getActualParameterAtPosition(Type type, Class superClass,
/**
* Returns an iterable for an input iterable or array value.
*
- *
- * If the input value extends {@link Iterable}, it will just return the input value. Otherwise, it
- * will return an iterable that can handle arrays of primitive and non-primitive component type.
- *
+ * If the input value extends {@link Iterable}, it will just return the input value. Otherwise,
+ * it will return an iterable that can handle arrays of primitive and non-primitive component
+ * type.
*
* @param value iterable (extends {@link Iterable}) or array value
* @return iterable
@@ -408,6 +397,5 @@ public static Object toArray(Collection collection, Class componentType) {
return collection.toArray((Object[]) Array.newInstance(componentType, collection.size()));
}
- private Types() {
- }
+ private Types() {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/Value.java b/google-http-client/src/main/java/com/google/api/client/util/Value.java
index 52f24bf6a..bce75bfa8 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/Value.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/Value.java
@@ -22,28 +22,27 @@
/**
* Use this annotation to specify that an enum constant is a string data value, optionally providing
* the string data value to use.
- *
- * If the string data value is not specified, the default is the Java field's name. For example:
- *
+ *
+ * If the string data value is not specified, the default is the Java field's name. For example:
*
*
- public enum A {
-
- // value is "USE_FIELD_NAME"
- @Value
- USE_FIELD_NAME,
-
- // value is "specifiedValue"
- @Value("specifiedValue")
- USE_SPECIFIED_VALUE,
-
- // value is null
- @NullValue
- NULL_VALUE
-
- // not a value
- NOT_A_VALUE
- }
+ * public enum A {
+ *
+ * // value is "USE_FIELD_NAME"
+ * @Value
+ * USE_FIELD_NAME,
+ *
+ * // value is "specifiedValue"
+ * @Value("specifiedValue")
+ * USE_SPECIFIED_VALUE,
+ *
+ * // value is null
+ * @NullValue
+ * NULL_VALUE
+ *
+ * // not a value
+ * NOT_A_VALUE
+ * }
*
*
* @since 1.4
diff --git a/google-http-client/src/main/java/com/google/api/client/util/escape/CharEscapers.java b/google-http-client/src/main/java/com/google/api/client/util/escape/CharEscapers.java
index 49470c81b..b8ed2c11b 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/escape/CharEscapers.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/escape/CharEscapers.java
@@ -18,8 +18,8 @@
import java.net.URLDecoder;
/**
- * Utility functions for dealing with {@code CharEscaper}s, and some commonly used
- * {@code CharEscaper} instances.
+ * Utility functions for dealing with {@code CharEscaper}s, and some commonly used {@code
+ * CharEscaper} instances.
*
* @since 1.0
*/
@@ -44,32 +44,28 @@ public final class CharEscapers {
* Escapes the string value so it can be safely included in URIs. For details on escaping URIs,
* see RFC 3986 - section 2.4 .
*
- *
- * When encoding a String, the following rules apply:
+ *
When encoding a String, the following rules apply:
+ *
*
- * The alphanumeric characters "a" through "z", "A" through "Z" and "0" through "9" remain the
- * same.
- * The special characters ".", "-", "*", and "_" remain the same.
- * The space character " " is converted into a plus sign "+".
- * All other characters are converted into one or more bytes using UTF-8 encoding and each
- * byte is then represented by the 3-character string "%XY", where "XY" is the two-digit,
- * uppercase, hexadecimal representation of the byte value.
+ * The alphanumeric characters "a" through "z", "A" through "Z" and "0" through "9" remain
+ * the same.
+ * The special characters ".", "-", "*", and "_" remain the same.
+ * The space character " " is converted into a plus sign "+".
+ * All other characters are converted into one or more bytes using UTF-8 encoding and each
+ * byte is then represented by the 3-character string "%XY", where "XY" is the two-digit,
+ * uppercase, hexadecimal representation of the byte value.
*
- *
*
- *
- * Note : Unlike other escapers, URI escapers produce uppercase hexadecimal sequences. From
- * RFC 3986 :
Note : Unlike other escapers, URI escapers produce uppercase hexadecimal sequences.
+ * From RFC 3986 :"URI producers and normalizers should use uppercase hexadecimal digits for all
* percent-encodings."
- *
*
- *
- * This escaper has identical behavior to (but is potentially much faster than):
+ *
This escaper has identical behavior to (but is potentially much faster than):
+ *
*
- * {@link java.net.URLEncoder#encode(String, String)} with the encoding name "UTF-8"
+ * {@link java.net.URLEncoder#encode(String, String)} with the encoding name "UTF-8"
*
- *
*/
public static String escapeUri(String value) {
return URI_ESCAPER.escape(value);
@@ -79,10 +75,8 @@ public static String escapeUri(String value) {
* Percent-decodes a US-ASCII string into a Unicode string. UTF-8 encoding is used to determine
* what characters are represented by any consecutive sequences of the form "%XX ".
*
- *
- * This replaces each occurrence of '+' with a space, ' '. So this method should not be used for
- * non application/x-www-form-urlencoded strings such as host and path.
- *
+ * This replaces each occurrence of '+' with a space, ' '. So this method should not be used
+ * for non application/x-www-form-urlencoded strings such as host and path.
*
* @param uri a percent-encoded US-ASCII string
* @return a Unicode string
@@ -101,36 +95,33 @@ public static String decodeUri(String uri) {
* escaping URIs, see RFC 3986 - section
* 2.4 .
*
- *
- * When encoding a String, the following rules apply:
+ *
When encoding a String, the following rules apply:
+ *
*
- * The alphanumeric characters "a" through "z", "A" through "Z" and "0" through "9" remain the
- * same.
- * The unreserved characters ".", "-", "~", and "_" remain the same.
- * The general delimiters "@" and ":" remain the same.
- * The subdelimiters "!", "$", "&", "'", "(", ")", "*", ",", ";", and "=" remain the same.
- * The space character " " is converted into %20.
- * All other characters are converted into one or more bytes using UTF-8 encoding and each
- * byte is then represented by the 3-character string "%XY", where "XY" is the two-digit,
- * uppercase, hexadecimal representation of the byte value.
+ * The alphanumeric characters "a" through "z", "A" through "Z" and "0" through "9" remain
+ * the same.
+ * The unreserved characters ".", "-", "~", and "_" remain the same.
+ * The general delimiters "@" and ":" remain the same.
+ * The subdelimiters "!", "$", "&", "'", "(", ")", "*", ",", ";", and "=" remain the
+ * same.
+ * The space character " " is converted into %20.
+ * All other characters are converted into one or more bytes using UTF-8 encoding and each
+ * byte is then represented by the 3-character string "%XY", where "XY" is the two-digit,
+ * uppercase, hexadecimal representation of the byte value.
*
- *
*
- *
- * Note : Unlike other escapers, URI escapers produce uppercase hexadecimal sequences. From
- * RFC 3986 :
Note : Unlike other escapers, URI escapers produce uppercase hexadecimal sequences.
+ * From RFC 3986 :"URI producers and normalizers should use uppercase hexadecimal digits for all
* percent-encodings."
- *
*/
public static String escapeUriPath(String value) {
return URI_PATH_ESCAPER.escape(value);
}
/**
- * Escapes a URI path but retains all reserved characters, including all general delimiters.
- * That is the same as {@link #escapeUriPath(String)} except that it keeps '?', '+', and '/'
- * unescaped.
+ * Escapes a URI path but retains all reserved characters, including all general delimiters. That
+ * is the same as {@link #escapeUriPath(String)} except that it keeps '?', '+', and '/' unescaped.
*/
public static String escapeUriPathWithoutReserved(String value) {
return URI_RESERVED_ESCAPER.escape(value);
@@ -141,27 +132,25 @@ public static String escapeUriPathWithoutReserved(String value) {
* escaping URIs, see RFC 3986 - section
* 2.4 .
*
- *
- * When encoding a String, the following rules apply:
+ *
When encoding a String, the following rules apply:
+ *
*
- * The alphanumeric characters "a" through "z", "A" through "Z" and "0" through "9" remain the
- * same.
- * The unreserved characters ".", "-", "~", and "_" remain the same.
- * The general delimiter ":" remains the same.
- * The subdelimiters "!", "$", "&", "'", "(", ")", "*", ",", ";", and "=" remain the same.
- * The space character " " is converted into %20.
- * All other characters are converted into one or more bytes using UTF-8 encoding and each
- * byte is then represented by the 3-character string "%XY", where "XY" is the two-digit,
- * uppercase, hexadecimal representation of the byte value.
+ * The alphanumeric characters "a" through "z", "A" through "Z" and "0" through "9" remain
+ * the same.
+ * The unreserved characters ".", "-", "~", and "_" remain the same.
+ * The general delimiter ":" remains the same.
+ * The subdelimiters "!", "$", "&", "'", "(", ")", "*", ",", ";", and "=" remain the
+ * same.
+ * The space character " " is converted into %20.
+ * All other characters are converted into one or more bytes using UTF-8 encoding and each
+ * byte is then represented by the 3-character string "%XY", where "XY" is the two-digit,
+ * uppercase, hexadecimal representation of the byte value.
*
- *
*
- *
- * Note : Unlike other escapers, URI escapers produce uppercase hexadecimal sequences. From
- * RFC 3986 :
Note : Unlike other escapers, URI escapers produce uppercase hexadecimal sequences.
+ * From RFC 3986 :"URI producers and normalizers should use uppercase hexadecimal digits for all
* percent-encodings."
- *
*
* @since 1.15
*/
@@ -175,44 +164,36 @@ public static String escapeUriUserInfo(String value) {
* values should be individually encoded. If you escape an entire query string in one pass with
* this escaper, then the "=" and "&" characters used as separators will also be escaped.
*
- *
- * This escaper is also suitable for escaping fragment identifiers.
- *
+ * This escaper is also suitable for escaping fragment identifiers.
+ *
+ *
For details on escaping URIs, see RFC 3986 - section 2.4 .
*
- *
- * For details on escaping URIs, see RFC
- * 3986 - section 2.4 .
- *
+ * When encoding a String, the following rules apply:
*
- *
- * When encoding a String, the following rules apply:
*
- * The alphanumeric characters "a" through "z", "A" through "Z" and "0" through "9" remain the
- * same.
- * The unreserved characters ".", "-", "~", and "_" remain the same.
- * The general delimiters "@" and ":" remain the same.
- * The path delimiters "/" and "?" remain the same.
- * The subdelimiters "!", "$", "'", "(", ")", "*", ",", and ";", remain the same.
- * The space character " " is converted into %20.
- * The equals sign "=" is converted into %3D.
- * The ampersand "&" is converted into %26.
- * All other characters are converted into one or more bytes using UTF-8 encoding and each
- * byte is then represented by the 3-character string "%XY", where "XY" is the two-digit,
- * uppercase, hexadecimal representation of the byte value.
+ * The alphanumeric characters "a" through "z", "A" through "Z" and "0" through "9" remain
+ * the same.
+ * The unreserved characters ".", "-", "~", and "_" remain the same.
+ * The general delimiters "@" and ":" remain the same.
+ * The path delimiters "/" and "?" remain the same.
+ * The subdelimiters "!", "$", "'", "(", ")", "*", ",", and ";", remain the same.
+ * The space character " " is converted into %20.
+ * The equals sign "=" is converted into %3D.
+ * The ampersand "&" is converted into %26.
+ * All other characters are converted into one or more bytes using UTF-8 encoding and each
+ * byte is then represented by the 3-character string "%XY", where "XY" is the two-digit,
+ * uppercase, hexadecimal representation of the byte value.
*
- *
*
- *
- * Note : Unlike other escapers, URI escapers produce uppercase hexadecimal sequences. From
- * RFC 3986 :
Note : Unlike other escapers, URI escapers produce uppercase hexadecimal sequences.
+ * From RFC 3986 :"URI producers and normalizers should use uppercase hexadecimal digits for all
* percent-encodings."
- *
*/
public static String escapeUriQuery(String value) {
return URI_QUERY_STRING_ESCAPER.escape(value);
}
- private CharEscapers() {
- }
+ private CharEscapers() {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/escape/Escaper.java b/google-http-client/src/main/java/com/google/api/client/util/escape/Escaper.java
index 7c49418fb..ddf91c69b 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/escape/Escaper.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/escape/Escaper.java
@@ -19,18 +19,15 @@
* (such as an XML document). Typically (but not always), the inverse process of "unescaping" the
* text is performed automatically by the relevant parser.
*
- *
- * For example, an XML escaper would convert the literal string {@code "Foo"} into {@code
+ * For example, an XML escaper would convert the literal string {@code "Foo"} into {@code
* "Foo<Bar>"} to prevent {@code ""} from being confused with an XML tag. When the
* resulting XML document is parsed, the parser API will return this text as the original literal
* string {@code "Foo"}.
*
- *
- * An {@code Escaper} instance is required to be stateless, and safe when used concurrently by
+ *
An {@code Escaper} instance is required to be stateless, and safe when used concurrently by
* multiple threads.
*
- *
- * Several popular escapers are defined as constants in the class {@link CharEscapers}.
+ *
Several popular escapers are defined as constants in the class {@link CharEscapers}.
*
* @since 1.0
*/
@@ -39,20 +36,20 @@ public abstract class Escaper {
/**
* Returns the escaped form of a given literal string.
*
- *
- * Note that this method may treat input characters differently depending on the specific escaper
- * implementation.
+ *
Note that this method may treat input characters differently depending on the specific
+ * escaper implementation.
+ *
*
- * {@link UnicodeEscaper} handles UTF-16
- * correctly, including surrogate character pairs. If the input is badly formed the escaper should
- * throw {@link IllegalArgumentException}.
+ * {@link UnicodeEscaper} handles UTF-16
+ * correctly, including surrogate character pairs. If the input is badly formed the escaper
+ * should throw {@link IllegalArgumentException}.
*
*
* @param string the literal string to be escaped
* @return the escaped form of {@code string}
* @throws NullPointerException if {@code string} is null
* @throws IllegalArgumentException if {@code string} contains badly formed UTF-16 or cannot be
- * escaped for any other reason
+ * escaped for any other reason
*/
public abstract String escape(String string);
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/escape/PercentEscaper.java b/google-http-client/src/main/java/com/google/api/client/util/escape/PercentEscaper.java
index 996f681b3..cedd09afb 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/escape/PercentEscaper.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/escape/PercentEscaper.java
@@ -19,38 +19,34 @@
* scheme. The set of safe characters (those which remain unescaped) can be specified on
* construction.
*
- *
- * For details on escaping URIs for use in web pages, see For details on escaping URIs for use in web pages, see RFC 3986 - section 2.4 and RFC 3986 - appendix A
*
- *
- * When encoding a String, the following rules apply:
+ *
When encoding a String, the following rules apply:
+ *
*
- * The alphanumeric characters "a" through "z", "A" through "Z" and "0" through "9" remain the
- * same.
- * Any additionally specified safe characters remain the same.
- * If {@code plusForSpace} was specified, the space character " " is converted into a plus sign
- * "+".
- * All other characters are converted into one or more bytes using UTF-8 encoding and each byte
- * is then represented by the 3-character string "%XY", where "XY" is the two-digit, uppercase,
- * hexadecimal representation of the byte value.
+ * The alphanumeric characters "a" through "z", "A" through "Z" and "0" through "9" remain the
+ * same.
+ * Any additionally specified safe characters remain the same.
+ * If {@code plusForSpace} was specified, the space character " " is converted into a plus
+ * sign "+".
+ * All other characters are converted into one or more bytes using UTF-8 encoding and each
+ * byte is then represented by the 3-character string "%XY", where "XY" is the two-digit,
+ * uppercase, hexadecimal representation of the byte value.
*
*
- *
- * RFC 2396 specifies the set of unreserved characters as "-", "_", ".", "!", "~", "*", "'", "(" and
- * ")". It goes on to state:
+ *
RFC 2396 specifies the set of unreserved characters as "-", "_", ".", "!", "~", "*", "'", "("
+ * and ")". It goes on to state:
*
- *
- * Unreserved characters can be escaped without changing the semantics of the URI, but this
+ *
Unreserved characters can be escaped without changing the semantics of the URI, but this
* should not be done unless the URI is being used in a context that does not allow the unescaped
* character to appear.
*
- *
- * For performance reasons the only currently supported character encoding of this class is UTF-8.
+ *
For performance reasons the only currently supported character encoding of this class is
+ * UTF-8.
*
- *
- * Note : This escaper produces uppercase hexadecimal sequences. From Note : This escaper produces uppercase hexadecimal sequences. From RFC 3986 :"URI producers and normalizers should use uppercase hexadecimal digits for all
* percent-encodings."
@@ -58,9 +54,7 @@
* @since 1.0
*/
public class PercentEscaper extends UnicodeEscaper {
- /**
- * A string of safe characters that mimics the behavior of {@link java.net.URLEncoder}.
- */
+ /** A string of safe characters that mimics the behavior of {@link java.net.URLEncoder}. */
public static final String SAFECHARS_URLENCODER = "-_.*";
/**
@@ -72,8 +66,7 @@ public class PercentEscaper extends UnicodeEscaper {
/**
* Contains the save characters plus all reserved characters. This happens to be the safe path
- * characters plus those characters which are reserved for URI segments, namely '+', '/', and
- * '?'.
+ * characters plus those characters which are reserved for URI segments, namely '+', '/', and '?'.
*/
public static final String SAFE_PLUS_RESERVED_CHARS_URLENCODER = SAFEPATHCHARS_URLENCODER + "+/?";
@@ -98,9 +91,7 @@ public class PercentEscaper extends UnicodeEscaper {
private static final char[] UPPER_HEX_DIGITS = "0123456789ABCDEF".toCharArray();
- /**
- * If true we should convert space to the {@code +} character.
- */
+ /** If true we should convert space to the {@code +} character. */
private final boolean plusForSpace;
/**
@@ -115,7 +106,7 @@ public class PercentEscaper extends UnicodeEscaper {
* character.
*
* @param safeChars a non null string specifying additional safe characters for this escaper (the
- * ranges 0..9, a..z and A..Z are always safe and should not be specified here)
+ * ranges 0..9, a..z and A..Z are always safe and should not be specified here)
* @param plusForSpace true if ASCII space should be escaped to {@code +} rather than {@code %20}
* @throws IllegalArgumentException if any of the parameters were invalid
*/
@@ -196,9 +187,7 @@ public String escape(String s) {
return s;
}
- /**
- * Escapes the given Unicode code point in UTF-8.
- */
+ /** Escapes the given Unicode code point in UTF-8. */
@Override
protected char[] escape(int cp) {
// We should never get negative values here but if we do it will throw an
diff --git a/google-http-client/src/main/java/com/google/api/client/util/escape/Platform.java b/google-http-client/src/main/java/com/google/api/client/util/escape/Platform.java
index f54b0d208..db81b2836 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/escape/Platform.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/escape/Platform.java
@@ -14,12 +14,9 @@
package com.google.api.client.util.escape;
-/**
- * Methods factored out so that they can be emulated differently in GWT.
- */
+/** Methods factored out so that they can be emulated differently in GWT. */
final class Platform {
- private Platform() {
- }
+ private Platform() {}
/** Returns a thread-local 1024-char array. */
// DEST_TL.get() is not null because initialValue() below returns a non-null.
@@ -33,10 +30,11 @@ static char[] charBufferFromThreadLocal() {
* 1024 characters. If we grow past this we don't put it back in the threadlocal, we just keep
* going and grow as needed.
*/
- private static final ThreadLocal DEST_TL = new ThreadLocal() {
- @Override
- protected char[] initialValue() {
- return new char[1024];
- }
- };
+ private static final ThreadLocal DEST_TL =
+ new ThreadLocal() {
+ @Override
+ protected char[] initialValue() {
+ return new char[1024];
+ }
+ };
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/escape/UnicodeEscaper.java b/google-http-client/src/main/java/com/google/api/client/util/escape/UnicodeEscaper.java
index 66b47ac1c..1fdcf4079 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/escape/UnicodeEscaper.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/escape/UnicodeEscaper.java
@@ -19,23 +19,19 @@
* context (such as an XML document). Typically (but not always), the inverse process of
* "unescaping" the text is performed automatically by the relevant parser.
*
- *
- * For example, an XML escaper would convert the literal string {@code "Foo"} into {@code
+ * For example, an XML escaper would convert the literal string {@code "Foo"} into {@code
* "Foo<Bar>"} to prevent {@code ""} from being confused with an XML tag. When the
* resulting XML document is parsed, the parser API will return this text as the original literal
* string {@code "Foo"}.
*
- *
- * As there are important reasons, including potential security issues, to handle Unicode correctly
- * if you are considering implementing a new escaper you should favor using UnicodeEscaper wherever
- * possible.
+ *
As there are important reasons, including potential security issues, to handle Unicode
+ * correctly if you are considering implementing a new escaper you should favor using UnicodeEscaper
+ * wherever possible.
*
- *
- * A {@code UnicodeEscaper} instance is required to be stateless, and safe when used concurrently by
- * multiple threads.
+ *
A {@code UnicodeEscaper} instance is required to be stateless, and safe when used concurrently
+ * by multiple threads.
*
- *
- * Several popular escapers are defined as constants in the class {@link CharEscapers}. To create
+ *
Several popular escapers are defined as constants in the class {@link CharEscapers}. To create
* your own escapers extend this class and implement the {@link #escape(int)} method.
*
* @since 1.0
@@ -49,17 +45,14 @@ public abstract class UnicodeEscaper extends Escaper {
* does not need to be escaped. When called as part of an escaping operation, the given code point
* is guaranteed to be in the range {@code 0 <= cp <= Character#MAX_CODE_POINT}.
*
- *
- * If an empty array is returned, this effectively strips the input character from the resulting
- * text.
+ *
If an empty array is returned, this effectively strips the input character from the
+ * resulting text.
*
- *
- * If the character does not need to be escaped, this method should return {@code null}, rather
+ *
If the character does not need to be escaped, this method should return {@code null}, rather
* than an array containing the character representation of the code point. This enables the
* escaping algorithm to perform more efficiently.
*
- *
- * If the implementation of this method cannot correctly handle a particular code point then it
+ *
If the implementation of this method cannot correctly handle a particular code point then it
* should either throw an appropriate runtime exception or return a suitable replacement
* character. It must never silently discard invalid input as this may constitute a security risk.
*
@@ -72,35 +65,31 @@ public abstract class UnicodeEscaper extends Escaper {
* Scans a sub-sequence of characters from a given {@link CharSequence}, returning the index of
* the next character that requires escaping.
*
- *
- * Note: When implementing an escaper, it is a good idea to override this method for
+ *
Note: When implementing an escaper, it is a good idea to override this method for
* efficiency. The base class implementation determines successive Unicode code points and invokes
* {@link #escape(int)} for each of them. If the semantics of your escaper are such that code
* points in the supplementary range are either all escaped or all unescaped, this method can be
* implemented more efficiently using {@link CharSequence#charAt(int)}.
*
- *
- * Note however that if your escaper does not escape characters in the supplementary range, you
+ *
Note however that if your escaper does not escape characters in the supplementary range, you
* should either continue to validate the correctness of any surrogate characters encountered or
* provide a clear warning to users that your escaper does not validate its input.
*
- *
- * See {@link PercentEscaper} for an example.
+ *
See {@link PercentEscaper} for an example.
*
* @param csq a sequence of characters
* @param start the index of the first character to be scanned
* @param end the index immediately after the last character to be scanned
* @throws IllegalArgumentException if the scanned sub-sequence of {@code csq} contains invalid
- * surrogate pairs
+ * surrogate pairs
*/
protected abstract int nextEscapeIndex(CharSequence csq, int start, int end);
/**
* Returns the escaped form of a given literal string.
*
- *
- * If you are escaping input in arbitrary successive chunks, then it is not generally safe to use
- * this method. If an input string ends with an unmatched high surrogate character, then this
+ *
If you are escaping input in arbitrary successive chunks, then it is not generally safe to
+ * use this method. If an input string ends with an unmatched high surrogate character, then this
* method will throw {@link IllegalArgumentException}. You should ensure your input is valid UTF-16 before calling this method.
*
@@ -118,9 +107,8 @@ public abstract class UnicodeEscaper extends Escaper {
* protected to allow subclasses to override the fastpath escaping function to inline their
* escaping test.
*
- *
- * This method is not reentrant and may only be invoked by the top level {@link #escape(String)}
- * method.
+ *
This method is not reentrant and may only be invoked by the top level {@link
+ * #escape(String)} method.
*
* @param s the literal string to be escaped
* @param index the index to start escaping from
@@ -188,34 +176,33 @@ protected final String escapeSlow(String s, int index) {
/**
* Returns the Unicode code point of the character at the given index.
*
- *
- * Unlike {@link Character#codePointAt(CharSequence, int)} or {@link String#codePointAt(int)} this
- * method will never fail silently when encountering an invalid surrogate pair.
+ *
Unlike {@link Character#codePointAt(CharSequence, int)} or {@link String#codePointAt(int)}
+ * this method will never fail silently when encountering an invalid surrogate pair.
+ *
+ *
The behaviour of this method is as follows:
*
- *
- * The behaviour of this method is as follows:
- *
- * If {@code index >= end}, {@link IndexOutOfBoundsException} is thrown.
- * If the character at the specified index is not a surrogate, it is returned.
- * If the first character was a high surrogate value, then an attempt is made to read the next
- * character.
*
- * If the end of the sequence was reached, the negated value of the trailing high surrogate
- * is returned.
- * If the next character was a valid low surrogate, the code point value of the high/low
- * surrogate pair is returned.
- * If the next character was not a low surrogate value, then {@link IllegalArgumentException}
- * is thrown.
- *
- * If the first character was a low surrogate value, {@link IllegalArgumentException} is
- * thrown.
+ * If {@code index >= end}, {@link IndexOutOfBoundsException} is thrown.
+ * If the character at the specified index is not a surrogate, it is returned.
+ * If the first character was a high surrogate value, then an attempt is made to read the
+ * next character.
+ *
+ * If the end of the sequence was reached, the negated value of the trailing high
+ * surrogate is returned.
+ * If the next character was a valid low surrogate, the code point value of the
+ * high/low surrogate pair is returned.
+ * If the next character was not a low surrogate value, then {@link
+ * IllegalArgumentException} is thrown.
+ *
+ * If the first character was a low surrogate value, {@link IllegalArgumentException} is
+ * thrown.
*
*
* @param seq the sequence of characters from which to decode the code point
* @param index the index of the first character to decode
* @param end the index beyond the last valid character to decode
* @return the Unicode code point for the given index or the negated value of the trailing high
- * surrogate character at the end of the sequence
+ * surrogate character at the end of the sequence
*/
protected static int codePointAt(CharSequence seq, int index, int end) {
if (index < end) {
@@ -234,11 +221,19 @@ protected static int codePointAt(CharSequence seq, int index, int end) {
return Character.toCodePoint(c1, c2);
}
throw new IllegalArgumentException(
- "Expected low surrogate but got char '" + c2 + "' with value " + (int) c2 + " at index "
+ "Expected low surrogate but got char '"
+ + c2
+ + "' with value "
+ + (int) c2
+ + " at index "
+ index);
} else {
throw new IllegalArgumentException(
- "Unexpected low surrogate character '" + c1 + "' with value " + (int) c1 + " at index "
+ "Unexpected low surrogate character '"
+ + c1
+ + "' with value "
+ + (int) c1
+ + " at index "
+ (index - 1));
}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/escape/package-info.java b/google-http-client/src/main/java/com/google/api/client/util/escape/package-info.java
index 35367554b..09ec250f2 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/escape/package-info.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/escape/package-info.java
@@ -18,6 +18,4 @@
* @since 1.0
* @author Yaniv Inbar
*/
-
package com.google.api.client.util.escape;
-
diff --git a/google-http-client/src/main/java/com/google/api/client/util/package-info.java b/google-http-client/src/main/java/com/google/api/client/util/package-info.java
index 1875e047e..b6c2ee331 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/package-info.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/package-info.java
@@ -18,9 +18,7 @@
* @since 1.0
* @author Yaniv Inbar
*/
-
@ReflectionSupport(value = ReflectionSupport.Level.FULL)
package com.google.api.client.util;
import com.google.j2objc.annotations.ReflectionSupport;
-
diff --git a/google-http-client/src/main/java/com/google/api/client/util/store/AbstractDataStore.java b/google-http-client/src/main/java/com/google/api/client/util/store/AbstractDataStore.java
index d3688ceab..00cf7cc86 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/store/AbstractDataStore.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/store/AbstractDataStore.java
@@ -15,7 +15,6 @@
package com.google.api.client.util.store;
import com.google.api.client.util.Preconditions;
-
import java.io.IOException;
import java.io.Serializable;
import java.util.Collection;
@@ -25,7 +24,6 @@
* Abstract data store implementation.
*
* @param serializable type of the mapped value
- *
* @author Yaniv Inbar
* @since 1.16
*/
@@ -49,10 +47,8 @@ protected AbstractDataStore(DataStoreFactory dataStoreFactory, String id) {
/**
* {@inheritDoc}
*
- *
- * Overriding is only supported for the purpose of calling the super implementation and changing
- * the return type, but nothing else.
- *
+ * Overriding is only supported for the purpose of calling the super implementation and
+ * changing the return type, but nothing else.
*/
public DataStoreFactory getDataStoreFactory() {
return dataStoreFactory;
@@ -65,9 +61,7 @@ public final String getId() {
/**
* {@inheritDoc}
*
- *
- * Default implementation is to call {@link #get(String)} and check if it is {@code null}.
- *
+ * Default implementation is to call {@link #get(String)} and check if it is {@code null}.
*/
public boolean containsKey(String key) throws IOException {
return get(key) != null;
@@ -76,9 +70,7 @@ public boolean containsKey(String key) throws IOException {
/**
* {@inheritDoc}
*
- *
- * Default implementation is to call {@link Collection#contains(Object)} on {@link #values()}.
- *
+ * Default implementation is to call {@link Collection#contains(Object)} on {@link #values()}.
*/
public boolean containsValue(V value) throws IOException {
return values().contains(value);
@@ -87,9 +79,7 @@ public boolean containsValue(V value) throws IOException {
/**
* {@inheritDoc}
*
- *
- * Default implementation is to check if {@link #size()} is {@code 0}.
- *
+ * Default implementation is to check if {@link #size()} is {@code 0}.
*/
public boolean isEmpty() throws IOException {
return size() == 0;
@@ -98,9 +88,7 @@ public boolean isEmpty() throws IOException {
/**
* {@inheritDoc}
*
- *
- * Default implementation is to call {@link Set#size()} on {@link #keySet()}.
- *
+ * Default implementation is to call {@link Set#size()} on {@link #keySet()}.
*/
public int size() throws IOException {
return keySet().size();
diff --git a/google-http-client/src/main/java/com/google/api/client/util/store/AbstractDataStoreFactory.java b/google-http-client/src/main/java/com/google/api/client/util/store/AbstractDataStoreFactory.java
index 3e4c48959..0136e5a32 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/store/AbstractDataStoreFactory.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/store/AbstractDataStoreFactory.java
@@ -16,7 +16,6 @@
import com.google.api.client.util.Maps;
import com.google.api.client.util.Preconditions;
-
import java.io.IOException;
import java.io.Serializable;
import java.util.Map;
@@ -39,8 +38,8 @@ public abstract class AbstractDataStoreFactory implements DataStoreFactory {
private final Map> dataStoreMap = Maps.newHashMap();
/**
- * Pattern to control possible values for the {@code id} parameter of
- * {@link #getDataStore(String)}.
+ * Pattern to control possible values for the {@code id} parameter of {@link
+ * #getDataStore(String)}.
*/
private static final Pattern ID_PATTERN = Pattern.compile("\\w{1,30}");
@@ -64,9 +63,7 @@ public final DataStore getDataStore(String id) throw
/**
* Returns a new instance of a type-specific data store based on the given unique ID.
*
- *
- * The {@link DataStore#getId()} must match the {@code id} parameter from this method.
- *
+ * The {@link DataStore#getId()} must match the {@code id} parameter from this method.
*
* @param id unique ID to refer to typed data store
* @param serializable type of the mapped value
diff --git a/google-http-client/src/main/java/com/google/api/client/util/store/AbstractMemoryDataStore.java b/google-http-client/src/main/java/com/google/api/client/util/store/AbstractMemoryDataStore.java
index 863483a2b..daf796611 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/store/AbstractMemoryDataStore.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/store/AbstractMemoryDataStore.java
@@ -18,7 +18,6 @@
import com.google.api.client.util.Lists;
import com.google.api.client.util.Maps;
import com.google.api.client.util.Preconditions;
-
import java.io.IOException;
import java.io.Serializable;
import java.util.Arrays;
@@ -34,7 +33,6 @@
* Abstract, thread-safe, in-memory implementation of a data store factory.
*
* @param serializable type of the mapped value
- *
* @author Yaniv Inbar
*/
public class AbstractMemoryDataStore extends AbstractDataStore {
@@ -182,8 +180,7 @@ public int size() throws IOException {
* {@link #clear()}.
*/
@SuppressWarnings("unused")
- public void save() throws IOException {
- }
+ public void save() throws IOException {}
@Override
public String toString() {
diff --git a/google-http-client/src/main/java/com/google/api/client/util/store/DataStore.java b/google-http-client/src/main/java/com/google/api/client/util/store/DataStore.java
index 353bb0f43..3bd9cc64a 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/store/DataStore.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/store/DataStore.java
@@ -14,7 +14,6 @@
package com.google.api.client.util.store;
-
import java.io.IOException;
import java.io.Serializable;
import java.util.Collection;
@@ -24,12 +23,9 @@
* Stores and manages serializable data of a specific type, where the key is a string and the value
* is a {@link Serializable} object.
*
- *
- * {@code null} keys or values are not allowed. Implementation should be thread-safe.
- *
+ * {@code null} keys or values are not allowed. Implementation should be thread-safe.
*
* @param serializable type of the mapped value
- *
* @author Yaniv Inbar
* @since 1.16
*/
@@ -56,9 +52,7 @@ public interface DataStore {
/**
* Returns the unmodifiable set of all stored keys.
*
- *
- * Order of the keys is not specified.
- *
+ * Order of the keys is not specified.
*/
Set keySet() throws IOException;
diff --git a/google-http-client/src/main/java/com/google/api/client/util/store/DataStoreFactory.java b/google-http-client/src/main/java/com/google/api/client/util/store/DataStoreFactory.java
index 502a4c213..5d62b258c 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/store/DataStoreFactory.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/store/DataStoreFactory.java
@@ -14,7 +14,6 @@
package com.google.api.client.util.store;
-
import java.io.IOException;
import java.io.Serializable;
@@ -22,19 +21,15 @@
* Factory for a store that manages serializable data, where the key is a string and the value is a
* {@link Serializable} object.
*
- *
- * Users should keep a single globally shared instance of the data store factory. Otherwise, some
+ *
Users should keep a single globally shared instance of the data store factory. Otherwise, some
* implementations may not share the internal copies of the data, and you'll end up with multiple
* data stores by the same IDs, each living in a separate implementation. Some implementations may
* also have some overhead, or may have caching implemented, and so multiple instances may defeat
* that. Finally, have multiple instances may defeat the thread-safety guarantee for some
* implementations.
- *
*
- *
- * Implementation should store the data in a persistent storage such as a database. Implementation
- * should be thread-safe. Read the JavaDoc of the implementation for those details.
- *
+ * Implementation should store the data in a persistent storage such as a database.
+ * Implementation should be thread-safe. Read the JavaDoc of the implementation for those details.
*
* @see MemoryDataStoreFactory
* @see FileDataStoreFactory
@@ -46,16 +41,13 @@ public interface DataStoreFactory {
/**
* Returns a type-specific data store based on the given unique ID.
*
- *
- * If a data store by that ID does not already exist, it should be created now, stored for later
- * access, and returned. Otherwise, if there is already a data store by that ID, it should be
- * returned. The {@link DataStore#getId()} must match the {@code id} parameter from this method.
- *
+ * If a data store by that ID does not already exist, it should be created now, stored for
+ * later access, and returned. Otherwise, if there is already a data store by that ID, it should
+ * be returned. The {@link DataStore#getId()} must match the {@code id} parameter from this
+ * method.
*
- *
- * The ID must be at least 1 and at most 30 characters long, and must contain only alphanumeric or
- * underscore characters.
- *
+ * The ID must be at least 1 and at most 30 characters long, and must contain only alphanumeric
+ * or underscore characters.
*
* @param id unique ID to refer to typed data store
* @param serializable type of the mapped value
diff --git a/google-http-client/src/main/java/com/google/api/client/util/store/DataStoreUtils.java b/google-http-client/src/main/java/com/google/api/client/util/store/DataStoreUtils.java
index 9e5405c3d..23782cc96 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/store/DataStoreUtils.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/store/DataStoreUtils.java
@@ -14,7 +14,6 @@
package com.google.api.client.util.store;
-
import java.io.IOException;
/**
@@ -26,13 +25,11 @@
public final class DataStoreUtils {
/**
- * Returns a debug string for the given data store to be used as an implementation of
- * {@link Object#toString()}.
+ * Returns a debug string for the given data store to be used as an implementation of {@link
+ * Object#toString()}.
*
- *
- * Implementation iterates over {@link DataStore#keySet()}, calling {@link DataStore#get(String)}
- * on each key.
- *
+ * Implementation iterates over {@link DataStore#keySet()}, calling {@link
+ * DataStore#get(String)} on each key.
*
* @param dataStore data store
* @return debug string
@@ -56,6 +53,5 @@ public static String toString(DataStore dataStore) {
}
}
- private DataStoreUtils() {
- }
+ private DataStoreUtils() {}
}
diff --git a/google-http-client/src/main/java/com/google/api/client/util/store/FileDataStoreFactory.java b/google-http-client/src/main/java/com/google/api/client/util/store/FileDataStoreFactory.java
index 229ac95e3..3ee9eb87b 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/store/FileDataStoreFactory.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/store/FileDataStoreFactory.java
@@ -17,7 +17,6 @@
import com.google.api.client.util.IOUtils;
import com.google.api.client.util.Maps;
import com.google.api.client.util.Throwables;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -30,11 +29,9 @@
/**
* Thread-safe file implementation of a credential store.
*
- *
- * For security purposes, the file's permissions are set to be accessible only by the file's owner.
- * Note that Java 1.5 does not support manipulating file permissions, and must be done manually or
- * using the JNI.
- *
+ * For security purposes, the file's permissions are set to be accessible only by the file's
+ * owner. Note that Java 1.5 does not support manipulating file permissions, and must be done
+ * manually or using the JNI.
*
* @since 1.16
* @author Yaniv Inbar
@@ -46,9 +43,7 @@ public class FileDataStoreFactory extends AbstractDataStoreFactory {
/** Directory to store data. */
private final File dataDirectory;
- /**
- * @param dataDirectory data directory
- */
+ /** @param dataDirectory data directory */
public FileDataStoreFactory(File dataDirectory) throws IOException {
dataDirectory = dataDirectory.getCanonicalFile();
this.dataDirectory = dataDirectory;
@@ -144,8 +139,10 @@ static void setPermissionsToOwnerOnly(File file) throws IOException {
// shouldn't reach this point, but just in case...
throw new RuntimeException(cause);
} catch (NoSuchMethodException exception) {
- LOGGER.warning("Unable to set permissions for " + file
- + ", likely because you are running a version of Java prior to 1.6");
+ LOGGER.warning(
+ "Unable to set permissions for "
+ + file
+ + ", likely because you are running a version of Java prior to 1.6");
} catch (SecurityException exception) {
// ignored
} catch (IllegalAccessException exception) {
diff --git a/google-http-client/src/main/java/com/google/api/client/util/store/MemoryDataStoreFactory.java b/google-http-client/src/main/java/com/google/api/client/util/store/MemoryDataStoreFactory.java
index f51cf2469..5b2fe9cad 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/store/MemoryDataStoreFactory.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/store/MemoryDataStoreFactory.java
@@ -14,17 +14,13 @@
package com.google.api.client.util.store;
-
-
import java.io.IOException;
import java.io.Serializable;
/**
* Thread-safe in-memory implementation of a data store factory.
*
- *
- * For convenience, a default global instance is provided in {@link #getDefaultInstance()}.
- *
+ * For convenience, a default global instance is provided in {@link #getDefaultInstance()}.
*
* @since 1.16
* @author Yaniv Inbar
diff --git a/google-http-client/src/main/java/com/google/api/client/util/store/package-info.java b/google-http-client/src/main/java/com/google/api/client/util/store/package-info.java
index 2e9d65182..e05e7e478 100644
--- a/google-http-client/src/main/java/com/google/api/client/util/store/package-info.java
+++ b/google-http-client/src/main/java/com/google/api/client/util/store/package-info.java
@@ -19,4 +19,3 @@
* @author Yaniv Inbar
*/
package com.google.api.client.util.store;
-
diff --git a/google-http-client/src/test/java/com/google/api/client/http/AbstractHttpContentTest.java b/google-http-client/src/test/java/com/google/api/client/http/AbstractHttpContentTest.java
index 78269ae7b..93f3fa963 100644
--- a/google-http-client/src/test/java/com/google/api/client/http/AbstractHttpContentTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/http/AbstractHttpContentTest.java
@@ -52,8 +52,6 @@ public void writeTo(OutputStream out) throws IOException {
public boolean retrySupported() {
return retrySupported;
}
-
-
}
public void testRetrySupported() {
diff --git a/google-http-client/src/test/java/com/google/api/client/http/BasicAuthenticationTest.java b/google-http-client/src/test/java/com/google/api/client/http/BasicAuthenticationTest.java
index 5b3d62b71..a76081275 100644
--- a/google-http-client/src/test/java/com/google/api/client/http/BasicAuthenticationTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/http/BasicAuthenticationTest.java
@@ -16,7 +16,6 @@
import com.google.api.client.testing.http.HttpTesting;
import com.google.api.client.testing.http.MockHttpTransport;
-
import junit.framework.TestCase;
/**
@@ -41,8 +40,9 @@ public void testConstructor() {
public void testInitialize() throws Exception {
BasicAuthentication auth = new BasicAuthentication(USERNAME, PASSWORD);
HttpRequest request =
- new MockHttpTransport().createRequestFactory().buildGetRequest(
- HttpTesting.SIMPLE_GENERIC_URL);
+ new MockHttpTransport()
+ .createRequestFactory()
+ .buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
auth.intercept(request);
assertEquals(AUTH_HEADER, request.getHeaders().getAuthorization());
}
diff --git a/google-http-client/src/test/java/com/google/api/client/http/EmptyContentTest.java b/google-http-client/src/test/java/com/google/api/client/http/EmptyContentTest.java
index 501e9d70e..743fc75e1 100644
--- a/google-http-client/src/test/java/com/google/api/client/http/EmptyContentTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/http/EmptyContentTest.java
@@ -14,7 +14,6 @@
package com.google.api.client.http;
-
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import junit.framework.TestCase;
diff --git a/google-http-client/src/test/java/com/google/api/client/http/ExponentialBackOffPolicyTest.java b/google-http-client/src/test/java/com/google/api/client/http/ExponentialBackOffPolicyTest.java
index fc9dc9bd1..5a0cb0494 100644
--- a/google-http-client/src/test/java/com/google/api/client/http/ExponentialBackOffPolicyTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/http/ExponentialBackOffPolicyTest.java
@@ -15,7 +15,6 @@
package com.google.api.client.http;
import com.google.api.client.util.NanoClock;
-
import junit.framework.TestCase;
/**
@@ -32,31 +31,39 @@ public ExponentialBackOffPolicyTest(String name) {
public void testConstructor() {
ExponentialBackOffPolicy backOffPolicy = new ExponentialBackOffPolicy();
- assertEquals(ExponentialBackOffPolicy.DEFAULT_INITIAL_INTERVAL_MILLIS,
+ assertEquals(
+ ExponentialBackOffPolicy.DEFAULT_INITIAL_INTERVAL_MILLIS,
backOffPolicy.getInitialIntervalMillis());
- assertEquals(ExponentialBackOffPolicy.DEFAULT_INITIAL_INTERVAL_MILLIS,
+ assertEquals(
+ ExponentialBackOffPolicy.DEFAULT_INITIAL_INTERVAL_MILLIS,
backOffPolicy.getCurrentIntervalMillis());
- assertEquals(ExponentialBackOffPolicy.DEFAULT_RANDOMIZATION_FACTOR,
+ assertEquals(
+ ExponentialBackOffPolicy.DEFAULT_RANDOMIZATION_FACTOR,
backOffPolicy.getRandomizationFactor());
assertEquals(ExponentialBackOffPolicy.DEFAULT_MULTIPLIER, backOffPolicy.getMultiplier());
assertEquals(
ExponentialBackOffPolicy.DEFAULT_MAX_INTERVAL_MILLIS, backOffPolicy.getMaxIntervalMillis());
- assertEquals(ExponentialBackOffPolicy.DEFAULT_MAX_ELAPSED_TIME_MILLIS,
+ assertEquals(
+ ExponentialBackOffPolicy.DEFAULT_MAX_ELAPSED_TIME_MILLIS,
backOffPolicy.getMaxElapsedTimeMillis());
}
public void testBuilder() {
ExponentialBackOffPolicy backOffPolicy = ExponentialBackOffPolicy.builder().build();
- assertEquals(ExponentialBackOffPolicy.DEFAULT_INITIAL_INTERVAL_MILLIS,
+ assertEquals(
+ ExponentialBackOffPolicy.DEFAULT_INITIAL_INTERVAL_MILLIS,
backOffPolicy.getInitialIntervalMillis());
- assertEquals(ExponentialBackOffPolicy.DEFAULT_INITIAL_INTERVAL_MILLIS,
+ assertEquals(
+ ExponentialBackOffPolicy.DEFAULT_INITIAL_INTERVAL_MILLIS,
backOffPolicy.getCurrentIntervalMillis());
- assertEquals(ExponentialBackOffPolicy.DEFAULT_RANDOMIZATION_FACTOR,
+ assertEquals(
+ ExponentialBackOffPolicy.DEFAULT_RANDOMIZATION_FACTOR,
backOffPolicy.getRandomizationFactor());
assertEquals(ExponentialBackOffPolicy.DEFAULT_MULTIPLIER, backOffPolicy.getMultiplier());
assertEquals(
ExponentialBackOffPolicy.DEFAULT_MAX_INTERVAL_MILLIS, backOffPolicy.getMaxIntervalMillis());
- assertEquals(ExponentialBackOffPolicy.DEFAULT_MAX_ELAPSED_TIME_MILLIS,
+ assertEquals(
+ ExponentialBackOffPolicy.DEFAULT_MAX_ELAPSED_TIME_MILLIS,
backOffPolicy.getMaxElapsedTimeMillis());
int testInitialInterval = 1;
@@ -65,13 +72,14 @@ public void testBuilder() {
int testMaxInterval = 10;
int testMaxElapsedTime = 900000;
- backOffPolicy = ExponentialBackOffPolicy.builder()
- .setInitialIntervalMillis(testInitialInterval)
- .setRandomizationFactor(testRandomizationFactor)
- .setMultiplier(testMultiplier)
- .setMaxIntervalMillis(testMaxInterval)
- .setMaxElapsedTimeMillis(testMaxElapsedTime)
- .build();
+ backOffPolicy =
+ ExponentialBackOffPolicy.builder()
+ .setInitialIntervalMillis(testInitialInterval)
+ .setRandomizationFactor(testRandomizationFactor)
+ .setMultiplier(testMultiplier)
+ .setMaxIntervalMillis(testMaxInterval)
+ .setMaxElapsedTimeMillis(testMaxElapsedTime)
+ .build();
assertEquals(testInitialInterval, backOffPolicy.getInitialIntervalMillis());
assertEquals(testInitialInterval, backOffPolicy.getCurrentIntervalMillis());
assertEquals(testRandomizationFactor, backOffPolicy.getRandomizationFactor());
@@ -87,13 +95,14 @@ public void testBackOff() throws Exception {
int testMaxInterval = 5000;
int testMaxElapsedTime = 900000;
- ExponentialBackOffPolicy backOffPolicy = ExponentialBackOffPolicy.builder()
- .setInitialIntervalMillis(testInitialInterval)
- .setRandomizationFactor(testRandomizationFactor)
- .setMultiplier(testMultiplier)
- .setMaxIntervalMillis(testMaxInterval)
- .setMaxElapsedTimeMillis(testMaxElapsedTime)
- .build();
+ ExponentialBackOffPolicy backOffPolicy =
+ ExponentialBackOffPolicy.builder()
+ .setInitialIntervalMillis(testInitialInterval)
+ .setRandomizationFactor(testRandomizationFactor)
+ .setMultiplier(testMultiplier)
+ .setMaxIntervalMillis(testMaxInterval)
+ .setMaxElapsedTimeMillis(testMaxElapsedTime)
+ .build();
int[] expectedResults = {500, 1000, 2000, 4000, 5000, 5000, 5000, 5000, 5000, 5000};
for (int expected : expectedResults) {
assertEquals(expected, backOffPolicy.getCurrentIntervalMillis());
@@ -110,8 +119,7 @@ static class MyNanoClock implements NanoClock {
private int i = 0;
private long startSeconds;
- MyNanoClock() {
- }
+ MyNanoClock() {}
MyNanoClock(long startSeconds) {
this.startSeconds = startSeconds;
@@ -133,11 +141,12 @@ public void testBackOffOverflow() throws Exception {
int testInitialInterval = Integer.MAX_VALUE / 2;
double testMultiplier = 2.1;
int testMaxInterval = Integer.MAX_VALUE;
- ExponentialBackOffPolicy backOffPolicy = ExponentialBackOffPolicy.builder()
- .setInitialIntervalMillis(testInitialInterval)
- .setMultiplier(testMultiplier)
- .setMaxIntervalMillis(testMaxInterval)
- .build();
+ ExponentialBackOffPolicy backOffPolicy =
+ ExponentialBackOffPolicy.builder()
+ .setInitialIntervalMillis(testInitialInterval)
+ .setMultiplier(testMultiplier)
+ .setMaxIntervalMillis(testMaxInterval)
+ .build();
backOffPolicy.getNextBackOffMillis();
// Assert that when an overflow is possible the current interval is set to the max interval.
assertEquals(testMaxInterval, backOffPolicy.getCurrentIntervalMillis());
diff --git a/google-http-client/src/test/java/com/google/api/client/http/GZipEncodingTest.java b/google-http-client/src/test/java/com/google/api/client/http/GZipEncodingTest.java
index 8746a5c66..5ecd0f8e9 100644
--- a/google-http-client/src/test/java/com/google/api/client/http/GZipEncodingTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/http/GZipEncodingTest.java
@@ -14,7 +14,6 @@
package com.google.api.client.http;
-
import com.google.api.client.testing.util.TestableByteArrayOutputStream;
import com.google.api.client.util.ByteArrayStreamingContent;
import com.google.api.client.util.StringUtils;
@@ -29,8 +28,11 @@
*/
public class GZipEncodingTest extends TestCase {
- byte[] EXPECED_ZIPPED = new byte[] {31, -117, 8, 0, 0, 0, 0, 0, 0, 0, -53, -49, -57, 13, 0, -30,
- -66, -14, 54, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+ byte[] EXPECED_ZIPPED =
+ new byte[] {
+ 31, -117, 8, 0, 0, 0, 0, 0, 0, 0, -53, -49, -57, 13, 0, -30, -66, -14, 54, 28, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0
+ };
public void test() throws IOException {
GZipEncoding encoding = new GZipEncoding();
diff --git a/google-http-client/src/test/java/com/google/api/client/http/GenericUrlTest.java b/google-http-client/src/test/java/com/google/api/client/http/GenericUrlTest.java
index f4a8b22a2..3ef972479 100644
--- a/google-http-client/src/test/java/com/google/api/client/http/GenericUrlTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/http/GenericUrlTest.java
@@ -34,8 +34,7 @@
*/
public class GenericUrlTest extends TestCase {
- public GenericUrlTest() {
- }
+ public GenericUrlTest() {}
public GenericUrlTest(String name) {
super(name);
@@ -142,13 +141,11 @@ public void testParse_longPath() {
}
public static class TestUrl extends GenericUrl {
- @Key
- String foo;
+ @Key String foo;
public String hidden;
- public TestUrl() {
- }
+ public TestUrl() {}
public TestUrl(String encodedUrl) {
super(encodedUrl);
@@ -157,9 +154,13 @@ public TestUrl(String encodedUrl) {
private static final String FULL =
"https://user:%3Cpa&$w%40rd%3E@www.google.com:223/m8/feeds/contacts/"
- + "someone=%23%25&%20%3F%3Co%3E%7B%7D@gmail.com/"
- + "full?" + "foo=bar&" + "alt=json&" + "max-results=3&" + "prettyprint=true&"
- + "q=Go%3D%23/%25%26%20?%3Co%3Egle#%3CD@WNL:ADING%3E";
+ + "someone=%23%25&%20%3F%3Co%3E%7B%7D@gmail.com/"
+ + "full?"
+ + "foo=bar&"
+ + "alt=json&"
+ + "max-results=3&"
+ + "prettyprint=true&"
+ + "q=Go%3D%23/%25%26%20?%3Co%3Egle#%3CD@WNL:ADING%3E";
private static final List FULL_PARTS =
Arrays.asList("", "m8", "feeds", "contacts", "someone=#%& ?{}@gmail.com", "full");
@@ -174,7 +175,9 @@ public void testBuild_full() {
url.setPort(223);
url.setPathParts(FULL_PARTS);
url.set("alt", "json")
- .set("max-results", 3).set("prettyprint", true).set("q", "Go=#/%& ?gle");
+ .set("max-results", 3)
+ .set("prettyprint", true)
+ .set("q", "Go=#/%& ?gle");
url.foo = "bar";
url.hidden = "invisible";
url.setFragment(FRAGMENT);
@@ -230,31 +233,23 @@ private void subtestFull(GenericUrl url) {
public static class FieldTypesUrl extends GenericUrl {
- @Key
- Boolean B;
+ @Key Boolean B;
- @Key
- Double D;
+ @Key Double D;
- @Key
- Integer I;
+ @Key Integer I;
- @Key
- boolean b;
+ @Key boolean b;
- @Key
- double d;
+ @Key double d;
- @Key
- int i;
+ @Key int i;
- @Key
- String s;
+ @Key String s;
String hidden;
- FieldTypesUrl() {
- }
+ FieldTypesUrl() {}
FieldTypesUrl(String encodedUrl) {
super(encodedUrl);
diff --git a/google-http-client/src/test/java/com/google/api/client/http/HttpBackOffUnsuccessfulResponseHandlerTest.java b/google-http-client/src/test/java/com/google/api/client/http/HttpBackOffUnsuccessfulResponseHandlerTest.java
index a5dd36538..7393ae318 100644
--- a/google-http-client/src/test/java/com/google/api/client/http/HttpBackOffUnsuccessfulResponseHandlerTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/http/HttpBackOffUnsuccessfulResponseHandlerTest.java
@@ -33,11 +33,16 @@ public void testHandleResponse_retryFalse() throws IOException {
}
public void testHandleResponse_requiredFalse() throws IOException {
- subsetHandleResponse(0, 0, true, new MockBackOff(), new BackOffRequired() {
- public boolean isRequired(HttpResponse response) {
- return false;
- }
- });
+ subsetHandleResponse(
+ 0,
+ 0,
+ true,
+ new MockBackOff(),
+ new BackOffRequired() {
+ public boolean isRequired(HttpResponse response) {
+ return false;
+ }
+ });
}
public void testHandleResponse_requiredTrue() throws IOException {
@@ -52,8 +57,10 @@ private void subsetHandleResponse(
throws IOException {
// create the handler
MockSleeper sleeper = new MockSleeper();
- HttpBackOffUnsuccessfulResponseHandler handler = new HttpBackOffUnsuccessfulResponseHandler(
- backOff).setSleeper(sleeper).setBackOffRequired(backOffRequired);
+ HttpBackOffUnsuccessfulResponseHandler handler =
+ new HttpBackOffUnsuccessfulResponseHandler(backOff)
+ .setSleeper(sleeper)
+ .setBackOffRequired(backOffRequired);
while (handler.handleResponse(null, null, retry)) {
assertEquals(millis, sleeper.getLastMillis());
diff --git a/google-http-client/src/test/java/com/google/api/client/http/HttpEncodingStreamingContentTest.java b/google-http-client/src/test/java/com/google/api/client/http/HttpEncodingStreamingContentTest.java
index 42fec080a..f353004a2 100644
--- a/google-http-client/src/test/java/com/google/api/client/http/HttpEncodingStreamingContentTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/http/HttpEncodingStreamingContentTest.java
@@ -28,8 +28,11 @@
*/
public class HttpEncodingStreamingContentTest extends TestCase {
- byte[] EXPECED_ZIPPED = new byte[] {31, -117, 8, 0, 0, 0, 0, 0, 0, 0, -53, -49, -57, 13, 0, -30,
- -66, -14, 54, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+ byte[] EXPECED_ZIPPED =
+ new byte[] {
+ 31, -117, 8, 0, 0, 0, 0, 0, 0, 0, -53, -49, -57, 13, 0, -30, -66, -14, 54, 28, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0
+ };
public void test() throws IOException {
GZipEncoding encoding = new GZipEncoding();
diff --git a/google-http-client/src/test/java/com/google/api/client/http/HttpHeadersTest.java b/google-http-client/src/test/java/com/google/api/client/http/HttpHeadersTest.java
index 1112f5bc9..70f76cd32 100644
--- a/google-http-client/src/test/java/com/google/api/client/http/HttpHeadersTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/http/HttpHeadersTest.java
@@ -34,8 +34,7 @@
*/
public class HttpHeadersTest extends TestCase {
- public HttpHeadersTest() {
- }
+ public HttpHeadersTest() {}
public HttpHeadersTest(String name) {
super(name);
@@ -50,29 +49,21 @@ public void testBasicAuthentication() {
public static class MyHeaders extends HttpHeaders {
- @Key
- public String foo;
+ @Key public String foo;
- @Key
- Object objNum;
+ @Key Object objNum;
- @Key
- Object objList;
+ @Key Object objList;
- @Key
- long someLong;
+ @Key long someLong;
- @Key
- List list;
+ @Key List list;
- @Key
- String[] r;
+ @Key String[] r;
- @Key
- E value;
+ @Key E value;
- @Key
- E otherValue;
+ @Key E otherValue;
}
public void testSerializeHeaders() throws Exception {
@@ -109,7 +100,8 @@ public void testSerializeHeaders() throws Exception {
assertEquals(ImmutableList.of("b"), lowLevelRequest.getHeaderValues("a"));
assertEquals(ImmutableList.of("VALUE"), lowLevelRequest.getHeaderValues("value"));
assertEquals(ImmutableList.of("other"), lowLevelRequest.getHeaderValues("othervalue"));
- assertEquals(ImmutableList.of(String.valueOf(Long.MAX_VALUE)),
+ assertEquals(
+ ImmutableList.of(String.valueOf(Long.MAX_VALUE)),
lowLevelRequest.getHeaderValues("content-length"));
HttpHeaders.serializeHeadersForMultipartRequests(myHeaders, null, null, writer);
@@ -234,7 +226,8 @@ public void testHeaderStringValues() {
assertEquals(ImmutableList.of("b"), myHeaders.getHeaderStringValues("a"));
assertEquals(ImmutableList.of("VALUE"), myHeaders.getHeaderStringValues("value"));
assertEquals(ImmutableList.of("other"), myHeaders.getHeaderStringValues("othervalue"));
- assertEquals(ImmutableList.of(String.valueOf(Long.MAX_VALUE)),
+ assertEquals(
+ ImmutableList.of(String.valueOf(Long.MAX_VALUE)),
myHeaders.getHeaderStringValues("content-length"));
}
@@ -244,8 +237,10 @@ public static class SlugHeaders extends HttpHeaders {
}
public void testParseAge() throws Exception {
- MockLowLevelHttpResponse httpResponse = new MockLowLevelHttpResponse().setHeaderNames(
- Arrays.asList("Age")).setHeaderValues(Arrays.asList("3456"));
+ MockLowLevelHttpResponse httpResponse =
+ new MockLowLevelHttpResponse()
+ .setHeaderNames(Arrays.asList("Age"))
+ .setHeaderValues(Arrays.asList("3456"));
HttpHeaders httpHeaders = new HttpHeaders();
httpHeaders.fromHttpResponse(httpResponse, null);
@@ -253,9 +248,10 @@ public void testParseAge() throws Exception {
}
public void testFromHttpResponse_normalFlow() throws Exception {
- MockLowLevelHttpResponse httpResponse = new MockLowLevelHttpResponse().setHeaderNames(
- Arrays.asList("Content-Type", "Slug"))
- .setHeaderValues(Arrays.asList("foo/bar", "123456789"));
+ MockLowLevelHttpResponse httpResponse =
+ new MockLowLevelHttpResponse()
+ .setHeaderNames(Arrays.asList("Content-Type", "Slug"))
+ .setHeaderValues(Arrays.asList("foo/bar", "123456789"));
// Test the normal HttpHeaders class
HttpHeaders httpHeaders = new HttpHeaders();
@@ -271,9 +267,10 @@ public void testFromHttpResponse_normalFlow() throws Exception {
}
public void testFromHttpResponse_doubleConvert() throws Exception {
- MockLowLevelHttpResponse httpResponse = new MockLowLevelHttpResponse().setHeaderNames(
- Arrays.asList("Content-Type", "Slug"))
- .setHeaderValues(Arrays.asList("foo/bar", "123456789"));
+ MockLowLevelHttpResponse httpResponse =
+ new MockLowLevelHttpResponse()
+ .setHeaderNames(Arrays.asList("Content-Type", "Slug"))
+ .setHeaderValues(Arrays.asList("foo/bar", "123456789"));
// Test the normal HttpHeaders class
SlugHeaders slugHeaders = new SlugHeaders();
@@ -291,21 +288,24 @@ public void testFromHttpResponse_doubleConvert() throws Exception {
public void testFromHttpResponse_clearOldValue() throws Exception {
HttpHeaders headers = new HttpHeaders();
headers.put("Foo", "oldValue");
- headers.fromHttpResponse(new MockLowLevelHttpResponse().setHeaderNames(Arrays.asList("Foo"))
- .setHeaderValues(Arrays.asList("newvalue")), null);
+ headers.fromHttpResponse(
+ new MockLowLevelHttpResponse()
+ .setHeaderNames(Arrays.asList("Foo"))
+ .setHeaderValues(Arrays.asList("newvalue")),
+ null);
assertEquals(Arrays.asList("newvalue"), headers.get("Foo"));
}
public static class V extends HttpHeaders {
- @Key
- Void v;
- @Key
- String s;
+ @Key Void v;
+ @Key String s;
}
public void testFromHttpResponse_void(String value) throws Exception {
- MockLowLevelHttpResponse httpResponse = new MockLowLevelHttpResponse().setHeaderNames(
- Arrays.asList("v", "v", "s")).setHeaderValues(Arrays.asList("ignore", "ignore2", "svalue"));
+ MockLowLevelHttpResponse httpResponse =
+ new MockLowLevelHttpResponse()
+ .setHeaderNames(Arrays.asList("v", "v", "s"))
+ .setHeaderValues(Arrays.asList("ignore", "ignore2", "svalue"));
V v = new V();
v.fromHttpResponse(httpResponse, null);
assertNull(v.v);
diff --git a/google-http-client/src/test/java/com/google/api/client/http/HttpMediaTypeTest.java b/google-http-client/src/test/java/com/google/api/client/http/HttpMediaTypeTest.java
index 80765d409..91342a144 100644
--- a/google-http-client/src/test/java/com/google/api/client/http/HttpMediaTypeTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/http/HttpMediaTypeTest.java
@@ -76,7 +76,8 @@ public void testFromString_null() {
try {
new HttpMediaType(null);
fail("Method did not NullPointerException");
- } catch (NullPointerException expected) {}
+ } catch (NullPointerException expected) {
+ }
}
public void testFromString_multipartSpec() {
@@ -109,7 +110,8 @@ public void testSetMainType_invalid() {
try {
new HttpMediaType("text", "plain").setType("foo/bar");
fail("Method did not throw IllegalArgumentException");
- } catch (IllegalArgumentException expected) {}
+ } catch (IllegalArgumentException expected) {
+ }
}
public void testSetSubType() {
@@ -120,7 +122,8 @@ public void testSetSubType_invalid() {
try {
new HttpMediaType("text", "plain").setSubType("foo/bar");
fail("Method did not throw IllegalArgumentException");
- } catch (IllegalArgumentException expected) {}
+ } catch (IllegalArgumentException expected) {
+ }
}
public void testSetParameter_casing() {
@@ -169,10 +172,14 @@ public void testCharset() {
}
public void testEqualsIgnoreParameters() {
- assertEquals(true, new HttpMediaType("foo/bar").equalsIgnoreParameters(new HttpMediaType("Foo/bar")));
- assertEquals(true, new HttpMediaType("foo/bar").equalsIgnoreParameters(
- new HttpMediaType("foo/bar; charset=utf-8")));
- assertEquals(false, new HttpMediaType("foo/bar").equalsIgnoreParameters(new HttpMediaType("bar/foo")));
+ assertEquals(
+ true, new HttpMediaType("foo/bar").equalsIgnoreParameters(new HttpMediaType("Foo/bar")));
+ assertEquals(
+ true,
+ new HttpMediaType("foo/bar")
+ .equalsIgnoreParameters(new HttpMediaType("foo/bar; charset=utf-8")));
+ assertEquals(
+ false, new HttpMediaType("foo/bar").equalsIgnoreParameters(new HttpMediaType("bar/foo")));
assertEquals(false, new HttpMediaType("foo/bar").equalsIgnoreParameters(null));
}
diff --git a/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java b/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java
index fc0e016ba..946f5961f 100644
--- a/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java
@@ -100,6 +100,7 @@ public void testNotSupportedByDefault() throws Exception {
static class MockExecutor implements Executor {
private Runnable runnable;
+
public void actuallyRun() {
runnable.run();
}
@@ -110,14 +111,13 @@ public void execute(Runnable command) {
}
@Deprecated
- static private class MockBackOffPolicy implements BackOffPolicy {
+ private static class MockBackOffPolicy implements BackOffPolicy {
int backOffCalls;
int resetCalls;
boolean returnBackOffStop;
- MockBackOffPolicy() {
- }
+ MockBackOffPolicy() {}
public boolean isBackOffRequired(int statusCode) {
switch (statusCode) {
@@ -142,9 +142,7 @@ public long getNextBackOffMillis() {
}
}
- /**
- * Transport used for testing the redirection logic in HttpRequest.
- */
+ /** Transport used for testing the redirection logic in HttpRequest. */
static class RedirectTransport extends MockHttpTransport {
int lowLevelExecCalls;
@@ -154,31 +152,34 @@ static class RedirectTransport extends MockHttpTransport {
int redirectStatusCode = HttpStatusCodes.STATUS_CODE_MOVED_PERMANENTLY;
String[] expectedContent;
- LowLevelHttpRequest retryableGetRequest = new MockLowLevelHttpRequest() {
+ LowLevelHttpRequest retryableGetRequest =
+ new MockLowLevelHttpRequest() {
- @Override
- public LowLevelHttpResponse execute() throws IOException {
- if (expectedContent != null) {
- assertEquals(String.valueOf(lowLevelExecCalls), expectedContent[lowLevelExecCalls],
- getContentAsString());
- }
- lowLevelExecCalls++;
- if (infiniteRedirection || lowLevelExecCalls == 1) {
- // Return redirect on only the first call.
- // If infiniteRedirection is true then always return the redirect status code.
- MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
- response.setStatusCode(redirectStatusCode);
- if (!removeLocation) {
- response.addHeader("Location", HttpTesting.SIMPLE_URL);
+ @Override
+ public LowLevelHttpResponse execute() throws IOException {
+ if (expectedContent != null) {
+ assertEquals(
+ String.valueOf(lowLevelExecCalls),
+ expectedContent[lowLevelExecCalls],
+ getContentAsString());
+ }
+ lowLevelExecCalls++;
+ if (infiniteRedirection || lowLevelExecCalls == 1) {
+ // Return redirect on only the first call.
+ // If infiniteRedirection is true then always return the redirect status code.
+ MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
+ response.setStatusCode(redirectStatusCode);
+ if (!removeLocation) {
+ response.addHeader("Location", HttpTesting.SIMPLE_URL);
+ }
+ return response;
+ }
+ // Return success on the second if infiniteRedirection is False.
+ MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
+ response.setContent("{\"data\":{\"foo\":{\"v1\":{}}}}");
+ return response;
}
- return response;
- }
- // Return success on the second if infiniteRedirection is False.
- MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
- response.setContent("{\"data\":{\"foo\":{\"v1\":{}}}}");
- return response;
- }
- };
+ };
@Override
public LowLevelHttpRequest buildRequest(String method, String url) {
@@ -190,13 +191,15 @@ private void setBackOffUnsuccessfulResponseHandler(
HttpRequest request, BackOff backOff, final HttpUnsuccessfulResponseHandler handler) {
final HttpBackOffUnsuccessfulResponseHandler backOffHandler =
new HttpBackOffUnsuccessfulResponseHandler(backOff).setSleeper(new MockSleeper());
- request.setUnsuccessfulResponseHandler(new HttpUnsuccessfulResponseHandler() {
- public boolean handleResponse(
- HttpRequest request, HttpResponse response, boolean supportsRetry) throws IOException {
- return handler.handleResponse(request, response, supportsRetry)
- || backOffHandler.handleResponse(request, response, supportsRetry);
- }
- });
+ request.setUnsuccessfulResponseHandler(
+ new HttpUnsuccessfulResponseHandler() {
+ public boolean handleResponse(
+ HttpRequest request, HttpResponse response, boolean supportsRetry)
+ throws IOException {
+ return handler.handleResponse(request, response, supportsRetry)
+ || backOffHandler.handleResponse(request, response, supportsRetry);
+ }
+ });
}
public void test301Redirect() throws Exception {
@@ -308,8 +311,11 @@ public void test303Redirect() throws Exception {
fakeTransport.redirectStatusCode = HttpStatusCodes.STATUS_CODE_SEE_OTHER;
byte[] content = new byte[300];
Arrays.fill(content, (byte) ' ');
- HttpRequest request = fakeTransport.createRequestFactory()
- .buildPostRequest(new GenericUrl("http://gmail.com"), new ByteArrayContent(null, content));
+ HttpRequest request =
+ fakeTransport
+ .createRequestFactory()
+ .buildPostRequest(
+ new GenericUrl("http://gmail.com"), new ByteArrayContent(null, content));
request.setRequestMethod(HttpMethods.POST);
HttpResponse resp = request.execute();
@@ -353,7 +359,7 @@ public void testMissingLocationRedirect() throws Exception {
Assert.assertEquals(1, fakeTransport.lowLevelExecCalls);
}
- static private class FailThenSuccessBackoffTransport extends MockHttpTransport {
+ private static class FailThenSuccessBackoffTransport extends MockHttpTransport {
public int lowLevelExecCalls;
int errorStatusCode;
@@ -364,26 +370,27 @@ protected FailThenSuccessBackoffTransport(int errorStatusCode, int callsBeforeSu
this.callsBeforeSuccess = callsBeforeSuccess;
}
- public LowLevelHttpRequest retryableGetRequest = new MockLowLevelHttpRequest() {
+ public LowLevelHttpRequest retryableGetRequest =
+ new MockLowLevelHttpRequest() {
- @Override
- public LowLevelHttpResponse execute() {
- lowLevelExecCalls++;
-
- if (lowLevelExecCalls <= callsBeforeSuccess) {
- // Return failure on the first call
- MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
- response.setContent("INVALID TOKEN");
- response.setStatusCode(errorStatusCode);
- return response;
- }
- // Return success on the second
- MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
- response.setContent("{\"data\":{\"foo\":{\"v1\":{}}}}");
- response.setStatusCode(200);
- return response;
- }
- };
+ @Override
+ public LowLevelHttpResponse execute() {
+ lowLevelExecCalls++;
+
+ if (lowLevelExecCalls <= callsBeforeSuccess) {
+ // Return failure on the first call
+ MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
+ response.setContent("INVALID TOKEN");
+ response.setStatusCode(errorStatusCode);
+ return response;
+ }
+ // Return success on the second
+ MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
+ response.setContent("{\"data\":{\"foo\":{\"v1\":{}}}}");
+ response.setStatusCode(200);
+ return response;
+ }
+ };
@Override
public LowLevelHttpRequest buildRequest(String method, String url) {
@@ -391,7 +398,7 @@ public LowLevelHttpRequest buildRequest(String method, String url) {
}
}
- static private class FailThenSuccessConnectionErrorTransport extends MockHttpTransport {
+ private static class FailThenSuccessConnectionErrorTransport extends MockHttpTransport {
public int lowLevelExecCalls;
int callsBeforeSuccess;
@@ -423,22 +430,22 @@ public LowLevelHttpResponse execute() throws IOException {
}
}
- static private class StatusCodesTransport extends MockHttpTransport {
+ private static class StatusCodesTransport extends MockHttpTransport {
int statusCode = 200;
- public StatusCodesTransport() {
- }
+ public StatusCodesTransport() {}
- public MockLowLevelHttpRequest retryableGetRequest = new MockLowLevelHttpRequest() {
+ public MockLowLevelHttpRequest retryableGetRequest =
+ new MockLowLevelHttpRequest() {
- @Override
- public LowLevelHttpResponse execute() throws IOException {
- MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
- response.setStatusCode(statusCode);
- return response;
- }
- };
+ @Override
+ public LowLevelHttpResponse execute() throws IOException {
+ MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
+ response.setStatusCode(statusCode);
+ return response;
+ }
+ };
@Override
public LowLevelHttpRequest buildRequest(String method, String url) {
@@ -724,8 +731,9 @@ public void testBackOffUnsuccessfulResponseSingleCall() throws Exception {
@Deprecated
public void testBackOffMultipleCalls() throws Exception {
int callsBeforeSuccess = 5;
- FailThenSuccessBackoffTransport fakeTransport = new FailThenSuccessBackoffTransport(
- HttpStatusCodes.STATUS_CODE_SERVER_ERROR, callsBeforeSuccess);
+ FailThenSuccessBackoffTransport fakeTransport =
+ new FailThenSuccessBackoffTransport(
+ HttpStatusCodes.STATUS_CODE_SERVER_ERROR, callsBeforeSuccess);
MockHttpUnsuccessfulResponseHandler handler = new MockHttpUnsuccessfulResponseHandler(false);
MockBackOffPolicy backOffPolicy = new MockBackOffPolicy();
@@ -744,8 +752,9 @@ public void testBackOffMultipleCalls() throws Exception {
public void testBackOffUnsucessfulReponseMultipleCalls() throws Exception {
int callsBeforeSuccess = 5;
- FailThenSuccessBackoffTransport fakeTransport = new FailThenSuccessBackoffTransport(
- HttpStatusCodes.STATUS_CODE_SERVER_ERROR, callsBeforeSuccess);
+ FailThenSuccessBackoffTransport fakeTransport =
+ new FailThenSuccessBackoffTransport(
+ HttpStatusCodes.STATUS_CODE_SERVER_ERROR, callsBeforeSuccess);
MockHttpUnsuccessfulResponseHandler handler = new MockHttpUnsuccessfulResponseHandler(false);
HttpRequest req =
@@ -763,8 +772,9 @@ public void testBackOffUnsucessfulReponseMultipleCalls() throws Exception {
@Deprecated
public void testBackOffCallsBeyondRetryLimit() throws Exception {
int callsBeforeSuccess = 11;
- FailThenSuccessBackoffTransport fakeTransport = new FailThenSuccessBackoffTransport(
- HttpStatusCodes.STATUS_CODE_SERVER_ERROR, callsBeforeSuccess);
+ FailThenSuccessBackoffTransport fakeTransport =
+ new FailThenSuccessBackoffTransport(
+ HttpStatusCodes.STATUS_CODE_SERVER_ERROR, callsBeforeSuccess);
MockHttpUnsuccessfulResponseHandler handler = new MockHttpUnsuccessfulResponseHandler(false);
MockBackOffPolicy backOffPolicy = new MockBackOffPolicy();
@@ -786,8 +796,9 @@ public void testBackOffCallsBeyondRetryLimit() throws Exception {
public void testBackOffUnsuccessfulReponseCallsBeyondRetryLimit() throws Exception {
int callsBeforeSuccess = 11;
- FailThenSuccessBackoffTransport fakeTransport = new FailThenSuccessBackoffTransport(
- HttpStatusCodes.STATUS_CODE_SERVER_ERROR, callsBeforeSuccess);
+ FailThenSuccessBackoffTransport fakeTransport =
+ new FailThenSuccessBackoffTransport(
+ HttpStatusCodes.STATUS_CODE_SERVER_ERROR, callsBeforeSuccess);
MockHttpUnsuccessfulResponseHandler handler = new MockHttpUnsuccessfulResponseHandler(false);
HttpRequest req =
@@ -851,8 +862,9 @@ public void testBackOffUnsuccessfulReponseUnRecognizedStatusCode() throws Except
@Deprecated
public void testBackOffStop() throws Exception {
int callsBeforeSuccess = 5;
- FailThenSuccessBackoffTransport fakeTransport = new FailThenSuccessBackoffTransport(
- HttpStatusCodes.STATUS_CODE_SERVER_ERROR, callsBeforeSuccess);
+ FailThenSuccessBackoffTransport fakeTransport =
+ new FailThenSuccessBackoffTransport(
+ HttpStatusCodes.STATUS_CODE_SERVER_ERROR, callsBeforeSuccess);
MockHttpUnsuccessfulResponseHandler handler = new MockHttpUnsuccessfulResponseHandler(false);
MockBackOffPolicy backOffPolicy = new MockBackOffPolicy();
backOffPolicy.returnBackOffStop = true;
@@ -876,8 +888,9 @@ public void testBackOffStop() throws Exception {
public void testBackOffUnsucessfulResponseStop() throws Exception {
int callsBeforeSuccess = 5;
- FailThenSuccessBackoffTransport fakeTransport = new FailThenSuccessBackoffTransport(
- HttpStatusCodes.STATUS_CODE_SERVER_ERROR, callsBeforeSuccess);
+ FailThenSuccessBackoffTransport fakeTransport =
+ new FailThenSuccessBackoffTransport(
+ HttpStatusCodes.STATUS_CODE_SERVER_ERROR, callsBeforeSuccess);
MockHttpUnsuccessfulResponseHandler handler = new MockHttpUnsuccessfulResponseHandler(false);
HttpRequest req =
@@ -896,7 +909,6 @@ public void testBackOffUnsucessfulResponseStop() throws Exception {
}
public enum E {
-
@Value
VALUE,
@Value("other")
@@ -905,26 +917,19 @@ public enum E {
public static class MyHeaders extends HttpHeaders {
- @Key
- public String foo;
+ @Key public String foo;
- @Key
- Object objNum;
+ @Key Object objNum;
- @Key
- Object objList;
+ @Key Object objList;
- @Key
- List list;
+ @Key List list;
- @Key
- String[] r;
+ @Key String[] r;
- @Key
- E value;
+ @Key E value;
- @Key
- E otherValue;
+ @Key E otherValue;
}
public void testExecute_headerSerialization() throws Exception {
@@ -942,12 +947,13 @@ public void testExecute_headerSerialization() throws Exception {
myHeaders.otherValue = E.OTHER_VALUE;
// execute request
final MockLowLevelHttpRequest lowLevelRequest = new MockLowLevelHttpRequest();
- HttpTransport transport = new MockHttpTransport() {
- @Override
- public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
- return lowLevelRequest;
- }
- };
+ HttpTransport transport =
+ new MockHttpTransport() {
+ @Override
+ public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
+ return lowLevelRequest;
+ }
+ };
HttpRequest request =
transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
request.setHeaders(myHeaders);
@@ -958,8 +964,8 @@ public LowLevelHttpRequest buildRequest(String method, String url) throws IOExce
assertEquals(ImmutableList.of("a2", "b2", "c2"), lowLevelRequest.getHeaderValues("objlist"));
assertEquals(ImmutableList.of("a1", "a2"), lowLevelRequest.getHeaderValues("r"));
assertTrue(lowLevelRequest.getHeaderValues("accept-encoding").isEmpty());
- assertEquals(ImmutableList.of("foo Google-HTTP-Java-Client/"
- + HttpRequest.VERSION + " (gzip)"),
+ assertEquals(
+ ImmutableList.of("foo Google-HTTP-Java-Client/" + HttpRequest.VERSION + " (gzip)"),
lowLevelRequest.getHeaderValues("user-agent"));
assertEquals(ImmutableList.of("b"), lowLevelRequest.getHeaderValues("a"));
assertEquals(ImmutableList.of("VALUE"), lowLevelRequest.getHeaderValues("value"));
@@ -998,9 +1004,14 @@ public LowLevelHttpResponse execute() throws IOException {
MyTransport transport = new MyTransport();
byte[] content = new byte[300];
Arrays.fill(content, (byte) ' ');
- HttpRequest request = transport.createRequestFactory().buildPostRequest(
- HttpTesting.SIMPLE_GENERIC_URL, new ByteArrayContent(
- new HttpMediaType("text/plain").setCharsetParameter(Charsets.UTF_8).build(), content));
+ HttpRequest request =
+ transport
+ .createRequestFactory()
+ .buildPostRequest(
+ HttpTesting.SIMPLE_GENERIC_URL,
+ new ByteArrayContent(
+ new HttpMediaType("text/plain").setCharsetParameter(Charsets.UTF_8).build(),
+ content));
assertNull(request.getEncoding());
request.execute();
assertNull(request.getEncoding());
@@ -1037,8 +1048,11 @@ public LowLevelHttpResponse execute() throws IOException {
// Create content of length 300.
byte[] content = new byte[300];
Arrays.fill(content, (byte) ' ');
- HttpRequest request = transport.createRequestFactory().buildPostRequest(
- HttpTesting.SIMPLE_GENERIC_URL, new ByteArrayContent("text/html", content));
+ HttpRequest request =
+ transport
+ .createRequestFactory()
+ .buildPostRequest(
+ HttpTesting.SIMPLE_GENERIC_URL, new ByteArrayContent("text/html", content));
// Assert logging is enabled by default.
assertTrue(request.isLoggingEnabled());
@@ -1152,16 +1166,19 @@ public LowLevelHttpRequest buildRequest(String method, String url) throws IOExce
// expect that it redirected to new URL every time using the count
assertEquals(HttpTesting.SIMPLE_URL + "_" + count, url);
count++;
- return new MockLowLevelHttpRequest().setResponse(
- new MockLowLevelHttpResponse().setStatusCode(
- HttpStatusCodes.STATUS_CODE_MOVED_PERMANENTLY)
- .setHeaderNames(Arrays.asList("Location"))
- .setHeaderValues(Arrays.asList(HttpTesting.SIMPLE_URL + "_" + count)));
+ return new MockLowLevelHttpRequest()
+ .setResponse(
+ new MockLowLevelHttpResponse()
+ .setStatusCode(HttpStatusCodes.STATUS_CODE_MOVED_PERMANENTLY)
+ .setHeaderNames(Arrays.asList("Location"))
+ .setHeaderValues(Arrays.asList(HttpTesting.SIMPLE_URL + "_" + count)));
}
}
MyTransport transport = new MyTransport();
- HttpRequest request = transport.createRequestFactory()
- .buildGetRequest(new GenericUrl(HttpTesting.SIMPLE_URL + "_" + transport.count));
+ HttpRequest request =
+ transport
+ .createRequestFactory()
+ .buildGetRequest(new GenericUrl(HttpTesting.SIMPLE_URL + "_" + transport.count));
try {
request.execute();
fail("expected " + HttpResponseException.class);
@@ -1176,12 +1193,15 @@ public void testExecute_redirectWithIncorrectContentRetryableSetting() throws Ex
String contentValue = "hello";
fakeTransport.expectedContent = new String[] {contentValue, ""};
byte[] bytes = StringUtils.getBytesUtf8(contentValue);
- InputStreamContent content = new InputStreamContent(
- new HttpMediaType("text/plain").setCharsetParameter(Charsets.UTF_8).build(),
- new ByteArrayInputStream(bytes));
+ InputStreamContent content =
+ new InputStreamContent(
+ new HttpMediaType("text/plain").setCharsetParameter(Charsets.UTF_8).build(),
+ new ByteArrayInputStream(bytes));
content.setRetrySupported(true);
- HttpRequest request = fakeTransport.createRequestFactory()
- .buildPostRequest(HttpTesting.SIMPLE_GENERIC_URL, content);
+ HttpRequest request =
+ fakeTransport
+ .createRequestFactory()
+ .buildPostRequest(HttpTesting.SIMPLE_GENERIC_URL, content);
HttpResponse resp = request.execute();
assertEquals(200, resp.getStatusCode());
assertEquals(2, fakeTransport.lowLevelExecCalls);
@@ -1191,15 +1211,20 @@ public void testExecute_curlLogger() throws Exception {
LogRecordingHandler recorder = new LogRecordingHandler();
HttpTransport.LOGGER.setLevel(Level.CONFIG);
HttpTransport.LOGGER.addHandler(recorder);
- new MockHttpTransport().createRequestFactory()
- .buildGetRequest(new GenericUrl("http://google.com/#q=a'b'c")).execute();
+ new MockHttpTransport()
+ .createRequestFactory()
+ .buildGetRequest(new GenericUrl("http://google.com/#q=a'b'c"))
+ .execute();
boolean found = false;
for (String message : recorder.messages()) {
if (message.startsWith("curl")) {
found = true;
- assertEquals("curl -v --compressed -H 'Accept-Encoding: gzip' -H 'User-Agent: "
- + "Google-HTTP-Java-Client/" + HttpRequest.VERSION + " (gzip)"
- + "' -- 'http://google.com/#q=a'\"'\"'b'\"'\"'c'",
+ assertEquals(
+ "curl -v --compressed -H 'Accept-Encoding: gzip' -H 'User-Agent: "
+ + "Google-HTTP-Java-Client/"
+ + HttpRequest.VERSION
+ + " (gzip)"
+ + "' -- 'http://google.com/#q=a'\"'\"'b'\"'\"'c'",
message);
}
}
@@ -1213,19 +1238,24 @@ public void testExecute_curlLoggerWithContentEncoding() throws Exception {
String contentValue = "hello";
byte[] bytes = StringUtils.getBytesUtf8(contentValue);
- InputStreamContent content = new InputStreamContent(
- new HttpMediaType("text/plain").setCharsetParameter(Charsets.UTF_8).build(),
- new ByteArrayInputStream(bytes));
+ InputStreamContent content =
+ new InputStreamContent(
+ new HttpMediaType("text/plain").setCharsetParameter(Charsets.UTF_8).build(),
+ new ByteArrayInputStream(bytes));
- new MockHttpTransport().createRequestFactory()
+ new MockHttpTransport()
+ .createRequestFactory()
.buildPostRequest(new GenericUrl("http://google.com/#q=a'b'c"), content)
- .setEncoding(new GZipEncoding()).execute();
+ .setEncoding(new GZipEncoding())
+ .execute();
boolean found = false;
- final String expectedCurlLog = "curl -v --compressed -X POST -H 'Accept-Encoding: gzip' "
- + "-H 'User-Agent: " + HttpRequest.USER_AGENT_SUFFIX
- + "' -H 'Content-Type: text/plain; charset=UTF-8' -H 'Content-Encoding: gzip' "
- + "-d '@-' -- 'http://google.com/#q=a'\"'\"'b'\"'\"'c' << $$$";
+ final String expectedCurlLog =
+ "curl -v --compressed -X POST -H 'Accept-Encoding: gzip' "
+ + "-H 'User-Agent: "
+ + HttpRequest.USER_AGENT_SUFFIX
+ + "' -H 'Content-Type: text/plain; charset=UTF-8' -H 'Content-Encoding: gzip' "
+ + "-d '@-' -- 'http://google.com/#q=a'\"'\"'b'\"'\"'c' << $$$";
for (String message : recorder.messages()) {
if (message.startsWith("curl")) {
found = true;
diff --git a/google-http-client/src/test/java/com/google/api/client/http/HttpResponseExceptionTest.java b/google-http-client/src/test/java/com/google/api/client/http/HttpResponseExceptionTest.java
index 627d70a00..4d651aecb 100644
--- a/google-http-client/src/test/java/com/google/api/client/http/HttpResponseExceptionTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/http/HttpResponseExceptionTest.java
@@ -51,8 +51,10 @@ public void testConstructor() throws Exception {
public void testBuilder() throws Exception {
HttpHeaders headers = new HttpHeaders();
- Builder builder = new HttpResponseException.Builder(9, "statusMessage", headers).setMessage(
- "message").setContent("content");
+ Builder builder =
+ new HttpResponseException.Builder(9, "statusMessage", headers)
+ .setMessage("message")
+ .setContent("content");
assertEquals("message", builder.getMessage());
assertEquals("content", builder.getContent());
assertEquals(9, builder.getStatusCode());
@@ -67,19 +69,20 @@ public void testBuilder() throws Exception {
}
public void testConstructorWithStatusMessage() throws Exception {
- HttpTransport transport = new MockHttpTransport() {
- @Override
- public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
- return new MockLowLevelHttpRequest() {
+ HttpTransport transport =
+ new MockHttpTransport() {
@Override
- public LowLevelHttpResponse execute() throws IOException {
- MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
- result.setReasonPhrase("OK");
- return result;
+ public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
+ return new MockLowLevelHttpRequest() {
+ @Override
+ public LowLevelHttpResponse execute() throws IOException {
+ MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
+ result.setReasonPhrase("OK");
+ return result;
+ }
+ };
}
};
- }
- };
HttpRequest request =
transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
HttpResponse response = request.execute();
@@ -88,19 +91,20 @@ public LowLevelHttpResponse execute() throws IOException {
}
public void testConstructor_noStatusCode() throws Exception {
- HttpTransport transport = new MockHttpTransport() {
- @Override
- public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
- return new MockLowLevelHttpRequest() {
+ HttpTransport transport =
+ new MockHttpTransport() {
@Override
- public LowLevelHttpResponse execute() throws IOException {
- MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
- result.setStatusCode(0);
- return result;
+ public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
+ return new MockLowLevelHttpRequest() {
+ @Override
+ public LowLevelHttpResponse execute() throws IOException {
+ MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
+ result.setStatusCode(0);
+ return result;
+ }
+ };
}
};
- }
- };
HttpRequest request =
transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
try {
@@ -112,20 +116,21 @@ public LowLevelHttpResponse execute() throws IOException {
}
public void testConstructor_messageButNoStatusCode() throws Exception {
- HttpTransport transport = new MockHttpTransport() {
- @Override
- public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
- return new MockLowLevelHttpRequest() {
+ HttpTransport transport =
+ new MockHttpTransport() {
@Override
- public LowLevelHttpResponse execute() throws IOException {
- MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
- result.setStatusCode(0);
- result.setReasonPhrase("Foo");
- return result;
+ public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
+ return new MockLowLevelHttpRequest() {
+ @Override
+ public LowLevelHttpResponse execute() throws IOException {
+ MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
+ result.setStatusCode(0);
+ result.setReasonPhrase("Foo");
+ return result;
+ }
+ };
}
};
- }
- };
HttpRequest request =
transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
try {
@@ -137,19 +142,20 @@ public LowLevelHttpResponse execute() throws IOException {
}
public void testComputeMessage() throws Exception {
- HttpTransport transport = new MockHttpTransport() {
- @Override
- public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
- return new MockLowLevelHttpRequest() {
+ HttpTransport transport =
+ new MockHttpTransport() {
@Override
- public LowLevelHttpResponse execute() throws IOException {
- MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
- result.setReasonPhrase("Foo");
- return result;
+ public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
+ return new MockLowLevelHttpRequest() {
+ @Override
+ public LowLevelHttpResponse execute() throws IOException {
+ MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
+ result.setReasonPhrase("Foo");
+ return result;
+ }
+ };
}
};
- }
- };
HttpRequest request =
transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
HttpResponse response = request.execute();
@@ -157,21 +163,22 @@ public LowLevelHttpResponse execute() throws IOException {
}
public void testThrown() throws Exception {
- HttpTransport transport = new MockHttpTransport() {
- @Override
- public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
- return new MockLowLevelHttpRequest() {
+ HttpTransport transport =
+ new MockHttpTransport() {
@Override
- public LowLevelHttpResponse execute() throws IOException {
- MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
- result.setStatusCode(HttpStatusCodes.STATUS_CODE_NOT_FOUND);
- result.setReasonPhrase("Not Found");
- result.setContent("Unable to find resource");
- return result;
+ public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
+ return new MockLowLevelHttpRequest() {
+ @Override
+ public LowLevelHttpResponse execute() throws IOException {
+ MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
+ result.setStatusCode(HttpStatusCodes.STATUS_CODE_NOT_FOUND);
+ result.setReasonPhrase("Not Found");
+ result.setContent("Unable to find resource");
+ return result;
+ }
+ };
}
};
- }
- };
HttpRequest request =
transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
try {
@@ -184,58 +191,58 @@ public LowLevelHttpResponse execute() throws IOException {
}
public void testInvalidCharset() throws Exception {
- HttpTransport transport = new MockHttpTransport() {
- @Override
- public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
- return new MockLowLevelHttpRequest() {
+ HttpTransport transport =
+ new MockHttpTransport() {
@Override
- public LowLevelHttpResponse execute() throws IOException {
- MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
- result.setStatusCode(HttpStatusCodes.STATUS_CODE_NOT_FOUND);
- result.setReasonPhrase("Not Found");
- result.setContentType("text/plain; charset=");
- result.setContent("Unable to find resource");
- return result;
+ public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
+ return new MockLowLevelHttpRequest() {
+ @Override
+ public LowLevelHttpResponse execute() throws IOException {
+ MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
+ result.setStatusCode(HttpStatusCodes.STATUS_CODE_NOT_FOUND);
+ result.setReasonPhrase("Not Found");
+ result.setContentType("text/plain; charset=");
+ result.setContent("Unable to find resource");
+ return result;
+ }
+ };
}
};
- }
- };
HttpRequest request =
transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
try {
request.execute();
fail();
} catch (HttpResponseException e) {
- assertEquals(
- "404 Not Found", e.getMessage());
+ assertEquals("404 Not Found", e.getMessage());
}
}
public void testUnsupportedCharset() throws Exception {
- HttpTransport transport = new MockHttpTransport() {
- @Override
- public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
- return new MockLowLevelHttpRequest() {
+ HttpTransport transport =
+ new MockHttpTransport() {
@Override
- public LowLevelHttpResponse execute() throws IOException {
- MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
- result.setStatusCode(HttpStatusCodes.STATUS_CODE_NOT_FOUND);
- result.setReasonPhrase("Not Found");
- result.setContentType("text/plain; charset=invalid-charset");
- result.setContent("Unable to find resource");
- return result;
+ public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
+ return new MockLowLevelHttpRequest() {
+ @Override
+ public LowLevelHttpResponse execute() throws IOException {
+ MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
+ result.setStatusCode(HttpStatusCodes.STATUS_CODE_NOT_FOUND);
+ result.setReasonPhrase("Not Found");
+ result.setContentType("text/plain; charset=invalid-charset");
+ result.setContent("Unable to find resource");
+ return result;
+ }
+ };
}
};
- }
- };
HttpRequest request =
transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
try {
request.execute();
fail();
} catch (HttpResponseException e) {
- assertEquals(
- "404 Not Found", e.getMessage());
+ assertEquals("404 Not Found", e.getMessage());
}
}
diff --git a/google-http-client/src/test/java/com/google/api/client/http/HttpResponseTest.java b/google-http-client/src/test/java/com/google/api/client/http/HttpResponseTest.java
index 9a2bd43b6..7846778e5 100644
--- a/google-http-client/src/test/java/com/google/api/client/http/HttpResponseTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/http/HttpResponseTest.java
@@ -39,8 +39,7 @@
*/
public class HttpResponseTest extends TestCase {
- public HttpResponseTest() {
- }
+ public HttpResponseTest() {}
public HttpResponseTest(String name) {
super(name);
@@ -58,20 +57,21 @@ public void testParseAsString_none() throws Exception {
private static final String SAMPLE2 = "123abc";
public void testParseAsString_utf8() throws Exception {
- HttpTransport transport = new MockHttpTransport() {
- @Override
- public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
- return new MockLowLevelHttpRequest() {
+ HttpTransport transport =
+ new MockHttpTransport() {
@Override
- public LowLevelHttpResponse execute() throws IOException {
- MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
- result.setContentType(Json.MEDIA_TYPE);
- result.setContent(SAMPLE);
- return result;
+ public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
+ return new MockLowLevelHttpRequest() {
+ @Override
+ public LowLevelHttpResponse execute() throws IOException {
+ MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
+ result.setContentType(Json.MEDIA_TYPE);
+ result.setContent(SAMPLE);
+ return result;
+ }
+ };
}
};
- }
- };
HttpRequest request =
transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
HttpResponse response = request.execute();
@@ -79,19 +79,20 @@ public LowLevelHttpResponse execute() throws IOException {
}
public void testParseAsString_noContentType() throws Exception {
- HttpTransport transport = new MockHttpTransport() {
- @Override
- public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
- return new MockLowLevelHttpRequest() {
+ HttpTransport transport =
+ new MockHttpTransport() {
@Override
- public LowLevelHttpResponse execute() throws IOException {
- MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
- result.setContent(SAMPLE2);
- return result;
+ public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
+ return new MockLowLevelHttpRequest() {
+ @Override
+ public LowLevelHttpResponse execute() throws IOException {
+ MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
+ result.setContent(SAMPLE2);
+ return result;
+ }
+ };
}
};
- }
- };
HttpRequest request =
transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
HttpResponse response = request.execute();
@@ -107,13 +108,14 @@ public void testStatusCode_negative_throwException() throws Exception {
}
private void subtestStatusCode_negative(boolean throwExceptionOnExecuteError) throws Exception {
- HttpTransport transport = new MockHttpTransport() {
- @Override
- public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
- return new MockLowLevelHttpRequest().setResponse(
- new MockLowLevelHttpResponse().setStatusCode(-1));
- }
- };
+ HttpTransport transport =
+ new MockHttpTransport() {
+ @Override
+ public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
+ return new MockLowLevelHttpRequest()
+ .setResponse(new MockLowLevelHttpResponse().setStatusCode(-1));
+ }
+ };
HttpRequest request =
transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
request.setThrowExceptionOnExecuteError(throwExceptionOnExecuteError);
@@ -131,40 +133,38 @@ public LowLevelHttpRequest buildRequest(String method, String url) throws IOExce
public static class MyHeaders extends HttpHeaders {
- @Key
- public String foo;
+ @Key public String foo;
- @Key
- public Object obj;
+ @Key public Object obj;
- @Key
- String[] r;
+ @Key String[] r;
}
static final String ETAG_VALUE = "\"abc\"";
public void testHeaderParsing() throws Exception {
- HttpTransport transport = new MockHttpTransport() {
- @Override
- public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
- return new MockLowLevelHttpRequest() {
+ HttpTransport transport =
+ new MockHttpTransport() {
@Override
- public LowLevelHttpResponse execute() throws IOException {
- MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
- result.addHeader("accept", "value");
- result.addHeader("foo", "bar");
- result.addHeader("goo", "car");
- result.addHeader("hoo", "dar");
- result.addHeader("hoo", "far");
- result.addHeader("obj", "o");
- result.addHeader("r", "a1");
- result.addHeader("r", "a2");
- result.addHeader("ETAG", ETAG_VALUE);
- return result;
+ public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
+ return new MockLowLevelHttpRequest() {
+ @Override
+ public LowLevelHttpResponse execute() throws IOException {
+ MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
+ result.addHeader("accept", "value");
+ result.addHeader("foo", "bar");
+ result.addHeader("goo", "car");
+ result.addHeader("hoo", "dar");
+ result.addHeader("hoo", "far");
+ result.addHeader("obj", "o");
+ result.addHeader("r", "a1");
+ result.addHeader("r", "a2");
+ result.addHeader("ETAG", ETAG_VALUE);
+ return result;
+ }
+ };
}
};
- }
- };
HttpRequest request =
transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
request.setResponseHeaders(new MyHeaders());
@@ -180,8 +180,11 @@ public LowLevelHttpResponse execute() throws IOException {
public void testParseAs_noParser() throws Exception {
try {
- new MockHttpTransport().createRequestFactory()
- .buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL).execute().parseAs(Object.class);
+ new MockHttpTransport()
+ .createRequestFactory()
+ .buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL)
+ .execute()
+ .parseAs(Object.class);
fail("expected " + NullPointerException.class);
} catch (NullPointerException e) {
// expected
@@ -191,30 +194,36 @@ public void testParseAs_noParser() throws Exception {
public void testParseAs_classNoContent() throws Exception {
final MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
- for (final int status : new int[] {
- HttpStatusCodes.STATUS_CODE_NO_CONTENT, HttpStatusCodes.STATUS_CODE_NOT_MODIFIED, 102}) {
- HttpTransport transport = new MockHttpTransport() {
- @Override
- public LowLevelHttpRequest buildRequest(String method, final String url) throws IOException {
- return new MockLowLevelHttpRequest() {
+ for (final int status :
+ new int[] {
+ HttpStatusCodes.STATUS_CODE_NO_CONTENT, HttpStatusCodes.STATUS_CODE_NOT_MODIFIED, 102
+ }) {
+ HttpTransport transport =
+ new MockHttpTransport() {
@Override
- public LowLevelHttpResponse execute() throws IOException {
- result.setStatusCode(status);
- result.setContentType(null);
- result.setContent(new ByteArrayInputStream(new byte[0]));
- return result;
+ public LowLevelHttpRequest buildRequest(String method, final String url)
+ throws IOException {
+ return new MockLowLevelHttpRequest() {
+ @Override
+ public LowLevelHttpResponse execute() throws IOException {
+ result.setStatusCode(status);
+ result.setContentType(null);
+ result.setContent(new ByteArrayInputStream(new byte[0]));
+ return result;
+ }
+ };
}
};
- }
- };
// Confirm that 'null' is returned when getting the response object of a
// request with no message body.
- Object parsed = transport.createRequestFactory()
- .buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL)
- .setThrowExceptionOnExecuteError(false)
- .execute()
- .parseAs(Object.class);
+ Object parsed =
+ transport
+ .createRequestFactory()
+ .buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL)
+ .setThrowExceptionOnExecuteError(false)
+ .execute()
+ .parseAs(Object.class);
assertNull(parsed);
}
}
@@ -222,49 +231,56 @@ public LowLevelHttpResponse execute() throws IOException {
public void testParseAs_typeNoContent() throws Exception {
final MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
- for (final int status : new int[] {
- HttpStatusCodes.STATUS_CODE_NO_CONTENT, HttpStatusCodes.STATUS_CODE_NOT_MODIFIED, 102}) {
- HttpTransport transport = new MockHttpTransport() {
- @Override
- public LowLevelHttpRequest buildRequest(String method, final String url) throws IOException {
- return new MockLowLevelHttpRequest() {
+ for (final int status :
+ new int[] {
+ HttpStatusCodes.STATUS_CODE_NO_CONTENT, HttpStatusCodes.STATUS_CODE_NOT_MODIFIED, 102
+ }) {
+ HttpTransport transport =
+ new MockHttpTransport() {
@Override
- public LowLevelHttpResponse execute() throws IOException {
- result.setStatusCode(status);
- result.setContentType(null);
- result.setContent(new ByteArrayInputStream(new byte[0]));
- return result;
+ public LowLevelHttpRequest buildRequest(String method, final String url)
+ throws IOException {
+ return new MockLowLevelHttpRequest() {
+ @Override
+ public LowLevelHttpResponse execute() throws IOException {
+ result.setStatusCode(status);
+ result.setContentType(null);
+ result.setContent(new ByteArrayInputStream(new byte[0]));
+ return result;
+ }
+ };
}
};
- }
- };
// Confirm that 'null' is returned when getting the response object of a
// request with no message body.
- Object parsed = transport.createRequestFactory()
- .buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL)
- .setThrowExceptionOnExecuteError(false)
- .execute()
- .parseAs((Type) Object.class);
+ Object parsed =
+ transport
+ .createRequestFactory()
+ .buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL)
+ .setThrowExceptionOnExecuteError(false)
+ .execute()
+ .parseAs((Type) Object.class);
assertNull(parsed);
}
}
public void testDownload() throws Exception {
- HttpTransport transport = new MockHttpTransport() {
- @Override
- public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
- return new MockLowLevelHttpRequest() {
+ HttpTransport transport =
+ new MockHttpTransport() {
@Override
- public LowLevelHttpResponse execute() throws IOException {
- MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
- result.setContentType(Json.MEDIA_TYPE);
- result.setContent(SAMPLE);
- return result;
+ public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
+ return new MockLowLevelHttpRequest() {
+ @Override
+ public LowLevelHttpResponse execute() throws IOException {
+ MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
+ result.setContentType(Json.MEDIA_TYPE);
+ result.setContent(SAMPLE);
+ return result;
+ }
+ };
}
};
- }
- };
HttpRequest request =
transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
HttpResponse response = request.execute();
@@ -274,22 +290,22 @@ public LowLevelHttpResponse execute() throws IOException {
}
public void testDisconnectWithContent() throws Exception {
- final MockLowLevelHttpResponse lowLevelHttpResponse =
- new MockLowLevelHttpResponse();
+ final MockLowLevelHttpResponse lowLevelHttpResponse = new MockLowLevelHttpResponse();
- HttpTransport transport = new MockHttpTransport() {
- @Override
- public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
- return new MockLowLevelHttpRequest() {
+ HttpTransport transport =
+ new MockHttpTransport() {
@Override
- public LowLevelHttpResponse execute() throws IOException {
- lowLevelHttpResponse.setContentType(Json.MEDIA_TYPE);
- lowLevelHttpResponse.setContent(SAMPLE);
- return lowLevelHttpResponse;
+ public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
+ return new MockLowLevelHttpRequest() {
+ @Override
+ public LowLevelHttpResponse execute() throws IOException {
+ lowLevelHttpResponse.setContentType(Json.MEDIA_TYPE);
+ lowLevelHttpResponse.setContent(SAMPLE);
+ return lowLevelHttpResponse;
+ }
+ };
}
};
- }
- };
HttpRequest request =
transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
HttpResponse response = request.execute();
@@ -304,20 +320,20 @@ public LowLevelHttpResponse execute() throws IOException {
}
public void testDisconnectWithNoContent() throws Exception {
- final MockLowLevelHttpResponse lowLevelHttpResponse =
- new MockLowLevelHttpResponse();
+ final MockLowLevelHttpResponse lowLevelHttpResponse = new MockLowLevelHttpResponse();
- HttpTransport transport = new MockHttpTransport() {
- @Override
- public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
- return new MockLowLevelHttpRequest() {
+ HttpTransport transport =
+ new MockHttpTransport() {
@Override
- public LowLevelHttpResponse execute() throws IOException {
- return lowLevelHttpResponse;
+ public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
+ return new MockLowLevelHttpRequest() {
+ @Override
+ public LowLevelHttpResponse execute() throws IOException {
+ return lowLevelHttpResponse;
+ }
+ };
}
};
- }
- };
HttpRequest request =
transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
HttpResponse response = request.execute();
@@ -346,26 +362,38 @@ public void testContentLoggingLimitWithLoggingEnabledAndDisabled() throws Except
Arrays.fill(a, 'x');
String big = new String(a);
String formated18kInteger = NumberFormat.getInstance().format(18000);
- subtestContentLoggingLimit(big, Integer.MAX_VALUE, true, String.format("Total: %s bytes", formated18kInteger), big);
- subtestContentLoggingLimit(big, 4, true, String.format("Total: %s bytes (logging first 4 bytes)", formated18kInteger), "xxxx");
+ subtestContentLoggingLimit(
+ big, Integer.MAX_VALUE, true, String.format("Total: %s bytes", formated18kInteger), big);
+ subtestContentLoggingLimit(
+ big,
+ 4,
+ true,
+ String.format("Total: %s bytes (logging first 4 bytes)", formated18kInteger),
+ "xxxx");
}
- public void subtestContentLoggingLimit(final String content, int contentLoggingLimit,
- boolean loggingEnabled, String... expectedMessages) throws Exception {
- HttpTransport transport = new MockHttpTransport() {
- @Override
- public LowLevelHttpRequest buildRequest(String method, final String url) throws IOException {
- return new MockLowLevelHttpRequest() {
+ public void subtestContentLoggingLimit(
+ final String content,
+ int contentLoggingLimit,
+ boolean loggingEnabled,
+ String... expectedMessages)
+ throws Exception {
+ HttpTransport transport =
+ new MockHttpTransport() {
@Override
- public LowLevelHttpResponse execute() throws IOException {
- MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
- result.setContent(content);
- result.setContentType("text/plain");
- return result;
+ public LowLevelHttpRequest buildRequest(String method, final String url)
+ throws IOException {
+ return new MockLowLevelHttpRequest() {
+ @Override
+ public LowLevelHttpResponse execute() throws IOException {
+ MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
+ result.setContent(content);
+ result.setContentType("text/plain");
+ return result;
+ }
+ };
}
};
- }
- };
HttpTransport.LOGGER.setLevel(Level.CONFIG);
HttpRequest request =
@@ -382,45 +410,51 @@ public LowLevelHttpResponse execute() throws IOException {
}
public void testGetContent_gzipNoContent() throws IOException {
- HttpTransport transport = new MockHttpTransport() {
- @Override
- public LowLevelHttpRequest buildRequest(String method, final String url) throws IOException {
- return new MockLowLevelHttpRequest() {
+ HttpTransport transport =
+ new MockHttpTransport() {
@Override
- public LowLevelHttpResponse execute() throws IOException {
- MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
- result.setContent("");
- result.setContentEncoding("gzip");
- result.setContentType("text/plain");
- return result;
+ public LowLevelHttpRequest buildRequest(String method, final String url)
+ throws IOException {
+ return new MockLowLevelHttpRequest() {
+ @Override
+ public LowLevelHttpResponse execute() throws IOException {
+ MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
+ result.setContent("");
+ result.setContentEncoding("gzip");
+ result.setContentType("text/plain");
+ return result;
+ }
+ };
}
};
- }
- };
HttpRequest request =
transport.createRequestFactory().buildHeadRequest(HttpTesting.SIMPLE_GENERIC_URL);
request.execute().getContent();
}
public void testGetContent_gzipEncoding_ReturnRawStream() throws IOException {
- HttpTransport transport = new MockHttpTransport() {
- @Override
- public LowLevelHttpRequest buildRequest(String method, final String url) throws IOException {
- return new MockLowLevelHttpRequest() {
+ HttpTransport transport =
+ new MockHttpTransport() {
@Override
- public LowLevelHttpResponse execute() throws IOException {
- MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
- result.setContent("");
- result.setContentEncoding("gzip");
- result.setContentType("text/plain");
- return result;
+ public LowLevelHttpRequest buildRequest(String method, final String url)
+ throws IOException {
+ return new MockLowLevelHttpRequest() {
+ @Override
+ public LowLevelHttpResponse execute() throws IOException {
+ MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
+ result.setContent("");
+ result.setContentEncoding("gzip");
+ result.setContentType("text/plain");
+ return result;
+ }
+ };
}
};
- }
- };
HttpRequest request =
transport.createRequestFactory().buildHeadRequest(HttpTesting.SIMPLE_GENERIC_URL);
request.setResponseReturnRawInputStream(true);
- assertFalse("it should not decompress stream", request.execute().getContent() instanceof GZIPInputStream);
+ assertFalse(
+ "it should not decompress stream",
+ request.execute().getContent() instanceof GZIPInputStream);
}
}
diff --git a/google-http-client/src/test/java/com/google/api/client/http/MultipartContentTest.java b/google-http-client/src/test/java/com/google/api/client/http/MultipartContentTest.java
index fd6c08b4b..76f725b61 100644
--- a/google-http-client/src/test/java/com/google/api/client/http/MultipartContentTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/http/MultipartContentTest.java
@@ -28,19 +28,56 @@ public class MultipartContentTest extends TestCase {
private static final String CRLF = "\r\n";
private static final String CONTENT_TYPE = Json.MEDIA_TYPE;
- private static final String HEADERS = "Content-Length: 3" + CRLF
- + "Content-Type: application/json; charset=UTF-8" + CRLF + "content-transfer-encoding: binary"
- + CRLF;
+ private static final String HEADERS =
+ "Content-Length: 3"
+ + CRLF
+ + "Content-Type: application/json; charset=UTF-8"
+ + CRLF
+ + "content-transfer-encoding: binary"
+ + CRLF;
public void testContent() throws Exception {
subtestContent("--__END_OF_PART__--" + CRLF, null);
subtestContent(
"--__END_OF_PART__" + CRLF + HEADERS + CRLF + "foo" + CRLF + "--__END_OF_PART__--" + CRLF,
- null, "foo");
- subtestContent("--__END_OF_PART__" + CRLF + HEADERS + CRLF + "foo" + CRLF + "--__END_OF_PART__"
- + CRLF + HEADERS + CRLF + "bar" + CRLF + "--__END_OF_PART__--" + CRLF, null, "foo", "bar");
- subtestContent("--myboundary" + CRLF + HEADERS + CRLF + "foo" + CRLF + "--myboundary" + CRLF
- + HEADERS + CRLF + "bar" + CRLF + "--myboundary--" + CRLF, "myboundary", "foo", "bar");
+ null,
+ "foo");
+ subtestContent(
+ "--__END_OF_PART__"
+ + CRLF
+ + HEADERS
+ + CRLF
+ + "foo"
+ + CRLF
+ + "--__END_OF_PART__"
+ + CRLF
+ + HEADERS
+ + CRLF
+ + "bar"
+ + CRLF
+ + "--__END_OF_PART__--"
+ + CRLF,
+ null,
+ "foo",
+ "bar");
+ subtestContent(
+ "--myboundary"
+ + CRLF
+ + HEADERS
+ + CRLF
+ + "foo"
+ + CRLF
+ + "--myboundary"
+ + CRLF
+ + HEADERS
+ + CRLF
+ + "bar"
+ + CRLF
+ + "--myboundary--"
+ + CRLF,
+ "myboundary",
+ "foo",
+ "bar");
}
private void subtestContent(String expectedContent, String boundaryString, String... contents)
@@ -59,7 +96,10 @@ private void subtestContent(String expectedContent, String boundaryString, Strin
content.writeTo(out);
assertEquals(expectedContent, out.toString());
assertEquals(StringUtils.getBytesUtf8(expectedContent).length, content.getLength());
- assertEquals(boundaryString == null ? "multipart/related; boundary=__END_OF_PART__" :
- "multipart/related; boundary=" + boundaryString, content.getType());
+ assertEquals(
+ boundaryString == null
+ ? "multipart/related; boundary=__END_OF_PART__"
+ : "multipart/related; boundary=" + boundaryString,
+ content.getType());
}
}
diff --git a/google-http-client/src/test/java/com/google/api/client/http/OpenCensusUtilsTest.java b/google-http-client/src/test/java/com/google/api/client/http/OpenCensusUtilsTest.java
index d88f34d6a..8fa8624eb 100644
--- a/google-http-client/src/test/java/com/google/api/client/http/OpenCensusUtilsTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/http/OpenCensusUtilsTest.java
@@ -14,12 +14,11 @@
package com.google.api.client.http;
-import com.google.api.client.http.HttpHeaders;
-import io.opencensus.trace.BlankSpan;
-import io.opencensus.trace.EndSpanOptions;
import io.opencensus.trace.Annotation;
import io.opencensus.trace.AttributeValue;
+import io.opencensus.trace.BlankSpan;
+import io.opencensus.trace.EndSpanOptions;
import io.opencensus.trace.Link;
import io.opencensus.trace.MessageEvent;
import io.opencensus.trace.Span;
@@ -52,49 +51,52 @@ public OpenCensusUtilsTest(String testName) {
@Override
public void setUp() {
- mockTextFormat = new TextFormat() {
- @Override
- public List fields() {
- throw new UnsupportedOperationException("TextFormat.fields");
- }
-
- @Override
- public void inject(SpanContext spanContext, C carrier, Setter setter) {
- throw new UnsupportedOperationException("TextFormat.inject");
- }
-
- @Override
- public SpanContext extract(C carrier, Getter getter) {
- throw new UnsupportedOperationException("TextFormat.extract");
- }
- };
- mockTextFormatSetter = new TextFormat.Setter() {
- @Override
- public void put(HttpHeaders carrier, String key, String value) {
- throw new UnsupportedOperationException("TextFormat.Setter.put");
- }
- };
+ mockTextFormat =
+ new TextFormat() {
+ @Override
+ public List fields() {
+ throw new UnsupportedOperationException("TextFormat.fields");
+ }
+
+ @Override
+ public void inject(SpanContext spanContext, C carrier, Setter setter) {
+ throw new UnsupportedOperationException("TextFormat.inject");
+ }
+
+ @Override
+ public SpanContext extract(C carrier, Getter getter) {
+ throw new UnsupportedOperationException("TextFormat.extract");
+ }
+ };
+ mockTextFormatSetter =
+ new TextFormat.Setter() {
+ @Override
+ public void put(HttpHeaders carrier, String key, String value) {
+ throw new UnsupportedOperationException("TextFormat.Setter.put");
+ }
+ };
headers = new HttpHeaders();
tracer = OpenCensusUtils.getTracer();
- mockSpan = new Span(tracer.getCurrentSpan().getContext(), null) {
+ mockSpan =
+ new Span(tracer.getCurrentSpan().getContext(), null) {
- @Override
- public void addAnnotation(String description, Map attributes) {}
+ @Override
+ public void addAnnotation(String description, Map attributes) {}
- @Override
- public void addAnnotation(Annotation annotation) {}
+ @Override
+ public void addAnnotation(Annotation annotation) {}
- @Override
- public void addMessageEvent(MessageEvent event) {
- throw new UnsupportedOperationException("Span.addMessageEvent");
- }
+ @Override
+ public void addMessageEvent(MessageEvent event) {
+ throw new UnsupportedOperationException("Span.addMessageEvent");
+ }
- @Override
- public void addLink(Link link) {}
+ @Override
+ public void addLink(Link link) {}
- @Override
- public void end(EndSpanOptions options) {}
- };
+ @Override
+ public void end(EndSpanOptions options) {}
+ };
originTextFormat = OpenCensusUtils.propagationTextFormat;
originTextFormatSetter = OpenCensusUtils.propagationTextFormatSetter;
}
@@ -200,7 +202,8 @@ public void testGetEndSpanOptionsNotFound() {
}
public void testGetEndSpanOptionsPreconditionFailed() {
- EndSpanOptions expected = EndSpanOptions.builder().setStatus(Status.FAILED_PRECONDITION).build();
+ EndSpanOptions expected =
+ EndSpanOptions.builder().setStatus(Status.FAILED_PRECONDITION).build();
assertEquals(expected, OpenCensusUtils.getEndSpanOptions(412));
}
diff --git a/google-http-client/src/test/java/com/google/api/client/http/UriTemplateTest.java b/google-http-client/src/test/java/com/google/api/client/http/UriTemplateTest.java
index fea7d8cbe..53376c389 100644
--- a/google-http-client/src/test/java/com/google/api/client/http/UriTemplateTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/http/UriTemplateTest.java
@@ -48,7 +48,8 @@ public void testExpandTemplates_basic() {
// Assert with addUnusedParamsAsQueryParams = false.
assertEquals("foo/xyz/bar/123", UriTemplate.expand("foo/{abc}/bar/{def}", requestMap, false));
// Assert with addUnusedParamsAsQueryParams = true.
- assertEquals("foo/xyz/bar/123?unused=unused%20parameter",
+ assertEquals(
+ "foo/xyz/bar/123?unused=unused%20parameter",
UriTemplate.expand("foo/{abc}/bar/{def}", requestMap, true));
// Assert the map has not changed.
assertEquals(3, requestMap.size());
@@ -68,8 +69,8 @@ public void testExpandTemplates_noExpansionsWithQueryParams() {
SortedMap requestMap = Maps.newTreeMap();
requestMap.put("abc", "xyz");
requestMap.put("def", "123");
- assertEquals("foo/xyz/bar/123?abc=xyz&def=123",
- UriTemplate.expand("foo/xyz/bar/123", requestMap, true));
+ assertEquals(
+ "foo/xyz/bar/123?abc=xyz&def=123", UriTemplate.expand("foo/xyz/bar/123", requestMap, true));
}
public void testExpandTemplates_noExpansionsWithoutQueryParams() {
@@ -104,22 +105,22 @@ private Iterable getListIterable() {
// template, expected output.
private static final String[][] LIST_TESTS = {
- {"{d}", "red,green,blue"},
- {"{d*}", "red,green,blue"},
- {"{+d}", "red,green,blue"},
- {"{+d*}", "red,green,blue"},
- {"{#d}", "#red,green,blue"},
- {"{#d*}", "#red,green,blue"},
- {"X{.d}", "X.red,green,blue"},
- {"X{.d*}", "X.red.green.blue"},
- {"{/d}", "/red,green,blue"},
- {"{/d*}", "/red/green/blue"},
- {"{;d}", ";d=red,green,blue"},
- {"{;d*}", ";d=red;d=green;d=blue"},
- {"{?d}", "?d=red,green,blue"},
- {"{?d*}", "?d=red&d=green&d=blue"},
- {"{&d}", "&d=red,green,blue"},
- {"{&d*}", "&d=red&d=green&d=blue"},
+ {"{d}", "red,green,blue"},
+ {"{d*}", "red,green,blue"},
+ {"{+d}", "red,green,blue"},
+ {"{+d*}", "red,green,blue"},
+ {"{#d}", "#red,green,blue"},
+ {"{#d*}", "#red,green,blue"},
+ {"X{.d}", "X.red,green,blue"},
+ {"X{.d*}", "X.red.green.blue"},
+ {"{/d}", "/red,green,blue"},
+ {"{/d*}", "/red/green/blue"},
+ {"{;d}", ";d=red,green,blue"},
+ {"{;d*}", ";d=red;d=green;d=blue"},
+ {"{?d}", "?d=red,green,blue"},
+ {"{?d*}", "?d=red&d=green&d=blue"},
+ {"{&d}", "&d=red,green,blue"},
+ {"{&d*}", "&d=red&d=green&d=blue"},
};
public void testExpandTemplates_explodeIterator() {
@@ -172,22 +173,22 @@ private Map getMapParams() {
// template, expected output.
private static final String[][] MAP_TESTS = {
- {"{d}", "semi,%3B,dot,.,comma,%2C"},
- {"{d*}", "semi=%3B,dot=.,comma=%2C"},
- {"{+d}", "semi,;,dot,.,comma,,"},
- {"{+d*}", "semi=;,dot=.,comma=,"},
- {"{#d}", "#semi,;,dot,.,comma,,"},
- {"{#d*}", "#semi=;,dot=.,comma=,"},
- {"X{.d}", "X.semi,%3B,dot,.,comma,%2C"},
- {"X{.d*}", "X.semi=%3B.dot=..comma=%2C"},
- {"{/d}", "/semi,%3B,dot,.,comma,%2C"},
- {"{/d*}", "/semi=%3B/dot=./comma=%2C"},
- {"{;d}", ";d=semi,%3B,dot,.,comma,%2C"},
- {"{;d*}", ";semi=%3B;dot=.;comma=%2C"},
- {"{?d}", "?d=semi,%3B,dot,.,comma,%2C"},
- {"{?d*}", "?semi=%3B&dot=.&comma=%2C"},
- {"{&d}", "&d=semi,%3B,dot,.,comma,%2C"},
- {"{&d*}", "&semi=%3B&dot=.&comma=%2C"},
+ {"{d}", "semi,%3B,dot,.,comma,%2C"},
+ {"{d*}", "semi=%3B,dot=.,comma=%2C"},
+ {"{+d}", "semi,;,dot,.,comma,,"},
+ {"{+d*}", "semi=;,dot=.,comma=,"},
+ {"{#d}", "#semi,;,dot,.,comma,,"},
+ {"{#d*}", "#semi=;,dot=.,comma=,"},
+ {"X{.d}", "X.semi,%3B,dot,.,comma,%2C"},
+ {"X{.d*}", "X.semi=%3B.dot=..comma=%2C"},
+ {"{/d}", "/semi,%3B,dot,.,comma,%2C"},
+ {"{/d*}", "/semi=%3B/dot=./comma=%2C"},
+ {"{;d}", ";d=semi,%3B,dot,.,comma,%2C"},
+ {"{;d*}", ";semi=%3B;dot=.;comma=%2C"},
+ {"{?d}", "?d=semi,%3B,dot,.,comma,%2C"},
+ {"{?d*}", "?semi=%3B&dot=.&comma=%2C"},
+ {"{&d}", "&d=semi,%3B,dot,.,comma,%2C"},
+ {"{&d*}", "&semi=%3B&dot=.&comma=%2C"},
};
public void testExpandTemplates_explodeMap() {
@@ -210,7 +211,8 @@ public void testExpandTemplates_unusedQueryParametersEncoding() {
requestMap.put("unused1", "abc!1234?");
requestMap.put("unused2", "56$7 8");
requestMap.put("unused3", "9=&/:@.");
- assertEquals("?unused1=abc!1234?&unused2=56$7%208&unused3=9%3D%26/:@.",
+ assertEquals(
+ "?unused1=abc!1234?&unused2=56$7%208&unused3=9%3D%26/:@.",
UriTemplate.expand("", requestMap, true));
}
@@ -223,7 +225,8 @@ public void testExpandTemplates_unusedListQueryParameters() {
requestMap.put("unused1", params);
requestMap.put("unused2", "56$7 8");
requestMap.put("unused3", "9=&/:@.");
- assertEquals("?unused1=value1&unused1=value2&unused2=56$7%208&unused3=9%3D%26/:@.",
+ assertEquals(
+ "?unused1=value1&unused1=value2&unused2=56$7%208&unused3=9%3D%26/:@.",
UriTemplate.expand("", requestMap, true));
}
@@ -243,7 +246,7 @@ public void testExpandTemplates_mixedBagParameters() {
requestMap.put("unused2", "unused=param");
assertEquals(
"foo/xyz/red/green/blue&iterable=red&iterable=green&iterable=blue&map=semi,%3B,dot,.,comma"
- + ",%2C&enum=ONE?unused1=unused%20param&unused2=unused%3Dparam",
+ + ",%2C&enum=ONE?unused1=unused%20param&unused2=unused%3Dparam",
UriTemplate.expand("foo/{abc}{/iterator*}{&iterable*}{&map}{&enum}", requestMap, true));
// Assert the map has not changed.
assertEquals(7, requestMap.size());
@@ -261,32 +264,36 @@ public void testExpandTemplates_withBaseUrl() {
requestMap.put("def", "123");
// Expand with URI template not starting with "/".
- assertEquals("https://test/base/path/xyz/123/bar/",
+ assertEquals(
+ "https://test/base/path/xyz/123/bar/",
UriTemplate.expand("https://test/base/path/", "{abc}/{def}/bar/", requestMap, true));
// Expand with URI template starting with "/".
- assertEquals("https://test/xyz/123/bar/",
+ assertEquals(
+ "https://test/xyz/123/bar/",
UriTemplate.expand("https://test/base/path/", "/{abc}/{def}/bar/", requestMap, true));
// Expand with URI template as a full URL.
- assertEquals("http://test3/xyz/123/bar/", UriTemplate.expand("https://test/base/path/",
- "http://test3/{abc}/{def}/bar/", requestMap, true));
+ assertEquals(
+ "http://test3/xyz/123/bar/",
+ UriTemplate.expand(
+ "https://test/base/path/", "http://test3/{abc}/{def}/bar/", requestMap, true));
}
public void testExpandNonReservedNonComposite() {
SortedMap requestMap = Maps.newTreeMap();
requestMap.put("abc", "xyz");
requestMap.put("def", "a/b?c");
- assertEquals("foo/xyz/bar/a%2Fb%3Fc",
- UriTemplate.expand("foo/{abc}/bar/{def}", requestMap, false));
- assertEquals("foo/xyz/bar/a/b?c",
- UriTemplate.expand("foo/{abc}/bar/{+def}", requestMap, false));
+ assertEquals(
+ "foo/xyz/bar/a%2Fb%3Fc", UriTemplate.expand("foo/{abc}/bar/{def}", requestMap, false));
+ assertEquals(
+ "foo/xyz/bar/a/b?c", UriTemplate.expand("foo/{abc}/bar/{+def}", requestMap, false));
}
public void testExpandSeveralTemplates() {
- SortedMap map = Maps.newTreeMap();
- map.put("id", "a");
- map.put("uid", "b");
+ SortedMap map = Maps.newTreeMap();
+ map.put("id", "a");
+ map.put("uid", "b");
- assertEquals("?id=a&uid=b", UriTemplate.expand("{?id,uid}", map, false));
+ assertEquals("?id=a&uid=b", UriTemplate.expand("{?id,uid}", map, false));
}
public void testExpandSeveralTemplatesUnusedParameterInMiddle() {
diff --git a/google-http-client/src/test/java/com/google/api/client/http/UrlEncodedContentTest.java b/google-http-client/src/test/java/com/google/api/client/http/UrlEncodedContentTest.java
index 76e768404..f0e0768a9 100644
--- a/google-http-client/src/test/java/com/google/api/client/http/UrlEncodedContentTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/http/UrlEncodedContentTest.java
@@ -35,10 +35,8 @@ public class UrlEncodedContentTest extends TestCase {
public void testWriteTo() throws IOException {
subtestWriteTo("a=x", ArrayMap.of("a", "x"));
subtestWriteTo("noval", ArrayMap.of("noval", ""));
- subtestWriteTo(
- "multi=a&multi=b&multi=c", ArrayMap.of("multi", Arrays.asList("a", "b", "c")));
- subtestWriteTo(
- "multi=a&multi=b&multi=c", ArrayMap.of("multi", new String[] {"a", "b", "c"}));
+ subtestWriteTo("multi=a&multi=b&multi=c", ArrayMap.of("multi", Arrays.asList("a", "b", "c")));
+ subtestWriteTo("multi=a&multi=b&multi=c", ArrayMap.of("multi", new String[] {"a", "b", "c"}));
// https://github.com/googleapis/google-http-java-client/issues/202
final Map params = new LinkedHashMap();
params.put("username", "un");
@@ -54,8 +52,10 @@ private void subtestWriteTo(String expected, Object data) throws IOException {
}
public void testGetContent() throws Exception {
- HttpRequest request = new MockHttpTransport().createRequestFactory()
- .buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
+ HttpRequest request =
+ new MockHttpTransport()
+ .createRequestFactory()
+ .buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
UrlEncodedContent content = UrlEncodedContent.getContent(request);
assertNotNull(content);
assertTrue(content.getData() instanceof Map);
diff --git a/google-http-client/src/test/java/com/google/api/client/http/UrlEncodedParserTest.java b/google-http-client/src/test/java/com/google/api/client/http/UrlEncodedParserTest.java
index 7659e4551..e61799777 100644
--- a/google-http-client/src/test/java/com/google/api/client/http/UrlEncodedParserTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/http/UrlEncodedParserTest.java
@@ -34,8 +34,7 @@
*/
public class UrlEncodedParserTest extends TestCase {
- public UrlEncodedParserTest() {
- }
+ public UrlEncodedParserTest() {}
public UrlEncodedParserTest(String name) {
super(name);
@@ -43,36 +42,32 @@ public UrlEncodedParserTest(String name) {
public static class Simple {
- @Key
- Void v;
+ @Key Void v;
- @Key
- String a;
+ @Key String a;
- @Key
- String b;
+ @Key String b;
- @Key
- String c;
+ @Key String c;
- @Key
- List q;
+ @Key List q;
- @Key
- String[] r;
+ @Key String[] r;
- @Key
- Object o;
+ @Key Object o;
@Override
public boolean equals(Object obj) {
Simple other = (Simple) obj;
- return Objects.equal(a, other.a) && Objects.equal(b, other.b) && Objects.equal(c, other.c)
- && Objects.equal(q, other.q) && Arrays.equals(r, other.r) && Objects.equal(o, other.o);
+ return Objects.equal(a, other.a)
+ && Objects.equal(b, other.b)
+ && Objects.equal(c, other.c)
+ && Objects.equal(q, other.q)
+ && Arrays.equals(r, other.r)
+ && Objects.equal(o, other.o);
}
- public Simple() {
- }
+ public Simple() {}
@Override
public String toString() {
@@ -88,20 +83,15 @@ public String toString() {
}
public static class Generic extends GenericData {
- @Key
- String a;
+ @Key String a;
- @Key
- String b;
+ @Key String b;
- @Key
- String c;
+ @Key String c;
- @Key
- List q;
+ @Key List q;
- @Key
- Object o;
+ @Key Object o;
@Override
public Generic set(String fieldName, Object value) {
@@ -169,7 +159,6 @@ public void testParse_null() {
}
public enum E {
-
@Value
VALUE,
@Value("other")
@@ -177,10 +166,8 @@ public enum E {
}
public static class EnumValue extends GenericData {
- @Key
- public E value;
- @Key
- public E otherValue;
+ @Key public E value;
+ @Key public E otherValue;
@Override
public EnumValue set(String fieldName, Object value) {
diff --git a/google-http-client/src/test/java/com/google/api/client/http/javanet/NetHttpRequestTest.java b/google-http-client/src/test/java/com/google/api/client/http/javanet/NetHttpRequestTest.java
index d1a3e03cc..d4118328e 100644
--- a/google-http-client/src/test/java/com/google/api/client/http/javanet/NetHttpRequestTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/http/javanet/NetHttpRequestTest.java
@@ -1,5 +1,9 @@
package com.google.api.client.http.javanet;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import com.google.api.client.http.HttpContent;
import com.google.api.client.http.InputStreamContent;
import com.google.api.client.http.LowLevelHttpResponse;
@@ -11,11 +15,6 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URL;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import java.util.concurrent.TimeoutException;
import org.junit.Test;
@@ -23,9 +22,11 @@ public class NetHttpRequestTest {
static class SleepingOutputWriter implements OutputWriter {
private long sleepTimeInMs;
+
public SleepingOutputWriter(long sleepTimeInMs) {
this.sleepTimeInMs = sleepTimeInMs;
}
+
@Override
public void write(OutputStream outputStream, StreamingContent content) throws IOException {
try {
@@ -38,21 +39,22 @@ public void write(OutputStream outputStream, StreamingContent content) throws IO
@Test
public void testHangingWrite() throws InterruptedException {
- Thread thread = new Thread() {
- @Override
- public void run() {
- try {
- postWithTimeout(0);
- } catch (IOException e) {
- // expected to be interrupted
- assertEquals(e.getCause().getClass(), InterruptedException.class);
- return;
- } catch (Exception e) {
- fail();
- }
- fail("should be interrupted before here");
- }
- };
+ Thread thread =
+ new Thread() {
+ @Override
+ public void run() {
+ try {
+ postWithTimeout(0);
+ } catch (IOException e) {
+ // expected to be interrupted
+ assertEquals(e.getCause().getClass(), InterruptedException.class);
+ return;
+ } catch (Exception e) {
+ fail();
+ }
+ fail("should be interrupted before here");
+ }
+ };
thread.start();
Thread.sleep(1000);
@@ -85,17 +87,18 @@ private static void postWithTimeout(int timeout) throws Exception {
@Test
public void testInterruptedWriteWithResponse() throws Exception {
- MockHttpURLConnection connection = new MockHttpURLConnection(new URL(HttpTesting.SIMPLE_URL)) {
- @Override
- public OutputStream getOutputStream() throws IOException {
- return new OutputStream() {
+ MockHttpURLConnection connection =
+ new MockHttpURLConnection(new URL(HttpTesting.SIMPLE_URL)) {
@Override
- public void write(int b) throws IOException {
- throw new IOException("Error writing request body to server");
+ public OutputStream getOutputStream() throws IOException {
+ return new OutputStream() {
+ @Override
+ public void write(int b) throws IOException {
+ throw new IOException("Error writing request body to server");
+ }
+ };
}
};
- }
- };
connection.setResponseCode(401);
connection.setRequestMethod("POST");
NetHttpRequest request = new NetHttpRequest(connection);
@@ -109,17 +112,18 @@ public void write(int b) throws IOException {
@Test
public void testInterruptedWriteWithoutResponse() throws Exception {
- MockHttpURLConnection connection = new MockHttpURLConnection(new URL(HttpTesting.SIMPLE_URL)) {
- @Override
- public OutputStream getOutputStream() throws IOException {
- return new OutputStream() {
+ MockHttpURLConnection connection =
+ new MockHttpURLConnection(new URL(HttpTesting.SIMPLE_URL)) {
@Override
- public void write(int b) throws IOException {
- throw new IOException("Error writing request body to server");
+ public OutputStream getOutputStream() throws IOException {
+ return new OutputStream() {
+ @Override
+ public void write(int b) throws IOException {
+ throw new IOException("Error writing request body to server");
+ }
+ };
}
};
- }
- };
connection.setRequestMethod("POST");
NetHttpRequest request = new NetHttpRequest(connection);
InputStream is = NetHttpRequestTest.class.getClassLoader().getResourceAsStream("file.txt");
@@ -136,22 +140,23 @@ public void write(int b) throws IOException {
@Test
public void testInterruptedWriteErrorOnResponse() throws Exception {
- MockHttpURLConnection connection = new MockHttpURLConnection(new URL(HttpTesting.SIMPLE_URL)) {
- @Override
- public OutputStream getOutputStream() throws IOException {
- return new OutputStream() {
+ MockHttpURLConnection connection =
+ new MockHttpURLConnection(new URL(HttpTesting.SIMPLE_URL)) {
@Override
- public void write(int b) throws IOException {
- throw new IOException("Error writing request body to server");
+ public OutputStream getOutputStream() throws IOException {
+ return new OutputStream() {
+ @Override
+ public void write(int b) throws IOException {
+ throw new IOException("Error writing request body to server");
+ }
+ };
}
- };
- }
- @Override
- public int getResponseCode() throws IOException {
- throw new IOException("Error parsing response code");
- }
- };
+ @Override
+ public int getResponseCode() throws IOException {
+ throw new IOException("Error parsing response code");
+ }
+ };
connection.setRequestMethod("POST");
NetHttpRequest request = new NetHttpRequest(connection);
InputStream is = NetHttpRequestTest.class.getClassLoader().getResourceAsStream("file.txt");
@@ -168,22 +173,23 @@ public int getResponseCode() throws IOException {
@Test
public void testErrorOnClose() throws Exception {
- MockHttpURLConnection connection = new MockHttpURLConnection(new URL(HttpTesting.SIMPLE_URL)) {
- @Override
- public OutputStream getOutputStream() throws IOException {
- return new OutputStream() {
- @Override
- public void write(int b) throws IOException {
- return;
- }
-
+ MockHttpURLConnection connection =
+ new MockHttpURLConnection(new URL(HttpTesting.SIMPLE_URL)) {
@Override
- public void close() throws IOException {
- throw new IOException("Error during close");
+ public OutputStream getOutputStream() throws IOException {
+ return new OutputStream() {
+ @Override
+ public void write(int b) throws IOException {
+ return;
+ }
+
+ @Override
+ public void close() throws IOException {
+ throw new IOException("Error during close");
+ }
+ };
}
};
- }
- };
connection.setRequestMethod("POST");
NetHttpRequest request = new NetHttpRequest(connection);
InputStream is = NetHttpRequestTest.class.getClassLoader().getResourceAsStream("file.txt");
diff --git a/google-http-client/src/test/java/com/google/api/client/http/javanet/NetHttpResponseTest.java b/google-http-client/src/test/java/com/google/api/client/http/javanet/NetHttpResponseTest.java
index 866928d16..beb4891ef 100644
--- a/google-http-client/src/test/java/com/google/api/client/http/javanet/NetHttpResponseTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/http/javanet/NetHttpResponseTest.java
@@ -39,8 +39,10 @@ public void testGetStatusCode() throws IOException {
}
public void subtestGetStatusCode(int expectedCode, int responseCode) throws IOException {
- assertEquals(expectedCode, new NetHttpResponse(
- new MockHttpURLConnection(null).setResponseCode(responseCode)).getStatusCode());
+ assertEquals(
+ expectedCode,
+ new NetHttpResponse(new MockHttpURLConnection(null).setResponseCode(responseCode))
+ .getStatusCode());
}
public void testGetContent() throws IOException {
@@ -61,9 +63,12 @@ public void testGetContent() throws IOException {
public void subtestGetContent(int responseCode) throws IOException {
NetHttpResponse response =
- new NetHttpResponse(new MockHttpURLConnection(null).setResponseCode(responseCode)
- .setInputStream(new ByteArrayInputStream(StringUtils.getBytesUtf8(VALID_RESPONSE)))
- .setErrorStream(new ByteArrayInputStream(StringUtils.getBytesUtf8(ERROR_RESPONSE))));
+ new NetHttpResponse(
+ new MockHttpURLConnection(null)
+ .setResponseCode(responseCode)
+ .setInputStream(new ByteArrayInputStream(StringUtils.getBytesUtf8(VALID_RESPONSE)))
+ .setErrorStream(
+ new ByteArrayInputStream(StringUtils.getBytesUtf8(ERROR_RESPONSE))));
InputStream is = response.getContent();
byte[] buf = new byte[100];
int bytes = 0, n = 0;
@@ -79,9 +84,12 @@ public void subtestGetContent(int responseCode) throws IOException {
public void subtestGetContentWithShortRead(int responseCode) throws IOException {
NetHttpResponse response =
- new NetHttpResponse(new MockHttpURLConnection(null).setResponseCode(responseCode)
- .setInputStream(new ByteArrayInputStream(StringUtils.getBytesUtf8(VALID_RESPONSE)))
- .setErrorStream(new ByteArrayInputStream(StringUtils.getBytesUtf8(ERROR_RESPONSE))));
+ new NetHttpResponse(
+ new MockHttpURLConnection(null)
+ .setResponseCode(responseCode)
+ .setInputStream(new ByteArrayInputStream(StringUtils.getBytesUtf8(VALID_RESPONSE)))
+ .setErrorStream(
+ new ByteArrayInputStream(StringUtils.getBytesUtf8(ERROR_RESPONSE))));
InputStream is = response.getContent();
byte[] buf = new byte[100];
int bytes = 0, b = 0;
@@ -96,10 +104,11 @@ public void subtestGetContentWithShortRead(int responseCode) throws IOException
}
public void testSkippingBytes() throws IOException {
- MockHttpURLConnection connection = new MockHttpURLConnection(null)
- .setResponseCode(200)
- .setInputStream(new ByteArrayInputStream(StringUtils.getBytesUtf8("0123456789")))
- .addHeader("Content-Length", "10");
+ MockHttpURLConnection connection =
+ new MockHttpURLConnection(null)
+ .setResponseCode(200)
+ .setInputStream(new ByteArrayInputStream(StringUtils.getBytesUtf8("0123456789")))
+ .addHeader("Content-Length", "10");
NetHttpResponse response = new NetHttpResponse(connection);
InputStream is = response.getContent();
// read 1 byte, then skip 9 (to EOF)
diff --git a/google-http-client/src/test/java/com/google/api/client/http/javanet/NetHttpTransportTest.java b/google-http-client/src/test/java/com/google/api/client/http/javanet/NetHttpTransportTest.java
index 56e65c01b..a1bc3b348 100644
--- a/google-http-client/src/test/java/com/google/api/client/http/javanet/NetHttpTransportTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/http/javanet/NetHttpTransportTest.java
@@ -32,8 +32,9 @@
*/
public class NetHttpTransportTest extends TestCase {
- private static final String[] METHODS =
- {"GET", "POST", "HEAD", "OPTIONS", "PUT", "DELETE", "TRACE"};
+ private static final String[] METHODS = {
+ "GET", "POST", "HEAD", "OPTIONS", "PUT", "DELETE", "TRACE"
+ };
public void testExecute_mock() throws Exception {
for (String method : METHODS) {
@@ -59,14 +60,14 @@ public void testExecute_mock() throws Exception {
}
}
-
public void testExecute_methodUnchanged() throws Exception {
String body = "Arbitrary body";
byte[] buf = StringUtils.getBytesUtf8(body);
for (String method : METHODS) {
- HttpURLConnection connection = new MockHttpURLConnection(new URL(HttpTesting.SIMPLE_URL))
- .setResponseCode(200)
- .setInputStream(new ByteArrayInputStream(buf));
+ HttpURLConnection connection =
+ new MockHttpURLConnection(new URL(HttpTesting.SIMPLE_URL))
+ .setResponseCode(200)
+ .setInputStream(new ByteArrayInputStream(buf));
connection.setRequestMethod(method);
NetHttpRequest request = new NetHttpRequest(connection);
setContent(request, "text/html", "");
@@ -76,14 +77,13 @@ public void testExecute_methodUnchanged() throws Exception {
}
public void testAbruptTerminationIsNoticedWithContentLength() throws Exception {
- String incompleteBody = ""
- + "Fixed size body test.\r\n"
- + "Incomplete response.";
+ String incompleteBody = "" + "Fixed size body test.\r\n" + "Incomplete response.";
byte[] buf = StringUtils.getBytesUtf8(incompleteBody);
- MockHttpURLConnection connection = new MockHttpURLConnection(new URL(HttpTesting.SIMPLE_URL))
- .setResponseCode(200)
- .addHeader("Content-Length", "205")
- .setInputStream(new ByteArrayInputStream(buf));
+ MockHttpURLConnection connection =
+ new MockHttpURLConnection(new URL(HttpTesting.SIMPLE_URL))
+ .setResponseCode(200)
+ .addHeader("Content-Length", "205")
+ .setInputStream(new ByteArrayInputStream(buf));
connection.setRequestMethod("GET");
NetHttpRequest request = new NetHttpRequest(connection);
setContent(request, null, "");
@@ -102,14 +102,13 @@ public void testAbruptTerminationIsNoticedWithContentLength() throws Exception {
}
public void testAbruptTerminationIsNoticedWithContentLengthWithReadToBuf() throws Exception {
- String incompleteBody = ""
- + "Fixed size body test.\r\n"
- + "Incomplete response.";
+ String incompleteBody = "" + "Fixed size body test.\r\n" + "Incomplete response.";
byte[] buf = StringUtils.getBytesUtf8(incompleteBody);
- MockHttpURLConnection connection = new MockHttpURLConnection(new URL(HttpTesting.SIMPLE_URL))
- .setResponseCode(200)
- .addHeader("Content-Length", "205")
- .setInputStream(new ByteArrayInputStream(buf));
+ MockHttpURLConnection connection =
+ new MockHttpURLConnection(new URL(HttpTesting.SIMPLE_URL))
+ .setResponseCode(200)
+ .addHeader("Content-Length", "205")
+ .setInputStream(new ByteArrayInputStream(buf));
connection.setRequestMethod("GET");
NetHttpRequest request = new NetHttpRequest(connection);
setContent(request, null, "");
diff --git a/google-http-client/src/test/java/com/google/api/client/json/JsonObjectParserTest.java b/google-http-client/src/test/java/com/google/api/client/json/JsonObjectParserTest.java
index b5d88adc8..3192b62ba 100644
--- a/google-http-client/src/test/java/com/google/api/client/json/JsonObjectParserTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/json/JsonObjectParserTest.java
@@ -38,7 +38,8 @@ public void testConstructor_null() {
try {
new JsonObjectParser((JsonFactory) null);
fail("Did not throw NullPointerException");
- } catch (NullPointerException expected) {}
+ } catch (NullPointerException expected) {
+ }
}
public void testParse_InputStream() throws Exception {
diff --git a/google-http-client/src/test/java/com/google/api/client/json/JsonParserTest.java b/google-http-client/src/test/java/com/google/api/client/json/JsonParserTest.java
index 726671f9c..3f4db6fc9 100644
--- a/google-http-client/src/test/java/com/google/api/client/json/JsonParserTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/json/JsonParserTest.java
@@ -14,10 +14,8 @@
package com.google.api.client.json;
-
import com.google.api.client.testing.json.MockJsonFactory;
import com.google.api.client.testing.json.MockJsonParser;
-
import junit.framework.TestCase;
/**
diff --git a/google-http-client/src/test/java/com/google/api/client/json/webtoken/JsonWebSignatureTest.java b/google-http-client/src/test/java/com/google/api/client/json/webtoken/JsonWebSignatureTest.java
index b26237569..312c1d971 100644
--- a/google-http-client/src/test/java/com/google/api/client/json/webtoken/JsonWebSignatureTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/json/webtoken/JsonWebSignatureTest.java
@@ -34,12 +34,15 @@ public void testSign() throws Exception {
header.setAlgorithm("RS256");
header.setType("JWT");
JsonWebToken.Payload payload = new JsonWebToken.Payload();
- payload.setIssuer("issuer")
- .setAudience("audience").setIssuedAtTimeSeconds(0L).setExpirationTimeSeconds(3600L);
+ payload
+ .setIssuer("issuer")
+ .setAudience("audience")
+ .setIssuedAtTimeSeconds(0L)
+ .setExpirationTimeSeconds(3600L);
RSAPrivateKey privateKey = SecurityTestUtils.newRsaPrivateKey();
assertEquals(
"..kDmKaHNYByLmqAi9ROeLcFmZM7W_emsceKvDZiEGAo-ineCunC6_Nb0HEpAuzIidV-LYTMHS3BvI49KFz9gi6hI3"
- + "ZndDL5EzplpFJo1ZclVk1_hLn94P2OTAkZ4ydsTfus6Bl98EbCkInpF_2t5Fr8OaHxCZCDdDU7W5DSnOsx4",
+ + "ZndDL5EzplpFJo1ZclVk1_hLn94P2OTAkZ4ydsTfus6Bl98EbCkInpF_2t5Fr8OaHxCZCDdDU7W5DSnOsx4",
JsonWebSignature.signUsingRsaSha256(privateKey, new MockJsonFactory(), header, payload));
}
diff --git a/google-http-client/src/test/java/com/google/api/client/testing/http/FixedClockTest.java b/google-http-client/src/test/java/com/google/api/client/testing/http/FixedClockTest.java
index e384d91e0..002685427 100644
--- a/google-http-client/src/test/java/com/google/api/client/testing/http/FixedClockTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/testing/http/FixedClockTest.java
@@ -18,12 +18,11 @@
/**
* Tests for the {@link FixedClock}.
+ *
* @author mlinder@google.com (Matthias Linder)
*/
public class FixedClockTest extends TestCase {
- /**
- * Tests that the {@link FixedClock#currentTimeMillis()} method will return the mocked values.
- */
+ /** Tests that the {@link FixedClock#currentTimeMillis()} method will return the mocked values. */
public void testCurrentTimeMillis() {
// Check that the initial value is set properly.
FixedClock clock = new FixedClock(100);
diff --git a/google-http-client/src/test/java/com/google/api/client/testing/http/MockHttpTransportTest.java b/google-http-client/src/test/java/com/google/api/client/testing/http/MockHttpTransportTest.java
index 474150471..ea5851917 100644
--- a/google-http-client/src/test/java/com/google/api/client/testing/http/MockHttpTransportTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/testing/http/MockHttpTransportTest.java
@@ -19,7 +19,6 @@
import com.google.api.client.http.GenericUrl;
import com.google.api.client.http.HttpRequest;
import com.google.api.client.http.HttpRequestFactory;
-
import junit.framework.TestCase;
/**
diff --git a/google-http-client/src/test/java/com/google/api/client/testing/http/MockLowLevelHttpRequestTest.java b/google-http-client/src/test/java/com/google/api/client/testing/http/MockLowLevelHttpRequestTest.java
index 537e20bad..3c887a3ef 100644
--- a/google-http-client/src/test/java/com/google/api/client/testing/http/MockLowLevelHttpRequestTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/testing/http/MockLowLevelHttpRequestTest.java
@@ -16,7 +16,6 @@
import com.google.api.client.util.ByteArrayStreamingContent;
import com.google.api.client.util.StringUtils;
-
import junit.framework.TestCase;
/**
diff --git a/google-http-client/src/test/java/com/google/api/client/testing/http/javanet/MockHttpUrlConnectionTest.java b/google-http-client/src/test/java/com/google/api/client/testing/http/javanet/MockHttpUrlConnectionTest.java
index 6f54f1975..4dbf2df37 100644
--- a/google-http-client/src/test/java/com/google/api/client/testing/http/javanet/MockHttpUrlConnectionTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/testing/http/javanet/MockHttpUrlConnectionTest.java
@@ -25,48 +25,46 @@
import java.util.Map;
import junit.framework.TestCase;
-/**
- * Tests {@link MockHttpURLConnection}.
- */
+/** Tests {@link MockHttpURLConnection}. */
public class MockHttpUrlConnectionTest extends TestCase {
private static final String RESPONSE_BODY = "body";
private static final String HEADER_NAME = "Custom-Header";
public void testSetGetHeaders() throws IOException {
- MockHttpURLConnection connection = new MockHttpURLConnection(new URL(HttpTesting.SIMPLE_URL));
- connection.addHeader(HEADER_NAME, "100");
- assertEquals("100", connection.getHeaderField(HEADER_NAME));
+ MockHttpURLConnection connection = new MockHttpURLConnection(new URL(HttpTesting.SIMPLE_URL));
+ connection.addHeader(HEADER_NAME, "100");
+ assertEquals("100", connection.getHeaderField(HEADER_NAME));
}
public void testSetGetMultipleHeaders() throws IOException {
- MockHttpURLConnection connection = new MockHttpURLConnection(new URL(HttpTesting.SIMPLE_URL));
- List values = Arrays.asList("value1", "value2", "value3");
- for (String value : values) {
- connection.addHeader(HEADER_NAME, value);
- }
- Map> headers = connection.getHeaderFields();
- assertEquals(3, headers.get(HEADER_NAME).size());
- for (int i = 0; i < 3; i++) {
- assertEquals(values.get(i), headers.get(HEADER_NAME).get(i));
- }
+ MockHttpURLConnection connection = new MockHttpURLConnection(new URL(HttpTesting.SIMPLE_URL));
+ List values = Arrays.asList("value1", "value2", "value3");
+ for (String value : values) {
+ connection.addHeader(HEADER_NAME, value);
+ }
+ Map> headers = connection.getHeaderFields();
+ assertEquals(3, headers.get(HEADER_NAME).size());
+ for (int i = 0; i < 3; i++) {
+ assertEquals(values.get(i), headers.get(HEADER_NAME).get(i));
+ }
}
public void testGetNonExistingHeader() throws IOException {
- MockHttpURLConnection connection = new MockHttpURLConnection(new URL(HttpTesting.SIMPLE_URL));
- assertNull(connection.getHeaderField(HEADER_NAME));
+ MockHttpURLConnection connection = new MockHttpURLConnection(new URL(HttpTesting.SIMPLE_URL));
+ assertNull(connection.getHeaderField(HEADER_NAME));
}
public void testSetInputStreamAndInputStreamImmutable() throws IOException {
- MockHttpURLConnection connection = new MockHttpURLConnection(new URL(HttpTesting.SIMPLE_URL));
- connection.setInputStream(new ByteArrayInputStream(StringUtils.getBytesUtf8(RESPONSE_BODY)));
- connection.setInputStream(new ByteArrayInputStream(StringUtils.getBytesUtf8("override")));
- byte[] buf = new byte[10];
- InputStream in = connection.getInputStream();
- int n = 0, bytes = 0;
- while ((n = in.read(buf)) != -1) {
- bytes += n;
- }
- assertEquals(RESPONSE_BODY, new String(buf, 0, bytes));
+ MockHttpURLConnection connection = new MockHttpURLConnection(new URL(HttpTesting.SIMPLE_URL));
+ connection.setInputStream(new ByteArrayInputStream(StringUtils.getBytesUtf8(RESPONSE_BODY)));
+ connection.setInputStream(new ByteArrayInputStream(StringUtils.getBytesUtf8("override")));
+ byte[] buf = new byte[10];
+ InputStream in = connection.getInputStream();
+ int n = 0, bytes = 0;
+ while ((n = in.read(buf)) != -1) {
+ bytes += n;
+ }
+ assertEquals(RESPONSE_BODY, new String(buf, 0, bytes));
}
}
diff --git a/google-http-client/src/test/java/com/google/api/client/testing/util/MockBackOffTest.java b/google-http-client/src/test/java/com/google/api/client/testing/util/MockBackOffTest.java
index 127edb1b0..9fdc66ecf 100644
--- a/google-http-client/src/test/java/com/google/api/client/testing/util/MockBackOffTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/testing/util/MockBackOffTest.java
@@ -37,5 +37,4 @@ public void subtestNextBackOffMillis(long expectedValue, BackOff backOffPolicy)
assertEquals(expectedValue, backOffPolicy.nextBackOffMillis());
}
}
-
}
diff --git a/google-http-client/src/test/java/com/google/api/client/util/ArrayMapTest.java b/google-http-client/src/test/java/com/google/api/client/util/ArrayMapTest.java
index db1f1e435..b08c2fa29 100644
--- a/google-http-client/src/test/java/com/google/api/client/util/ArrayMapTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/util/ArrayMapTest.java
@@ -14,10 +14,9 @@
package com.google.api.client.util;
-import junit.framework.TestCase;
-
import java.util.Iterator;
import java.util.Map;
+import junit.framework.TestCase;
/**
* Tests {@link ArrayMap}.
@@ -26,8 +25,7 @@
*/
public class ArrayMapTest extends TestCase {
- public ArrayMapTest() {
- }
+ public ArrayMapTest() {}
public ArrayMapTest(String testName) {
super(testName);
diff --git a/google-http-client/src/test/java/com/google/api/client/util/BackOffUtilsTest.java b/google-http-client/src/test/java/com/google/api/client/util/BackOffUtilsTest.java
index fad0b82f9..79ddc4f5e 100644
--- a/google-http-client/src/test/java/com/google/api/client/util/BackOffUtilsTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/util/BackOffUtilsTest.java
@@ -16,7 +16,6 @@
import com.google.api.client.testing.util.MockBackOff;
import com.google.api.client.testing.util.MockSleeper;
-
import junit.framework.TestCase;
/**
diff --git a/google-http-client/src/test/java/com/google/api/client/util/ClassInfoTest.java b/google-http-client/src/test/java/com/google/api/client/util/ClassInfoTest.java
index c7ec1c7af..380fd6189 100644
--- a/google-http-client/src/test/java/com/google/api/client/util/ClassInfoTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/util/ClassInfoTest.java
@@ -27,13 +27,13 @@
public class ClassInfoTest extends TestCase {
public enum E {
-
@Value
VALUE,
@Value("other")
OTHER_VALUE,
@NullValue
- NULL, IGNORED_VALUE
+ NULL,
+ IGNORED_VALUE
}
public void testIsEnum() {
@@ -49,10 +49,11 @@ public void testGetFieldInfo_enum() throws Exception {
}
public class A {
- @Key
- String b;
+ @Key String b;
+
@Key("oc")
String c;
+
String d;
@Key("AbC")
@@ -60,8 +61,7 @@ public class A {
}
public class B extends A {
- @Key
- String e;
+ @Key String e;
}
public class C extends B {
@@ -70,8 +70,8 @@ public class C extends B {
}
public class A1 {
- @Key
- String foo;
+ @Key String foo;
+
@Key("foo")
String foo2;
}
diff --git a/google-http-client/src/test/java/com/google/api/client/util/ClockTest.java b/google-http-client/src/test/java/com/google/api/client/util/ClockTest.java
index 64acd1993..8af12e19c 100644
--- a/google-http-client/src/test/java/com/google/api/client/util/ClockTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/util/ClockTest.java
@@ -18,12 +18,11 @@
/**
* Tests for the {@link Clock}.
+ *
* @author mlinder@google.com (Matthias Linder)
*/
public class ClockTest extends TestCase {
- /**
- * Tests that the Clock.SYSTEM.currentTimeMillis() method returns useful values.
- */
+ /** Tests that the Clock.SYSTEM.currentTimeMillis() method returns useful values. */
public void testSystemClock() {
assertNotNull(Clock.SYSTEM);
diff --git a/google-http-client/src/test/java/com/google/api/client/util/DataMapTest.java b/google-http-client/src/test/java/com/google/api/client/util/DataMapTest.java
index 30d5eba0d..82b7ed2a4 100644
--- a/google-http-client/src/test/java/com/google/api/client/util/DataMapTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/util/DataMapTest.java
@@ -27,12 +27,9 @@
*/
public class DataMapTest extends TestCase {
static class A {
- @Key
- String r;
- @Key
- String s;
- @Key
- String t;
+ @Key String r;
+ @Key String s;
+ @Key String t;
}
public void testSizeAndIsEmpty() {
diff --git a/google-http-client/src/test/java/com/google/api/client/util/DataTest.java b/google-http-client/src/test/java/com/google/api/client/util/DataTest.java
index 8a40c3f01..de428c60c 100644
--- a/google-http-client/src/test/java/com/google/api/client/util/DataTest.java
+++ b/google-http-client/src/test/java/com/google/api/client/util/DataTest.java
@@ -203,29 +203,41 @@ public void testParsePrimitiveValue() {
assertEquals('a', Data.parsePrimitiveValue(Character.class, "a"));
assertEquals(true, Data.parsePrimitiveValue(boolean.class, "true"));
assertEquals(true, Data.parsePrimitiveValue(Boolean.class, "true"));
- assertEquals(new Byte(Byte.MAX_VALUE),
+ assertEquals(
+ new Byte(Byte.MAX_VALUE),
Data.parsePrimitiveValue(Byte.class, String.valueOf(Byte.MAX_VALUE)));
- assertEquals(new Byte(Byte.MAX_VALUE),
+ assertEquals(
+ new Byte(Byte.MAX_VALUE),
Data.parsePrimitiveValue(byte.class, String.valueOf(Byte.MAX_VALUE)));
- assertEquals(new Short(Short.MAX_VALUE),
+ assertEquals(
+ new Short(Short.MAX_VALUE),
Data.parsePrimitiveValue(Short.class, String.valueOf(Short.MAX_VALUE)));
- assertEquals(new Short(Short.MAX_VALUE),
+ assertEquals(
+ new Short(Short.MAX_VALUE),
Data.parsePrimitiveValue(short.class, String.valueOf(Short.MAX_VALUE)));
- assertEquals(new Integer(Integer.MAX_VALUE),
+ assertEquals(
+ new Integer(Integer.MAX_VALUE),
Data.parsePrimitiveValue(Integer.class, String.valueOf(Integer.MAX_VALUE)));
- assertEquals(new Integer(Integer.MAX_VALUE),
+ assertEquals(
+ new Integer(Integer.MAX_VALUE),
Data.parsePrimitiveValue(int.class, String.valueOf(Integer.MAX_VALUE)));
- assertEquals(new Long(Long.MAX_VALUE),
+ assertEquals(
+ new Long(Long.MAX_VALUE),
Data.parsePrimitiveValue(Long.class, String.valueOf(Long.MAX_VALUE)));
- assertEquals(new Long(Long.MAX_VALUE),
+ assertEquals(
+ new Long(Long.MAX_VALUE),
Data.parsePrimitiveValue(long.class, String.valueOf(Long.MAX_VALUE)));
- assertEquals(new Float(Float.MAX_VALUE),
+ assertEquals(
+ new Float(Float.MAX_VALUE),
Data.parsePrimitiveValue(Float.class, String.valueOf(Float.MAX_VALUE)));
- assertEquals(new Float(Float.MAX_VALUE),
+ assertEquals(
+ new Float(Float.MAX_VALUE),
Data.parsePrimitiveValue(float.class, String.valueOf(Float.MAX_VALUE)));
- assertEquals(new Double(Double.MAX_VALUE),
+ assertEquals(
+ new Double(Double.MAX_VALUE),
Data.parsePrimitiveValue(Double.class, String.valueOf(Double.MAX_VALUE)));
- assertEquals(new Double(Double.MAX_VALUE),
+ assertEquals(
+ new Double(Double.MAX_VALUE),
Data.parsePrimitiveValue(double.class, String.valueOf(Double.MAX_VALUE)));
BigInteger bigint = BigInteger.valueOf(Long.MAX_VALUE);
assertEquals(
@@ -268,57 +280,59 @@ static class Resolve {
public X x;
}
- static class IntegerResolve extends Resolve {
- }
+ static class IntegerResolve extends Resolve {}
- static class MedResolve extends Resolve {
- }
+ static class MedResolve extends Resolve {}
- static class DoubleResolve extends MedResolve {
- }
+ static class DoubleResolve extends MedResolve {}
- static class Med2Resolve extends MedResolve