#12182 Code cleanup

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<SQLSer
         try (JDBCSession session = executionContext.openSession(monitor, DBCExecutionPurpose.META, "Find objects by name")) {
             List<DBSObjectReference> objects = new ArrayList<>();
 
-            if (params.getName().startsWith("#")) {
+            if (params.getMask().startsWith("%#") || params.getMask().startsWith("#")) {
                 // Search temp tables
                 searchTempTables(session, params, objects);
             } else {

plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/SQLSearchUtils.java

@@ -90,7 +90,6 @@ public class SQLSearchUtils
                         String objectNameMask = nameList.get(0);
                         DBSStructureAssistant.ObjectsSearchParams params = new DBSStructureAssistant.ObjectsSearchParams(
                                 structureAssistant.getAutoCompleteObjectTypes(),
-                            identifierDetector.removeQuotes(objectNameMask),
                                 identifierDetector.removeQuotes(objectNameMask)
                         );
                         params.setParentObject(sc);

plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/completion/SQLCompletionAnalyzer.java

@@ -744,7 +744,6 @@ public class SQLCompletionAnalyzer implements DBRRunnableParametrized<DBRProgres
                         if (structureAssistant != null) {
                             DBSStructureAssistant.ObjectsSearchParams params = new DBSStructureAssistant.ObjectsSearchParams(
                                     structureAssistant.getAutoCompleteObjectTypes(),
-                                request.getWordDetector().removeQuotes(token),
                                     request.getWordDetector().removeQuotes(token)
                             );
                             params.setCaseSensitive(request.getWordDetector().isQuoted(token));
@@ -1111,7 +1110,6 @@ public class SQLCompletionAnalyzer implements DBRRunnableParametrized<DBRProgres
     {
         DBSStructureAssistant.ObjectsSearchParams assistantParams = new DBSStructureAssistant.ObjectsSearchParams(
                 objectTypes == null ? assistant.getAutoCompleteObjectTypes() : objectTypes,
-            objectName,
                 makeObjectNameMask(objectName, rootSC)
         );
         assistantParams.setParentObject(rootSC);

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/struct/DBSStructureAssistant.java

@@ -57,7 +57,6 @@ public interface DBSStructureAssistant<CONTEXT extends DBCExecutionContext> {
      *     <li>{@code parentObject}: parent (schema or catalog)</li>
      *     <li>{@code objectTypes}: type of objects to search</li>
      *     <li>{@code mask}: name mask</li>
-     *     <li>{@code mask}: original name</li>
      *     <li>{@code caseSensitive}: case sensitive search (ignored by some implementations)</li>
      *     <li>{@code globalSearch}: search in all available schemas/catalogs. If {@code false} then search with respect of active schema/catalog</li>
      *     <li>{@code maxResults}: maximum number of results</li>
@@ -66,9 +65,11 @@ public interface DBSStructureAssistant<CONTEXT extends DBCExecutionContext> {
      * </ul>
      */
     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<CONTEXT extends DBCExecutionContext> {
         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<CONTEXT extends DBCExecutionContext> {
             this.mask = mask;
         }
 
-        @NotNull
-        public String getName() {
-            return name;
-        }
-
-        public void setName(@NotNull String name) {
-            this.name = name;
-        }
-
         public boolean isCaseSensitive() {
             return caseSensitive;
         }

plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLContextInformer.java

@@ -302,7 +302,6 @@ public class SQLContextInformer
                                 if (executionContext != null) {
                                     DBSStructureAssistant.ObjectsSearchParams params = new DBSStructureAssistant.ObjectsSearchParams(
                                             structureAssistant.getAutoCompleteObjectTypes(),
-                                        containerNames[0],
                                             containerNames[0]
                                     );
                                     params.setGlobalSearch(true);
@@ -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);

plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/dialogs/GotoObjectDialog.java

@@ -369,7 +369,6 @@ public class GotoObjectDialog extends FilteredItemsSelectionDialog {
             try {
                 DBSStructureAssistant.ObjectsSearchParams params = new DBSStructureAssistant.ObjectsSearchParams(
                         typesToSearch.toArray(new DBSObjectType[0]),
-                    nameMask,
                         nameMask
                 );
                 params.setParentObject(container);

plugins/org.jkiss.dbeaver.ui.search/src/org/jkiss/dbeaver/ui/search/metadata/SearchMetadataPage.java

@@ -445,7 +445,6 @@ public class SearchMetadataPage extends AbstractSearchPage {
 
         DBSStructureAssistant.ObjectsSearchParams params = new DBSStructureAssistant.ObjectsSearchParams(
                 objectTypes.toArray(new DBSObjectType[0]),
-            nameMask,
                 objectNameMask
         );
         params.setParentObject(parentObject);