Skip to content

Commit 017f10e

Browse files
paullatzelspergerpaullatzelsperger
authored
fix: compile errors (#39)
1 parent 1d132c7 commit 017f10e

File tree

5 files changed

+48
-48
lines changed

5 files changed

+48
-48
lines changed

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
# Compiles production Java source (without tests)
4646
- name: Build
47-
run: ./gradlew compileJava --no-daemon
47+
run: ./gradlew --refresh-dependencies compileJava --no-daemon
4848

4949
- name: Perform CodeQL Analysis
5050
uses: github/codeql-action/analyze@v2

‎.github/workflows/verify.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- uses: ./.github/actions/setup-build
2828

2929
- name: Run Checkstyle
30-
run: ./gradlew checkstyleMain checkstyleTest checkstyleTestFixtures
30+
run: ./gradlew --refresh-dependencies checkstyleMain checkstyleTest checkstyleTestFixtures
3131

3232
Unit-Tests:
3333
runs-on: ubuntu-latest
@@ -40,7 +40,7 @@ jobs:
4040
- name: Run unit tests
4141
uses: ./.github/actions/run-tests
4242
with:
43-
command: ./gradlew test jacocoTestReport
43+
command: ./gradlew --refresh-dependencies test jacocoTestReport
4444

4545
Azure-Storage-Integration-Tests:
4646
runs-on: ubuntu-latest
@@ -61,7 +61,7 @@ jobs:
6161
uses: ./.github/actions/run-tests
6262
with:
6363
command: |
64-
./gradlew test -DincludeTags="AzureStorageIntegrationTest" --refresh-dependencies
64+
./gradlew --refresh-dependencies test -DincludeTags="AzureStorageIntegrationTest" --refresh-dependencies
6565
6666
# TODO: this test has been commented out because it was flaky. Further investigation needed. ref: https://github.com/eclipse-edc/Connector/issues/2403
6767
# Azure-Cloud-Integration-Test:
@@ -114,7 +114,7 @@ jobs:
114114
- name: Component Tests
115115
uses: ./.github/actions/run-tests
116116
with:
117-
command: ./gradlew jacocoTestReport -DincludeTags="ComponentTest"
117+
command: ./gradlew --refresh-dependencies jacocoTestReport -DincludeTags="ComponentTest"
118118

119119
End-To-End-Tests:
120120
runs-on: ubuntu-latest
@@ -125,7 +125,7 @@ jobs:
125125
- name: End to End Integration Tests
126126
uses: ./.github/actions/run-tests
127127
with:
128-
command: ./gradlew test -DincludeTags="EndToEndTest"
128+
command: ./gradlew --refresh-dependencies test -DincludeTags="EndToEndTest"
129129

130130
API-Tests:
131131
env:
@@ -138,7 +138,7 @@ jobs:
138138
- name: Component Tests
139139
uses: ./.github/actions/run-tests
140140
with:
141-
command: ./gradlew test jacocoTestReport -DincludeTags="ApiTest"
141+
command: ./gradlew --refresh-dependencies test jacocoTestReport -DincludeTags="ApiTest"
142142

143143
Upload-Test-Report:
144144
needs:

‎extensions/common/azure/azure-blob-core/src/test/java/org/eclipse/edc/azure/blob/validator/AzureStorageValidatorTest.java‎

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@
1515
package org.eclipse.edc.azure.blob.validator;
1616

1717
import org.junit.jupiter.api.Test;
18+
import org.junit.jupiter.api.extension.ExtensionContext;
1819
import org.junit.jupiter.params.ParameterizedTest;
19-
import org.junit.jupiter.params.provider.MethodSource;
20+
import org.junit.jupiter.params.provider.Arguments;
21+
import org.junit.jupiter.params.provider.ArgumentsProvider;
22+
import org.junit.jupiter.params.provider.ArgumentsSource;
2023
import org.junit.jupiter.params.provider.NullAndEmptySource;
24+
import org.junit.jupiter.params.provider.NullSource;
2125
import org.junit.jupiter.params.provider.ValueSource;
2226

2327
import java.util.stream.Stream;
@@ -27,36 +31,16 @@
2731
class AzureStorageValidatorTest {
2832

2933

30-
private static Stream<String> validBlobNames() {
31-
return Stream.of(
32-
"geq",
33-
"Qja143",
34-
"ABE",
35-
"a name",
36-
"end space ",
37-
"je`~3j4k%$':\\",
38-
"abcdefghijklmnop".repeat(64),
39-
"a/b".repeat(253));
40-
}
41-
42-
private static Stream<String> invalidBlobNames() {
43-
return Stream.of(
44-
null,
45-
"",
46-
"abcdefghijklmnop".repeat(64) + "a",
47-
"a/b".repeat(254));
48-
}
49-
5034
@ParameterizedTest
51-
@ValueSource(strings = { "abc", "abcdefghijabcdefghijbcde", "1er", "451", "ge45" })
35+
@ValueSource(strings = {"abc", "abcdefghijabcdefghijbcde", "1er", "451", "ge45"})
5236
void validateAccountName_success(String input) {
5337
AzureStorageValidator.validateAccountName(input);
5438
}
5539

5640
@ParameterizedTest
5741
@NullAndEmptySource
58-
@ValueSource(strings = { " ", "$log", "r", "re", "a a", " b", "ag_c", "re-r", "bdjfkCJdfd", "efer:a",
59-
"abcdefghijabcdefghijbcdef" })
42+
@ValueSource(strings = {" ", "$log", "r", "re", "a a", " b", "ag_c", "re-r", "bdjfkCJdfd", "efer:a",
43+
"abcdefghijabcdefghijbcdef"})
6044
void validateAccountName_fail(String input) {
6145
assertThatExceptionOfType(IllegalArgumentException.class)
6246
.isThrownBy(() -> AzureStorageValidator.validateAccountName(input));
@@ -66,15 +50,15 @@ void validateAccountName_fail(String input) {
6650
@ValueSource(strings = {
6751
"$root", "$logs", "$web",
6852
"re-r", "z0r-a-q",
69-
"abc", "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz01234567890", "1er", "451", "ge45" })
53+
"abc", "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz01234567890", "1er", "451", "ge45"})
7054
void validateContainerName_success(String input) {
7155
AzureStorageValidator.validateContainerName(input);
7256
}
7357

7458
@ParameterizedTest
7559
@NullAndEmptySource
76-
@ValueSource(strings = { "$log", " ", "r", "re", "a a", "-ree", "era-", "z0rr--", " b", "ag_c",
77-
"bdjfkCJdfd", "efer:a", "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz012345678901" })
60+
@ValueSource(strings = {"$log", " ", "r", "re", "a a", "-ree", "era-", "z0rr--", " b", "ag_c",
61+
"bdjfkCJdfd", "efer:a", "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz012345678901"})
7862
void validateContainerName_fail(String input) {
7963
assertThatExceptionOfType(IllegalArgumentException.class)
8064
.isThrownBy(() -> AzureStorageValidator.validateContainerName(input));
@@ -93,15 +77,41 @@ void validateKeyName_success() {
9377
}
9478

9579
@ParameterizedTest
96-
@MethodSource("validBlobNames")
80+
@ArgumentsSource(ValidBlobNameProvider.class)
9781
void validateBlobName_success(String input) {
9882
AzureStorageValidator.validateBlobName(input);
9983
}
10084

10185
@ParameterizedTest
102-
@MethodSource("invalidBlobNames")
86+
@ArgumentsSource(InvalidBlobNameProvider.class)
87+
@NullSource
10388
void validateBlobName_fail(String input) {
10489
assertThatExceptionOfType(IllegalArgumentException.class)
10590
.isThrownBy(() -> AzureStorageValidator.validateBlobName(input));
10691
}
92+
93+
private static class InvalidBlobNameProvider implements ArgumentsProvider {
94+
@Override
95+
public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
96+
return Stream.of(
97+
Arguments.of(""),
98+
Arguments.of("abcdefghijklmnop".repeat(64) + "a"),
99+
Arguments.of("a/b".repeat(254)));
100+
}
101+
}
102+
103+
private static class ValidBlobNameProvider implements ArgumentsProvider {
104+
@Override
105+
public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
106+
return Stream.of(
107+
Arguments.of("geq"),
108+
Arguments.of("Qja143"),
109+
Arguments.of("ABE"),
110+
Arguments.of("a name"),
111+
Arguments.of("end space "),
112+
Arguments.of("je`~3j4k%$':\\"),
113+
Arguments.of("abcdefghijklmnop".repeat(64)),
114+
Arguments.of("a/b".repeat(253)));
115+
}
116+
}
107117
}

‎extensions/data-plane/data-plane-azure-storage/src/main/java/org/eclipse/edc/connector/dataplane/azure/storage/pipeline/AzureStorageDataSinkFactory.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@ public boolean canHandle(DataFlowRequest request) {
6060
return AzureBlobStoreSchema.TYPE.equals(request.getDestinationDataAddress().getType());
6161
}
6262

63-
@Override
64-
public @NotNull Result<Boolean> validate(DataFlowRequest request) {
65-
return validateRequest(request).mapTo();
66-
}
67-
6863
@Override
6964
public @NotNull Result<Void> validateRequest(DataFlowRequest request) {
7065
var dataAddress = request.getDestinationDataAddress();
@@ -75,7 +70,7 @@ public boolean canHandle(DataFlowRequest request) {
7570
} catch (IllegalArgumentException e) {
7671
return Result.failure("AzureStorage destination address is invalid: " + e.getMessage());
7772
}
78-
return VALID.mapTo();
73+
return Result.success();
7974
}
8075

8176
@Override

‎extensions/data-plane/data-plane-azure-storage/src/main/java/org/eclipse/edc/connector/dataplane/azure/storage/pipeline/AzureStorageDataSourceFactory.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,6 @@ public boolean canHandle(DataFlowRequest request) {
5555
return AzureBlobStoreSchema.TYPE.equals(request.getSourceDataAddress().getType());
5656
}
5757

58-
@Override
59-
public @NotNull Result<Boolean> validate(DataFlowRequest request) {
60-
return validateRequest(request).mapTo();
61-
}
62-
6358
@Override
6459
public @NotNull Result<Void> validateRequest(DataFlowRequest request) {
6560
var dataAddress = request.getSourceDataAddress();
@@ -71,7 +66,7 @@ public boolean canHandle(DataFlowRequest request) {
7166
} catch (IllegalArgumentException e) {
7267
return Result.failure("AzureStorage source address is invalid: " + e.getMessage());
7368
}
74-
return VALID.mapTo();
69+
return Result.success();
7570
}
7671

7772
@Override

0 commit comments

Comments
 (0)