jhorvath commented on code in PR #6058:
URL: https://github.com/apache/netbeans/pull/6058#discussion_r1226379738
##########
java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/db/DBConnectionsProvider.java:
##########
@@ -26,51 +26,51 @@
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
import org.eclipse.lsp4j.CodeAction;
import org.eclipse.lsp4j.CodeActionParams;
import org.netbeans.api.db.explorer.ConnectionManager;
import org.netbeans.api.db.explorer.DatabaseConnection;
import org.netbeans.modules.java.lsp.server.protocol.CodeActionsProvider;
import org.netbeans.modules.java.lsp.server.protocol.NbCodeLanguageClient;
-import org.netbeans.modules.java.lsp.server.protocol.UpdateConfigParams;
import org.netbeans.modules.parsing.api.ResultIterator;
import org.openide.util.lookup.ServiceProvider;
/**
- * Updates Run Configuratoin with Database env variables.
*
* @author Jan Horvath
*/
@ServiceProvider(service = CodeActionsProvider.class)
-public class DBSetEnvCommand extends CodeActionsProvider {
- private static final String COMMAND_SET_DB_ENV = "java.db.set.env";
//NOI18N
- private static final String CONFIG_SECTION = "java+.runConfig"; //NOI18N
+public class DBConnectionsProvider extends CodeActionsProvider{
+ private static final String GET_DB_CONNECTIONS = "java.db.connections";
//NOI18N
Review Comment:
Originally it was meant to provide all db connection in workspace. Fixed
##########
java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/db/DBConnectionsProvider.java:
##########
@@ -26,51 +26,51 @@
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
import org.eclipse.lsp4j.CodeAction;
import org.eclipse.lsp4j.CodeActionParams;
import org.netbeans.api.db.explorer.ConnectionManager;
import org.netbeans.api.db.explorer.DatabaseConnection;
import org.netbeans.modules.java.lsp.server.protocol.CodeActionsProvider;
import org.netbeans.modules.java.lsp.server.protocol.NbCodeLanguageClient;
-import org.netbeans.modules.java.lsp.server.protocol.UpdateConfigParams;
import org.netbeans.modules.parsing.api.ResultIterator;
import org.openide.util.lookup.ServiceProvider;
/**
- * Updates Run Configuratoin with Database env variables.
*
* @author Jan Horvath
*/
@ServiceProvider(service = CodeActionsProvider.class)
-public class DBSetEnvCommand extends CodeActionsProvider {
- private static final String COMMAND_SET_DB_ENV = "java.db.set.env";
//NOI18N
- private static final String CONFIG_SECTION = "java+.runConfig"; //NOI18N
+public class DBConnectionsProvider extends CodeActionsProvider{
+ private static final String GET_DB_CONNECTIONS = "java.db.connections";
//NOI18N
private static final Set<String> COMMANDS = new HashSet<>(Arrays.asList(
- COMMAND_SET_DB_ENV
+ GET_DB_CONNECTIONS
));
+
@Override
public List<CodeAction> getCodeActions(ResultIterator resultIterator,
CodeActionParams params) throws Exception {
return Collections.emptyList();
}
+
@Override
public CompletableFuture<Object> processCommand(NbCodeLanguageClient
client, String command, List<Object> arguments) {
- if (!COMMAND_SET_DB_ENV.equals(command)) {
+ if (!GET_DB_CONNECTIONS.equals(command)) {
return null;
}
+ Map<String, String> result = new HashMap<> ();
DatabaseConnection conn =
ConnectionManager.getDefault().getPreferredConnection(true);
- Map<String, String> props = new HashMap<>();
- props.put("DATASOURCES_DEFAULT_URL", conn.getDatabaseURL()); //NOI18N
- props.put("DATASOURCES_DEFAULT_USERNAME", conn.getUser()); //NOI18N
- props.put("DATASOURCES_DEFAULT_PASSWORD", conn.getPassword()); //NOI18N
- props.put("DATASOURCES_DEFAULT_DRIVER_CLASS_NAME",
conn.getDriverClass()); //NOI18N
- String values = props.entrySet().stream()
- .map(e -> e.getKey() + "=" + e.getValue()) //NOI18N
- .collect(Collectors.joining(",")); //NOI18N
- client.configurationUpdate(new UpdateConfigParams(CONFIG_SECTION,
"env", values)); //NOI18N
- return CompletableFuture.completedFuture(props);
+
+ result.put("DATASOURCES_DEFAULT_URL", conn.getDatabaseURL()); //NOI18N
+ result.put("DATASOURCES_DEFAULT_USERNAME", conn.getUser()); //NOI18N
+ result.put("DATASOURCES_DEFAULT_PASSWORD", conn.getPassword());
//NOI18N
+ result.put("DATASOURCES_DEFAULT_DRIVER_CLASS_NAME",
conn.getDriverClass()); //NOI18N
+ String ocid = (String) conn.getConnectionProperties().get("OCID");
Review Comment:
Fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
