Skip to content

Commit 7f37198

Browse files
kasobol-msftkasobol-msft
authored
[Storage] Bump Groovy version to 3 that works with Java 17. (Azure#24477)
* bump groovy version * Revert "bump groovy version" This reverts commit a80c805. * use different spocks depending on java version. * rename.
1 parent 313b6b6 commit 7f37198

File tree

72 files changed

+546
-468
lines changed

Some content is hidden

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

72 files changed

+546
-468
lines changed

‎eng/versioning/external_dependencies.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ org.junit.vintage:junit-vintage-engine;5.7.2
210210
org.openjdk.jmh:jmh-core;1.22
211211
org.openjdk.jmh:jmh-generator-annprocess;1.22
212212
org.spockframework:spock-core;2.0-M4-groovy-2.5
213+
groovy3_org.spockframework:spock-core;2.0-groovy-3.0
213214
org.testng:testng;7.3.0
214215
uk.org.lidalia:slf4j-test;1.2.0
215216

‎sdk/storage/azure-storage-blob-batch/pom.xml‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,6 @@
124124
<version>1.6.5</version> <!-- {x-version-update;com.microsoft.azure:adal4j;external_dependency} -->
125125
<scope>test</scope>
126126
</dependency>
127-
<dependency>
128-
<groupId>org.spockframework</groupId>
129-
<artifactId>spock-core</artifactId>
130-
<version>2.0-M4-groovy-2.5</version> <!-- {x-version-update;org.spockframework:spock-core;external_dependency} -->
131-
<scope>test</scope>
132-
</dependency>
133127
<dependency>
134128
<groupId>cglib</groupId>
135129
<artifactId>cglib-nodep</artifactId>
@@ -177,6 +171,14 @@
177171
<activation>
178172
<jdk>[1.8,9)</jdk>
179173
</activation>
174+
<dependencies>
175+
<dependency>
176+
<groupId>org.spockframework</groupId>
177+
<artifactId>spock-core</artifactId>
178+
<version>2.0-M4-groovy-2.5</version> <!-- {x-version-update;org.spockframework:spock-core;external_dependency} -->
179+
<scope>test</scope>
180+
</dependency>
181+
</dependencies>
180182
<build>
181183
<plugins>
182184
<plugin>
@@ -219,6 +221,14 @@
219221
<activation>
220222
<jdk>[9,)</jdk>
221223
</activation>
224+
<dependencies>
225+
<dependency>
226+
<groupId>org.spockframework</groupId>
227+
<artifactId>spock-core</artifactId>
228+
<version>2.0-groovy-3.0</version> <!-- {x-version-update;groovy3_org.spockframework:spock-core;external_dependency} -->
229+
<scope>test</scope>
230+
</dependency>
231+
</dependencies>
222232
<build>
223233
<plugins>
224234
<plugin>

‎sdk/storage/azure-storage-blob-batch/src/test/java/com/azure/storage/blob/batch/APISpec.groovy‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,23 @@ class APISpec extends StorageSpec {
3131
BlobServiceClient versionedBlobServiceClient
3232

3333
def setup() {
34-
primaryBlobServiceClient = getServiceClient(env.primaryAccount)
35-
primaryBlobServiceAsyncClient = getServiceAsyncClient(env.primaryAccount)
36-
versionedBlobServiceClient = getServiceClient(env.versionedAccount)
34+
primaryBlobServiceClient = getServiceClient(environment.primaryAccount)
35+
primaryBlobServiceAsyncClient = getServiceAsyncClient(environment.primaryAccount)
36+
versionedBlobServiceClient = getServiceClient(environment.versionedAccount)
3737
}
3838

3939
def getOAuthServiceClient() {
4040
BlobServiceClientBuilder builder = new BlobServiceClientBuilder()
41-
.endpoint(env.primaryAccount.blobEndpoint)
41+
.endpoint(environment.primaryAccount.blobEndpoint)
4242

4343
instrument(builder)
4444

45-
if (env.testMode != TestMode.PLAYBACK) {
45+
if (environment.testMode != TestMode.PLAYBACK) {
4646
// AZURE_TENANT_ID, AZURE_CLIENT_ID, AZURE_CLIENT_SECRET
4747
return builder.credential(new EnvironmentCredentialBuilder().build()).buildClient()
4848
} else {
4949
// Running in playback, we don't have access to the AAD environment variables, just use SharedKeyCredential.
50-
return builder.credential(env.primaryAccount.credential).buildClient()
50+
return builder.credential(environment.primaryAccount.credential).buildClient()
5151
}
5252
}
5353

‎sdk/storage/azure-storage-blob-batch/src/test/java/com/azure/storage/blob/batch/BatchAPITest.groovy‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ class BatchAPITest extends APISpec {
245245
thrown(BlobBatchStorageException)
246246

247247
// In PLAYBACK check responses in an order invariant fashion.
248-
if (env.testMode == TestMode.PLAYBACK) {
248+
if (environment.testMode == TestMode.PLAYBACK) {
249249
assert (assertExpectedOrException(response1, 200) + assertExpectedOrException(response2, 200)) == 1
250250
} else {
251251
assert response1.getStatusCode() == 200
@@ -280,7 +280,7 @@ class BatchAPITest extends APISpec {
280280
.verify(Duration.ofSeconds(30))
281281

282282
// In PLAYBACK check responses in an order invariant fashion.
283-
if (env.testMode == TestMode.PLAYBACK) {
283+
if (environment.testMode == TestMode.PLAYBACK) {
284284
assert (assertExpectedOrException(response1, 200) + assertExpectedOrException(response2, 200)) == 1
285285
} else {
286286
assert response1.getStatusCode() == 200
@@ -313,7 +313,7 @@ class BatchAPITest extends APISpec {
313313
notThrown(BlobBatchStorageException)
314314

315315
// In PLAYBACK check responses in an order invariant fashion.
316-
if (env.testMode == TestMode.PLAYBACK) {
316+
if (environment.testMode == TestMode.PLAYBACK) {
317317
assert (assertExpectedOrException(response1, 200) + assertExpectedOrException(response2, 200)) == 1
318318
} else {
319319
assert response1.getStatusCode() == 200
@@ -435,7 +435,7 @@ class BatchAPITest extends APISpec {
435435
thrown(BlobBatchStorageException)
436436

437437
// In PLAYBACK check responses in an order invariant fashion.
438-
if (env.testMode == TestMode.PLAYBACK) {
438+
if (environment.testMode == TestMode.PLAYBACK) {
439439
assert (assertExpectedOrException(response1, 202) + assertExpectedOrException(response2, 202)) == 1
440440
} else {
441441
assert response1.getStatusCode() == 202
@@ -468,7 +468,7 @@ class BatchAPITest extends APISpec {
468468
notThrown(BlobStorageException)
469469

470470
// In PLAYBACK check responses in an order invariant fashion.
471-
if (env.testMode == TestMode.PLAYBACK) {
471+
if (environment.testMode == TestMode.PLAYBACK) {
472472
assert (assertExpectedOrException(response1, 202) + assertExpectedOrException(response2, 202)) == 1
473473
} else {
474474
assert response1.getStatusCode() == 202

‎sdk/storage/azure-storage-blob-changefeed/pom.xml‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,6 @@
130130
<version>1.6.5</version> <!-- {x-version-update;com.microsoft.azure:adal4j;external_dependency} -->
131131
<scope>test</scope>
132132
</dependency>
133-
<dependency>
134-
<groupId>org.spockframework</groupId>
135-
<artifactId>spock-core</artifactId>
136-
<version>2.0-M4-groovy-2.5</version> <!-- {x-version-update;org.spockframework:spock-core;external_dependency} -->
137-
<scope>test</scope>
138-
</dependency>
139133
<dependency>
140134
<groupId>cglib</groupId>
141135
<artifactId>cglib-nodep</artifactId>
@@ -189,6 +183,14 @@
189183
<activation>
190184
<jdk>[1.8,9)</jdk>
191185
</activation>
186+
<dependencies>
187+
<dependency>
188+
<groupId>org.spockframework</groupId>
189+
<artifactId>spock-core</artifactId>
190+
<version>2.0-M4-groovy-2.5</version> <!-- {x-version-update;org.spockframework:spock-core;external_dependency} -->
191+
<scope>test</scope>
192+
</dependency>
193+
</dependencies>
192194
<build>
193195
<plugins>
194196
<plugin>
@@ -231,6 +233,14 @@
231233
<activation>
232234
<jdk>[9,)</jdk>
233235
</activation>
236+
<dependencies>
237+
<dependency>
238+
<groupId>org.spockframework</groupId>
239+
<artifactId>spock-core</artifactId>
240+
<version>2.0-groovy-3.0</version> <!-- {x-version-update;groovy3_org.spockframework:spock-core;external_dependency} -->
241+
<scope>test</scope>
242+
</dependency>
243+
</dependencies>
234244
<build>
235245
<plugins>
236246
<plugin>

‎sdk/storage/azure-storage-blob-changefeed/src/test/java/com/azure/storage/blob/changefeed/APISpec.groovy‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,18 @@ class APISpec extends StorageSpec {
4141
}
4242

4343
def setup() {
44-
primaryBlobServiceClient = getServiceClient(env.primaryAccount)
45-
primaryBlobServiceAsyncClient = getServiceAsyncClient(env.primaryAccount)
44+
primaryBlobServiceClient = getServiceClient(environment.primaryAccount)
45+
primaryBlobServiceAsyncClient = getServiceAsyncClient(environment.primaryAccount)
4646

4747
containerName = generateContainerName()
4848
}
4949

5050
def cleanup() {
51-
if (env.testMode != TestMode.PLAYBACK) {
51+
if (environment.testMode != TestMode.PLAYBACK) {
5252
def cleanupClient = new BlobServiceClientBuilder()
5353
.httpClient(getHttpClient())
54-
.credential(env.primaryAccount.credential)
55-
.endpoint(env.primaryAccount.blobEndpoint)
54+
.credential(environment.primaryAccount.credential)
55+
.endpoint(environment.primaryAccount.blobEndpoint)
5656
.buildClient()
5757
def options = new ListBlobContainersOptions().setPrefix(namer.getResourcePrefix())
5858
for (BlobContainerItem container : cleanupClient.listBlobContainers(options, Duration.ofSeconds(120))) {

‎sdk/storage/azure-storage-blob-changefeed/src/test/java/com/azure/storage/blob/changefeed/ChangefeedNetworkTest.groovy‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import com.azure.storage.blob.changefeed.models.BlobChangefeedEvent
77
import com.azure.storage.common.test.shared.extensions.PlaybackOnly
88
import spock.lang.Ignore
99
import reactor.test.StepVerifier
10-
import spock.lang.Requires
1110

1211
import java.time.OffsetDateTime
1312
import java.time.ZoneOffset
@@ -92,7 +91,7 @@ class ChangefeedNetworkTest extends APISpec {
9291
/* Update and uncomment after recording. */
9392
OffsetDateTime startTime = OffsetDateTime.of(2020, 8, 11, 23, 3, 10, 987532200, ZoneOffset.UTC)
9493

95-
Long pollInterval = env.testMode == TestMode.PLAYBACK ? 0 : 1000 * 60 * 3
94+
Long pollInterval = environment.testMode == TestMode.PLAYBACK ? 0 : 1000 * 60 * 3
9695

9796
Set<String> eventIds1 = new HashSet<>()
9897
Set<String> eventIds2 = new HashSet<>()

‎sdk/storage/azure-storage-blob-cryptography/pom.xml‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,6 @@
7878
<version>1.7.1</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
7979
<scope>test</scope>
8080
</dependency>
81-
<!-- https://mvnrepository.com/artifact/org.spockframework/spock-core -->
82-
<dependency>
83-
<groupId>org.spockframework</groupId>
84-
<artifactId>spock-core</artifactId>
85-
<version>2.0-M4-groovy-2.5</version> <!-- {x-version-update;org.spockframework:spock-core;external_dependency} -->
86-
<scope>test</scope>
87-
</dependency>
8881
<dependency>
8982
<!-- The following two dependencies are to test for
9083
cross platform compatibility within SDKs -->
@@ -168,6 +161,14 @@
168161
<activation>
169162
<jdk>[1.8,9)</jdk>
170163
</activation>
164+
<dependencies>
165+
<dependency>
166+
<groupId>org.spockframework</groupId>
167+
<artifactId>spock-core</artifactId>
168+
<version>2.0-M4-groovy-2.5</version> <!-- {x-version-update;org.spockframework:spock-core;external_dependency} -->
169+
<scope>test</scope>
170+
</dependency>
171+
</dependencies>
171172
<build>
172173
<plugins>
173174
<plugin>
@@ -210,6 +211,14 @@
210211
<activation>
211212
<jdk>[9,)</jdk>
212213
</activation>
214+
<dependencies>
215+
<dependency>
216+
<groupId>org.spockframework</groupId>
217+
<artifactId>spock-core</artifactId>
218+
<version>2.0-groovy-3.0</version> <!-- {x-version-update;groovy3_org.spockframework:spock-core;external_dependency} -->
219+
<scope>test</scope>
220+
</dependency>
221+
</dependencies>
213222
<build>
214223
<plugins>
215224
<plugin>

‎sdk/storage/azure-storage-blob-cryptography/src/test/java/com/azure/storage/blob/specialized/cryptography/APISpec.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ class APISpec extends StorageSpec {
403403
* real key this way.
404404
*/
405405
static def getRandomKey(long seed = new Random().nextLong()) {
406-
if (getEnv().getTestMode() == TestMode.LIVE) {
406+
if (getEnvironment().getTestMode() == TestMode.LIVE) {
407407
def key = new byte[32] // 256 bit key
408408
new Random(seed).nextBytes(key)
409409
return key
@@ -417,7 +417,7 @@ class APISpec extends StorageSpec {
417417
* and RECORD testing modes only.
418418
*/
419419
static def mockAesKey(EncryptedBlobAsyncClient encryptedClient) {
420-
if (getEnv().getTestMode() != TestMode.LIVE) {
420+
if (getEnvironment().getTestMode() != TestMode.LIVE) {
421421
def mockAesKey = new SecretKey() {
422422
@Override
423423
String getAlgorithm() {

‎sdk/storage/azure-storage-blob-cryptography/src/test/java/com/azure/storage/blob/specialized/cryptography/BlobCryptographyBuilderTest.groovy‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ class BlobCryptographyBuilderTest extends APISpec {
2020
def setup() {
2121
keyId = "keyId"
2222

23-
fakeKey = new FakeKey(keyId, (getEnv().getTestMode() == TestMode.LIVE) ? getRandomByteArray(256) : mockRandomData)
23+
fakeKey = new FakeKey(keyId, (getEnvironment().getTestMode() == TestMode.LIVE) ? getRandomByteArray(256) : mockRandomData)
2424
fakeKeyResolver = new FakeKeyResolver(fakeKey)
2525

26-
def sc = getServiceClientBuilder(env.primaryAccount)
26+
def sc = getServiceClientBuilder(environment.primaryAccount)
2727
.buildClient()
2828
def containerName = generateContainerName()
2929
def blobName = generateBlobName()
@@ -66,7 +66,7 @@ class BlobCryptographyBuilderTest extends APISpec {
6666
def "Http pipeline"() {
6767
when:
6868
def regularClient = cc.getBlobClient(generateBlobName())
69-
def encryptedClient = new EncryptedBlobClient(mockAesKey(getEncryptedClientBuilder(fakeKey, null, env.primaryAccount.credential, cc.getBlobContainerUrl())
69+
def encryptedClient = new EncryptedBlobClient(mockAesKey(getEncryptedClientBuilder(fakeKey, null, environment.primaryAccount.credential, cc.getBlobContainerUrl())
7070
.pipeline(regularClient.getHttpPipeline())
7171
.blobName(regularClient.getBlobName())
7272
.buildEncryptedBlobAsyncClient()))
@@ -82,7 +82,7 @@ class BlobCryptographyBuilderTest extends APISpec {
8282
setup:
8383
cc.create()
8484
CustomerProvidedKey key = new CustomerProvidedKey(getRandomKey())
85-
def builder = getEncryptedClientBuilder(fakeKey, null, env.primaryAccount.credential, cc.getBlobContainerUrl())
85+
def builder = getEncryptedClientBuilder(fakeKey, null, environment.primaryAccount.credential, cc.getBlobContainerUrl())
8686
.customerProvidedKey(key)
8787
.blobName(generateBlobName())
8888
def encryptedAsyncClient = mockAesKey(builder.buildEncryptedBlobAsyncClient())
@@ -106,12 +106,12 @@ class BlobCryptographyBuilderTest extends APISpec {
106106
setup:
107107
cc.create()
108108
CustomerProvidedKey key = new CustomerProvidedKey(getRandomKey())
109-
def encryptedClientWithCpk = mockAesKey(getEncryptedClientBuilder(fakeKey, null, env.primaryAccount.credential, cc.getBlobContainerUrl())
109+
def encryptedClientWithCpk = mockAesKey(getEncryptedClientBuilder(fakeKey, null, environment.primaryAccount.credential, cc.getBlobContainerUrl())
110110
.customerProvidedKey(key)
111111
.blobName(generateBlobName())
112112
.buildEncryptedBlobAsyncClient())
113113

114-
def encryptedClientNoCpk = new EncryptedBlobClient(mockAesKey(getEncryptedClientBuilder(fakeKey, null, env.primaryAccount.credential, encryptedClientWithCpk.getBlobUrl())
114+
def encryptedClientNoCpk = new EncryptedBlobClient(mockAesKey(getEncryptedClientBuilder(fakeKey, null, environment.primaryAccount.credential, encryptedClientWithCpk.getBlobUrl())
115115
.buildEncryptedBlobAsyncClient()))
116116

117117
when:
@@ -129,7 +129,7 @@ class BlobCryptographyBuilderTest extends APISpec {
129129
setup:
130130
def scope = "testscope1"
131131
cc.create()
132-
def builder = getEncryptedClientBuilder(fakeKey, null, env.primaryAccount.credential, cc.getBlobContainerUrl())
132+
def builder = getEncryptedClientBuilder(fakeKey, null, environment.primaryAccount.credential, cc.getBlobContainerUrl())
133133
.encryptionScope(scope)
134134
.blobName(generateBlobName())
135135
def encryptedAsyncClient = mockAesKey(builder.buildEncryptedBlobAsyncClient())
@@ -174,7 +174,7 @@ class BlobCryptographyBuilderTest extends APISpec {
174174
def "getCustomerProvidedKeyClient"() {
175175
setup:
176176
CustomerProvidedKey originalKey = new CustomerProvidedKey(getRandomKey())
177-
def client = getEncryptedClientBuilder(fakeKey, null, env.primaryAccount.credential, cc.getBlobContainerUrl())
177+
def client = getEncryptedClientBuilder(fakeKey, null, environment.primaryAccount.credential, cc.getBlobContainerUrl())
178178
.customerProvidedKey(originalKey)
179179
.blobName(generateBlobName())
180180
.buildEncryptedBlobClient()
@@ -191,7 +191,7 @@ class BlobCryptographyBuilderTest extends APISpec {
191191
def "getEncryptionScopeClient"() {
192192
setup:
193193
def originalScope = "testscope1"
194-
def client = getEncryptedClientBuilder(fakeKey, null, env.primaryAccount.credential, cc.getBlobContainerUrl())
194+
def client = getEncryptedClientBuilder(fakeKey, null, environment.primaryAccount.credential, cc.getBlobContainerUrl())
195195
.encryptionScope(originalScope)
196196
.blobName(generateBlobName())
197197
.buildEncryptedBlobClient()

0 commit comments

Comments
 (0)