Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/clojure/clojure/java/data.clj
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@

(defn- make-getter-fn [method]
(fn [instance]
(from-java (.invoke method instance nil))))
(clojure.lang.Reflector/prepRet (.getReturnType method)
(from-java (.invoke method instance nil)))))

(defn- add-getter-fn [the-map prop-descriptor]
(let [name (.getName prop-descriptor)
Expand Down
9 changes: 8 additions & 1 deletion src/test/clojure/clojure/java/test_data.clj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
(:use clojure.java.data)
(:use [clojure.tools.logging :only (log* info)])
(:use clojure.test)
(:import (clojure.java.data.test Person Address State Primitive)))
(:import (clojure.java.data.test Person Address State Primitive BooleanTest)))

(deftest clojure-to-java
(let [person (to-java Person {:name "Bob"
Expand Down Expand Up @@ -103,3 +103,10 @@
:stringArray ["Argument" "Vector"]}]
(is (= datum
(from-java (to-java Primitive datum))))))

(deftest booleans-from-java
(let [java-datum (new BooleanTest)]
(is (= :false (if (:boolMember (from-java java-datum))
:true
:false)))))

18 changes: 18 additions & 0 deletions src/test/java/clojure/java/data/test/BooleanTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package clojure.java.data.test;

public class BooleanTest {

private boolean boolMember = false;

public BooleanTest() {}

public boolean isBoolMember() {
return this.boolMember;
}

public void setBoolMember(boolean boolMember) {
this.boolMember = boolMember;
}

}