proto-plugin removed from gradle, AddressDetails moved

apps/rest-api-app/build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
     id("bisq.java-library")
-    id("bisq.protobuf")
     application
 }
 

apps/rest-api-app/src/main/java/bisq/rest_api/proto/AddressDetails.java → apps/rest-api-app/src/main/java/bisq/rest_api/report/AddressDetails.java

@@ -15,24 +15,20 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-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());
-    }
 }

apps/rest-api-app/src/main/java/bisq/rest_api/report/ReportRestApi.java

@@ -154,8 +154,8 @@ public List<Report> 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<bisq.rest_api.proto.AddressDetails> getAddressDetailsDto(
+            content = @Content(mediaType = MediaType.APPLICATION_JSON, schema = @Schema(implementation = AddressDetails[].class)))
+    public List<AddressDetails> 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<bisq.rest_api.proto.AddressDetails> getAddressDetailsDto(
         }
     }
 
-    public List<bisq.rest_api.proto.AddressDetails> getAddressDetailsProtobufs(List<String> addressList) {
+    public List<AddressDetails> getAddressDetailsProtobufs(List<String> addressList) {
         Set<BondedRole> 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<bisq.rest_api.proto.AddressDetails> getAddressDetailsProtobufs(List<
                                 ))
                         ).orElse(Stream.empty()))
                 .collect(Collectors.toList());
-
     }
 }