From e9bd5ed5e3b94177198303dae8ef27c3fc8ab3eb Mon Sep 17 00:00:00 2001 From: paweldomas Date: Mon, 22 Feb 2016 14:33:05 -0600 Subject: Moves HealthCheckIQ to separate IQ provider. --- .../extensions/colibri/ColibriIQProvider.java | 26 ------ .../jabber/extensions/colibri/HealthCheckIQ.java | 48 ----------- .../jabber/extensions/health/HealthCheckIQ.java | 49 +++++++++++ .../extensions/health/HealthCheckIQProvider.java | 94 ++++++++++++++++++++++ 4 files changed, 143 insertions(+), 74 deletions(-) delete mode 100644 src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/HealthCheckIQ.java create mode 100644 src/net/java/sip/communicator/impl/protocol/jabber/extensions/health/HealthCheckIQ.java create mode 100644 src/net/java/sip/communicator/impl/protocol/jabber/extensions/health/HealthCheckIQProvider.java (limited to 'src/net/java/sip/communicator') diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriIQProvider.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriIQProvider.java index 0507c1c..4298b3f 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriIQProvider.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriIQProvider.java @@ -900,32 +900,6 @@ public class ColibriIQProvider } } } - else if (HealthCheckIQ.ELEMENT_NAME.equals(parser.getName()) - && HealthCheckIQ.NAMESPACE.equals(namespace)) - { - String rootElement = parser.getName(); - - iq = new HealthCheckIQ(); - - boolean done = false; - - while (!done) - { - switch (parser.next()) - { - case XmlPullParser.END_TAG: - { - String name = parser.getName(); - - if (rootElement.equals(name)) - { - done = true; - } - break; - } - } - } - } else iq = null; diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/HealthCheckIQ.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/HealthCheckIQ.java deleted file mode 100644 index 1ce8a6f..0000000 --- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/HealthCheckIQ.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Jitsi, the OpenSource Java VoIP and Instant Messaging client. - * - * Copyright @ 2015 Atlassian Pty Ltd - * - * 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 net.java.sip.communicator.impl.protocol.jabber.extensions.colibri; - -import org.jivesoftware.smack.packet.*; - -/** - * The health check IQ used to trigger health checks on the Jitsi Videobridge. - * - * @author Pawel Domas - */ -public class HealthCheckIQ - extends IQ -{ - /** - * Health check IQ element name. - */ - final static public String ELEMENT_NAME = "healthcheck"; - - /** - * XML namespace name for health check IQs. - */ - final static public String NAMESPACE = ColibriConferenceIQ.NAMESPACE; - - /** - * {@inheritDoc} - */ - @Override - public String getChildElementXML() - { - return "<" + ELEMENT_NAME + " xmlns='" + NAMESPACE + "' />"; - } -} diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/health/HealthCheckIQ.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/health/HealthCheckIQ.java new file mode 100644 index 0000000..661bb1b --- /dev/null +++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/health/HealthCheckIQ.java @@ -0,0 +1,49 @@ +/* + * Jitsi, the OpenSource Java VoIP and Instant Messaging client. + * + * Copyright @ 2015 Atlassian Pty Ltd + * + * 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 net.java.sip.communicator.impl.protocol.jabber.extensions.health; + +import org.jivesoftware.smack.packet.*; + +/** + * The health check IQ used to trigger health checks on the Jitsi Videobridge. + * + * @author Pawel Domas + */ +public class HealthCheckIQ + extends IQ +{ + /** + * Health check IQ element name. + */ + final static public String ELEMENT_NAME = "healthcheck"; + + /** + * XML namespace name for health check IQs. + */ + final static public String NAMESPACE + = "http://jitsi.org/protocol/healthcheck"; + + /** + * {@inheritDoc} + */ + @Override + public String getChildElementXML() + { + return "<" + ELEMENT_NAME + " xmlns='" + NAMESPACE + "' />"; + } +} diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/health/HealthCheckIQProvider.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/health/HealthCheckIQProvider.java new file mode 100644 index 0000000..9c2903d --- /dev/null +++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/health/HealthCheckIQProvider.java @@ -0,0 +1,94 @@ +/* + * Jitsi, the OpenSource Java VoIP and Instant Messaging client. + * + * Copyright @ 2015 Atlassian Pty Ltd + * + * 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 net.java.sip.communicator.impl.protocol.jabber.extensions.health; + +import net.java.sip.communicator.service.protocol.jabber.*; + +import org.jivesoftware.smack.packet.*; +import org.jivesoftware.smack.provider.*; + +import org.xmlpull.v1.*; + +/** + * The IQProvider for {@link HealthCheckIQ}. + * + * @author Pawel Domas + */ +public class HealthCheckIQProvider + implements IQProvider +{ + /** + * Registers HealthCheckIQProvider as an IQProvider + * in {@link AbstractSmackInteroperabilityLayer}. + */ + public static void registerIQProvider() + { + AbstractSmackInteroperabilityLayer smackInteropLayer = + AbstractSmackInteroperabilityLayer.getInstance(); + + // ColibriStatsIQ + smackInteropLayer.addIQProvider( + HealthCheckIQ.ELEMENT_NAME, + HealthCheckIQ.NAMESPACE, + new HealthCheckIQProvider()); + } + + /** + * Parses HealthCheckIQ. + * + * {@inheritDoc} + */ + @Override + public IQ parseIQ(XmlPullParser parser) + throws Exception + { + String namespace = parser.getNamespace(); + IQ iq; + + if (HealthCheckIQ.ELEMENT_NAME.equals(parser.getName()) + && HealthCheckIQ.NAMESPACE.equals(namespace)) + { + String rootElement = parser.getName(); + + iq = new HealthCheckIQ(); + + boolean done = false; + + while (!done) + { + switch (parser.next()) + { + case XmlPullParser.END_TAG: + { + String name = parser.getName(); + + if (rootElement.equals(name)) + { + done = true; + } + break; + } + } + } + } + else + iq = null; + + return iq; + } +} -- cgit v1.1