Changeset 35719 for other-projects/the-macronizer/trunk/src/java/util/Utils4JJ.java

Timestamp:

2021-11-03T15:24:04+13:00 (2 years ago)

Author:

cstephen

Message:

Add support for JSON response to direct input queries. Cleanup other components.

File:

• other-projects/the-macronizer/trunk/src/java/util/Utils4JJ.java (modified) (13 diffs)

other-projects/the-macronizer/trunk/src/java/util/Utils4JJ.java

@@ -95 +95 @@
      * @return Package path for the class.
      */
-    public static String getPackagePath(final Class clasz) {
+    public static String getPackagePath(final Class<?> clasz) {
         checkNotNull("clasz", clasz);
         return clasz.getPackage().getName().replace('.', '/');
@@ -111 +111 @@
      * @return Resource URL.
      */
-    public static URL getResource(final Class clasz, final String name) {
+    public static URL getResource(final Class<?> clasz, final String name) {
         checkNotNull("clasz", clasz);
         checkNotNull("name", name);
@@ -130 +130 @@
      * @return Properties.
      */
-    public static Properties loadProperties(final Class clasz,
+    public static Properties loadProperties(final Class<?> clasz,
             final String filename) {
         checkNotNull("clasz", clasz);
@@ -264 +264 @@
         checkNotNull("className", className);
         try {
-            final Class clasz = Class.forName(className);
+            final Class<?> clasz = Class.forName(className);
             return clasz.newInstance();
         } catch (final ClassNotFoundException e) {
@@ -281 +281 @@
      *            URL to add - Cannot be <code>null</code>.
      */
-    public static void addToClasspath(final String url) {
+    public static void addToClasspath(final String url)
+        throws IOException
+    {
         checkNotNull("url", url);
         try {
@@ -657 +659 @@
      *            URL to add - Cannot be <code>null</code>.
      */
-    public static void addToClasspath(final URL url) {
+    public static void addToClasspath(final URL url)
+        throws IOException
+    {
         checkNotNull("url", url);
         final ClassLoader classLoader = Utils4JJ.class.getClassLoader();
@@ -681 +685 @@
                 throw new RuntimeException(e);
             }
+            finally {
+                urlClassLoader.close();
+            }
         }
     }
@@ -730 +737 @@
      */
     private static String getMethodSignature(final String returnType,
-            final String methodName, final Class[] argTypes) {
+            final String methodName, final Class<?>[] argTypes) {
         final StringBuffer sb = new StringBuffer();
         if (returnType != null) {
@@ -771 +778 @@
      */
     public static Object invoke(final Object obj, final String methodName,
-            final Class[] argTypes, final Object[] args)
+            final Class<?>[] argTypes, final Object[] args)
             throws InvokeMethodFailedException {
 
@@ -777 +784 @@
         checkNotNull("methodName", methodName);
 
-        final Class[] argTypesIntern;
+        final Class<?>[] argTypesIntern;
         final Object[] argsIntern;
         if (argTypes == null) {
@@ -842 +849 @@
     }
 
-    private static void checkSameLength(final Class[] argTypes,
+    private static void checkSameLength(final Class<?>[] argTypes,
             final Object[] args) {
         if (argTypes.length != args.length) {
@@ -904 +911 @@
         final ZipFile zip = new ZipFile(zipFile);
         try {
-            final Enumeration enu = zip.entries();
+            final Enumeration<?> enu = zip.entries();
             while (enu.hasMoreElements()
                     && ((cancelable == null) || !cancelable.isCanceled())) {
@@ -1025 +1032 @@
      *         unchanged.
      */
-    public static String replaceVars(final String str, final Map vars) {
+    public static String replaceVars(final String str, final Map<?, ?> vars) {
 
         if (str == null) {