From d90607114ee89e5f1f5b27f74c759ee305e98e47 Mon Sep 17 00:00:00 2001 From: ShadelessFox Date: Wed, 30 Jun 2021 16:26:19 +0300 Subject: [PATCH] #12182 Code cleanup --- .../model/SQLServerStructureAssistant.java | 7 ++----- .../jkiss/dbeaver/model/sql/SQLSearchUtils.java | 5 ++--- .../sql/completion/SQLCompletionAnalyzer.java | 10 ++++------ .../model/struct/DBSStructureAssistant.java | 17 ++++------------- .../editors/sql/syntax/SQLContextInformer.java | 7 +++---- .../ui/navigator/dialogs/GotoObjectDialog.java | 5 ++--- .../ui/search/metadata/SearchMetadataPage.java | 5 ++--- 7 files changed, 19 insertions(+), 37 deletions(-) diff --git a/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerStructureAssistant.java b/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerStructureAssistant.java index 0c592b4510..96c150087f 100644 --- a/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerStructureAssistant.java +++ b/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerStructureAssistant.java @@ -30,10 +30,7 @@ import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils; import org.jkiss.dbeaver.model.impl.struct.AbstractObjectReference; import org.jkiss.dbeaver.model.impl.struct.RelationalObjectType; import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor; -import org.jkiss.dbeaver.model.struct.DBSObject; -import org.jkiss.dbeaver.model.struct.DBSObjectReference; -import org.jkiss.dbeaver.model.struct.DBSObjectType; -import org.jkiss.dbeaver.model.struct.DBSStructureAssistant; +import org.jkiss.dbeaver.model.struct.*; import java.util.ArrayList; import java.util.Collections; @@ -129,7 +126,7 @@ public class SQLServerStructureAssistant implements DBSStructureAssistant objects = new ArrayList<>(); - if (params.getName().startsWith("#")) { + if (params.getMask().startsWith("%#") || params.getMask().startsWith("#")) { // Search temp tables searchTempTables(session, params, objects); } else { diff --git a/plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/SQLSearchUtils.java b/plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/SQLSearchUtils.java index 115614ae5f..d1c30666b0 100644 --- a/plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/SQLSearchUtils.java +++ b/plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/SQLSearchUtils.java @@ -89,9 +89,8 @@ public class SQLSearchUtils if (structureAssistant != null) { String objectNameMask = nameList.get(0); DBSStructureAssistant.ObjectsSearchParams params = new DBSStructureAssistant.ObjectsSearchParams( - structureAssistant.getAutoCompleteObjectTypes(), - identifierDetector.removeQuotes(objectNameMask), - identifierDetector.removeQuotes(objectNameMask) + structureAssistant.getAutoCompleteObjectTypes(), + identifierDetector.removeQuotes(objectNameMask) ); params.setParentObject(sc); params.setCaseSensitive(identifierDetector.isQuoted(objectNameMask)); diff --git a/plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/completion/SQLCompletionAnalyzer.java b/plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/completion/SQLCompletionAnalyzer.java index 380e62d870..8560f2d991 100644 --- a/plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/completion/SQLCompletionAnalyzer.java +++ b/plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/completion/SQLCompletionAnalyzer.java @@ -743,9 +743,8 @@ public class SQLCompletionAnalyzer implements DBRRunnableParametrized params) throws DBException { DBSStructureAssistant.ObjectsSearchParams assistantParams = new DBSStructureAssistant.ObjectsSearchParams( - objectTypes == null ? assistant.getAutoCompleteObjectTypes() : objectTypes, - objectName, - makeObjectNameMask(objectName, rootSC) + objectTypes == null ? assistant.getAutoCompleteObjectTypes() : objectTypes, + makeObjectNameMask(objectName, rootSC) ); assistantParams.setParentObject(rootSC); assistantParams.setCaseSensitive(request.getWordDetector().isQuoted(objectName)); diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/struct/DBSStructureAssistant.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/struct/DBSStructureAssistant.java index 79986ae542..c0b9a16727 100644 --- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/struct/DBSStructureAssistant.java +++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/struct/DBSStructureAssistant.java @@ -57,7 +57,6 @@ public interface DBSStructureAssistant { *
  • {@code parentObject}: parent (schema or catalog)
    • *
  • {@code objectTypes}: type of objects to search
    • *
  • {@code mask}: name mask
    • - *
  • {@code mask}: original name
    • *
  • {@code caseSensitive}: case sensitive search (ignored by some implementations)
    • *
  • {@code globalSearch}: search in all available schemas/catalogs. If {@code false} then search with respect of active schema/catalog
    • *
  • {@code maxResults}: maximum number of results
    • @@ -66,9 +65,11 @@ public interface DBSStructureAssistant { * */ class ObjectsSearchParams { + @NotNull private final DBSObjectType[] objectTypes; - private String name; + @NotNull private String mask; + @Nullable private DBSObject parentObject; private int maxResults = Integer.MAX_VALUE; private boolean caseSensitive; @@ -76,9 +77,8 @@ public interface DBSStructureAssistant { private boolean searchInDefinitions; private boolean globalSearch; - public ObjectsSearchParams(@NotNull DBSObjectType[] objectTypes, @NotNull String name, @NotNull String mask) { + public ObjectsSearchParams(@NotNull DBSObjectType[] objectTypes, @NotNull String mask) { this.objectTypes = objectTypes; - this.name = name; this.mask = mask; } @@ -105,15 +105,6 @@ public interface DBSStructureAssistant { this.mask = mask; } - @NotNull - public String getName() { - return name; - } - - public void setName(@NotNull String name) { - this.name = name; - } - public boolean isCaseSensitive() { return caseSensitive; } diff --git a/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLContextInformer.java b/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLContextInformer.java index a3205a4259..3b787d62d9 100644 --- a/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLContextInformer.java +++ b/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLContextInformer.java @@ -301,9 +301,8 @@ public class SQLContextInformer DBCExecutionContext executionContext = editor.getExecutionContext(); if (executionContext != null) { DBSStructureAssistant.ObjectsSearchParams params = new DBSStructureAssistant.ObjectsSearchParams( - structureAssistant.getAutoCompleteObjectTypes(), - containerNames[0], - containerNames[0] + structureAssistant.getAutoCompleteObjectTypes(), + containerNames[0] ); params.setGlobalSearch(true); params.setMaxResults(1); @@ -360,7 +359,7 @@ public class SQLContextInformer DBSObjectType[] objectTypes = structureAssistant.getHyperlinkObjectTypes(); DBCExecutionContext executionContext = editor.getExecutionContext(); if (executionContext != null) { - DBSStructureAssistant.ObjectsSearchParams params = new DBSStructureAssistant.ObjectsSearchParams(objectTypes, objectName, objectName); + DBSStructureAssistant.ObjectsSearchParams params = new DBSStructureAssistant.ObjectsSearchParams(objectTypes, objectName); params.setParentObject(container); params.setCaseSensitive(caseSensitive); params.setMaxResults(10); diff --git a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/dialogs/GotoObjectDialog.java b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/dialogs/GotoObjectDialog.java index 35f6716ecc..b048d0d2cf 100644 --- a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/dialogs/GotoObjectDialog.java +++ b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/dialogs/GotoObjectDialog.java @@ -368,9 +368,8 @@ public class GotoObjectDialog extends FilteredItemsSelectionDialog { public void run(DBRProgressMonitor param) throws InvocationTargetException, InterruptedException { try { DBSStructureAssistant.ObjectsSearchParams params = new DBSStructureAssistant.ObjectsSearchParams( - typesToSearch.toArray(new DBSObjectType[0]), - nameMask, - nameMask + typesToSearch.toArray(new DBSObjectType[0]), + nameMask ); params.setParentObject(container); params.setGlobalSearch(true); diff --git a/plugins/org.jkiss.dbeaver.ui.search/src/org/jkiss/dbeaver/ui/search/metadata/SearchMetadataPage.java b/plugins/org.jkiss.dbeaver.ui.search/src/org/jkiss/dbeaver/ui/search/metadata/SearchMetadataPage.java index c792a20b00..fc573047a0 100644 --- a/plugins/org.jkiss.dbeaver.ui.search/src/org/jkiss/dbeaver/ui/search/metadata/SearchMetadataPage.java +++ b/plugins/org.jkiss.dbeaver.ui.search/src/org/jkiss/dbeaver/ui/search/metadata/SearchMetadataPage.java @@ -444,9 +444,8 @@ public class SearchMetadataPage extends AbstractSearchPage { } DBSStructureAssistant.ObjectsSearchParams params = new DBSStructureAssistant.ObjectsSearchParams( - objectTypes.toArray(new DBSObjectType[0]), - nameMask, - objectNameMask + objectTypes.toArray(new DBSObjectType[0]), + objectNameMask ); params.setParentObject(parentObject); params.setCaseSensitive(caseSensitive); -- GitLab