Commit fd3ce950 authored by Patrick Dowler's avatar Patrick Dowler
Browse files

fix json output for cadcAccessControl library

parent af78ac22

projects/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonGroupWriter.java

+10 −9
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ import ca.nrc.cadc.ac.xml.GroupWriter; 
import ca.nrc.cadc.xml.JsonOutputter;

import org.jdom2.Document;

import org.jdom2.Element;

import org.json.JSONException;



import java.io.IOException;

import java.io.Writer;
@@ -105,15 +104,17 @@ public class JsonGroupWriter extends GroupWriter 
        document.setRootElement(groupElement);



        JsonOutputter jsonOutputter = new JsonOutputter();

        jsonOutputter.getListElementNames().add("groups");

        jsonOutputter.getListElementNames().add("users");

        jsonOutputter.getListElementNames().add("identities");

        jsonOutputter.getListElementNames().add("details");

        jsonOutputter.getListElementNames().add("properties");

        jsonOutputter.getListElementNames().add("groupMembers");

        jsonOutputter.getListElementNames().add("groupAdmins");

        jsonOutputter.getListElementNames().add("userMembers");

        jsonOutputter.getListElementNames().add("userAdmins");



        try

        {

        jsonOutputter.output(document, writer);

    }

        catch (JSONException e)

        {

            throw new IOException(e);

        }

    }



}

projects/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserListWriter.java

+5 −9
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ import ca.nrc.cadc.ac.xml.UserListWriter; 
import ca.nrc.cadc.xml.JsonOutputter;

import org.jdom2.Document;

import org.jdom2.Element;

import org.json.JSONException;



import java.io.IOException;

import java.io.Writer;
@@ -107,15 +106,12 @@ public class JsonUserListWriter extends UserListWriter 
        document.setRootElement(usersElement);



        JsonOutputter jsonOutputter = new JsonOutputter();

        jsonOutputter.getListElementNames().add("groups");

        jsonOutputter.getListElementNames().add("users");

        jsonOutputter.getListElementNames().add("identities");

        jsonOutputter.getListElementNames().add("details");



        try

        {

        jsonOutputter.output(document, writer);

    }

        catch (JSONException e)

        {

            throw new IOException(e);

        }

    }



}

projects/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserRequestWriter.java

+10 −9
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ import ca.nrc.cadc.ac.xml.UserRequestWriter; 
import ca.nrc.cadc.xml.JsonOutputter;

import org.jdom2.Document;

import org.jdom2.Element;

import org.json.JSONException;



import java.io.IOException;

import java.io.Writer;
@@ -108,15 +107,17 @@ public class JsonUserRequestWriter extends UserRequestWriter 
        document.setRootElement(userRequestElement);



        JsonOutputter jsonOutputter = new JsonOutputter();

        jsonOutputter.getListElementNames().add("groups");

        jsonOutputter.getListElementNames().add("users");

        jsonOutputter.getListElementNames().add("identities");

        jsonOutputter.getListElementNames().add("details");

        jsonOutputter.getListElementNames().add("properties");

        jsonOutputter.getListElementNames().add("groupMembers");

        jsonOutputter.getListElementNames().add("groupAdmins");

        jsonOutputter.getListElementNames().add("userMembers");

        jsonOutputter.getListElementNames().add("userAdmins");



        try

        {

        jsonOutputter.output(document, writer);

    }

        catch (JSONException e)

        {

            throw new IOException(e);

        }

    }



}

projects/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserWriter.java

+11 −10
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ import ca.nrc.cadc.ac.xml.UserWriter; 
import ca.nrc.cadc.xml.JsonOutputter;

import org.jdom2.Document;

import org.jdom2.Element;

import org.json.JSONException;



import java.io.IOException;

import java.io.Writer;
@@ -107,15 +106,17 @@ public class JsonUserWriter extends UserWriter 
        document.setRootElement(userElement);



        JsonOutputter jsonOutputter = new JsonOutputter();

        jsonOutputter.getListElementNames().add("groups");

        jsonOutputter.getListElementNames().add("users");

        jsonOutputter.getListElementNames().add("identities");

        jsonOutputter.getListElementNames().add("details");

        jsonOutputter.getListElementNames().add("properties");

        jsonOutputter.getListElementNames().add("groupMembers");

        jsonOutputter.getListElementNames().add("groupAdmins");

        jsonOutputter.getListElementNames().add("userMembers");

        jsonOutputter.getListElementNames().add("userAdmins");

        

        try

        {

        jsonOutputter.output(document, writer);

    }

        catch (JSONException e)

        {

            throw new IOException(e);

        }

    }



}

projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapperTest.java

+14 −3
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ import ca.nrc.cadc.ac.PersonalDetails; 
import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.ac.json.JsonUserListWriter;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.util.Log4jInit;



import java.io.ByteArrayInputStream;

import java.io.InputStream;
@@ -81,6 +82,8 @@ import java.security.Principal; 
import java.util.ArrayList;

import java.util.Collection;

import java.util.List;

import org.apache.log4j.Level;

import org.apache.log4j.Logger;



import org.junit.Test;
@@ -89,6 +92,13 @@ import static org.junit.Assert.*; 


public class JsonUserListInputStreamWrapperTest

{

    private static final Logger log = Logger.getLogger(JsonUserListInputStreamWrapperTest.class);

    

    static

    {

        Log4jInit.setLevel("ca.nrc.cadc.ac", Level.INFO);

    }

    

    @Test

    public void readInputStream() throws Exception

    {
@@ -111,9 +121,10 @@ public class JsonUserListInputStreamWrapperTest 
        users.add(user2);



        userListWriter.write(users, writer);

        String json = writer.toString();

        log.debug("user:\n" + json);

        

        final InputStream inputStream =

                new ByteArrayInputStream(writer.toString().getBytes());

        final InputStream inputStream = new ByteArrayInputStream(json.getBytes());



        testSubject.read(inputStream);