Commit cf9becf1 authored by bmajor's avatar bmajor Committed by GitHub
Browse files

Merge pull request #22 from pdowler/master 

fix GroupURI to check that scheme is ivo
parents e29bf705 e3d981bc

cadc-access-control/build.gradle

+1 −1
Changes for cadc-access-control/build.gradle: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ sourceCompatibility = 1.7 


group = 'org.opencadc'



version = '1.1.3'

version = '1.1.4'



mainClassName = 'ca.nrc.cadc.ac.client.Main'

cadc-access-control/src/main/java/ca/nrc/cadc/ac/GroupURI.java

+2 −2
Changes for cadc-access-control/src/main/java/ca/nrc/cadc/ac/GroupURI.java: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -99,9 +99,9 @@ public class GroupURI 
        }



        // Ensure the scheme is correct

        if (uri.getScheme() == null)

        if (uri.getScheme() == null || !"ivo".equals(uri.getScheme()))

        {

            throw new IllegalArgumentException("GroupURI scheme is required.");

            throw new IllegalArgumentException("GroupURI scheme must be 'ivo'.");

        }



        if (uri.getAuthority() == null)

cadc-access-control/src/test/java/ca/nrc/cadc/ac/GroupURITest.java

+3 −0
Changes for cadc-access-control/src/test/java/ca/nrc/cadc/ac/GroupURITest.java: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ public class GroupURITest 
            // no scheme

            assertIllegalArgument("example.org/gms?gname", "scheme");

            

            // wrong scheme

            assertIllegalArgument("gms://example.org/gms?gname", "scheme");



            // no authority

            assertIllegalArgument("ivo://gms?gname", "authority");