Merge branch 'main' into hints

linkedin · Jul 21, 2023 · 5853fc4 · 5853fc4
2 parents 7a392e4 + da4bdb0
commit 5853fc4
Show file tree

Hide file tree

Showing 19 changed files with 51 additions and 44 deletions.
diff --git a/hoptimator-catalog/src/main/java/com/linkedin/hoptimator/catalog/ResourceProvider.java b/hoptimator-catalog/src/main/java/com/linkedin/hoptimator/catalog/ResourceProvider.java
@@ -166,13 +166,15 @@ static ResourceProvider from(Resource resource) {
     return x -> Collections.singleton(resource);
   }
 
+  /** A Resource that shouldn't be provided when reading from the table. */
   static class ReadResource extends Resource {
 
     public ReadResource(Resource resource) {
       super(resource);
     }
   }
 
+  /** A Resource that shouldn't be provided when wriring to the table. */
   static class WriteResource extends Resource {
 
     public WriteResource(Resource resource) {

diff --git a/hoptimator-cli/src/main/java/com/linkedin/hoptimator/HoptimatorCliApp.java b/hoptimator-cli/src/main/java/com/linkedin/hoptimator/HoptimatorCliApp.java
@@ -58,7 +58,7 @@ protected int run(String[] args) throws IOException {
 
   private static InsertInto parseInsertInto(String s) {
       String sql = s.trim();
-      if (!sql.startsWith("insert into ")) {
+      if (!startsWith(sql, "insert into ")) {
         throw new IllegalArgumentException("Expected insert into ... ");
       }
       String[] parts = sql.substring(12).split("(?i)SELECT"); // case insensitive
@@ -108,11 +108,11 @@ public String getHelpText() {
     @Override
     public String matches(String line) {
       String sql = line;
-      if (sql.startsWith(SqlLine.COMMAND_PREFIX)) {
+      if (startsWith(sql, SqlLine.COMMAND_PREFIX)) {
         sql = sql.substring(1);
       }
 
-      if (sql.startsWith("avro")) {
+      if (startsWith(sql, "avro")) {
         sql = sql.substring("avro".length() + 1);
         return sql;
       }
@@ -123,11 +123,11 @@ public String matches(String line) {
     @Override
     public void execute(String line, DispatchCallback dispatchCallback) {
       String sql = line;
-      if (sql.startsWith(SqlLine.COMMAND_PREFIX)) {
+      if (startsWith(sql, SqlLine.COMMAND_PREFIX)) {
         sql = sql.substring(1);
       }
 
-      if (sql.startsWith("avro")) {
+      if (startsWith(sql, "avro")) {
         sql = sql.substring("avro".length() + 1);
       }
 
@@ -175,11 +175,11 @@ public String getHelpText() {
     @Override
     public String matches(String line) {
       String sql = line;
-      if (sql.startsWith(SqlLine.COMMAND_PREFIX)) {
+      if (startsWith(sql, SqlLine.COMMAND_PREFIX)) {
         sql = sql.substring(1);
       }
 
-      if (sql.startsWith("yaml insert into ")) {
+      if (startsWith(sql, "yaml insert into ")) {
         sql = sql.substring("yaml insert into ".length());
         return sql;
       }
@@ -190,11 +190,11 @@ public String matches(String line) {
     @Override
     public void execute(String line, DispatchCallback dispatchCallback) {
       String sql = line;
-      if (sql.startsWith(SqlLine.COMMAND_PREFIX)) {
+      if (startsWith(sql, SqlLine.COMMAND_PREFIX)) {
         sql = sql.substring(1);
       }
 
-      if (sql.startsWith("yaml")) {
+      if (startsWith(sql, "yaml")) {
         sql = sql.substring("yaml".length() + 1);
       }
 
@@ -249,11 +249,11 @@ public String getHelpText() {
     @Override
     public String matches(String line) {
       String sql = line;
-      if (sql.startsWith(SqlLine.COMMAND_PREFIX)) {
+      if (startsWith(sql, SqlLine.COMMAND_PREFIX)) {
         sql = sql.substring(1);
       }
 
-      if (sql.startsWith("pipeline")) {
+      if (startsWith(sql, "pipeline")) {
         sql = sql.substring("pipeline".length() + 1);
         return sql;
       }
@@ -264,11 +264,11 @@ public String matches(String line) {
     @Override
     public void execute(String line, DispatchCallback dispatchCallback) {
       String sql = line;
-      if (sql.startsWith(SqlLine.COMMAND_PREFIX)) {
+      if (startsWith(sql, SqlLine.COMMAND_PREFIX)) {
         sql = sql.substring(1);
       }
 
-      if (sql.startsWith("pipeline")) {
+      if (startsWith(sql, "pipeline")) {
         sql = sql.substring("pipeline".length() + 1);
       }
 
@@ -323,11 +323,11 @@ public String getHelpText() {
     @Override
     public String matches(String line) {
       String sql = line;
-      if (sql.startsWith(SqlLine.COMMAND_PREFIX)) {
+      if (startsWith(sql, SqlLine.COMMAND_PREFIX)) {
         sql = sql.substring(1);
       }
 
-      if (sql.startsWith("check")) {
+      if (startsWith(sql, "check")) {
         sql = sql.substring("check".length() + 1);
         return sql;
       }
@@ -338,11 +338,11 @@ public String matches(String line) {
     @Override
     public void execute(String line, DispatchCallback dispatchCallback) {
       String sql = line;
-      if (sql.startsWith(SqlLine.COMMAND_PREFIX)) {
+      if (startsWith(sql, SqlLine.COMMAND_PREFIX)) {
         sql = sql.substring(1);
       }
 
-      if (sql.startsWith("check")) {
+      if (startsWith(sql, "check")) {
         sql = sql.substring("check".length() + 1);
       }
 
@@ -448,11 +448,11 @@ public String getHelpText() {
     @Override
     public String matches(String line) {
       String sql = line;
-      if (sql.startsWith(SqlLine.COMMAND_PREFIX)) {
+      if (startsWith(sql, SqlLine.COMMAND_PREFIX)) {
         sql = sql.substring(1);
       }
 
-      if (sql.startsWith("insert into")) {
+      if (startsWith(sql, "insert into")) {
         sql = sql.substring("insert into".length() + 1);
         return sql;
       }
@@ -463,7 +463,7 @@ public String matches(String line) {
     @Override
     public void execute(String line, DispatchCallback dispatchCallback) {
       String sql = line;
-      if (sql.startsWith(SqlLine.COMMAND_PREFIX)) {
+      if (startsWith(sql, SqlLine.COMMAND_PREFIX)) {
         sql = sql.substring(1);
       }
 
@@ -526,7 +526,7 @@ public String getHelpText() {
 
     @Override
     public String matches(String line) {
-      if (line.startsWith("!intro") || line.startsWith("intro")) {
+      if (startsWith(line, "!intro") || startsWith(line, "intro")) {
         return line;
       } else {
         return null;
@@ -572,11 +572,11 @@ public String getHelpText() {
     @Override
     public String matches(String line) {
       String sql = line;
-      if (sql.startsWith(SqlLine.COMMAND_PREFIX)) {
+      if (startsWith(sql, SqlLine.COMMAND_PREFIX)) {
         sql = sql.substring(1);
       }
 
-      if (sql.startsWith("mermaid insert into ")) {
+      if (startsWith(sql, "mermaid insert into ")) {
         sql = sql.substring("mermaid insert into ".length());
         return sql;
       }
@@ -587,11 +587,11 @@ public String matches(String line) {
     @Override
     public void execute(String line, DispatchCallback dispatchCallback) {
       String sql = line;
-      if (sql.startsWith(SqlLine.COMMAND_PREFIX)) {
+      if (startsWith(sql, SqlLine.COMMAND_PREFIX)) {
         sql = sql.substring(1);
       }
 
-      if (sql.startsWith("mermaid ")) {
+      if (startsWith(sql, "mermaid ")) {
         sql = sql.substring("mermaid ".length());
       }
 
@@ -627,4 +627,9 @@ public boolean echoToFile() {
       return false;
     }
   }
+
+  // case-insensitive prefix match
+  static boolean startsWith(String s, String prefix) {
+    return s.matches("(?i)" + prefix + ".*");
+  }
 }
diff --git a/hoptimator-kafka-adapter/src/main/java/com/linkedin/hoptimator/catalog/kafka/KafkaTopic.java b/hoptimator-kafka-adapter/src/main/java/com/linkedin/hoptimator/catalog/kafka/KafkaTopic.java
@@ -6,7 +6,7 @@
 import java.util.Collections;
 import java.util.Map;
 
-public class KafkaTopic extends Resource {
+class KafkaTopic extends Resource {
   public KafkaTopic(String name, Map<String, String> clientOverrides) {
     super("KafkaTopic");
     export("name", name);

diff --git a/...ator-kafka-adapter/src/main/java/com/linkedin/hoptimator/catalog/kafka/KafkaTopicAcl.java b/...ator-kafka-adapter/src/main/java/com/linkedin/hoptimator/catalog/kafka/KafkaTopicAcl.java
@@ -2,10 +2,10 @@
 
 import com.linkedin.hoptimator.catalog.Resource;
 
-public class KafkaTopicAcl extends Resource {
-  public KafkaTopicAcl(String name, String principal, String method) {
+class KafkaTopicAcl extends Resource {
+  public KafkaTopicAcl(String topicName, String principal, String method) {
     super("KafkaTopicAcl");
-    export("name", name);
+    export("topicName", topicName);
     export("principal", principal);
     export("method", method);
   }

diff --git a/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1Acl.java b/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1Acl.java
@@ -31,7 +31,7 @@
  * Access control rule (colloquially, an Acl)
  */
 @ApiModel(description = "Access control rule (colloquially, an Acl)")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-19T22:31:00.312Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-21T22:04:16.918Z[Etc/UTC]")
 public class V1alpha1Acl implements io.kubernetes.client.common.KubernetesObject {
   public static final String SERIALIZED_NAME_API_VERSION = "apiVersion";
   @SerializedName(SERIALIZED_NAME_API_VERSION)

diff --git a/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1AclList.java b/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1AclList.java
@@ -32,7 +32,7 @@
  * AclList is a list of Acl
  */
 @ApiModel(description = "AclList is a list of Acl")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-19T22:31:00.312Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-21T22:04:16.918Z[Etc/UTC]")
 public class V1alpha1AclList implements io.kubernetes.client.common.KubernetesListObject {
   public static final String SERIALIZED_NAME_API_VERSION = "apiVersion";
   @SerializedName(SERIALIZED_NAME_API_VERSION)

diff --git a/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1AclSpec.java b/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1AclSpec.java
@@ -29,7 +29,7 @@
  * A set of related ACL rules.
  */
 @ApiModel(description = "A set of related ACL rules.")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-19T22:31:00.312Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-21T22:04:16.918Z[Etc/UTC]")
 public class V1alpha1AclSpec {
   /**
    * The resource access method.

diff --git a/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1AclSpecResource.java b/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1AclSpecResource.java
@@ -28,7 +28,7 @@
  * The resource being controlled.
  */
 @ApiModel(description = "The resource being controlled.")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-19T22:31:00.312Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-21T22:04:16.918Z[Etc/UTC]")
 public class V1alpha1AclSpecResource {
   public static final String SERIALIZED_NAME_KIND = "kind";
   @SerializedName(SERIALIZED_NAME_KIND)

diff --git a/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1AclStatus.java b/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1AclStatus.java
@@ -28,7 +28,7 @@
  * Status, as set by the operator.
  */
 @ApiModel(description = "Status, as set by the operator.")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-19T22:31:00.312Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-21T22:04:16.918Z[Etc/UTC]")
 public class V1alpha1AclStatus {
   public static final String SERIALIZED_NAME_MESSAGE = "message";
   @SerializedName(SERIALIZED_NAME_MESSAGE)

diff --git a/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1KafkaTopic.java b/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1KafkaTopic.java
@@ -31,7 +31,7 @@
  * Kafka Topic
  */
 @ApiModel(description = "Kafka Topic")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-19T22:31:00.312Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-21T22:04:16.918Z[Etc/UTC]")
 public class V1alpha1KafkaTopic implements io.kubernetes.client.common.KubernetesObject {
   public static final String SERIALIZED_NAME_API_VERSION = "apiVersion";
   @SerializedName(SERIALIZED_NAME_API_VERSION)

diff --git a/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1KafkaTopicList.java b/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1KafkaTopicList.java
@@ -32,7 +32,7 @@
  * KafkaTopicList is a list of KafkaTopic
  */
 @ApiModel(description = "KafkaTopicList is a list of KafkaTopic")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-19T22:31:00.312Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-21T22:04:16.918Z[Etc/UTC]")
 public class V1alpha1KafkaTopicList implements io.kubernetes.client.common.KubernetesListObject {
   public static final String SERIALIZED_NAME_API_VERSION = "apiVersion";
   @SerializedName(SERIALIZED_NAME_API_VERSION)

diff --git a/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1KafkaTopicSpec.java b/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1KafkaTopicSpec.java
@@ -33,7 +33,7 @@
  * Desired Kafka topic configuration.
  */
 @ApiModel(description = "Desired Kafka topic configuration.")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-19T22:31:00.312Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-21T22:04:16.918Z[Etc/UTC]")
 public class V1alpha1KafkaTopicSpec {
   public static final String SERIALIZED_NAME_CLIENT_CONFIGS = "clientConfigs";
   @SerializedName(SERIALIZED_NAME_CLIENT_CONFIGS)

diff --git a/...els/src/main/java/com/linkedin/hoptimator/models/V1alpha1KafkaTopicSpecClientConfigs.java b/...els/src/main/java/com/linkedin/hoptimator/models/V1alpha1KafkaTopicSpecClientConfigs.java
@@ -28,7 +28,7 @@
 /**
  * V1alpha1KafkaTopicSpecClientConfigs
  */
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-19T22:31:00.312Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-21T22:04:16.918Z[Etc/UTC]")
 public class V1alpha1KafkaTopicSpecClientConfigs {
   public static final String SERIALIZED_NAME_CONFIG_MAP_REF = "configMapRef";
   @SerializedName(SERIALIZED_NAME_CONFIG_MAP_REF)

diff --git a/...dels/src/main/java/com/linkedin/hoptimator/models/V1alpha1KafkaTopicSpecConfigMapRef.java b/...dels/src/main/java/com/linkedin/hoptimator/models/V1alpha1KafkaTopicSpecConfigMapRef.java
@@ -28,7 +28,7 @@
  * Reference to a ConfigMap to use for AdminClient configuration.
  */
 @ApiModel(description = "Reference to a ConfigMap to use for AdminClient configuration.")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-19T22:31:00.312Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-21T22:04:16.918Z[Etc/UTC]")
 public class V1alpha1KafkaTopicSpecConfigMapRef {
   public static final String SERIALIZED_NAME_NAME = "name";
   @SerializedName(SERIALIZED_NAME_NAME)

diff --git a/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1KafkaTopicStatus.java b/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1KafkaTopicStatus.java
@@ -28,7 +28,7 @@
  * Current state of the topic.
  */
 @ApiModel(description = "Current state of the topic.")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-19T22:31:00.312Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-21T22:04:16.918Z[Etc/UTC]")
 public class V1alpha1KafkaTopicStatus {
   public static final String SERIALIZED_NAME_MESSAGE = "message";
   @SerializedName(SERIALIZED_NAME_MESSAGE)

diff --git a/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1Subscription.java b/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1Subscription.java
@@ -31,7 +31,7 @@
  * Hoptimator Subscription
  */
 @ApiModel(description = "Hoptimator Subscription")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-19T22:31:00.312Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-21T22:04:16.918Z[Etc/UTC]")
 public class V1alpha1Subscription implements io.kubernetes.client.common.KubernetesObject {
   public static final String SERIALIZED_NAME_API_VERSION = "apiVersion";
   @SerializedName(SERIALIZED_NAME_API_VERSION)

diff --git a/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1SubscriptionList.java b/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1SubscriptionList.java
@@ -32,7 +32,7 @@
  * SubscriptionList is a list of Subscription
  */
 @ApiModel(description = "SubscriptionList is a list of Subscription")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-19T22:31:00.312Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-21T22:04:16.918Z[Etc/UTC]")
 public class V1alpha1SubscriptionList implements io.kubernetes.client.common.KubernetesListObject {
   public static final String SERIALIZED_NAME_API_VERSION = "apiVersion";
   @SerializedName(SERIALIZED_NAME_API_VERSION)

diff --git a/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1SubscriptionSpec.java b/hoptimator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1SubscriptionSpec.java
@@ -31,7 +31,7 @@
  * Subscription spec
  */
 @ApiModel(description = "Subscription spec")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-19T22:31:00.312Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-21T22:04:16.918Z[Etc/UTC]")
 public class V1alpha1SubscriptionSpec {
   public static final String SERIALIZED_NAME_DATABASE = "database";
   @SerializedName(SERIALIZED_NAME_DATABASE)

diff --git a/...mator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1SubscriptionStatus.java b/...mator-models/src/main/java/com/linkedin/hoptimator/models/V1alpha1SubscriptionStatus.java
@@ -30,7 +30,7 @@
  * Filled in by the operator.
  */
 @ApiModel(description = "Filled in by the operator.")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-19T22:31:00.312Z[Etc/UTC]")
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2023-07-21T22:04:16.918Z[Etc/UTC]")
 public class V1alpha1SubscriptionStatus {
   public static final String SERIALIZED_NAME_MESSAGE = "message";
   @SerializedName(SERIALIZED_NAME_MESSAGE)