#199 : added also name to during oxls.sh --list

GluuFederation · Oct 18, 2018 · fdd8550 · fdd8550
1 parent d960416
commit fdd8550
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 8 deletions.
diff --git a/oxd-server/src/main/java/org/xdi/oxd/server/Cli.java b/oxd-server/src/main/java/org/xdi/oxd/server/Cli.java
@@ -17,9 +17,11 @@
 import org.xdi.oxd.common.response.RemoveSiteResponse;
 import org.xdi.oxd.server.persistence.PersistenceService;
 import org.xdi.oxd.server.service.ConfigurationService;
+import org.xdi.oxd.server.service.Rp;
 import org.xdi.oxd.server.service.RpService;
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -49,8 +51,15 @@ public static void main(String[] args) {
 
             // list
             if (cmd.hasOption("l")) {
-                for (String oxdIdKey : rpService.getRps().keySet()) {
-                    System.out.println(oxdIdKey);
+                final Collection<Rp> values = rpService.getRps().values();
+                if (values.isEmpty()) {
+                    System.out.println("There are no any entries yet in database.");
+                    return;
+                }
+
+                System.out.println("oxd_id                                client_name");
+                for (Rp rp : values) {
+                    System.out.println(String.format("%s  %s", rp.getOxdId(), rp.getClientName() != null ? rp.getClientName() : ""));
                 }
                 return;
             }
@@ -119,9 +128,17 @@ private static void tryToConnectToRunningOxd(CommandLine cmd) {
 
                 GetRpResponse resp = client.send(new Command(CommandType.GET_RP).setParamsObject(params)).dataAsResponse(GetRpResponse.class);
                 if (resp.getNode() instanceof ArrayNode) {
-                    Iterator<JsonNode> elements = ((ArrayNode) resp.getNode()).getElements();
+                    final ArrayNode arrayNode = (ArrayNode) resp.getNode();
+                    if (arrayNode.size() == 0) {
+                        System.out.println("There are no any entries yet in database.");
+                        return;
+                    }
+
+                    Iterator<JsonNode> elements = arrayNode.getElements();
+                    System.out.println("oxd_id                                client_name");
                     while (elements.hasNext()) {
-                        System.out.println(sanitizeOutput(elements.next().toString()));
+                        final JsonNode element = elements.next();
+                        System.out.println(String.format("%s  %s", element.get("oxd_id").asText(), element.get("client_name").asText()));
                     }
                 } else {
                     System.out.println(resp.getNode());

diff --git a/oxd-server/src/main/java/org/xdi/oxd/server/op/GetRpOperation.java b/oxd-server/src/main/java/org/xdi/oxd/server/op/GetRpOperation.java
@@ -8,10 +8,11 @@
 import org.xdi.oxd.common.params.GetRpParams;
 import org.xdi.oxd.common.response.GetRpResponse;
 import org.xdi.oxd.rs.protect.Jackson;
+import org.xdi.oxd.server.service.MinimumRp;
 import org.xdi.oxd.server.service.Rp;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author yuriyz
@@ -33,8 +34,11 @@ protected GetRpOperation(Command command, Injector injector) {
     @Override
     public CommandResponse execute(GetRpParams params) {
         if (params.getList() != null && params.getList()) {
-            Set<String> oxdIds = getRpService().getRps().keySet();
-            return okResponse(new GetRpResponse(Jackson.createJsonMapper().valueToTree(new HashSet<>(oxdIds))));
+            List<MinimumRp> rps = new ArrayList<>();
+            for (Rp rp : getRpService().getRps().values()) {
+                rps.add(rp.asMinimumRp());
+            }
+            return okResponse(new GetRpResponse(Jackson.createJsonMapper().valueToTree(rps)));
         }
 
         Rp rp = getRpService().getRp(params.getOxdId());

diff --git a/oxd-server/src/main/java/org/xdi/oxd/server/service/MinimumRp.java b/oxd-server/src/main/java/org/xdi/oxd/server/service/MinimumRp.java
@@ -0,0 +1,49 @@
+package org.xdi.oxd.server.service;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.io.Serializable;
+
+/**
+ * @author Yuriy Zabrovarnyy
+ */
+public class MinimumRp implements Serializable {
+
+    @JsonProperty(value = "oxd_id")
+    private String oxdId;
+
+    @JsonProperty(value = "client_name")
+    private String clientName;
+
+    public MinimumRp() {
+    }
+
+    public MinimumRp(String oxdId, String clientName) {
+        this.oxdId = oxdId;
+        this.clientName = clientName;
+    }
+
+    public String getOxdId() {
+        return oxdId;
+    }
+
+    public void setOxdId(String oxdId) {
+        this.oxdId = oxdId;
+    }
+
+    public String getClientName() {
+        return clientName;
+    }
+
+    public void setClientName(String clientName) {
+        this.clientName = clientName;
+    }
+
+    @Override
+    public String toString() {
+        return "MinimumRp{" +
+                "oxdId='" + oxdId + '\'' +
+                ", clientName='" + clientName + '\'' +
+                '}';
+    }
+}
diff --git a/oxd-server/src/main/java/org/xdi/oxd/server/service/Rp.java b/oxd-server/src/main/java/org/xdi/oxd/server/service/Rp.java
@@ -607,6 +607,10 @@ public void setSetupClientId(String setupClientId) {
         this.setupClientId = setupClientId;
     }
 
+    public MinimumRp asMinimumRp() {
+        return new MinimumRp(oxdId, clientName);
+    }
+
     @Override
     public String toString() {
         return "Rp{" +