From 8535983fea8c09046c53f2ebf388bbf3fae594ce Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Thu, 25 Jan 2018 20:02:22 +1300 Subject: Clean up unnecessary code --- src/org/traccar/api/resource/AttributeResource.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/org/traccar/api/resource/AttributeResource.java') diff --git a/src/org/traccar/api/resource/AttributeResource.java b/src/org/traccar/api/resource/AttributeResource.java index 26a1f6931..b37cbbeb2 100644 --- a/src/org/traccar/api/resource/AttributeResource.java +++ b/src/org/traccar/api/resource/AttributeResource.java @@ -52,9 +52,9 @@ public class AttributeResource extends ExtendedObjectResource { if (result != null) { switch (entity.getType()) { case "number": - return Response.ok((Number) result).build(); + return Response.ok(result).build(); case "boolean": - return Response.ok((Boolean) result).build(); + return Response.ok(result).build(); default: return Response.ok(result.toString()).build(); } -- cgit v1.2.3 From a24a7d075ec26e36d26e6ffaec028d7893d07800 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Fri, 26 Jan 2018 19:03:15 +1300 Subject: Implement some explicit casts --- src/org/traccar/api/resource/AttributeResource.java | 6 ++++-- src/org/traccar/processing/ComputedAttributesHandler.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src/org/traccar/api/resource/AttributeResource.java') diff --git a/src/org/traccar/api/resource/AttributeResource.java b/src/org/traccar/api/resource/AttributeResource.java index b37cbbeb2..8f0bac473 100644 --- a/src/org/traccar/api/resource/AttributeResource.java +++ b/src/org/traccar/api/resource/AttributeResource.java @@ -52,9 +52,11 @@ public class AttributeResource extends ExtendedObjectResource { if (result != null) { switch (entity.getType()) { case "number": - return Response.ok(result).build(); + Number numberValue = (Number) result; + return Response.ok(numberValue).build(); case "boolean": - return Response.ok(result).build(); + Boolean booleanValue = (Boolean) result; + return Response.ok(booleanValue).build(); default: return Response.ok(result.toString()).build(); } diff --git a/src/org/traccar/processing/ComputedAttributesHandler.java b/src/org/traccar/processing/ComputedAttributesHandler.java index f0c54d355..b37db05bf 100644 --- a/src/org/traccar/processing/ComputedAttributesHandler.java +++ b/src/org/traccar/processing/ComputedAttributesHandler.java @@ -102,10 +102,12 @@ public class ComputedAttributesHandler extends BaseDataHandler { try { switch (attribute.getType()) { case "number": - position.getAttributes().put(attribute.getAttribute(), result); + Number numberValue = (Number) result; + position.getAttributes().put(attribute.getAttribute(), numberValue); break; case "boolean": - position.getAttributes().put(attribute.getAttribute(), result); + Boolean booleanValue = (Boolean) result; + position.getAttributes().put(attribute.getAttribute(), booleanValue); break; default: position.getAttributes().put(attribute.getAttribute(), result.toString()); -- cgit v1.2.3