[asterixdb-clients] branch master updated: [NO ISSUE] Remove 'port' attribute

[dl...@apache.org]

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

dlych pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb-clients.git


The following commit(s) were added to refs/heads/master by this push:
     new d5cf95d  [NO ISSUE] Remove 'port' attribute
d5cf95d is described below

commit d5cf95dc201747f2d128d2f5546f48aba06adc98
Author: Dmitry Lychagin <dm...@couchbase.com>
AuthorDate: Thu Oct 14 14:41:53 2021 -0700

    [NO ISSUE] Remove 'port' attribute
    
    Details:
    - Removed 'port' attribute from connection dialog
    - Port can now be specified inside 'server' attribute
    
    Change-Id: I33e20b2f664ed91f6e68d234dc5551578be77c3f
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb-clients/+/13705
    Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Reviewed-by: Dmitry Lychagin <dm...@couchbase.com>
    Reviewed-by: Ian Maxon <im...@uci.edu>
---
 asterixdb-jdbc/asterix-jdbc-taco/pom.xml                              | 3 +--
 .../src/main/taco/plugins/asterixdb_jdbc/connection-dialog.tcd        | 1 -
 .../src/main/taco/plugins/asterixdb_jdbc/connection-fields.xml        | 4 +---
 .../src/main/taco/plugins/asterixdb_jdbc/connectionBuilder.js         | 3 +--
 .../src/main/taco/plugins/asterixdb_jdbc/connectionResolver.tdr       | 1 -
 5 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/asterixdb-jdbc/asterix-jdbc-taco/pom.xml b/asterixdb-jdbc/asterix-jdbc-taco/pom.xml
index 9223528..1a7c677 100644
--- a/asterixdb-jdbc/asterix-jdbc-taco/pom.xml
+++ b/asterixdb-jdbc/asterix-jdbc-taco/pom.xml
@@ -47,12 +47,11 @@
     <taco.plugin.vendor>Apache</taco.plugin.vendor>
     <taco.plugin.site>https://asterixdb.apache.org</taco.plugin.site>
     <taco.plugin.dialect>AsterixDB</taco.plugin.dialect>
-    <taco.plugin.port.default>19002</taco.plugin.port.default>
     <taco.plugin.database.label>Dataverse</taco.plugin.database.label>
     <taco.plugin.database.default>Default</taco.plugin.database.default>
     <taco.plugin.table.label>Dataset</taco.plugin.table.label>
     <taco.plugin.jdbc.scheme>jdbc:asterixdb://</taco.plugin.jdbc.scheme>
-    <taco.plugin.jdbc.properties.aux> </taco.plugin.jdbc.properties.aux>
+    <taco.plugin.jdbc.properties.aux/>
     <taco.plugin.auth.none><![CDATA[<option value="auth-none" label="No Authentication"/>]]></taco.plugin.auth.none>
 
     <taco.sourceDirectory>${project.basedir}/src/main/taco</taco.sourceDirectory>
diff --git a/asterixdb-jdbc/asterix-jdbc-taco/src/main/taco/plugins/asterixdb_jdbc/connection-dialog.tcd b/asterixdb-jdbc/asterix-jdbc-taco/src/main/taco/plugins/asterixdb_jdbc/connection-dialog.tcd
index 13a6edd..772fd58 100644
--- a/asterixdb-jdbc/asterix-jdbc-taco/src/main/taco/plugins/asterixdb_jdbc/connection-dialog.tcd
+++ b/asterixdb-jdbc/asterix-jdbc-taco/src/main/taco/plugins/asterixdb_jdbc/connection-dialog.tcd
@@ -24,7 +24,6 @@
     </authentication-options>
     <db-name-prompt value="${taco.plugin.database.label}: " />
     <has-pre-connect-database value="true" />
-    <port-prompt value="Port: " default="${taco.plugin.port.default}" />
     <show-ssl-checkbox value="false" />
   </connection-config>
 </connection-dialog>
diff --git a/asterixdb-jdbc/asterix-jdbc-taco/src/main/taco/plugins/asterixdb_jdbc/connection-fields.xml b/asterixdb-jdbc/asterix-jdbc-taco/src/main/taco/plugins/asterixdb_jdbc/connection-fields.xml
index e200852..89f1085 100644
--- a/asterixdb-jdbc/asterix-jdbc-taco/src/main/taco/plugins/asterixdb_jdbc/connection-fields.xml
+++ b/asterixdb-jdbc/asterix-jdbc-taco/src/main/taco/plugins/asterixdb_jdbc/connection-fields.xml
@@ -19,11 +19,9 @@
 <connection-fields>
 
   <field name="server" label="Server" category="endpoint" value-type="string">
-    <validation-rule reg-exp="^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$"/>
+    <validation-rule reg-exp="^[^/]+$"/>
   </field>
 
-  <field name="port" label="Port" category="endpoint" value-type="string" default-value="${taco.plugin.port.default}"/>
-
   <field name="authentication" label="Authentication" category="authentication" value-type="selection" >
     <selection-group>
       ${taco.plugin.auth.none}
diff --git a/asterixdb-jdbc/asterix-jdbc-taco/src/main/taco/plugins/asterixdb_jdbc/connectionBuilder.js b/asterixdb-jdbc/asterix-jdbc-taco/src/main/taco/plugins/asterixdb_jdbc/connectionBuilder.js
index dd1cbc7..cb7b464 100644
--- a/asterixdb-jdbc/asterix-jdbc-taco/src/main/taco/plugins/asterixdb_jdbc/connectionBuilder.js
+++ b/asterixdb-jdbc/asterix-jdbc-taco/src/main/taco/plugins/asterixdb_jdbc/connectionBuilder.js
@@ -19,8 +19,7 @@
 (function dsbuilder(attr) {
     var urlBuilder =
         "${taco.plugin.jdbc.scheme}" +
-        attr[connectionHelper.attributeServer] + ":" +
-        attr[connectionHelper.attributePort] + "/" +
+        attr[connectionHelper.attributeServer] + "/" +
         attr[connectionHelper.attributeDatabase] + "?";
     return [urlBuilder];
 })
diff --git a/asterixdb-jdbc/asterix-jdbc-taco/src/main/taco/plugins/asterixdb_jdbc/connectionResolver.tdr b/asterixdb-jdbc/asterix-jdbc-taco/src/main/taco/plugins/asterixdb_jdbc/connectionResolver.tdr
index 48543c0..311c577 100644
--- a/asterixdb-jdbc/asterix-jdbc-taco/src/main/taco/plugins/asterixdb_jdbc/connectionResolver.tdr
+++ b/asterixdb-jdbc/asterix-jdbc-taco/src/main/taco/plugins/asterixdb_jdbc/connectionResolver.tdr
@@ -25,7 +25,6 @@
       <required-attributes>
         <attribute-list>
           <attr>server</attr>
-          <attr>port</attr>
           <attr>dbname</attr>
           <attr>authentication</attr>
           <attr>username</attr>