Merge branch 'devel' into fix/cb-3884/tree-empty-flickering

dbeaver · Mar 15, 2024 · 3f25bf0 · 3f25bf0
2 parents f086e70 + 25b895c
commit 3f25bf0
Show file tree

Hide file tree

Showing 59 changed files with 148 additions and 113 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -23,15 +23,12 @@
       "name": "CloudBeaver CE",
       "cwd": "${workspaceFolder}/../opt/cbce",
       "request": "launch",
-      "mainClass": "org.eclipse.equinox.launcher.Main",
+      "mainClass": "org.jkiss.dbeaver.launcher.DBeaverLauncher",
       "windows": {
         "type": "java",
         "name": "CloudBeaver CE",
         "request": "launch",
-        "mainClass": "org.eclipse.equinox.launcher.Main",
-        "classPaths": [
-          "${workspaceFolder}/../eclipse/eclipse/plugins/org.eclipse.equinox.launcher_1.6.600.v20231106-1826.jar"
-        ],
+        "mainClass": "org.jkiss.dbeaver.launcher.DBeaverLauncher",
         "args": [
           "-product",
           "io.cloudbeaver.product.ce.product",
@@ -63,10 +60,7 @@
         "type": "java",
         "name": "CloudBeaver CE",
         "request": "launch",
-        "mainClass": "org.eclipse.equinox.launcher.Main",
-        "classPaths": [
-          "${workspaceFolder}/../eclipse/Eclipse.app/Contents/Eclipse/plugins/org.eclipse.equinox.launcher_1.6.600.v20231106-1826.jar"
-        ],
+        "mainClass": "org.jkiss.dbeaver.launcher.DBeaverLauncher",
         "args": [
           "-product",
           "io.cloudbeaver.product.ce.product",

diff --git a/deploy/scripts/run-server.bat b/deploy/scripts/run-server.bat
@@ -1,5 +1,5 @@
 @echo off
-for /f %%a in ('dir /B /S server\plugins\org.eclipse.equinox.launcher*.jar') do SET launcherJar="%%a"
+for /f %%a in ('dir /B /S server\plugins\org.jkiss.dbeaver.launcher*.jar') do SET launcherJar="%%a"
 
 echo "Starting Cloudbeaver Server"
 

diff --git a/deploy/scripts/run-server.sh b/deploy/scripts/run-server.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-launcherJar=( server/plugins/org.eclipse.equinox.launcher*.jar )
+launcherJar=( server/plugins/org.jkiss.dbeaver.launcher*.jar )
 
 echo "Starting Cloudbeaver Server"
 

diff --git a/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Model
 Bundle-SymbolicName: io.cloudbeaver.model;singleton:=true
-Bundle-Version: 1.0.48.qualifier
-Bundle-Release-Date: 20240304
+Bundle-Version: 1.0.49.qualifier
+Bundle-Release-Date: 20240325
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .

diff --git a/server/bundles/io.cloudbeaver.model/pom.xml b/server/bundles/io.cloudbeaver.model/pom.xml
@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.model</artifactId>
-    <version>1.0.48-SNAPSHOT</version>
+    <version>1.0.49-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.product.ce/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Community Product
 Bundle-SymbolicName: io.cloudbeaver.product.ce;singleton:=true
-Bundle-Version: 24.0.0.qualifier
-Bundle-Release-Date: 20240304
+Bundle-Version: 24.0.1.qualifier
+Bundle-Release-Date: 20240325
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .

diff --git a/server/bundles/io.cloudbeaver.product.ce/pom.xml b/server/bundles/io.cloudbeaver.product.ce/pom.xml
@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.product.ce</artifactId>
-    <version>24.0.0-SNAPSHOT</version>
+    <version>24.0.1-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/server/bundles/io.cloudbeaver.resources.drivers.base/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.resources.drivers.base/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Base JDBC drivers
 Bundle-SymbolicName: io.cloudbeaver.resources.drivers.base;singleton:=true
-Bundle-Version: 1.0.93.qualifier
-Bundle-Release-Date: 20240304
+Bundle-Version: 1.0.94.qualifier
+Bundle-Release-Date: 20240325
 Bundle-Vendor: DBeaver Corp
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: io.cloudbeaver.resources.drivers.base
diff --git a/server/bundles/io.cloudbeaver.resources.drivers.base/pom.xml b/server/bundles/io.cloudbeaver.resources.drivers.base/pom.xml
@@ -9,6 +9,6 @@
     <relativePath>../</relativePath>
   </parent>
   <artifactId>io.cloudbeaver.resources.drivers.base</artifactId>
-  <version>1.0.93-SNAPSHOT</version>
+  <version>1.0.94-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.server/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Server
 Bundle-SymbolicName: io.cloudbeaver.server;singleton:=true
-Bundle-Version: 24.0.0.qualifier
-Bundle-Release-Date: 20240304
+Bundle-Version: 24.0.1.qualifier
+Bundle-Release-Date: 20240325
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: io.cloudbeaver.server.CBPlatformActivator

diff --git a/server/bundles/io.cloudbeaver.server/pom.xml b/server/bundles/io.cloudbeaver.server/pom.xml
@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.server</artifactId>
-    <version>24.0.0-SNAPSHOT</version>
+    <version>24.0.1-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/...bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jobs/WebDataSourceMonitorJob.java b/...bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jobs/WebDataSourceMonitorJob.java
@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2023 DBeaver Corp and others
+ * Copyright (C) 2010-2024 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,16 +18,13 @@
 
 import io.cloudbeaver.model.session.BaseWebSession;
 import io.cloudbeaver.model.session.WebSession;
-import io.cloudbeaver.server.CBApplication;
 import io.cloudbeaver.server.CBPlatform;
+import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.model.DBPDataSource;
-import org.jkiss.dbeaver.model.DBPDataSourceContainer;
 import org.jkiss.dbeaver.model.app.DBPPlatform;
-import org.jkiss.dbeaver.model.auth.SMSession;
-import org.jkiss.dbeaver.model.websocket.event.WSEventType;
+import org.jkiss.dbeaver.model.app.DBPProject;
 import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceEvent;
 import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceProperty;
-import org.jkiss.dbeaver.runtime.DBWorkbench;
 import org.jkiss.dbeaver.runtime.jobs.DataSourceMonitorJob;
 
 import java.util.Collection;
@@ -46,22 +43,23 @@ public WebDataSourceMonitorJob(DBPPlatform platform) {
     protected void doJob() {
         Collection<BaseWebSession> allSessions = CBPlatform.getInstance().getSessionManager().getAllActiveSessions();
         allSessions.parallelStream().forEach(s -> {
-            checkDataSourceAliveInWorkspace(s.getWorkspace(), s::getLastAccessTimeMillis);
+            checkDataSourceAliveInWorkspace(s.getWorkspace(), s.getLastAccessTimeMillis());
         });
 
     }
 
     @Override
-    public void showNotification(DBPDataSource dataSource, DBPDataSourceContainer dsDescriptor, SMSession smSession) {
-        if (smSession instanceof WebSession webSession) {
-            webSession.addSessionEvent( //TODO: Add new event for disconnect datasource
-                    WSDataSourceEvent.update(
-                        webSession.getSessionId(),
-                        webSession.getUserId(),
-                        dsDescriptor.getProject().getId(),
-                        List.of(dsDescriptor.getId()),
-                        WSDataSourceProperty.CONFIGURATION)
-            );
+    protected void showNotification(@NotNull DBPDataSource dataSource) {
+        final DBPProject project = dataSource.getContainer().getProject();
+        if (project.getWorkspaceSession() instanceof WebSession webSession) {
+            // TODO: Add new event for disconnect datasource
+            webSession.addSessionEvent(WSDataSourceEvent.update(
+                webSession.getSessionId(),
+                webSession.getUserId(),
+                project.getId(),
+                List.of(dataSource.getContainer().getId()),
+                WSDataSourceProperty.CONFIGURATION
+            ));
         }
     }
 }
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java
@@ -585,12 +585,19 @@ private DBSDataManipulator generateUpdateResultsDataBatch(
 
                     Object[] rowValues = new Object[updateAttributes.length + keyAttributes.length];
                     // put key values first in case of updating them
+                    DBDDocument document = null;
                     for (int i = 0; i < keyAttributes.length; i++) {
                         DBDAttributeBinding keyAttribute = keyAttributes[i];
                         boolean isDocumentValue = keyAttributes.length == 1 && keyAttribute.getDataKind() == DBPDataKind.DOCUMENT && dataContainer instanceof DBSDocumentLocator;
                         if (isDocumentValue) {
-                            rowValues[updateAttributes.length + i] =
-                                makeDocumentInputValue(session, (DBSDocumentLocator) dataContainer, resultsInfo, row, metaData);
+                            document = makeDocumentInputValue(
+                                session,
+                                (DBSDocumentLocator) dataContainer,
+                                resultsInfo,
+                                row,
+                                metaData
+                            );
+                            rowValues[updateAttributes.length + i] = document;
                         } else {
                             rowValues[updateAttributes.length + i] = keyAttribute.getValueHandler().getValueFromObject(
                                 session,
@@ -610,6 +617,9 @@ private DBSDataManipulator generateUpdateResultsDataBatch(
                         DBDAttributeBinding updateAttribute = updateAttributes[i];
                         Object value = updateValues.get(String.valueOf(updateAttribute.getOrdinalPosition()));
                         Object realCellValue = setCellRowValue(value, webSession, session, updateAttribute, withoutExecution);
+                        if (document instanceof DBDComposite compositeDoc) {
+                            compositeDoc.setAttributeValue(updateAttribute, realCellValue);
+                        }
                         rowValues[i] = realCellValue;
                         finalRow[updateAttribute.getOrdinalPosition()] = realCellValue;
                     }

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLUtils.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLUtils.java
@@ -150,6 +150,13 @@ private static Object serializeContentValue(WebSession session, DBDContent value
         Map<String, Object> map = createMapOfType(WebSQLConstants.VALUE_TYPE_CONTENT);
         if (ContentUtils.isTextContent(value)) {
             String stringValue = ContentUtils.getContentStringValue(session.getProgressMonitor(), value);
+            int textPreviewMaxLength = CommonUtils.toInt(
+                CBApplication.getInstance().getAppConfiguration().getResourceQuota(
+                    WebSQLConstants.QUOTA_PROP_TEXT_PREVIEW_MAX_LENGTH,
+                    WebSQLConstants.TEXT_PREVIEW_MAX_LENGTH));
+            if (stringValue != null && stringValue.length() > textPreviewMaxLength) {
+                stringValue =  stringValue.substring(0, textPreviewMaxLength);
+            }
             map.put(WebSQLConstants.ATTR_TEXT, stringValue);
         } else {
             map.put(WebSQLConstants.ATTR_BINARY, true);

diff --git a/server/bundles/io.cloudbeaver.service.admin/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.admin/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Service - Administration
 Bundle-SymbolicName: io.cloudbeaver.service.admin;singleton:=true
-Bundle-Version: 1.0.92.qualifier
-Bundle-Release-Date: 20240304
+Bundle-Version: 1.0.93.qualifier
+Bundle-Release-Date: 20240325
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .

diff --git a/server/bundles/io.cloudbeaver.service.admin/pom.xml b/server/bundles/io.cloudbeaver.service.admin/pom.xml
@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.service.admin</artifactId>
-    <version>1.0.92-SNAPSHOT</version>
+    <version>1.0.93-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/server/bundles/io.cloudbeaver.service.auth/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.auth/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Service - Authentication
 Bundle-SymbolicName: io.cloudbeaver.service.auth;singleton:=true
-Bundle-Version: 1.0.92.qualifier
-Bundle-Release-Date: 20240304
+Bundle-Version: 1.0.93.qualifier
+Bundle-Release-Date: 20240325
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .

diff --git a/server/bundles/io.cloudbeaver.service.auth/pom.xml b/server/bundles/io.cloudbeaver.service.auth/pom.xml
@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.service.auth</artifactId>
-    <version>1.0.92-SNAPSHOT</version>
+    <version>1.0.93-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/server/bundles/io.cloudbeaver.service.data.transfer/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.data.transfer/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Service - Data Transfer
 Bundle-SymbolicName: io.cloudbeaver.service.data.transfer;singleton:=true
-Bundle-Version: 1.0.93.qualifier
-Bundle-Release-Date: 20240304
+Bundle-Version: 1.0.94.qualifier
+Bundle-Release-Date: 20240325
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .

diff --git a/server/bundles/io.cloudbeaver.service.data.transfer/pom.xml b/server/bundles/io.cloudbeaver.service.data.transfer/pom.xml
@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.service.data.transfer</artifactId>
-    <version>1.0.93-SNAPSHOT</version>
+    <version>1.0.94-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/server/bundles/io.cloudbeaver.service.fs/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.fs/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Service - File System
 Bundle-SymbolicName: io.cloudbeaver.service.fs;singleton:=true
-Bundle-Version: 1.0.10.qualifier
-Bundle-Release-Date: 20240304
+Bundle-Version: 1.0.11.qualifier
+Bundle-Release-Date: 20240325
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .

diff --git a/server/bundles/io.cloudbeaver.service.fs/pom.xml b/server/bundles/io.cloudbeaver.service.fs/pom.xml
@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.service.fs</artifactId>
-    <version>1.0.10-SNAPSHOT</version>
+    <version>1.0.11-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/server/bundles/io.cloudbeaver.service.metadata/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.metadata/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Service - Metadata
 Bundle-SymbolicName: io.cloudbeaver.service.metadata;singleton:=true
-Bundle-Version: 1.0.96.qualifier
-Bundle-Release-Date: 20240304
+Bundle-Version: 1.0.97.qualifier
+Bundle-Release-Date: 20240325
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .

diff --git a/server/bundles/io.cloudbeaver.service.metadata/pom.xml b/server/bundles/io.cloudbeaver.service.metadata/pom.xml
@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.service.metadata</artifactId>
-    <version>1.0.96-SNAPSHOT</version>
+    <version>1.0.97-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/server/bundles/io.cloudbeaver.service.rm.nio/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.rm.nio/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Resource manager NIO implementation
 Bundle-SymbolicName: io.cloudbeaver.service.rm.nio;singleton:=true
-Bundle-Version: 1.0.10.qualifier
-Bundle-Release-Date: 20240304
+Bundle-Version: 1.0.11.qualifier
+Bundle-Release-Date: 20240325
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .

diff --git a/server/bundles/io.cloudbeaver.service.rm.nio/pom.xml b/server/bundles/io.cloudbeaver.service.rm.nio/pom.xml
@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.service.rm.nio</artifactId>
-    <version>1.0.10-SNAPSHOT</version>
+    <version>1.0.11-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/server/bundles/io.cloudbeaver.service.rm/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.rm/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Service - Resource manager
 Bundle-SymbolicName: io.cloudbeaver.service.rm;singleton:=true
-Bundle-Version: 1.0.45.qualifier
-Bundle-Release-Date: 20240304
+Bundle-Version: 1.0.46.qualifier
+Bundle-Release-Date: 20240325
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .

diff --git a/server/bundles/io.cloudbeaver.service.rm/pom.xml b/server/bundles/io.cloudbeaver.service.rm/pom.xml
@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.service.rm</artifactId>
-    <version>1.0.45-SNAPSHOT</version>
+    <version>1.0.46-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/server/bundles/io.cloudbeaver.service.security/META-INF/MANIFEST.MF b/server/bundles/io.cloudbeaver.service.security/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: Cloudbeaver Web Service - Security
 Bundle-Vendor: DBeaver Corp
 Bundle-SymbolicName: io.cloudbeaver.service.security;singleton:=true
-Bundle-Version: 1.0.48.qualifier
-Bundle-Release-Date: 20240304
+Bundle-Version: 1.0.49.qualifier
+Bundle-Release-Date: 20240325
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .

diff --git a/server/bundles/io.cloudbeaver.service.security/plugin.xml b/server/bundles/io.cloudbeaver.service.security/plugin.xml
@@ -28,7 +28,7 @@
             </credentials>
             <configuration>
                 <propertyGroup label="Configuration">
-                    <property id="logout-url" label="Logout url" type="string" description="Logout url"/>
+                    <property id="logout-url" label="Logout URL" type="string" description="Logout URL"/>
                     <property id="user-header" label="Username header" type="string" description="Username header"/>
                     <property id="team-header" label="Team header" type="string" description="Team header"/>
                     <property id="team-delimiter" label="Team delimiter symbol" type="string" description="Team delimiter symbol, default: |"/>