Fixes for profile REST interface from code review.

Simplified the inputs, outputs for ProfileData

1 files changed, 31 insertions, 38 deletions

diff --git a/base/java-tools/src/com/netscape/cmstools/profile/ProfileCLI.java b/base/java-tools/src/com/netscape/cmstools/profile/ProfileCLI.java
index 1463b096e..ba41a3da1 100644
--- a/base/java-tools/src/com/netscape/cmstools/profile/ProfileCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/profile/ProfileCLI.java
@@ -6,9 +6,7 @@ import java.io.FileOutputStream;
 import java.net.URI;
 import java.util.Arrays;
 import java.util.Locale;
-import java.util.Map;
 
-import javax.ws.rs.core.UriBuilder;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
@@ -22,7 +20,6 @@ import com.netscape.certsrv.profile.ProfileData;
 import com.netscape.certsrv.profile.ProfileDataInfo;
 import com.netscape.certsrv.profile.ProfileInput;
 import com.netscape.certsrv.profile.ProfileOutput;
-import com.netscape.certsrv.profile.ProfileResource;
 import com.netscape.cmstools.cli.CLI;
 import com.netscape.cmstools.cli.MainCLI;
 
@@ -93,54 +90,50 @@ public class ProfileCLI extends CLI {
     }
 
     public static void printProfileDataInfo(ProfileDataInfo info) {
-        System.out.println("Profile ID:  " + info.getProfileId());
-        System.out.println("Profile URL: " + info.getProfileURL());
-        System.out.println("Profile Name: " + info.getProfileName());
-        System.out.println("Profile Description: " + info.getProfileDescription());
+        System.out.println("  Profile ID: " + info.getProfileId());
+        if (verbose) {
+            System.out.println("  URL: " + info.getProfileURL());
+        }
+        System.out.println("  Name: " + info.getProfileName());
+        System.out.println("  Description: " + info.getProfileDescription());
     }
 
     public static void printProfile(ProfileData data, URI baseUri) {
-
-        UriBuilder profileBuilder = UriBuilder.fromUri(baseUri);
-        URI uri = profileBuilder.path(ProfileResource.class).path("{id}").
-                build(data.getId());
-
-        System.out.println("Profile ID:  " + data.getId());
-        System.out.println("Profile URL: " + uri.toString());
-        System.out.println("Profile Name: " + data.getName());
-        System.out.println("Profile Description: " + data.getDescription() + "\n");
-
-        System.out.println("Profile Inputs:  " + data.getId());
-        int count =0;
-        for (Map.Entry<String, ProfileInput> entry: data.getInputs().entrySet()) {
-            ProfileInput input = entry.getValue();
-            System.out.println("Input " + count + " Id: " + entry.getKey());
-            System.out.println("Input " + count + " Name: " + input.getName());
-            System.out.println("Input " + count + " Class: " + input.getClassId());
+        System.out.println("  Profile ID: " + data.getId());
+        if (verbose) {
+            System.out.println("  URL: " + data.getLink().getHref().toString());
+        }
+        System.out.println("  Name: " + data.getName());
+        System.out.println("  Description: " + data.getDescription());
+
+        for (ProfileInput input: data.getInputs()) {
+            System.out.println();
+            System.out.println("  Input ID: " + input.getId());
+            System.out.println("  Name: " + input.getName());
+            System.out.println("  Class: " + input.getClassId());
             for (ProfileAttribute attr: input.getAttrs()) {
-                System.out.println("Input " + count + " Attribute Name: " + attr.getName());
-                System.out.println("Input " + count + " Attribute Description: " +
+                System.out.println();
+                System.out.println("    Attribute Name: " + attr.getName());
+                System.out.println("    Attribute Description: " +
                     attr.getDescriptor().getDescription(Locale.getDefault()));
-                System.out.println("Input " + count + " Attribute Syntax: " +
+                System.out.println("    Attribute Syntax: " +
                     attr.getDescriptor().getSyntax());
             }
-            count ++;
         }
 
-        count = 0;
-        for (Map.Entry<String, ProfileOutput> entry: data.getOutputs().entrySet()) {
-            ProfileOutput output = entry.getValue();
-            System.out.println("Output " + count + " Id: " + entry.getKey());
-            System.out.println("Output " + count + " Name: " + output.getName());
-            System.out.println("Output " + count + " Class: " + output.getClassId());
+        for (ProfileOutput output: data.getOutputs()) {
+            System.out.println();
+            System.out.println("  Output ID: " + output.getId());
+            System.out.println("  Name: " + output.getName());
+            System.out.println("  Class: " + output.getClassId());
             for (ProfileAttribute attr: output.getAttrs()) {
-                System.out.println("Output " + count + " Attribute Name: " + attr.getName());
-                System.out.println("Output " + count + " Attribute Description: " +
+                System.out.println();
+                System.out.println("    Attribute Name: " + attr.getName());
+                System.out.println("    Attribute Description: " +
                     attr.getDescriptor().getDescription(Locale.getDefault()));
-                System.out.println("Output " + count + " Attribute Syntax: " +
+                System.out.println("    Attribute Syntax: " +
                     attr.getDescriptor().getSyntax());
             }
-            count ++;
         }
     }