Code review changes

hpcc-systems · Oct 3, 2024 · bc8a339 · bc8a339
1 parent 110d7ad
commit bc8a339
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/commons-hpcc/src/main/java/org/hpccsystems/commons/ecl/FieldDef.java b/commons-hpcc/src/main/java/org/hpccsystems/commons/ecl/FieldDef.java
@@ -319,7 +319,7 @@ public boolean isUnsigned()
     }
 
     /**
-     * Is the underlying value biased?
+     * Is the underlying value biased? Deprecated in favor of isNonStandardInt.
      *
      * @return true when biased
      *

diff --git a/commons-hpcc/src/main/java/org/hpccsystems/commons/ecl/RecordDefinitionTranslator.java b/commons-hpcc/src/main/java/org/hpccsystems/commons/ecl/RecordDefinitionTranslator.java
@@ -34,6 +34,8 @@ public class RecordDefinitionTranslator
     private static final String CHILD_KEY             = "child";
     private static final String FLAGS_KEY             = "flags";
 
+    private static final String ESP_TYPE_NAME_PREFIX = "ty";
+
     private static final int    FLAG_UNSIGNED         = 256;
     private static final int    FLAG_UNKNOWN_SIZE     = 1024;
     private static final int    TYPE_ID_MASK          = 0xff;       // 0x7fff & ~FLAG_UNKNOWN_SIZE & ~FLAG_UNSIGNED;
@@ -460,7 +462,7 @@ public static JSONObject toJsonRecord(FieldDef field) throws Exception
                 continue;
             }
 
-            rootDefinition.put("ty" + (i + 1), typeDefinition);
+            rootDefinition.put(ESP_TYPE_NAME_PREFIX + (i + 1), typeDefinition);
         }
 
         return rootDefinition;
@@ -708,7 +710,7 @@ private static int getJsonTypeDefinition(FieldDef field, HashMap<Integer, Intege
 
                 int childTypeHash = getJsonTypeDefinition(field.getDef(0), typeDefinitionMap, typeDefinitions);
                 int childTypeIndex = typeDefinitionMap.get(childTypeHash);
-                String childTypeName = "ty" + (childTypeIndex + 1);
+                String childTypeName = ESP_TYPE_NAME_PREFIX + (childTypeIndex + 1);
                 typeDef.put("child", childTypeName);
                 break;
             }
@@ -750,7 +752,7 @@ private static int getJsonTypeDefinition(FieldDef field, HashMap<Integer, Intege
 
                     int childTypeHash = getJsonTypeDefinition(childField, typeDefinitionMap, typeDefinitions);
                     int childTypeIndex = typeDefinitionMap.get(childTypeHash);
-                    String childTypeName = "ty" + (childTypeIndex + 1);
+                    String childTypeName = ESP_TYPE_NAME_PREFIX + (childTypeIndex + 1);
                     int childTypeID = getTypeID(childField);
 
                     JSONObject childJson = new JSONObject();
@@ -792,7 +794,7 @@ else if (childField.getFieldType() == FieldType.SET)
 
             int childTypeHash = getJsonTypeDefinition(nonKeyedField, typeDefinitionMap, typeDefinitions);
             int childTypeIndex = typeDefinitionMap.get(childTypeHash);
-            String childTypeName = "ty" + (childTypeIndex + 1);
+            String childTypeName = ESP_TYPE_NAME_PREFIX + (childTypeIndex + 1);
             typeDef.put("child", childTypeName);
         }