properly functioning REQ custom filters implementation

nostr-java-api/src/main/java/nostr/api/NIP01.java

@@ -42,6 +42,7 @@
 import nostr.id.Identity;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -208,7 +209,10 @@ public static Filters createFilters(List<GenericEvent> events, List<PublicKey> a
         return Filters.builder()
                 .authors(authors)
                 .events(events)
-                .genericTagQuery(genericTagQuery)
+                .genericTagQuery(
+                    Map.of(
+                        genericTagQuery.getTagName(),
+                        genericTagQuery.getValue()))
                 .kinds(kinds).limit(limit)
                 .referencePubKeys(referencePubKeys)
                 .referencedEvents(referencedEvents)

nostr-java-api/src/main/java/nostr/api/Nostr.java

@@ -281,8 +281,7 @@ public static String encode(@NonNull List<Filters> filtersList) {
          * @param json
          */
         public static Filters decodeFilters(@NonNull String json) {
-            final var dec = new FiltersDecoder(json);
-            return dec.decode();
+            return new FiltersDecoder<>().decode(json);
         }
 
         // Generic Tag Queries

nostr-java-event/src/main/java/nostr/event/impl/Filters.java

@@ -1,23 +1,25 @@
-
 package nostr.event.impl;
 
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import nostr.base.GenericTagQuery;
+import lombok.Setter;
 import nostr.base.PublicKey;
 import nostr.base.annotation.Key;
 import nostr.event.Kind;
-import nostr.event.json.deserializer.CustomGenericTagQueryDeserializer;
-import nostr.event.json.serializer.CustomGenericTagQuerySerializer;
 import nostr.event.json.serializer.CustomIdEventListSerializer;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  *
@@ -61,7 +63,17 @@ public class Filters {
     private Integer limit;
 
     @Key(nip = 12)
-    @JsonSerialize(using=CustomGenericTagQuerySerializer.class)
-    @JsonDeserialize(using=CustomGenericTagQueryDeserializer.class)
-    private GenericTagQuery genericTagQuery;
+    @Setter(AccessLevel.NONE)
+    private Map<String, List<String>> genericTagQuery;
+
+    @JsonAnyGetter
+    public Map<String, List<String>> getGenericTagQuery() {
+        return genericTagQuery;
+    }
+
+    @JsonAnySetter
+    public void setGenericTagQuery(String key, List<String> value) {
+        this.genericTagQuery = Optional.ofNullable(genericTagQuery).orElse(new HashMap<>());
+        this.genericTagQuery.put(key, value);
+    }
 }

nostr-java-event/src/main/java/nostr/event/json/codec/FDecoder.java

@@ -1,5 +1,5 @@
 package nostr.event.json.codec;
 
-public interface FDecoder<Filters> {
-    Filters decode();
+public interface FDecoder<T> {
+  T decode(String str);
 }

nostr-java-event/src/main/java/nostr/event/json/codec/FiltersDecoder.java

@@ -3,24 +3,19 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Data;
+import lombok.NonNull;
 import nostr.event.impl.Filters;
 
 /**
  *
  * @author eric
  */
 @Data
-public class FiltersDecoder implements FDecoder<Filters> {
-    private final Class<Filters> clazz;
-    private final String jsonString;
-
-    public FiltersDecoder(String jsonString) {
-        this.clazz = Filters.class;
-        this.jsonString = jsonString;
-    }
+public class FiltersDecoder<T extends Filters> implements FDecoder<T> {
+    private final Class<T> clazz = (Class<T>)Filters.class;
 
     @Override
-    public Filters decode()  {
+    public T decode(@NonNull String jsonString)  {
         try {
             ObjectMapper mapper = new ObjectMapper();
             return mapper.readValue(jsonString, clazz);

nostr-java-test/src/main/java/nostr/test/EntityFactory.java

@@ -29,6 +29,7 @@
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Random;
 
 /**
@@ -146,7 +147,15 @@ public static Filters createFilters(PublicKey publicKey) {
             List<GenericEvent> refEvents = new ArrayList<>();
             refEvents.add(createTextNoteEvent(publicKey));
 
-            return Filters.builder().events(eventList).referencedEvents(refEvents).genericTagQuery(createGenericTagQuery()).build();
+            GenericTagQuery genericTagQuery = createGenericTagQuery();
+            return Filters.builder()
+                .events(eventList)
+                .referencedEvents(refEvents)
+                .genericTagQuery(
+                    Map.of(
+                        genericTagQuery.getTagName(),
+                        genericTagQuery.getValue()))
+                .build();
         }
 
         public static GenericTagQuery createGenericTagQuery() {