Auth model enhancement (AuthProperty)

Former-commit-id: 5346f12c

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/auth/AuthProperty.java

+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2020 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jkiss.dbeaver.model.auth;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Auth Property
+ */
+@Target(value = {ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface AuthProperty
+{
+    // Property value can be provided by context
+    boolean contextProvided() default false;
+
+}

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/connection/DBPAuthModelDescriptor.java

@@ -45,6 +45,6 @@ public interface DBPAuthModelDescriptor extends DBPNamedObject {
     DBAAuthModel getInstance();
 
     @NotNull
-    DBPPropertySource createCredentialsSource(@Nullable DBPDataSourceContainer dataSource);
+    DBPPropertySource createCredentialsSource(@Nullable DBPDataSourceContainer dataSource, @Nullable DBPConnectionConfiguration configuration);
 
 }

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/auth/AuthModelDatabaseNativeCredentials.java

@@ -25,6 +25,9 @@ import org.jkiss.dbeaver.model.meta.Property;
  */
 public class AuthModelDatabaseNativeCredentials implements DBAAuthCredentials {
 
+    public static final String PROP_USER_NAME = "userName";
+    public static final String PROP_USER_PASSWORD = "userPassword";
+
     private String userName;
     private String userPassword;
 

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/runtime/properties/ObjectAttributeDescriptor.java

@@ -29,6 +29,7 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.utils.BeanUtils;
 import org.jkiss.utils.CommonUtils;
 
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.util.*;
 
@@ -109,6 +110,10 @@ public abstract class ObjectAttributeDescriptor {
         return id;
     }
 
+    public <T extends Annotation> T getAnnotation(Class<T> annoType) {
+        return getter == null ? null : getter.getAnnotation(annoType);
+    }
+
     public Method getGetter()
     {
         return getter;

plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceAuthModelDescriptor.java

@@ -25,6 +25,7 @@ import org.jkiss.dbeaver.model.DBPImage;
 import org.jkiss.dbeaver.model.auth.DBAAuthCredentials;
 import org.jkiss.dbeaver.model.auth.DBAAuthModel;
 import org.jkiss.dbeaver.model.connection.DBPAuthModelDescriptor;
+import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
 import org.jkiss.dbeaver.model.connection.DBPDriver;
 import org.jkiss.dbeaver.model.preferences.DBPPropertySource;
 import org.jkiss.dbeaver.runtime.properties.PropertyCollector;
@@ -114,11 +115,11 @@ public class DataSourceAuthModelDescriptor extends DataSourceBindingDescriptor i
 
     @NotNull
     @Override
-    public DBPPropertySource createCredentialsSource(DBPDataSourceContainer dataSource) {
+    public DBPPropertySource createCredentialsSource(DBPDataSourceContainer dataSource, DBPConnectionConfiguration configuration) {
         DBAAuthModel instance = getInstance();
-        DBAAuthCredentials credentials = dataSource == null ?
+        DBAAuthCredentials credentials = dataSource == null || configuration == null ?
             instance.createCredentials() :
-            instance.loadCredentials(dataSource, dataSource.getConnectionConfiguration());
+            instance.loadCredentials(dataSource, configuration);
         PropertyCollector propertyCollector = new PropertyCollector(credentials, false);
         propertyCollector.collectProperties();
         return propertyCollector;