From 0179856ef2ddad493d9d6e0272daa514af5e9921 Mon Sep 17 00:00:00 2001 From: Greg Messner Date: Wed, 23 Oct 2019 07:43:50 -0700 Subject: [PATCH] Added content_sha256 field (#455). --- .../java/org/gitlab4j/api/models/RepositoryFile.java | 9 +++++++++ .../java/org/gitlab4j/api/TestGitLabApiBeans.java | 7 +++++++ .../resources/org/gitlab4j/api/repository-file.json | 12 ++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 src/test/resources/org/gitlab4j/api/repository-file.json diff --git a/src/main/java/org/gitlab4j/api/models/RepositoryFile.java b/src/main/java/org/gitlab4j/api/models/RepositoryFile.java index 6496269a..d3a05d12 100644 --- a/src/main/java/org/gitlab4j/api/models/RepositoryFile.java +++ b/src/main/java/org/gitlab4j/api/models/RepositoryFile.java @@ -15,6 +15,7 @@ public class RepositoryFile { private Integer size; private Encoding encoding; private String content; + private String contentSha256; private String ref; private String blobId; private String commitId; @@ -60,6 +61,14 @@ public class RepositoryFile { this.content = content; } + public String getContentSha256() { + return contentSha256; + } + + public void setContentSha256(String contentSha256) { + this.contentSha256 = contentSha256; + } + public String getRef() { return ref; } diff --git a/src/test/java/org/gitlab4j/api/TestGitLabApiBeans.java b/src/test/java/org/gitlab4j/api/TestGitLabApiBeans.java index 4aaa070d..4c06750a 100644 --- a/src/test/java/org/gitlab4j/api/TestGitLabApiBeans.java +++ b/src/test/java/org/gitlab4j/api/TestGitLabApiBeans.java @@ -82,6 +82,7 @@ import org.gitlab4j.api.models.ProtectedBranch; import org.gitlab4j.api.models.ProtectedTag; import org.gitlab4j.api.models.PushRules; import org.gitlab4j.api.models.RegistryRepository; +import org.gitlab4j.api.models.RepositoryFile; import org.gitlab4j.api.models.Runner; import org.gitlab4j.api.models.RunnerDetail; import org.gitlab4j.api.models.SearchBlob; @@ -405,6 +406,12 @@ public class TestGitLabApiBeans { assertTrue(compareJson(repos, "registry-repositories.json")); } + @Test + public void testRepositoryFile() throws Exception { + RepositoryFile file = unmarshalResource(RepositoryFile.class, "repository-file.json"); + assertTrue(compareJson(file, "repository-file.json")); + } + @Test public void testRunnerDetail() throws Exception { RunnerDetail runnerDetail = unmarshalResource(RunnerDetail.class, "runner-detail.json"); diff --git a/src/test/resources/org/gitlab4j/api/repository-file.json b/src/test/resources/org/gitlab4j/api/repository-file.json new file mode 100644 index 00000000..ffb79967 --- /dev/null +++ b/src/test/resources/org/gitlab4j/api/repository-file.json @@ -0,0 +1,12 @@ +{ + "file_name": "key.rb", + "file_path": "app/models/key.rb", + "size": 1476, + "encoding": "base64", + "content": "IyA9PSBTY2hlbWEgSW5mb3...", + "content_sha256": "4c294617b60715c1d218e61164a3abd4808a4284cbc30e6728a01ad9aada4481", + "ref": "master", + "blob_id": "79f7bbd25901e8334750839545a9bd021f0e4c83", + "commit_id": "d5a3ff139356ce33e37e73add446f16869741b50", + "last_commit_id": "570e7b2abdd848b95f2f578043fc23bd6f6fd24d" +} \ No newline at end of file -- GitLab