You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by fm...@apache.org on 2013/02/19 18:10:47 UTC

svn commit: r1447819 - in /syncope/trunk: console/src/main/java/org/apache/syncope/console/pages/panels/ core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ core/src/test/java/org/apache/syncope/core/persistence/dao/

Author: fmartelli
Date: Tue Feb 19 17:10:46 2013
New Revision: 1447819

URL: http://svn.apache.org/r1447819
Log:
SYNCOPE-257 - makes the solution more robust

Modified:
    syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ExternalResourceValidator.java
    syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/ResourceTest.java

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java?rev=1447819&r1=1447818&r2=1447819&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java Tue Feb 19 17:10:46 2013
@@ -411,6 +411,7 @@ public class ResourceMappingPanel extend
                         false);
                 ((AjaxDropDownChoicePanel) purpose).setChoices(Arrays.asList(MappingPurpose.values()));
                 purpose.setStyleSheet(FIELD_STYLE);
+                purpose.setRequired(true);
                 
                 item.add(purpose);
 

Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ExternalResourceValidator.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ExternalResourceValidator.java?rev=1447819&r1=1447818&r2=1447819&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ExternalResourceValidator.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ExternalResourceValidator.java Tue Feb 19 17:10:46 2013
@@ -49,6 +49,13 @@ public class ExternalResourceValidator e
 
             return false;
         }
+        
+        if (item.getPurpose() == null) {
+            context.buildConstraintViolationWithTemplate(EntityViolationType.InvalidMapping.toString())
+                    .addNode(item + ".purpose is null").addConstraintViolation();
+
+            return false;
+        }
 
         return true;
     }

Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/ResourceTest.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/ResourceTest.java?rev=1447819&r1=1447818&r2=1447819&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/ResourceTest.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/ResourceTest.java Tue Feb 19 17:10:46 2013
@@ -201,18 +201,21 @@ public class ResourceTest extends Abstra
         UMappingItem item = new UMappingItem();
         item.setIntAttrName("fullname");
         item.setIntMappingType(IntMappingType.UserSchema);
+        item.setPurpose(MappingPurpose.BOTH);
         mapping.setAccountIdItem(item);
 
         item = new UMappingItem();
         item.setIntAttrName("icon");
         item.setExtAttrName("icon");
         item.setIntMappingType(IntMappingType.RoleSchema);
+        item.setPurpose(MappingPurpose.BOTH);
         mapping.addItem(item);
 
         item = new UMappingItem();
         item.setIntAttrName("mderiveddata");
         item.setExtAttrName("mderiveddata");
         item.setIntMappingType(IntMappingType.MembershipDerivedSchema);
+        item.setPurpose(MappingPurpose.BOTH);
         mapping.addItem(item);
 
         // save the resource