Skip to content

Commit a0306b1

Browse files
paullatzelspergerpaullatzelsperger
authored
fix: use the getStringProperty method of the DataAddress (#42)
* fix: use the getStringProperty method of the DataAddress * DEPENDENCIES
1 parent 5eb24ea commit a0306b1

File tree

12 files changed

+34
-34
lines changed

12 files changed

+34
-34
lines changed

‎DEPENDENCIES‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,12 @@ maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.94.Final, Apa
209209
maven/mavencentral/io.netty/netty-transport/4.1.86.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
210210
maven/mavencentral/io.netty/netty-transport/4.1.93.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
211211
maven/mavencentral/io.netty/netty-transport/4.1.94.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
212-
maven/mavencentral/io.opentelemetry.instrumentation/opentelemetry-instrumentation-annotations/1.28.0, Apache-2.0, approved, #9662
212+
maven/mavencentral/io.opentelemetry.instrumentation/opentelemetry-instrumentation-annotations/1.29.0, , restricted, clearlydefined
213213
maven/mavencentral/io.opentelemetry.proto/opentelemetry-proto/1.0.0-alpha, Apache-2.0, approved, #10044
214214
maven/mavencentral/io.opentelemetry/opentelemetry-api/1.18.0, Apache-2.0, approved, clearlydefined
215-
maven/mavencentral/io.opentelemetry/opentelemetry-api/1.28.0, Apache-2.0, approved, #9661
215+
maven/mavencentral/io.opentelemetry/opentelemetry-api/1.29.0, , restricted, clearlydefined
216216
maven/mavencentral/io.opentelemetry/opentelemetry-context/1.18.0, Apache-2.0, approved, clearlydefined
217-
maven/mavencentral/io.opentelemetry/opentelemetry-context/1.28.0, Apache-2.0, approved, #9663
217+
maven/mavencentral/io.opentelemetry/opentelemetry-context/1.29.0, , restricted, clearlydefined
218218
maven/mavencentral/io.projectreactor.netty/reactor-netty-core/1.0.33, Apache-2.0, approved, #9687
219219
maven/mavencentral/io.projectreactor.netty/reactor-netty-http/1.0.33, Apache-2.0, approved, clearlydefined
220220
maven/mavencentral/io.projectreactor/reactor-core/3.4.30, Apache-2.0, approved, #7517

‎extensions/control-plane/provision/provision-blob/src/main/java/org/eclipse/edc/connector/provision/azure/blob/ObjectContainerProvisionedResource.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
public class ObjectContainerProvisionedResource extends ProvisionedDataDestinationResource {
3131

3232
public String getAccountName() {
33-
return getDataAddress().getProperty(ACCOUNT_NAME);
33+
return getDataAddress().getStringProperty(ACCOUNT_NAME);
3434
}
3535

3636
public String getContainerName() {
37-
return getDataAddress().getProperty(CONTAINER_NAME);
37+
return getDataAddress().getStringProperty(CONTAINER_NAME);
3838
}
3939

4040
private ObjectContainerProvisionedResource() {

‎extensions/control-plane/provision/provision-blob/src/main/java/org/eclipse/edc/connector/provision/azure/blob/ObjectContainerStatusChecker.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ public boolean isComplete(TransferProcess transferProcess, List<ProvisionedResou
4848
}
4949
}
5050
} else {
51-
var accountName = transferProcess.getDataRequest().getDataDestination().getProperty(AzureBlobStoreSchema.ACCOUNT_NAME);
52-
var containerName = transferProcess.getDataRequest().getDataDestination().getProperty(AzureBlobStoreSchema.CONTAINER_NAME);
51+
var accountName = transferProcess.getDataRequest().getDataDestination().getStringProperty(AzureBlobStoreSchema.ACCOUNT_NAME);
52+
var containerName = transferProcess.getDataRequest().getDataDestination().getStringProperty(AzureBlobStoreSchema.CONTAINER_NAME);
5353
return checkContainerExists(accountName, containerName);
5454
}
5555
throw new EdcException(format("No object container resource was associated with the transfer process: %s - cannot determine completion.", transferProcess));

‎extensions/control-plane/provision/provision-blob/src/main/java/org/eclipse/edc/connector/provision/azure/blob/ObjectStorageConsumerResourceDefinitionGenerator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ public class ObjectStorageConsumerResourceDefinitionGenerator implements Consume
3131
public @Nullable ResourceDefinition generate(DataRequest dataRequest, Policy policy) {
3232
var destination = dataRequest.getDataDestination();
3333
var id = randomUUID().toString();
34-
var account = destination.getProperty(AzureBlobStoreSchema.ACCOUNT_NAME);
35-
var container = destination.getProperty(AzureBlobStoreSchema.CONTAINER_NAME);
34+
var account = destination.getStringProperty(AzureBlobStoreSchema.ACCOUNT_NAME);
35+
var container = destination.getStringProperty(AzureBlobStoreSchema.CONTAINER_NAME);
3636

3737
if (container == null) {
3838
container = randomUUID().toString();

‎extensions/control-plane/provision/provision-blob/src/test/java/org/eclipse/edc/connector/provision/azure/blob/ObjectContainerProvisionedResourceTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ void createDataDestination() {
5050

5151
assertThat(dest.getType()).isEqualTo(AzureBlobStoreSchema.TYPE);
5252
assertThat(dest.getKeyName()).isEqualTo("test-container");
53-
assertThat(dest.getProperty(CONTAINER_NAME)).isEqualTo("test-container");
54-
assertThat(dest.getProperty(ACCOUNT_NAME)).isEqualTo("test-account");
53+
assertThat(dest.getStringProperty(CONTAINER_NAME)).isEqualTo("test-container");
54+
assertThat(dest.getStringProperty(ACCOUNT_NAME)).isEqualTo("test-account");
5555
}
5656

5757
@Test

‎extensions/data-plane/data-plane-azure-data-factory/src/main/java/org/eclipse/edc/connector/dataplane/azure/datafactory/AzureDataFactoryTransferManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ public CompletableFuture<StreamResult<Void>> transfer(DataFlowRequest request) {
8686
var dataAddress = request.getDestinationDataAddress();
8787
var secret = keyVaultClient.getSecret(dataAddress.getKeyName());
8888
var token = typeManager.readValue(secret.getValue(), AzureSasToken.class);
89-
var accountName = dataAddress.getProperty(AzureBlobStoreSchema.ACCOUNT_NAME);
90-
var containerName = dataAddress.getProperty(AzureBlobStoreSchema.CONTAINER_NAME);
89+
var accountName = dataAddress.getStringProperty(AzureBlobStoreSchema.ACCOUNT_NAME);
90+
var containerName = dataAddress.getStringProperty(AzureBlobStoreSchema.CONTAINER_NAME);
9191

9292
var runId = client.runPipeline(pipeline).runId();
9393

‎extensions/data-plane/data-plane-azure-data-factory/src/main/java/org/eclipse/edc/connector/dataplane/azure/datafactory/AzureDataFactoryTransferRequestValidator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ boolean canHandle(DataFlowRequest request) {
5252
}
5353

5454
private void validateSource(DataAddress source) {
55-
validateBlobName(source.getProperty(AzureBlobStoreSchema.BLOB_NAME));
55+
validateBlobName(source.getStringProperty(AzureBlobStoreSchema.BLOB_NAME));
5656
validateCommon(source);
5757
}
5858

@@ -61,8 +61,8 @@ private void validateDestination(DataAddress destination) {
6161
}
6262

6363
private void validateCommon(DataAddress dataAddress) {
64-
validateAccountName(dataAddress.getProperty(AzureBlobStoreSchema.ACCOUNT_NAME));
65-
validateContainerName(dataAddress.getProperty(AzureBlobStoreSchema.CONTAINER_NAME));
64+
validateAccountName(dataAddress.getStringProperty(AzureBlobStoreSchema.ACCOUNT_NAME));
65+
validateContainerName(dataAddress.getStringProperty(AzureBlobStoreSchema.CONTAINER_NAME));
6666
validateKeyName(dataAddress.getKeyName());
6767
}
6868
}

‎extensions/data-plane/data-plane-azure-data-factory/src/main/java/org/eclipse/edc/connector/dataplane/azure/datafactory/DataFactoryPipelineFactory.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ private DatasetResource createDestinationDataset(String name, DataAddress source
9494
}
9595

9696
private LinkedServiceResource createSourceLinkedService(String name, DataAddress dataAddress) {
97-
var accountName = dataAddress.getProperty(AzureBlobStoreSchema.ACCOUNT_NAME);
97+
var accountName = dataAddress.getStringProperty(AzureBlobStoreSchema.ACCOUNT_NAME);
9898

9999
return client.defineLinkedService(name)
100100
.withProperties(new AzureStorageLinkedService()
@@ -110,7 +110,7 @@ private LinkedServiceResource createSourceLinkedService(String name, DataAddress
110110
}
111111

112112
private LinkedServiceResource createDestinationLinkedService(String name, DataAddress dataAddress) {
113-
var accountName = dataAddress.getProperty(AzureBlobStoreSchema.ACCOUNT_NAME);
113+
var accountName = dataAddress.getStringProperty(AzureBlobStoreSchema.ACCOUNT_NAME);
114114
var secret = keyVaultClient.getSecret(dataAddress.getKeyName());
115115
var token = typeManager.readValue(secret.getValue(), AzureSasToken.class);
116116
var sasTokenSecret = keyVaultClient.setSecret(name, token.getSas());
@@ -135,8 +135,8 @@ private DatasetResource createDatasetResource(String name, LinkedServiceResource
135135
new BinaryDataset()
136136
.withLinkedServiceName(new LinkedServiceReference().withReferenceName(linkedService.name()))
137137
.withLocation(new AzureBlobStorageLocation()
138-
.withFileName(dataAddress.getProperty(AzureBlobStoreSchema.BLOB_NAME))
139-
.withContainer(dataAddress.getProperty(AzureBlobStoreSchema.CONTAINER_NAME))
138+
.withFileName(dataAddress.getStringProperty(AzureBlobStoreSchema.BLOB_NAME))
139+
.withContainer(dataAddress.getStringProperty(AzureBlobStoreSchema.CONTAINER_NAME))
140140
)
141141
)
142142
.create();

‎extensions/data-plane/data-plane-azure-data-factory/src/test/java/org/eclipse/edc/connector/dataplane/azure/datafactory/AzureDataFactoryTransferRequestValidatorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
class AzureDataFactoryTransferRequestValidatorTest {
4141
private static final DataFlowRequest.Builder REQUEST = createRequest(AzureBlobStoreSchema.TYPE);
4242

43-
private final Map<String, String> sourceProperties = TestFunctions.sourceProperties();
44-
private final Map<String, String> destinationProperties = TestFunctions.destinationProperties();
43+
private final Map<String, Object> sourceProperties = TestFunctions.sourceProperties();
44+
private final Map<String, Object> destinationProperties = TestFunctions.destinationProperties();
4545
private final DataAddress.Builder source = createDataAddress(AzureBlobStoreSchema.TYPE);
4646
private final DataAddress.Builder destination = createDataAddress(AzureBlobStoreSchema.TYPE);
4747
AzureDataFactoryTransferRequestValidator validator = new AzureDataFactoryTransferRequestValidator();

‎extensions/data-plane/data-plane-azure-data-factory/src/test/java/org/eclipse/edc/connector/dataplane/azure/datafactory/TestFunctions.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
public class TestFunctions {
3030

31-
public static Map<String, String> sourceProperties() {
31+
public static Map<String, Object> sourceProperties() {
3232
var srcStorageAccount = createAccountName();
3333
return DataAddress.Builder.newInstance()
3434
.type(AzureBlobStoreSchema.TYPE)
@@ -40,7 +40,7 @@ public static Map<String, String> sourceProperties() {
4040
.getProperties();
4141
}
4242

43-
public static Map<String, String> destinationProperties() {
43+
public static Map<String, Object> destinationProperties() {
4444
var destStorageAccount = createAccountName();
4545

4646
return DataAddress.Builder.newInstance()

0 commit comments

Comments
 (0)