records

ldproxy · Jan 2, 2025 · 7dbe734 · 7dbe734
1 parent 6569161
commit 7dbe734
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/libxtracfg/js/types/java/data.ts b/libxtracfg/js/types/java/data.ts
@@ -58,7 +58,9 @@ public ${name}(`;
       }
       if (Object.hasOwn(entry, "default")) {
         code += `
-  this.${key} = Object.requireNonNullElse(${key},${getDefault(entry)});`;
+  this.${key} = java.util.Objects.requireNonNullElse(${key},${getDefault(
+          entry
+        )});`;
       } else {
         code += `
   this.${key} = ${key};`;
@@ -113,7 +115,9 @@ public ${name}(`;
       }
       if (Object.hasOwn(entry, "default")) {
         code += `
-  this.${key} = Object.requireNonNullElse(${key},${getDefault(entry)});`;
+  this.${key} = java.util.Objects.requireNonNullElse(${key},${getDefault(
+          entry
+        )});`;
       } else {
         code += `
   this.${key} = ${key};`;
@@ -125,7 +129,7 @@ public ${name}(`;
   `;
     for (const [key, entry] of props) {
       code += `
-public ${getType(entry, suffixNs)} get${firstLetterUpperCase(key)}() {
+public ${getType(entry, suffixNs)} ${key}() {
   return ${key};
 }
   `;
@@ -174,7 +178,7 @@ public interface ${name} {
   `;
     for (const [key, entry] of Object.entries(properties)) {
       code += `
-${getType(entry, suffixNs)} get${firstLetterUpperCase(key)}();
+${getType(entry, suffixNs)} ${key}();
   `;
     }