Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update InternalApiBoundaryTest to skip flagging the use of protected APIs that are in internal package #5774

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update InternalApiBoundaryTest to skip flagging the use of protected APIs that are in internal package #5774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf6cdb1
Update architecture-tests
zoewangg Jan 6, 2025
c5abe5e
Merge branch 'master' into zoewang/improveTests
zoewangg Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ...-utils/src/main/java/software/amazon/awssdk/protocols/jsoncore/internal/NullJsonNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,18 @@

import java.util.List;
import java.util.Map;
import software.amazon.awssdk.annotations.SdkInternalApi;
import software.amazon.awssdk.annotations.SdkProtectedApi;
import software.amazon.awssdk.protocols.jsoncore.JsonNode;
import software.amazon.awssdk.protocols.jsoncore.JsonNodeVisitor;

/**
* A null {@link JsonNode}.
*
* <p>
* Implementation notes: this class should've been outside internal package,
* but we can't fix it due to backwards compatibility reasons.
*/
@SdkInternalApi
@SdkProtectedApi
public final class NullJsonNode implements JsonNode {
private static final NullJsonNode INSTANCE = new NullJsonNode();

Expand Down
32 changes: 0 additions & 32 deletions test/architecture-tests/archunit_store/18fc8858-1308-4d5d-b92d-87817d2fab53
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,58 +1,32 @@
Class <software.amazon.awssdk.auth.credentials.internal.ProfileCredentialsUtils> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.util.ClassLoaderHelper>)
Class <software.amazon.awssdk.auth.credentials.internal.ProfileCredentialsUtils> depends on an internal API from a different module (Class <software.amazon.awssdk.profiles.internal.ProfileSection>)
Class <software.amazon.awssdk.auth.credentials.internal.WebIdentityCredentialsUtils> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.util.ClassLoaderHelper>)
Class <software.amazon.awssdk.auth.signer.SignerLoader> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.util.ClassLoaderHelper>)
Class <software.amazon.awssdk.auth.signer.internal.AbstractAws4Signer> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.util.HttpChecksumUtils>)
Class <software.amazon.awssdk.auth.signer.internal.AbstractAwsS3V4Signer> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.chunked.AwsChunkedEncodingConfig>)
Class <software.amazon.awssdk.auth.signer.internal.AbstractAwsS3V4Signer> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.util.HttpChecksumUtils>)
Class <software.amazon.awssdk.auth.signer.internal.chunkedencoding.AwsSignedChunkedEncodingInputStream$Builder> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.chunked.AwsChunkedEncodingConfig>)
Class <software.amazon.awssdk.auth.signer.internal.chunkedencoding.AwsSignedChunkedEncodingInputStream> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.chunked.AwsChunkedEncodingConfig>)
Class <software.amazon.awssdk.auth.signer.internal.chunkedencoding.AwsSignedChunkedEncodingInputStream> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.io.AwsChunkedEncodingInputStream>)
Class <software.amazon.awssdk.auth.signer.internal.util.SignerMethodResolver> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.signer.SigningMethod>)
Class <software.amazon.awssdk.auth.token.internal.ProfileTokenProviderLoader> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.util.ClassLoaderHelper>)
Class <software.amazon.awssdk.auth.token.internal.ProfileTokenProviderLoader> depends on an internal API from a different module (Class <software.amazon.awssdk.profiles.internal.ProfileSection>)
Class <software.amazon.awssdk.awscore.client.builder.AwsDefaultClientBuilder> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.SdkInternalTestAdvancedClientOption>)
Class <software.amazon.awssdk.awscore.client.builder.AwsDefaultClientBuilder> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.retry.SdkDefaultRetryStrategy>)
Class <software.amazon.awssdk.awscore.client.builder.AwsDefaultClientBuilder> depends on an internal API from a different module (Class <software.amazon.awssdk.retries.internal.DefaultAwareRetryStrategy>)
Class <software.amazon.awssdk.awscore.endpoint.AwsClientEndpointProvider> depends on an internal API from a different module (Class <software.amazon.awssdk.utils.internal.SystemSettingUtils>)
Class <software.amazon.awssdk.awscore.eventstream.EventStreamInitialRequestInterceptor> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.async.AsyncStreamPrepender>)
Class <software.amazon.awssdk.awscore.internal.AwsExecutionContextBuilder> depends on an internal API from a different module (Class <software.amazon.awssdk.auth.signer.internal.util.SignerMethodResolver>)
Class <software.amazon.awssdk.awscore.internal.AwsExecutionContextBuilder> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.InternalCoreExecutionAttribute>)
Class <software.amazon.awssdk.awscore.internal.AwsExecutionContextBuilder> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.useragent.BusinessMetricsUtils>)
Class <software.amazon.awssdk.awscore.internal.AwsExecutionContextBuilder> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.util.HttpChecksumResolver>)
Class <software.amazon.awssdk.awscore.internal.defaultsmode.AutoDefaultsModeDiscovery> depends on an internal API from a different module (Class <software.amazon.awssdk.regions.internal.util.EC2MetadataUtils>)
Class <software.amazon.awssdk.awscore.internal.defaultsmode.AutoDefaultsModeDiscovery> depends on an internal API from a different module (Class <software.amazon.awssdk.utils.internal.SystemSettingUtils>)
Class <software.amazon.awssdk.awscore.retry.AwsRetryStrategy$1> depends on an internal API from a different module (Class <software.amazon.awssdk.retries.internal.RetryStrategyDefaults>)
Class <software.amazon.awssdk.awscore.retry.AwsRetryStrategy> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.retry.RetryPolicyAdapter>)
Class <software.amazon.awssdk.awscore.retry.AwsRetryStrategy> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.retry.SdkDefaultRetryStrategy>)
Class <software.amazon.awssdk.awscore.retry.AwsRetryStrategy> depends on an internal API from a different module (Class <software.amazon.awssdk.retries.internal.RetryStrategyDefaults>)
Class <software.amazon.awssdk.core.async.SdkPublisher> depends on an internal API from a different module (Class <software.amazon.awssdk.utils.internal.MappingSubscriber>)
Class <software.amazon.awssdk.core.internal.retry.SdkDefaultRetryStrategy$1> depends on an internal API from a different module (Class <software.amazon.awssdk.retries.internal.RetryStrategyDefaults>)
Class <software.amazon.awssdk.core.internal.retry.SdkDefaultRetryStrategy> depends on an internal API from a different module (Class <software.amazon.awssdk.retries.internal.RetryStrategyDefaults>)
Class <software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.JsonItemAttributeConverter$Visitor> depends on an internal API from a different module (Class <software.amazon.awssdk.protocols.jsoncore.internal.ArrayJsonNode>)
Class <software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.JsonItemAttributeConverter$Visitor> depends on an internal API from a different module (Class <software.amazon.awssdk.protocols.jsoncore.internal.BooleanJsonNode>)
Class <software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.JsonItemAttributeConverter$Visitor> depends on an internal API from a different module (Class <software.amazon.awssdk.protocols.jsoncore.internal.NullJsonNode>)
Class <software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.JsonItemAttributeConverter$Visitor> depends on an internal API from a different module (Class <software.amazon.awssdk.protocols.jsoncore.internal.NumberJsonNode>)
Class <software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.JsonItemAttributeConverter$Visitor> depends on an internal API from a different module (Class <software.amazon.awssdk.protocols.jsoncore.internal.ObjectJsonNode>)
Class <software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.JsonItemAttributeConverter$Visitor> depends on an internal API from a different module (Class <software.amazon.awssdk.protocols.jsoncore.internal.StringJsonNode>)
Class <software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.JsonItemAttributeConverter> depends on an internal API from a different module (Class <software.amazon.awssdk.protocols.jsoncore.internal.NullJsonNode>)
Class <software.amazon.awssdk.enhanced.dynamodb.internal.mapper.BeanAttributeSetter> depends on an internal API from a different module (Class <software.amazon.awssdk.utils.internal.ReflectionUtils>)
Class <software.amazon.awssdk.http.DefaultSdkHttpFullRequest$Builder> depends on an internal API from a different module (Class <software.amazon.awssdk.internal.http.LowCopyListMap$ForBuildable>)
Class <software.amazon.awssdk.http.DefaultSdkHttpFullRequest$Builder> depends on an internal API from a different module (Class <software.amazon.awssdk.internal.http.LowCopyListMap$ForBuilder>)
Class <software.amazon.awssdk.http.DefaultSdkHttpFullRequest$Builder> depends on an internal API from a different module (Class <software.amazon.awssdk.internal.http.LowCopyListMap>)
Class <software.amazon.awssdk.http.DefaultSdkHttpFullRequest> depends on an internal API from a different module (Class <software.amazon.awssdk.internal.http.LowCopyListMap$ForBuildable>)
Class <software.amazon.awssdk.http.DefaultSdkHttpFullRequest> depends on an internal API from a different module (Class <software.amazon.awssdk.internal.http.LowCopyListMap$ForBuilder>)
Class <software.amazon.awssdk.http.DefaultSdkHttpFullResponse$Builder> depends on an internal API from a different module (Class <software.amazon.awssdk.internal.http.LowCopyListMap$ForBuildable>)
Class <software.amazon.awssdk.http.DefaultSdkHttpFullResponse$Builder> depends on an internal API from a different module (Class <software.amazon.awssdk.internal.http.LowCopyListMap$ForBuilder>)
Class <software.amazon.awssdk.http.DefaultSdkHttpFullResponse$Builder> depends on an internal API from a different module (Class <software.amazon.awssdk.internal.http.LowCopyListMap>)
Class <software.amazon.awssdk.http.DefaultSdkHttpFullResponse> depends on an internal API from a different module (Class <software.amazon.awssdk.internal.http.LowCopyListMap$ForBuildable>)
Class <software.amazon.awssdk.http.DefaultSdkHttpFullResponse> depends on an internal API from a different module (Class <software.amazon.awssdk.internal.http.LowCopyListMap$ForBuilder>)
Class <software.amazon.awssdk.http.DefaultSdkHttpFullResponse> depends on an internal API from a different module (Class <software.amazon.awssdk.internal.http.LowCopyListMap>)
Class <software.amazon.awssdk.http.FileStoreTlsKeyManagersProvider> depends on an internal API from a different module (Class <software.amazon.awssdk.internal.http.AbstractFileStoreTlsKeyManagersProvider>)
Class <software.amazon.awssdk.http.SystemPropertyTlsKeyManagersProvider> depends on an internal API from a different module (Class <software.amazon.awssdk.internal.http.AbstractFileStoreTlsKeyManagersProvider>)
Class <software.amazon.awssdk.http.SystemPropertyTlsKeyManagersProvider> depends on an internal API from a different module (Class <software.amazon.awssdk.utils.internal.SystemSettingUtils>)
Class <software.amazon.awssdk.http.TlsKeyManagersProvider> depends on an internal API from a different module (Class <software.amazon.awssdk.internal.http.NoneTlsKeyManagersProvider>)
Class <software.amazon.awssdk.http.auth.aws.eventstream.internal.io.SigV4DataFramePublisher> depends on an internal API from a different module (Class <software.amazon.awssdk.utils.internal.MappingSubscriber>)
Class <software.amazon.awssdk.http.auth.aws.internal.signer.util.SignerUtils> depends on an internal API from a different module (Class <software.amazon.awssdk.checksums.internal.DigestAlgorithm>)
Class <software.amazon.awssdk.imds.internal.AsyncHttpRequestHelper> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.http.TransformingAsyncResponseHandler>)
Class <software.amazon.awssdk.imds.internal.AsyncHttpRequestHelper> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.http.async.AsyncResponseHandler>)
Expand All @@ -62,19 +36,14 @@ Class <software.amazon.awssdk.imds.internal.DefaultEc2MetadataClient> depends on
Class <software.amazon.awssdk.protocols.xml.AwsXmlProtocolFactory> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.http.CombinedResponseHandler>)
Class <software.amazon.awssdk.services.dynamodb.DynamoDbRetryPolicy> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.retry.RetryPolicyAdapter>)
Class <software.amazon.awssdk.services.dynamodb.DynamoDbRetryPolicy> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.retry.SdkDefaultRetrySetting>)
Class <software.amazon.awssdk.services.dynamodb.endpoints.internal.DynamoDbResolveEndpointInterceptor> depends on an internal API from a different module (Class <software.amazon.awssdk.awscore.internal.useragent.BusinessMetricsUtils>)
Class <software.amazon.awssdk.services.s3.S3Utilities> depends on an internal API from a different module (Class <software.amazon.awssdk.awscore.internal.defaultsmode.DefaultsModeConfiguration>)
Class <software.amazon.awssdk.services.s3.internal.crt.DefaultS3CrtAsyncClient> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.util.ClassLoaderHelper>)
Class <software.amazon.awssdk.services.s3.internal.handlers.GetBucketPolicyInterceptor> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.async.SdkPublishers>)
Class <software.amazon.awssdk.services.s3.internal.handlers.GetObjectInterceptor> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.util.HttpChecksumUtils>)
Class <software.amazon.awssdk.services.s3.internal.signing.DefaultS3Presigner> depends on an internal API from a different module (Class <software.amazon.awssdk.awscore.internal.AwsExecutionContextBuilder>)
Class <software.amazon.awssdk.services.s3.internal.signing.DefaultS3Presigner> depends on an internal API from a different module (Class <software.amazon.awssdk.awscore.internal.defaultsmode.DefaultsModeConfiguration>)
Class <software.amazon.awssdk.services.sso.auth.SsoProfileCredentialsProviderFactory$SsoProfileCredentialsProvider> depends on an internal API from a different module (Class <software.amazon.awssdk.profiles.internal.ProfileSection>)
Class <software.amazon.awssdk.services.sso.auth.SsoProfileCredentialsProviderFactory> depends on an internal API from a different module (Class <software.amazon.awssdk.auth.token.internal.LazyTokenProvider>)
Class <software.amazon.awssdk.services.sso.auth.SsoProfileCredentialsProviderFactory> depends on an internal API from a different module (Class <software.amazon.awssdk.profiles.internal.ProfileSection>)
Class <software.amazon.awssdk.services.sts.auth.StsWebIdentityTokenFileCredentialsProvider> depends on an internal API from a different module (Class <software.amazon.awssdk.auth.credentials.internal.WebIdentityTokenCredentialProperties>)
Class <software.amazon.awssdk.services.sts.internal.StsWebIdentityCredentialsProviderFactory$StsWebIdentityCredentialsProvider> depends on an internal API from a different module (Class <software.amazon.awssdk.auth.credentials.internal.WebIdentityTokenCredentialProperties>)
Class <software.amazon.awssdk.services.sts.internal.StsWebIdentityCredentialsProviderFactory> depends on an internal API from a different module (Class <software.amazon.awssdk.auth.credentials.internal.WebIdentityTokenCredentialProperties>)
Class <software.amazon.awssdk.transfer.s3.internal.CrtS3TransferManager> depends on an internal API from a different module (Class <software.amazon.awssdk.services.s3.internal.crt.S3InternalSdkHttpExecutionAttribute>)
Class <software.amazon.awssdk.transfer.s3.internal.CrtS3TransferManager> depends on an internal API from a different module (Class <software.amazon.awssdk.services.s3.internal.crt.S3MetaRequestPauseObservable>)
Class <software.amazon.awssdk.transfer.s3.internal.GenericS3TransferManager> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.async.FileAsyncRequestBody>)
Expand All @@ -83,7 +52,6 @@ Class <software.amazon.awssdk.transfer.s3.internal.GenericS3TransferManager> dep
Class <software.amazon.awssdk.transfer.s3.internal.GenericS3TransferManager> depends on an internal API from a different module (Class <software.amazon.awssdk.services.s3.internal.multipart.MultipartS3AsyncClient>)
Class <software.amazon.awssdk.transfer.s3.internal.GenericS3TransferManager> depends on an internal API from a different module (Class <software.amazon.awssdk.services.s3.internal.resource.S3AccessPointResource>)
Class <software.amazon.awssdk.transfer.s3.internal.GenericS3TransferManager> depends on an internal API from a different module (Class <software.amazon.awssdk.services.s3.internal.resource.S3ArnConverter>)
Class <software.amazon.awssdk.transfer.s3.internal.TransferManagerFactory> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.util.ClassLoaderHelper>)
Class <software.amazon.awssdk.transfer.s3.internal.TransferManagerFactory> depends on an internal API from a different module (Class <software.amazon.awssdk.services.s3.internal.crt.S3CrtAsyncClient>)
Class <software.amazon.awssdk.transfer.s3.internal.model.CrtFileUpload> depends on an internal API from a different module (Class <software.amazon.awssdk.services.s3.internal.crt.S3MetaRequestPauseObservable>)
Class <software.amazon.awssdk.transfer.s3.internal.model.DefaultFileDownload> depends on an internal API from a different module (Class <software.amazon.awssdk.services.s3.internal.multipart.MultipartDownloadUtils>)
Expand Down
1 change: 1 addition & 0 deletions test/architecture-tests/archunit_store/c898eee1-aeb5-4355-bb3b-ea56bf58cacb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Class <software.amazon.awssdk.core.internal.util.MetricUtils> does not reside ou
Class <software.amazon.awssdk.core.internal.waiters.ResponseOrException> does not reside outside of package '..internal..' in (ResponseOrException.java:0)
Class <software.amazon.awssdk.core.internal.waiters.WaiterAttribute> does not reside outside of package '..internal..' in (WaiterAttribute.java:0)
Class <software.amazon.awssdk.http.nio.netty.internal.DnsResolverLoader> does not reside outside of package '..internal..' in (DnsResolverLoader.java:0)
Class <software.amazon.awssdk.protocols.jsoncore.internal.NullJsonNode> does not reside outside of package '..internal..' in (NullJsonNode.java:0)
Class <software.amazon.awssdk.retries.api.internal.backoff.ExponentialDelayWithHalfJitter> does not reside outside of package '..internal..' in (ExponentialDelayWithHalfJitter.java:0)
Class <software.amazon.awssdk.retries.internal.DefaultAwareRetryStrategy> does not reside outside of package '..internal..' in (DefaultAwareRetryStrategy.java:0)
Class <software.amazon.awssdk.retries.internal.RetryStrategyDefaults> does not reside outside of package '..internal..' in (RetryStrategyDefaults.java:0)
Expand Down
Loading
Loading