From da3792f53353c9e568c407fdc4b47d63d223a9ed Mon Sep 17 00:00:00 2001 From: rnewbigging <103130942+rnewbigging@users.noreply.github.com> Date: Tue, 10 Oct 2023 16:15:04 +0200 Subject: [PATCH] Move HttpClient5 to own module (#90) Co-authored-by: CharlesDuboisSAP Moved the httpclient5 module out of frameworks to its own module within cloudplatform ala. httpclient4. --- .../connectivity-apache-httpclient5}/pom.xml | 11 +++++----- .../AbstractX509SslContextProvider.java | 2 +- .../ApacheHttpClient5Accessor.java | 4 +--- .../connectivity}/ApacheHttpClient5Cache.java | 3 +-- .../ApacheHttpClient5CacheBuilder.java | 2 +- .../ApacheHttpClient5Factory.java | 4 +--- .../ApacheHttpClient5FactoryBuilder.java | 2 +- .../ApacheHttpClient5Wrapper.java | 5 +---- .../CfPlatformSslContextProvider.java | 2 +- .../DefaultApacheHttpClient5Cache.java | 4 +--- .../DefaultApacheHttpClient5Factory.java | 5 +---- .../connectivity}/QueryParamGetter.java | 3 +-- .../connectivity}/SSLContextFactory.java | 4 +--- .../src/main/resources/META-INF/beans.xml | 0 .../ApacheHttpClient5AccessorTest.java | 2 +- .../ApacheHttpClient5CacheBuilderTest.java | 2 +- .../ApacheHttpClient5FactoryBuilderTest.java | 2 +- .../DefaultApacheHttpClient5CacheTest.java | 5 +---- .../DefaultApacheHttpClient5FactoryTest.java | 4 +--- cloudplatform/pom.xml | 1 + datamodel/openapi/openapi-core/pom.xml | 4 ++-- .../services/openapi/apiclient/ApiClient.java | 2 +- frameworks/pom.xml | 1 - module-inventory.json | 22 +++++++++---------- modules-bom/pom.xml | 10 ++++----- release_notes_next_major.md | 1 + 26 files changed, 43 insertions(+), 64 deletions(-) rename {frameworks/apache-httpclient5 => cloudplatform/connectivity-apache-httpclient5}/pom.xml (92%) rename {frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5 => cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity}/AbstractX509SslContextProvider.java (98%) rename {frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5 => cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity}/ApacheHttpClient5Accessor.java (97%) rename {frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5 => cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity}/ApacheHttpClient5Cache.java (96%) rename {frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5 => cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity}/ApacheHttpClient5CacheBuilder.java (97%) rename {frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5 => cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity}/ApacheHttpClient5Factory.java (91%) rename {frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5 => cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity}/ApacheHttpClient5FactoryBuilder.java (98%) rename {frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5 => cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity}/ApacheHttpClient5Wrapper.java (92%) rename {frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5 => cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity}/CfPlatformSslContextProvider.java (99%) rename {frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5 => cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity}/DefaultApacheHttpClient5Cache.java (95%) rename {frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5 => cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity}/DefaultApacheHttpClient5Factory.java (96%) rename {frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5 => cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity}/QueryParamGetter.java (94%) rename {frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5 => cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity}/SSLContextFactory.java (96%) rename {frameworks/apache-httpclient5 => cloudplatform/connectivity-apache-httpclient5}/src/main/resources/META-INF/beans.xml (100%) rename {frameworks/apache-httpclient5/src/test/java/com/sap/cloud/sdk/frameworks/apachehttpclient5 => cloudplatform/connectivity-apache-httpclient5/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity}/ApacheHttpClient5AccessorTest.java (91%) rename {frameworks/apache-httpclient5/src/test/java/com/sap/cloud/sdk/frameworks/apachehttpclient5 => cloudplatform/connectivity-apache-httpclient5/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity}/ApacheHttpClient5CacheBuilderTest.java (89%) rename {frameworks/apache-httpclient5/src/test/java/com/sap/cloud/sdk/frameworks/apachehttpclient5 => cloudplatform/connectivity-apache-httpclient5/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity}/ApacheHttpClient5FactoryBuilderTest.java (90%) rename {frameworks/apache-httpclient5/src/test/java/com/sap/cloud/sdk/frameworks/apachehttpclient5 => cloudplatform/connectivity-apache-httpclient5/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity}/DefaultApacheHttpClient5CacheTest.java (98%) rename {frameworks/apache-httpclient5/src/test/java/com/sap/cloud/sdk/frameworks/apachehttpclient5 => cloudplatform/connectivity-apache-httpclient5/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity}/DefaultApacheHttpClient5FactoryTest.java (98%) diff --git a/frameworks/apache-httpclient5/pom.xml b/cloudplatform/connectivity-apache-httpclient5/pom.xml similarity index 92% rename from frameworks/apache-httpclient5/pom.xml rename to cloudplatform/connectivity-apache-httpclient5/pom.xml index 10e85d320..dd2610b2d 100644 --- a/frameworks/apache-httpclient5/pom.xml +++ b/cloudplatform/connectivity-apache-httpclient5/pom.xml @@ -2,11 +2,11 @@ 4.0.0 - com.sap.cloud.sdk.frameworks - frameworks-parent + com.sap.cloud.sdk.cloudplatform + cloudplatform-parent 5.0.0-alpha-SNAPSHOT - apache-httpclient5 + connectivity-apache-httpclient5 Apache version 5 Http Client integration Integrates the Apache version 5 Http Client with the destination abstraction. https://sap.github.io/cloud-sdk/docs/java/getting-started @@ -16,9 +16,8 @@ - SAP DEVELOPER LICENSE AGREEMENT - https://tools.hana.ondemand.com/developer-license-3_1.txt - repo + The Apache Software License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt diff --git a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/AbstractX509SslContextProvider.java b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/AbstractX509SslContextProvider.java similarity index 98% rename from frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/AbstractX509SslContextProvider.java rename to cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/AbstractX509SslContextProvider.java index aa65e0be6..36f61d9e4 100644 --- a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/AbstractX509SslContextProvider.java +++ b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/AbstractX509SslContextProvider.java @@ -2,7 +2,7 @@ * Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. */ -package com.sap.cloud.sdk.frameworks.apachehttpclient5; +package com.sap.cloud.sdk.cloudplatform.connectivity; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5Accessor.java b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5Accessor.java similarity index 97% rename from frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5Accessor.java rename to cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5Accessor.java index 8260285b1..e5237fd20 100644 --- a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5Accessor.java +++ b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5Accessor.java @@ -2,7 +2,7 @@ * Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. */ -package com.sap.cloud.sdk.frameworks.apachehttpclient5; +package com.sap.cloud.sdk.cloudplatform.connectivity; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -10,8 +10,6 @@ import org.apache.hc.client5.http.classic.HttpClient; import com.google.common.annotations.Beta; -import com.sap.cloud.sdk.cloudplatform.connectivity.Destination; -import com.sap.cloud.sdk.cloudplatform.connectivity.HttpDestinationProperties; import com.sap.cloud.sdk.cloudplatform.connectivity.exception.DestinationAccessException; import com.sap.cloud.sdk.cloudplatform.connectivity.exception.HttpClientInstantiationException; diff --git a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5Cache.java b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5Cache.java similarity index 96% rename from frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5Cache.java rename to cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5Cache.java index cb31175b0..2fd0317cd 100644 --- a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5Cache.java +++ b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5Cache.java @@ -2,7 +2,7 @@ * Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. */ -package com.sap.cloud.sdk.frameworks.apachehttpclient5; +package com.sap.cloud.sdk.cloudplatform.connectivity; import java.time.Duration; @@ -11,7 +11,6 @@ import org.apache.hc.client5.http.classic.HttpClient; import com.google.common.annotations.Beta; -import com.sap.cloud.sdk.cloudplatform.connectivity.HttpDestinationProperties; import com.sap.cloud.sdk.cloudplatform.connectivity.exception.HttpClientInstantiationException; import io.vavr.control.Try; diff --git a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5CacheBuilder.java b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5CacheBuilder.java similarity index 97% rename from frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5CacheBuilder.java rename to cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5CacheBuilder.java index 7f4d3dd18..3ad8964ce 100644 --- a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5CacheBuilder.java +++ b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5CacheBuilder.java @@ -2,7 +2,7 @@ * Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. */ -package com.sap.cloud.sdk.frameworks.apachehttpclient5; +package com.sap.cloud.sdk.cloudplatform.connectivity; import java.time.Duration; diff --git a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5Factory.java b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5Factory.java similarity index 91% rename from frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5Factory.java rename to cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5Factory.java index 6f56ff702..b75ca12fc 100644 --- a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5Factory.java +++ b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5Factory.java @@ -2,7 +2,7 @@ * Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. */ -package com.sap.cloud.sdk.frameworks.apachehttpclient5; +package com.sap.cloud.sdk.cloudplatform.connectivity; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -10,8 +10,6 @@ import org.apache.hc.client5.http.classic.HttpClient; import com.google.common.annotations.Beta; -import com.sap.cloud.sdk.cloudplatform.connectivity.Destination; -import com.sap.cloud.sdk.cloudplatform.connectivity.HttpDestinationProperties; import com.sap.cloud.sdk.cloudplatform.connectivity.exception.DestinationAccessException; import com.sap.cloud.sdk.cloudplatform.connectivity.exception.HttpClientInstantiationException; diff --git a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5FactoryBuilder.java b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5FactoryBuilder.java similarity index 98% rename from frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5FactoryBuilder.java rename to cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5FactoryBuilder.java index 1a1b0c973..15075d6d3 100644 --- a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5FactoryBuilder.java +++ b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5FactoryBuilder.java @@ -2,7 +2,7 @@ * Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. */ -package com.sap.cloud.sdk.frameworks.apachehttpclient5; +package com.sap.cloud.sdk.cloudplatform.connectivity; import java.time.Duration; diff --git a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5Wrapper.java b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5Wrapper.java similarity index 92% rename from frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5Wrapper.java rename to cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5Wrapper.java index 681af9f39..6ab075d84 100644 --- a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5Wrapper.java +++ b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5Wrapper.java @@ -2,7 +2,7 @@ * Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. */ -package com.sap.cloud.sdk.frameworks.apachehttpclient5; +package com.sap.cloud.sdk.cloudplatform.connectivity; import java.io.IOException; import java.net.URI; @@ -18,9 +18,6 @@ import org.apache.hc.core5.io.CloseMode; import com.google.common.base.Joiner; -import com.sap.cloud.sdk.cloudplatform.connectivity.Header; -import com.sap.cloud.sdk.cloudplatform.connectivity.HttpDestinationProperties; -import com.sap.cloud.sdk.cloudplatform.connectivity.UriPathMerger; import lombok.extern.slf4j.Slf4j; diff --git a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/CfPlatformSslContextProvider.java b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/CfPlatformSslContextProvider.java similarity index 99% rename from frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/CfPlatformSslContextProvider.java rename to cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/CfPlatformSslContextProvider.java index d52d009eb..b5713a9b5 100644 --- a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/CfPlatformSslContextProvider.java +++ b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/CfPlatformSslContextProvider.java @@ -2,7 +2,7 @@ * Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. */ -package com.sap.cloud.sdk.frameworks.apachehttpclient5; +package com.sap.cloud.sdk.cloudplatform.connectivity; import java.io.File; import java.io.IOException; diff --git a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/DefaultApacheHttpClient5Cache.java b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/DefaultApacheHttpClient5Cache.java similarity index 95% rename from frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/DefaultApacheHttpClient5Cache.java rename to cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/DefaultApacheHttpClient5Cache.java index c9e59e17e..8e1a0c84f 100644 --- a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/DefaultApacheHttpClient5Cache.java +++ b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/DefaultApacheHttpClient5Cache.java @@ -2,7 +2,7 @@ * Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. */ -package com.sap.cloud.sdk.frameworks.apachehttpclient5; +package com.sap.cloud.sdk.cloudplatform.connectivity; import java.time.Duration; import java.util.Objects; @@ -18,8 +18,6 @@ import com.github.benmanes.caffeine.cache.Ticker; import com.sap.cloud.sdk.cloudplatform.cache.CacheKey; import com.sap.cloud.sdk.cloudplatform.cache.CacheManager; -import com.sap.cloud.sdk.cloudplatform.connectivity.DestinationUtility; -import com.sap.cloud.sdk.cloudplatform.connectivity.HttpDestinationProperties; import com.sap.cloud.sdk.cloudplatform.connectivity.exception.HttpClientInstantiationException; import io.vavr.control.Try; diff --git a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/DefaultApacheHttpClient5Factory.java b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/DefaultApacheHttpClient5Factory.java similarity index 96% rename from frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/DefaultApacheHttpClient5Factory.java rename to cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/DefaultApacheHttpClient5Factory.java index 3eaf85eba..21b17ac61 100644 --- a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/DefaultApacheHttpClient5Factory.java +++ b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/DefaultApacheHttpClient5Factory.java @@ -2,7 +2,7 @@ * Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. */ -package com.sap.cloud.sdk.frameworks.apachehttpclient5; +package com.sap.cloud.sdk.cloudplatform.connectivity; import java.io.IOException; import java.net.URI; @@ -32,9 +32,6 @@ import org.apache.hc.core5.http.io.SocketConfig; import org.apache.hc.core5.util.Timeout; -import com.sap.cloud.sdk.cloudplatform.connectivity.DestinationProperty; -import com.sap.cloud.sdk.cloudplatform.connectivity.HttpDestinationProperties; -import com.sap.cloud.sdk.cloudplatform.connectivity.ProxyConfiguration; import com.sap.cloud.sdk.cloudplatform.connectivity.exception.DestinationAccessException; import com.sap.cloud.sdk.cloudplatform.connectivity.exception.HttpClientInstantiationException; diff --git a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/QueryParamGetter.java b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/QueryParamGetter.java similarity index 94% rename from frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/QueryParamGetter.java rename to cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/QueryParamGetter.java index 4b89f0cad..ace6b3272 100644 --- a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/QueryParamGetter.java +++ b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/QueryParamGetter.java @@ -2,7 +2,7 @@ * Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. */ -package com.sap.cloud.sdk.frameworks.apachehttpclient5; +package com.sap.cloud.sdk.cloudplatform.connectivity; import java.util.Collection; import java.util.LinkedList; @@ -13,7 +13,6 @@ import com.google.common.escape.Escaper; import com.google.common.net.PercentEscaper; -import com.sap.cloud.sdk.cloudplatform.connectivity.HttpDestinationProperties; import io.vavr.control.Try; import lombok.extern.slf4j.Slf4j; diff --git a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/SSLContextFactory.java b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/SSLContextFactory.java similarity index 96% rename from frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/SSLContextFactory.java rename to cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/SSLContextFactory.java index 1586e6308..9b59e2442 100644 --- a/frameworks/apache-httpclient5/src/main/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/SSLContextFactory.java +++ b/cloudplatform/connectivity-apache-httpclient5/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/SSLContextFactory.java @@ -2,7 +2,7 @@ * Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. */ -package com.sap.cloud.sdk.frameworks.apachehttpclient5; +package com.sap.cloud.sdk.cloudplatform.connectivity; import java.io.File; import java.io.IOException; @@ -20,8 +20,6 @@ import org.apache.hc.core5.ssl.SSLContextBuilder; import com.sap.cloud.sdk.cloudplatform.PlatformSslContextProvider; -import com.sap.cloud.sdk.cloudplatform.connectivity.AuthenticationType; -import com.sap.cloud.sdk.cloudplatform.connectivity.HttpDestinationProperties; import com.sap.cloud.sdk.cloudplatform.exception.CloudPlatformException; import io.vavr.control.Option; diff --git a/frameworks/apache-httpclient5/src/main/resources/META-INF/beans.xml b/cloudplatform/connectivity-apache-httpclient5/src/main/resources/META-INF/beans.xml similarity index 100% rename from frameworks/apache-httpclient5/src/main/resources/META-INF/beans.xml rename to cloudplatform/connectivity-apache-httpclient5/src/main/resources/META-INF/beans.xml diff --git a/frameworks/apache-httpclient5/src/test/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5AccessorTest.java b/cloudplatform/connectivity-apache-httpclient5/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5AccessorTest.java similarity index 91% rename from frameworks/apache-httpclient5/src/test/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5AccessorTest.java rename to cloudplatform/connectivity-apache-httpclient5/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5AccessorTest.java index 3cc6e8bc4..26b23c4e0 100644 --- a/frameworks/apache-httpclient5/src/test/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5AccessorTest.java +++ b/cloudplatform/connectivity-apache-httpclient5/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5AccessorTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. */ -package com.sap.cloud.sdk.frameworks.apachehttpclient5; +package com.sap.cloud.sdk.cloudplatform.connectivity; import static org.assertj.core.api.Assertions.assertThat; diff --git a/frameworks/apache-httpclient5/src/test/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5CacheBuilderTest.java b/cloudplatform/connectivity-apache-httpclient5/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5CacheBuilderTest.java similarity index 89% rename from frameworks/apache-httpclient5/src/test/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5CacheBuilderTest.java rename to cloudplatform/connectivity-apache-httpclient5/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5CacheBuilderTest.java index ea3a31bb6..09f6fab46 100644 --- a/frameworks/apache-httpclient5/src/test/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5CacheBuilderTest.java +++ b/cloudplatform/connectivity-apache-httpclient5/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5CacheBuilderTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. */ -package com.sap.cloud.sdk.frameworks.apachehttpclient5; +package com.sap.cloud.sdk.cloudplatform.connectivity; import static org.assertj.core.api.Assertions.assertThatNoException; diff --git a/frameworks/apache-httpclient5/src/test/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5FactoryBuilderTest.java b/cloudplatform/connectivity-apache-httpclient5/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5FactoryBuilderTest.java similarity index 90% rename from frameworks/apache-httpclient5/src/test/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5FactoryBuilderTest.java rename to cloudplatform/connectivity-apache-httpclient5/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5FactoryBuilderTest.java index f0d4ce7ee..81720eb74 100644 --- a/frameworks/apache-httpclient5/src/test/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/ApacheHttpClient5FactoryBuilderTest.java +++ b/cloudplatform/connectivity-apache-httpclient5/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/ApacheHttpClient5FactoryBuilderTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. */ -package com.sap.cloud.sdk.frameworks.apachehttpclient5; +package com.sap.cloud.sdk.cloudplatform.connectivity; import static org.assertj.core.api.Assertions.assertThatNoException; diff --git a/frameworks/apache-httpclient5/src/test/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/DefaultApacheHttpClient5CacheTest.java b/cloudplatform/connectivity-apache-httpclient5/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/DefaultApacheHttpClient5CacheTest.java similarity index 98% rename from frameworks/apache-httpclient5/src/test/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/DefaultApacheHttpClient5CacheTest.java rename to cloudplatform/connectivity-apache-httpclient5/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/DefaultApacheHttpClient5CacheTest.java index 77461e72e..f8f49c4ff 100644 --- a/frameworks/apache-httpclient5/src/test/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/DefaultApacheHttpClient5CacheTest.java +++ b/cloudplatform/connectivity-apache-httpclient5/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/DefaultApacheHttpClient5CacheTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. */ -package com.sap.cloud.sdk.frameworks.apachehttpclient5; +package com.sap.cloud.sdk.cloudplatform.connectivity; import static org.assertj.core.api.Assertions.assertThat; @@ -20,9 +20,6 @@ import org.junit.Test; import com.sap.cloud.sdk.cloudplatform.cache.CacheManager; -import com.sap.cloud.sdk.cloudplatform.connectivity.AuthenticationType; -import com.sap.cloud.sdk.cloudplatform.connectivity.DefaultHttpDestination; -import com.sap.cloud.sdk.cloudplatform.connectivity.HttpDestination; import com.sap.cloud.sdk.testutil.MockUtil; public class DefaultApacheHttpClient5CacheTest diff --git a/frameworks/apache-httpclient5/src/test/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/DefaultApacheHttpClient5FactoryTest.java b/cloudplatform/connectivity-apache-httpclient5/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/DefaultApacheHttpClient5FactoryTest.java similarity index 98% rename from frameworks/apache-httpclient5/src/test/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/DefaultApacheHttpClient5FactoryTest.java rename to cloudplatform/connectivity-apache-httpclient5/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/DefaultApacheHttpClient5FactoryTest.java index 38e759641..b350480ad 100644 --- a/frameworks/apache-httpclient5/src/test/java/com/sap/cloud/sdk/frameworks/apachehttpclient5/DefaultApacheHttpClient5FactoryTest.java +++ b/cloudplatform/connectivity-apache-httpclient5/src/test/java/com/sap/cloud/sdk/cloudplatform/connectivity/DefaultApacheHttpClient5FactoryTest.java @@ -2,7 +2,7 @@ * Copyright (c) 2023 SAP SE or an SAP affiliate company. All rights reserved. */ -package com.sap.cloud.sdk.frameworks.apachehttpclient5; +package com.sap.cloud.sdk.cloudplatform.connectivity; import static com.github.tomakehurst.wiremock.client.WireMock.get; import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor; @@ -50,8 +50,6 @@ import org.mockito.Mockito; import com.github.tomakehurst.wiremock.junit.WireMockRule; -import com.sap.cloud.sdk.cloudplatform.connectivity.DefaultHttpDestination; -import com.sap.cloud.sdk.cloudplatform.connectivity.ProxyConfiguration; import com.sap.cloud.sdk.cloudplatform.security.BasicCredentials; import io.vavr.control.Option; diff --git a/cloudplatform/pom.xml b/cloudplatform/pom.xml index 248fd9caf..a1c7dad47 100644 --- a/cloudplatform/pom.xml +++ b/cloudplatform/pom.xml @@ -40,6 +40,7 @@ connectivity-dwc connectivity-oauth connectivity-apache-httpclient4 + connectivity-apache-httpclient5 resilience security security-scp-cf diff --git a/datamodel/openapi/openapi-core/pom.xml b/datamodel/openapi/openapi-core/pom.xml index 68d68af49..94194c090 100644 --- a/datamodel/openapi/openapi-core/pom.xml +++ b/datamodel/openapi/openapi-core/pom.xml @@ -49,8 +49,8 @@ connectivity-apache-httpclient4 - com.sap.cloud.sdk.frameworks - apache-httpclient5 + com.sap.cloud.sdk.cloudplatform + connectivity-apache-httpclient5 com.fasterxml.jackson.core diff --git a/datamodel/openapi/openapi-core/src/main/java/com/sap/cloud/sdk/services/openapi/apiclient/ApiClient.java b/datamodel/openapi/openapi-core/src/main/java/com/sap/cloud/sdk/services/openapi/apiclient/ApiClient.java index 6107f4381..588e6cd85 100644 --- a/datamodel/openapi/openapi-core/src/main/java/com/sap/cloud/sdk/services/openapi/apiclient/ApiClient.java +++ b/datamodel/openapi/openapi-core/src/main/java/com/sap/cloud/sdk/services/openapi/apiclient/ApiClient.java @@ -47,9 +47,9 @@ import com.fasterxml.jackson.annotation.PropertyAccessor; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import com.sap.cloud.sdk.cloudplatform.connectivity.ApacheHttpClient5Accessor; import com.sap.cloud.sdk.cloudplatform.connectivity.Destination; import com.sap.cloud.sdk.cloudplatform.connectivity.HttpClientAccessor; -import com.sap.cloud.sdk.frameworks.apachehttpclient5.ApacheHttpClient5Accessor; import com.sap.cloud.sdk.services.openapi.apiclient.auth.ApiKeyAuth; import com.sap.cloud.sdk.services.openapi.apiclient.auth.Authentication; import com.sap.cloud.sdk.services.openapi.apiclient.auth.HttpBasicAuth; diff --git a/frameworks/pom.xml b/frameworks/pom.xml index 1cc75e452..aa4b75439 100644 --- a/frameworks/pom.xml +++ b/frameworks/pom.xml @@ -32,7 +32,6 @@ resilience4j - apache-httpclient5 diff --git a/module-inventory.json b/module-inventory.json index 471993f14..fa291f7ba 100644 --- a/module-inventory.json +++ b/module-inventory.json @@ -131,6 +131,17 @@ "parentArtifactId": "cloudplatform-parent", "excludeFromBlackDuckScan": false }, + { + "groupId": "com.sap.cloud.sdk.cloudplatform", + "artifactId": "connectivity-apache-httpclient5", + "packaging": "jar", + "releaseAudience": "Public", + "releaseMaturity": "Beta", + "pomFile": "cloudplatform/connectivity-apache-httpclient5/pom.xml", + "parentGroupId": "com.sap.cloud.sdk.cloudplatform", + "parentArtifactId": "cloudplatform-parent", + "excludeFromBlackDuckScan": false + }, { "groupId": "com.sap.cloud.sdk.cloudplatform", "artifactId": "connectivity-dwc", @@ -505,17 +516,6 @@ "parentArtifactId": "datamodel-parent", "excludeFromBlackDuckScan": false }, - { - "groupId": "com.sap.cloud.sdk.frameworks", - "artifactId": "apache-httpclient5", - "packaging": "jar", - "releaseAudience": "Public", - "releaseMaturity": "Beta", - "pomFile": "frameworks/apache-httpclient5/pom.xml", - "parentGroupId": "com.sap.cloud.sdk.frameworks", - "parentArtifactId": "frameworks-parent", - "excludeFromBlackDuckScan": false - }, { "groupId": "com.sap.cloud.sdk.frameworks", "artifactId": "frameworks-parent", diff --git a/modules-bom/pom.xml b/modules-bom/pom.xml index a495e5fb5..ee809ef1f 100644 --- a/modules-bom/pom.xml +++ b/modules-bom/pom.xml @@ -85,6 +85,11 @@ connectivity-apache-httpclient4 ${sdk.version} + + com.sap.cloud.sdk.cloudplatform + connectivity-apache-httpclient5 + ${sdk.version} + com.sap.cloud.sdk.cloudplatform cloudplatform-connectivity-scp-cf @@ -216,11 +221,6 @@ soap ${sdk.version} - - com.sap.cloud.sdk.frameworks - apache-httpclient5 - ${sdk.version} - com.sap.cloud.sdk.frameworks resilience4j diff --git a/release_notes_next_major.md b/release_notes_next_major.md index e06beaf8c..c81da6e63 100644 --- a/release_notes_next_major.md +++ b/release_notes_next_major.md @@ -128,6 +128,7 @@ blog: https://blogs.sap.com/?p=xxx As usual, the specific error cause is attached to the exception. - The following classes have been moved or their modules have been renamed: - All classes related to the Apache Http Client 4 have been moved from `com.sap.cloud.sdk.cloudplatform:cloudplatform-connectivity` to a new module `com.sap.cloud.sdk.cloudplatform:connectivity-apache-httpclient4` + - All classes related to the Apache Http Client 5 have been moved from `com.sap.cloud.sdk.frameworks:apache-httpclient5` to `com.sap.cloud.sdk.cloudplatform:connectivity-apache-httpclient5` - The `HttpClientAccessor` and `ApacheHttpClient5Accessor` classes are generalised to accept `Destination` instances, making invocations to `.asHttp()` superfluous when obtaining HTTP clients. - The `getSslContext()` method was removed from the `CloudPlatform` interface and the implementation was moved to the modules `connectivity-apache-httpclient4` and `connectivity-apache-httpclient5`. - The OData, OpenAPI and SOAP APIs are generalised to accept instances of `Destination`, making invocations to `.asHttp()` superfluous when executing OData or REST requests.