- add min and max #21

- fix several warnings on tests
- remove "public" from method declarations in interfaces

Author: brunovinicius

android-linq.iml

@@ -1,35 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/groovy" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/groovy-all-2.2.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="JUnit4">
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.11.jar!/" />
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-core-1.3.jar!/" />
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-library-1.3.jar!/" />
+          <root url="jar://$APPLICATION_HOME_DIR$/lib/groovy-all-2.4.6.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
 </module>

pom.xml

@@ -8,7 +8,17 @@
     <groupId>br.com.zbra</groupId>
     <artifactId>android-linq</artifactId>
     <version>1.0.1</version>
-	<packaging>jar</packaging>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
 
     <properties>
         <maven.compiler.source>1.7</maven.compiler.source>

src/main/java/br/com/zbra/androidlinq/AbstractStream.java

@@ -140,7 +140,7 @@ public Integer aggregate(Integer v, T t) {
 
     @Override
     public Long sum(final SelectorLong<T> selector) {
-        return aggregate(0l, new Aggregator<T, Long>() {
+        return aggregate(0L, new Aggregator<T, Long>() {
             @Override
             public Long aggregate(Long v, T t) {
                 return v + selector.select(t);
@@ -178,6 +178,26 @@ public BigDecimal aggregate(BigDecimal v, T t) {
         });
     }
 
+    @Override
+    public <TResult extends Comparable<TResult>> T min(Selector<T, TResult> selector) {
+        return orderBy(selector).first();
+    }
+
+    @Override
+    public <TResult> T min(Selector<T, TResult> selector, Comparator<TResult> comparator) {
+        return orderBy(selector, comparator).first();
+    }
+
+    @Override
+    public <TResult extends Comparable<TResult>> T max(Selector<T, TResult> selector) {
+        return orderBy(selector).last();
+    }
+
+    @Override
+    public <TResult> T max(Selector<T, TResult> selector, Comparator<TResult> comparator) {
+        return orderBy(selector, comparator).last();
+    }
+
     @Override
     public boolean any() {
         return iterator().hasNext();

src/main/java/br/com/zbra/androidlinq/OrderedStream.java

@@ -13,7 +13,7 @@ public interface OrderedStream<T> extends Stream<T> {
      * @param <TKey>      The type of the key returned by keySelector.
      * @return An Stream of type T whose elements are sorted according to a key.
      */
-    public <TKey> OrderedStream<T> thenBy(Selector<T, TKey> keySelector, Comparator<TKey> comparator);
+    <TKey> OrderedStream<T> thenBy(Selector<T, TKey> keySelector, Comparator<TKey> comparator);
 
     /**
      * Performs a subsequent ordering of the elements in a sequence in ascending order according to a key.
@@ -22,7 +22,7 @@ public interface OrderedStream<T> extends Stream<T> {
      * @param <TKey>      The type of the key returned by keySelector.
      * @return An Stream of type T whose elements are sorted according to a key.
      */
-    public <TKey extends Comparable<TKey>> OrderedStream<T> thenBy(Selector<T, TKey> keySelector);
+    <TKey extends Comparable<TKey>> OrderedStream<T> thenBy(Selector<T, TKey> keySelector);
 
     /**
      * Performs a subsequent ordering of the elements in a sequence in descending order by using a specified comparer.
@@ -32,7 +32,7 @@ public interface OrderedStream<T> extends Stream<T> {
      * @param <TKey>      The type of the key returned by keySelector.
      * @return An Stream of type T whose elements are sorted according to a key.
      */
-    public <TKey> OrderedStream<T> thenByDescending(Selector<T, TKey> keySelector, Comparator<TKey> comparator);
+    <TKey> OrderedStream<T> thenByDescending(Selector<T, TKey> keySelector, Comparator<TKey> comparator);
 
     /**
      * Performs a subsequent ordering of the elements in a sequence in descending order, according to a key.
@@ -41,6 +41,6 @@ public interface OrderedStream<T> extends Stream<T> {
      * @param <TKey>      The type of the key returned by keySelector.
      * @return An Stream of type T whose elements are sorted according to a key.
      */
-    public <TKey extends Comparable<TKey>> OrderedStream<T> thenByDescending(Selector<T, TKey> keySelector);
+    <TKey extends Comparable<TKey>> OrderedStream<T> thenByDescending(Selector<T, TKey> keySelector);
 
 }