Improved shape of registry

Author: alxmrs

java/arcs/core/data/SchemaRegistry.kt

@@ -1,5 +1,25 @@
+/*
+ * Copyright 2020 Google LLC.
+ *
+ * This code may only be used under the BSD style license found at
+ * http://polymer.github.io/LICENSE.txt
+ *
+ * Code distributed by Google as part of this project is also subject to an additional IP rights
+ * grant found at
+ * http://polymer.github.io/PATENTS.txt
+ */
 package arcs.core.data
 
+/**
+ * A registry for generated [Schema]s.
+ */
 object SchemaRegistry {
-    var schemas: MutableMap<String, Schema> = mutableMapOf()
+    private val schemas: MutableMap<String, Schema> = mutableMapOf()
+
+    internal fun register(schema: Schema) {
+        schemas[schema.hash] = schema
+    }
+
+    /** Given a schema hash as a String, return the schema for that has, if it exists. */
+    fun fromHash(hash: String) = schemas[hash]
 }

src/tools/schema2kotlin.ts

@@ -11,6 +11,7 @@ import {Schema2Base, ClassGenerator} from './schema2base.js';
 import {SchemaNode} from './schema2graph.js';
 import {ParticleSpec} from '../runtime/particle-spec.js';
 import minimist from 'minimist';
+import {UnifiedStore} from '../runtime/storageNG/unified-store.js';
 
 // TODO: use the type lattice to generate interfaces
 
@@ -219,10 +220,10 @@ Schema(
 )`;
   }
 
-  leftPad(input: string, indent: number) {
+  leftPad(input: string, indent: number, skipFirst: boolean = false) {
     return input
       .split('\n')
-      .map(line => ' '.repeat(indent) + line)
+      .map((line: string, idx: number) => (idx === 0 && skipFirst) ? line : ' '.repeat(indent) + line)
       .join('\n');
   }
 
@@ -303,11 +304,10 @@ class ${name}_Spec() : ${this.getType('EntitySpec')}<${name}> {
 
 ${this.opts.wasm ? '' : `\
     companion object {
+        val schema = ${this.leftPad(this.createSchema(schemaHash), 12, true)}
+        
         init {
-            SchemaRegistry.schemas.plusAssign(mapOf(
-                "${schemaHash}" to 
-${this.leftPad(this.createSchema(schemaHash), 16)}         
-            ))
+            SchemaRegistry.register(schema)
         }
     }
 `}

src/tools/tests/goldens/generated-schemas.jvm.kt

@@ -74,18 +74,17 @@ class GoldInternal1() : Entity {
 class GoldInternal1_Spec() : EntitySpec<GoldInternal1> {
 
     companion object {
+        val schema = Schema(
+                listOf(),
+                SchemaFields(
+                    singletons = mapOf("val" to FieldType.Text),
+                    collections = emptyMap()
+                ),
+                "485712110d89359a3e539dac987329cd2649d889"
+            )
+
         init {
-            SchemaRegistry.schemas.plusAssign(mapOf(
-                "485712110d89359a3e539dac987329cd2649d889" to
-                Schema(
-                    listOf(),
-                    SchemaFields(
-                        singletons = mapOf("val" to FieldType.Text),
-                        collections = emptyMap()
-                    ),
-                    "485712110d89359a3e539dac987329cd2649d889"
-                )
-            ))
+            SchemaRegistry.register(schema)
         }
     }
 
@@ -199,21 +198,20 @@ class Gold_Data() : Entity {
 class Gold_Data_Spec() : EntitySpec<Gold_Data> {
 
     companion object {
+        val schema = Schema(
+                listOf(),
+                SchemaFields(
+                    singletons = mapOf("num" to FieldType.Number,
+                        "txt" to FieldType.Text,
+                        "lnk" to FieldType.Text,
+                        "flg" to FieldType.Boolean),
+                    collections = emptyMap()
+                ),
+                "d8058d336e472da47b289eafb39733f77eadb111"
+            )
+
         init {
-            SchemaRegistry.schemas.plusAssign(mapOf(
-                "d8058d336e472da47b289eafb39733f77eadb111" to
-                Schema(
-                    listOf(),
-                    SchemaFields(
-                        singletons = mapOf("num" to FieldType.Number,
-                            "txt" to FieldType.Text,
-                            "lnk" to FieldType.Text,
-                            "flg" to FieldType.Boolean),
-                        collections = emptyMap()
-                    ),
-                    "d8058d336e472da47b289eafb39733f77eadb111"
-                )
-            ))
+            SchemaRegistry.register(schema)
         }
     }