Skip to content

Commit

Permalink
Remove unneed method from ResultStoreImpl / Added scriv fragment
Browse files Browse the repository at this point in the history
  • Loading branch information
stvoutsin committed Jun 7, 2024
1 parent 0592073 commit 2e063f8
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 9 deletions.
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,17 @@ Find changes for the upcoming release in the project's [changelog.d](https://git

<!-- scriv-insert-here -->

<a id='changelog-8.1.0'></a>

<a id='changelog-1.17.0'></a>
## 1.17.0 (2024-06-07)

### New features

- Updated cadc libraries to more recent version. Moved to using the cadc-tomcat Docker image



<a id='changelog-1.16.0'></a>
## 1.16.0 (2024-05-30)

### New features
Expand Down
37 changes: 37 additions & 0 deletions changelog.d/20240607_221513_steliosvoutsinas_results_fix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
.. A new scriv changelog fragment.
..
.. Uncomment the header that is right (remove the leading dots).
..
.. Removed
.. -------
..
.. - A bullet item for the Removed category.
..
.. Added
.. -----
..
.. - A bullet item for the Added category.
..
Changed
-------
- Added Results Servlet
- Changed Result Implementation to point to the results endpoint
..
.. - A bullet item for the Changed category.
..
.. Deprecated
.. ----------
..
.. - A bullet item for the Deprecated category.
..
.. Fixed
.. -----
..
.. - A bullet item for the Fixed category.
..
.. Security
.. --------
..
.. - A bullet item for the Security category.
..
9 changes: 1 addition & 8 deletions tap/src/main/java/ca/nrc/cadc/sample/ResultStoreImpl.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/*
************************************************************************
******************* CANADIAN ASTRONOMY DATA CENTRE *******************
Expand Down Expand Up @@ -92,7 +91,6 @@

public class ResultStoreImpl implements ResultStore {
private String filename;
private String jobID;
private static final String bucket = System.getProperty("gcs_bucket");
private static final String bucketURL = System.getProperty("gcs_bucket_url");
private static final String baseURL = System.getProperty("base_url");
Expand Down Expand Up @@ -137,7 +135,7 @@ public URL put(final ResultSet resultSet,
private OutputStream getOutputStream() {
Storage storage = StorageOptions.getDefaultInstance().getService();
BlobId blobId = BlobId.of(bucket, filename);

BlobInfo blobInfo = BlobInfo.newBuilder(blobId).setContentType("application/x-votable+xml").build();
Blob blob = storage.create(blobInfo);
return Channels.newOutputStream(blob.writer());
Expand All @@ -160,9 +158,4 @@ public void setFilename(String filename) {
this.filename = filename;
}

public void setJobID(String jobID) {
this.jobID = jobID;
}


}

0 comments on commit 2e063f8

Please sign in to comment.