Update Serializable protocol to not use a property prefix.

codelerity · May 22, 2024 · b76cd53 · b76cd53
1 parent f1b5d5e
commit b76cd53
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/praxiscore-api/src/main/java/org/praxislive/core/protocols/SerializableProtocol.java b/praxiscore-api/src/main/java/org/praxislive/core/protocols/SerializableProtocol.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  * 
- * Copyright 2023 Neil C Smith.
+ * Copyright 2024 Neil C Smith.
  * 
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License version 3 only, as
@@ -35,19 +35,18 @@
  * usually be implemented by a root container.
  * <p>
  * The standard format is a hierarchical map. Annotation keys, including type,
- * info and connections, are prefixed by <code>%</code>. Property keys are
- * prefixed by <code>.</code>. Child keys are prefixed by <code>@</code> and the
- * values are maps.
+ * info and connections, are prefixed by <code>%</code>. Child keys are prefixed
+ * by <code>@</code> and the values are maps. Property keys are not prefixed.
  * <pre>
  * {@code
  * %type core:container
  * %info ...
  * %custom-annotation foo
- * .property1 true
+ * property1 true
  * @child1 {
  *   %type core:custom
  *   %info ...
- *   .property1 42
+ *   property1 42
  * }
  * @child2 {
  *   %type core:custom

diff --git a/praxiscore-base/src/main/java/org/praxislive/base/MapTreeWriter.java b/praxiscore-base/src/main/java/org/praxislive/base/MapTreeWriter.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  * 
- * Copyright 2023 Neil C Smith.
+ * Copyright 2024 Neil C Smith.
  * 
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License version 3 only, as
@@ -44,7 +44,6 @@ public final class MapTreeWriter implements TreeWriter {
 
     private static final String ANNOTATION_PREFIX = "%";
     private static final String CHILD_PREFIX = "@";
-    private static final String PROPERTY_PREFIX = ".";
 
     private static final String TYPE_KEY = ANNOTATION_PREFIX + "type";
     private static final String INFO_KEY = ANNOTATION_PREFIX + "info";
@@ -97,7 +96,7 @@ public MapTreeWriter writeInfo(ComponentInfo info) {
 
     @Override
     public MapTreeWriter writeProperty(String id, Value value) {
-        map.put(PROPERTY_PREFIX + id, value);
+        map.put(id, value);
         return this;
     }
 

diff --git a/praxiscore-base/src/test/java/org/praxislive/base/MapTreeWriterTest.java b/praxiscore-base/src/test/java/org/praxislive/base/MapTreeWriterTest.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  * 
- * Copyright 2023 Neil C Smith.
+ * Copyright 2024 Neil C Smith.
  * 
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License version 3 only, as
@@ -79,18 +79,18 @@ private PMap buildComparison() {
         builder.put("%type", ComponentType.of("core:container"));
         builder.put("%info", ContainerProtocol.API_INFO);
         builder.put("%custom", PString.of("FOO"));
-        builder.put(".p1", 1);
-        builder.put(".p2", true);
+        builder.put("p1", 1);
+        builder.put("p2", true);
         builder.put("@child1", PMap.builder()
                 .put("%type", ComponentType.of("core:type1"))
                 .put("%info", ComponentProtocol.API_INFO)
-                .put(".p1", "value")
+                .put("p1", "value")
                 .build()
         );
         builder.put("@child2", PMap.builder()
                 .put("%type", ComponentType.of("core:type2"))
                 .put("%info", ComponentProtocol.API_INFO)
-                .put(".p1", 42)
+                .put("p1", 42)
                 .build()
         );
         builder.put("%connections", PArray.of(