Changeset 7527

Timestamp:

Nov 7, 2018, 9:07:03 AM (5 years ago)

Author:

Nicklas Nordborg

Message:

References #2130: Upgrade 3-rd party libraries

Updated Apache Commons Collections to version 4.2.

Location:

trunk

Files:

• .classpath (modified) (2 diffs)
• doc/3rd-party-components.txt (modified) (2 diffs)
• lib/dist/commons-collections-3.1.jar (deleted)
• lib/dist/commons-collections4-4.1.jar (deleted)
• lib/dist/commons-collections4-4.2.jar (added)
• src/clients/web/net/sf/basedb/clients/web/extensions/ServletWrapper.java (modified) (2 diffs)
• src/core/net/sf/basedb/core/Config.java (modified) (2 diffs)
• src/core/net/sf/basedb/core/ItemList.java (modified) (2 diffs)
• src/core/net/sf/basedb/core/ReporterList.java (modified) (2 diffs)
• src/core/net/sf/basedb/util/overview/OverviewUtil.java (modified) (2 diffs)
• src/core/net/sf/basedb/util/overview/validator/ExtensionNodeValidator.java (modified) (2 diffs)
• src/core/net/sf/basedb/util/uri/ConnectionManagerUtil.java (modified) (2 diffs)

trunk/.classpath

@@ -19 +19 @@
   <classpathentry kind="lib" path="lib/dist/json-simple-1.1.1.jar"/>
   <classpathentry kind="lib" path="lib/svn/svnant-1.4dev.jar"/>
-  <classpathentry kind="lib" path="lib/dist/commons-collections-3.1.jar"/>
   <classpathentry kind="lib" path="lib/dist/jdom-2.0.6.jar"/>
   <classpathentry kind="lib" path="lib/dist/jcommon-1.0.23.jar"/>
@@ -35 +34 @@
   <classpathentry kind="lib" path="lib/dist/httpcore-4.4.10.jar"/>
   <classpathentry kind="lib" path="lib/dist/commons-email-1.5.jar"/>
+  <classpathentry kind="lib" path="lib/dist/commons-collections4-4.2.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
   <classpathentry kind="output" path="xbin"/>

trunk/doc/3rd-party-components.txt

@@ -198 +198 @@
 Jar files : javax-mail-1.5.3.jar
 
+Apache Commons Collections 4
+----------------------------
+Package for working with collections.
+
+More info : https://commons.apache.org/proper/commons-collections/
+Version   : 4.2
+License   : Apache License 2.0 (apache.license-2.0.txt)
+Jar files : commons-collections4-4.2.jar
 
 jBCrypt
@@ -368 +376 @@
 Version   : 2.2
 License   : Apache License, Version 2.0 (yauaa-LICENSE.txt)
-Files     : yauaa-2.2.jar, snakeyaml-1.18.jar, commons-collections4-4.1.jar
+Files     : yauaa-2.2.jar, snakeyaml-1.18.jar
             commons-lang3-3.6.jar
 

trunk/src/clients/web/net/sf/basedb/clients/web/extensions/ServletWrapper.java

@@ -35 +35 @@
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.collections.iterators.IteratorEnumeration;
+import org.apache.commons.collections4.iterators.IteratorEnumeration;
 
 /**
@@ -116 +116 @@
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   public Enumeration<String> getInitParameterNames()
   {
-    return (Enumeration<String>)new IteratorEnumeration(parameters.keySet().iterator());
+    return new IteratorEnumeration<String>(parameters.keySet().iterator());
   }
 

trunk/src/core/net/sf/basedb/core/Config.java

@@ -36 +36 @@
 import java.nio.charset.Charset;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.Predicate;
 
 import net.sf.basedb.util.ComparableComparator;
@@ -139 +139 @@
       {
         final Pattern p = Pattern.compile(filter);
-        CollectionUtils.filter(tmp, new Predicate()
+        CollectionUtils.filter(tmp, new Predicate<String>()
         {
           @Override
-          public boolean evaluate(Object o)
+          public boolean evaluate(String o)
           {
-            return !p.matcher((String)o).matches() || commonCharsets.contains(o);
+            return !p.matcher(o).matches() || commonCharsets.contains(o);
           }
         });

trunk/src/core/net/sf/basedb/core/ItemList.java

@@ -32 +32 @@
 import java.util.TreeSet;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.Predicate;
 
 import net.sf.basedb.core.query.Expressions;
@@ -235 +235 @@
     }
     
-    Predicate countFilter = new Predicate()
+    Predicate<Integer> countFilter = new Predicate<Integer>()
       {
         @Override
-        public boolean evaluate(Object o)
+        public boolean evaluate(Integer count)
         {
-          int count = (Integer)o;
           return minCount <= count && count <= maxCount;
         }

trunk/src/core/net/sf/basedb/core/ReporterList.java

@@ -31 +31 @@
 import java.util.Set;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.Predicate;
 
 import net.sf.basedb.core.data.ReporterListData;
@@ -204 +204 @@
     }
     CollectionUtils.filter(union.values(), 
-      new Predicate()
+      new Predicate<Integer>()
     {
       @Override
-      public boolean evaluate(Object o)
+      public boolean evaluate(Integer count)
       {
-        int count = (Integer)o;
         return minCount <= count && count <= maxCount;
       }

trunk/src/core/net/sf/basedb/util/overview/OverviewUtil.java

@@ -31 +31 @@
 import java.util.Set;
 
-import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections4.IteratorUtils;
 
 import net.sf.basedb.core.Annotatable;
@@ -210 +210 @@
       (ExtensionsInvoker<ValidationRuleAction>)registry.useExtensions(new ClientContext(dc, overview), settings, "net.sf.basedb.util.overview.validationrule");
     
-    List<ValidationRuleAction> xtRules = (List<ValidationRuleAction>)IteratorUtils.toList(invoker.iterator());
+    List<ValidationRuleAction> xtRules = IteratorUtils.toList(invoker.iterator());
     if (xtRules != null && xtRules.size() > 0)
     {

trunk/src/core/net/sf/basedb/util/overview/validator/ExtensionNodeValidator.java

@@ -25 +25 @@
 import java.util.List;
 
-import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections4.IteratorUtils;
 
 import net.sf.basedb.core.Application;
@@ -190 +190 @@
       Registry registry = Application.getExtensionsManager().getRegistry();
       Settings settings = Application.getExtensionsManager().getSettings();
-      ExtensionsInvoker<?> invoker = registry.useExtensions(clientContext, settings, "net.sf.basedb.util.overview.validator");
+      ExtensionsInvoker<NodeValidatorAction<I>> invoker = (ExtensionsInvoker<NodeValidatorAction<I>>)registry.useExtensions(clientContext, settings, "net.sf.basedb.util.overview.validator");
       
       xtValidators = IteratorUtils.toList(invoker.iterator());

trunk/src/core/net/sf/basedb/util/uri/ConnectionManagerUtil.java

@@ -26 +26 @@
 import java.util.List;
 
-import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.collections4.IteratorUtils;
 
 import net.sf.basedb.core.Application;
@@ -66 +66 @@
     @return A list with the factories
   */
-  @SuppressWarnings({ "unchecked", "rawtypes" })
   public static List<ConnectionManagerFactory> getFactories()
   {
     ExtensionsInvoker<ConnectionManagerFactory> invoker = getInvoker(null, null);
-    List list = IteratorUtils.toList(invoker.iterator(), Math.max(invoker.getNumExtensions(), 1));
+    List<ConnectionManagerFactory> list = IteratorUtils.toList(invoker.iterator(), Math.max(invoker.getNumExtensions(), 1));
     return list;
   }