You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/12/03 18:17:43 UTC
svn commit: r1547485 - in /syncope/trunk: ./
core/src/main/java/org/apache/syncope/core/util/MappingUtil.java
core/src/test/java/org/apache/syncope/core/rest/VirAttrTestITCase.java
Author: ilgrosso
Date: Tue Dec 3 17:17:43 2013
New Revision: 1547485
URL: http://svn.apache.org/r1547485
Log:
Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/VirAttrTestITCase.java
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1547384-1547476
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java?rev=1547485&r1=1547484&r2=1547485&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java Tue Dec 3 17:17:43 2013
@@ -504,6 +504,7 @@ public final class MappingUtil {
* @param intMappingType source mapping type
* @return corresponding Class object, if any (can be null)
*/
+ @SuppressWarnings("rawtypes")
public static Class getIntMappingTypeClass(final IntMappingType intMappingType) {
Class result;
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/VirAttrTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/VirAttrTestITCase.java?rev=1547485&r1=1547484&r2=1547485&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/VirAttrTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/VirAttrTestITCase.java Tue Dec 3 17:17:43 2013
@@ -516,7 +516,7 @@ public class VirAttrTestITCase extends A
final Map<String, Object> actuals = jdbcTemplate.queryForMap(
"SELECT id, surname, email FROM testsync WHERE id=?",
- new Object[] {Integer.parseInt(userTO.getAttrMap().get("aLong").getValues().get(0))});
+ new Object[] { Integer.parseInt(userTO.getAttrMap().get("aLong").getValues().get(0)) });
assertEquals(userTO.getAttrMap().get("aLong").getValues().get(0), actuals.get("id").toString());
assertEquals("ml@role.it", actuals.get("email"));