Skip to content

Commit 0262d63

Browse files
committed
pr remarks
1 parent 252d235 commit 0262d63

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

charts/tractusx-connector-memory/example.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
fullnameOverride: tx-inmem
3535

3636
participant:
37-
id: "test"
37+
id: "test-participant"
3838

3939
runtime:
4040
service:

docs/migration/Version_0.3.4_0.4.0.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Migration from 0.3.3 to 0.4.0
1+
# Migration from 0.3.4 to 0.4.0
22

33
## Switching to DSP
44

edc-extensions/cx-oauth2/src/main/java/org/eclipse/tractusx/edc/oauth2/CxParticipantExtension.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ public class CxParticipantExtension implements ServiceExtension, ParticipantAgen
3636
private static final String DEFAULT_PARTICIPANT_ID_REGEX = "[^/]+(?=/$|$)";
3737
private static final int DEFAULT_PARTICIPANT_ID_REGEX_GROUP = 0;
3838

39-
@Setting(value = "Data plane proxy API consumer port", defaultValue = CxParticipantExtension.PARTICIPANT_ID_REGEX)
39+
@Setting(value = "Participant Extractor from referringConnector regex", defaultValue = CxParticipantExtension.DEFAULT_PARTICIPANT_ID_REGEX)
4040
private static final String PARTICIPANT_ID_REGEX = "tx.participant.id.regex";
4141

42-
@Setting(value = "Data plane proxy API consumer port", defaultValue = CxParticipantExtension.PARTICIPANT_ID_REGEX)
43-
private static final String PARTICIPANT_ID_REGEX_GROUP = "tx.participant.id.regex";
42+
@Setting(value = "Participant Extractor from referringConnector regex group", defaultValue = "0")
43+
private static final String PARTICIPANT_ID_REGEX_GROUP = "tx.participant.id.regexGroup";
4444
@Inject
45-
ParticipantAgentService agentService;
45+
private ParticipantAgentService agentService;
4646
private Pattern participantRegex;
4747

4848
private int participantRegexGroup;

edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/AbstractHashicorpVaultExtension.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class AbstractHashicorpVaultExtension {
5151

5252
private static final String VAULT_TIMEOUT_SECONDS = "edc.vault.hashicorp.timeout.seconds";
5353

54-
public HashicorpVaultClient createVaultClient(ServiceExtensionContext context, ObjectMapper mapper) {
54+
protected HashicorpVaultClient createVaultClient(ServiceExtensionContext context, ObjectMapper mapper) {
5555
var config = loadHashicorpVaultClientConfig(context);
5656

5757
var okHttpClient = createOkHttpClient(config);

edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultHealthExtension.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ public void initialize(ServiceExtensionContext context) {
5757
}
5858

5959
private void configureHealthCheck(HashicorpVaultClient client, ServiceExtensionContext context) {
60-
final boolean healthCheckEnabled =
60+
var healthCheckEnabled =
6161
context.getSetting(VAULT_HEALTH_CHECK, VAULT_HEALTH_CHECK_DEFAULT);
6262
if (!healthCheckEnabled) return;
6363

64-
final HashicorpVaultHealthCheck healthCheck =
64+
var healthCheck =
6565
new HashicorpVaultHealthCheck(client, context.getMonitor());
6666

6767
healthCheckService.addLivenessProvider(healthCheck);

edc-extensions/hashicorp-vault/src/main/java/org/eclipse/tractusx/edc/hashicorpvault/HashicorpVaultVaultExtension.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.eclipse.edc.spi.system.ServiceExtensionContext;
3131
import org.eclipse.edc.spi.types.TypeManager;
3232

33-
@Provides({ Vault.class, CertificateResolver.class, PrivateKeyResolver.class })
33+
@Provides({Vault.class, CertificateResolver.class, PrivateKeyResolver.class})
3434
public class HashicorpVaultVaultExtension extends AbstractHashicorpVaultExtension
3535
implements ServiceExtension {
3636

@@ -46,10 +46,10 @@ public String name() {
4646
public void initialize(ServiceExtensionContext context) {
4747
var client = createVaultClient(context, typeManager.getMapper());
4848

49-
final HashicorpVault vault = new HashicorpVault(client);
50-
final CertificateResolver certificateResolver =
49+
var vault = new HashicorpVault(client);
50+
var certificateResolver =
5151
new HashicorpCertificateResolver(vault, context.getMonitor());
52-
final VaultPrivateKeyResolver privateKeyResolver = new VaultPrivateKeyResolver(vault);
52+
var privateKeyResolver = new VaultPrivateKeyResolver(vault);
5353

5454
context.registerService(Vault.class, vault);
5555
context.registerService(CertificateResolver.class, certificateResolver);

edc-tests/deployment/src/main/resources/helm/tractusx-connector-azure-vault-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fullnameOverride: tx-prod
3939
# EDC ControlPlane + DataPlane #
4040
################################
4141
participant:
42-
id: "test"
42+
id: "test-participant"
4343

4444
controlplane:
4545
service:

edc-tests/deployment/src/main/resources/helm/tractusx-connector-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ fullnameOverride: tx-prod
2424
################################
2525

2626
participant:
27-
id: "test"
27+
id: "test-participant"
2828

2929
controlplane:
3030
service:

0 commit comments

Comments
 (0)