syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1380208 - in /incubator/syncope/trunk: ./ client/src/main/java/org/apache/syncope/client/mod/ client/src/main/java/org/apache/syncope/client/to/ console/src/main/java/org/apache/syncope/console/pages/ console/src/main/java/org/apache/synco...
Date Mon, 03 Sep 2012 11:26:14 GMT
Author: coheigea
Date: Mon Sep  3 11:26:13 2012
New Revision: 1380208

URL: http://svn.apache.org/viewvc?rev=1380208&view=rev
Log:
Removing a bunch of warnings related to Collections.EMPTY_X

Modified:
    incubator/syncope/trunk/   (props changed)
    incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/mod/MembershipMod.java
    incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/AbstractAttributableTO.java
    incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/ConnInstanceTO.java
    incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/ConnObjectTO.java
    incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/MembershipTO.java
    incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/UserTO.java
    incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/WorkflowFormTO.java
    incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
    incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java
    incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java
    incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
    incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserManagementResultPanel.java
    incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/TaskRestClient.java
    incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
    incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java
    incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractBaseBean.java
    incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ExternalResource.java
    incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MVirAttr.java
    incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/Membership.java
    incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RVirAttr.java
    incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java
    incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserSearchDAOImpl.java
    incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationByResource.java
    incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationManager.java
    incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ConnObjectUtil.java
    incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/NoOpUserWorkflowAdapter.java
    incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupManager.java
    incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupQueryImpl.java
    incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserManager.java
    incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserQueryImpl.java

Propchange: incubator/syncope/trunk/
------------------------------------------------------------------------------
  Merged /incubator/syncope/branches/1_0_X:r1380206

Modified: incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/mod/MembershipMod.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/mod/MembershipMod.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/mod/MembershipMod.java
(original)
+++ incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/mod/MembershipMod.java
Mon Sep  3 11:26:13 2012
@@ -48,12 +48,12 @@ public class MembershipMod extends Abstr
 
     @Override
     public Set<String> getResourcesToBeAdded() {
-        return Collections.EMPTY_SET;
+        return Collections.emptySet();
     }
 
     @Override
     public Set<String> getResourcesToBeRemoved() {
-        return Collections.EMPTY_SET;
+        return Collections.emptySet();
     }
 
     @Override

Modified: incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/AbstractAttributableTO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/AbstractAttributableTO.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/AbstractAttributableTO.java
(original)
+++ incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/AbstractAttributableTO.java
Mon Sep  3 11:26:13 2012
@@ -60,7 +60,7 @@ public abstract class AbstractAttributab
         Map<String, AttributeTO> result;
 
         if (derivedAttributes == null) {
-            result = Collections.EMPTY_MAP;
+            result = Collections.emptyMap();
         } else {
             result = new HashMap<String, AttributeTO>(derivedAttributes.size());
             for (AttributeTO attributeTO : derivedAttributes) {
@@ -77,7 +77,7 @@ public abstract class AbstractAttributab
         Map<String, AttributeTO> result;
 
         if (derivedAttributes == null) {
-            result = Collections.EMPTY_MAP;
+            result = Collections.emptyMap();
         } else {
             result = new HashMap<String, AttributeTO>(virtualAttributes.size());
             for (AttributeTO attributeTO : virtualAttributes) {

Modified: incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/ConnInstanceTO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/ConnInstanceTO.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/ConnInstanceTO.java
(original)
+++ incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/ConnInstanceTO.java
Mon Sep  3 11:26:13 2012
@@ -87,7 +87,7 @@ public class ConnInstanceTO extends Abst
         Map<String, ConnConfProperty> result;
 
         if (getConfiguration() == null) {
-            result = Collections.EMPTY_MAP;
+            result = Collections.emptyMap();
         } else {
             result = new HashMap<String, ConnConfProperty>();
             for (ConnConfProperty prop : getConfiguration()) {

Modified: incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/ConnObjectTO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/ConnObjectTO.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/ConnObjectTO.java
(original)
+++ incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/ConnObjectTO.java
Mon Sep  3 11:26:13 2012
@@ -59,7 +59,7 @@ public class ConnObjectTO extends Abstra
         Map<String, AttributeTO> result;
 
         if (attributes == null) {
-            result = Collections.EMPTY_MAP;
+            result = Collections.emptyMap();
         } else {
             result = new HashMap<String, AttributeTO>(attributes.size());
             for (AttributeTO attributeTO : attributes) {

Modified: incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/MembershipTO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/MembershipTO.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/MembershipTO.java
(original)
+++ incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/MembershipTO.java
Mon Sep  3 11:26:13 2012
@@ -57,7 +57,7 @@ public class MembershipTO extends Abstra
 
     @Override
     public Set<String> getResources() {
-        return Collections.EMPTY_SET;
+        return Collections.emptySet();
     }
 
     @Override

Modified: incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/UserTO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/UserTO.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/UserTO.java
(original)
+++ incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/UserTO.java
Mon Sep  3 11:26:13 2012
@@ -91,7 +91,7 @@ public class UserTO extends AbstractAttr
         Map<Long, MembershipTO> result;
 
         if (getMemberships() == null) {
-            result = Collections.EMPTY_MAP;
+            result = Collections.emptyMap();
         } else {
             result = new HashMap<Long, MembershipTO>(getMemberships().size());
             for (MembershipTO membership : getMemberships()) {

Modified: incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/WorkflowFormTO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/WorkflowFormTO.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/WorkflowFormTO.java
(original)
+++ incubator/syncope/trunk/client/src/main/java/org/apache/syncope/client/to/WorkflowFormTO.java
Mon Sep  3 11:26:13 2012
@@ -125,7 +125,7 @@ public class WorkflowFormTO extends Abst
         Map<String, WorkflowFormPropertyTO> result;
 
         if (getProperties() == null) {
-            result = Collections.EMPTY_MAP;
+            result = Collections.emptyMap();
         } else {
             result = new HashMap<String, WorkflowFormPropertyTO>();
             for (WorkflowFormPropertyTO prop : getProperties()) {

Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
(original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
Mon Sep  3 11:26:13 2012
@@ -254,7 +254,7 @@ class NotificationModalPage extends Base
 
     private List<String> getSchemaNames(final IntMappingType type) {
         if (type == null) {
-            return Collections.EMPTY_LIST;
+            return Collections.emptyList();
         }
 
         switch (type) {
@@ -267,7 +267,7 @@ class NotificationModalPage extends Base
             case Username:
                 return Collections.singletonList("Username");
             default:
-                return Collections.EMPTY_LIST;
+                return Collections.emptyList();
         }
     }
 }

Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java
(original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java
Mon Sep  3 11:26:13 2012
@@ -330,7 +330,7 @@ public class ReportletConfModalPage exte
                                 break;
 
                             default:
-                                choices = Collections.EMPTY_LIST;
+                                choices = Collections.emptyList();
                         }
 
                         panel = new AjaxPalettePanel("value", new PropertyModel<List<String>>(

Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java
(original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java
Mon Sep  3 11:26:13 2012
@@ -594,7 +594,7 @@ public class Schema extends BasePage {
                     break;
 
                 default:
-                    list = Collections.EMPTY_LIST;
+                    list = Collections.emptyList();
             }
 
             return list;

Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
(original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
Mon Sep  3 11:26:13 2012
@@ -250,7 +250,7 @@ public class ResourceMappingPanel extend
                         attrTypes = getAttributeTypes((AttributableType) mappingTypesPanel.getModelObject());
 
                         typesPanel.setChoices(attrTypes);
-                        intAttrNames.setChoices(Collections.EMPTY_LIST);
+                        intAttrNames.setChoices(Collections.emptyList());
 
                         target.add(typesPanel.getField());
                         target.add(intAttrNames.getField());
@@ -382,7 +382,7 @@ public class ResourceMappingPanel extend
         if (resourceTO != null && resourceTO.getConnectorId() != null &&
resourceTO.getConnectorId() > 0) {
             schemaNames = getResourceSchemaNames(resourceTO.getConnectorId(), resourceTO.getConnConfProperties());
         } else {
-            schemaNames = Collections.EMPTY_LIST;
+            schemaNames = Collections.emptyList();
         }
     }
 
@@ -442,7 +442,7 @@ public class ResourceMappingPanel extend
         toBeUpdated.setEnabled(true);
 
         if (type == null || type.getAttributableType() == null) {
-            toBeUpdated.setChoices(Collections.EMPTY_LIST);
+            toBeUpdated.setChoices(Collections.emptyList());
         } else {
 
             switch (type) {
@@ -471,7 +471,7 @@ public class ResourceMappingPanel extend
                 default:
                     toBeUpdated.setRequired(false);
                     toBeUpdated.setEnabled(false);
-                    toBeUpdated.setChoices(Collections.EMPTY_LIST);
+                    toBeUpdated.setChoices(Collections.emptyList());
             }
         }
     }

Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserManagementResultPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserManagementResultPanel.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserManagementResultPanel.java
(original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/UserManagementResultPanel.java
Mon Sep  3 11:26:13 2012
@@ -210,14 +210,14 @@ public class UserManagementResultPanel e
             beforeAttrMap = before.getAttributeMap();
             attributes.addAll(beforeAttrMap.keySet());
         } else {
-            beforeAttrMap = Collections.EMPTY_MAP;
+            beforeAttrMap = Collections.emptyMap();
         }
 
         if (after != null) {
             afterAttrMap = after.getAttributeMap();
             attributes.addAll(afterAttrMap.keySet());
         } else {
-            afterAttrMap = Collections.EMPTY_MAP;
+            afterAttrMap = Collections.emptyMap();
         }
 
         final List<String> profile = new ArrayList<String>();

Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/TaskRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/TaskRestClient.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/TaskRestClient.java
(original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/TaskRestClient.java
Mon Sep  3 11:26:13 2012
@@ -85,7 +85,7 @@ public class TaskRestClient extends Abst
      * @return paginated list.
      */
     public <T extends TaskTO> List<T> listTasks(final Class<T> reference,
final int page, final int size) {
-        List<T> result = Collections.EMPTY_LIST;
+        List<T> result = Collections.emptyList();
 
         if (PropagationTaskTO.class == reference) {
             result = (List<T>) Arrays.asList(SyncopeSession.get().getRestTemplate().getForObject(

Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
(original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
Mon Sep  3 11:26:13 2012
@@ -36,7 +36,7 @@ public class AjaxDropDownChoicePanel<T> 
 
         super(id, name, model);
 
-        field = new DropDownChoice("dropDownChoiceField", model, Collections.EMPTY_LIST,
new ChoiceRenderer());
+        field = new DropDownChoice("dropDownChoiceField", model, Collections.emptyList(),
new ChoiceRenderer());
         add(field.setLabel(new Model(name)).setOutputMarkupId(true));
 
         if (!isReadOnly()) {

Modified: incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java
(original)
+++ incubator/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.java
Mon Sep  3 11:26:13 2012
@@ -34,7 +34,7 @@ public class AjaxTextFieldPanel extends 
 
     private static final long serialVersionUID = 238940918106696068L;
 
-    private List<String> choices = Collections.EMPTY_LIST;
+    private List<String> choices = Collections.emptyList();
 
     public AjaxTextFieldPanel(final String id, final String name, final IModel<String>
model) {
 

Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractBaseBean.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractBaseBean.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractBaseBean.java
(original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractBaseBean.java
Mon Sep  3 11:26:13 2012
@@ -91,8 +91,8 @@ public abstract class AbstractBaseBean i
         PropertyDescriptor[] propertyDescriptors = BeanUtils.getPropertyDescriptors(getClass());
         for (int i = 0; i < propertyDescriptors.length; i++) {
 
-            if (propertyDescriptors[i].getPropertyType().isInstance(Collections.EMPTY_SET)
-                    || propertyDescriptors[i].getPropertyType().isInstance(Collections.EMPTY_LIST))
{
+            if (propertyDescriptors[i].getPropertyType().isInstance(Collections.emptySet())
+                    || propertyDescriptors[i].getPropertyType().isInstance(Collections.emptyList()))
{
 
                 excludeFields.add(propertyDescriptors[i].getName());
             }

Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ExternalResource.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ExternalResource.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ExternalResource.java
(original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/ExternalResource.java
Mon Sep  3 11:26:13 2012
@@ -323,7 +323,7 @@ public class ExternalResource extends Ab
     }
 
     public Set<ConnConfProperty> getConfiguration() {
-        Set<ConnConfProperty> result = Collections.EMPTY_SET;
+        Set<ConnConfProperty> result = Collections.emptySet();
 
         Set<ConnConfProperty> deserializedSet;
         if (StringUtils.isNotBlank(xmlConfiguration)) {

Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MVirAttr.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MVirAttr.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MVirAttr.java
(original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MVirAttr.java
Mon Sep  3 11:26:13 2012
@@ -65,6 +65,6 @@ public class MVirAttr extends AbstractVi
 
     @Override
     public List<String> getValues() {
-        return Collections.EMPTY_LIST;
+        return Collections.emptyList();
     }
 }

Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/Membership.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/Membership.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/Membership.java
(original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/Membership.java
Mon Sep  3 11:26:13 2012
@@ -75,7 +75,7 @@ public class Membership extends Abstract
 
     @Override
     protected Set<ExternalResource> resources() {
-        return Collections.EMPTY_SET;
+        return Collections.emptySet();
     }
 
     public SyncopeRole getSyncopeRole() {
@@ -189,12 +189,12 @@ public class Membership extends Abstract
 
     @Override
     public Set<ExternalResource> getResources() {
-        return Collections.EMPTY_SET;
+        return Collections.emptySet();
     }
 
     @Override
     public Set<String> getResourceNames() {
-        return Collections.EMPTY_SET;
+        return Collections.emptySet();
     }
 
     @Override

Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RVirAttr.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RVirAttr.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RVirAttr.java
(original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RVirAttr.java
Mon Sep  3 11:26:13 2012
@@ -64,6 +64,6 @@ public class RVirAttr extends AbstractVi
 
     @Override
     public List<String> getValues() {
-        return Collections.EMPTY_LIST;
+        return Collections.emptyList();
     }
 }

Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java
(original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java
Mon Sep  3 11:26:13 2012
@@ -126,7 +126,7 @@ public class UserDAOImpl extends Abstrac
         UDerSchema schema = derSchemaDAO.find(schemaName, UDerSchema.class);
         if (schema == null) {
             LOG.error("Invalid schema name '{}'", schemaName);
-            return Collections.EMPTY_LIST;
+            return Collections.emptyList();
         }
 
         // query string
@@ -170,7 +170,7 @@ public class UserDAOImpl extends Abstrac
         USchema schema = schemaDAO.find(schemaName, USchema.class);
         if (schema == null) {
             LOG.error("Invalid schema name '{}'", schemaName);
-            return Collections.EMPTY_LIST;
+            return Collections.emptyList();
         }
 
         final String entityName = schema.isUniqueConstraint()

Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserSearchDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserSearchDAOImpl.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserSearchDAOImpl.java
(original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserSearchDAOImpl.java
Mon Sep  3 11:26:13 2012
@@ -127,7 +127,7 @@ public class UserSearchDAOImpl extends A
     public List<SyncopeUser> search(
             final Set<Long> adminRoles, final NodeCond searchCondition, final int page,
final int itemsPerPage) {
 
-        List<SyncopeUser> result = Collections.EMPTY_LIST;
+        List<SyncopeUser> result = Collections.emptyList();
 
         if (adminRoles != null && (!adminRoles.isEmpty() || roleDAO.findAll().isEmpty()))
{
             LOG.debug("Search condition:\n{}", searchCondition);

Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationByResource.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationByResource.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationByResource.java
(original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationByResource.java
Mon Sep  3 11:26:13 2012
@@ -165,7 +165,7 @@ public class PropagationByResource imple
      * @return resource matching the given type
      */
     public final Set<String> get(final PropagationOperation type) {
-        Set<String> result = Collections.EMPTY_SET;
+        Set<String> result = Collections.emptySet();
 
         switch (type) {
             case CREATE:

Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationManager.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationManager.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationManager.java
(original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationManager.java
Mon Sep  3 11:26:13 2012
@@ -175,7 +175,7 @@ public class PropagationManager {
 
         final PropagationByResource propByRes = wfResult.getPropByRes();
         if (propByRes == null || propByRes.isEmpty()) {
-            return Collections.EMPTY_LIST;
+            return Collections.emptyList();
         }
 
         if (syncResourceNames != null) {

Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ConnObjectUtil.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ConnObjectUtil.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ConnObjectUtil.java
(original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ConnObjectUtil.java
Mon Sep  3 11:26:13 2012
@@ -154,7 +154,7 @@ public class ConnObjectUtil {
                     attributeTO.setSchema(mapping.getIntAttrName());
 
                     for (Object value : attribute == null || attribute.getValue() == null
-                            ? Collections.EMPTY_LIST
+                            ? Collections.emptyList()
                             : attribute.getValue()) {
                         attributeTO.addValue(value.toString());
                     }
@@ -173,7 +173,7 @@ public class ConnObjectUtil {
                     attributeTO.setSchema(mapping.getIntAttrName());
 
                     for (Object value : attribute == null || attribute.getValue() == null
-                            ? Collections.EMPTY_LIST
+                            ? Collections.emptyList()
                             : attribute.getValue()) {
                         attributeTO.addValue(value.toString());
                     }

Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/NoOpUserWorkflowAdapter.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/NoOpUserWorkflowAdapter.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/NoOpUserWorkflowAdapter.java
(original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/NoOpUserWorkflowAdapter.java
Mon Sep  3 11:26:13 2012
@@ -172,7 +172,7 @@ public class NoOpUserWorkflowAdapter ext
 
     @Override
     public List<WorkflowFormTO> getForms() {
-        return Collections.EMPTY_LIST;
+        return Collections.emptyList();
     }
 
     @Override

Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupManager.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupManager.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupManager.java
(original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupManager.java
Mon Sep  3 11:26:13 2012
@@ -78,7 +78,7 @@ public class SyncopeGroupManager extends
 
     @Override
     public List<Group> findGroupsByUser(final String userId) {
-        List<Group> result = Collections.EMPTY_LIST;
+        List<Group> result = Collections.emptyList();
         SyncopeUser user = userDAO.find(userId);
         if (user != null) {
             result = new ArrayList<Group>();

Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupQueryImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupQueryImpl.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupQueryImpl.java
(original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeGroupQueryImpl.java
Mon Sep  3 11:26:13 2012
@@ -105,7 +105,7 @@ public class SyncopeGroupQueryImpl imple
             if (role != null) {
                 result = Collections.singletonList(fromSyncopeRole(role));
             } else {
-                result = Collections.EMPTY_LIST;
+                result = Collections.emptyList();
             }
         }
         if (result == null) {

Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserManager.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserManager.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserManager.java
(original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserManager.java
Mon Sep  3 11:26:13 2012
@@ -73,7 +73,7 @@ public class SyncopeUserManager extends 
 
     @Override
     public List<Group> findGroupsByUser(final String userId) {
-        List<Group> result = Collections.EMPTY_LIST;
+        List<Group> result = Collections.emptyList();
         SyncopeUser user = userDAO.find(userId);
         if (user != null) {
             result = new ArrayList<Group>();

Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserQueryImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserQueryImpl.java?rev=1380208&r1=1380207&r2=1380208&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserQueryImpl.java
(original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/activiti/SyncopeUserQueryImpl.java
Mon Sep  3 11:26:13 2012
@@ -141,7 +141,7 @@ public class SyncopeUserQueryImpl implem
                     result = Collections.singletonList(fromSyncopeUser(user));
                 }
             } else {
-                result = Collections.EMPTY_LIST;
+                result = Collections.emptyList();
             }
         }
         if (memberOf != null) {
@@ -157,7 +157,7 @@ public class SyncopeUserQueryImpl implem
                     }
                 }
             } else {
-                result = Collections.EMPTY_LIST;
+                result = Collections.emptyList();
             }
         }
         // THIS CAN BE *VERY* DANGEROUS



Mime
View raw message