Skip to content

Commit 125c603

Browse files
wolf4oodwolf4ood
authored
feat: removes StatusChecker (#66)
* feat: removes StatusChecker * fix: IntegrationTest
1 parent 3bda740 commit 125c603

File tree

8 files changed

+11
-219
lines changed

8 files changed

+11
-219
lines changed

‎DEPENDENCIES‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ maven/mavencentral/com.nimbusds/lang-tag/1.7, Apache-2.0, approved, clearlydefin
132132
maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.25, Apache-2.0, approved, clearlydefined
133133
maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.28, Apache-2.0, approved, clearlydefined
134134
maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.30.2, Apache-2.0, approved, clearlydefined
135-
maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.31, Apache-2.0, approved, clearlydefined
136135
maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.32, Apache-2.0, approved, #10561
137136
maven/mavencentral/com.nimbusds/oauth2-oidc-sdk/10.7.1, Apache-2.0, approved, clearlydefined
138137
maven/mavencentral/com.puppycrawl.tools/checkstyle/10.0, LGPL-2.1-or-later, approved, #7936
@@ -250,9 +249,9 @@ maven/mavencentral/jakarta.annotation/jakarta.annotation-api/2.1.1, EPL-2.0 OR G
250249
maven/mavencentral/jakarta.inject/jakarta.inject-api/2.0.1, Apache-2.0, approved, clearlydefined
251250
maven/mavencentral/jakarta.json/jakarta.json-api/2.1.1, EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, #7907
252251
maven/mavencentral/jakarta.transaction/jakarta.transaction-api/2.0.0, EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0, approved, #7697
253-
maven/mavencentral/jakarta.validation/jakarta.validation-api/2.0.2, Apache-2.0, approved, clearlydefined
254-
maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.0, Apache-2.0, approved, clearlydefined
255-
maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0, approved, clearlydefined
252+
maven/mavencentral/jakarta.validation/jakarta.validation-api/2.0.2, Apache-2.0, approved, ee4j.validation
253+
maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.0, Apache-2.0, approved, ee4j.validation
254+
maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0, approved, ee4j.validation
256255
maven/mavencentral/jakarta.ws.rs/jakarta.ws.rs-api/3.1.0, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.rest
257256
maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/2.3.2, BSD-3-Clause, approved, ee4j.jaxb
258257
maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/3.0.0, BSD-3-Clause, approved, ee4j.jaxb
@@ -337,6 +336,7 @@ maven/mavencentral/org.eclipse.edc/control-api-configuration/0.3.1-SNAPSHOT, Apa
337336
maven/mavencentral/org.eclipse.edc/control-plane-aggregate-services/0.3.1-SNAPSHOT, Apache-2.0, approved, technology.edc
338337
maven/mavencentral/org.eclipse.edc/control-plane-api-client-spi/0.3.1-SNAPSHOT, Apache-2.0, approved, technology.edc
339338
maven/mavencentral/org.eclipse.edc/control-plane-api-client/0.3.1-SNAPSHOT, Apache-2.0, approved, technology.edc
339+
maven/mavencentral/org.eclipse.edc/control-plane-api/0.3.1-SNAPSHOT, Apache-2.0, approved, technology.edc
340340
maven/mavencentral/org.eclipse.edc/control-plane-core/0.3.1-SNAPSHOT, Apache-2.0, approved, technology.edc
341341
maven/mavencentral/org.eclipse.edc/control-plane-spi/0.3.1-SNAPSHOT, Apache-2.0, approved, technology.edc
342342
maven/mavencentral/org.eclipse.edc/core-spi/0.3.1-SNAPSHOT, Apache-2.0, approved, technology.edc
@@ -525,7 +525,6 @@ maven/mavencentral/org.slf4j/slf4j-api/1.7.36, MIT, approved, CQ13368
525525
maven/mavencentral/org.slf4j/slf4j-api/1.7.7, MIT, approved, CQ9827
526526
maven/mavencentral/org.slf4j/slf4j-api/2.0.5, MIT, approved, #5915
527527
maven/mavencentral/org.slf4j/slf4j-api/2.0.6, MIT, approved, #5915
528-
maven/mavencentral/org.slf4j/slf4j-api/2.0.9, MIT, approved, #5915
529528
maven/mavencentral/org.testcontainers/junit-jupiter/1.19.0, MIT, approved, #10344
530529
maven/mavencentral/org.testcontainers/testcontainers/1.19.0, Apache-2.0 AND MIT, approved, #10347
531530
maven/mavencentral/org.xmlunit/xmlunit-core/2.9.1, Apache-2.0, approved, #6272

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,15 @@
1515
package org.eclipse.edc.connector.provision.azure;
1616

1717
import dev.failsafe.RetryPolicy;
18-
import org.eclipse.edc.azure.blob.AzureBlobStoreSchema;
1918
import org.eclipse.edc.azure.blob.AzureSasToken;
2019
import org.eclipse.edc.azure.blob.api.BlobStoreApi;
2120
import org.eclipse.edc.connector.provision.azure.blob.ObjectContainerProvisionedResource;
22-
import org.eclipse.edc.connector.provision.azure.blob.ObjectContainerStatusChecker;
2321
import org.eclipse.edc.connector.provision.azure.blob.ObjectStorageConsumerResourceDefinitionGenerator;
2422
import org.eclipse.edc.connector.provision.azure.blob.ObjectStorageProvisioner;
2523
import org.eclipse.edc.connector.provision.azure.blob.ObjectStorageResourceDefinition;
2624
import org.eclipse.edc.connector.transfer.spi.provision.ProvisionManager;
2725
import org.eclipse.edc.connector.transfer.spi.provision.Provisioner;
2826
import org.eclipse.edc.connector.transfer.spi.provision.ResourceManifestGenerator;
29-
import org.eclipse.edc.connector.transfer.spi.status.StatusCheckerRegistry;
3027
import org.eclipse.edc.runtime.metamodel.annotation.Inject;
3128
import org.eclipse.edc.spi.system.ServiceExtension;
3229
import org.eclipse.edc.spi.system.ServiceExtensionContext;
@@ -46,9 +43,6 @@ public class AzureProvisionExtension implements ServiceExtension {
4643
@Inject
4744
private ResourceManifestGenerator manifestGenerator;
4845

49-
@Inject
50-
private StatusCheckerRegistry statusCheckerRegistry;
51-
5246
@Inject
5347
private TypeManager typeManager;
5448

@@ -68,8 +62,6 @@ public void initialize(ServiceExtensionContext context) {
6862
// register the generator
6963
manifestGenerator.registerGenerator(new ObjectStorageConsumerResourceDefinitionGenerator());
7064

71-
statusCheckerRegistry.register(AzureBlobStoreSchema.TYPE, new ObjectContainerStatusChecker(blobStoreApi, retryPolicy));
72-
7365
registerTypes(typeManager);
7466
}
7567

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

Lines changed: 0 additions & 68 deletions
This file was deleted.

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

Lines changed: 0 additions & 134 deletions
This file was deleted.

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ edc-vault-filesystem = { module = "org.eclipse.edc:vault-filesystem", version.re
3535
edc-core-connector = { module = "org.eclipse.edc:connector-core", version.ref = "edc" }
3636
edc-core-controlplane = { module = "org.eclipse.edc:control-plane-core", version.ref = "edc" }
3737
edc-core-controlplane-apiclient = { module = "org.eclipse.edc:control-plane-api-client", version.ref = "edc" }
38+
edc-core-controlplane-api = { module = "org.eclipse.edc:control-plane-api", version.ref = "edc" }
3839
edc-core-dataplane = { module = "org.eclipse.edc:data-plane-core", version.ref = "edc" }
3940
edc-core-dataPlane-selector = { module = "org.eclipse.edc:data-plane-selector-core", version.ref = "edc" }
4041
edc-core-dataPlane-util = { module = "org.eclipse.edc:data-plane-util", version.ref = "edc" }

‎system-tests/azure-tests/src/test/java/org/eclipse/edc/test/system/local/BlobTransferIntegrationTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import static org.eclipse.edc.test.system.local.TransferRuntimeConfiguration.PROTOCOL_PATH;
5555
import static org.eclipse.edc.test.system.local.TransferRuntimeConfiguration.PROVIDER_CONNECTOR_PATH;
5656
import static org.eclipse.edc.test.system.local.TransferRuntimeConfiguration.PROVIDER_CONNECTOR_PORT;
57+
import static org.eclipse.edc.test.system.local.TransferRuntimeConfiguration.PROVIDER_CONTROL_URL;
5758
import static org.eclipse.edc.test.system.local.TransferRuntimeConfiguration.PROVIDER_MANAGEMENT_PATH;
5859
import static org.eclipse.edc.test.system.local.TransferRuntimeConfiguration.PROVIDER_MANAGEMENT_PORT;
5960
import static org.eclipse.edc.test.system.local.TransferRuntimeConfiguration.PROVIDER_PARTICIPANT_ID;
@@ -79,6 +80,8 @@ public class BlobTransferIntegrationTest extends AbstractAzureBlobTest {
7980
put("web.http.management.path", PROVIDER_MANAGEMENT_PATH);
8081
put("web.http.protocol.port", String.valueOf(PROVIDER_PROTOCOL_PORT));
8182
put("web.http.protocol.path", PROTOCOL_PATH);
83+
put("web.http.control.port", String.valueOf(PROVIDER_CONTROL_URL.getPort()));
84+
put("web.http.control.path", PROVIDER_CONTROL_URL.getPath());
8285
put(PARTICIPANT_ID, PROVIDER_PARTICIPANT_ID);
8386
put("edc.dsp.callback.address", PROVIDER_PROTOCOL_URL);
8487
}

‎system-tests/runtimes/azure-storage-transfer-provider/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ dependencies {
4242

4343
implementation(libs.edc.dsp)
4444
implementation(libs.edc.core.controlplane.apiclient)
45+
implementation(libs.edc.core.controlplane.api)
4546

4647
implementation(libs.jakarta.rsApi)
4748
}

‎system-tests/tests/src/testFixtures/java/org/eclipse/edc/test/system/local/TransferRuntimeConfiguration.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
package org.eclipse.edc.test.system.local;
1616

17+
import java.net.URI;
1718
import java.util.concurrent.TimeUnit;
1819

1920
import static org.eclipse.edc.junit.testfixtures.TestUtils.getFreePort;
@@ -41,13 +42,10 @@ public class TransferRuntimeConfiguration {
4142
public static final String PROVIDER_MANAGEMENT_PATH = "/api/v1/management";
4243
public static final int PROVIDER_PROTOCOL_PORT = getFreePort();
4344
public static final String PROVIDER_PROTOCOL_URL = "http://localhost:" + PROVIDER_PROTOCOL_PORT + PROTOCOL_PATH;
44-
4545
public static final String PROVIDER_ASSET_ID = "test-document";
4646
public static final long CONTRACT_VALIDITY = TimeUnit.HOURS.toSeconds(1);
47-
4847
public static final String PROVIDER_ASSET_FILE = "text-document.txt";
49-
5048
public static final String PROVIDER_CONNECTOR_MANAGEMENT_URL = "http://localhost:" + PROVIDER_MANAGEMENT_PORT + PROVIDER_MANAGEMENT_PATH;
51-
49+
public static final URI PROVIDER_CONTROL_URL = URI.create("http://localhost:" + getFreePort() + "/control");
5250

5351
}

0 commit comments

Comments
 (0)