svn commit: r1636531 - in /aries/trunk/web/web-urlhandler/src: main/java/org/apache/aries/web/converter/impl/ main/java/org/apache/aries/web/url/ test/java/org/apache/aries/web/converter/impl/

[cs...@apache.org]

Author: cschneider
Date: Tue Nov  4 09:51:43 2014
New Revision: 1636531

URL: http://svn.apache.org/r1636531
Log:
ARIES-1198 Handling warnings

Modified:
    aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/CaseInsensitiveMap.java
    aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/PackageFinder.java
    aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/WarToWabConverterImpl.java
    aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/url/WAR_URLServiceHandler.java
    aries/trunk/web/web-urlhandler/src/test/java/org/apache/aries/web/converter/impl/WabConverterTest.java

Modified: aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/CaseInsensitiveMap.java
URL: http://svn.apache.org/viewvc/aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/CaseInsensitiveMap.java?rev=1636531&r1=1636530&r2=1636531&view=diff
==============================================================================
--- aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/CaseInsensitiveMap.java (original)
+++ aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/CaseInsensitiveMap.java Tue Nov  4 09:51:43 2014
@@ -29,6 +29,7 @@ import org.osgi.framework.Constants;
  * Simple key case-insensitive map where only selected set of keys are 
  * treated in case-insensitive way.
  */
+@SuppressWarnings("serial")
 public class CaseInsensitiveMap extends HashMap<String, String> {
     
     private static final Map<String, String> DEFAULT_KEY_MAP = new HashMap<String, String>();

Modified: aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/PackageFinder.java
URL: http://svn.apache.org/viewvc/aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/PackageFinder.java?rev=1636531&r1=1636530&r2=1636531&view=diff
==============================================================================
--- aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/PackageFinder.java (original)
+++ aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/PackageFinder.java Tue Nov  4 09:51:43 2014
@@ -487,7 +487,7 @@ public class PackageFinder extends Class
       return pfav;
     }
 
-    public void visitTableSwitchInsn(int arg0, int arg1, Label arg2, Label[] arg3)
+    public void visitTableSwitchInsn(int min, int max, Label dflt, Label... labels)
     {
       //no-op
     }

Modified: aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/WarToWabConverterImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/WarToWabConverterImpl.java?rev=1636531&r1=1636530&r2=1636531&view=diff
==============================================================================
--- aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/WarToWabConverterImpl.java (original)
+++ aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/converter/impl/WarToWabConverterImpl.java Tue Nov  4 09:51:43 2014
@@ -339,6 +339,7 @@ public class WarToWabConverterImpl imple
       properties.put(Constants.BUNDLE_CLASSPATH, classPathValue.toString().substring(1));
     }
 
+    @SuppressWarnings("serial")
     ArrayList<String> packages = new ArrayList<String>() {
       @Override
       public boolean contains(Object elem) {

Modified: aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/url/WAR_URLServiceHandler.java
URL: http://svn.apache.org/viewvc/aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/url/WAR_URLServiceHandler.java?rev=1636531&r1=1636530&r2=1636531&view=diff
==============================================================================
--- aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/url/WAR_URLServiceHandler.java (original)
+++ aries/trunk/web/web-urlhandler/src/main/java/org/apache/aries/web/url/WAR_URLServiceHandler.java Tue Nov  4 09:51:43 2014
@@ -96,7 +96,7 @@ public class WAR_URLServiceHandler exten
 
   public void start(BundleContext context) throws Exception
   {
-    Dictionary properties = new Hashtable();
+    Dictionary<String, Object> properties = new Hashtable<String, Object>();
     properties.put( URLConstants.URL_HANDLER_PROTOCOL, new String[] {urlScheme});
     context.registerService(URLStreamHandlerService.class.getName(), this, properties);
   }

Modified: aries/trunk/web/web-urlhandler/src/test/java/org/apache/aries/web/converter/impl/WabConverterTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/web/web-urlhandler/src/test/java/org/apache/aries/web/converter/impl/WabConverterTest.java?rev=1636531&r1=1636530&r2=1636531&view=diff
==============================================================================
--- aries/trunk/web/web-urlhandler/src/test/java/org/apache/aries/web/converter/impl/WabConverterTest.java (original)
+++ aries/trunk/web/web-urlhandler/src/test/java/org/apache/aries/web/converter/impl/WabConverterTest.java Tue Nov  4 09:51:43 2014
@@ -132,6 +132,7 @@ public class WabConverterTest
     props.put(Constants.BUNDLE_SYMBOLICNAME, "test.bundle");
     WarToWabConverterImpl sut = new WarToWabConverterImpl(input, WAR_FILE_NAME, props);
     
+    @SuppressWarnings("resource")
     Manifest m = new JarInputStream(sut.getWAB()).getManifest();
     assertEquals("test.bundle", m.getMainAttributes().getValue(Constants.BUNDLE_SYMBOLICNAME));
   }