From 618a7a2dce2cddb6aa90a786a50028b86207d53e Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Mon, 16 May 2022 09:37:14 -0700 Subject: [PATCH 1/2] chore: remove old deprecated class Fixes https://github.com/googleapis/google-http-java-client/issues/779 Fixes b/149964486 --- .../apache/GoogleApacheHttpTransport.java | 85 ------------------- 1 file changed, 85 deletions(-) delete mode 100644 google-api-client/src/main/java/com/google/api/client/googleapis/apache/GoogleApacheHttpTransport.java diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/apache/GoogleApacheHttpTransport.java b/google-api-client/src/main/java/com/google/api/client/googleapis/apache/GoogleApacheHttpTransport.java deleted file mode 100644 index de2d95099..000000000 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/apache/GoogleApacheHttpTransport.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright 2013 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ - -package com.google.api.client.googleapis.apache; - -import com.google.api.client.googleapis.GoogleUtils; -import com.google.api.client.http.apache.ApacheHttpTransport; -import com.google.api.client.util.SslUtils; -import java.io.IOException; -import java.net.ProxySelector; -import java.security.GeneralSecurityException; -import java.security.KeyStore; -import java.util.concurrent.TimeUnit; -import javax.net.ssl.SSLContext; -import org.apache.http.client.HttpClient; -import org.apache.http.config.SocketConfig; -import org.apache.http.conn.socket.LayeredConnectionSocketFactory; -import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; -import org.apache.http.impl.conn.SystemDefaultRoutePlanner; - -/** - * Utilities for Google APIs based on {@link ApacheHttpTransport}. - * - * @since 1.14 - * @author Yaniv Inbar - * @deprecated Use com.google.api.client.googleapis.apache.v2.GoogleApacheHttpTransport - */ -@Deprecated -public final class GoogleApacheHttpTransport { - - /** - * Returns a new instance of {@link ApacheHttpTransport} that uses {@link - * GoogleUtils#getCertificateTrustStore()} for the trusted certificates. - * - * @deprecated Use - * com.google.api.client.googleapis.apache.v2.GoogleApacheHttpTransport.newTrustedTransport() - */ - public static ApacheHttpTransport newTrustedTransport() - throws GeneralSecurityException, IOException { - // Set socket buffer sizes to 8192 - SocketConfig socketConfig = - SocketConfig.custom().setRcvBufSize(8192).setSndBufSize(8192).build(); - - PoolingHttpClientConnectionManager connectionManager = - new PoolingHttpClientConnectionManager(-1, TimeUnit.MILLISECONDS); - - // Disable the stale connection check (previously configured in the HttpConnectionParams - connectionManager.setValidateAfterInactivity(-1); - - // Use the included trust store - KeyStore trustStore = GoogleUtils.getCertificateTrustStore(); - SSLContext sslContext = SslUtils.getTlsSslContext(); - SslUtils.initSslContext(sslContext, trustStore, SslUtils.getPkixTrustManagerFactory()); - LayeredConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(sslContext); - - HttpClient client = - HttpClientBuilder.create() - .useSystemProperties() - .setSSLSocketFactory(socketFactory) - .setDefaultSocketConfig(socketConfig) - .setMaxConnTotal(200) - .setMaxConnPerRoute(20) - .setRoutePlanner(new SystemDefaultRoutePlanner(ProxySelector.getDefault())) - .setConnectionManager(connectionManager) - .disableRedirectHandling() - .disableAutomaticRetries() - .build(); - return new ApacheHttpTransport(client); - } - - private GoogleApacheHttpTransport() {} -} From aae3611be87e0c9e9207d1083b08a410ad571ffb Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Mon, 16 May 2022 10:07:34 -0700 Subject: [PATCH 2/2] include cliir ignored differences --- clirr-ignored-differences.xml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/clirr-ignored-differences.xml b/clirr-ignored-differences.xml index 226df4811..3073121f5 100644 --- a/clirr-ignored-differences.xml +++ b/clirr-ignored-differences.xml @@ -6,4 +6,32 @@ 8001 com/google/api/client/googleapis/auth/clientlogin/** + + 8001 + com/google/api/client/googleapis/apache/GoogleApacheHttpTransport + + + 7006 + com/google/api/client/googleapis/extensions/android/gms/auth/GooglePlayServicesAvailabilityIOException + com.google.android.gms.auth.GoogleAuthException getCause() + java.lang.Throwable + + + 7006 + com/google/api/client/googleapis/extensions/android/gms/auth/GooglePlayServicesAvailabilityIOException + java.lang.Throwable getCause() + com.google.android.gms.auth.GoogleAuthException + + + 7006 + com/google/api/client/googleapis/xml/atom/AtomPatchContent + com.google.api.client.http.xml.AbstractXmlHttpContent setMediaType(com.google.api.client.http.HttpMediaType) + com.google.api.client.http.AbstractHttpContent + + + 7006 + com/google/api/client/googleapis/xml/atom/AtomPatchContent + com.google.api.client.http.AbstractHttpContent setMediaType(com.google.api.client.http.HttpMediaType) + com.google.api.client.http.xml.AbstractXmlHttpContent + \ No newline at end of file