Delete TypedCloneable

smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java

@@ -22,11 +22,11 @@ import java.util.Locale;
 
 import javax.xml.namespace.QName;
 
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.util.EqualsUtil;
 import org.jivesoftware.smack.util.HashCode;
 import org.jivesoftware.smack.util.Objects;
 import org.jivesoftware.smack.util.StringUtils;
-import org.jivesoftware.smack.util.TypedCloneable;
 import org.jivesoftware.smack.util.XmlStringBuilder;
 
 import org.jxmpp.jid.Jid;
@@ -58,7 +58,7 @@ import org.jxmpp.stringprep.XmppStringprepException;
  * @author Matt Tucker
  */
 public final class Message extends MessageOrPresence<MessageBuilder>
-                implements MessageView, TypedCloneable<Message> {
+                implements MessageView {
 
     public static final String ELEMENT = "message";
     public static final String BODY = "body";
@@ -371,6 +371,16 @@ public final class Message extends MessageOrPresence<MessageBuilder>
         return StanzaBuilder.buildMessageFrom(this, getStanzaId());
     }
 
+    @Override
+    public MessageBuilder asBuilder(String id) {
+        return StanzaBuilder.buildMessageFrom(this, id);
+    }
+
+    @Override
+    public MessageBuilder asBuilder(XMPPConnection connection) {
+        return connection.getStanzaFactory().buildMessageStanzaFrom(this);
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -409,7 +419,10 @@ public final class Message extends MessageOrPresence<MessageBuilder>
      * instance.
      * </p>
      * @return a clone of this message.
+     * @deprecated use {@link #asBuilder()} instead.
      */
+    // TODO: Remove in Smack 4.5.
+    @Deprecated
     @Override
     public Message clone() {
         return new Message(this);

smack-core/src/main/java/org/jivesoftware/smack/packet/MessageOrPresence.java

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2019 Florian Schmaus
+ * Copyright 2019-2020 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,6 +16,8 @@
  */
 package org.jivesoftware.smack.packet;
 
+import org.jivesoftware.smack.XMPPConnection;
+
 public abstract class MessageOrPresence<MPB extends MessageOrPresenceBuilder<?, ?>> extends Stanza {
 
     @Deprecated
@@ -33,4 +35,8 @@ public abstract class MessageOrPresence<MPB extends MessageOrPresenceBuilder<?,
 
     public abstract MPB asBuilder();
 
+    public abstract MPB asBuilder(String id);
+
+    public abstract MPB asBuilder(XMPPConnection connection);
+
 }

smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java

@@ -20,9 +20,9 @@ package org.jivesoftware.smack.packet;
 import java.util.List;
 import java.util.Locale;
 
+import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.util.Objects;
 import org.jivesoftware.smack.util.StringUtils;
-import org.jivesoftware.smack.util.TypedCloneable;
 import org.jivesoftware.smack.util.XmlStringBuilder;
 
 import org.jxmpp.jid.Jid;
@@ -61,7 +61,7 @@ import org.jxmpp.jid.Jid;
  * @author Matt Tucker
  */
 public final class Presence extends MessageOrPresence<PresenceBuilder>
-                implements PresenceView, TypedCloneable<Presence> {
+                implements PresenceView {
 
     public static final String ELEMENT = "presence";
 
@@ -282,6 +282,16 @@ public final class Presence extends MessageOrPresence<PresenceBuilder>
         return StanzaBuilder.buildPresenceFrom(this, getStanzaId());
     }
 
+    @Override
+    public PresenceBuilder asBuilder(String id) {
+        return StanzaBuilder.buildPresenceFrom(this, id);
+    }
+
+    @Override
+    public PresenceBuilder asBuilder(XMPPConnection connection) {
+        return connection.getStanzaFactory().buildPresenceStanzaFrom(this);
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -343,7 +353,10 @@ public final class Presence extends MessageOrPresence<PresenceBuilder>
      * instance.
      * </p>
      * @return a clone of this presence.
+     * @deprecated use {@link #asBuilder()} instead.
      */
+    // TODO: Remove in Smack 4.5.
+    @Deprecated
     @Override
     public Presence clone() {
         return new Presence(this);
@@ -354,7 +367,10 @@ public final class Presence extends MessageOrPresence<PresenceBuilder>
      *
      * @return a "clone" of this presence  with a different stanza ID.
      * @since 4.1.2
+     * @deprecated use {@link #asBuilder(XMPPConnection)} or {@link #asBuilder(String)}instead.
      */
+    // TODO: Remove in Smack 4.5.
+    @Deprecated
     public Presence cloneWithNewId() {
         Presence clone = clone();
         clone.setNewStanzaId();

smack-core/src/main/java/org/jivesoftware/smack/util/MultiMap.java

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright © 2015-2019 Florian Schmaus
+ * Copyright © 2015-2020 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ import java.util.Set;
  * @param <K> the type of the keys the map uses.
  * @param <V> the type of the values the map uses.
  */
-public class MultiMap<K, V> implements TypedCloneable<MultiMap<K, V>> {
+public class MultiMap<K, V> {
 
     /**
      * The constant value {@value}.

smack-core/src/main/java/org/jivesoftware/smack/util/TypedCloneable.java

@@ -1,34 +0,0 @@
-/**
- *
- * Copyright 2015 Florian Schmaus
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jivesoftware.smack.util;
-
-/**
- * An extended version of {@link java.lang.Cloneable}, which defines a generic {@link #clone()}
- * method.
- *
- * @param <T> the type returned by {@link #clone()}.
- */
-public interface TypedCloneable<T> extends Cloneable {
-
-    /**
-     * Clone this instance.
-     *
-     * @return a cloned version of this instance.
-     */
-    T clone();
-
-}

smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java

@@ -962,8 +962,9 @@ public final class ServiceDiscoveryManager extends Manager {
             // to respect ConnectionConfiguration.isSendPresence()
             final Presence presenceSend = this.presenceSend;
             if (connection.isAuthenticated() && presenceSend != null) {
+                Presence presence = presenceSend.asBuilder(connection).build();
                 try {
-                    connection.sendStanza(presenceSend.cloneWithNewId());
+                    connection.sendStanza(presence);
                 }
                 catch (InterruptedException | NotConnectedException e) {
                     LOGGER.log(Level.WARNING, "Could could not update presence with caps info", e);

smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java

@@ -30,7 +30,6 @@ import org.jivesoftware.smack.packet.IqData;
 import org.jivesoftware.smack.util.EqualsUtil;
 import org.jivesoftware.smack.util.HashCode;
 import org.jivesoftware.smack.util.StringUtils;
-import org.jivesoftware.smack.util.TypedCloneable;
 import org.jivesoftware.smack.util.XmlStringBuilder;
 
 import org.jxmpp.util.XmppStringUtils;
@@ -44,7 +43,7 @@ import org.jxmpp.util.XmppStringUtils;
  *
  * @author Gaston Dombiak
  */
-public class DiscoverInfo extends IQ implements DiscoverInfoView, TypedCloneable<DiscoverInfo> {
+public class DiscoverInfo extends IQ implements DiscoverInfoView {
 
     public static final String ELEMENT = QUERY_ELEMENT;
     public static final String NAMESPACE = "http://jabber.org/protocol/disco#info";
@@ -303,7 +302,13 @@ public class DiscoverInfo extends IQ implements DiscoverInfoView, TypedCloneable
         return new DiscoverInfoBuilder(this, stanzaId);
     }
 
-    // TODO: Deprecate in favor of asBuilder().
+    /**
+     * Deprecated, do not use.
+     *
+     * @deprecated use {@link #asBuilder(String)} instead.
+     */
+    // TODO: Remove in Smack 4.5.
+    @Deprecated
     @Override
     public DiscoverInfo clone() {
         return new DiscoverInfo(this);
@@ -516,7 +521,7 @@ public class DiscoverInfo extends IQ implements DiscoverInfoView, TypedCloneable
      * as well as specific feature types of interest, if any (e.g., for the purpose of feature
      * negotiation).
      */
-    public static final class Feature implements TypedCloneable<Feature> {
+    public static final class Feature {
 
         private final String variable;
 
@@ -566,11 +571,6 @@ public class DiscoverInfo extends IQ implements DiscoverInfoView, TypedCloneable
             return variable.hashCode();
         }
 
-        @Override
-        public Feature clone() {
-            return new Feature(this);
-        }
-
         @Override
         public String toString() {
             return toXML().toString();

smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MucEnterConfiguration.java

@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2015-2016 Florian Schmaus
+ * Copyright 2015-2020 Florian Schmaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,15 +60,17 @@ public final class MucEnterConfiguration {
         since = builder.since;
         timeout = builder.timeout;
 
+        final PresenceBuilder joinPresenceBuilder;
         if (builder.joinPresence == null) {
-            joinPresence = builder.joinPresenceBuilder.ofType(Presence.Type.available).build();
+            joinPresenceBuilder = builder.joinPresenceBuilder.ofType(Presence.Type.available);
         }
         else {
-            joinPresence = builder.joinPresence.clone();
+            joinPresenceBuilder = builder.joinPresence.asBuilder();
         }
         // Indicate the the client supports MUC
-        joinPresence.addExtension(new MUCInitialPresence(password, maxChars, maxStanzas, seconds,
+        joinPresenceBuilder.addExtension(new MUCInitialPresence(password, maxChars, maxStanzas, seconds,
                         since));
+        joinPresence = joinPresenceBuilder.build();
     }
 
     Presence getJoinPresence(MultiUserChat multiUserChat) {
@@ -92,6 +94,8 @@ public final class MucEnterConfiguration {
         private long timeout;
 
         private final PresenceBuilder joinPresenceBuilder;
+
+        // TODO: Remove in Smack 4.5.
         private Presence joinPresence;
 
         Builder(Resourcepart nickname, XMPPConnection connection) {

smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java

@@ -1047,7 +1047,7 @@ public final class Roster extends Manager {
             }
             if (presence == null) {
                 if (unavailable != null) {
-                    return unavailable.clone();
+                    return unavailable;
                 }
                 else {
                     presence = synthesizeUnvailablePresence(jid);
@@ -1055,7 +1055,7 @@ public final class Roster extends Manager {
                 }
             }
             else {
-                return presence.clone();
+                return presence;
             }
         }
     }
@@ -1084,7 +1084,7 @@ public final class Roster extends Manager {
                 return presence;
             }
             else {
-                return presence.clone();
+                return presence;
             }
         }
     }
@@ -1107,7 +1107,7 @@ public final class Roster extends Manager {
         } else {
             res = new ArrayList<>(userPresences.values().size());
             for (Presence presence : userPresences.values()) {
-                res.add(presence.clone());
+                res.add(presence);
             }
         }
         return res;
@@ -1156,7 +1156,7 @@ public final class Roster extends Manager {
             Presence unavailable = null;
             for (Presence presence : userPresences.values()) {
                 if (presence.isAvailable()) {
-                    answer.add(presence.clone());
+                    answer.add(presence);
                 }
                 else {
                     unavailable = presence;
@@ -1166,7 +1166,7 @@ public final class Roster extends Manager {
                 res = answer;
             }
             else if (unavailable != null) {
-                res = Arrays.asList(unavailable.clone());
+                res = Arrays.asList(unavailable);
             }
             else {
                 Presence presence = synthesizeUnvailablePresence(jid);