Merge pull request #55 from jateeter/master

Fixed start-index=1 error (symptom was empty RESTful member get)

Author: jateeter

src/main/java/org/energyos/espi/common/domain/MeterReading.java

@@ -73,7 +73,7 @@
         @NamedQuery(name = MeterReading.QUERY_FIND_ALL_IDS,
                 query = "SELECT meterReading.id FROM MeterReading meterReading"),
         @NamedQuery(name = MeterReading.QUERY_FIND_ALL_IDS_BY_XPATH_2, query = "SELECT DISTINCT m.id FROM UsagePoint u, MeterReading m WHERE u.retailCustomer.id = :o1Id AND m.usagePoint.id = :o2Id"),
-        @NamedQuery(name = MeterReading.QUERY_FIND_ID_BY_XPATH, query = "SELECT DISTINCT m.id FROM  UsagePoint u, MeterReading m WHERE u.retailCustomer.id = :o1ID AND m.usagePoint.id = :o2Id AND m.id = :o3Id")
+        @NamedQuery(name = MeterReading.QUERY_FIND_ID_BY_XPATH, query = "SELECT DISTINCT m.id FROM  UsagePoint u, MeterReading m WHERE u.retailCustomer.id = :o1Id AND m.usagePoint.id = :o2Id AND m.id = :o3Id")
 
 })
 public class MeterReading extends IdentifiedObject

src/main/java/org/energyos/espi/common/domain/ReadingType.java

@@ -104,7 +104,9 @@
         @NamedQuery(name = ReadingType.QUERY_FIND_ALL_IDS_BY_USAGE_POINT_ID,
                 query = "SELECT meterReading.readingType.id FROM MeterReading meterReading WHERE meterReading.usagePoint.id = :usagePointId"),
         @NamedQuery(name = ReadingType.QUERY_FIND_ALL_IDS,
-                query = "SELECT readingType.id FROM ReadingType readingType")
+                query = "SELECT readingType.id FROM ReadingType readingType"),
+        @NamedQuery(name = ReadingType.QUERY_FIND_ALL_IDS_BY_XPATH_0, query = "SELECT DISTINCT r.id FROM ReadingType r"),
+        @NamedQuery(name = ReadingType.QUERY_FIND_ID_BY_XPATH, query = "SELECT DISTINCT r.id FROM ReadingType r WHERE r.id = :o1Id")
 
 })
 public class ReadingType
@@ -115,6 +117,8 @@ public class ReadingType
     public static final String QUERY_FIND_BY_UUID = "ReadingType.findByUUID";
     public static final String QUERY_FIND_ALL_IDS_BY_USAGE_POINT_ID = "ReadingType.findAllIdsByUsagePointId";
 	public static final String QUERY_FIND_ALL_IDS = "ReadingType.findAllIds";
+    public static final String QUERY_FIND_ALL_IDS_BY_XPATH_0 = "ReadingType.findAllIdsByXpath0";
+    public static final String QUERY_FIND_ID_BY_XPATH = "ReadingType.findIdsByXpath";
 
     @XmlTransient
     @OneToOne(cascade = CascadeType.PERSIST, fetch = FetchType.EAGER)

src/main/java/org/energyos/espi/common/domain/TimeConfiguration.java

@@ -73,7 +73,9 @@
         @NamedQuery(name = TimeConfiguration.QUERY_FIND_ALL_IDS_BY_USAGE_POINT_ID,
                 query = "SELECT usagePoint.localTimeParameters.id FROM UsagePoint usagePoint WHERE usagePoint.id = :usagePointId"),
         @NamedQuery(name = TimeConfiguration.QUERY_FIND_ALL_IDS,
-                query = "SELECT timeConfiguration.id FROM TimeConfiguration timeConfiguration")
+                query = "SELECT timeConfiguration.id FROM TimeConfiguration timeConfiguration"),
+        @NamedQuery(name = TimeConfiguration.QUERY_FIND_ALL_IDS_BY_XPATH_0, query = "SELECT DISTINCT t.id FROM TimeConfiguration t"),
+        @NamedQuery(name = TimeConfiguration.QUERY_FIND_ID_BY_XPATH, query = "SELECT DISTINCT t.id FROM TimeConfiguration t WHERE t.id = :o1Id")
 
 })
 public class TimeConfiguration extends IdentifiedObject {
@@ -82,7 +84,9 @@ public class TimeConfiguration extends IdentifiedObject {
     public static final String QUERY_FIND_ALL_IDS = "TimeConfiguration.findAllIds";
     public static final String QUERY_FIND_BY_UUID = "TimeConfiguration.findByUUID";
     public static final String QUERY_FIND_ALL_IDS_BY_USAGE_POINT_ID = "TimeConfiguration.findAllIdsByUsagePointId";
-
+    public static final String QUERY_FIND_ALL_IDS_BY_XPATH_0 = "TimeConfiguration.findAllIdsByXpath0";
+    public static final String QUERY_FIND_ID_BY_XPATH = "TimeConfiguration.findIdsByXpath";
+    
     @XmlElement(required = true, type = String.class)
     @XmlJavaTypeAdapter(HexBinaryAdapter.class)
     protected byte[] dstEndRule;

src/main/java/org/energyos/espi/common/service/impl/ExportServiceImpl.java

@@ -524,6 +524,7 @@ private void buildHeader (OutputStream stream, String hrefFragment) throws IOExc
     	String uuid = UUID.randomUUID().toString();
 
         stream.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n".getBytes());
+        stream.write("<?xml-stylesheet type=\"text/xsl\" href=\"/GreenButtonDataStyleSheet.xslt\"?>".getBytes());
         stream.write("<feed xmlns=\"http://www.w3.org/2005/Atom\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n".getBytes());
         stream.write("<id>urn:uuid:".getBytes());
         stream.write(uuid.getBytes());

src/main/java/org/energyos/espi/common/utils/ExportFilter.java

@@ -1,11 +1,13 @@
 package org.energyos.espi.common.utils;
 
 import com.sun.org.apache.xerces.internal.jaxp.datatype.XMLGregorianCalendarImpl;
+
 import org.energyos.espi.common.models.atom.DateTimeType;
 import org.energyos.espi.common.models.atom.EntryType;
 
 import java.util.Map;
 
+@SuppressWarnings("restriction")
 public class ExportFilter {
     private Map<String, String> params;
     private int matchedCounter = 0, emittedCounter = 0;
@@ -55,8 +57,7 @@ public boolean matches(EntryType entry) {
         }
 
         if (hasParam("start-index")) {
-        	if (matchedCounter < Integer.valueOf(params.get("start-index"))) {
-                    matchedCounter++;
+        	if (++matchedCounter < Integer.valueOf(params.get("start-index"))) {
                     return false;
 
         	}
@@ -77,7 +78,8 @@ private boolean hasParam(String paramName) {
         return params.get(paramName) != null;
     }
 
-    private long toTime(String key) {
+    @SuppressWarnings("restriction")
+	private long toTime(String key) {
         String param = params.get(key);
 
         return XMLGregorianCalendarImpl.parse(param).toGregorianCalendar().getTimeInMillis();