From e33db69c387f0e3a8c9600fb9e3359233084ebaa Mon Sep 17 00:00:00 2001 From: Jesse Gallagher Date: Thu, 12 Sep 2024 11:24:48 -0400 Subject: [PATCH 1/4] Add JSR 305 provided dependency for dev convenience --- domino-jnx-commons/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/domino-jnx-commons/pom.xml b/domino-jnx-commons/pom.xml index b70c2035..55080bf6 100644 --- a/domino-jnx-commons/pom.xml +++ b/domino-jnx-commons/pom.xml @@ -41,6 +41,13 @@ junit-jupiter-params test + + + com.google.code.findbugs + jsr305 + 3.0.2 + provided + ${jar.finalName} From 257484efd00da327560d2fe1f44de9a1746e6bdc Mon Sep 17 00:00:00 2001 From: Jesse Gallagher Date: Fri, 20 Sep 2024 13:38:02 -0400 Subject: [PATCH 2/4] Set version to 1.42.2-SNAPSHOT --- domino-jnx-api/pom.xml | 2 +- domino-jnx-commons/pom.xml | 2 +- domino-jnx-console/pom.xml | 2 +- domino-jnx-jna/pom.xml | 2 +- example/jnx-example-domino-servlet/pom.xml | 2 +- example/jnx-example-domino-webapp-admin/pom.xml | 2 +- example/jnx-example-gluon/pom.xml | 2 +- example/jnx-example-graalvm-native/pom.xml | 2 +- example/jnx-example-runjava/pom.xml | 2 +- example/jnx-example-swt/pom.xml | 2 +- example/jnx-example-webapp/pom.xml | 2 +- integration/domino-jnx-jakarta-security/pom.xml | 2 +- integration/domino-jnx-jsonb/pom.xml | 2 +- integration/domino-jnx-lsxbeshim/pom.xml | 2 +- integration/domino-jnx-rawdoc-json/pom.xml | 2 +- integration/domino-jnx-vertx-json/pom.xml | 2 +- integration/domino-jnx-xpages/pom.xml | 2 +- pom.xml | 2 +- test/it-domino-jnx/pom.xml | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/domino-jnx-api/pom.xml b/domino-jnx-api/pom.xml index 93666ed5..9d4424e6 100644 --- a/domino-jnx-api/pom.xml +++ b/domino-jnx-api/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.1 + 1.42.2-SNAPSHOT domino-jnx-api HCL Domino API diff --git a/domino-jnx-commons/pom.xml b/domino-jnx-commons/pom.xml index 55080bf6..89d5e82b 100644 --- a/domino-jnx-commons/pom.xml +++ b/domino-jnx-commons/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.1 + 1.42.2-SNAPSHOT domino-jnx-commons HCL Domino API Common Code diff --git a/domino-jnx-console/pom.xml b/domino-jnx-console/pom.xml index 6f84845b..dc47f59d 100644 --- a/domino-jnx-console/pom.xml +++ b/domino-jnx-console/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.1 + 1.42.2-SNAPSHOT domino-jnx-console HCL Domino API Server Controller Connector diff --git a/domino-jnx-jna/pom.xml b/domino-jnx-jna/pom.xml index ac892e83..f831acbf 100644 --- a/domino-jnx-jna/pom.xml +++ b/domino-jnx-jna/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.1 + 1.42.2-SNAPSHOT domino-jnx-jna HCL Domino API, JNA Implementation diff --git a/example/jnx-example-domino-servlet/pom.xml b/example/jnx-example-domino-servlet/pom.xml index 000d90ef..cc1c137f 100644 --- a/example/jnx-example-domino-servlet/pom.xml +++ b/example/jnx-example-domino-servlet/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.1 + 1.42.2-SNAPSHOT ../.. jnx-example-domino-servlet diff --git a/example/jnx-example-domino-webapp-admin/pom.xml b/example/jnx-example-domino-webapp-admin/pom.xml index 3b4858ad..eb85e8be 100644 --- a/example/jnx-example-domino-webapp-admin/pom.xml +++ b/example/jnx-example-domino-webapp-admin/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.1 + 1.42.2-SNAPSHOT ../.. jnx-example-domino-webapp-admin diff --git a/example/jnx-example-gluon/pom.xml b/example/jnx-example-gluon/pom.xml index 603e8111..daf18523 100644 --- a/example/jnx-example-gluon/pom.xml +++ b/example/jnx-example-gluon/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.1 + 1.42.2-SNAPSHOT ../.. jnx-example-gluon diff --git a/example/jnx-example-graalvm-native/pom.xml b/example/jnx-example-graalvm-native/pom.xml index 0b6348f6..b12dc832 100644 --- a/example/jnx-example-graalvm-native/pom.xml +++ b/example/jnx-example-graalvm-native/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.1 + 1.42.2-SNAPSHOT ../.. jnx-example-graalvm-native diff --git a/example/jnx-example-runjava/pom.xml b/example/jnx-example-runjava/pom.xml index ec6d1f7f..378c33e7 100644 --- a/example/jnx-example-runjava/pom.xml +++ b/example/jnx-example-runjava/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.1 + 1.42.2-SNAPSHOT ../.. jnx-example-runjava diff --git a/example/jnx-example-swt/pom.xml b/example/jnx-example-swt/pom.xml index 3504a743..bbc6e1d6 100644 --- a/example/jnx-example-swt/pom.xml +++ b/example/jnx-example-swt/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.1 + 1.42.2-SNAPSHOT ../.. jnx-example-swt diff --git a/example/jnx-example-webapp/pom.xml b/example/jnx-example-webapp/pom.xml index 175fe7a4..deb8efc3 100644 --- a/example/jnx-example-webapp/pom.xml +++ b/example/jnx-example-webapp/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.1 + 1.42.2-SNAPSHOT ../.. jnx-example-webapp diff --git a/integration/domino-jnx-jakarta-security/pom.xml b/integration/domino-jnx-jakarta-security/pom.xml index 77c16779..a6635844 100644 --- a/integration/domino-jnx-jakarta-security/pom.xml +++ b/integration/domino-jnx-jakarta-security/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.1 + 1.42.2-SNAPSHOT ../.. domino-jnx-jakarta-security diff --git a/integration/domino-jnx-jsonb/pom.xml b/integration/domino-jnx-jsonb/pom.xml index ab22ec12..4a537a8b 100644 --- a/integration/domino-jnx-jsonb/pom.xml +++ b/integration/domino-jnx-jsonb/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.1 + 1.42.2-SNAPSHOT ../.. domino-jnx-jsonb diff --git a/integration/domino-jnx-lsxbeshim/pom.xml b/integration/domino-jnx-lsxbeshim/pom.xml index 8a6dac8f..92adc917 100644 --- a/integration/domino-jnx-lsxbeshim/pom.xml +++ b/integration/domino-jnx-lsxbeshim/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.1 + 1.42.2-SNAPSHOT ../.. domino-jnx-lsxbeshim diff --git a/integration/domino-jnx-rawdoc-json/pom.xml b/integration/domino-jnx-rawdoc-json/pom.xml index 52fa0479..60ac9e66 100644 --- a/integration/domino-jnx-rawdoc-json/pom.xml +++ b/integration/domino-jnx-rawdoc-json/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.1 + 1.42.2-SNAPSHOT ../.. domino-jnx-rawdoc-json diff --git a/integration/domino-jnx-vertx-json/pom.xml b/integration/domino-jnx-vertx-json/pom.xml index f30f6d46..3a930eb2 100644 --- a/integration/domino-jnx-vertx-json/pom.xml +++ b/integration/domino-jnx-vertx-json/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.1 + 1.42.2-SNAPSHOT ../.. domino-jnx-vertx-json diff --git a/integration/domino-jnx-xpages/pom.xml b/integration/domino-jnx-xpages/pom.xml index 37906954..2048361e 100644 --- a/integration/domino-jnx-xpages/pom.xml +++ b/integration/domino-jnx-xpages/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.1 + 1.42.2-SNAPSHOT ../.. domino-jnx-xpages diff --git a/pom.xml b/pom.xml index 5b7846e9..9520b764 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 com.hcl.domino domino-jnx - 1.42.1 + 1.42.2-SNAPSHOT pom HCL Domino API Parent Project Modern Java API for HCL Domino diff --git a/test/it-domino-jnx/pom.xml b/test/it-domino-jnx/pom.xml index 12cac0a5..45e3a4ff 100644 --- a/test/it-domino-jnx/pom.xml +++ b/test/it-domino-jnx/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.1 + 1.42.2-SNAPSHOT ../.. it-domino-jnx From e6eea9f259e914f751483d127d98acef232b2f87 Mon Sep 17 00:00:00 2001 From: Jesse Gallagher Date: Fri, 20 Sep 2024 13:48:24 -0400 Subject: [PATCH 3/4] Modify DQLTerm to consider instances equal when they logically are --- domino-jnx-api/src/main/java/com/hcl/domino/dql/DQL.java | 5 +++++ .../test/java/com/hcl/domino/test/dql/TestDQLGenerator.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/domino-jnx-api/src/main/java/com/hcl/domino/dql/DQL.java b/domino-jnx-api/src/main/java/com/hcl/domino/dql/DQL.java index cadebfd1..08b83dfb 100644 --- a/domino-jnx-api/src/main/java/com/hcl/domino/dql/DQL.java +++ b/domino-jnx-api/src/main/java/com/hcl/domino/dql/DQL.java @@ -126,6 +126,11 @@ public static abstract class DQLTerm { */ @Override public abstract String toString(); + + @Override + public boolean equals(Object obj) { + return obj != null && getClass().equals(obj.getClass()) && toString().equals(obj.toString()); + } } public static class InViewsOrFoldersTerm extends DQLTerm { diff --git a/domino-jnx-api/src/test/java/com/hcl/domino/test/dql/TestDQLGenerator.java b/domino-jnx-api/src/test/java/com/hcl/domino/test/dql/TestDQLGenerator.java index e2d354e5..2747b360 100644 --- a/domino-jnx-api/src/test/java/com/hcl/domino/test/dql/TestDQLGenerator.java +++ b/domino-jnx-api/src/test/java/com/hcl/domino/test/dql/TestDQLGenerator.java @@ -107,4 +107,9 @@ public void testFormulas() { assertEquals("Bar = 'Baz' and @formula('Foo=''Hello''')", DQL.and(DQL.item("Bar").isEqualTo("Baz"), DQL.formula("Foo='Hello'")).toString()); } + @Test + public void testTermEquivalence() { + assertEquals(DQL.item("Foo").isEqualTo("Bar"), DQL.item("Foo").isEqualTo("Bar")); + } + } From 1414564cbc68acc4b6116ac3c99067959d9c83c9 Mon Sep 17 00:00:00 2001 From: Jesse Gallagher Date: Fri, 20 Sep 2024 13:48:50 -0400 Subject: [PATCH 4/4] Set version to 1.42.2 --- domino-jnx-api/pom.xml | 2 +- domino-jnx-commons/pom.xml | 2 +- domino-jnx-console/pom.xml | 2 +- domino-jnx-jna/pom.xml | 2 +- example/jnx-example-domino-servlet/pom.xml | 2 +- example/jnx-example-domino-webapp-admin/pom.xml | 2 +- example/jnx-example-gluon/pom.xml | 2 +- example/jnx-example-graalvm-native/pom.xml | 2 +- example/jnx-example-runjava/pom.xml | 2 +- example/jnx-example-swt/pom.xml | 2 +- example/jnx-example-webapp/pom.xml | 2 +- integration/domino-jnx-jakarta-security/pom.xml | 2 +- integration/domino-jnx-jsonb/pom.xml | 2 +- integration/domino-jnx-lsxbeshim/pom.xml | 2 +- integration/domino-jnx-rawdoc-json/pom.xml | 2 +- integration/domino-jnx-vertx-json/pom.xml | 2 +- integration/domino-jnx-xpages/pom.xml | 2 +- pom.xml | 2 +- test/it-domino-jnx/pom.xml | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/domino-jnx-api/pom.xml b/domino-jnx-api/pom.xml index 9d4424e6..c95ab846 100644 --- a/domino-jnx-api/pom.xml +++ b/domino-jnx-api/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.2-SNAPSHOT + 1.42.2 domino-jnx-api HCL Domino API diff --git a/domino-jnx-commons/pom.xml b/domino-jnx-commons/pom.xml index 89d5e82b..be397721 100644 --- a/domino-jnx-commons/pom.xml +++ b/domino-jnx-commons/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.2-SNAPSHOT + 1.42.2 domino-jnx-commons HCL Domino API Common Code diff --git a/domino-jnx-console/pom.xml b/domino-jnx-console/pom.xml index dc47f59d..1d704343 100644 --- a/domino-jnx-console/pom.xml +++ b/domino-jnx-console/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.2-SNAPSHOT + 1.42.2 domino-jnx-console HCL Domino API Server Controller Connector diff --git a/domino-jnx-jna/pom.xml b/domino-jnx-jna/pom.xml index f831acbf..57e3f9fd 100644 --- a/domino-jnx-jna/pom.xml +++ b/domino-jnx-jna/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.2-SNAPSHOT + 1.42.2 domino-jnx-jna HCL Domino API, JNA Implementation diff --git a/example/jnx-example-domino-servlet/pom.xml b/example/jnx-example-domino-servlet/pom.xml index cc1c137f..ea3ec010 100644 --- a/example/jnx-example-domino-servlet/pom.xml +++ b/example/jnx-example-domino-servlet/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.2-SNAPSHOT + 1.42.2 ../.. jnx-example-domino-servlet diff --git a/example/jnx-example-domino-webapp-admin/pom.xml b/example/jnx-example-domino-webapp-admin/pom.xml index eb85e8be..875ab5f7 100644 --- a/example/jnx-example-domino-webapp-admin/pom.xml +++ b/example/jnx-example-domino-webapp-admin/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.2-SNAPSHOT + 1.42.2 ../.. jnx-example-domino-webapp-admin diff --git a/example/jnx-example-gluon/pom.xml b/example/jnx-example-gluon/pom.xml index daf18523..927fd3d1 100644 --- a/example/jnx-example-gluon/pom.xml +++ b/example/jnx-example-gluon/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.2-SNAPSHOT + 1.42.2 ../.. jnx-example-gluon diff --git a/example/jnx-example-graalvm-native/pom.xml b/example/jnx-example-graalvm-native/pom.xml index b12dc832..ad8c0ba5 100644 --- a/example/jnx-example-graalvm-native/pom.xml +++ b/example/jnx-example-graalvm-native/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.2-SNAPSHOT + 1.42.2 ../.. jnx-example-graalvm-native diff --git a/example/jnx-example-runjava/pom.xml b/example/jnx-example-runjava/pom.xml index 378c33e7..7bcd2239 100644 --- a/example/jnx-example-runjava/pom.xml +++ b/example/jnx-example-runjava/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.2-SNAPSHOT + 1.42.2 ../.. jnx-example-runjava diff --git a/example/jnx-example-swt/pom.xml b/example/jnx-example-swt/pom.xml index bbc6e1d6..d642143d 100644 --- a/example/jnx-example-swt/pom.xml +++ b/example/jnx-example-swt/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.2-SNAPSHOT + 1.42.2 ../.. jnx-example-swt diff --git a/example/jnx-example-webapp/pom.xml b/example/jnx-example-webapp/pom.xml index deb8efc3..c68d7337 100644 --- a/example/jnx-example-webapp/pom.xml +++ b/example/jnx-example-webapp/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.2-SNAPSHOT + 1.42.2 ../.. jnx-example-webapp diff --git a/integration/domino-jnx-jakarta-security/pom.xml b/integration/domino-jnx-jakarta-security/pom.xml index a6635844..891745d2 100644 --- a/integration/domino-jnx-jakarta-security/pom.xml +++ b/integration/domino-jnx-jakarta-security/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.2-SNAPSHOT + 1.42.2 ../.. domino-jnx-jakarta-security diff --git a/integration/domino-jnx-jsonb/pom.xml b/integration/domino-jnx-jsonb/pom.xml index 4a537a8b..21e1342f 100644 --- a/integration/domino-jnx-jsonb/pom.xml +++ b/integration/domino-jnx-jsonb/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.2-SNAPSHOT + 1.42.2 ../.. domino-jnx-jsonb diff --git a/integration/domino-jnx-lsxbeshim/pom.xml b/integration/domino-jnx-lsxbeshim/pom.xml index 92adc917..3a3af30f 100644 --- a/integration/domino-jnx-lsxbeshim/pom.xml +++ b/integration/domino-jnx-lsxbeshim/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.2-SNAPSHOT + 1.42.2 ../.. domino-jnx-lsxbeshim diff --git a/integration/domino-jnx-rawdoc-json/pom.xml b/integration/domino-jnx-rawdoc-json/pom.xml index 60ac9e66..6a776f85 100644 --- a/integration/domino-jnx-rawdoc-json/pom.xml +++ b/integration/domino-jnx-rawdoc-json/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.2-SNAPSHOT + 1.42.2 ../.. domino-jnx-rawdoc-json diff --git a/integration/domino-jnx-vertx-json/pom.xml b/integration/domino-jnx-vertx-json/pom.xml index 3a930eb2..81889f3b 100644 --- a/integration/domino-jnx-vertx-json/pom.xml +++ b/integration/domino-jnx-vertx-json/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.2-SNAPSHOT + 1.42.2 ../.. domino-jnx-vertx-json diff --git a/integration/domino-jnx-xpages/pom.xml b/integration/domino-jnx-xpages/pom.xml index 2048361e..6eadc03e 100644 --- a/integration/domino-jnx-xpages/pom.xml +++ b/integration/domino-jnx-xpages/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.2-SNAPSHOT + 1.42.2 ../.. domino-jnx-xpages diff --git a/pom.xml b/pom.xml index 9520b764..72fbb029 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 com.hcl.domino domino-jnx - 1.42.2-SNAPSHOT + 1.42.2 pom HCL Domino API Parent Project Modern Java API for HCL Domino diff --git a/test/it-domino-jnx/pom.xml b/test/it-domino-jnx/pom.xml index 45e3a4ff..add5ea9e 100644 --- a/test/it-domino-jnx/pom.xml +++ b/test/it-domino-jnx/pom.xml @@ -7,7 +7,7 @@ com.hcl.domino domino-jnx - 1.42.2-SNAPSHOT + 1.42.2 ../.. it-domino-jnx