Skip to content

Commit fcded65

Browse files
do not publish an "all" lilb
1 parent 95a7cba commit fcded65

File tree

5 files changed

+15
-14
lines changed

5 files changed

+15
-14
lines changed

build.gradle.kts

+1-10
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ allprojects {
4949

5050
}
5151

52-
publishing{
52+
publishing {
5353
repositories {
5454
maven {
5555
name = "GitHubPackages"
@@ -78,13 +78,4 @@ allprojects {
7878

7979
val test by tasks.getting(Test::class) {
8080
useJUnitPlatform()
81-
}
82-
83-
publishing {
84-
publications {
85-
create<MavenPublication>("all") {
86-
artifactId = "edc.all"
87-
from(components["java"])
88-
}
89-
}
9081
}

extensions/ids/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ dependencies {
1414
api(project(":extensions:ids:ids-core"))
1515
api(project(":extensions:ids:ids-api-catalog"))
1616
api(project(":extensions:ids:ids-api-transfer"))
17+
api(project(":extensions:ids:ids-policy-mock"))
1718
}
1819

1920
publishing {

extensions/ids/ids-api-transfer/src/main/java/com/microsoft/dagx/ids/api/transfer/ArtifactRequestController.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public ArtifactRequestController(DapsService dapsService,
7070
public Response request(ArtifactRequestMessage message) {
7171
var verificationResult = dapsService.verifyAndConvertToken(message.getSecurityToken().getTokenValue());
7272
if (!verificationResult.valid()) {
73+
monitor.info(() -> "verification failed for request " + message.getId());
7374
return Response.status(Response.Status.FORBIDDEN).entity(new RejectionMessageBuilder()._rejectionReason_(NOT_AUTHENTICATED).build()).build();
7475
}
7576

@@ -93,6 +94,7 @@ public Response request(ArtifactRequestMessage message) {
9394
var policyResult = policyService.evaluateRequest(clientConnectorId, correlationId, verificationResult.token(), policy);
9495

9596
if (!policyResult.valid()) {
97+
monitor.info("Policy evaluation failed");
9698
return Response.status(Response.Status.FORBIDDEN).entity(new RejectionMessageBuilder()._rejectionReason_(NOT_AUTHORIZED).build()).build();
9799
}
98100

@@ -101,10 +103,11 @@ public Response request(ArtifactRequestMessage message) {
101103
@SuppressWarnings("unchecked") var destinationMap = (Map<String, Object>) message.getProperties().get(DESTINATION_KEY);
102104
var type = (String) destinationMap.get("type");
103105

104-
@SuppressWarnings("unchecked") var properties = (Map<String, String>) destinationMap.get("properties");
106+
@SuppressWarnings("unchecked") Map<String, String> properties = (Map<String, String>) destinationMap.get("properties");
105107
var secretName = (String) destinationMap.get("keyName");
106108

107-
var dataDestination = DataAddress.Builder.newInstance().type(type).properties(cast(properties)).keyName(secretName).build();
109+
final Map<String, String> cast = cast(properties);
110+
var dataDestination = DataAddress.Builder.newInstance().type(type).properties(cast).keyName(secretName).build();
108111

109112
var dataRequest = DataRequest.Builder.newInstance().id(randomUUID().toString()).dataEntry(entry).dataDestination(dataDestination).protocol(IDS_REST).build();
110113

extensions/transfer/transfer-core/src/main/java/com/microsoft/dagx/transfer/core/transfer/TransferProcessManagerImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ private int checkProvisioned() {
173173
List<TransferProcess> requestAcked = transferProcessStore.nextForState(TransferProcessStates.REQUESTED_ACK.code(), batchSize);
174174

175175
for (var process : requestAcked) {
176-
if (!process.getProvisionedResourceSet().empty()) {
176+
if (process.getProvisionedResourceSet() != null && !process.getProvisionedResourceSet().empty()) {
177177

178178
if (process.getDataRequest().getTransferType().isFinite()) {
179179
process.transitionInProgress();

spi/src/main/java/com/microsoft/dagx/spi/types/domain/transfer/TransferType.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,13 @@
66

77
package com.microsoft.dagx.spi.types.domain.transfer;
88

9+
import com.fasterxml.jackson.annotation.JsonCreator;
10+
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
11+
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
12+
913
import java.util.Objects;
1014

15+
@JsonDeserialize(builder = TransferType.Builder.class)
1116
public class TransferType {
1217
private String contentType;
1318
private boolean isFinite = true;
@@ -20,14 +25,15 @@ public boolean isFinite() {
2025
return isFinite;
2126
}
2227

23-
28+
@JsonPOJOBuilder(withPrefix = "")
2429
public static final class Builder {
2530
private String contentType = "application/octet-stream";
2631
private boolean isFinite = true;
2732

2833
private Builder() {
2934
}
3035

36+
@JsonCreator
3137
public static Builder transferType() {
3238
return new Builder();
3339
}

0 commit comments

Comments
 (0)