From 0698d8f7614f9c80c14d5a7362b75e43146567eb Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Wed, 16 Sep 2015 00:53:29 +0900 Subject: [PATCH 1/3] Correct unit test. --- src/test/java/com/zaxxer/hikari/TestConcurrentBag.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/com/zaxxer/hikari/TestConcurrentBag.java b/src/test/java/com/zaxxer/hikari/TestConcurrentBag.java index 3b1fce5c..4951fe02 100644 --- a/src/test/java/com/zaxxer/hikari/TestConcurrentBag.java +++ b/src/test/java/com/zaxxer/hikari/TestConcurrentBag.java @@ -122,7 +122,6 @@ public class TestConcurrentBag TestElf.setSlf4jTargetStream(ConcurrentBag.class, ps); bag.requite(reserved); - Assert.assertTrue(new String(baos.toByteArray()).contains("does not exist")); bag.remove(notinuse); Assert.assertTrue(new String(baos.toByteArray()).contains("not borrowed or reserved")); From 1e8ea2b3e2caac0badf29e3df05d553411d87377 Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Wed, 16 Sep 2015 12:10:25 +0900 Subject: [PATCH 2/3] Remove Method.getParameterCount() because it is only available in Java 8. Use getParameterTypes().length instead. --- src/main/java/com/zaxxer/hikari/util/PropertyElf.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/zaxxer/hikari/util/PropertyElf.java b/src/main/java/com/zaxxer/hikari/util/PropertyElf.java index ac480a2a..da8f9201 100644 --- a/src/main/java/com/zaxxer/hikari/util/PropertyElf.java +++ b/src/main/java/com/zaxxer/hikari/util/PropertyElf.java @@ -75,7 +75,7 @@ public final class PropertyElf HashSet set = new HashSet<>(); for (Method method : targetClass.getMethods()) { String name = method.getName(); - if (name.matches("(get|is)[A-Z].+") && method.getParameterCount() == 0) { + if (name.matches("(get|is)[A-Z].+") && method.getParameterTypes().length == 0) { name = name.replaceFirst("(get|is)", ""); try { if (targetClass.getMethod("set" + name, method.getReturnType()) != null) { From dbeb5ab1cbe31bb091b0b81ea0c2eb9ac567d6e1 Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Wed, 16 Sep 2015 13:21:06 +0900 Subject: [PATCH 3/3] Remove Method.getParameterCount() because it is only available in Java 8. Use getParameterTypes().length instead. --- src/main/java/com/zaxxer/hikari/util/PropertyElf.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zaxxer/hikari/util/PropertyElf.java b/src/main/java/com/zaxxer/hikari/util/PropertyElf.java index da8f9201..e8871bda 100644 --- a/src/main/java/com/zaxxer/hikari/util/PropertyElf.java +++ b/src/main/java/com/zaxxer/hikari/util/PropertyElf.java @@ -127,7 +127,7 @@ public final class PropertyElf List methods = Arrays.asList(target.getClass().getMethods()); for (Method method : methods) { - if (method.getName().equals(methodName) && method.getParameterCount() == 1) { + if (method.getName().equals(methodName) && method.getParameterTypes().length == 1) { writeMethod = method; break; } @@ -136,7 +136,7 @@ public final class PropertyElf if (writeMethod == null) { methodName = "set" + propName.toUpperCase(); for (Method method : methods) { - if (method.getName().equals(methodName) && method.getParameterCount() == 1) { + if (method.getName().equals(methodName) && method.getParameterTypes().length == 1) { writeMethod = method; break; }