2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImpl.java b/src/main/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImpl.java
index b478edf..b21b0e1 100644
--- a/src/main/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImpl.java
+++ b/src/main/java/io/swagger/api/impl/DcaeServiceTypesApiServiceImpl.java
@@ -159,7 +159,7 @@ public class DcaeServiceTypesApiServiceImpl extends DcaeServiceTypesApiService {
                 query.bind("serviceLocation", serviceLocation);
             }
 
-            if (asdcServiceId != null && !"NONE".equals(asdcServiceId.toUpperCase(Locale.ENGLISH))) {
+            if (asdcServiceId != null && !"NONE".equalsIgnoreCase(asdcServiceId)) {
                 query.bind("asdcServiceId", asdcServiceId);
             }
 
diff --git a/src/main/java/io/swagger/api/impl/DcaeServicesApiServiceImpl.java b/src/main/java/io/swagger/api/impl/DcaeServicesApiServiceImpl.java
index 1b2329f..fe938f1 100644
--- a/src/main/java/io/swagger/api/impl/DcaeServicesApiServiceImpl.java
+++ b/src/main/java/io/swagger/api/impl/DcaeServicesApiServiceImpl.java
@@ -136,7 +136,7 @@ public class DcaeServicesApiServiceImpl extends DcaeServicesApiService {
                                     String componentType, Boolean shareable, DateTime created, Integer offset,
                                     UriInfo uriInfo, SecurityContext securityContext) {
         List<DCAEServiceObject> serviceObjects = new ArrayList<>();
-        DateTime createdCutoff = (created == null ? DateTime.now(DateTimeZone.UTC) : created);
+        DateTime createdCutoff = created == null ? DateTime.now(DateTimeZone.UTC) : created;
 
         LOG.info(String.format("Create time upper bound cutoff: %s", createdCutoff.toString()));
 
@@ -211,7 +211,7 @@ public class DcaeServicesApiServiceImpl extends DcaeServicesApiService {
 
             if (shareable != null) {
                 // NOTE: That the shareable field in the database is actually an integer.
-                query.bind("shareable", (shareable ? 1 : 0));
+                query.bind("shareable", shareable ? 1 : 0);
             }
 
             query.bind("createdCutoff", createdCutoff);