From dc624a752e7a739c9642e644235ebb40a2c30428 Mon Sep 17 00:00:00 2001
From: kuiperanon <kuiperbeltanon@gmail.com>
Date: Tue, 2 Apr 2024 20:54:08 -0500
Subject: [PATCH] Restructure NIP46 JSON serializable objects

---
 .../src/main/java/nostr/api/NIP46.java        | 139 +-----------------
 1 file changed, 7 insertions(+), 132 deletions(-)

diff --git a/nostr-java-api/src/main/java/nostr/api/NIP46.java b/nostr-java-api/src/main/java/nostr/api/NIP46.java
index b150774d9..05d52b866 100644
--- a/nostr-java-api/src/main/java/nostr/api/NIP46.java
+++ b/nostr-java-api/src/main/java/nostr/api/NIP46.java
@@ -61,18 +61,13 @@ public interface NIP46ReqRes {
     @NoArgsConstructor
     @Log
     public static final class Request implements Serializable {
-        private String initiator;
-        private String token;
-        private LocalDateTime createdAt;
-        private String requestUuid;
-        @JsonIgnore
-        private Method method;
-        @JsonIgnore
-        private Session session;
-        private Set<Parameter> parameters = new LinkedHashSet<>();
-
-        public void addParameter(Parameter parameter) {
-            this.parameters.add(parameter);
+        private String id;
+        private String method;
+        // @JsonIgnore
+        private Set<String> params = new LinkedHashSet<>();
+
+        public void addParam(String param) {
+            this.params.add(param);
         }
 
         public String toString() {
@@ -104,10 +99,6 @@ public static final class Response implements Serializable {
         private Long id;
         private String responseUuid;
         private String result;
-        @JsonIgnore
-        private Method method;
-        @JsonIgnore
-        private Session session;
         private LocalDateTime createdAt;
 
         public String toString() {
@@ -130,120 +121,4 @@ public static Response fromString(@NonNull String jsonString) {
             }
         }
     }
-
-    @Data
-    @AllArgsConstructor
-    @NoArgsConstructor
-    @Log
-    public static final class Method implements Serializable {
-        private Long id;
-        private String name;
-        private String description;
-        private Set<Request> requests = new LinkedHashSet<>();
-        private Set<Response> responses = new LinkedHashSet<>();
-
-        public void addRequest(@NonNull Request request) {
-            this.requests.add(request);
-        }
-
-        public void addResponse(@NonNull Response response) {
-            this.responses.add(response);
-        }
-
-        public String toString() {
-            try {
-                ObjectMapper objectMapper = new ObjectMapper();
-                return objectMapper.writeValueAsString(this);
-            } catch (JsonProcessingException ex) {
-                // Handle the exception if needed
-                log.log(Level.WARNING, "Error converting to JSON: {0}", ex.getMessage());
-                return "{}"; // Return an empty JSON object as a fallback
-            }
-        }
-
-        public static Method fromString(@NonNull String jsonString) {
-            ObjectMapper objectMapper = new ObjectMapper();
-            try {
-                return objectMapper.readValue(jsonString, Method.class);
-            } catch (JsonProcessingException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    @Data
-    @AllArgsConstructor
-    @NoArgsConstructor
-    @Log
-    public static final class Session implements Serializable {
-        private Long id;
-        private String sessionId;
-        private String status;
-        private String app;
-        private String account;
-        private LocalDateTime createdAt;
-        private String token;
-        private Set<Request> requests = new LinkedHashSet<>();
-        private Set<Response> responses = new LinkedHashSet<>();
-
-        public void addRequest(@NonNull Request request) {
-            this.requests.add(request);
-        }
-
-        public void addResponse(@NonNull Response response) {
-            this.responses.add(response);
-        }
-
-        public String toString() {
-            try {
-                ObjectMapper objectMapper = new ObjectMapper();
-                return objectMapper.writeValueAsString(this);
-            } catch (JsonProcessingException ex) {
-                // Handle the exception if needed
-                log.log(Level.WARNING, "Error converting to JSON: {0}", ex.getMessage());
-                return "{}"; // Return an empty JSON object as a fallback
-            }
-        }
-
-        public static Session fromString(@NonNull String jsonString) {
-            ObjectMapper objectMapper = new ObjectMapper();
-            try {
-                return objectMapper.readValue(jsonString, Session.class);
-            } catch (JsonProcessingException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
-    @Data
-    @AllArgsConstructor
-    @NoArgsConstructor
-    @Log
-    public static final class Parameter implements Serializable {
-        private Long id;
-        private String name;
-        private String value;
-        @JsonIgnore
-        private Request request;
-
-        public String toString() {
-            try {
-                ObjectMapper objectMapper = new ObjectMapper();
-                return objectMapper.writeValueAsString(this);
-            } catch (JsonProcessingException ex) {
-                log.log(Level.WARNING, "Error converting to JSON: {0}", ex.getMessage());
-                return "{}"; // Return an empty JSON object as a fallback
-            }
-        }
-
-        public static Parameter fromString(@NonNull String jsonString) {
-            ObjectMapper objectMapper = new ObjectMapper();
-            try {
-                return objectMapper.readValue(jsonString, Parameter.class);
-            } catch (JsonProcessingException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
 }