svn commit: r1712941 - in /sling/trunk/bundles/commons/json/src: main/java/org/apache/sling/commons/json/sling/JsonObjectCreator.java test/java/org/apache/sling/commons/json/test/JSONAssert.java

[sseifert]

Author: sseifert
Date: Fri Nov  6 11:31:40 2015
New Revision: 1712941

URL: http://svn.apache.org/viewvc?rev=1712941&view=rev
Log:
cosmetic: eliminate some code style warnings; and switch to non-deprecated 
junit Asset class (no functional change)

Modified:
    
sling/trunk/bundles/commons/json/src/main/java/org/apache/sling/commons/json/sling/JsonObjectCreator.java
    
sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/test/JSONAssert.java

Modified: 
sling/trunk/bundles/commons/json/src/main/java/org/apache/sling/commons/json/sling/JsonObjectCreator.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/json/src/main/java/org/apache/sling/commons/json/sling/JsonObjectCreator.java?rev=1712941&r1=1712940&r2=1712941&view=diff
==============================================================================
--- 
sling/trunk/bundles/commons/json/src/main/java/org/apache/sling/commons/json/sling/JsonObjectCreator.java
 (original)
+++ 
sling/trunk/bundles/commons/json/src/main/java/org/apache/sling/commons/json/sling/JsonObjectCreator.java
 Fri Nov  6 11:31:40 2015
@@ -26,7 +26,6 @@ import java.util.Calendar;
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
-import java.util.TimeZone;
 
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceUtil;
@@ -58,7 +57,6 @@ public abstract class JsonObjectCreator
     throws JSONException {
         final ValueMap valueMap = resource.adaptTo(ValueMap.class);
 
-        @SuppressWarnings("unchecked")
         final Map propertyMap = (valueMap != null)
                 ? valueMap
                 : resource.adaptTo(Map.class);
@@ -91,7 +89,6 @@ public abstract class JsonObjectCreator
 
             // the node's actual properties
             while (props.hasNext()) {
-                @SuppressWarnings("unchecked")
                 final Map.Entry prop = props.next();
 
                 if ( prop.getValue() != null ) {

Modified: 
sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/test/JSONAssert.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/test/JSONAssert.java?rev=1712941&r1=1712940&r2=1712941&view=diff
==============================================================================
--- 
sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/test/JSONAssert.java
 (original)
+++ 
sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/test/JSONAssert.java
 Fri Nov  6 11:31:40 2015
@@ -18,11 +18,10 @@ package org.apache.sling.commons.json.te
 
 import java.util.Iterator;
 
-import junit.framework.Assert;
-
 import org.apache.sling.commons.json.JSONArray;
 import org.apache.sling.commons.json.JSONException;
 import org.apache.sling.commons.json.JSONObject;
+import org.junit.Assert;
 
 /**
  * Provides assertions on equality for JSON Arrays and Objects.