Skip to content

Commit 8fdec59

Browse files
kushagraThaparkushagraThapar
authored
Renamed package to com.azure.cosmos.encryption to match artifact id (Azure#27024)
* Renamed package to com.azure.cosmos.encryption to match artifact id * Fixed spot bugs, azure-client-sdk-parent
1 parent 497f3f0 commit 8fdec59

File tree

90 files changed

+215
-219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+215
-219
lines changed

‎eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2075,13 +2075,13 @@
20752075
</Match>
20762076

20772077
<Match>
2078-
<Class name="com.azure.encryption.cosmos.implementation.EncryptionProcessor"/>
2078+
<Class name="com.azure.cosmos.encryption.implementation.EncryptionProcessor"/>
20792079
<Method name="decryptAndSerializeProperty"/>
20802080
<Bug pattern="BC_UNCONFIRMED_CAST"/>
20812081
</Match>
20822082

20832083
<Match>
2084-
<Class name="com.azure.encryption.cosmos.implementation.EncryptionProcessor"/>
2084+
<Class name="com.azure.cosmos.encryption.implementation.EncryptionProcessor"/>
20852085
<Method name="encryptAndSerializeProperty"/>
20862086
<Bug pattern="BC_UNCONFIRMED_CAST"/>
20872087
</Match>
@@ -2175,7 +2175,7 @@
21752175

21762176
<!-- Exclude AAP source code types from spotbug -->
21772177
<Match>
2178-
<Class name="~com\.azure\.encryption\.cosmos\.implementation\.mdesrc(.+)"/>
2178+
<Class name="~com\.azure\.cosmos\.encryption\.implementation\.mdesrc(.+)"/>
21792179
<Bug pattern="DM_CONVERT_CASE,
21802180
ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD,
21812181
UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR,

‎sdk/cosmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/encryption/AsyncEncryptionBenchmark.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
import com.azure.cosmos.models.FeedResponse;
2828
import com.azure.cosmos.models.PartitionKey;
2929
import com.azure.cosmos.models.ThroughputProperties;
30-
import com.azure.encryption.cosmos.CosmosEncryptionAsyncClient;
31-
import com.azure.encryption.cosmos.CosmosEncryptionAsyncContainer;
32-
import com.azure.encryption.cosmos.CosmosEncryptionAsyncDatabase;
33-
import com.azure.encryption.cosmos.keyprovider.AzureKeyVaultKeyWrapProvider;
34-
import com.azure.encryption.cosmos.models.CosmosEncryptionAlgorithm;
35-
import com.azure.encryption.cosmos.models.CosmosEncryptionType;
30+
import com.azure.cosmos.encryption.CosmosEncryptionAsyncClient;
31+
import com.azure.cosmos.encryption.CosmosEncryptionAsyncContainer;
32+
import com.azure.cosmos.encryption.CosmosEncryptionAsyncDatabase;
33+
import com.azure.cosmos.encryption.keyprovider.AzureKeyVaultKeyWrapProvider;
34+
import com.azure.cosmos.encryption.models.CosmosEncryptionAlgorithm;
35+
import com.azure.cosmos.encryption.models.CosmosEncryptionType;
3636
import com.azure.identity.ClientSecretCredential;
3737
import com.azure.identity.ClientSecretCredentialBuilder;
3838
import com.codahale.metrics.ConsoleReporter;

‎sdk/cosmos/azure-cosmos-encryption/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ Licensed under the MIT License.
4343
<revapi.skip>true</revapi.skip>
4444
<!-- Configures the Java 9+ run to perform the required module exports, opens, and reads that are necessary for testing but shouldn't be part of the module-info. -->
4545
<javaModulesSurefireArgLine>
46-
--add-opens com.azure.encryption.cosmos/com.azure.encryption.cosmos=ALL-UNNAMED
47-
--add-opens com.azure.encryption.cosmos/com.azure.encryption.cosmos.implementation=ALL-UNNAMED
48-
--add-opens com.azure.encryption.cosmos/com.azure.encryption.cosmos.keyprovider=ALL-UNNAMED
49-
--add-opens com.azure.encryption.cosmos/com.azure.encryption.cosmos.util=ALL-UNNAMED
50-
--add-opens com.azure.encryption.cosmos/com.azure.encryption.cosmos.models=ALL-UNNAMED
46+
--add-opens com.azure.cosmos.encryption/com.azure.cosmos.encryption=ALL-UNNAMED
47+
--add-opens com.azure.cosmos.encryption/com.azure.cosmos.encryption.implementation=ALL-UNNAMED
48+
--add-opens com.azure.cosmos.encryption/com.azure.cosmos.encryption.keyprovider=ALL-UNNAMED
49+
--add-opens com.azure.cosmos.encryption/com.azure.cosmos.encryption.util=ALL-UNNAMED
50+
--add-opens com.azure.cosmos.encryption/com.azure.cosmos.encryption.models=ALL-UNNAMED
5151
</javaModulesSurefireArgLine>
5252
</properties>
5353

sdk/cosmos/azure-cosmos-encryption/src/main/java/com/azure/encryption/cosmos/ChangeFeedEncryptionProcessorBuilder.java renamed to sdk/cosmos/azure-cosmos-encryption/src/main/java/com/azure/cosmos/encryption/ChangeFeedEncryptionProcessorBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
package com.azure.encryption.cosmos;
4+
package com.azure.cosmos.encryption;
55

66
import com.azure.cosmos.ChangeFeedProcessor;
77
import com.azure.cosmos.ChangeFeedProcessorBuilder;

sdk/cosmos/azure-cosmos-encryption/src/main/java/com/azure/encryption/cosmos/CosmosEncryptionAsyncClient.java renamed to sdk/cosmos/azure-cosmos-encryption/src/main/java/com/azure/cosmos/encryption/CosmosEncryptionAsyncClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
package com.azure.encryption.cosmos;
4+
package com.azure.cosmos.encryption;
55

66
import com.azure.cosmos.BridgeInternal;
77
import com.azure.cosmos.CosmosAsyncClient;
88
import com.azure.cosmos.CosmosAsyncClientEncryptionKey;
99
import com.azure.cosmos.CosmosAsyncContainer;
1010
import com.azure.cosmos.CosmosAsyncDatabase;
1111
import com.azure.cosmos.CosmosException;
12-
import com.azure.encryption.cosmos.keyprovider.EncryptionKeyWrapProvider;
12+
import com.azure.cosmos.encryption.keyprovider.EncryptionKeyWrapProvider;
1313
import com.azure.cosmos.implementation.HttpConstants;
1414
import com.azure.cosmos.implementation.Utils;
1515
import com.azure.cosmos.implementation.caches.AsyncCache;

sdk/cosmos/azure-cosmos-encryption/src/main/java/com/azure/encryption/cosmos/CosmosEncryptionAsyncContainer.java renamed to sdk/cosmos/azure-cosmos-encryption/src/main/java/com/azure/cosmos/encryption/CosmosEncryptionAsyncContainer.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
package com.azure.encryption.cosmos;
4+
package com.azure.cosmos.encryption;
55

66
import com.azure.cosmos.BridgeInternal;
77
import com.azure.cosmos.CosmosAsyncContainer;
88
import com.azure.cosmos.CosmosBridgeInternal;
99
import com.azure.cosmos.CosmosException;
10+
import com.azure.cosmos.encryption.implementation.Constants;
11+
import com.azure.cosmos.encryption.implementation.CosmosResponseFactory;
12+
import com.azure.cosmos.encryption.implementation.EncryptionUtils;
1013
import com.azure.cosmos.implementation.CosmosPagedFluxOptions;
1114
import com.azure.cosmos.implementation.HttpConstants;
1215
import com.azure.cosmos.implementation.ImplementationBridgeHelpers;
@@ -39,13 +42,10 @@
3942
import com.azure.cosmos.models.SqlQuerySpec;
4043
import com.azure.cosmos.util.CosmosPagedFlux;
4144
import com.azure.cosmos.util.UtilBridgeInternal;
42-
import com.azure.encryption.cosmos.implementation.Constants;
43-
import com.azure.encryption.cosmos.implementation.CosmosResponseFactory;
44-
import com.azure.encryption.cosmos.implementation.EncryptionProcessor;
45-
import com.azure.encryption.cosmos.implementation.EncryptionUtils;
46-
import com.azure.encryption.cosmos.models.EncryptionModelBridgeInternal;
47-
import com.azure.encryption.cosmos.models.SqlQuerySpecWithEncryption;
48-
import com.azure.encryption.cosmos.util.Beta;
45+
import com.azure.cosmos.encryption.implementation.EncryptionProcessor;
46+
import com.azure.cosmos.encryption.models.EncryptionModelBridgeInternal;
47+
import com.azure.cosmos.encryption.models.SqlQuerySpecWithEncryption;
48+
import com.azure.cosmos.encryption.util.Beta;
4949
import com.fasterxml.jackson.databind.JsonNode;
5050
import com.fasterxml.jackson.databind.node.ObjectNode;
5151
import reactor.core.publisher.Flux;

sdk/cosmos/azure-cosmos-encryption/src/main/java/com/azure/encryption/cosmos/CosmosEncryptionAsyncDatabase.java renamed to sdk/cosmos/azure-cosmos-encryption/src/main/java/com/azure/cosmos/encryption/CosmosEncryptionAsyncDatabase.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
package com.azure.encryption.cosmos;
4+
package com.azure.cosmos.encryption;
55

66
import com.azure.cosmos.CosmosAsyncClientEncryptionKey;
77
import com.azure.cosmos.CosmosAsyncContainer;
88
import com.azure.cosmos.CosmosAsyncDatabase;
9+
import com.azure.cosmos.encryption.implementation.mdesrc.cryptography.DataEncryptionKeyAlgorithm;
10+
import com.azure.cosmos.encryption.implementation.mdesrc.cryptography.ProtectedDataEncryptionKey;
911
import com.azure.cosmos.implementation.apachecommons.lang.StringUtils;
1012
import com.azure.cosmos.models.CosmosClientEncryptionKeyProperties;
1113
import com.azure.cosmos.models.CosmosClientEncryptionKeyResponse;
1214
import com.azure.cosmos.models.EncryptionKeyWrapMetadata;
1315
import com.azure.cosmos.util.CosmosPagedFlux;
14-
import com.azure.encryption.cosmos.implementation.mdesrc.cryptography.DataEncryptionKeyAlgorithm;
15-
import com.azure.encryption.cosmos.implementation.mdesrc.cryptography.KeyEncryptionKey;
16-
import com.azure.encryption.cosmos.implementation.mdesrc.cryptography.MicrosoftDataEncryptionException;
17-
import com.azure.encryption.cosmos.implementation.mdesrc.cryptography.ProtectedDataEncryptionKey;
18-
import com.azure.encryption.cosmos.keyprovider.EncryptionKeyWrapProvider;
19-
import com.azure.encryption.cosmos.keyprovider.KeyProviderBridgeHelpers;
16+
import com.azure.cosmos.encryption.implementation.mdesrc.cryptography.KeyEncryptionKey;
17+
import com.azure.cosmos.encryption.implementation.mdesrc.cryptography.MicrosoftDataEncryptionException;
18+
import com.azure.cosmos.encryption.keyprovider.EncryptionKeyWrapProvider;
19+
import com.azure.cosmos.encryption.keyprovider.KeyProviderBridgeHelpers;
2020
import reactor.core.publisher.Mono;
2121

2222
import java.security.InvalidKeyException;

sdk/cosmos/azure-cosmos-encryption/src/main/java/com/azure/encryption/cosmos/CosmosEncryptionClient.java renamed to sdk/cosmos/azure-cosmos-encryption/src/main/java/com/azure/cosmos/encryption/CosmosEncryptionClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
package com.azure.encryption.cosmos;
4+
package com.azure.cosmos.encryption;
55

66
import com.azure.cosmos.CosmosAsyncClient;
77
import com.azure.cosmos.CosmosAsyncDatabase;
88
import com.azure.cosmos.CosmosClient;
99
import com.azure.cosmos.CosmosDatabase;
10-
import com.azure.encryption.cosmos.keyprovider.EncryptionKeyWrapProvider;
10+
import com.azure.cosmos.encryption.keyprovider.EncryptionKeyWrapProvider;
1111
import com.azure.cosmos.implementation.ImplementationBridgeHelpers.CosmosClientHelper.CosmosClientAccessor;
1212
import com.azure.cosmos.implementation.ImplementationBridgeHelpers.CosmosClientHelper;
1313
import org.slf4j.Logger;

sdk/cosmos/azure-cosmos-encryption/src/main/java/com/azure/encryption/cosmos/CosmosEncryptionContainer.java renamed to sdk/cosmos/azure-cosmos-encryption/src/main/java/com/azure/cosmos/encryption/CosmosEncryptionContainer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
package com.azure.encryption.cosmos;
4+
package com.azure.cosmos.encryption;
55

66
import com.azure.cosmos.CosmosContainer;
77
import com.azure.cosmos.CosmosException;
8-
import com.azure.encryption.cosmos.util.Beta;
9-
import com.azure.encryption.cosmos.models.SqlQuerySpecWithEncryption;
8+
import com.azure.cosmos.encryption.util.Beta;
9+
import com.azure.cosmos.encryption.models.SqlQuerySpecWithEncryption;
1010
import com.azure.cosmos.models.CosmosBatch;
1111
import com.azure.cosmos.models.CosmosBatchOperationResult;
1212
import com.azure.cosmos.models.CosmosBatchRequestOptions;

sdk/cosmos/azure-cosmos-encryption/src/main/java/com/azure/encryption/cosmos/CosmosEncryptionDatabase.java renamed to sdk/cosmos/azure-cosmos-encryption/src/main/java/com/azure/cosmos/encryption/CosmosEncryptionDatabase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
package com.azure.encryption.cosmos;
4+
package com.azure.cosmos.encryption;
55

66
import com.azure.cosmos.CosmosClientEncryptionKey;
77
import com.azure.cosmos.CosmosContainer;

0 commit comments

Comments
 (0)