Merge branch 'release/v1.3.2'

Author: S.Homburg

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [1.3.2] - 2022-12-29
+
+### Added
+
+- copy selected key value to clipboard
+- copy all selected values to clipboard
+
+### Changed
+
+- table column width now optimized by default
+- last open query tab prevent closing
+
+### Fixed
+
+- connection testing now displays the result of test
+- action "Search Parent" in context menu now enabled
+
+### Security
+
 ## [1.3.1] - 2022-10-31
 
 ### Added

build.gradle

@@ -2,7 +2,7 @@ import java.text.SimpleDateFormat
 
 plugins {
     id("java")
-    id("org.jetbrains.intellij") version "1.10.0"
+    id("org.jetbrains.intellij") version "1.11.0"
     id("org.jetbrains.changelog") version "1.3.1"
 }
 

gradle.properties

@@ -21,8 +21,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #
-pluginVersion=1.3.1
-ideaVersion=223.7571.182
+pluginVersion=1.3.2
+ideaVersion=223.8214.52
 javaSourceVersion=17
 javaTargetVersion=17
 #sources = true

src/main/java/com/hsofttec/intellij/querytester/QueryTesterToolWindowFactory.java

@@ -40,7 +40,7 @@ public class QueryTesterToolWindowFactory implements ToolWindowFactory {
      * @param toolWindow current tool window
      */
     public void createToolWindowContent( @NotNull Project project, @NotNull ToolWindow toolWindow ) {
-        Content content = ContentFactory.SERVICE.getInstance().createContent(new QueryTester(project), "", false);
+        Content content = ContentFactory.getInstance().createContent(new QueryTester(project), "", false);
         toolWindow.getContentManager( ).addContent( content );
     }
 }

src/main/java/com/hsofttec/intellij/querytester/models/ConnectionConfigurationComboBoxModel.java

@@ -24,6 +24,8 @@
 
 package com.hsofttec.intellij.querytester.models;
 
+import com.hsofttec.intellij.querytester.states.ConnectionSettings;
+
 import javax.swing.*;
 import java.util.ArrayList;
 import java.util.Collection;

src/main/java/com/hsofttec/intellij/querytester/models/NscaleQueryInformation.java

@@ -26,6 +26,7 @@
 
 import com.hsofttec.intellij.querytester.QueryMode;
 import com.hsofttec.intellij.querytester.QueryType;
+import com.hsofttec.intellij.querytester.states.ConnectionSettings;
 import lombok.Data;
 
 @Data

src/main/java/com/hsofttec/intellij/querytester/renderer/ConnectionListCellRenderer.java

@@ -24,7 +24,7 @@
 
 package com.hsofttec.intellij.querytester.renderer;
 
-import com.hsofttec.intellij.querytester.models.ConnectionSettings;
+import com.hsofttec.intellij.querytester.states.ConnectionSettings;
 
 import javax.swing.*;
 import java.awt.*;

src/main/java/com/hsofttec/intellij/querytester/services/ConnectionService.java

@@ -40,7 +40,7 @@
 import com.ceyoniq.nscale.al.core.repository.ResourceKey;
 import com.ceyoniq.nscale.al.core.repository.ResourceKeyInfo;
 import com.hsofttec.intellij.querytester.models.BaseResource;
-import com.hsofttec.intellij.querytester.models.ConnectionSettings;
+import com.hsofttec.intellij.querytester.states.ConnectionSettings;
 import com.hsofttec.intellij.querytester.ui.Notifier;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.exception.ExceptionUtils;
@@ -102,18 +102,19 @@ public void createConnection( ConnectionSettings connectionSettings ) {
                 advancedConnector.setSsl( connectionSettings.isSsl( ) );
                 advancedConnector.setTimeout( connectionSettings.getTimeout( ) );
                 advancedConnector.setConnectTimeout( connectionSettings.getConnectTimeout( ) );
-                connectionId = connectionSettings.getId( );
+                connectionId = connectionSettings.getId();
 
-                String[] usernameParts = StringUtils.split( connectionSettings.getUsername( ), "@" );
-                String username = usernameParts[ 0 ];
+                String[] usernameParts = StringUtils.split(connectionSettings.getUsername(), "@");
+                String username = usernameParts[0];
                 String domain = null;
 
-                if ( usernameParts.length > 1 ) {
-                    domain = usernameParts[ 1 ];
+                if (usernameParts.length > 1) {
+                    domain = usernameParts[1];
                 }
 
-                Principal principal = new Principal( username, connectionSettings.getPassword( ), domain );
-                session = advancedConnector.login( principal );
+                String password = connectionSettings.getPassword();
+                Principal principal = new Principal(username, password, domain);
+                session = advancedConnector.login(principal);
             } catch ( Exception exception ) {
                 String localizedMessage = exception.getLocalizedMessage( );
 //                logger.error( localizedMessage, rootCause );

src/main/java/com/hsofttec/intellij/querytester/services/ConnectionSettingsService.java

@@ -24,42 +24,41 @@
 
 package com.hsofttec.intellij.querytester.services;
 
-import com.hsofttec.intellij.querytester.models.ConnectionSettings;
+import com.hsofttec.intellij.querytester.states.ConnectionSettings;
+import com.hsofttec.intellij.querytester.states.ConnectionSettingsState;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.util.xmlb.XmlSerializerUtil;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.stream.Collectors;
 
 @State(
         name = "querytester",
-        storages = @Storage( "querytester.xml" )
+        storages = @Storage("querytester.xml")
 )
-public class ConnectionSettingsService implements PersistentStateComponent<ConnectionSettingsService.ConnectionSettingsState> {
+public class ConnectionSettingsService implements PersistentStateComponent<ConnectionSettingsState> {
 
-    public ConnectionSettingsService.ConnectionSettingsState connectionSettingsState = new ConnectionSettingsService.ConnectionSettingsState( );
+    public ConnectionSettingsState connectionSettingsState = new ConnectionSettingsState();
 
-    public ConnectionSettingsService( ) {
+    public ConnectionSettingsService() {
     }
 
-    public static ConnectionSettingsService getSettings( ) {
-        return ApplicationManager.getApplication( ).getService( ConnectionSettingsService.class );
+    public static ConnectionSettingsService getSettings() {
+        return ApplicationManager.getApplication().getService(ConnectionSettingsService.class);
     }
 
 
     @Override
-    public ConnectionSettingsService.ConnectionSettingsState getState( ) {
+    public ConnectionSettingsState getState() {
         return connectionSettingsState;
     }
 
     @Override
-    public void loadState( @NotNull ConnectionSettingsService.ConnectionSettingsState state ) {
-        XmlSerializerUtil.copyBean( state, this.connectionSettingsState );
+    public void loadState( @NotNull ConnectionSettingsState state ) {
+        XmlSerializerUtil.copyBean(state, this.connectionSettingsState);
     }
 
     public void removeConnection( String connectionId ) {
@@ -83,9 +82,4 @@ public void updateConnection( ConnectionSettings connectionSettings ) {
             }
         }
     }
-
-    public static class ConnectionSettingsState {
-        public List<ConnectionSettings> connectionSettings = new ArrayList<>( );
-    }
-
 }

src/main/java/com/hsofttec/intellij/querytester/services/HistoryService.java

@@ -25,7 +25,7 @@
 package com.hsofttec.intellij.querytester.services;
 
 import com.hsofttec.intellij.querytester.listeners.HistoryModifiedEventListener;
-import com.hsofttec.intellij.querytester.models.SettingsState;
+import com.hsofttec.intellij.querytester.states.SettingsState;
 import com.hsofttec.intellij.querytester.utils.DimensionConverter;
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.ServiceManager;

src/main/java/com/hsofttec/intellij/querytester/services/QueryService.java

@@ -40,7 +40,7 @@
 import com.hsofttec.intellij.querytester.QueryTesterConstants;
 import com.hsofttec.intellij.querytester.models.NscaleQueryInformation;
 import com.hsofttec.intellij.querytester.models.NscaleResult;
-import com.hsofttec.intellij.querytester.models.SettingsState;
+import com.hsofttec.intellij.querytester.states.SettingsState;
 import com.hsofttec.intellij.querytester.ui.Notifier;
 import org.apache.commons.beanutils.BasicDynaClass;
 import org.apache.commons.beanutils.DynaBean;

src/main/java/com/hsofttec/intellij/querytester/services/SettingsService.java

@@ -1,6 +1,30 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright © 2022 Sven Homburg, <homburgs@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the “Software”), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 package com.hsofttec.intellij.querytester.services;
 
-import com.hsofttec.intellij.querytester.models.SettingsState;
+import com.hsofttec.intellij.querytester.states.SettingsState;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.State;

src/main/java/com/hsofttec/intellij/querytester/models/ConnectionSettings.java renamed to src/main/java/com/hsofttec/intellij/querytester/states/ConnectionSettings.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package com.hsofttec.intellij.querytester.models;
+package com.hsofttec.intellij.querytester.states;
 
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.commons.lang.StringUtils;

src/main/java/com/hsofttec/intellij/querytester/ui/notifiers/OptimizeTableHeaderWidthNotifier.java renamed to src/main/java/com/hsofttec/intellij/querytester/states/ConnectionSettingsState.java

@@ -22,12 +22,11 @@
  * THE SOFTWARE.
  */
 
-package com.hsofttec.intellij.querytester.ui.notifiers;
+package com.hsofttec.intellij.querytester.states;
 
-import com.intellij.util.messages.Topic;
+import java.util.ArrayList;
+import java.util.List;
 
-public interface OptimizeTableHeaderWidthNotifier {
-    Topic<OptimizeTableHeaderWidthNotifier> OPTIMIZE_TABLE_HEADER_WIDTH_TOPIC = Topic.create( "optimize table header width", OptimizeTableHeaderWidthNotifier.class );
-
-    void doAction( );
+public class ConnectionSettingsState {
+    public List<ConnectionSettings> connectionSettings = new ArrayList<>();
 }

src/main/java/com/hsofttec/intellij/querytester/models/SettingsState.java renamed to src/main/java/com/hsofttec/intellij/querytester/states/SettingsState.java

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package com.hsofttec.intellij.querytester.models;
+package com.hsofttec.intellij.querytester.states;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -36,6 +36,7 @@ public class SettingsState {
     private boolean showDelete;
     private int maxHistorySize;
     private String fontFace;
+    private String fieldSeparator;
     private int fontSize;
 
     public SettingsState( ) {
@@ -45,6 +46,7 @@ public SettingsState( ) {
         maxHistorySize = 25;
         maxResultSize = 100;
         fontFace = "JetBrains Mono";
+        fieldSeparator = "|";
         fontSize = 14;
     }
 }

src/main/java/com/hsofttec/intellij/querytester/ui/AppSettingsConfigurable.java

@@ -24,8 +24,8 @@
 
 package com.hsofttec.intellij.querytester.ui;
 
-import com.hsofttec.intellij.querytester.models.SettingsState;
 import com.hsofttec.intellij.querytester.services.SettingsService;
+import com.hsofttec.intellij.querytester.states.SettingsState;
 import com.hsofttec.intellij.querytester.ui.components.AppSettingsComponent;
 import com.hsofttec.intellij.querytester.ui.notifiers.FontSettingsChangedNotifier;
 import com.intellij.openapi.options.Configurable;
@@ -70,7 +70,8 @@ public boolean isModified( ) {
         modified |= appSettingsComponent.getMaxHistorySizeValue( ) != settings.getMaxHistorySize( );
         modified |= appSettingsComponent.getMaxResultSizeValue( ) != settings.getMaxResultSize( );
         modified |= appSettingsComponent.getFontSizeValue( ) != settings.getFontSize( );
-        modified |= !appSettingsComponent.getFontFaceValue( ).equals( settings.getFontFace( ) );
+        modified |= !appSettingsComponent.getFontFaceValue().equals(settings.getFontFace());
+        modified |= !appSettingsComponent.getFieldSeparator().equals(settings.getFieldSeparator());
         return modified;
     }
 
@@ -83,7 +84,8 @@ public void apply( ) {
         settings.setMaxHistorySize( appSettingsComponent.getMaxHistorySizeValue( ) );
         settings.setMaxResultSize( appSettingsComponent.getMaxResultSizeValue( ) );
         settings.setFontFace( appSettingsComponent.getFontFaceValue( ) );
-        settings.setFontSize( appSettingsComponent.getFontSizeValue( ) );
+        settings.setFontSize(appSettingsComponent.getFontSizeValue());
+        settings.setFieldSeparator(appSettingsComponent.getFieldSeparator());
         FontSettingsChangedNotifier notifier = messageBus.syncPublisher( FontSettingsChangedNotifier.FONT_SETTINGS_CHANGED_TOPIC );
         notifier.doAction( );
     }
@@ -97,7 +99,8 @@ public void reset( ) {
         appSettingsComponent.setMaxHistorySizeValue( settings.getMaxHistorySize( ) );
         appSettingsComponent.setMaxResultSizeValue( settings.getMaxResultSize( ) );
         appSettingsComponent.setFontSizeValue( settings.getFontSize( ) );
-        appSettingsComponent.setFontFaceValue( settings.getFontFace( ) );
+        appSettingsComponent.setFontFaceValue(settings.getFontFace());
+        appSettingsComponent.setFieldSeparator(settings.getFieldSeparator());
     }
 
     @Override