Merge pull request igniterealtime#664 from Flowdalic/flow

Flowdalic · web-flow · commit 69a9d6f9658f · 2025-09-02T15:31:11.000Z
Various commits
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
@@ -41,6 +41,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.logging.Level;
@@ -111,7 +112,6 @@
 import org.jivesoftware.smack.sasl.packet.SaslNonza;
 import org.jivesoftware.smack.util.Async;
 import org.jivesoftware.smack.util.CollectionUtil;
-import org.jivesoftware.smack.util.Consumer;
 import org.jivesoftware.smack.util.MultiMap;
 import org.jivesoftware.smack.util.Objects;
 import org.jivesoftware.smack.util.PacketParserUtils;
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java b/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2014-2020 Florian Schmaus
+ * Copyright 2014-2025 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SmackFuture.java b/smack-core/src/main/java/org/jivesoftware/smack/SmackFuture.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2017-2021 Florian Schmaus
+ * Copyright 2017-2025 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,14 +26,14 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.net.SocketFactory;
 
 import org.jivesoftware.smack.packet.Stanza;
 import org.jivesoftware.smack.util.CallbackRecipient;
-import org.jivesoftware.smack.util.Consumer;
 import org.jivesoftware.smack.util.ExceptionCallback;
 import org.jivesoftware.smack.util.SuccessCallback;
 
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
@@ -18,6 +18,7 @@
 
 import java.net.InetAddress;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 import java.util.function.Predicate;
 
 import javax.xml.namespace.QName;
@@ -39,7 +40,6 @@
 import org.jivesoftware.smack.packet.Stanza;
 import org.jivesoftware.smack.packet.StanzaFactory;
 import org.jivesoftware.smack.packet.XmlElement;
-import org.jivesoftware.smack.util.Consumer;
 import org.jivesoftware.smack.util.XmppElementUtil;
 
 import org.jxmpp.JxmppContext;
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/c2s/internal/ModularXmppClientToServerConnectionInternal.java b/smack-core/src/main/java/org/jivesoftware/smack/c2s/internal/ModularXmppClientToServerConnectionInternal.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2020-2024 Florian Schmaus
+ * Copyright 2020-2025 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 import java.nio.channels.SelectionKey;
 import java.util.ListIterator;
 import java.util.Queue;
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 import org.jivesoftware.smack.SmackException;
@@ -41,7 +42,6 @@
 import org.jivesoftware.smack.packet.Nonza;
 import org.jivesoftware.smack.packet.TopLevelStreamElement;
 import org.jivesoftware.smack.packet.XmlEnvironment;
-import org.jivesoftware.smack.util.Consumer;
 import org.jivesoftware.smack.util.PacketParserUtils;
 import org.jivesoftware.smack.xml.XmlPullParser;
 import org.jivesoftware.smack.xml.XmlPullParserException;
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/fsm/StateDescriptorGraph.java b/smack-core/src/main/java/org/jivesoftware/smack/fsm/StateDescriptorGraph.java
@@ -28,10 +28,10 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Consumer;
 
 import org.jivesoftware.smack.c2s.ModularXmppClientToServerConnection.DisconnectedStateDescriptor;
 import org.jivesoftware.smack.c2s.internal.ModularXmppClientToServerConnectionInternal;
-import org.jivesoftware.smack.util.Consumer;
 import org.jivesoftware.smack.util.MultiMap;
 
 /**
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/Consumer.java b/smack-core/src/main/java/org/jivesoftware/smack/util/Consumer.java
@@ -16,7 +16,14 @@
  */
 package org.jivesoftware.smack.util;
 
-// TODO: Replace with java.util.function.Consumer once Smack's minimum Android SDK level is 24 or higher.
+/**
+ * Deprecated, use {@link java.util.function.Consumer} instead.
+ *
+ * @param <T> the type of the input to the operation
+ * @deprecated use {@link java.util.function.Consumer} instead.
+ */
+// TODO: Remove in Smack 4.6
+@Deprecated
 public interface Consumer<T> {
 
     void accept(T t);
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/MultiMap.java b/smack-core/src/main/java/org/jivesoftware/smack/util/MultiMap.java
@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Consumer;
 
 /**
  * A lightweight implementation of a MultiMap, that is a Map that is able to hold multiple values for every key.
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2003-2007 Jive Software, 2016-2024 Florian Schmaus.
+ * Copyright 2003-2007 Jive Software, 2016-2025 Florian Schmaus.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
+import java.util.function.Consumer;
 import java.util.regex.Pattern;
 
 /**
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java b/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java
@@ -23,6 +23,7 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
@@ -231,11 +231,7 @@ protected synchronized void closeByLocal(boolean in) throws IOException {
                 connection.sendIqRequestAndWaitForResponse(close);
             }
             catch (Exception e) {
-                // Sadly we are unable to use the IOException(Throwable) constructor because this
-                // constructor is only supported from Android API 9 on.
-                IOException ioException = new IOException();
-                ioException.initCause(e);
-                throw ioException;
+                throw new IOException(e);
             }
 
             this.inputStream.cleanup();
@@ -829,11 +825,7 @@ protected synchronized void writeToXML(DataPacketExtension data) throws IOExcept
                 // close session unless it is already closed
                 if (!this.isClosed) {
                     InBandBytestreamSession.this.close();
-                    // Sadly we are unable to use the IOException(Throwable) constructor because this
-                    // constructor is only supported from Android API 9 on.
-                    IOException ioException = new IOException();
-                    ioException.initCause(e);
-                    throw ioException;
+                    throw new IOException(e);
                 }
             }
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MucEnterConfiguration.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MucEnterConfiguration.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2015-2024 Florian Schmaus
+ * Copyright 2015-2025 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,11 +17,11 @@
 package org.jivesoftware.smackx.muc;
 
 import java.util.Date;
+import java.util.function.Consumer;
 
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.packet.Presence;
 import org.jivesoftware.smack.packet.PresenceBuilder;
-import org.jivesoftware.smack.util.Consumer;
 import org.jivesoftware.smack.util.Objects;
 
 import org.jivesoftware.smackx.muc.packet.MUCInitialPresence;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
@@ -26,6 +26,7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -62,7 +63,6 @@
 import org.jivesoftware.smack.packet.Presence;
 import org.jivesoftware.smack.packet.PresenceBuilder;
 import org.jivesoftware.smack.packet.Stanza;
-import org.jivesoftware.smack.util.Consumer;
 import org.jivesoftware.smack.util.Objects;
 
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PepManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PepManager.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2003-2007 Jive Software, 2015-2024 Florian Schmaus
+ * Copyright 2003-2007 Jive Software, 2015-2025 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -204,16 +204,8 @@ public <E extends ExtensionElement> boolean addPepEventListener(String node, Cla
                         extensionElementType, pepEventListener);
 
         synchronized (pepEventListeners) {
-            if (listenerToCouplingMap.containsKey(pepEventListener)) {
-                return false;
-            }
-            listenerToCouplingMap.put(pepEventListener, pepEventListenerCoupling);
-            /*
-             * TODO: Replace the above with the below using putIfAbsent() if Smack's minimum required Android SDK level
-             * is 24 or higher. PepEventListenerCoupling<?> currentPepEventListenerCoupling =
-             * listenerToCouplingMap.putIfAbsent(pepEventListener, pepEventListenerCoupling); if
-             * (currentPepEventListenerCoupling != null) { return false; }
-             */
+            var currentPepEventListenerCoupling = listenerToCouplingMap.putIfAbsent(pepEventListener, pepEventListenerCoupling);
+            if (currentPepEventListenerCoupling != null) return false;
 
             boolean listenerForNodeExisted = pepEventListeners.put(node, pepEventListenerCoupling);
             if (!listenerForNodeExisted) {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/time/packet/Time.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/time/packet/Time.java
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2003-2007 Jive Software, 2014-2024 Florian Schmaus
+ * Copyright 2003-2007 Jive Software, 2014-2025 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,17 +16,14 @@
  */
 package org.jivesoftware.smackx.time.packet;
 
+import java.time.ZonedDateTime;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.IqData;
-import org.jivesoftware.smack.util.StringUtils;
-
-import org.jxmpp.util.XmppDateTime;
+import org.jivesoftware.smack.util.Objects;
 
 /**
  * A Time IQ packet, which is used by XMPP clients to exchange their respective local
@@ -41,30 +38,22 @@ public class Time extends IQ implements TimeView {
     public static final String NAMESPACE = "urn:xmpp:time";
     public static final String ELEMENT = "time";
 
-    private static final Logger LOGGER = Logger.getLogger(Time.class.getName());
-
-    private final String utc;
-    private final String tzo;
+    private final ZonedDateTime zonedDateTime;
 
     @SuppressWarnings("this-escape")
     public Time(TimeBuilder timeBuilder) {
         super(timeBuilder, ELEMENT, NAMESPACE);
-        utc = timeBuilder.getUtc();
-        tzo = timeBuilder.getTzo();
+        zonedDateTime = timeBuilder.getZonedDateTime();
 
         Type type = getType();
         switch (type) {
         case get:
-            if (utc != null) {
-                throw new IllegalArgumentException("Time requests must not have utc set");
-            }
-            if (tzo != null) {
-                throw new IllegalArgumentException("Time requests must not have tzo set");
+            if (zonedDateTime != null) {
+                throw new IllegalArgumentException("Time requests must not have time set");
             }
             break;
         case result:
-            StringUtils.requireNotNullNorEmpty(utc, "Must have set a utc value");
-            StringUtils.requireNotNullNorEmpty(tzo, "Must have set a tzo value");
+            Objects.requireNonNull(zonedDateTime, "Must have set a time value");
             break;
         case error:
             // Nothing to check.
@@ -74,41 +63,31 @@ public Time(TimeBuilder timeBuilder) {
         }
     }
 
+    @Override
+    public ZonedDateTime getZonedDateTime() {
+        return zonedDateTime;
+    }
+
     /**
      * Returns the local time or <code>null</code> if the time hasn't been set.
      *
      * @return the local time.
+     * @deprecated use {@link #getZonedDateTime()} instead.
      */
+    // TODO: Remove in Smack 4.6
+    @Deprecated
     public Date getTime() {
-        if (utc == null) {
-            return null;
-        }
-        Date date = null;
-        try {
-            date = XmppDateTime.parseDate(utc);
-        }
-        catch (Exception e) {
-            LOGGER.log(Level.SEVERE, "Error getting local time", e);
-        }
-        return date;
-    }
+        if (zonedDateTime == null) return null;
 
-    @Override
-    public String getUtc() {
-        return utc;
-    }
-
-    @Override
-    public String getTzo() {
-        return tzo;
+        return Date.from(zonedDateTime.toInstant());
     }
 
     @Override
     protected IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder buf) {
-        if (utc != null) {
+        if (zonedDateTime != null) {
             buf.rightAngleBracket();
-            buf.element("utc", utc);
-            buf.element("tzo", tzo);
+            buf.element("utc", getUtc());
+            buf.element("tzo", getTzo());
         } else {
             buf.setEmptyElement();
         }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/time/packet/TimeBuilder.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/time/packet/TimeBuilder.java
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/time/packet/TimeView.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/time/packet/TimeView.java
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/time/packet/TimeTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/time/packet/TimeTest.java
diff --git a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/XmppConnectionDescriptor.java b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/XmppConnectionDescriptor.java
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smack/roster/RosterIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smack/roster/RosterIntegrationTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/**`
`2`	`2`	`*`
`3`		`- * Copyright 2014-2020 Florian Schmaus`
	`3`	`+ * Copyright 2014-2025 Florian Schmaus`
`4`	`4`	`*`
`5`	`5`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`6`	`6`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/**`
`2`	`2`	`*`
`3`		`- * Copyright 2003-2007 Jive Software, 2016-2024 Florian Schmaus.`
	`3`	`+ * Copyright 2003-2007 Jive Software, 2016-2025 Florian Schmaus.`
`4`	`4`	`*`
`5`	`5`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`6`	`6`	`* you may not use this file except in compliance with the License.`
`@@ -26,6 +26,7 @@`
`26`	`26`	`import java.util.Iterator;`
`27`	`27`	`import java.util.List;`
`28`	`28`	`import java.util.Random;`
	`29`	`+import java.util.function.Consumer;`
`29`	`30`	`import java.util.regex.Pattern;`
`30`	`31`
`31`	`32`	`/**`