Make All Functions @JvmStatic for easier and cleaner callingfrom Java

Author: 06needhamt

TestProgram/src/linq/testprogram/Main.java

@@ -23,8 +23,8 @@ copy of this software and associated documentation files (the
 */
 
 package linq.testprogram;
-import linq.HelperFunctionsKt;
-import linq.collections.LinqListFunctionsKt;
+import static linq.HelperFunctions.CastHelperFunctions;
+import static linq.collections.LinqListFunctions.LINQ;
 
 import java.util.ArrayList;
 
@@ -49,66 +49,66 @@ public static void main(String[] args)
         list3.add(50);
         list3.add("Hello World");
         list3.add(100);
-        list = new ArrayList<>(LinqListFunctionsKt.Concat(list,list2));
+        list = new ArrayList<>(LINQ.Concat(list,list2));
         try {
-            int result = LinqListFunctionsKt.First(list, (x) -> x == 5);
-            boolean equal = LinqListFunctionsKt.All(list,(x) -> x == 10);
-            boolean hasany = LinqListFunctionsKt.HasAny(list);
-            boolean hasanyCond = LinqListFunctionsKt.HasAny(list, (x) -> x == 12);
-            boolean contains = LinqListFunctionsKt.Contains(list,3);
-            int count = LinqListFunctionsKt.Count(list);
+            int result = LINQ.First(list, (x) -> x == 5);
+            boolean equal = LINQ.All(list,(x) -> x == 10);
+            boolean hasany = LINQ.HasAny(list);
+            boolean hasanyCond = LINQ.HasAny(list, (x) -> x == 12);
+            boolean contains = LINQ.Contains(list,3);
+            int count = LINQ.Count(list);
             System.out.println("There are " + count + " items in the list");
-            list2 = new ArrayList<>(LinqListFunctionsKt.Distinct(list));
-            count = LinqListFunctionsKt.Count(list2);
+            list2 = new ArrayList<>(LINQ.Distinct(list));
+            count = LINQ.Count(list2);
             System.out.println("There are " + count + " distinct items in the list");
-            list2 = new ArrayList<>(LinqListFunctionsKt.Intersect(list,list2));
-            count = LinqListFunctionsKt.Count(list2);
+            list2 = new ArrayList<>(LINQ.Intersect(list,list2));
+            count = LINQ.Count(list2);
             System.out.println("There are " + count + " distinct items in both lists");
             System.out.println("First item in the list is: " + list.indexOf(result));
             System.out.println("Are All items in the list equal: " + equal);
             System.out.println("Does the list contain any items: " + hasany);
             System.out.println("Does the list contain any items that meet this condition: " + hasanyCond);
             System.out.println("Does the list contain any items equal to 3: " + contains);
-            int average = LinqListFunctionsKt.Average(list2);
-            int last = LinqListFunctionsKt.Last(list2);
-            int max = LinqListFunctionsKt.Max(list2);
-            int min = LinqListFunctionsKt.Min(list2);
-            ArrayList<String> strings = new ArrayList<String>(HelperFunctionsKt.CastStringList(LinqListFunctionsKt.OfType(list3)));
+            int average = LINQ.Average(list2);
+            int last = LINQ.Last(list2);
+            int max = LINQ.Max(list2);
+            int min = LINQ.Min(list2);
+            ArrayList<String> strings = new ArrayList<String>(CastHelperFunctions.CastStringList(LINQ.OfType(list3)));
             System.out.println("The average value in the list is : " + average);
             System.out.println("The Last item in the list is : " + last);
             System.out.println("The Largest item in the list is : " + max);
             System.out.println("The Smallest item in the list is : " + min);
             for(String str : strings)
                 System.out.println(str);
-            ArrayList<Integer> range = LinqListFunctionsKt.Range(100,50);
+            ArrayList<Integer> range = LINQ.Range(100,50);
             for(Integer num : range)
                 System.out.print(num + ",");
             System.out.println();
-            ArrayList<Integer> repeat = LinqListFunctionsKt.Repeat(100,10);
+            ArrayList<Integer> repeat = LINQ.Repeat(100,10);
             for(Integer num : repeat)
                 System.out.print(num + ",");
             System.out.println();
-            range = new ArrayList<>(LinqListFunctionsKt.Reverse(range));
+            range = new ArrayList<>(LINQ.Reverse(range));
             for(Integer num : range)
                 System.out.print(num + ",");
             System.out.println();
             try {
                 ArrayList<Integer> single1 = new ArrayList<>();
                 single1.add(50);
-                Integer item = LinqListFunctionsKt.Single(single1);
+                Integer item = LINQ.Single(single1);
                 System.out.println(item);
                 single1.add(100);
-                item = LinqListFunctionsKt.Single(single1);
+                item = LINQ.Single(single1);
                 System.out.println(item);
             }
             catch (Exception e){
                 e.printStackTrace(System.err);
             }
             System.out.println("After Exception");
             list4.add("Hello");
-            boolean string = LinqListFunctionsKt.HasAny(list4, x -> x.equals("Hello"));
+            boolean string = LINQ.HasAny(list4, x -> x.equals("Hello"));
             System.out.println(string);
-            Integer[] array = HelperFunctionsKt.CastIntegerArray(LinqListFunctionsKt.ToArray(list2));
+            Integer[] array = CastHelperFunctions.CastIntegerArray(LINQ.ToArray(list2));
             System.out.println("Items in array");
             for(Integer item : array)
                 System.out.println(item);

TestProgramJava7/src/linq/testprogram/java7/Main.java

@@ -25,8 +25,7 @@ copy of this software and associated documentation files (the
 
 package linq.testprogram.java7;
 
-import linq.collections.LinqListFunctionsJava7Kt;
-import linq.collections.LinqListFunctionsKt;
+import static linq.collections.LinqListFunctionsJava7.LINQJava7;
 import linq.lamdba.LINQLambda;
 
 import java.util.ArrayList;
@@ -39,11 +38,11 @@ public static void main(String[] args) {
         try {
             ArrayList<Integer> list = new ArrayList<Integer>();
             list.add(10);
-            int result = LinqListFunctionsKt.First(list);
+            int result = LINQJava7.First(list);
             LINQLambda<Boolean> lambda = new LINQLambda<Boolean>(LambdaFunctions.class.getMethod("cond", Integer.TYPE)
                     ,null
                     ,new Object[]{11});
-            boolean all = LinqListFunctionsJava7Kt.All(list, lambda);
+            boolean all = LINQJava7.All(list, lambda);
             System.out.println(all);
         } catch (Exception ex) {
             ex.printStackTrace(System.err);