Change naming

ydb-platform · Jan 16, 2025 · 9d7f9fb · 9d7f9fb
1 parent 5fb040c
commit 9d7f9fb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/databind/src/main/java/tech/ydb/yoj/databind/schema/Column.java b/databind/src/main/java/tech/ydb/yoj/databind/schema/Column.java
@@ -81,16 +81,16 @@
     @ExperimentalApi(issue = "https://github.com/ydb-platform/yoj-project/issues/24")
     CustomValueType customValueType() default @CustomValueType(columnClass = Comparable.class, converter = NoConverter.class);
 
-    enum NamingStrategy {
+    enum ColumnNaming {
         @Deprecated LEGACY,
         ABSOLUTE,
         RELATIVE
     }
 
     /**
-     * LEGACY - Use parent name as prefix only if current(child) doesn't specify name explicityly
+     * LEGACY - Use parent name as prefix only if current(child) doesn't specify name explicitly
      * ABSOLUTE - Use only current name, don't add prent name as prefix
      * RELATIVE - Use current name and add parent name as prefix
      */
-    NamingStrategy namingStrategy() default NamingStrategy.LEGACY;
+    ColumnNaming columnNaming() default ColumnNaming.LEGACY;
 }
diff --git a/...bind/src/main/java/tech/ydb/yoj/databind/schema/naming/AnnotationFirstNamingStrategy.java b/...bind/src/main/java/tech/ydb/yoj/databind/schema/naming/AnnotationFirstNamingStrategy.java
@@ -40,11 +40,11 @@ private String getColumnName(Schema.JavaField field) {
 
         var name = (annotation.name().isEmpty()) ? field.getField().getName() : annotation.name();
 
-        if (annotation.namingStrategy() == Column.NamingStrategy.ABSOLUTE) {
+        if (annotation.columnNaming() == Column.ColumnNaming.ABSOLUTE) {
             return name;
-        } else if (annotation.namingStrategy() == Column.NamingStrategy.RELATIVE) {
+        } else if (annotation.columnNaming() == Column.ColumnNaming.RELATIVE) {
             return parentName + NAME_DELIMITER + name;
-        } else { // annotation.namingStrategy() == Column.NamingStrategy.LEGACY
+        } else { // annotation.columnNaming() == Column.ColumnNaming.LEGACY
             if (!annotation.name().isEmpty()) {
                 return annotation.name();
             }

diff --git a/databind/src/test/java/tech/ydb/yoj/databind/schema/naming/MixedEntity.java b/databind/src/test/java/tech/ydb/yoj/databind/schema/naming/MixedEntity.java
@@ -27,7 +27,7 @@ private static class Id {
 
     @Value
     static class SubEntityWithRelative {
-        @Column(name = "sfe_relative", namingStrategy = Column.NamingStrategy.RELATIVE)
+        @Column(name = "sfe_relative", columnNaming = Column.ColumnNaming.RELATIVE)
         SingleFieldEntity singleFieldEntityRelative;
     }
 }
diff --git a/databind/src/test/java/tech/ydb/yoj/databind/schema/naming/TestEntity.java b/databind/src/test/java/tech/ydb/yoj/databind/schema/naming/TestEntity.java
@@ -18,13 +18,13 @@ private static class Id {
     static class SubEntity {
         boolean boolValue;
 
-        @Column(namingStrategy = Column.NamingStrategy.ABSOLUTE)
+        @Column(columnNaming = Column.ColumnNaming.ABSOLUTE)
         boolean absoluteBoolValue;
 
         @Column(name = "sfe")
         SingleFieldEntity singleFieldEntity;
 
-        @Column(name = "sfe_absolute", namingStrategy = Column.NamingStrategy.ABSOLUTE)
+        @Column(name = "sfe_absolute", columnNaming = Column.ColumnNaming.ABSOLUTE)
         SingleFieldEntity singleFieldEntityAbsolute;
     }
 }