Moved F2 and F3 functional interfaces to the Lambda module.

rapidoid · Feb 3, 2015 · 3c4ecbf · 3c4ecbf
1 parent 61d4578
commit 3c4ecbf
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/rapidoid-ioc/src/main/java/org/rapidoid/inject/IoC.java b/rapidoid-ioc/src/main/java/org/rapidoid/inject/IoC.java
@@ -37,12 +37,12 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.beany.Beany;
 import org.rapidoid.config.Conf;
+import org.rapidoid.lambda.F3;
 import org.rapidoid.lambda.Lambdas;
 import org.rapidoid.lambda.Mapper;
 import org.rapidoid.log.Log;
 import org.rapidoid.util.Builder;
 import org.rapidoid.util.Cls;
-import org.rapidoid.util.F3;
 import org.rapidoid.util.U;
 import org.rapidoid.util.UTILS;
 

diff --git a/...s/src/main/java/org/rapidoid/util/F2.java → ...src/main/java/org/rapidoid/lambda/F2.java b/...s/src/main/java/org/rapidoid/util/F2.java → ...src/main/java/org/rapidoid/lambda/F2.java
@@ -1,11 +1,9 @@
-package org.rapidoid.util;
+package org.rapidoid.lambda;
 
-import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Since;
 
 /*
  * #%L
- * rapidoid-utils
+ * rapidoid-lambda
  * %%
  * Copyright (C) 2014 - 2015 Nikolche Mihajlovski
  * %%
@@ -23,8 +21,10 @@
  * #L%
  */
 
-@Authors("Nikolche Mihajlovski")
-@Since("2.0.0")
+/**
+ * @author Nikolche Mihajlovski
+ * @since 2.0.0
+ */
 public interface F2<R, P1, P2> {
 
 	R execute(P1 param1, P2 param2) throws Exception;

diff --git a/...s/src/main/java/org/rapidoid/util/F3.java → ...src/main/java/org/rapidoid/lambda/F3.java b/...s/src/main/java/org/rapidoid/util/F3.java → ...src/main/java/org/rapidoid/lambda/F3.java
@@ -1,11 +1,8 @@
-package org.rapidoid.util;
-
-import org.rapidoid.annotation.Authors;
-import org.rapidoid.annotation.Since;
+package org.rapidoid.lambda;
 
 /*
  * #%L
- * rapidoid-utils
+ * rapidoid-lambda
  * %%
  * Copyright (C) 2014 - 2015 Nikolche Mihajlovski
  * %%
@@ -23,8 +20,10 @@
  * #L%
  */
 
-@Authors("Nikolche Mihajlovski")
-@Since("2.0.0")
+/**
+ * @author Nikolche Mihajlovski
+ * @since 2.0.0
+ */
 public interface F3<R, P1, P2, P3> {
 
 	R execute(P1 param1, P2 param2, P3 param3) throws Exception;

diff --git a/rapidoid-net/src/test/java/org/rapidoid/EchoProtocolTest.java b/rapidoid-net/src/test/java/org/rapidoid/EchoProtocolTest.java
@@ -26,9 +26,9 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.lambda.F2;
 import org.rapidoid.net.abstracts.Channel;
 import org.rapidoid.net.impl.Protocol;
-import org.rapidoid.util.F2;
 import org.rapidoid.util.UTILS;
 import org.testng.annotations.Test;
 

diff --git a/rapidoid-utils/src/main/java/org/rapidoid/util/UTILS.java b/rapidoid-utils/src/main/java/org/rapidoid/util/UTILS.java
@@ -52,6 +52,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.lambda.F2;
 import org.rapidoid.lambda.Lambdas;
 import org.rapidoid.lambda.Mapper;
 import org.rapidoid.lambda.Predicate;