Skip to content

Commit db1a758

Browse files
committed
Merge remote-tracking branch 'origin/main' into 6.x
2 parents d8777af + 7a224e3 commit db1a758

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

src/main/java/org/gitlab4j/api/models/PackageFile.java

+9
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public class PackageFile implements Serializable {
1515
private Long size;
1616
private String fileMd5;
1717
private String fileSha1;
18+
private String fileSha256;
1819

1920
public Long getId() {
2021
return id;
@@ -72,6 +73,14 @@ public void setFileSha1(String fileSha1) {
7273
this.fileSha1 = fileSha1;
7374
}
7475

76+
public String getFileSha256() {
77+
return fileSha256;
78+
}
79+
80+
public void setFileSha256(String fileSha256) {
81+
this.fileSha256 = fileSha256;
82+
}
83+
7584
@Override
7685
public String toString() {
7786
return (JacksonJson.toJsonString(this));

src/test/resources/org/gitlab4j/api/package-files.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"file_name": "my-app-1.5-20181107.152550-1.jar",
77
"size": 2421,
88
"file_md5": "58e6a45a629910c6ff99145a688971ac",
9-
"file_sha1": "ebd193463d3915d7e22219f52740056dfd26cbfe"
9+
"file_sha1": "ebd193463d3915d7e22219f52740056dfd26cbfe",
10+
"file_sha256": "e677d33156215f1afa15c934a4ebd1162c62d0ae0e70d2510b6bc75e651c27b8"
1011
},
1112
{
1213
"id": 26,
@@ -15,7 +16,8 @@
1516
"file_name": "my-app-1.5-20181107.152550-1.pom",
1617
"size": 1122,
1718
"file_md5": "d90f11d851e17c5513586b4a7e98f1b2",
18-
"file_sha1": "9608d068fe88aff85781811a42f32d97feb440b5"
19+
"file_sha1": "9608d068fe88aff85781811a42f32d97feb440b5",
20+
"file_sha256": "621dc7c0a151ab80895237868421eb5708c5285bf88b5ceeac3d77d5be11512b"
1921
},
2022
{
2123
"id": 27,
@@ -24,6 +26,7 @@
2426
"file_name": "maven-metadata.xml",
2527
"size": 767,
2628
"file_md5": "6dfd0cce1203145a927fef5e3a1c650c",
27-
"file_sha1": "d25932de56052d320a8ac156f745ece73f6a8cd2"
29+
"file_sha1": "d25932de56052d320a8ac156f745ece73f6a8cd2",
30+
"file_sha256": "c3e051898b0fb347553424d7947127905b4649961463f8627003f5ce7a6f750c"
2831
}
2932
]

0 commit comments

Comments
 (0)