Move proto mappings into the TopicClientImpl

Author: Daniil Zulin

topic/src/main/java/tech/ydb/topic/impl/TopicClientImpl.java

@@ -109,7 +109,7 @@ public CompletableFuture<Status> createTopic(String path, CreateTopicSettings se
                     .setMinActivePartitions(partitioningSettings.getMinActivePartitions())
                     .setPartitionCountLimit(partitioningSettings.getPartitionCountLimit())
                     .setAutoPartitioningSettings(YdbTopic.AutoPartitioningSettings.newBuilder()
-                            .setStrategy(partitioningSettings.getAutoPartitioningStrategy().getProtoReference())));
+                            .setStrategy(toProto(partitioningSettings.getAutoPartitioningStrategy()))));
 
             AutoPartitioningWriteStrategySettings writeStrategySettings = partitioningSettings
                     .getWriteStrategySettings();
@@ -166,7 +166,7 @@ public CompletableFuture<Status> alterTopic(String path, AlterTopicSettings sett
             }
             AutoPartitioningStrategy autoPartitioningStrategy = partitioningSettings.getAutoPartitioningStrategy();
             if (autoPartitioningStrategy != null) {
-                YdbTopic.AutoPartitioningStrategy protoReference = autoPartitioningStrategy.getProtoReference();
+                YdbTopic.AutoPartitioningStrategy protoReference = toProto(autoPartitioningStrategy);
                 builder.getAlterAutoPartitioningSettingsBuilder().setSetStrategy(protoReference);
             }
             AlterAutoPartitioningWriteStrategySettings writeStrategySettings = partitioningSettings
@@ -322,7 +322,7 @@ private TopicDescription mapDescribeTopic(YdbTopic.DescribeTopicResult result) {
         PartitioningSettings.Builder partitioningDescription = PartitioningSettings.newBuilder()
                 .setMinActivePartitions(partitioningSettings.getMinActivePartitions())
                 .setPartitionCountLimit(partitioningSettings.getPartitionCountLimit())
-                .setAutoPartitioningStrategy(AutoPartitioningStrategy.fromProto(autoPartitioningStrategy));
+                .setAutoPartitioningStrategy(fromProto(autoPartitioningStrategy));
 
         YdbTopic.AutoPartitioningWriteSpeedStrategy partitionWriteSpeed = autoPartitioningSettings
                 .getPartitionWriteSpeed();
@@ -449,6 +449,36 @@ private static YdbTopic.SupportedCodecs toProto(SupportedCodecs supportedCodecs)
         return codecsBuilder.build();
     }
 
+    private static AutoPartitioningStrategy fromProto(YdbTopic.AutoPartitioningStrategy autoPartitioningStrategy) {
+        switch (autoPartitioningStrategy) {
+            case AUTO_PARTITIONING_STRATEGY_PAUSED:
+                return AutoPartitioningStrategy.PAUSED;
+            case AUTO_PARTITIONING_STRATEGY_SCALE_UP:
+                return AutoPartitioningStrategy.SCALE_UP;
+            case AUTO_PARTITIONING_STRATEGY_SCALE_UP_AND_DOWN:
+                return AutoPartitioningStrategy.SCALE_UP_AND_DOWN;
+            case AUTO_PARTITIONING_STRATEGY_DISABLED:
+                return AutoPartitioningStrategy.DISABLED;
+            default:
+                return null;
+        }
+    }
+
+    private static YdbTopic.AutoPartitioningStrategy toProto(AutoPartitioningStrategy autoPartitioningStrategy) {
+        switch (autoPartitioningStrategy) {
+            case PAUSED:
+                return YdbTopic.AutoPartitioningStrategy.AUTO_PARTITIONING_STRATEGY_PAUSED;
+            case SCALE_UP:
+                return YdbTopic.AutoPartitioningStrategy.AUTO_PARTITIONING_STRATEGY_SCALE_UP;
+            case SCALE_UP_AND_DOWN:
+                return YdbTopic.AutoPartitioningStrategy.AUTO_PARTITIONING_STRATEGY_SCALE_UP_AND_DOWN;
+            case DISABLED:
+                return YdbTopic.AutoPartitioningStrategy.AUTO_PARTITIONING_STRATEGY_DISABLED;
+            default:
+                throw new IllegalArgumentException("Unknown auto partitioning strategy: " + autoPartitioningStrategy);
+        }
+    }
+
     @Override
     public void close() {
         logger.debug("TopicClientImpl.close() is called");

topic/src/main/java/tech/ydb/topic/settings/AutoPartitioningStrategy.java

@@ -1,48 +1,25 @@
 package tech.ydb.topic.settings;
 
-import javax.annotation.Nullable;
-
-import tech.ydb.proto.topic.YdbTopic;
-
 public enum AutoPartitioningStrategy {
     /**
      * The auto partitioning is disabled.
      * You cannot disable the auto partitioning after it has been enabled.
      * @see AutoPartitioningStrategy#PAUSED
      */
-    DISABLED(YdbTopic.AutoPartitioningStrategy.AUTO_PARTITIONING_STRATEGY_DISABLED),
+    DISABLED,
     /**
      * The auto partitioning algorithm will increase the partition count depending on the load characteristics.
      * The auto partitioning algorithm will never decrease the number of partitions.
      * @see AlterAutoPartitioningWriteStrategySettings
      */
-    SCALE_UP(YdbTopic.AutoPartitioningStrategy.AUTO_PARTITIONING_STRATEGY_SCALE_UP),
+    SCALE_UP,
     /**
      * The auto partitioning algorithm will both increase and decrease partitions count depending on the load characteristics.
      * @see AlterAutoPartitioningWriteStrategySettings
      */
-    SCALE_UP_AND_DOWN(YdbTopic.AutoPartitioningStrategy.AUTO_PARTITIONING_STRATEGY_SCALE_UP_AND_DOWN),
+    SCALE_UP_AND_DOWN,
     /**
      * The auto partitioning is paused.
      */
-    PAUSED(YdbTopic.AutoPartitioningStrategy.AUTO_PARTITIONING_STRATEGY_PAUSED);
-
-    private final YdbTopic.AutoPartitioningStrategy protoReference;
-
-    AutoPartitioningStrategy(YdbTopic.AutoPartitioningStrategy protoReference) {
-        this.protoReference = protoReference;
-    }
-
-    public YdbTopic.AutoPartitioningStrategy getProtoReference() {
-        return protoReference;
-    }
-
-    public static @Nullable AutoPartitioningStrategy fromProto(YdbTopic.AutoPartitioningStrategy protoReference) {
-        for (AutoPartitioningStrategy value : values()) {
-            if (value.getProtoReference() == protoReference) {
-                return value;
-            }
-        }
-        return null;
-    }
+    PAUSED;
 }