From 8775b6ce007e07484a0baeda63ab76778bdcace5 Mon Sep 17 00:00:00 2001 From: Michael Burman Date: Tue, 12 Nov 2024 14:15:43 +0200 Subject: [PATCH] Remove ListRoles options support from DSE --- .../src/main/java/com/datastax/mgmtapi/shim/DseAPI68.java | 8 +------- .../src/main/java/com/datastax/mgmtapi/shim/DseAPI69.java | 7 +------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/management-api-agent-dse-6.8/src/main/java/com/datastax/mgmtapi/shim/DseAPI68.java b/management-api-agent-dse-6.8/src/main/java/com/datastax/mgmtapi/shim/DseAPI68.java index b807859a..f7dd2145 100644 --- a/management-api-agent-dse-6.8/src/main/java/com/datastax/mgmtapi/shim/DseAPI68.java +++ b/management-api-agent-dse-6.8/src/main/java/com/datastax/mgmtapi/shim/DseAPI68.java @@ -350,13 +350,7 @@ public List> listRoles() { roleOutput.put("name", role.getRoleName()); roleOutput.put("super", String.valueOf(roleManager.isSuper(role))); roleOutput.put("login", String.valueOf(roleManager.canLogin(role))); - - Map customOptions = data.options; - String optionsAsString = - customOptions.keySet().stream() - .map(key -> key + ": " + customOptions.get(key)) - .collect(Collectors.joining(", ", "{", "}")); - + roleOutput.put("options", "{}"); roleOutput.put("datacenters", ""); roles.add(roleOutput); } diff --git a/management-api-agent-dse-6.9/src/main/java/com/datastax/mgmtapi/shim/DseAPI69.java b/management-api-agent-dse-6.9/src/main/java/com/datastax/mgmtapi/shim/DseAPI69.java index 2459746f..a0e88226 100644 --- a/management-api-agent-dse-6.9/src/main/java/com/datastax/mgmtapi/shim/DseAPI69.java +++ b/management-api-agent-dse-6.9/src/main/java/com/datastax/mgmtapi/shim/DseAPI69.java @@ -357,12 +357,7 @@ public List> listRoles() { roleOutput.put("super", String.valueOf(roleManager.isSuper(role))); roleOutput.put("login", String.valueOf(roleManager.canLogin(role))); - Map customOptions = data.options; - String optionsAsString = - customOptions.keySet().stream() - .map(key -> key + ": " + customOptions.get(key)) - .collect(Collectors.joining(", ", "{", "}")); - + roleOutput.put("options", "{}"); roleOutput.put("datacenters", ""); roles.add(roleOutput); }