Merge branch 'eclipse:master' into master

eclipse · Sep 22, 2023 · 507abf9 · 507abf9
2 parents f3f53b0 + 11d601a
commit 507abf9
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 14 deletions.
diff --git a/company-kata-solutions/src/main/java/org/eclipse/collections/companykata/Order.java b/company-kata-solutions/src/main/java/org/eclipse/collections/companykata/Order.java
@@ -12,13 +12,10 @@
 
 import org.eclipse.collections.api.bag.Bag;
 import org.eclipse.collections.api.bag.sorted.MutableSortedBag;
-import org.eclipse.collections.api.block.function.primitive.DoubleFunction;
 import org.eclipse.collections.impl.block.factory.Comparators;
-import org.eclipse.collections.impl.block.function.AddFunction;
-import org.eclipse.collections.impl.factory.Lists;
 import org.eclipse.collections.impl.factory.SortedBags;
 
-import java.util.List;
+
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**

diff --git a/company-kata-solutions/src/main/java/org/eclipse/collections/companykata/Supplier.java b/company-kata-solutions/src/main/java/org/eclipse/collections/companykata/Supplier.java
@@ -10,8 +10,6 @@
 
 package org.eclipse.collections.companykata;
 
-import org.eclipse.collections.api.block.function.Function;
-
 /**
  * Suppliers have a name and an array of itemNames.
  */

diff --git a/company-kata/src/main/java/org/eclipse/collections/companykata/Order.java b/company-kata/src/main/java/org/eclipse/collections/companykata/Order.java
@@ -10,7 +10,6 @@
 
 package org.eclipse.collections.companykata;
 
-import org.eclipse.collections.api.block.function.primitive.DoubleFunction;
 import org.eclipse.collections.impl.block.function.AddFunction;
 import org.eclipse.collections.impl.factory.Lists;
 

diff --git a/company-kata/src/main/java/org/eclipse/collections/companykata/Supplier.java b/company-kata/src/main/java/org/eclipse/collections/companykata/Supplier.java
@@ -10,8 +10,6 @@
 
 package org.eclipse.collections.companykata;
 
-import org.eclipse.collections.api.block.function.Function;
-
 /**
  * Suppliers have a name and an array of itemNames.
  */

diff --git a/haiku-kata-solutions/src/main/java/org/eclipse/collections/haikukata/TextProcessorEC.java b/haiku-kata-solutions/src/main/java/org/eclipse/collections/haikukata/TextProcessorEC.java
@@ -35,9 +35,8 @@ private String getHaiku()
 
     public CharAdapter getHaikuAsCharAdapter()
     {
-        // TODO: Wrap this.getHaiku() in a CharAdapter
-        // Hint: Look a the Strings class.
-        return null;
+        // Hint: Wrap this.getHaiku() in a CharAdapter, Look at the Strings class.
+        return CharAdapter.adapt(this.getHaiku());
     }
 
     public ListIterable<CharIntPair> topLetters()

diff --git a/pom-jdk17.xml b/pom-jdk17.xml
@@ -89,7 +89,7 @@
 
     <properties>
         <eclipse.collections.version>11.1.0</eclipse.collections.version>
-        <junit5.version>5.9.2</junit5.version>
+        <junit5.version>5.10.0</junit5.version>
         <jackson.version>2.14.1</jackson.version>
         <jol.version>0.16</jol.version>
 

diff --git a/pom.xml b/pom.xml
@@ -96,7 +96,7 @@
 
     <properties>
         <eclipse.collections.version>11.1.0</eclipse.collections.version>
-        <junit5.version>5.9.2</junit5.version>
+        <junit5.version>5.10.0</junit5.version>
         <jackson.version>2.14.1</jackson.version>
         <jol.version>0.16</jol.version>