diff --git a/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/GetAction.java b/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/GetAction.java index 62ce245a..b153ed08 100644 --- a/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/GetAction.java +++ b/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/GetAction.java @@ -3,7 +3,7 @@ ******************* CANADIAN ASTRONOMY DATA CENTRE ******************* ************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************** * -* (c) 2018. (c) 2018. +* (c) 2024. (c) 2024. * Government of Canada Gouvernement du Canada * National Research Council Conseil national de recherches * Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6 diff --git a/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/GetPermissionsAction.java b/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/GetPermissionsAction.java index ba689ac2..0dc8c49a 100644 --- a/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/GetPermissionsAction.java +++ b/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/GetPermissionsAction.java @@ -3,7 +3,7 @@ ******************* CANADIAN ASTRONOMY DATA CENTRE ******************* ************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************** * -* (c) 2018. (c) 2018. +* (c) 2024. (c) 2024. * Government of Canada Gouvernement du Canada * National Research Council Conseil national de recherches * Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6 diff --git a/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/PostPermissionsAction.java b/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/PostPermissionsAction.java index 6fd0a45a..59cfdb4e 100644 --- a/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/PostPermissionsAction.java +++ b/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/PostPermissionsAction.java @@ -3,7 +3,7 @@ ******************* CANADIAN ASTRONOMY DATA CENTRE ******************* ************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************** * -* (c) 2018. (c) 2018. +* (c) 2024. (c) 2024. * Government of Canada Gouvernement du Canada * National Research Council Conseil national de recherches * Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6 @@ -67,6 +67,11 @@ package ca.nrc.cadc.vosi.actions; +import ca.nrc.cadc.net.ResourceNotFoundException; +import ca.nrc.cadc.rest.InlineContentException; +import ca.nrc.cadc.rest.InlineContentHandler; +import ca.nrc.cadc.tap.schema.TapPermissions; +import ca.nrc.cadc.tap.schema.TapSchemaDAO; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -74,16 +79,9 @@ import java.net.URI; import java.util.HashMap; import java.util.Map; - import org.apache.log4j.Logger; import org.opencadc.gms.GroupURI; -import ca.nrc.cadc.net.ResourceNotFoundException; -import ca.nrc.cadc.rest.InlineContentException; -import ca.nrc.cadc.rest.InlineContentHandler; -import ca.nrc.cadc.tap.schema.TapPermissions; -import ca.nrc.cadc.tap.schema.TapSchemaDAO; - /** * Set the permissions on a schema or table. * diff --git a/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/PutAction.java b/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/PutAction.java index 2c06ee9f..0146d85e 100644 --- a/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/PutAction.java +++ b/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/PutAction.java @@ -3,7 +3,7 @@ ******************* CANADIAN ASTRONOMY DATA CENTRE ******************* ************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************** * -* (c) 2018. (c) 2018. +* (c) 2024. (c) 2024. * Government of Canada Gouvernement du Canada * National Research Council Conseil national de recherches * Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6 @@ -69,7 +69,6 @@ import ca.nrc.cadc.auth.AuthenticationUtil; import ca.nrc.cadc.auth.HttpPrincipal; -import ca.nrc.cadc.auth.IdentityManager; import ca.nrc.cadc.db.DatabaseTransactionManager; import ca.nrc.cadc.net.ResourceAlreadyExistsException; import ca.nrc.cadc.profiler.Profiler; diff --git a/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/TableDescHandler.java b/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/TableDescHandler.java index 5800ed59..dda974a1 100644 --- a/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/TableDescHandler.java +++ b/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/TableDescHandler.java @@ -3,7 +3,7 @@ ******************* CANADIAN ASTRONOMY DATA CENTRE ******************* ************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************** * -* (c) 2018. (c) 2018. +* (c) 2024. (c) 2024. * Government of Canada Gouvernement du Canada * National Research Council Conseil national de recherches * Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6 @@ -67,7 +67,6 @@ package ca.nrc.cadc.vosi.actions; - import ca.nrc.cadc.dali.tables.votable.VOTableDocument; import ca.nrc.cadc.dali.tables.votable.VOTableReader; import ca.nrc.cadc.dali.tables.votable.VOTableResource; @@ -77,12 +76,10 @@ import ca.nrc.cadc.rest.InlineContentHandler; import ca.nrc.cadc.tap.schema.SchemaDesc; import ca.nrc.cadc.tap.schema.TableDesc; -import ca.nrc.cadc.tap.schema.TapSchema; import ca.nrc.cadc.tap.schema.TapSchemaUtil; import ca.nrc.cadc.util.StringUtil; import ca.nrc.cadc.vosi.InvalidTableSetException; import ca.nrc.cadc.vosi.TableReader; -import ca.nrc.cadc.vosi.TableSetReader; import java.io.IOException; import java.io.InputStream; import java.io.StringReader; diff --git a/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/TablesAction.java b/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/TablesAction.java index bca65cf4..5601c9ee 100644 --- a/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/TablesAction.java +++ b/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/TablesAction.java @@ -3,7 +3,7 @@ ******************* CANADIAN ASTRONOMY DATA CENTRE ******************* ************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************** * -* (c) 2018. (c) 2018. +* (c) 2024. (c) 2024. * Government of Canada Gouvernement du Canada * National Research Council Conseil national de recherches * Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6 @@ -79,7 +79,6 @@ import ca.nrc.cadc.tap.schema.TapSchemaDAO; import java.io.IOException; import java.security.AccessControlException; - import java.security.Principal; import java.util.Set; import java.util.TreeSet; diff --git a/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/Util.java b/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/Util.java index 7e2949da..6427047a 100644 --- a/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/Util.java +++ b/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/Util.java @@ -3,7 +3,7 @@ ******************* CANADIAN ASTRONOMY DATA CENTRE ******************* ************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************** * -* (c) 2018. (c) 2018. +* (c) 2024. (c) 2024. * Government of Canada Gouvernement du Canada * National Research Council Conseil national de recherches * Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6 diff --git a/youcat/src/intTest/java/org/opencadc/youcat/AbstractTablesTest.java b/youcat/src/intTest/java/org/opencadc/youcat/AbstractTablesTest.java index cc7e9d32..cef78227 100644 --- a/youcat/src/intTest/java/org/opencadc/youcat/AbstractTablesTest.java +++ b/youcat/src/intTest/java/org/opencadc/youcat/AbstractTablesTest.java @@ -3,7 +3,7 @@ ******************* CANADIAN ASTRONOMY DATA CENTRE ******************* ************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************** * -* (c) 2019. (c) 2019. +* (c) 2024. (c) 2024. * Government of Canada Gouvernement du Canada * National Research Council Conseil national de recherches * Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6 diff --git a/youcat/src/intTest/java/org/opencadc/youcat/CreateTableTest.java b/youcat/src/intTest/java/org/opencadc/youcat/CreateTableTest.java index a8e33565..f01b798a 100644 --- a/youcat/src/intTest/java/org/opencadc/youcat/CreateTableTest.java +++ b/youcat/src/intTest/java/org/opencadc/youcat/CreateTableTest.java @@ -3,7 +3,7 @@ ******************* CANADIAN ASTRONOMY DATA CENTRE ******************* ************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************** * -* (c) 2019. (c) 2019. +* (c) 2024. (c) 2024. * Government of Canada Gouvernement du Canada * National Research Council Conseil national de recherches * Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6 diff --git a/youcat/src/intTest/java/org/opencadc/youcat/LoadTableDataTest.java b/youcat/src/intTest/java/org/opencadc/youcat/LoadTableDataTest.java index 89514c3a..bd75e683 100644 --- a/youcat/src/intTest/java/org/opencadc/youcat/LoadTableDataTest.java +++ b/youcat/src/intTest/java/org/opencadc/youcat/LoadTableDataTest.java @@ -3,7 +3,7 @@ ******************* CANADIAN ASTRONOMY DATA CENTRE ******************* ************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************** * -* (c) 2018. (c) 2018. +* (c) 2024. (c) 2024. * Government of Canada Gouvernement du Canada * National Research Council Conseil national de recherches * Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6 diff --git a/youcat/src/intTest/java/org/opencadc/youcat/PermissionsTest.java b/youcat/src/intTest/java/org/opencadc/youcat/PermissionsTest.java index b696b7b6..15e7f746 100644 --- a/youcat/src/intTest/java/org/opencadc/youcat/PermissionsTest.java +++ b/youcat/src/intTest/java/org/opencadc/youcat/PermissionsTest.java @@ -3,7 +3,7 @@ ******************* CANADIAN ASTRONOMY DATA CENTRE ******************* ************** CENTRE CANADIEN DE DONNÉES ASTRONOMIQUES ************** * -* (c) 2019. (c) 2019. +* (c) 2024. (c) 2024. * Government of Canada Gouvernement du Canada * National Research Council Conseil national de recherches * Ottawa, Canada, K1A 0R6 Ottawa, Canada, K1A 0R6