Correct errors in Java metdata generation.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqljson-query",
-  "version": "1.0.12",
+  "version": "1.1.0",
   "description": "Command line tool to generate SQL/JSON queries and Typescript types for query results.",
   "keywords": [
     "SQL",
@@ -35,7 +35,7 @@
   "devDependencies": {
     "@types/ajv": "^1.0.0",
     "@types/jest": "^26.0.23",
-    "@types/lodash": "^4.14.169",
+    "@types/lodash": "^4.14.170",
     "@types/minimist": "^1.2.1",
     "@types/node": "^14.17.0",
     "@types/pg": "^7.14.11",

src/relations-md-generator.ts

@@ -70,21 +70,24 @@ function relationsJavaSource(dbmd: DatabaseMetadata): string
       relMd => relMd
     );
 
-  parts.push('public class Relations');
+  parts.push('public class RelationsMetadata');
   parts.push('{');
 
   for ( const [schema, relMds] of schemaToRelMdsMap.entries() )
   {
-    parts.push(`  public static class ${schema} = { // schema '${schema}'\n`);
+    parts.push(`  public static class ${schema} // schema '${schema}'`);
+    parts.push('  {');
 
     for ( const relMd of relMds )
     {
       parts.push(indentLines(relationMetadataJavaSource(relMd), 4));
     }
 
-    parts.push("}"); // close schema object
+    parts.push("  }"); // schema class
   }
 
+  parts.push("}"); // Relations class
+
   return parts.join('\n');
 }
 

src/result-types-source-generator.ts

@@ -227,26 +227,34 @@ function javaResultTypeDeclaration
   )
   : string
 {
-  const lines: string[] = [];
-  const resTypeName = resTypeNameAssignments.get(resType)!;
+  const fieldDecls: string[] = [];
+
+  resType.tableFieldProperties.forEach(f => {
+    const fieldType = tableFieldPropertyType(f, resType, customPropTypeFn, 'Java');
+    fieldDecls.push(`public ${fieldType} ${f.name};`);
+  });
+  resType.tableExpressionProperty.forEach(f => {
+    const fieldType = tableExpressionPropertyType(f, 'Java');
+    fieldDecls.push(`public ${fieldType} ${f.name};`);
+  });
+  resType.parentReferenceProperties.forEach(f => {
+    const fieldType = parentReferencePropertyType(f, resTypeNameAssignments, 'Java');
+    fieldDecls.push(`public ${fieldType} ${f.name};`);
+  });
+  resType.childCollectionProperties.forEach(f => {
+    const fieldType = childCollectionPropertyType(f, resTypeNameAssignments, customPropTypeFn, 'Java');
+    fieldDecls.push(`public ${fieldType} ${f.name};`);
+  });
 
-  lines.push(`public static class ${resTypeName}`);
-  lines.push('{');
-  resType.tableFieldProperties.forEach(f => lines.push('  ' +
-    `public ${tableFieldPropertyType(f, resType, customPropTypeFn, 'Java')} ${f.name};`
-  ));
-  resType.tableExpressionProperty.forEach(f => lines.push('  ' +
-    `public ${tableExpressionPropertyType(f, 'Java')} ${f.name};`
-  ));
-  resType.parentReferenceProperties.forEach(f => lines.push('  ' +
-    `public ${parentReferencePropertyType(f, resTypeNameAssignments, 'Java')} ${f.name};`
-  ));
-  resType.childCollectionProperties.forEach(f => lines.push('  ' +
-    `public ${childCollectionPropertyType(f, resTypeNameAssignments, customPropTypeFn, 'Java')} ${f.name};`
-  ));
-  lines.push('}')
+  const resTypeName = resTypeNameAssignments.get(resType)!;
 
-  return lines.join('\n');
+  return (
+    '@SuppressWarnings("nullness") // because fields will be set directly by the deserializer not by constructor\n' +
+    `public static class ${resTypeName}\n` +
+    '{\n' +
+    indentLines(fieldDecls.join('\n'), 2) + '\n' +
+    '}'
+  );
 }
 
 function tableFieldPropertyType