/**
 *
 * Copyright 2003-2007 Jive Software.
 *
 * 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.smackx.muc;

import org.jivesoftware.smackx.disco.packet.DiscoverItems;
import org.jxmpp.jid.Jid;

/**
 * Hosted rooms by a chat service may be discovered if they are configured to appear in the room
 * directory . The information that may be discovered is the XMPP address of the room and the room
 * name. The address of the room may be used for obtaining more detailed information
 * {@link org.jivesoftware.smackx.muc.MultiUserChatManager#getRoomInfo(org.jxmpp.jid.EntityBareJid)}
 * or could be used for joining the room
 * {@link org.jivesoftware.smackx.muc.MultiUserChatManager#getMultiUserChat(org.jxmpp.jid.EntityBareJid)}
 * and {@link org.jivesoftware.smackx.muc.MultiUserChat#join(org.jxmpp.jid.parts.Resourcepart)}.
 *
 * @author Gaston Dombiak
 */
public class HostedRoom {

    private final Jid jid;

    private final String name;

    public HostedRoom(DiscoverItems.Item item) {
        jid = item.getEntityID();
        name = item.getName();
    }

    /**
     * Returns the XMPP address of the hosted room by the chat service. This address may be used
     * when creating a <code>MultiUserChat</code> when joining a room.
     *
     * @return the XMPP address of the hosted room by the chat service.
     */
    public Jid getJid() {
        return jid;
    }

    /**
     * Returns the name of the room.
     *
     * @return the name of the room.
     */
    public String getName() {
        return name;
    }
}

@@ -638,16 +638,60 @@
 x.muc;%0A%0A
+import org.jivesoftware.smack.util.Objects;%0A
 import o
@@ -762,16 +762,26 @@
 mpp.jid.
+EntityBare
 Jid;%0A%0A/*
@@ -1486,16 +1486,26 @@
 e final 
+EntityBare
 Jid jid;
@@ -1505,16 +1505,16 @@
 id jid;%0A
-
 %0A    pri
@@ -1605,25 +1605,151 @@
 d = 
-item.getEntityID(
+Objects.requireNonNull(item.getEntityID().asEntityBareJidIfPossible(),%0A                        %22The discovered item must be an entity bare JID%22
 );%0A 
@@ -2059,16 +2059,26 @@
  public 
+EntityBare
 Jid getJ

Improve HostedRoom API