1.5.5

Add Multimap.forEachKey/forEachValue/flatForEachValue. Add Multiset/LongMultiset.forEach(Consumer<? super T> action). Improvements and bug fix.
landawn · Mar 4, 2019 · 936a237 · 936a237
1 parent 670f8ee
commit 936a237
Show file tree

Hide file tree

Showing 24 changed files with 2,232 additions and 2,485 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,6 +4,10 @@
 
 * Add `Multiset/LongMultiset.forEach(Consumer<? super T> action)`.
 
+* Add `IntObjPair/LongObjPair/DoubleObjPair`.
+
+* Refactoring `Synchronized`.
+
 * Improvements and bug fix.
 
 

diff --git a/README.md b/README.md
@@ -19,6 +19,7 @@ A general programming library in Java/Android. It's easy to learn and simple to
 [Indexed](https://cdn.rawgit.com/landawn/AbacusUtil/master/docs/Indexed_view.html), 
 [If](https://cdn.rawgit.com/landawn/AbacusUtil/master/docs/If_view.html), 
 [Try](https://cdn.rawgit.com/landawn/AbacusUtil/master/docs/Try_view.html), 
+[Synchronzed](https://cdn.rawgit.com/landawn/AbacusUtil/master/docs/Synchronzed_view.html), 
 [Retry](https://cdn.rawgit.com/landawn/AbacusUtil/master/docs/Retry_view.html), 
 [Multiset](https://cdn.rawgit.com/landawn/AbacusUtil/master/docs/Multiset_view.html), 
 [Multimap](https://cdn.rawgit.com/landawn/AbacusUtil/master/docs/Multimap_view.html),
@@ -56,7 +57,8 @@ A general programming library in Java/Android. It's easy to learn and simple to
 [HttpClient](https://cdn.rawgit.com/landawn/AbacusUtil/master/docs/HttpClient_view.html), 
 [OkHttpRequest](https://cdn.rawgit.com/landawn/AbacusUtil/master/docs/OkHttpRequest_view.html), 
 [Profiler](https://cdn.rawgit.com/landawn/AbacusUtil/master/docs/Profiler_view.html), 
-[CodeGenerator](https://cdn.rawgit.com/landawn/AbacusUtil/master/docs/CodeGenerator_view.html)...
+[CodeGenerator](https://cdn.rawgit.com/landawn/AbacusUtil/master/docs/CodeGenerator_view.html), 
+[f](https://cdn.rawgit.com/landawn/AbacusUtil/master/docs/f_view.html)...
 
 * Primitive Mutable: 
 [MutableBoolean](https://cdn.rawgit.com/landawn/AbacusUtil/master/docs/MutableBoolean_view.html), 

diff --git a/docs/IOUtil.gif b/docs/IOUtil.gif
diff --git a/docs/Multimap.gif b/docs/Multimap.gif
diff --git a/docs/OkHttpRequest.gif b/docs/OkHttpRequest.gif
diff --git a/docs/Primitives.gif b/docs/Primitives.gif
diff --git a/docs/SQLBuilder.gif b/docs/SQLBuilder.gif
diff --git a/docs/StringUtil.gif b/docs/StringUtil.gif
diff --git a/docs/Synchronized.gif b/docs/Synchronized.gif
diff --git a/docs/f.gif b/docs/f.gif
diff --git a/docs/f_view.html b/docs/f_view.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Panoramic View of f</title>
+  </head>
+  <body>
+    <img src="f.gif" style="width:70%;height:70%;" alt="" />
+  </body>
+</html>
diff --git a/lib/abacus-util-1.5.5.jar b/lib/abacus-util-1.5.5.jar
diff --git a/lib/abacus-util-jdk7-1.5.5.jar b/lib/abacus-util-jdk7-1.5.5.jar
diff --git a/src/com/landawn/abacus/http/okhttp/OkHttpRequest.java b/src/com/landawn/abacus/http/okhttp/OkHttpRequest.java
@@ -16,7 +16,9 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Method;
 import java.net.URL;
+import java.util.Map;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -29,12 +31,14 @@
 import com.landawn.abacus.logging.Logger;
 import com.landawn.abacus.logging.LoggerFactory;
 import com.landawn.abacus.type.Type;
+import com.landawn.abacus.util.ClassUtil;
 import com.landawn.abacus.util.ContinuableFuture;
 import com.landawn.abacus.util.IOUtil;
 import com.landawn.abacus.util.N;
 import com.landawn.abacus.util.Try;
 
 import okhttp3.CacheControl;
+import okhttp3.FormBody;
 import okhttp3.Headers;
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
@@ -181,6 +185,41 @@ public OkHttpRequest removeHeader(String name) {
         return this;
     }
 
+    public OkHttpRequest body(final Map<?, ?> formBodyByMap) {
+        if (N.isNullOrEmpty(formBodyByMap)) {
+            this.body = Util.EMPTY_REQUEST;
+            return this;
+        }
+
+        final FormBody.Builder builder = new FormBody.Builder();
+
+        for (Map.Entry<?, ?> entry : formBodyByMap.entrySet()) {
+            builder.add(N.stringOf(entry.getKey()), N.stringOf(entry.getValue()));
+        }
+
+        this.body = builder.build();
+        return this;
+    }
+
+    public OkHttpRequest body(final Object formBodyByEntity) {
+        if (formBodyByEntity == null) {
+            this.body = Util.EMPTY_REQUEST;
+            return this;
+        }
+
+        final Class<?> cls = formBodyByEntity.getClass();
+        N.checkArgument(N.isEntity(cls), "{} is not an entity class with getter/setter methods", cls);
+
+        final FormBody.Builder builder = new FormBody.Builder();
+
+        for (Map.Entry<String, Method> entry : ClassUtil.getPropGetMethodList(cls).entrySet()) {
+            builder.add(entry.getKey(), N.stringOf(ClassUtil.getPropValue(formBodyByEntity, entry.getValue())));
+        }
+
+        this.body = builder.build();
+        return this;
+    }
+
     public OkHttpRequest body(RequestBody body) {
         this.body = body;
         return this;
@@ -257,11 +296,11 @@ protected <T> T execute(Class<T> resultClass, String method) throws IOException
         }
     }
 
-    public ContinuableFuture<Response> asyncGet() throws IOException {
+    public ContinuableFuture<Response> asyncGet() {
         return asyncGet(DEFAULT_EXECUTOR);
     }
 
-    public ContinuableFuture<Response> asyncGet(final Executor executor) throws IOException {
+    public ContinuableFuture<Response> asyncGet(final Executor executor) {
         return ContinuableFuture.call(new Try.Callable<Response, IOException>() {
             @Override
             public Response call() throws IOException {
@@ -271,11 +310,11 @@ public Response call() throws IOException {
         }, executor);
     }
 
-    public <T> ContinuableFuture<T> asyncGet(final Class<T> resultClass) throws IOException {
+    public <T> ContinuableFuture<T> asyncGet(final Class<T> resultClass) {
         return asyncGet(resultClass, DEFAULT_EXECUTOR);
     }
 
-    public <T> ContinuableFuture<T> asyncGet(final Class<T> resultClass, final Executor executor) throws IOException {
+    public <T> ContinuableFuture<T> asyncGet(final Class<T> resultClass, final Executor executor) {
         return ContinuableFuture.call(new Try.Callable<T, IOException>() {
             @Override
             public T call() throws IOException {
@@ -285,11 +324,11 @@ public T call() throws IOException {
         }, executor);
     }
 
-    public ContinuableFuture<Response> asyncPost() throws IOException {
+    public ContinuableFuture<Response> asyncPost() {
         return asyncPost(DEFAULT_EXECUTOR);
     }
 
-    public ContinuableFuture<Response> asyncPost(final Executor executor) throws IOException {
+    public ContinuableFuture<Response> asyncPost(final Executor executor) {
         return ContinuableFuture.call(new Try.Callable<Response, IOException>() {
             @Override
             public Response call() throws IOException {
@@ -299,11 +338,11 @@ public Response call() throws IOException {
         }, executor);
     }
 
-    public <T> ContinuableFuture<T> asyncPost(final Class<T> resultClass) throws IOException {
+    public <T> ContinuableFuture<T> asyncPost(final Class<T> resultClass) {
         return asyncPost(resultClass, DEFAULT_EXECUTOR);
     }
 
-    public <T> ContinuableFuture<T> asyncPost(final Class<T> resultClass, final Executor executor) throws IOException {
+    public <T> ContinuableFuture<T> asyncPost(final Class<T> resultClass, final Executor executor) {
         return ContinuableFuture.call(new Try.Callable<T, IOException>() {
             @Override
             public T call() throws IOException {
@@ -313,11 +352,11 @@ public T call() throws IOException {
         }, executor);
     }
 
-    public ContinuableFuture<Response> asyncPut() throws IOException {
+    public ContinuableFuture<Response> asyncPut() {
         return asyncPut(DEFAULT_EXECUTOR);
     }
 
-    public ContinuableFuture<Response> asyncPut(final Executor executor) throws IOException {
+    public ContinuableFuture<Response> asyncPut(final Executor executor) {
         return ContinuableFuture.call(new Try.Callable<Response, IOException>() {
             @Override
             public Response call() throws IOException {
@@ -327,11 +366,11 @@ public Response call() throws IOException {
         }, executor);
     }
 
-    public <T> ContinuableFuture<T> asyncPut(final Class<T> resultClass) throws IOException {
+    public <T> ContinuableFuture<T> asyncPut(final Class<T> resultClass) {
         return asyncPut(resultClass, DEFAULT_EXECUTOR);
     }
 
-    public <T> ContinuableFuture<T> asyncPut(final Class<T> resultClass, final Executor executor) throws IOException {
+    public <T> ContinuableFuture<T> asyncPut(final Class<T> resultClass, final Executor executor) {
         return ContinuableFuture.call(new Try.Callable<T, IOException>() {
             @Override
             public T call() throws IOException {
@@ -341,11 +380,11 @@ public T call() throws IOException {
         }, executor);
     }
 
-    public ContinuableFuture<Response> asyncDelete() throws IOException {
+    public ContinuableFuture<Response> asyncDelete() {
         return asyncDelete(DEFAULT_EXECUTOR);
     }
 
-    public ContinuableFuture<Response> asyncDelete(final Executor executor) throws IOException {
+    public ContinuableFuture<Response> asyncDelete(final Executor executor) {
         return ContinuableFuture.call(new Try.Callable<Response, IOException>() {
             @Override
             public Response call() throws IOException {
@@ -355,11 +394,11 @@ public Response call() throws IOException {
         }, executor);
     }
 
-    public <T> ContinuableFuture<T> asyncDelete(final Class<T> resultClass) throws IOException {
+    public <T> ContinuableFuture<T> asyncDelete(final Class<T> resultClass) {
         return asyncDelete(resultClass, DEFAULT_EXECUTOR);
     }
 
-    public <T> ContinuableFuture<T> asyncDelete(final Class<T> resultClass, final Executor executor) throws IOException {
+    public <T> ContinuableFuture<T> asyncDelete(final Class<T> resultClass, final Executor executor) {
         return ContinuableFuture.call(new Try.Callable<T, IOException>() {
             @Override
             public T call() throws IOException {
@@ -369,11 +408,11 @@ public T call() throws IOException {
         }, executor);
     }
 
-    public ContinuableFuture<Response> asyncHead() throws IOException {
+    public ContinuableFuture<Response> asyncHead() {
         return asyncHead(DEFAULT_EXECUTOR);
     }
 
-    public ContinuableFuture<Response> asyncHead(final Executor executor) throws IOException {
+    public ContinuableFuture<Response> asyncHead(final Executor executor) {
         return ContinuableFuture.call(new Try.Callable<Response, IOException>() {
             @Override
             public Response call() throws IOException {
@@ -383,11 +422,11 @@ public Response call() throws IOException {
         }, executor);
     }
 
-    public ContinuableFuture<Response> asyncPatch() throws IOException {
+    public ContinuableFuture<Response> asyncPatch() {
         return asyncPatch(DEFAULT_EXECUTOR);
     }
 
-    public ContinuableFuture<Response> asyncPatch(final Executor executor) throws IOException {
+    public ContinuableFuture<Response> asyncPatch(final Executor executor) {
         return ContinuableFuture.call(new Try.Callable<Response, IOException>() {
             @Override
             public Response call() throws IOException {