Reduce PR surface.

Matt Whisenhnunt · mattwhisenhunt · commit eb7b529d78c2 · 2017-10-17T13:30:16.000-07:00
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
@@ -277,7 +277,7 @@ public static final class Builder {
      * </p>
      *
      * <pre>
-     setProxy(new HttpHost("127.0.0.1", 8080))
+       setProxy(new HttpHost("127.0.0.1", 8080))
      * </pre>
      */
     public Builder setProxy(HttpHost proxy) {
@@ -313,7 +313,7 @@ public Builder setProxySelector(ProxySelector proxySelector) {
      * </p>
      *
      * <pre>
-     trustCertificatesFromJavaKeyStore(new FileInputStream("certs.jks"), "password");
+    trustCertificatesFromJavaKeyStore(new FileInputStream("certs.jks"), "password");
      * </pre>
      *
      * @param keyStoreStream input stream to the key store (closed at the end of this method in a
@@ -337,7 +337,7 @@ public Builder trustCertificatesFromJavaKeyStore(InputStream keyStoreStream, Str
      * </p>
      *
      * <pre>
-     trustCertificatesFromStream(new FileInputStream("certs.pem"));
+    trustCertificatesFromStream(new FileInputStream("certs.pem"));
      * </pre>
      *
      * @param certificateStream certificate stream
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
@@ -50,14 +50,13 @@
  * @since 1.14
  * @author Yaniv Inbar
  */
-@Deprecated
+@Beta
 public class MockHttpClient extends DefaultHttpClient {
 
   /** HTTP response code to use. */
   int responseCode;
 
   @Override
-  @Deprecated
   protected RequestDirector createClientRequestDirector(HttpRequestExecutor requestExec,
       ClientConnectionManager conman, ConnectionReuseStrategy reustrat,
       ConnectionKeepAliveStrategy kastrat, HttpRoutePlanner rouplan, HttpProcessor httpProcessor,
@@ -74,13 +73,11 @@ public HttpResponse execute(HttpHost target, HttpRequest request, HttpContext co
   }
 
   /** Returns the HTTP response code to use. */
-  @Deprecated
   public final int getResponseCode() {
     return responseCode;
   }
 
   /** Sets the HTTP response code to use. */
-  @Deprecated
   public MockHttpClient setResponseCode(int responseCode) {
     Preconditions.checkArgument(responseCode >= 0);
     this.responseCode = responseCode;

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ public static final class Builder {`
`277`	`277`	`* </p>`
`278`	`278`	`*`
`279`	`279`	`* <pre>`
`280`		`- setProxy(new HttpHost("127.0.0.1", 8080))`
	`280`	`+ setProxy(new HttpHost("127.0.0.1", 8080))`
`281`	`281`	`* </pre>`
`282`	`282`	`*/`
`283`	`283`	`public Builder setProxy(HttpHost proxy) {`
`@@ -313,7 +313,7 @@ public Builder setProxySelector(ProxySelector proxySelector) {`
`313`	`313`	`* </p>`
`314`	`314`	`*`
`315`	`315`	`* <pre>`
`316`		`- trustCertificatesFromJavaKeyStore(new FileInputStream("certs.jks"), "password");`
	`316`	`+ trustCertificatesFromJavaKeyStore(new FileInputStream("certs.jks"), "password");`
`317`	`317`	`* </pre>`
`318`	`318`	`*`
`319`	`319`	`* @param keyStoreStream input stream to the key store (closed at the end of this method in a`
`@@ -337,7 +337,7 @@ public Builder trustCertificatesFromJavaKeyStore(InputStream keyStoreStream, Str`
`337`	`337`	`* </p>`
`338`	`338`	`*`
`339`	`339`	`* <pre>`
`340`		`- trustCertificatesFromStream(new FileInputStream("certs.pem"));`
	`340`	`+ trustCertificatesFromStream(new FileInputStream("certs.pem"));`
`341`	`341`	`* </pre>`
`342`	`342`	`*`
`343`	`343`	`* @param certificateStream certificate stream`