[felix-dev] branch master updated: Minor code cleanup

[cziegeler]

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 eca7d00b25 Minor code cleanup
eca7d00b25 is described below

commit eca7d00b259b1e71e64551270b977bb621e7b38c
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Tue Aug 15 10:48:45 2023 +0200

    Minor code cleanup
---
 inventory/pom.xml                                              |  2 +-
 .../felix/inventory/impl/helper/ZipConfigurationWriter.java    |  2 +-
 .../inventory/impl/webconsole/ConfigurationPrinterAdapter.java | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/inventory/pom.xml b/inventory/pom.xml
index 148701a566..ec00c2cef5 100644
--- a/inventory/pom.xml
+++ b/inventory/pom.xml
@@ -53,7 +53,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>5.1.1</version>
+                <version>5.1.9</version>
                 <extensions>true</extensions>
                     <configuration>
                     <instructions>
diff --git 
a/inventory/src/main/java/org/apache/felix/inventory/impl/helper/ZipConfigurationWriter.java
 
b/inventory/src/main/java/org/apache/felix/inventory/impl/helper/ZipConfigurationWriter.java
index c7c15a6f62..35e76af65d 100644
--- 
a/inventory/src/main/java/org/apache/felix/inventory/impl/helper/ZipConfigurationWriter.java
+++ 
b/inventory/src/main/java/org/apache/felix/inventory/impl/helper/ZipConfigurationWriter.java
@@ -136,7 +136,7 @@ public class ZipConfigurationWriter extends 
ConfigurationWriter
 
         this.entryCounter++;
         return MessageFormat.format("{0,number,000}_{1}", new Object[]
-            { new Integer(this.entryCounter), name });
+            { this.entryCounter, name });
     }
 
     private static class ConfigZipOutputStream extends ZipOutputStream
diff --git 
a/inventory/src/main/java/org/apache/felix/inventory/impl/webconsole/ConfigurationPrinterAdapter.java
 
b/inventory/src/main/java/org/apache/felix/inventory/impl/webconsole/ConfigurationPrinterAdapter.java
index 1ada58e3d6..ae177d72d7 100644
--- 
a/inventory/src/main/java/org/apache/felix/inventory/impl/webconsole/ConfigurationPrinterAdapter.java
+++ 
b/inventory/src/main/java/org/apache/felix/inventory/impl/webconsole/ConfigurationPrinterAdapter.java
@@ -42,7 +42,7 @@ public class ConfigurationPrinterAdapter
     private final Method printMethod;
     private final Method attachmentMethod;
 
-    private static final List CUSTOM_MODES = new ArrayList();
+    private static final List<String> CUSTOM_MODES = new ArrayList<>();
     static
     {
         CUSTOM_MODES.add(ConsoleConstants.MODE_TXT);
@@ -55,9 +55,9 @@ public class ConfigurationPrinterAdapter
      * This is done manually to avoid having the configuration printer class
      * available.
      */
-    private static boolean isConfigurationPrinter(final Class clazz)
+    private static boolean isConfigurationPrinter(final Class<?> clazz)
     {
-        final Class[] interf = clazz.getInterfaces();
+        final Class<?>[] interf = clazz.getInterfaces();
         for (int i = 0; i < interf.length; i++)
         {
             if 
(interf[i].getName().equals(ConsoleConstants.INTERFACE_CONFIGURATION_PRINTER))
@@ -210,7 +210,7 @@ public class ConfigurationPrinterAdapter
      */
     public String[] getPrinterModes()
     {
-        final Set list = new HashSet();
+        final Set<String> list = new HashSet<>();
         if (this.match(ConsoleConstants.MODE_TXT) || 
this.match(ConsoleConstants.MODE_ZIP))
         {
             list.add(Format.TEXT.toString());
@@ -279,7 +279,7 @@ public class ConfigurationPrinterAdapter
         return title + " (" + printer.getClass() + ")";
     }
 
-    private static Method getMethod(final Class clazz, final String mName, 
final Class[] params, final boolean declaredByClass)
+    private static Method getMethod(final Class<?> clazz, final String mName, 
final Class<?>[] params, final boolean declaredByClass)
     {
         try
         {