Merge pull request #69 from ga4gh/release/0.3.1

Release 0.3.1 into main
ga4gh · May 26, 2022 · 930e5bf · 930e5bf
2 parents e182450 + 5cff143
commit 930e5bf
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -186,10 +186,16 @@ Multiple datasets are currently contained in this repo for development and testi
 
 ## Changelog
 
+### v0.3.1
+
+* Fixed a bug where admin requests to create a controlled access DRS object (i.e. with visas) did not complete successfully
+
 ### v0.3.0
+
 * DRS object batch requests
 * Passport support - Passport mediated auth to DRS objects (using Starter Kit implementation of Passports)
 * Auth info - Discover Passport broker(s) and visa(s) for requested controlled access DRS Objects (single object and bulk request)
 
 ### v0.2.2
+
 * patched log4j dependencies to v2.16.0 to avoid [Log4j Vulnerability](https://www.cisa.gov/uscert/apache-log4j-vulnerability-guidance)
diff --git a/build.gradle b/build.gradle
@@ -36,7 +36,7 @@ configurations.all {
 
 archivesBaseName = 'ga4gh-starter-kit-drs'
 group 'org.ga4gh'
-version '0.3.0'
+version '0.3.1'
 
 repositories {
     // Use jcenter for resolving dependencies.

diff --git a/src/main/java/org/ga4gh/starterkit/drs/constant/DrsServiceInfoDefaults.java b/src/main/java/org/ga4gh/starterkit/drs/constant/DrsServiceInfoDefaults.java
@@ -54,7 +54,7 @@ public class DrsServiceInfoDefaults {
     /**
      * Default service version
      */
-    public static final String VERSION = "0.3.0";
+    public static final String VERSION = "0.3.1";
 
     /**
      * Default service organization name

diff --git a/src/main/java/org/ga4gh/starterkit/drs/controller/DrsAdmin.java b/src/main/java/org/ga4gh/starterkit/drs/controller/DrsAdmin.java
@@ -77,6 +77,7 @@ public DrsObject showDrsObject(
      * @return persistent DRSObject saved with the requested attributes
      */
     @PostMapping(consumes = MediaType.APPLICATION_JSON_VALUE)
+    @JsonView(SerializeView.Admin.class)
     public DrsObject createDrsObject(
         @RequestBody DrsObject drsObject
     ) {

diff --git a/src/main/java/org/ga4gh/starterkit/drs/model/PassportBroker.java b/src/main/java/org/ga4gh/starterkit/drs/model/PassportBroker.java
@@ -47,7 +47,7 @@ public class PassportBroker implements HibernateEntity<String> {
         cascade = {CascadeType.ALL},
         orphanRemoval = true
     )
-    @JsonView(SerializeView.Admin.class)
+    @JsonView(SerializeView.Never.class)
     private List<PassportVisa> passportVisas;
 
     public PassportBroker() {

diff --git a/src/main/java/org/ga4gh/starterkit/drs/model/PassportVisa.java b/src/main/java/org/ga4gh/starterkit/drs/model/PassportVisa.java
@@ -59,6 +59,7 @@ public class PassportVisa implements HibernateEntity<Integer> {
                    CascadeType.DETACH, CascadeType.REFRESH}
     )
     @JoinColumn(name = "passport_broker_url")
+    @JsonView(SerializeView.Admin.class)
     private PassportBroker passportBroker;
 
     @ManyToMany
@@ -67,7 +68,7 @@ public class PassportVisa implements HibernateEntity<Integer> {
         joinColumns = {@JoinColumn(name = "visa_id")},
         inverseJoinColumns = {@JoinColumn(name = "drs_object_id")}
     )
-    @JsonView(SerializeView.Admin.class)
+    @JsonView(SerializeView.Never.class)
     private List<DrsObject> drsObjects;
 
     public PassportVisa() {

diff --git a/src/test/resources/responses/service-info/show/00.json b/src/test/resources/responses/service-info/show/00.json
@@ -1 +1 @@
-{"id":"org.ga4gh.starterkit.drs","name":"GA4GH Starter Kit DRS Service","description":"An open source, community-driven implementation of the GA4GH Data Repository Service (DRS) API specification.","contactUrl":"mailto:[email protected]","documentationUrl":"https://github.com/ga4gh/ga4gh-starter-kit-drs","createdAt":"2020-01-15T12:00:00Z","updatedAt":"2020-01-15T12:00:00Z","environment":"test","version":"0.3.0","type":{"group":"org.ga4gh","artifact":"drs","version":"1.1.0"},"organization":{"name":"Global Alliance for Genomics and Health","url":"https://ga4gh.org"}}
+{"id":"org.ga4gh.starterkit.drs","name":"GA4GH Starter Kit DRS Service","description":"An open source, community-driven implementation of the GA4GH Data Repository Service (DRS) API specification.","contactUrl":"mailto:[email protected]","documentationUrl":"https://github.com/ga4gh/ga4gh-starter-kit-drs","createdAt":"2020-01-15T12:00:00Z","updatedAt":"2020-01-15T12:00:00Z","environment":"test","version":"0.3.1","type":{"group":"org.ga4gh","artifact":"drs","version":"1.1.0"},"organization":{"name":"Global Alliance for Genomics and Health","url":"https://ga4gh.org"}}