Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
Openfire
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Openfire
Commits
8cde607b
Commit
8cde607b
authored
Oct 27, 2015
by
Christian Schudt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace Arrays.asList() (with 1 arg) with Collections.singletonList().
(for performance reasons)
parent
cce0b3d0
Changes
35
Hide whitespace changes
Inline
Side-by-side
Showing
35 changed files
with
104 additions
and
104 deletions
+104
-104
GetListActiveUsers.java
...esoftware/openfire/commands/admin/GetListActiveUsers.java
+1
-1
GetUsersPresence.java
...ivesoftware/openfire/commands/admin/GetUsersPresence.java
+2
-2
PacketsNotification.java
...software/openfire/commands/admin/PacketsNotification.java
+2
-2
AddGroup.java
.../jivesoftware/openfire/commands/admin/group/AddGroup.java
+5
-5
AddGroupUsers.java
...software/openfire/commands/admin/group/AddGroupUsers.java
+5
-5
DeleteGroup.java
...vesoftware/openfire/commands/admin/group/DeleteGroup.java
+2
-2
DeleteGroupUsers.java
...tware/openfire/commands/admin/group/DeleteGroupUsers.java
+4
-4
GetListGroupUsers.java
...ware/openfire/commands/admin/group/GetListGroupUsers.java
+2
-2
GetListGroups.java
...software/openfire/commands/admin/group/GetListGroups.java
+2
-2
UpdateGroup.java
...vesoftware/openfire/commands/admin/group/UpdateGroup.java
+8
-3
CreateMUCRoom.java
...vesoftware/openfire/commands/admin/muc/CreateMUCRoom.java
+2
-2
AddUser.java
...rg/jivesoftware/openfire/commands/admin/user/AddUser.java
+2
-2
AuthenticateUser.java
...ftware/openfire/commands/admin/user/AuthenticateUser.java
+3
-3
ChangeUserPassword.java
...ware/openfire/commands/admin/user/ChangeUserPassword.java
+2
-2
DeleteUser.java
...jivesoftware/openfire/commands/admin/user/DeleteUser.java
+5
-5
UserProperties.java
...software/openfire/commands/admin/user/UserProperties.java
+4
-4
ChangeSharedSecret.java
...ware/openfire/commands/clearspace/ChangeSharedSecret.java
+2
-2
SystemAdminAdded.java
...ftware/openfire/commands/clearspace/SystemAdminAdded.java
+4
-4
SystemAdminRemoved.java
...ware/openfire/commands/clearspace/SystemAdminRemoved.java
+4
-4
GroupAdminAdded.java
...jivesoftware/openfire/commands/event/GroupAdminAdded.java
+2
-2
GroupAdminRemoved.java
...vesoftware/openfire/commands/event/GroupAdminRemoved.java
+2
-1
GroupCreated.java
...rg/jivesoftware/openfire/commands/event/GroupCreated.java
+1
-2
GroupDeleting.java
...g/jivesoftware/openfire/commands/event/GroupDeleting.java
+1
-2
GroupMemberAdded.java
...ivesoftware/openfire/commands/event/GroupMemberAdded.java
+2
-2
GroupMemberRemoved.java
...esoftware/openfire/commands/event/GroupMemberRemoved.java
+2
-2
GroupModified.java
...g/jivesoftware/openfire/commands/event/GroupModified.java
+2
-2
UserCreated.java
...org/jivesoftware/openfire/commands/event/UserCreated.java
+1
-2
UserDeleting.java
...rg/jivesoftware/openfire/commands/event/UserDeleting.java
+1
-2
UserModified.java
...rg/jivesoftware/openfire/commands/event/UserModified.java
+2
-2
VCardCreated.java
...rg/jivesoftware/openfire/commands/event/VCardCreated.java
+2
-2
VCardDeleting.java
...g/jivesoftware/openfire/commands/event/VCardDeleting.java
+2
-2
VCardModified.java
...g/jivesoftware/openfire/commands/event/VCardModified.java
+2
-2
IQOfflineMessagesHandler.java
...vesoftware/openfire/handler/IQOfflineMessagesHandler.java
+8
-8
PendingSubscriptionsCommand.java
...software/openfire/pubsub/PendingSubscriptionsCommand.java
+2
-2
PubSubEngine.java
src/java/org/jivesoftware/openfire/pubsub/PubSubEngine.java
+11
-13
No files found.
src/java/org/jivesoftware/openfire/commands/admin/GetListActiveUsers.java
View file @
8cde607b
...
@@ -119,7 +119,7 @@ public class GetListActiveUsers extends AdHocCommand {
...
@@ -119,7 +119,7 @@ public class GetListActiveUsers extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
as
List
(
Action
.
complete
);
return
Collections
.
singleton
List
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/admin/GetUsersPresence.java
View file @
8cde607b
...
@@ -29,8 +29,8 @@ import org.xmpp.forms.DataForm;
...
@@ -29,8 +29,8 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.Arrays
;
import
java.util.Collection
;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -119,7 +119,7 @@ public class GetUsersPresence extends AdHocCommand {
...
@@ -119,7 +119,7 @@ public class GetUsersPresence extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
as
List
(
Action
.
complete
);
return
Collections
.
singleton
List
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/admin/PacketsNotification.java
View file @
8cde607b
...
@@ -28,7 +28,7 @@ import org.xmpp.forms.DataForm;
...
@@ -28,7 +28,7 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.
Array
s
;
import
java.util.
Collection
s
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -124,7 +124,7 @@ public class PacketsNotification extends AdHocCommand {
...
@@ -124,7 +124,7 @@ public class PacketsNotification extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
as
List
(
Action
.
complete
);
return
Collections
.
singleton
List
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/admin/group/AddGroup.java
View file @
8cde607b
...
@@ -19,10 +19,6 @@
...
@@ -19,10 +19,6 @@
package
org
.
jivesoftware
.
openfire
.
commands
.
admin
.
group
;
package
org
.
jivesoftware
.
openfire
.
commands
.
admin
.
group
;
import
java.util.Arrays
;
import
java.util.Collection
;
import
java.util.List
;
import
org.dom4j.Element
;
import
org.dom4j.Element
;
import
org.jivesoftware.openfire.commands.AdHocCommand
;
import
org.jivesoftware.openfire.commands.AdHocCommand
;
import
org.jivesoftware.openfire.commands.SessionData
;
import
org.jivesoftware.openfire.commands.SessionData
;
...
@@ -35,6 +31,10 @@ import org.xmpp.forms.DataForm;
...
@@ -35,6 +31,10 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.List
;
/**
/**
* Command that allows to create and configure new goups.
* Command that allows to create and configure new goups.
*
*
...
@@ -188,7 +188,7 @@ public class AddGroup extends AdHocCommand {
...
@@ -188,7 +188,7 @@ public class AddGroup extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
asList
(
AdHocCommand
.
Action
.
complete
);
return
Collections
.
singletonList
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/admin/group/AddGroupUsers.java
View file @
8cde607b
...
@@ -19,10 +19,6 @@
...
@@ -19,10 +19,6 @@
package
org
.
jivesoftware
.
openfire
.
commands
.
admin
.
group
;
package
org
.
jivesoftware
.
openfire
.
commands
.
admin
.
group
;
import
java.util.Arrays
;
import
java.util.Collection
;
import
java.util.List
;
import
org.dom4j.Element
;
import
org.dom4j.Element
;
import
org.jivesoftware.openfire.commands.AdHocCommand
;
import
org.jivesoftware.openfire.commands.AdHocCommand
;
import
org.jivesoftware.openfire.commands.SessionData
;
import
org.jivesoftware.openfire.commands.SessionData
;
...
@@ -35,6 +31,10 @@ import org.xmpp.forms.DataForm;
...
@@ -35,6 +31,10 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.List
;
/**
/**
* Command that allows to add members or admins to a given group.
* Command that allows to add members or admins to a given group.
*
*
...
@@ -130,7 +130,7 @@ public class AddGroupUsers extends AdHocCommand {
...
@@ -130,7 +130,7 @@ public class AddGroupUsers extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
asList
(
AdHocCommand
.
Action
.
complete
);
return
Collections
.
singletonList
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/admin/group/DeleteGroup.java
View file @
8cde607b
...
@@ -28,7 +28,7 @@ import org.jivesoftware.openfire.group.GroupNotFoundException;
...
@@ -28,7 +28,7 @@ import org.jivesoftware.openfire.group.GroupNotFoundException;
import
org.xmpp.forms.DataForm
;
import
org.xmpp.forms.DataForm
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
java.util.
Array
s
;
import
java.util.
Collection
s
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -98,7 +98,7 @@ public class DeleteGroup extends AdHocCommand {
...
@@ -98,7 +98,7 @@ public class DeleteGroup extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
asList
(
AdHocCommand
.
Action
.
complete
);
return
Collections
.
singletonList
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/admin/group/DeleteGroupUsers.java
View file @
8cde607b
...
@@ -19,9 +19,6 @@
...
@@ -19,9 +19,6 @@
package
org
.
jivesoftware
.
openfire
.
commands
.
admin
.
group
;
package
org
.
jivesoftware
.
openfire
.
commands
.
admin
.
group
;
import
java.util.Arrays
;
import
java.util.List
;
import
org.dom4j.Element
;
import
org.dom4j.Element
;
import
org.jivesoftware.openfire.commands.AdHocCommand
;
import
org.jivesoftware.openfire.commands.AdHocCommand
;
import
org.jivesoftware.openfire.commands.SessionData
;
import
org.jivesoftware.openfire.commands.SessionData
;
...
@@ -34,6 +31,9 @@ import org.xmpp.forms.DataForm;
...
@@ -34,6 +31,9 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.Collections
;
import
java.util.List
;
/**
/**
* Command that allows to delete members or admins from a given group.
* Command that allows to delete members or admins from a given group.
*
*
...
@@ -119,7 +119,7 @@ public class DeleteGroupUsers extends AdHocCommand {
...
@@ -119,7 +119,7 @@ public class DeleteGroupUsers extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
asList
(
AdHocCommand
.
Action
.
complete
);
return
Collections
.
singletonList
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/admin/group/GetListGroupUsers.java
View file @
8cde607b
...
@@ -29,7 +29,7 @@ import org.xmpp.forms.DataForm;
...
@@ -29,7 +29,7 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.
Array
s
;
import
java.util.
Collection
s
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -110,7 +110,7 @@ public class GetListGroupUsers extends AdHocCommand {
...
@@ -110,7 +110,7 @@ public class GetListGroupUsers extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
asList
(
AdHocCommand
.
Action
.
complete
);
return
Collections
.
singletonList
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/admin/group/GetListGroups.java
View file @
8cde607b
...
@@ -28,7 +28,7 @@ import org.jivesoftware.openfire.roster.RosterManager;
...
@@ -28,7 +28,7 @@ import org.jivesoftware.openfire.roster.RosterManager;
import
org.xmpp.forms.DataForm
;
import
org.xmpp.forms.DataForm
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
java.util.
Array
s
;
import
java.util.
Collection
s
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -155,7 +155,7 @@ public class GetListGroups extends AdHocCommand {
...
@@ -155,7 +155,7 @@ public class GetListGroups extends AdHocCommand {
@Override
@Override
protected
List
<
AdHocCommand
.
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
AdHocCommand
.
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
asList
(
AdHocCommand
.
Action
.
complete
);
return
Collections
.
singletonList
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/admin/group/UpdateGroup.java
View file @
8cde607b
...
@@ -28,7 +28,12 @@ import org.jivesoftware.openfire.group.GroupNotFoundException;
...
@@ -28,7 +28,12 @@ import org.jivesoftware.openfire.group.GroupNotFoundException;
import
org.xmpp.forms.DataForm
;
import
org.xmpp.forms.DataForm
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
java.util.*
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.StringTokenizer
;
/**
/**
* Command that allows to update a given group.
* Command that allows to update a given group.
...
@@ -213,12 +218,12 @@ public class UpdateGroup extends AdHocCommand {
...
@@ -213,12 +218,12 @@ public class UpdateGroup extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
if
(
data
.
getStage
()
==
0
)
{
if
(
data
.
getStage
()
==
0
)
{
return
Arrays
.
asList
(
AdHocCommand
.
Action
.
next
);
return
Collections
.
singletonList
(
Action
.
next
);
}
}
else
if
(
data
.
getStage
()
==
1
)
{
else
if
(
data
.
getStage
()
==
1
)
{
return
Arrays
.
asList
(
AdHocCommand
.
Action
.
next
,
AdHocCommand
.
Action
.
prev
,
AdHocCommand
.
Action
.
complete
);
return
Arrays
.
asList
(
AdHocCommand
.
Action
.
next
,
AdHocCommand
.
Action
.
prev
,
AdHocCommand
.
Action
.
complete
);
}
}
return
Arrays
.
asList
(
AdHocCommand
.
Action
.
complete
);
return
Collections
.
singletonList
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/admin/muc/CreateMUCRoom.java
View file @
8cde607b
...
@@ -30,8 +30,8 @@ import org.xmpp.forms.DataForm;
...
@@ -30,8 +30,8 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.Arrays
;
import
java.util.Collection
;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -167,7 +167,7 @@ public class CreateMUCRoom extends AdHocCommand {
...
@@ -167,7 +167,7 @@ public class CreateMUCRoom extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
asList
(
AdHocCommand
.
Action
.
complete
);
return
Collections
.
singletonList
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/admin/user/AddUser.java
View file @
8cde607b
...
@@ -31,7 +31,7 @@ import org.xmpp.forms.DataForm;
...
@@ -31,7 +31,7 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.
Array
s
;
import
java.util.
Collection
s
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -168,7 +168,7 @@ public class AddUser extends AdHocCommand {
...
@@ -168,7 +168,7 @@ public class AddUser extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
asList
(
AdHocCommand
.
Action
.
complete
);
return
Collections
.
singletonList
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/admin/user/AuthenticateUser.java
View file @
8cde607b
...
@@ -22,9 +22,9 @@ package org.jivesoftware.openfire.commands.admin.user;
...
@@ -22,9 +22,9 @@ package org.jivesoftware.openfire.commands.admin.user;
import
org.dom4j.Element
;
import
org.dom4j.Element
;
import
org.jivesoftware.openfire.XMPPServer
;
import
org.jivesoftware.openfire.XMPPServer
;
import
org.jivesoftware.openfire.auth.AuthFactory
;
import
org.jivesoftware.openfire.auth.AuthFactory
;
import
org.jivesoftware.openfire.auth.UnauthorizedException
;
import
org.jivesoftware.openfire.auth.ConnectionException
;
import
org.jivesoftware.openfire.auth.ConnectionException
;
import
org.jivesoftware.openfire.auth.InternalUnauthenticatedException
;
import
org.jivesoftware.openfire.auth.InternalUnauthenticatedException
;
import
org.jivesoftware.openfire.auth.UnauthorizedException
;
import
org.jivesoftware.openfire.commands.AdHocCommand
;
import
org.jivesoftware.openfire.commands.AdHocCommand
;
import
org.jivesoftware.openfire.commands.SessionData
;
import
org.jivesoftware.openfire.commands.SessionData
;
import
org.jivesoftware.openfire.component.InternalComponentManager
;
import
org.jivesoftware.openfire.component.InternalComponentManager
;
...
@@ -35,7 +35,7 @@ import org.xmpp.forms.DataForm;
...
@@ -35,7 +35,7 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.
Array
s
;
import
java.util.
Collection
s
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -142,7 +142,7 @@ public class AuthenticateUser extends AdHocCommand {
...
@@ -142,7 +142,7 @@ public class AuthenticateUser extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
asList
(
AdHocCommand
.
Action
.
complete
);
return
Collections
.
singletonList
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/admin/user/ChangeUserPassword.java
View file @
8cde607b
...
@@ -30,7 +30,7 @@ import org.xmpp.forms.DataForm;
...
@@ -30,7 +30,7 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.
Array
s
;
import
java.util.
Collection
s
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -118,7 +118,7 @@ public class ChangeUserPassword extends AdHocCommand {
...
@@ -118,7 +118,7 @@ public class ChangeUserPassword extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
asList
(
AdHocCommand
.
Action
.
complete
);
return
Collections
.
singletonList
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/admin/user/DeleteUser.java
View file @
8cde607b
...
@@ -19,10 +19,6 @@
...
@@ -19,10 +19,6 @@
*/
*/
package
org
.
jivesoftware
.
openfire
.
commands
.
admin
.
user
;
package
org
.
jivesoftware
.
openfire
.
commands
.
admin
.
user
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.Map
;
import
org.dom4j.Element
;
import
org.dom4j.Element
;
import
org.jivesoftware.openfire.XMPPServer
;
import
org.jivesoftware.openfire.XMPPServer
;
import
org.jivesoftware.openfire.commands.AdHocCommand
;
import
org.jivesoftware.openfire.commands.AdHocCommand
;
...
@@ -35,6 +31,10 @@ import org.xmpp.forms.DataForm;
...
@@ -35,6 +31,10 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.Map
;
/**
/**
* Delete a user from Openfire if the provider is not read-only. See
* Delete a user from Openfire if the provider is not read-only. See
* <a href="http://www.xmpp.org/extensions/xep-0133.html#delete-user">Service Administration:
* <a href="http://www.xmpp.org/extensions/xep-0133.html#delete-user">Service Administration:
...
@@ -122,7 +122,7 @@ public class DeleteUser extends AdHocCommand {
...
@@ -122,7 +122,7 @@ public class DeleteUser extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
asList
(
AdHocCommand
.
Action
.
complete
);
return
Collections
.
singletonList
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/admin/user/UserProperties.java
View file @
8cde607b
...
@@ -19,17 +19,17 @@
...
@@ -19,17 +19,17 @@
*/
*/
package
org
.
jivesoftware
.
openfire
.
commands
.
admin
.
user
;
package
org
.
jivesoftware
.
openfire
.
commands
.
admin
.
user
;
import
org.dom4j.Element
;
import
org.jivesoftware.openfire.commands.AdHocCommand
;
import
org.jivesoftware.openfire.commands.AdHocCommand
;
import
org.jivesoftware.openfire.commands.SessionData
;
import
org.jivesoftware.openfire.commands.SessionData
;
import
org.jivesoftware.openfire.user.UserManager
;
import
org.jivesoftware.openfire.user.User
;
import
org.jivesoftware.openfire.user.User
;
import
org.
dom4j.Element
;
import
org.
jivesoftware.openfire.user.UserManager
;
import
org.xmpp.forms.DataForm
;
import
org.xmpp.forms.DataForm
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Arrays
;
/**
/**
* An adhoc command to retrieve the properties of the user.
* An adhoc command to retrieve the properties of the user.
...
@@ -120,7 +120,7 @@ public class UserProperties extends AdHocCommand {
...
@@ -120,7 +120,7 @@ public class UserProperties extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
asList
(
AdHocCommand
.
Action
.
complete
);
return
Collections
.
singletonList
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/clearspace/ChangeSharedSecret.java
View file @
8cde607b
...
@@ -28,7 +28,7 @@ import org.xmpp.forms.DataForm;
...
@@ -28,7 +28,7 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.
Array
s
;
import
java.util.
Collection
s
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -122,7 +122,7 @@ public class ChangeSharedSecret extends AdHocCommand {
...
@@ -122,7 +122,7 @@ public class ChangeSharedSecret extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
as
List
(
Action
.
complete
);
return
Collections
.
singleton
List
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/clearspace/SystemAdminAdded.java
View file @
8cde607b
...
@@ -16,18 +16,18 @@
...
@@ -16,18 +16,18 @@
package
org
.
jivesoftware
.
openfire
.
commands
.
clearspace
;
package
org
.
jivesoftware
.
openfire
.
commands
.
clearspace
;
import
org.dom4j.Element
;
import
org.jivesoftware.openfire.admin.AdminManager
;
import
org.jivesoftware.openfire.commands.AdHocCommand
;
import
org.jivesoftware.openfire.commands.AdHocCommand
;
import
org.jivesoftware.openfire.commands.SessionData
;
import
org.jivesoftware.openfire.commands.SessionData
;
import
org.jivesoftware.openfire.admin.AdminManager
;
import
org.jivesoftware.openfire.component.InternalComponentManager
;
import
org.jivesoftware.openfire.component.InternalComponentManager
;
import
org.dom4j.Element
;
import
org.xmpp.forms.DataForm
;
import
org.xmpp.forms.DataForm
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Arrays
;
/**
/**
* Notifies that a new system administrator has been added.
* Notifies that a new system administrator has been added.
...
@@ -98,7 +98,7 @@ public class SystemAdminAdded extends AdHocCommand {
...
@@ -98,7 +98,7 @@ public class SystemAdminAdded extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
as
List
(
Action
.
complete
);
return
Collections
.
singleton
List
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/clearspace/SystemAdminRemoved.java
View file @
8cde607b
...
@@ -16,18 +16,18 @@
...
@@ -16,18 +16,18 @@
package
org
.
jivesoftware
.
openfire
.
commands
.
clearspace
;
package
org
.
jivesoftware
.
openfire
.
commands
.
clearspace
;
import
org.dom4j.Element
;
import
org.jivesoftware.openfire.admin.AdminManager
;
import
org.jivesoftware.openfire.commands.AdHocCommand
;
import
org.jivesoftware.openfire.commands.AdHocCommand
;
import
org.jivesoftware.openfire.commands.SessionData
;
import
org.jivesoftware.openfire.commands.SessionData
;
import
org.jivesoftware.openfire.admin.AdminManager
;
import
org.jivesoftware.openfire.component.InternalComponentManager
;
import
org.jivesoftware.openfire.component.InternalComponentManager
;
import
org.dom4j.Element
;
import
org.xmpp.forms.DataForm
;
import
org.xmpp.forms.DataForm
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Arrays
;
/**
/**
* Notifies that a user has had its system administrator status revoked.
* Notifies that a user has had its system administrator status revoked.
...
@@ -98,7 +98,7 @@ public class SystemAdminRemoved extends AdHocCommand {
...
@@ -98,7 +98,7 @@ public class SystemAdminRemoved extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
as
List
(
Action
.
complete
);
return
Collections
.
singleton
List
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/event/GroupAdminAdded.java
View file @
8cde607b
...
@@ -31,7 +31,7 @@ import org.xmpp.forms.DataForm;
...
@@ -31,7 +31,7 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.
Array
s
;
import
java.util.
Collection
s
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -140,7 +140,7 @@ public class GroupAdminAdded extends AdHocCommand {
...
@@ -140,7 +140,7 @@ public class GroupAdminAdded extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
as
List
(
Action
.
complete
);
return
Collections
.
singleton
List
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/event/GroupAdminRemoved.java
View file @
8cde607b
...
@@ -32,6 +32,7 @@ import org.xmpp.forms.FormField;
...
@@ -32,6 +32,7 @@ import org.xmpp.forms.FormField;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -140,7 +141,7 @@ public class GroupAdminRemoved extends AdHocCommand {
...
@@ -140,7 +141,7 @@ public class GroupAdminRemoved extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
as
List
(
Action
.
complete
);
return
Collections
.
singleton
List
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/event/GroupCreated.java
View file @
8cde607b
...
@@ -31,7 +31,6 @@ import org.xmpp.forms.DataForm;
...
@@ -31,7 +31,6 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -117,7 +116,7 @@ public class GroupCreated extends AdHocCommand {
...
@@ -117,7 +116,7 @@ public class GroupCreated extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
as
List
(
Action
.
complete
);
return
Collections
.
singleton
List
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/event/GroupDeleting.java
View file @
8cde607b
...
@@ -31,7 +31,6 @@ import org.xmpp.forms.DataForm;
...
@@ -31,7 +31,6 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -117,7 +116,7 @@ public class GroupDeleting extends AdHocCommand {
...
@@ -117,7 +116,7 @@ public class GroupDeleting extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
as
List
(
Action
.
complete
);
return
Collections
.
singleton
List
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/event/GroupMemberAdded.java
View file @
8cde607b
...
@@ -31,7 +31,7 @@ import org.xmpp.forms.DataForm;
...
@@ -31,7 +31,7 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.
Array
s
;
import
java.util.
Collection
s
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -140,7 +140,7 @@ public class GroupMemberAdded extends AdHocCommand {
...
@@ -140,7 +140,7 @@ public class GroupMemberAdded extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
as
List
(
Action
.
complete
);
return
Collections
.
singleton
List
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/event/GroupMemberRemoved.java
View file @
8cde607b
...
@@ -31,7 +31,7 @@ import org.xmpp.forms.DataForm;
...
@@ -31,7 +31,7 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.
Array
s
;
import
java.util.
Collection
s
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -140,7 +140,7 @@ public class GroupMemberRemoved extends AdHocCommand {
...
@@ -140,7 +140,7 @@ public class GroupMemberRemoved extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
as
List
(
Action
.
complete
);
return
Collections
.
singleton
List
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/event/GroupModified.java
View file @
8cde607b
...
@@ -31,7 +31,7 @@ import org.xmpp.forms.DataForm;
...
@@ -31,7 +31,7 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.
Array
s
;
import
java.util.
Collection
s
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -188,7 +188,7 @@ public class GroupModified extends AdHocCommand {
...
@@ -188,7 +188,7 @@ public class GroupModified extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
as
List
(
Action
.
complete
);
return
Collections
.
singleton
List
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/event/UserCreated.java
View file @
8cde607b
...
@@ -31,7 +31,6 @@ import org.xmpp.forms.DataForm;
...
@@ -31,7 +31,6 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -118,7 +117,7 @@ public class UserCreated extends AdHocCommand {
...
@@ -118,7 +117,7 @@ public class UserCreated extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
as
List
(
Action
.
complete
);
return
Collections
.
singleton
List
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/event/UserDeleting.java
View file @
8cde607b
...
@@ -31,7 +31,6 @@ import org.xmpp.forms.DataForm;
...
@@ -31,7 +31,6 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -115,7 +114,7 @@ public class UserDeleting extends AdHocCommand {
...
@@ -115,7 +114,7 @@ public class UserDeleting extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
as
List
(
Action
.
complete
);
return
Collections
.
singleton
List
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/event/UserModified.java
View file @
8cde607b
...
@@ -31,7 +31,7 @@ import org.xmpp.forms.DataForm;
...
@@ -31,7 +31,7 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.
Array
s
;
import
java.util.
Collection
s
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -194,7 +194,7 @@ public class UserModified extends AdHocCommand {
...
@@ -194,7 +194,7 @@ public class UserModified extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
as
List
(
Action
.
complete
);
return
Collections
.
singleton
List
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/event/VCardCreated.java
View file @
8cde607b
...
@@ -29,7 +29,7 @@ import org.xmpp.forms.DataForm;
...
@@ -29,7 +29,7 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.
Array
s
;
import
java.util.
Collection
s
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -112,7 +112,7 @@ public class VCardCreated extends AdHocCommand {
...
@@ -112,7 +112,7 @@ public class VCardCreated extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
as
List
(
Action
.
complete
);
return
Collections
.
singleton
List
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/event/VCardDeleting.java
View file @
8cde607b
...
@@ -29,7 +29,7 @@ import org.xmpp.forms.DataForm;
...
@@ -29,7 +29,7 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.
Array
s
;
import
java.util.
Collection
s
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -112,7 +112,7 @@ public class VCardDeleting extends AdHocCommand {
...
@@ -112,7 +112,7 @@ public class VCardDeleting extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
as
List
(
Action
.
complete
);
return
Collections
.
singleton
List
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/commands/event/VCardModified.java
View file @
8cde607b
...
@@ -29,7 +29,7 @@ import org.xmpp.forms.DataForm;
...
@@ -29,7 +29,7 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.
Array
s
;
import
java.util.
Collection
s
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -112,7 +112,7 @@ public class VCardModified extends AdHocCommand {
...
@@ -112,7 +112,7 @@ public class VCardModified extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
as
List
(
Action
.
complete
);
return
Collections
.
singleton
List
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/handler/IQOfflineMessagesHandler.java
View file @
8cde607b
...
@@ -20,13 +20,6 @@
...
@@ -20,13 +20,6 @@
package
org
.
jivesoftware
.
openfire
.
handler
;
package
org
.
jivesoftware
.
openfire
.
handler
;
import
java.text.ParseException
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Date
;
import
java.util.Iterator
;
import
java.util.List
;
import
org.dom4j.DocumentHelper
;
import
org.dom4j.DocumentHelper
;
import
org.dom4j.Element
;
import
org.dom4j.Element
;
import
org.jivesoftware.openfire.IQHandlerInfo
;
import
org.jivesoftware.openfire.IQHandlerInfo
;
...
@@ -52,6 +45,13 @@ import org.xmpp.packet.IQ;
...
@@ -52,6 +45,13 @@ import org.xmpp.packet.IQ;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.PacketError
;
import
org.xmpp.packet.PacketError
;
import
java.text.ParseException
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.Date
;
import
java.util.Iterator
;
import
java.util.List
;
/**
/**
* Implements JEP-0013: Flexible Offline Message Retrieval. Allows users to request number of
* Implements JEP-0013: Flexible Offline Message Retrieval. Allows users to request number of
* messages, request message headers, retrieve specific messages, remove specific messages,
* messages, request message headers, retrieve specific messages, remove specific messages,
...
@@ -156,7 +156,7 @@ public class IQOfflineMessagesHandler extends IQHandler implements ServerFeature
...
@@ -156,7 +156,7 @@ public class IQOfflineMessagesHandler extends IQHandler implements ServerFeature
}
}
public
Iterator
<
String
>
getFeatures
(
String
name
,
String
node
,
JID
senderJID
)
{
public
Iterator
<
String
>
getFeatures
(
String
name
,
String
node
,
JID
senderJID
)
{
return
Arrays
.
as
List
(
NAMESPACE
).
iterator
();
return
Collections
.
singleton
List
(
NAMESPACE
).
iterator
();
}
}
public
DataForm
getExtendedInfo
(
String
name
,
String
node
,
JID
senderJID
)
{
public
DataForm
getExtendedInfo
(
String
name
,
String
node
,
JID
senderJID
)
{
...
...
src/java/org/jivesoftware/openfire/pubsub/PendingSubscriptionsCommand.java
View file @
8cde607b
...
@@ -27,7 +27,7 @@ import org.xmpp.forms.DataForm;
...
@@ -27,7 +27,7 @@ import org.xmpp.forms.DataForm;
import
org.xmpp.forms.FormField
;
import
org.xmpp.forms.FormField
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
java.util.
Array
s
;
import
java.util.
Collection
s
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -120,7 +120,7 @@ public class PendingSubscriptionsCommand extends AdHocCommand {
...
@@ -120,7 +120,7 @@ public class PendingSubscriptionsCommand extends AdHocCommand {
@Override
@Override
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
protected
List
<
Action
>
getActions
(
SessionData
data
)
{
return
Arrays
.
as
List
(
Action
.
complete
);
return
Collections
.
singleton
List
(
Action
.
complete
);
}
}
@Override
@Override
...
...
src/java/org/jivesoftware/openfire/pubsub/PubSubEngine.java
View file @
8cde607b
...
@@ -20,17 +20,6 @@
...
@@ -20,17 +20,6 @@
package
org
.
jivesoftware
.
openfire
.
pubsub
;
package
org
.
jivesoftware
.
openfire
.
pubsub
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.HashSet
;
import
java.util.Iterator
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.concurrent.ConcurrentHashMap
;
import
org.dom4j.DocumentHelper
;
import
org.dom4j.DocumentHelper
;
import
org.dom4j.Element
;
import
org.dom4j.Element
;
import
org.dom4j.QName
;
import
org.dom4j.QName
;
...
@@ -53,9 +42,18 @@ import org.xmpp.packet.IQ;
...
@@ -53,9 +42,18 @@ import org.xmpp.packet.IQ;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.JID
;
import
org.xmpp.packet.Message
;
import
org.xmpp.packet.Message
;
import
org.xmpp.packet.PacketError
;
import
org.xmpp.packet.PacketError
;
import
org.xmpp.packet.PacketError.Condition
;
import
org.xmpp.packet.Presence
;
import
org.xmpp.packet.Presence
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.HashSet
;
import
java.util.Iterator
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.concurrent.ConcurrentHashMap
;
/**
/**
* A PubSubEngine is responsible for handling packets sent to a pub-sub service.
* A PubSubEngine is responsible for handling packets sent to a pub-sub service.
*
*
...
@@ -1841,7 +1839,7 @@ public class PubSubEngine {
...
@@ -1841,7 +1839,7 @@ public class PubSubEngine {
return
Collections
.
emptyList
();
return
Collections
.
emptyList
();
}
}
// User is connected at specified resource so answer list with presence show value
// User is connected at specified resource so answer list with presence show value
return
Arrays
.
as
List
(
show
);
return
Collections
.
singleton
List
(
show
);
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment