[bugfix] make exist-db 5.x compatible

eXist-db · Oct 23, 2021 · d3720fd · d3720fd
1 parent ef986fc
commit d3720fd
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 16 deletions.
diff --git a/src/main/java/org/exist/jms/replication/subscribe/ReplicationJmsListener.java b/src/main/java/org/exist/jms/replication/subscribe/ReplicationJmsListener.java
@@ -714,7 +714,7 @@ private Collection updateCollectionMetadata(final XmldbURI sourcePath, final Opt
                 permission.setMode(mode.get());
             }
             // Set Create time only
-            createTime.ifPresent(collection::setCreationTime);
+            createTime.ifPresent(collection::setCreated);
 
             broker.saveCollection(txn, collection);
 
@@ -897,7 +897,7 @@ private void updateMetadataCollection(final eXistMessage em) {
                 permission.setMode(mode.get());
             }
 
-            created.ifPresent(collection::setCreationTime);
+            created.ifPresent(collection::setCreated);
 
             // Make persistent
             broker.saveCollection(txn, collection);

diff --git a/src/main/java/org/exist/jms/xquery/management/ManageReceivers.java b/src/main/java/org/exist/jms/xquery/management/ManageReceivers.java
@@ -49,31 +49,31 @@ public class ManageReceivers extends BasicFunction {
                     new QName(START, JmsModule.NAMESPACE_URI, JmsModule.PREFIX), "Start receiver",
                     new SequenceType[]{
                             new FunctionParameterSequenceType(ID, Type.INTEGER, Cardinality.EXACTLY_ONE, RECEIVER_ID),},
-                    new SequenceType(Type.ITEM, Cardinality.EMPTY)
+                    new SequenceType(Type.ITEM, Cardinality.EMPTY_SEQUENCE)
             ),
             new FunctionSignature(
                     new QName(STOP, JmsModule.NAMESPACE_URI, JmsModule.PREFIX), "Stop receiver",
                     new SequenceType[]{
                             new FunctionParameterSequenceType(ID, Type.INTEGER, Cardinality.EXACTLY_ONE, RECEIVER_ID),},
-                    new SequenceType(Type.ITEM, Cardinality.EMPTY)
+                    new SequenceType(Type.ITEM, Cardinality.EMPTY_SEQUENCE)
             ),
             new FunctionSignature(
                     new QName(CLOSE, JmsModule.NAMESPACE_URI, JmsModule.PREFIX), "Close receiver",
                     new SequenceType[]{
                             new FunctionParameterSequenceType(ID, Type.INTEGER, Cardinality.EXACTLY_ONE, RECEIVER_ID),},
-                    new SequenceType(Type.ITEM, Cardinality.EMPTY)
+                    new SequenceType(Type.ITEM, Cardinality.EMPTY_SEQUENCE)
             ),
             new FunctionSignature(
                     new QName(REPORT, JmsModule.NAMESPACE_URI, JmsModule.PREFIX), "Get details of receiver",
                     new SequenceType[]{
                             new FunctionParameterSequenceType(ID, Type.INTEGER, Cardinality.EXACTLY_ONE, RECEIVER_ID),},
-                    new FunctionReturnSequenceType(Type.NODE, Cardinality.ONE, "XML fragment with receiver information")
+                    new FunctionReturnSequenceType(Type.NODE, Cardinality.EXACTLY_ONE, "XML fragment with receiver information")
             ),
             new FunctionSignature(
                     new QName(CLEARREPORT, JmsModule.NAMESPACE_URI, JmsModule.PREFIX), "Clear report",
                     new SequenceType[]{
                             new FunctionParameterSequenceType(ID, Type.INTEGER, Cardinality.EXACTLY_ONE, RECEIVER_ID),},
-                    new FunctionReturnSequenceType(Type.NODE, Cardinality.ONE, "Clear report of receiver")
+                    new FunctionReturnSequenceType(Type.NODE, Cardinality.EXACTLY_ONE, "Clear report of receiver")
             ),};
 
     public ManageReceivers(final XQueryContext context, final FunctionSignature signature) {

diff --git a/src/main/java/org/exist/jms/xquery/messaging/RegisterReceiver.java b/src/main/java/org/exist/jms/xquery/messaging/RegisterReceiver.java
@@ -87,9 +87,10 @@ public Sequence eval(final Sequence[] args, final Sequence contextSequence) thro
             final JmsConfiguration config = new JmsConfiguration();
             config.loadConfiguration(configMap);
 
-            // Remove Request module from expression and xquery context
-            this.getContext().setModule(RequestModule.NAMESPACE_URI, null);
-            context.setModule(RequestModule.NAMESPACE_URI, null);
+            // TODO why was this needed and why did we want to remove it.
+//            // Remove Request module from expression and xquery context
+//            this.getContext().setModule(RequestModule.NAMESPACE_URI, null);
+//            context.setModule(RequestModule.NAMESPACE_URI, null);
 
             // Setup listener, pass correct User object
             // get user via Broker for compatibility < existdb 2.2

diff --git a/src/main/java/org/exist/jms/xquery/messaging/SendMessage.java b/src/main/java/org/exist/jms/xquery/messaging/SendMessage.java
@@ -46,11 +46,11 @@ public class SendMessage extends BasicFunction {
                     new QName("send", MessagingModule.NAMESPACE_URI, MessagingModule.PREFIX),
                     "Send JMS message",
                     new SequenceType[]{
-                            new FunctionParameterSequenceType("content", Type.ITEM, Cardinality.ONE, "Send message to remote server"),
+                            new FunctionParameterSequenceType("content", Type.ITEM, Cardinality.EXACTLY_ONE, "Send message to remote server"),
                             new FunctionParameterSequenceType("jmsMessageProperties", Type.MAP, Cardinality.ZERO_OR_ONE, "Application-defined property values"),
-                            new FunctionParameterSequenceType("jmsConfiguration", Type.MAP, Cardinality.ONE, "JMS configuration settings")
+                            new FunctionParameterSequenceType("jmsConfiguration", Type.MAP, Cardinality.EXACTLY_ONE, "JMS configuration settings")
                     },
-                    new FunctionReturnSequenceType(Type.NODE, Cardinality.ONE, "Confirmation message")
+                    new FunctionReturnSequenceType(Type.NODE, Cardinality.EXACTLY_ONE, "Confirmation message")
             ),
 
     };

diff --git a/src/main/java/org/exist/jms/xquery/replication/ReplicationSwitch.java b/src/main/java/org/exist/jms/xquery/replication/ReplicationSwitch.java
@@ -42,7 +42,7 @@ public class ReplicationSwitch extends BasicFunction {
                     new QName("enable-trigger", ReplicationModule.NAMESPACE_URI, ReplicationModule.PREFIX),
                     "Globally switch on/off the replication trigger", new SequenceType[]{
                     new FunctionParameterSequenceType("newStatus", Type.BOOLEAN, Cardinality.EXACTLY_ONE, "Value true() enables replication."),},
-                    new FunctionReturnSequenceType(Type.EMPTY, Cardinality.ZERO, "")
+                    new FunctionReturnSequenceType(Type.EMPTY, Cardinality.EMPTY_SEQUENCE, "")
             ),};
 
     public ReplicationSwitch(final XQueryContext context, final FunctionSignature signature) {

diff --git a/src/main/java/org/exist/jms/xquery/replication/SyncResource.java b/src/main/java/org/exist/jms/xquery/replication/SyncResource.java
@@ -58,13 +58,13 @@ public class SyncResource extends BasicFunction {
                     new QName("sync", ReplicationModule.NAMESPACE_URI, ReplicationModule.PREFIX),
                     "Synchronize resource", new SequenceType[]{
                     new FunctionParameterSequenceType("path", Type.STRING, Cardinality.EXACTLY_ONE, "Path to resource"),},
-                    new FunctionReturnSequenceType(Type.EMPTY, Cardinality.EMPTY, "No return value")
+                    new FunctionReturnSequenceType(Type.EMPTY, Cardinality.EMPTY_SEQUENCE, "No return value")
             ),
             new FunctionSignature(
                     new QName("sync-metadata", ReplicationModule.NAMESPACE_URI, ReplicationModule.PREFIX),
                     "Synchronize meta data of resource", new SequenceType[]{
                     new FunctionParameterSequenceType("path", Type.STRING, Cardinality.EXACTLY_ONE, "Path to resource"),},
-                    new FunctionReturnSequenceType(Type.EMPTY, Cardinality.EMPTY, "No return value")
+                    new FunctionReturnSequenceType(Type.EMPTY, Cardinality.EMPTY_SEQUENCE, "No return value")
             ),};
 
     public SyncResource(final XQueryContext context, final FunctionSignature signature) {