various minor updates & cleanup

README.md

@@ -98,9 +98,9 @@ valid relay(s) must **_first_** be defined in [relays.properties](nostr-java-api
 
 ## Examples
 I recommend having a look at these repositories/module for examples:
-  - [nostr-example](https://github.com/tcheeric/nostr-java/tree/main/nostr-java-examples) module
-  - [nostr-client](https://github.com/tcheeric/nostr-client) github repository
-  - [SuperConductor](https://github.com/avlo/superconductor) nostr relay
+- [nostr-example](https://github.com/tcheeric/nostr-java/tree/main/nostr-java-examples) module
+- [nostr-client](https://github.com/tcheeric/nostr-client) github repository
+- [SuperConductor](https://github.com/avlo/superconductor) nostr relay
 
 
 ## Supported NIPs

buildSrc/build.gradle

@@ -11,7 +11,7 @@ plugins {
 }
 
 group = 'xyz.tcheeric'
-version = '0.6.5-SNAPSHOT'
+version = '0.6.6-SNAPSHOT'
 
 repositories {
     mavenCentral()

buildSrc/src/main/groovy/nostr-java.conventions.gradle

@@ -15,7 +15,7 @@ plugins {
     id 'org.gradle.test-retry'
 }
 
-group = version = rootProject.property("nostr-java.group")
+group = rootProject.property("nostr-java.group")
 version = rootProject.property("nostr-java.version")
 description = rootProject.property("nostr-java.description")
 
@@ -38,7 +38,6 @@ publishing {
     }
 }
 
-
 dependencies {
     def springBootVersion = rootProject.property("nostr-java.springBootVersion")
     def apacheCommonsLang3 = rootProject.property("nostr-java.apacheCommonsLang3")
@@ -61,7 +60,6 @@ dependencies {
     implementation 'org.bouncycastle:bcprov-jdk18on:' + bouncyCastle
 
     implementation 'org.apache.commons:commons-lang3:' + apacheCommonsLang3
-    implementation 'com.google.guava:guava:' + googleGuava
     implementation 'org.awaitility:awaitility:' + awaitility
     implementation 'org.projectlombok:lombok:' + lombok
     annotationProcessor 'org.awaitility:awaitility:' + awaitility
@@ -71,25 +69,20 @@ dependencies {
     testImplementation 'org.projectlombok:lombok:' + lombok
     testImplementation 'org.awaitility:awaitility:' + awaitility
     testImplementation 'com.adarshr:gradle-test-logger-plugin:' + logger
+    testImplementation 'com.google.guava:guava:' + googleGuava
 
     testAnnotationProcessor 'org.projectlombok:lombok:' + lombok
 }
 
-configurations {
-    compileOnly {
-        extendsFrom annotationProcessor
-    }
-}
-
 tasks.test {
     systemProperty("spring.profiles.active", "test")
     useJUnitPlatform()
-//    retry {
-//        maxRetries.set(1)
-////        maxFailures.set(20)
-////        failOnPassedAfterRetry.set(false)
-////        failOnSkippedAfterRetry.set(true)
-//    }
+}
+
+test {
+    filter {
+        excludeTestsMatching("nostr.api.integration.*");
+    }
 }
 
 test {

gradle.properties

@@ -6,7 +6,7 @@ org.gradle.parallel=true
 org.gradle.warning.mode=none
 
 nostr-java.group=xyz.tcheeric
-nostr-java.version=0.6.5-SNAPSHOT
+nostr-java.version=0.6.6-SNAPSHOT
 nostr-java.description=nostr-java
 
 nostr-java.java-version=21

nostr-java-api/build.gradle

@@ -9,7 +9,7 @@ dependencies {
     api project(':nostr-java-encryption')
 }
 
-tasks.register('integrationTest', Test) {
+tasks.register('apiIntegrationTest', Test) {
     description = 'api integration tests.'
     group = 'verification'
     systemProperty("spring.profiles.active", "test")
@@ -20,11 +20,11 @@ tasks.register('integrationTest', Test) {
     }
 }
 
-integrationTest {
+apiIntegrationTest {
     retry {
         failOnPassedAfterRetry = false
         maxRetries = 1
     }
 }
 
-check.dependsOn integrationTest
+check.dependsOn apiIntegrationTest

nostr-java-api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>xyz.tcheeric</groupId>
         <artifactId>nostr-java</artifactId>
-        <version>0.6.5-SNAPSHOT</version>
+        <version>0.6.6-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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

@@ -8,7 +8,7 @@
 import nostr.event.Deleteable;
 import nostr.event.NIP09Event;
 import nostr.event.impl.GenericEvent;
-import nostr.event.impl.GenericTag;
+import nostr.event.tag.GenericTag;
 import nostr.event.tag.AddressTag;
 import nostr.event.tag.EventTag;
 import nostr.event.tag.IdentifierTag;
@@ -75,7 +75,7 @@ public NIP09<T> createDeletionEvent(@NonNull List<Deleteable> deleteables) {
 
     private AddressTag toAddressTag(@NonNull GenericTag genericTag) {
         IdentifierTag identifierTag = new IdentifierTag();
-        identifierTag.setId(genericTag.getAttributes().get(1).getValue().toString());
+        identifierTag.setUuid(genericTag.getAttributes().get(1).getValue().toString());
 
         AddressTag addressTag = new AddressTag();
         addressTag.setIdentifierTag(identifierTag);

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

@@ -11,7 +11,7 @@
 import nostr.api.factory.impl.NIP23Impl.SummaryTagFactory;
 import nostr.api.factory.impl.NIP23Impl.TitleTagFactory;
 import nostr.event.impl.GenericEvent;
-import nostr.event.impl.GenericTag;
+import nostr.event.tag.GenericTag;
 import nostr.event.tag.AddressTag;
 import nostr.event.tag.EventTag;
 import nostr.id.Identity;

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

@@ -11,8 +11,7 @@
 import nostr.event.NIP25Event;
 import nostr.event.Reaction;
 import nostr.event.impl.GenericEvent;
-import nostr.event.impl.GenericTag;
-import nostr.event.impl.GenericTag;
+import nostr.event.tag.GenericTag;
 import nostr.event.tag.EmojiTag;
 import nostr.id.Identity;
 

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

@@ -2,7 +2,7 @@
 
 import lombok.NonNull;
 import nostr.api.factory.TagFactory;
-import nostr.event.impl.GenericTag;
+import nostr.event.tag.GenericTag;
 
 public class NIP31 {