Merge pull request #65 from ccutrer/streamlining2

Some streamlining
hap-java · Feb 12, 2019 · 0788d47 · 0788d47
2 parents e449fcf + b6501cc
commit 0788d47
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/com/beowulfe/hap/characteristics/BaseCharacteristic.java b/src/main/java/com/beowulfe/hap/characteristics/BaseCharacteristic.java
@@ -22,6 +22,7 @@ public abstract class BaseCharacteristic<T> implements Characteristic {
   private final Logger logger = LoggerFactory.getLogger(BaseCharacteristic.class);
 
   private final String type;
+  private final String shortType;
   private final String format;
   private final boolean isWritable;
   private final boolean isReadable;
@@ -46,6 +47,7 @@ public BaseCharacteristic(
     }
 
     this.type = type;
+    this.shortType = this.type.replaceAll("^0*([0-9a-fA-F]+)-0000-1000-8000-0026BB765291$", "$1");
     this.format = format;
     this.isWritable = isWritable;
     this.isReadable = isReadable;
@@ -94,11 +96,10 @@ protected CompletableFuture<JsonObjectBuilder> makeBuilder(int instanceId) {
               JsonObjectBuilder builder =
                   Json.createObjectBuilder()
                       .add("iid", instanceId)
-                      .add("type", type)
+                      .add("type", shortType)
                       .add("perms", perms.build())
                       .add("format", format)
-                      .add("events", false)
-                      .add("bonjour", false)
+                      .add("ev", false)
                       .add("description", description);
               setJsonValue(builder, value);
               return builder;

diff --git a/src/main/java/com/beowulfe/hap/impl/json/AccessoryController.java b/src/main/java/com/beowulfe/hap/impl/json/AccessoryController.java
@@ -65,8 +65,10 @@ public HttpResponse listing() throws Exception {
   }
 
   private CompletableFuture<JsonObject> toJson(Service service, int interfaceId) throws Exception {
+    String shortType =
+        service.getType().replaceAll("^0*([0-9a-fA-F]+)-0000-1000-8000-0026BB765291$", "$1");
     JsonObjectBuilder builder =
-        Json.createObjectBuilder().add("iid", ++interfaceId).add("type", service.getType());
+        Json.createObjectBuilder().add("iid", ++interfaceId).add("type", shortType);
     List<Characteristic> characteristics = service.getCharacteristics();
     Collection<CompletableFuture<JsonObject>> characteristicFutures =
         new ArrayList<>(characteristics.size());