ref: Reuse parseText. (#91)

jitsi · Feb 10, 2023 · 6c4c83a · 6c4c83a
1 parent f221325
commit 6c4c83a
Show file tree

Hide file tree

Showing 12 changed files with 86 additions and 166 deletions.
diff --git a/src/main/java/org/jitsi/xmpp/extensions/coin/CoinIQProvider.java b/src/main/java/org/jitsi/xmpp/extensions/coin/CoinIQProvider.java
@@ -189,40 +189,4 @@ public CoinIQ parse(XmlPullParser parser, int initialDepth, IqData data, XmlEnvi
 
         return coinIQ;
     }
-
-    /**
-     * Returns the content of the next {@link XmlPullParser.Event#TEXT_CHARACTERS} element that
-     * we encounter in <tt>parser</tt>.
-     *
-     * @param parser the parse that we'll be probing for text.
-     *
-     * @return the content of the next {@link XmlPullParser.Event#TEXT_CHARACTERS} element we
-     * come across or <tt>null</tt> if we encounter a closing tag first.
-     *
-     * @throws java.lang.Exception if an error occurs parsing the XML.
-     */
-    public static String parseText(XmlPullParser parser)
-        throws XmlPullParserException, IOException, SmackParsingException
-    {
-        boolean done = false;
-
-        XmlPullParser.Event eventType;
-        String text = null;
-
-        while (!done)
-        {
-            eventType = parser.next();
-
-            if (eventType == XmlPullParser.Event.TEXT_CHARACTERS)
-            {
-                text = parser.getText();
-            }
-            else if (eventType == XmlPullParser.Event.END_ELEMENT)
-            {
-                done = true;
-            }
-        }
-
-        return text;
-    }
 }
diff --git a/src/main/java/org/jitsi/xmpp/extensions/coin/ConferenceMediumProvider.java b/src/main/java/org/jitsi/xmpp/extensions/coin/ConferenceMediumProvider.java
@@ -74,13 +74,13 @@ public ConferenceMediumPacketExtension parse(XmlPullParser parser, int depth, Xm
                 switch (elementName)
                 {
                 case MediaPacketExtension.ELEMENT_DISPLAY_TEXT:
-                    ext.setDisplayText(CoinIQProvider.parseText(parser));
+                    ext.setDisplayText(ParsingUtils.parseText(parser));
                     break;
                 case MediaPacketExtension.ELEMENT_STATUS:
-                    ext.setStatus(CoinIQProvider.parseText(parser));
+                    ext.setStatus(ParsingUtils.parseText(parser));
                     break;
                 case MediaPacketExtension.ELEMENT_TYPE:
-                    ext.setType(CoinIQProvider.parseText(parser));
+                    ext.setType(ParsingUtils.parseText(parser));
                     break;
                 }
             }

diff --git a/src/main/java/org/jitsi/xmpp/extensions/coin/DescriptionProvider.java b/src/main/java/org/jitsi/xmpp/extensions/coin/DescriptionProvider.java
@@ -65,13 +65,13 @@ public DescriptionPacketExtension parse(XmlPullParser parser, int depth, XmlEnvi
                 switch (elementName)
                 {
                 case DescriptionPacketExtension.ELEMENT_SUBJECT:
-                    ext.setSubject(CoinIQProvider.parseText(parser));
+                    ext.setSubject(ParsingUtils.parseText(parser));
                     break;
                 case DescriptionPacketExtension.ELEMENT_FREE_TEXT:
-                    ext.setFreeText(CoinIQProvider.parseText(parser));
+                    ext.setFreeText(ParsingUtils.parseText(parser));
                     break;
                 case DescriptionPacketExtension.ELEMENT_DISPLAY_TEXT:
-                    ext.setDisplayText(CoinIQProvider.parseText(parser));
+                    ext.setDisplayText(ParsingUtils.parseText(parser));
                     break;
                 }
             }

diff --git a/src/main/java/org/jitsi/xmpp/extensions/coin/EndpointProvider.java b/src/main/java/org/jitsi/xmpp/extensions/coin/EndpointProvider.java
@@ -79,19 +79,19 @@ public EndpointPacketExtension parse(XmlPullParser parser, int depth, XmlEnviron
                 switch (elementName)
                 {
                 case EndpointPacketExtension.ELEMENT_DISPLAY_TEXT:
-                    ext.setDisplayText(CoinIQProvider.parseText(parser));
+                    ext.setDisplayText(ParsingUtils.parseText(parser));
                     break;
                 case EndpointPacketExtension.ELEMENT_DISCONNECTION:
                     ext.setDisconnectionType(
                         DisconnectionType.parseString(parser.getText()));
                     break;
                 case EndpointPacketExtension.ELEMENT_JOINING:
                     ext.setJoiningType(JoiningType.parseString(
-                        CoinIQProvider.parseText(parser)));
+                        ParsingUtils.parseText(parser)));
                     break;
                 case EndpointPacketExtension.ELEMENT_STATUS:
                     ext.setStatus(EndpointStatusType.parseString(
-                        CoinIQProvider.parseText(parser)));
+                        ParsingUtils.parseText(parser)));
                     break;
                 case CallInfoPacketExtension.ELEMENT:
                 {

diff --git a/src/main/java/org/jitsi/xmpp/extensions/coin/MediaProvider.java b/src/main/java/org/jitsi/xmpp/extensions/coin/MediaProvider.java
@@ -73,19 +73,19 @@ public MediaPacketExtension parse(XmlPullParser parser, int depth, XmlEnvironmen
                 switch (elementName)
                 {
                 case MediaPacketExtension.ELEMENT_DISPLAY_TEXT:
-                    ext.setDisplayText(CoinIQProvider.parseText(parser));
+                    ext.setDisplayText(ParsingUtils.parseText(parser));
                     break;
                 case MediaPacketExtension.ELEMENT_LABEL:
-                    ext.setLabel(CoinIQProvider.parseText(parser));
+                    ext.setLabel(ParsingUtils.parseText(parser));
                     break;
                 case MediaPacketExtension.ELEMENT_SRC_ID:
-                    ext.setSrcID(CoinIQProvider.parseText(parser));
+                    ext.setSrcID(ParsingUtils.parseText(parser));
                     break;
                 case MediaPacketExtension.ELEMENT_STATUS:
-                    ext.setStatus(CoinIQProvider.parseText(parser));
+                    ext.setStatus(ParsingUtils.parseText(parser));
                     break;
                 case MediaPacketExtension.ELEMENT_TYPE:
-                    ext.setType(CoinIQProvider.parseText(parser));
+                    ext.setType(ParsingUtils.parseText(parser));
                     break;
                 }
             }

diff --git a/src/main/java/org/jitsi/xmpp/extensions/coin/ParsingUtils.java b/src/main/java/org/jitsi/xmpp/extensions/coin/ParsingUtils.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright @ 2018 - present 8x8, Inc.
+ *
+ * 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.jitsi.xmpp.extensions.coin;
+
+import org.jivesoftware.smack.parsing.SmackParsingException;
+import org.jivesoftware.smack.xml.XmlPullParser;
+import org.jivesoftware.smack.xml.XmlPullParserException;
+
+import java.io.IOException;
+
+public class ParsingUtils
+{
+    /**
+     * Returns the content of the next {@link XmlPullParser.Event#TEXT_CHARACTERS} element that
+     * we encounter in <tt>parser</tt>.
+     *
+     * @param parser the parse that we'll be probing for text.
+     *
+     * @return the content of the next {@link XmlPullParser.Event#TEXT_CHARACTERS} element we
+     * come across or <tt>null</tt> if we encounter a closing tag first.
+     *
+     * @throws java.lang.Exception if an error occurs parsing the XML.
+     */
+    public static String parseText(XmlPullParser parser)
+            throws XmlPullParserException, IOException, SmackParsingException
+    {
+        boolean done = false;
+
+        XmlPullParser.Event eventType;
+        String text = null;
+
+        while (!done)
+        {
+            eventType = parser.next();
+
+            if (eventType == XmlPullParser.Event.TEXT_CHARACTERS)
+            {
+                text = parser.getText();
+            }
+            else if (eventType == XmlPullParser.Event.END_ELEMENT)
+            {
+                done = true;
+            }
+        }
+
+        return text;
+    }
+}
diff --git a/src/main/java/org/jitsi/xmpp/extensions/coin/StateProvider.java b/src/main/java/org/jitsi/xmpp/extensions/coin/StateProvider.java
@@ -65,16 +65,16 @@ public StatePacketExtension parse(XmlPullParser parser, int depth, XmlEnvironmen
                 if (elementName.equals(StatePacketExtension.ELEMENT_ACTIVE))
                 {
                     ext.setActive(
-                            Boolean.parseBoolean(CoinIQProvider.parseText(parser)) ? 1 : 0);
+                            Boolean.parseBoolean(ParsingUtils.parseText(parser)) ? 1 : 0);
                 }
                 else if (elementName.equals(StatePacketExtension.ELEMENT_LOCKED))
                 {
                     ext.setLocked(
-                            Boolean.parseBoolean(CoinIQProvider.parseText(parser)) ? 1 : 0);
+                            Boolean.parseBoolean(ParsingUtils.parseText(parser)) ? 1 : 0);
                 }
                 if (elementName.equals(StatePacketExtension.ELEMENT_USER_COUNT))
                 {
-                    ext.setUserCount(Integer.parseInt(CoinIQProvider.parseText(parser)));
+                    ext.setUserCount(Integer.parseInt(ParsingUtils.parseText(parser)));
                 }
             }
             else if (eventType == XmlPullParser.Event.END_ELEMENT)

diff --git a/src/main/java/org/jitsi/xmpp/extensions/coin/UserLanguagesProvider.java b/src/main/java/org/jitsi/xmpp/extensions/coin/UserLanguagesProvider.java
@@ -64,7 +64,7 @@ public UserLanguagesPacketExtension parse(XmlPullParser parser, int depth, XmlEn
                 if (elementName.equals(
                         UserLanguagesPacketExtension.ELEMENT_LANGUAGES))
                 {
-                    ext.setLanguages(CoinIQProvider.parseText(parser));
+                    ext.setLanguages(ParsingUtils.parseText(parser));
                 }
             }
             else if (eventType == XmlPullParser.Event.END_ELEMENT)

diff --git a/src/main/java/org/jitsi/xmpp/extensions/coin/UserProvider.java b/src/main/java/org/jitsi/xmpp/extensions/coin/UserProvider.java
@@ -80,7 +80,7 @@ public UserPacketExtension parse(XmlPullParser parser, int depth, XmlEnvironment
             {
                 if (elementName.equals(UserPacketExtension.ELEMENT_DISPLAY_TEXT))
                 {
-                    ext.setDisplayText(CoinIQProvider.parseText(parser));
+                    ext.setDisplayText(ParsingUtils.parseText(parser));
                 }
                 else if (elementName.equals(EndpointPacketExtension.ELEMENT))
                 {

diff --git a/src/main/java/org/jitsi/xmpp/extensions/jingle/ReasonProvider.java b/src/main/java/org/jitsi/xmpp/extensions/jingle/ReasonProvider.java
@@ -15,6 +15,7 @@
  */
 package org.jitsi.xmpp.extensions.jingle;
 
+import org.jitsi.xmpp.extensions.coin.*;
 import org.jivesoftware.smack.packet.*;
 import org.jivesoftware.smack.parsing.*;
 import org.jivesoftware.smack.provider.*;
@@ -74,7 +75,7 @@ public ReasonPacketExtension parse(XmlPullParser parser, int depth, XmlEnvironme
                 else if (elementName.equals(
                                 ReasonPacketExtension.TEXT_ELEMENT))
                 {
-                    text = parseText(parser);
+                    text = ParsingUtils.parseText(parser);
                 }
             }
             else if (eventType == XmlPullParser.Event.END_ELEMENT)
@@ -90,39 +91,4 @@ else if (eventType == XmlPullParser.Event.END_ELEMENT)
 
     }
 
-    /**
-     * Returns the content of the next {@link XmlPullParser.Event#TEXT_CHARACTERS} element that
-     * we encounter in <tt>parser</tt>.
-     *
-     * @param parser the parse that we'll be probing for text.
-     *
-     * @return the content of the next {@link XmlPullParser.Event#TEXT_CHARACTERS} element we
-     * come across or <tt>null</tt> if we encounter a closing tag first.
-     *
-     * @throws java.lang.Exception if an error occurs parsing the XML.
-     */
-    public String parseText(XmlPullParser parser)
-        throws XmlPullParserException, IOException, SmackParsingException
-    {
-        boolean done = false;
-
-        XmlPullParser.Event eventType;
-        String text = null;
-
-        while (!done)
-        {
-            eventType = parser.next();
-
-            if (eventType == XmlPullParser.Event.TEXT_CHARACTERS)
-            {
-                text = parser.getText();
-            }
-            else if (eventType == XmlPullParser.Event.END_ELEMENT)
-            {
-                done = true;
-            }
-        }
-
-        return text;
-    }
 }
diff --git a/src/main/java/org/jitsi/xmpp/extensions/jingle/RedirectProvider.java b/src/main/java/org/jitsi/xmpp/extensions/jingle/RedirectProvider.java
@@ -15,6 +15,7 @@
  */
 package org.jitsi.xmpp.extensions.jingle;
 
+import org.jitsi.xmpp.extensions.coin.*;
 import org.jivesoftware.smack.packet.*;
 import org.jivesoftware.smack.parsing.*;
 import org.jivesoftware.smack.provider.*;
@@ -51,7 +52,7 @@ public RedirectPacketExtension parse(XmlPullParser parser, int depth, XmlEnviron
     {
         String text;
         boolean done = false;
-        text = parseText(parser);
+        text = ParsingUtils.parseText(parser);
 
         while (!done)
         {
@@ -69,41 +70,4 @@ public RedirectPacketExtension parse(XmlPullParser parser, int depth, XmlEnviron
         redirectExt.setRedir(text);
         return redirectExt;
     }
-
-    /**
-     * Returns the content of the next {@link XmlPullParser.Event#TEXT_CHARACTERS} element that
-     * we encounter in <tt>parser</tt>.
-     *
-     * @param parser the parse that we'll be probing for text.
-     *
-     * @return the content of the next {@link XmlPullParser.Event#TEXT_CHARACTERS} element we
-     * come across or <tt>null</tt> if we encounter a closing tag first.
-     *
-     * @throws java.lang.Exception if an error occurs parsing the XML.
-     */
-    public String parseText(XmlPullParser parser)
-        throws XmlPullParserException, IOException, SmackParsingException
-    {
-        boolean done = false;
-
-        XmlPullParser.Event eventType;
-        String text = null;
-
-        while (!done)
-        {
-            eventType = parser.next();
-
-            if (eventType == XmlPullParser.Event.TEXT_CHARACTERS)
-            {
-                text = parser.getText();
-                done = true;
-            }
-            else if (eventType == XmlPullParser.Event.END_ELEMENT)
-            {
-                done = true;
-            }
-        }
-
-        return text;
-    }
 }
diff --git a/src/main/java/org/jitsi/xmpp/extensions/jingleinfo/RelayProvider.java b/src/main/java/org/jitsi/xmpp/extensions/jingleinfo/RelayProvider.java
@@ -15,6 +15,7 @@
  */
 package org.jitsi.xmpp.extensions.jingleinfo;
 
+import org.jitsi.xmpp.extensions.coin.*;
 import org.jivesoftware.smack.packet.*;
 import org.jivesoftware.smack.parsing.*;
 import org.jivesoftware.smack.provider.*;
@@ -69,7 +70,7 @@ public RelayPacketExtension parse(XmlPullParser parser, int depth, XmlEnvironmen
                 }
                 else if (elementName.equals("token"))
                 {
-                    ext.setToken(parseText(parser));
+                    ext.setToken(ParsingUtils.parseText(parser));
                 }
             }
             else if (eventType == XmlPullParser.Event.END_ELEMENT)
@@ -83,40 +84,4 @@ else if (eventType == XmlPullParser.Event.END_ELEMENT)
 
         return ext;
     }
-
-    /**
-     * Returns the content of the next {@link XmlPullParser.Event#TEXT_CHARACTERS} element that
-     * we encounter in <tt>parser</tt>.
-     *
-     * @param parser the parse that we'll be probing for text.
-     *
-     * @return the content of the next {@link XmlPullParser.Event#TEXT_CHARACTERS} element we
-     * come across or <tt>null</tt> if we encounter a closing tag first.
-     *
-     * @throws java.lang.Exception if an error occurs parsing the XML.
-     */
-    public static String parseText(XmlPullParser parser)
-        throws XmlPullParserException, IOException, SmackParsingException
-    {
-        boolean done = false;
-
-        XmlPullParser.Event eventType;
-        String text = null;
-
-        while (!done)
-        {
-            eventType = parser.next();
-
-            if (eventType == XmlPullParser.Event.TEXT_CHARACTERS)
-            {
-                text = parser.getText();
-            }
-            else if (eventType == XmlPullParser.Event.END_ELEMENT)
-            {
-                done = true;
-            }
-        }
-
-        return text;
-    }
 }