Skip to content

Develop fix nip46 #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tcheeric merged 1 commit into from
Apr 3, 2024
Merged

Develop fix nip46 #128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139 changes: 7 additions & 132 deletions nostr-java-api/src/main/java/nostr/api/NIP46.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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() {
Expand All @@ -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);
}
}
}

}