September release

Labros Papadopoulosrequested to merge
develop into main

Merge request reports

src/main/java/org/etsi/osl/hypo/api/peering/clients/RegistryClient.java

0 → 100644
+23 −0
Changes for src/main/java/org/etsi/osl/hypo/api/peering/clients/RegistryClient.java: 23 added lines, 0 removed lines.
Original line number Diff line number Diff line 
package org.etsi.osl.hypo.api.peering.clients;



import jakarta.ws.rs.Consumes;

import jakarta.ws.rs.GET;

import jakarta.ws.rs.HeaderParam;

import jakarta.ws.rs.Path;

import jakarta.ws.rs.PathParam;

import jakarta.ws.rs.Produces;

import jakarta.ws.rs.core.MediaType;

import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;

import org.etsi.osl.hypo.api.peering.model.PeeringInfoSecret;



@Path("registry-api")

@RegisterRestClient(configKey = "registry-api")

public interface RegistryClient {



    @GET

    @Path("organization/secret/{secret-name}")

    @Consumes(MediaType.APPLICATION_JSON)

    @Produces(MediaType.APPLICATION_JSON)

    PeeringInfoSecret getSecretWithVaultToken(

            @HeaderParam("X-Vault-Token") String vaultToken, @PathParam("secret-name") String secretName);

}

src/main/java/org/etsi/osl/hypo/api/peering/entity/OssClientData.java

+0 −6
Changes for src/main/java/org/etsi/osl/hypo/api/peering/entity/OssClientData.java: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -48,12 +48,6 @@ public class OssClientData { 
    @Column(name = "oauth2TokenUri")

    private String oauth2TokenUri;



    @Column(name = "username")

    private String username;



    @Column(name = "password")

    private String password;



    @Column(name = "healthCheckCounter")

    private int healthCheckCounter;

src/main/java/org/etsi/osl/hypo/api/peering/mapper/OssLifecycleDataToOssClientDataMapper.java

+1 −0
Changes for src/main/java/org/etsi/osl/hypo/api/peering/mapper/OssLifecycleDataToOssClientDataMapper.java: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ public interface OssLifecycleDataToOssClientDataMapper { 
    @Mapping(target = "id", ignore = true)

    @Mapping(target = "organizationId", ignore = true)

    @Mapping(target = "healthCheckCounter", ignore = true)

    @Mapping(target = "oauth2TokenUri", source = "authUrl")

    @BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)

    OssClientData mapToOssClientData(

            OssLifecycleData ossLifecycleData, @MappingTarget OssClientData ossClientData);

src/main/java/org/etsi/osl/hypo/api/peering/model/OssLifecycleData.java

+2 −2
Changes for src/main/java/org/etsi/osl/hypo/api/peering/model/OssLifecycleData.java: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ import lombok.ToString; 
    "oauth2ClientId",

    "oauth2ClientSecret",

    "oauth2Scopes",

    "oauth2TokenUri",

    "authUrl",

    "username",

    "password"

})
@@ -38,7 +38,7 @@ public class OssLifecycleData { 


    private String oauth2Scopes;



    private String oauth2TokenUri;

    private String authUrl;



    private String username;

src/main/java/org/etsi/osl/hypo/api/peering/model/PeeringInfoSecret.java

0 → 100644
+14 −0
Changes for src/main/java/org/etsi/osl/hypo/api/peering/model/PeeringInfoSecret.java: 14 added lines, 0 removed lines.
Original line number Diff line number Diff line 
package org.etsi.osl.hypo.api.peering.model;



import lombok.AllArgsConstructor;

import lombok.Data;

import lombok.NoArgsConstructor;

import lombok.ToString;



@Data

@NoArgsConstructor

@AllArgsConstructor

public class PeeringInfoSecret {

    private String username;

    @ToString.Exclude private String password;

}