This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 2975af412c Clean up code, suppress warnings
2975af412c is described below
commit 2975af412ce2cd9448efc01cbc707771b70f4a2d
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Mon Aug 14 11:57:07 2023 +0200
Clean up code, suppress warnings
---
.../felix/webconsole/internal/compendium/LogServlet.java | 3 ++-
.../internal/compendium/PreferencesConfigurationPrinter.java | 1 +
.../internal/compendium/WireAdminConfigurationPrinter.java | 11 ++++++-----
.../webconsole/internal/configuration/ConfigManager.java | 1 +
.../webconsole/internal/configuration/MetaTypeSupport.java | 7 +++++--
.../apache/felix/webconsole/internal/core/BundlesServlet.java | 1 +
6 files changed, 16 insertions(+), 8 deletions(-)
diff --git
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/LogServlet.java
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/LogServlet.java
index 1a196eca56..60204145a0 100644
---
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/LogServlet.java
+++
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/LogServlet.java
@@ -82,6 +82,7 @@ public class LogServlet extends SimpleWebConsolePlugin
implements OsgiManagerPlu
return null == traces ? false : Boolean.valueOf( traces
).booleanValue();
}
+ @SuppressWarnings("rawtypes")
private final void renderJSON( final PrintWriter pw, int minLogLevel,
boolean traces ) throws IOException
{
// create status line
@@ -185,7 +186,7 @@ public class LogServlet extends SimpleWebConsolePlugin
implements OsgiManagerPlu
jw.endObject();
}
-
+ @SuppressWarnings("rawtypes")
private static final String serviceDescription( ServiceReference
serviceReference )
{
if ( serviceReference == null )
diff --git
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/PreferencesConfigurationPrinter.java
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/PreferencesConfigurationPrinter.java
index cf0b00dac9..e279f26ada 100644
---
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/PreferencesConfigurationPrinter.java
+++
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/PreferencesConfigurationPrinter.java
@@ -45,6 +45,7 @@ public class PreferencesConfigurationPrinter extends
AbstractConfigurationPrinte
/**
* @see
org.apache.felix.webconsole.ConfigurationPrinter#printConfiguration(java.io.PrintWriter)
*/
+ @SuppressWarnings({"rawtypes", "unchecked"})
public void printConfiguration(PrintWriter printWriter)
{
ServiceReference sr = getBundleContext().getServiceReference(
diff --git
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/WireAdminConfigurationPrinter.java
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/WireAdminConfigurationPrinter.java
index c7d8e2669a..512ee4c446 100644
---
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/WireAdminConfigurationPrinter.java
+++
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/WireAdminConfigurationPrinter.java
@@ -53,6 +53,7 @@ public final class WireAdminConfigurationPrinter extends
AbstractConfigurationPr
/**
* @see
org.apache.felix.webconsole.ConfigurationPrinter#printConfiguration(java.io.PrintWriter)
*/
+ @SuppressWarnings({"rawtypes", "unchecked"})
public final void printConfiguration(PrintWriter pw)
{
final BundleContext bc = getBundleContext();
@@ -170,7 +171,7 @@ public final class WireAdminConfigurationPrinter extends
AbstractConfigurationPr
}
}
- Class[] flavors = wire.getFlavors();
+ Class<?>[] flavors = wire.getFlavors();
if (flavors == null)
{
pw.println(" Flavors: none");
@@ -187,7 +188,7 @@ public final class WireAdminConfigurationPrinter extends
AbstractConfigurationPr
pw.println();
}
- Dictionary props = wire.getProperties();
+ Dictionary<String, Object> props = wire.getProperties();
if (props == null)
{
pw.println(" Properties: none");
@@ -195,11 +196,11 @@ public final class WireAdminConfigurationPrinter extends
AbstractConfigurationPr
else
{
pw.println(" Properties: ");
- for (Enumeration e = props.keys(); e.hasMoreElements();)
+ for (Enumeration<String> e = props.keys(); e.hasMoreElements();)
{
- final Object key = e.nextElement();
+ final String key = e.nextElement();
pw.print(" "); //$NON-NLS-1$
- pw.print(key.toString());
+ pw.print(key);
pw.print('=');
pw.println(props.get(key));
}
diff --git
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigManager.java
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigManager.java
index 7fe275ce5f..3530021bd7 100644
---
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigManager.java
+++
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigManager.java
@@ -439,6 +439,7 @@ public class ConfigManager extends SimpleWebConsolePlugin
implements OsgiManager
// prepare variables
final String referer = request.getParameter( REFERER );
final boolean factoryCreate = "true".equals(
request.getParameter(FACTORY_CREATE) ); //$NON-NLS-1$
+ @SuppressWarnings("unchecked")
final Map<String, Object> vars = ( ( Map<String, Object> )
WebConsoleUtil.getVariableResolver( request ) );
vars.put( "__data__", json.toString() ); //$NON-NLS-1$
vars.put( "selectedPid", pid != null ? pid : "" ); //$NON-NLS-1$
//$NON-NLS-2$
diff --git
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/MetaTypeSupport.java
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/MetaTypeSupport.java
index 728ce0a1e4..51c4c728d0 100644
---
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/MetaTypeSupport.java
+++
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/MetaTypeSupport.java
@@ -163,6 +163,7 @@ class MetaTypeSupport
}
+ @SuppressWarnings("rawtypes")
private static List toList( Object value )
{
if ( value instanceof Vector )
@@ -190,11 +191,12 @@ class MetaTypeSupport
}
+ @SuppressWarnings("rawtypes")
static PropertyDescriptor createAttributeDefinition( final String id,
final Object value )
{
int attrType;
int attrCardinality;
- Class type;
+ Class<?> type;
if ( value == null )
{
@@ -299,7 +301,7 @@ class MetaTypeSupport
return Byte.valueOf( value );
case AttributeDefinition.CHARACTER:
char c = ( value.length() > 0 ) ? value.charAt( 0 ) : 0;
- return new Character( c );
+ return Character.valueOf( c );
case AttributeDefinition.DOUBLE:
return Double.valueOf( value );
case AttributeDefinition.FLOAT:
@@ -318,6 +320,7 @@ class MetaTypeSupport
}
+ @SuppressWarnings({"rawtypes", "unchecked"})
static void setPasswordProps( final Vector vec, final String[] properties,
Object props )
{
List propList = ( props == null ) ? new ArrayList() : toList( props );
diff --git
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
index 2cdef7c255..d00e67ac72 100644
---
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
+++
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/core/BundlesServlet.java
@@ -234,6 +234,7 @@ public class BundlesServlet extends SimpleWebConsolePlugin
implements OsgiManage
* @see
org.apache.felix.webconsole.ConfigurationPrinter#printConfiguration(java.io.PrintWriter)
*/
@Override
+ @SuppressWarnings({"rawtypes"})
public void printConfiguration( PrintWriter pw )
{
try
