From 00a2c252fe850d9696ed204b8bf997dddb210f4c Mon Sep 17 00:00:00 2001 From: bsc7 <118875465+bsc7@users.noreply.github.com> Date: Tue, 19 Nov 2024 10:59:50 +0100 Subject: [PATCH] proto-plugin removed from gradle, AddressDetails moved --- apps/rest-api-app/build.gradle.kts | 1 - .../{proto => report}/AddressDetails.java | 34 ++----------------- .../bisq/rest_api/report/ReportRestApi.java | 9 +++-- .../src/main/proto/rest_api.proto | 10 ------ 4 files changed, 6 insertions(+), 48 deletions(-) rename apps/rest-api-app/src/main/java/bisq/rest_api/{proto => report}/AddressDetails.java (50%) delete mode 100644 apps/rest-api-app/src/main/proto/rest_api.proto diff --git a/apps/rest-api-app/build.gradle.kts b/apps/rest-api-app/build.gradle.kts index 778519bd16..93dbe2907d 100644 --- a/apps/rest-api-app/build.gradle.kts +++ b/apps/rest-api-app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("bisq.java-library") - id("bisq.protobuf") application } diff --git a/apps/rest-api-app/src/main/java/bisq/rest_api/proto/AddressDetails.java b/apps/rest-api-app/src/main/java/bisq/rest_api/report/AddressDetails.java similarity index 50% rename from apps/rest-api-app/src/main/java/bisq/rest_api/proto/AddressDetails.java rename to apps/rest-api-app/src/main/java/bisq/rest_api/report/AddressDetails.java index d4819884ef..237f92e835 100644 --- a/apps/rest-api-app/src/main/java/bisq/rest_api/proto/AddressDetails.java +++ b/apps/rest-api-app/src/main/java/bisq/rest_api/report/AddressDetails.java @@ -15,24 +15,20 @@ * along with Bisq. If not, see . */ -package bisq.rest_api.proto; +package bisq.rest_api.report; -import bisq.common.proto.NetworkProto; -import bisq.common.proto.Proto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.ToString; import lombok.extern.slf4j.Slf4j; -import static com.google.common.base.Preconditions.checkArgument; - @Slf4j @Getter @EqualsAndHashCode @ToString @Schema(name = "AddressDetails") -public final class AddressDetails implements NetworkProto { +public final class AddressDetails { private final String address; private final String bondedRoleType; private final String nickNameOrBondUserName; @@ -42,30 +38,4 @@ public AddressDetails(String address, String bondedRoleType, String nickNameOrBo this.bondedRoleType = bondedRoleType; this.nickNameOrBondUserName = nickNameOrBondUserName; } - - @Override - public void verify() { - checkArgument(address != null && address.length() > 0); - checkArgument(bondedRoleType != null && bondedRoleType.length() > 0); - checkArgument(nickNameOrBondUserName != null && nickNameOrBondUserName.length() > 0); - } - - @Override - public bisq.rest_api.protobuf.AddressDetails toProto(boolean serializeForHash) { - return resolveProto(serializeForHash); - } - - @Override - public bisq.rest_api.protobuf.AddressDetails.Builder getBuilder(boolean serializeForHash) { - return bisq.rest_api.protobuf.AddressDetails.newBuilder() - .setAddress(this.address) - .setBondedRoleType(this.bondedRoleType) - .setNickNameOrBondUserName(this.nickNameOrBondUserName); - } - - public static AddressDetails fromProto(bisq.rest_api.protobuf.AddressDetails proto) { - return new AddressDetails(proto.getAddress(), - proto.getBondedRoleType(), - proto.getNickNameOrBondUserName()); - } } diff --git a/apps/rest-api-app/src/main/java/bisq/rest_api/report/ReportRestApi.java b/apps/rest-api-app/src/main/java/bisq/rest_api/report/ReportRestApi.java index fbfc49214a..bc0030c511 100644 --- a/apps/rest-api-app/src/main/java/bisq/rest_api/report/ReportRestApi.java +++ b/apps/rest-api-app/src/main/java/bisq/rest_api/report/ReportRestApi.java @@ -154,8 +154,8 @@ public List getReports( @Path("/addresses/details") @Operation(description = "Get address info for a set of host:port addresses") @ApiResponse(responseCode = "200", description = "The set of address info (host, role type, nickname or bond name)", - content = @Content(mediaType = MediaType.APPLICATION_JSON, schema = @Schema(implementation = bisq.rest_api.proto.AddressDetails[].class))) - public List getAddressDetailsDto( + content = @Content(mediaType = MediaType.APPLICATION_JSON, schema = @Schema(implementation = AddressDetails[].class))) + public List getAddressDetailsDto( @QueryParam("addresses") String addresses) { // Comma-separated list try { log.info("Received request to get address infos for: {}", addresses); @@ -166,13 +166,13 @@ public List getAddressDetailsDto( } } - public List getAddressDetailsProtobufs(List addressList) { + public List getAddressDetailsProtobufs(List addressList) { Set bondedRoles = bondedRolesService.getAuthorizedBondedRolesService().getBondedRoles(); return bondedRoles.stream() .flatMap(bondedRole -> bondedRole.getAuthorizedBondedRole().getAddressByTransportTypeMap() .map(addressMap -> addressMap.entrySet().stream() .filter(entry -> addressList.contains(entry.getValue().toString())) // Nutze addressList - .map(entry -> new bisq.rest_api.proto.AddressDetails( + .map(entry -> new AddressDetails( entry.getValue().toString(), bondedRole.getAuthorizedBondedRole().getBondedRoleType().name(), userService.getUserProfileService() @@ -182,6 +182,5 @@ public List getAddressDetailsProtobufs(List< )) ).orElse(Stream.empty())) .collect(Collectors.toList()); - } } diff --git a/apps/rest-api-app/src/main/proto/rest_api.proto b/apps/rest-api-app/src/main/proto/rest_api.proto deleted file mode 100644 index d8e613da70..0000000000 --- a/apps/rest-api-app/src/main/proto/rest_api.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; -package rest_api; -option java_package = "bisq.rest_api.protobuf"; -option java_multiple_files = true; - -message AddressDetails { - string address = 1; - string bondedRoleType = 2; - string nickNameOrBondUserName = 3; -}