vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-29 23:42:06 +01:00
Code Issues Releases Wiki Activity

Create org.jivesoftware.smack.rosterstore package

Browse source 
and move RosterStore and DirectoryRosterStore into it.
This commit is contained in:
Florian Schmaus 2014-08-16 14:26:45 +02:00
parent e32a437c49
commit c84419a55e
8 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java
View file

@ -49,6 +49,7 @@ import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Presence; import org.jivesoftware.smack.packet.Presence;
import org.jivesoftware.smack.packet.Session; import org.jivesoftware.smack.packet.Session;
import org.jivesoftware.smack.rosterstore.RosterStore;
public abstract class AbstractXMPPConnection implements XMPPConnection { public abstract class AbstractXMPPConnection implements XMPPConnection {
private static final Logger LOGGER = Logger.getLogger(AbstractXMPPConnection.class.getName()); private static final Logger LOGGER = Logger.getLogger(AbstractXMPPConnection.class.getName());

1
smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
View file

@ -19,6 +19,7 @@ package org.jivesoftware.smack;
import org.jivesoftware.smack.packet.Session; import org.jivesoftware.smack.packet.Session;
import org.jivesoftware.smack.proxy.ProxyInfo; import org.jivesoftware.smack.proxy.ProxyInfo;
import org.jivesoftware.smack.rosterstore.RosterStore;
import org.jivesoftware.smack.util.DNSUtil; import org.jivesoftware.smack.util.DNSUtil;
import org.jivesoftware.smack.util.StringUtils; import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smack.util.dns.HostAddress; import org.jivesoftware.smack.util.dns.HostAddress;

1
smack-core/src/main/java/org/jivesoftware/smack/Roster.java
View file

@ -46,6 +46,7 @@ import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Presence; import org.jivesoftware.smack.packet.Presence;
import org.jivesoftware.smack.packet.RosterPacket; import org.jivesoftware.smack.packet.RosterPacket;
import org.jivesoftware.smack.packet.RosterPacket.Item; import org.jivesoftware.smack.packet.RosterPacket.Item;
import org.jivesoftware.smack.rosterstore.RosterStore;
import org.jxmpp.util.XmppStringUtils; import org.jxmpp.util.XmppStringUtils;
/** /**

1
smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
View file

@ -23,6 +23,7 @@ import org.jivesoftware.smack.filter.IQReplyFilter;
import org.jivesoftware.smack.filter.PacketFilter; import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.rosterstore.RosterStore;
/** /**
* The abstract XMPPConnection class provides an interface for connections to a XMPP server and * The abstract XMPPConnection class provides an interface for connections to a XMPP server and

2
smack-core/src/main/java/org/jivesoftware/smack/DirectoryRosterStore.java → smack-core/src/main/java/org/jivesoftware/smack/rosterstore/DirectoryRosterStore.java
View file

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.jivesoftware.smack; package org.jivesoftware.smack.rosterstore;
import java.io.File; import java.io.File;
import java.io.FileFilter; import java.io.FileFilter;

6
smack-core/src/main/java/org/jivesoftware/smack/RosterStore.java → smack-core/src/main/java/org/jivesoftware/smack/rosterstore/RosterStore.java
View file

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.jivesoftware.smack; package org.jivesoftware.smack.rosterstore;
import java.util.Collection; import java.util.Collection;
@ -29,13 +29,13 @@ public interface RosterStore {
/** /**
* This method returns a collection of all roster items contained in this store. * This method returns a collection of all roster items contained in this store.
* @return List of {@link RosterEntry} * @return List of {@link org.jivesoftware.smack.RosterEntry}
*/ */
public Collection<RosterPacket.Item> getEntries(); public Collection<RosterPacket.Item> getEntries();
/** /**
* This method returns the roster item in this store for the given JID. * This method returns the roster item in this store for the given JID.
* @param bareJid The bare JID of the RosterEntry * @param bareJid The bare JID of the RosterEntry
* @return The {@link RosterEntry} which belongs to that user * @return The {@link org.jivesoftware.smack.RosterEntry} which belongs to that user
*/ */
public RosterPacket.Item getEntry(String bareJid); public RosterPacket.Item getEntry(String bareJid);
/** /**

2
smack-core/src/test/java/org/jivesoftware/smack/RosterVersioningTest.java
View file

@ -32,6 +32,8 @@ import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.RosterPacket; import org.jivesoftware.smack.packet.RosterPacket;
import org.jivesoftware.smack.packet.RosterPacket.Item; import org.jivesoftware.smack.packet.RosterPacket.Item;
import org.jivesoftware.smack.packet.RosterPacket.ItemType; import org.jivesoftware.smack.packet.RosterPacket.ItemType;
import org.jivesoftware.smack.rosterstore.DirectoryRosterStore;
import org.jivesoftware.smack.rosterstore.RosterStore;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;

2
smack-core/src/test/java/org/jivesoftware/smack/DirectoryRosterStoreTest.java → smack-core/src/test/java/org/jivesoftware/smack/rosterstore/DirectoryRosterStoreTest.java
View file

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.jivesoftware.smack; package org.jivesoftware.smack.rosterstore;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;