fix: compile errors

Author: paullatzelsperger

.github/workflows/run-cosmos-tests.yaml

@@ -3,6 +3,8 @@ on:
   schedule:
     # run daily at midnight
     - cron: 0 0 * * *
+  workflow_dispatch:
+    
 
 jobs:
   Check-Actions-Secrets:

DEPENDENCIES

@@ -1,46 +1,46 @@
 maven/mavencentral/com.apicatalog/titanium-json-ld/1.3.2, Apache-2.0, approved, #8912
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-appplatform/2.28.0, , restricted, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-appservice/2.28.0, , restricted, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-authorization/2.28.0, , restricted, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-cdn/2.28.0, , restricted, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-compute/2.28.0, , restricted, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-containerinstance/2.28.0, , restricted, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-containerregistry/2.28.0, , restricted, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-containerservice/2.28.0, , restricted, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-cosmos/2.28.0, , restricted, clearlydefined
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-appplatform/2.28.0, MIT, approved, #9670
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-appservice/2.28.0, MIT, approved, #9671
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-authorization/2.28.0, MIT, approved, #9672
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-cdn/2.28.0, MIT, approved, #9673
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-compute/2.28.0, MIT, approved, clearlydefined
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-containerinstance/2.28.0, MIT, approved, #9674
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-containerregistry/2.28.0, MIT, approved, clearlydefined
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-containerservice/2.28.0, MIT, approved, #9675
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-cosmos/2.28.0, MIT, approved, clearlydefined
 maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-datafactory/1.0.0-beta.22, MIT, approved, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-dns/2.28.0, , restricted, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-eventhubs/2.28.0, , restricted, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-keyvault/2.28.0, , restricted, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-monitor/2.28.0, , restricted, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-msi/2.28.0, , restricted, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-network/2.28.0, , restricted, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-privatedns/2.28.0, , restricted, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-redis/2.28.0, , restricted, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-resources/2.28.0, , restricted, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-search/2.28.0, , restricted, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-servicebus/2.28.0, , restricted, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-sql/2.28.0, , restricted, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-storage/2.28.0, , restricted, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-trafficmanager/2.28.0, , restricted, clearlydefined
-maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager/2.28.0, , restricted, clearlydefined
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-dns/2.28.0, MIT, approved, #9676
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-eventhubs/2.28.0, MIT, approved, #9677
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-keyvault/2.28.0, MIT, approved, #9678
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-monitor/2.28.0, MIT, approved, #9679
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-msi/2.28.0, MIT, approved, clearlydefined
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-network/2.28.0, MIT, approved, clearlydefined
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-privatedns/2.28.0, MIT, approved, #9680
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-redis/2.28.0, MIT, approved, #9681
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-resources/2.28.0, MIT, approved, clearlydefined
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-search/2.28.0, MIT, approved, #9682
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-servicebus/2.28.0, MIT, approved, #9683
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-sql/2.28.0, MIT, approved, #9684
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-storage/2.28.0, MIT, approved, clearlydefined
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager-trafficmanager/2.28.0, MIT, approved, #9685
+maven/mavencentral/com.azure.resourcemanager/azure-resourcemanager/2.28.0, MIT, approved, clearlydefined
 maven/mavencentral/com.azure/azure-core-http-netty/1.13.4, MIT AND Apache-2.0, approved, #7948
 maven/mavencentral/com.azure/azure-core-http-netty/1.13.5, MIT AND Apache-2.0, approved, #7948
 maven/mavencentral/com.azure/azure-core-management/1.10.2, MIT, approved, clearlydefined
 maven/mavencentral/com.azure/azure-core-management/1.11.2, MIT, approved, clearlydefined
 maven/mavencentral/com.azure/azure-core/1.37.0, MIT, approved, clearlydefined
 maven/mavencentral/com.azure/azure-core/1.40.0, MIT, approved, clearlydefined
-maven/mavencentral/com.azure/azure-core/1.41.0, , restricted, clearlydefined
-maven/mavencentral/com.azure/azure-identity/1.9.2, , restricted, clearlydefined
+maven/mavencentral/com.azure/azure-core/1.41.0, MIT AND Apache-2.0, approved, #9648
+maven/mavencentral/com.azure/azure-identity/1.9.2, MIT AND Apache-2.0, approved, #9686
 maven/mavencentral/com.azure/azure-json/1.0.1, MIT AND Apache-2.0, approved, #7933
 maven/mavencentral/com.azure/azure-messaging-eventgrid/4.17.0, MIT, approved, clearlydefined
 maven/mavencentral/com.azure/azure-security-keyvault-keys/4.6.3, MIT, approved, clearlydefined
 maven/mavencentral/com.azure/azure-security-keyvault-secrets/4.6.3, MIT, approved, #7940
-maven/mavencentral/com.azure/azure-storage-blob/12.23.0, , restricted, clearlydefined
+maven/mavencentral/com.azure/azure-storage-blob/12.23.0, MIT, approved, #9632
 maven/mavencentral/com.azure/azure-storage-common/12.21.2, MIT, approved, clearlydefined
-maven/mavencentral/com.azure/azure-storage-common/12.22.0, , restricted, clearlydefined
+maven/mavencentral/com.azure/azure-storage-common/12.22.0, MIT, approved, #9645
 maven/mavencentral/com.azure/azure-storage-file-share/12.18.2, MIT, approved, clearlydefined
-maven/mavencentral/com.azure/azure-storage-internal-avro/12.8.0, , restricted, clearlydefined
+maven/mavencentral/com.azure/azure-storage-internal-avro/12.8.0, MIT, approved, #9630
 maven/mavencentral/com.ethlo.time/itu/1.7.0, Apache-2.0, approved, clearlydefined
 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.10.3, Apache-2.0, approved, CQ21280
 maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.12.1, Apache-2.0, approved, CQ22965
@@ -233,14 +233,14 @@ maven/mavencentral/io.netty/netty-transport/4.1.86.Final, Apache-2.0 AND BSD-3-C
 maven/mavencentral/io.netty/netty-transport/4.1.91.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-transport/4.1.93.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
 maven/mavencentral/io.netty/netty-transport/4.1.94.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.opentelemetry.instrumentation/opentelemetry-instrumentation-annotations/1.28.0, , restricted, clearlydefined
+maven/mavencentral/io.opentelemetry.instrumentation/opentelemetry-instrumentation-annotations/1.28.0, Apache-2.0, approved, #9662
 maven/mavencentral/io.opentelemetry.proto/opentelemetry-proto/0.14.0-alpha, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.opentelemetry/opentelemetry-api/1.18.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.opentelemetry/opentelemetry-api/1.28.0, , restricted, clearlydefined
+maven/mavencentral/io.opentelemetry/opentelemetry-api/1.28.0, Apache-2.0, approved, #9661
 maven/mavencentral/io.opentelemetry/opentelemetry-context/1.18.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.opentelemetry/opentelemetry-context/1.28.0, , restricted, clearlydefined
-maven/mavencentral/io.projectreactor.netty/reactor-netty-core/1.0.31, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.projectreactor.netty/reactor-netty-core/1.0.33, , restricted, clearlydefined
+maven/mavencentral/io.opentelemetry/opentelemetry-context/1.28.0, Apache-2.0, approved, #9663
+maven/mavencentral/io.projectreactor.netty/reactor-netty-core/1.0.31, Apache-2.0, approved, #9687
+maven/mavencentral/io.projectreactor.netty/reactor-netty-core/1.0.33, Apache-2.0, approved, #9687
 maven/mavencentral/io.projectreactor.netty/reactor-netty-http/1.0.31, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.projectreactor.netty/reactor-netty-http/1.0.33, Apache-2.0, approved, clearlydefined
 maven/mavencentral/io.projectreactor/reactor-core/3.4.29, Apache-2.0, approved, #7517

extensions/control-plane/store/contract-negotiation-store-cosmos/src/test/java/org/eclipse/edc/connector/store/azure/cosmos/contractnegotiation/CosmosContractNegotiationStoreTest.java

@@ -287,12 +287,12 @@ protected SqlContractNegotiationStore getContractNegotiationStore() {
     }
 
     @Override
-    protected void lockEntity(String negotiationId, String owner, Duration duration) {
+    protected void leaseEntity(String negotiationId, String owner, Duration duration) {
         leaseUtil.leaseEntity(negotiationId, owner, duration);
     }
 
     @Override
-    protected boolean isLockedBy(String negotiationId, String owner) {
+    protected boolean isLeasedBy(String negotiationId, String owner) {
         return leaseUtil.isLeased(negotiationId, owner);
     }
 }

extensions/control-plane/store/transfer-process-store-cosmos/src/test/java/org/eclipse/edc/connector/store/azure/cosmos/transferprocess/CosmosTransferProcessStoreTest.java

@@ -107,8 +107,8 @@ void find_queryByDataRequest_propNotExist() {
         var tp = createTransferProcessBuilder("testprocess1")
                 .dataRequest(da)
                 .build();
-        store.updateOrCreate(tp);
-        store.updateOrCreate(createTransferProcess("testprocess2"));
+        store.save(tp);
+        store.save(createTransferProcess("testprocess2"));
 
         var query = QuerySpec.Builder.newInstance()
                 .filter(List.of(new Criterion("dataRequest.notexist", "=", "somevalue")))
@@ -126,8 +126,8 @@ void find_queryByResourceManifest_propNotExist() {
         var tp = createTransferProcessBuilder("testprocess1")
                 .resourceManifest(rm)
                 .build();
-        store.updateOrCreate(tp);
-        store.updateOrCreate(createTransferProcess("testprocess2"));
+        store.save(tp);
+        store.save(createTransferProcess("testprocess2"));
 
         // throws exception when an explicit mapping exists
         var query = QuerySpec.Builder.newInstance()
@@ -159,8 +159,8 @@ void find_queryByProvisionedResourceSet_propNotExist() {
         var tp = createTransferProcessBuilder("testprocess1")
                 .provisionedResourceSet(prs)
                 .build();
-        store.updateOrCreate(tp);
-        store.updateOrCreate(createTransferProcess("testprocess2"));
+        store.save(tp);
+        store.save(createTransferProcess("testprocess2"));
 
         // throws exception when an explicit mapping exists
         var query = QuerySpec.Builder.newInstance()
@@ -180,7 +180,7 @@ void find_queryByProvisionedResourceSet_propNotExist() {
 
     @Test
     void find_queryByLease() {
-        store.updateOrCreate(createTransferProcess("testprocess1"));
+        store.save(createTransferProcess("testprocess1"));
 
         var query = QuerySpec.Builder.newInstance()
                 .filter(List.of(new Criterion("lease.leasedBy", "=", "foobar")))
@@ -196,16 +196,16 @@ void create_withoutDataRequest_throwsException() {
         var t1 = TestFunctions.createTransferProcessBuilder("id1")
                 .dataRequest(null)
                 .build();
-        assertThatIllegalArgumentException().isThrownBy(() -> getTransferProcessStore().updateOrCreate(t1));
+        assertThatIllegalArgumentException().isThrownBy(() -> getTransferProcessStore().save(t1));
     }
 
 
     @Test
     void nextNotLeased_expiredLease() {
         var t = createTransferProcess("id1", INITIAL);
-        getTransferProcessStore().updateOrCreate(t);
+        getTransferProcessStore().save(t);
 
-        lockEntity(t.getId(), CONNECTOR_NAME, Duration.ofMillis(100));
+        leaseEntity(t.getId(), CONNECTOR_NAME, Duration.ofMillis(100));
 
         Awaitility.await().atLeast(Duration.ofMillis(100))
                 .atMost(Duration.ofMillis(5000)) //this is different from the superclass - with the connection to cosmos it may take longer than 500ms
@@ -215,7 +215,7 @@ void nextNotLeased_expiredLease() {
     @Override
     @Test
     protected void findAll_verifySorting_invalidProperty() {
-        range(0, 10).forEach(i -> getTransferProcessStore().updateOrCreate(createTransferProcess("test-neg-" + i)));
+        range(0, 10).forEach(i -> getTransferProcessStore().save(createTransferProcess("test-neg-" + i)));
 
         var query = QuerySpec.Builder.newInstance().sortField("notexist").sortOrder(SortOrder.DESC).build();
 
@@ -240,12 +240,12 @@ protected SqlTransferProcessStore getTransferProcessStore() {
     }
 
     @Override
-    protected void lockEntity(String negotiationId, String owner, Duration duration) {
+    protected void leaseEntity(String negotiationId, String owner, Duration duration) {
         getLeaseUtil().leaseEntity(negotiationId, owner, duration);
     }
 
     @Override
-    protected boolean isLockedBy(String negotiationId, String owner) {
+    protected boolean isLeasedBy(String negotiationId, String owner) {
         return getLeaseUtil().isLeased(negotiationId, owner);
     }