Stopped some error messages from appearing in GraphQL

core/src/main/java/me/retrodaredevil/solarthing/packets/collection/PacketGroups.java

@@ -150,6 +150,9 @@ public static List<FragmentedPacketGroup> mergePackets(List<? extends InstancePa
 	 */
 	@Contract(pure = true)
 	public static List<FragmentedPacketGroup> mergePackets(List<? extends InstancePacketGroup> instancePacketGroups, long maxTimeDistance, Long masterIdIgnoreDistance, Comparator<Integer> fragmentIdComparator){
+		if (instancePacketGroups.isEmpty()) {
+			throw new IllegalArgumentException("instancePacketGroups cannot be empty!");
+		}
 		Map<Integer, List<InstancePacketGroup>> fragmentMap = new HashMap<>();
 		for(InstancePacketGroup packetGroup : instancePacketGroups){ // this for loop initializes fragmentMap
 			final int fragmentId = packetGroup.getFragmentId();
@@ -192,6 +195,9 @@ private static void addToPacketGroups(
 		if(minTime > maxTime){
 			return;
 		}
+		if (fragmentIds.isEmpty()) {
+			throw new IllegalArgumentException("Fragment IDs is empty!");
+		}
 		int masterFragmentId = fragmentIds.get(0);
 		List<? extends InstancePacketGroup> masterList = requireNonNull(fragmentMap.get(masterFragmentId));
 		if(masterIdIgnoreDistance != null && fragmentIds.size() > 1){ // see if we need to check for gaps in the master list

core/src/main/java/me/retrodaredevil/solarthing/solar/outback/fx/charge/FXChargingPacket.java

@@ -1,21 +1,12 @@
 package me.retrodaredevil.solarthing.solar.outback.fx.charge;
 
-import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import me.retrodaredevil.solarthing.annotations.JsonExplicit;
+import me.retrodaredevil.solarthing.annotations.Nullable;
 import me.retrodaredevil.solarthing.packets.Packet;
-import me.retrodaredevil.solarthing.solar.extra.SolarExtraPacketType;
-import me.retrodaredevil.solarthing.solar.extra.SupplementarySolarExtraPacket;
 import me.retrodaredevil.solarthing.solar.outback.OutbackData;
-import me.retrodaredevil.solarthing.annotations.Nullable;
-
-import me.retrodaredevil.solarthing.annotations.NotNull;
 
-/**
- * Note that data from this was never accurate because it didn't take temperature compensation into account
- */
 @JsonDeserialize(as = ImmutableFXChargingPacket.class)
 @JsonExplicit
 public interface FXChargingPacket extends OutbackData, Packet {

graphql/src/main/java/me/retrodaredevil/solarthing/graphql/SimpleQueryHandler.java

@@ -63,6 +63,9 @@ public SimpleQueryHandler(DefaultInstanceOptions defaultInstanceOptions, ObjectM
 		metaQueryHandler = new MetaQueryHandler(new StdCouchDbConnector(SolarThingConstants.CLOSED_UNIQUE_NAME, instance), metaObjectMapper);
 	}
 	public List<? extends FragmentedPacketGroup> sortPackets(List<? extends InstancePacketGroup> packets, String sourceId) {
+		if (packets.isEmpty()) {
+			return Collections.emptyList();
+		}
 		if (sourceId == null) {
 			return PacketGroups.mergePackets(PacketGroups.parseToInstancePacketGroups(packets, defaultInstanceOptions), 2 * 60 * 1000, 2 * 60 * 1000L);
 		}

other/docs/todo.md

@@ -3,11 +3,9 @@
 * Create a calendar program to be able to view daily kWh on a calendar interface
   * If we do something with a calendar, we could use Google calendar https://developers.google.com/calendar/create-events/
 * Create button/widget on Grafana that sends an encrypted command to shut off the generator
-* Create GraphQL query that allows someone to get dailyKWH from a large time period (many days) for
-easy displaying in Grafana
 * Packet for disk usage
 * Make CouchDB and InfluxDB database configuration warn when setting unused values
-* Make sure that the latest packet handler is really the latest. (Aux On has been frequently sent twice with the generator shutoff)
+* Make sure the latest packet handler is really the latest. (Aux On has been frequently sent twice with the generator shutoff)
 
 ### Android TODO
 * Notification for when FXs are in EQ, but any MX is in absorb or float
@@ -40,6 +38,8 @@ easy displaying in Grafana
 * Store metadata
   * Put this in a document named `meta` in `solarthing_closed
 * Add temperature event to message program
+* Create GraphQL query that allows someone to get dailyKWH from a large time period (many days) for
+easy displaying in Grafana
 
 ### TODO Look into
 * Look into supporting Elasticsearch, MongoDB, Graphite