Merge pull request #160 from yfre/mark_primary_service

mark primary service

Author: yfre

src/main/java/io/github/hapjava/accessories/HomekitAccessory.java

@@ -86,6 +86,6 @@ default Collection<Service> getServices() {
    * @return primary service
    */
   default Service getPrimaryService() {
-    return getServices().iterator().next();
+    return getServices().isEmpty() ? null : getServices().iterator().next();
   };
 }

src/main/java/io/github/hapjava/server/impl/json/AccessoryController.java

@@ -42,7 +42,7 @@ public HttpResponse listing() throws Exception {
       iidLookup.putAll(swapKeyAndValue(registry.getCharacteristics(accessory.getId())));
 
       for (Service service : servicesByInterfaceId.values()) {
-        serviceFutures.add(toJson(service, iidLookup));
+        serviceFutures.add(toJson(service, iidLookup, accessory.getPrimaryService() == service));
       }
 
       accessoryServiceFutures.put(accessory.getId(), serviceFutures);
@@ -72,8 +72,8 @@ public HttpResponse listing() throws Exception {
     }
   }
 
-  private CompletableFuture<JsonObject> toJson(Service service, Map<Object, Integer> iidLookup)
-      throws Exception {
+  private CompletableFuture<JsonObject> toJson(
+      Service service, Map<Object, Integer> iidLookup, boolean isPrimary) throws Exception {
     String shortType =
         service.getType().replaceAll("^0*([0-9a-fA-F]+)-0000-1000-8000-0026BB765291$", "$1");
     JsonObjectBuilder builder =
@@ -103,7 +103,7 @@ private CompletableFuture<JsonObject> toJson(Service service, Map<Object, Intege
                     .forEach(jsonLinkedServices::add);
                 builder.add("linked", jsonLinkedServices);
               }
-
+              builder.add("primary", isPrimary);
               return builder.build();
             });
   }