Merge branch 'google:master' into master

vbothe23 · Jul 25, 2023 · 5a0d3fd · 5a0d3fd
2 parents b00b686 + 892ad88
commit 5a0d3fd
Show file tree

Hide file tree

Showing 14 changed files with 249 additions and 256 deletions.
diff --git a/.../bunsen-avro/src/main/java/com/cerner/bunsen/avro/converters/DefinitionToAvroVisitor.java b/.../bunsen-avro/src/main/java/com/cerner/bunsen/avro/converters/DefinitionToAvroVisitor.java
@@ -452,6 +452,7 @@ public HapiConverter<Schema> visitComposite(String elementName,
       String elementTypeUrl,
       List<StructureField<HapiConverter<Schema>>> children) {
 
+    Preconditions.checkArgument(!children.isEmpty());
     String recordName = DefinitionVisitorsUtil.recordNameFor(elementPath);
     String recordNamespace = DefinitionVisitorsUtil.namespaceFor(basePackage, elementTypeUrl);
     String fullName = recordNamespace + "." + recordName;
@@ -743,6 +744,7 @@ private static String lowercase(String string) {
 
   @Override
   public int getMaxDepth(String elementTypeUrl, String path) {
+    // return 2;
     return 1;
   }
 }
diff --git a/bunsen/bunsen-avro/src/test/java/com/cerner/bunsen/avro/R4AvroConverterTest.java b/bunsen/bunsen-avro/src/test/java/com/cerner/bunsen/avro/R4AvroConverterTest.java
@@ -488,7 +488,7 @@ public void testCompile() throws IOException {
 
     // Ensure common types were generated
     Assert.assertTrue(javaFiles.contains("com/cerner/bunsen/r4/avro/Period.java"));
-    Assert.assertTrue(javaFiles.contains("com/cerner/bunsen/r4/avro/Coding.java"));
+    Assert.assertTrue(javaFiles.contains("com/cerner/bunsen/r4/avro/PatientCoding.java"));
     Assert.assertTrue(javaFiles.contains("com/cerner/bunsen/r4/avro/ValueSet.java"));
 
     // The specific profile should be created in the expecter4b-package.

diff --git a/bunsen/bunsen-avro/src/test/java/com/cerner/bunsen/avro/Stu3AvroConverterTest.java b/bunsen/bunsen-avro/src/test/java/com/cerner/bunsen/avro/Stu3AvroConverterTest.java
@@ -485,7 +485,7 @@ public void testCompile() throws IOException {
 
     // Ensure common types were generated
     Assert.assertTrue(javaFiles.contains("com/cerner/bunsen/stu3/avro/Period.java"));
-    Assert.assertTrue(javaFiles.contains("com/cerner/bunsen/stu3/avro/Coding.java"));
+    Assert.assertTrue(javaFiles.contains("com/cerner/bunsen/stu3/avro/PatientCoding.java"));
     Assert.assertTrue(javaFiles.contains("com/cerner/bunsen/stu3/avro/ValueSet.java"));
 
     // The specific profile should be created in the expected sub-package.