[linkis] branch dev-1.3.3 updated: [Bugfix] engine version support hyphen (#4246)

[pe...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

peacewong pushed a commit to branch dev-1.3.3
in repository https://gitbox.apache.org/repos/asf/linkis.git


The following commit(s) were added to refs/heads/dev-1.3.3 by this push:
     new 436f90d7a [Bugfix] engine version support hyphen (#4246)
436f90d7a is described below

commit 436f90d7a08cb495762e67f41b42ecfecb051511
Author: GuoPhilipse <46...@users.noreply.github.com>
AuthorDate: Tue Feb 21 19:29:48 2023 +0800

    [Bugfix] engine version support hyphen (#4246)
    
    * EngineTypeLabel support "-"
---
 .../label/entity/engine/EngineTypeLabel.java       | 15 +++++++
 .../label/entity/engine/EngineTypeLabelTest.java   | 47 ++++++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineTypeLabel.java b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineTypeLabel.java
index 09492b146..912f6c9f9 100644
--- a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineTypeLabel.java
+++ b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineTypeLabel.java
@@ -74,4 +74,19 @@ public class EngineTypeLabel extends GenericLabel implements EngineNodeLabel, EM
   public Boolean isEmpty() {
     return StringUtils.isBlank(getEngineType()) || StringUtils.isBlank(getVersion());
   }
+
+  @Override
+  protected void setStringValue(String stringValue) {
+    String version;
+    String engineType = stringValue.split("-")[0];
+
+    if (engineType.equals("*")) {
+      version = stringValue.replaceFirst("[" + engineType + "]-", "");
+    } else {
+      version = stringValue.replaceFirst(engineType + "-", "");
+    }
+
+    setEngineType(engineType);
+    setVersion(version);
+  }
 }
diff --git a/linkis-computation-governance/linkis-manager/linkis-label-common/src/test/java/org/apache/linkis/manager/label/entity/engine/EngineTypeLabelTest.java b/linkis-computation-governance/linkis-manager/linkis-label-common/src/test/java/org/apache/linkis/manager/label/entity/engine/EngineTypeLabelTest.java
new file mode 100644
index 000000000..cc4171b43
--- /dev/null
+++ b/linkis-computation-governance/linkis-manager/linkis-label-common/src/test/java/org/apache/linkis/manager/label/entity/engine/EngineTypeLabelTest.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.linkis.manager.label.entity.engine;
+
+import org.apache.linkis.manager.label.builder.factory.LabelBuilderFactory;
+import org.apache.linkis.manager.label.builder.factory.LabelBuilderFactoryContext;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/** EngineTypeLabel Tester */
+public class EngineTypeLabelTest {
+
+  @Test
+  public void testSetStringValue() {
+    String engineType = "hive";
+    String version = "1.1.0-cdh5.12.0";
+
+    String engineType1 = "*";
+    String version1 = "*";
+
+    LabelBuilderFactory labelBuilderFactory = LabelBuilderFactoryContext.getLabelBuilderFactory();
+    EngineTypeLabel engineTypeLabel = labelBuilderFactory.createLabel(EngineTypeLabel.class);
+    engineTypeLabel.setStringValue(engineType + "-" + version);
+    Assertions.assertEquals(engineTypeLabel.getEngineType(), engineType);
+    Assertions.assertEquals(engineTypeLabel.getVersion(), version);
+
+    engineTypeLabel.setStringValue(engineType1 + "-" + version1);
+    Assertions.assertEquals(engineTypeLabel.getEngineType(), engineType1);
+    Assertions.assertEquals(engineTypeLabel.getVersion(), version1);
+  }
+}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org