diff --git a/pom.xml b/pom.xml index 3559ea0..2d9e222 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.myzlab K - 1.1.15.1 + 1.1.18 jar UTF-8 diff --git a/src/main/java/ve/zlab/k/KCollection.java b/src/main/java/ve/zlab/k/KCollection.java index 3647225..e2578e5 100644 --- a/src/main/java/ve/zlab/k/KCollection.java +++ b/src/main/java/ve/zlab/k/KCollection.java @@ -8,6 +8,7 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.UUID; @@ -884,6 +885,10 @@ public KCollection addProperty(final String property, final Object value) throws return this; } + public Iterator iterator() { + return collection.iterator(); + } + public Map twoColumnsToMap(final String key, final String value, final Class clazzT, final Class clazzV) throws KException { final Map map = new HashMap<>(); diff --git a/src/main/java/ve/zlab/k/KRow.java b/src/main/java/ve/zlab/k/KRow.java index 1fa5bb8..9671d2d 100644 --- a/src/main/java/ve/zlab/k/KRow.java +++ b/src/main/java/ve/zlab/k/KRow.java @@ -161,6 +161,14 @@ public UUID getUUID(final int n) { return null; } + if (o[n] == null) { + return null; + } + + if (o[n] instanceof String) { + return UUID.fromString((String) o[n]); + } + return (UUID) o[n]; } diff --git a/src/main/java/ve/zlab/k/response/DynamicObject.java b/src/main/java/ve/zlab/k/response/DynamicObject.java index 1edce8f..3bcc9c2 100644 --- a/src/main/java/ve/zlab/k/response/DynamicObject.java +++ b/src/main/java/ve/zlab/k/response/DynamicObject.java @@ -136,7 +136,11 @@ public DynamicObject addProperties(final Map map) { } public Response toResponse() { - return Response.ok(this.toJSON()).build(); + return toResponse(Response.Status.OK); + } + + public Response toResponse(Response.Status status) { + return Response.status(status).entity(this.toJSON()).build(); } public String toJSON() {