Merge pull request #330 from IBM/johntimm-master

Issue #329 - Invalid SQL generated in ResourceDAOImpl

Author: JohnTimm

fhir-core/src/main/java/com/ibm/fhir/core/context/FHIRPagingContext.java

@@ -10,9 +10,11 @@ public interface FHIRPagingContext {
     int getLastPageNumber();
     int getPageNumber();
     int getPageSize();
-    long getTotalCount();
+    int getTotalCount();
     void setLastPageNumber(int lastPageNumber);
     void setPageNumber(int pageNumber);
     void setPageSize(int pageSize);
-    void setTotalCount(long totalCount);
+    void setTotalCount(int totalCount);
+    boolean isLenient();
+    void setLenient(boolean lenient);
 }

fhir-core/src/main/java/com/ibm/fhir/core/context/impl/FHIRPagingContextImpl.java

@@ -16,7 +16,8 @@ public class FHIRPagingContextImpl implements FHIRPagingContext {
     protected int lastPageNumber;
     protected int pageNumber;
     protected int pageSize;
-    protected long totalCount;
+    protected int totalCount;
+    protected boolean lenient = true;
 
     public FHIRPagingContextImpl() {
         this.pageNumber = DEFAULT_PAGE_NUMBER;
@@ -40,7 +41,7 @@ public int getPageSize() {
     }
 
     @Override
-    public long getTotalCount() {
+    public int getTotalCount() {
         return totalCount;
     }
 
@@ -60,7 +61,17 @@ public void setPageSize(int pageSize) {
     }
 
     @Override
-    public void setTotalCount(long totalCount) {
+    public void setTotalCount(int totalCount) {
         this.totalCount = totalCount;
     }
+    
+    @Override
+    public boolean isLenient() {
+        return lenient;
+    }
+
+    @Override
+    public void setLenient(boolean lenient) {
+        this.lenient = lenient;
+    }
 }