Skip to content

Commit d3f067b

Browse files
committed
refactor: simplify organization uploads
1 parent 9e48d70 commit d3f067b

3 files changed

Lines changed: 25 additions & 18 deletions

File tree

README.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,24 @@ var invoice = facturapi.invoices().create(Map.of(
5151
System.out.println(invoice.getId());
5252
```
5353

54+
## Uploads
55+
56+
```java
57+
import java.io.File;
58+
59+
var organization = facturapi.organizations().uploadLogo(
60+
"org_123",
61+
new File("logo.png")
62+
);
63+
64+
var updated = facturapi.organizations().uploadCertificate(
65+
"org_123",
66+
new File("certificate.cer"),
67+
new File("certificate.key"),
68+
"secret"
69+
);
70+
```
71+
5472
## Design
5573

5674
- Inputs use flexible JSON dictionaries (`Map<String, Object>`).

src/main/java/io/facturapi/resources/OrganizationsResource.java

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,15 @@ public DomainAvailability checkDomainAvailability(Map<String, ?> query) {
9090
* Uploads organization logo file.
9191
*/
9292
public Organization uploadLogo(String id, File file) throws IOException {
93-
return uploadLogo(id, Files.readAllBytes(file.toPath()), file.getName());
93+
return uploadLogo(id, Files.readAllBytes(file.toPath()));
9494
}
9595

9696
/**
9797
* Uploads organization logo file bytes.
9898
*/
99-
public Organization uploadLogo(String id, byte[] fileBytes, String fileName) {
99+
public Organization uploadLogo(String id, byte[] fileBytes) {
100100
MultipartBody multipartBody = new MultipartBodyBuilder()
101-
.addFile("file", fileName, fileBytes, "application/octet-stream")
101+
.addFile("file", "logo.jpg", fileBytes, "application/octet-stream")
102102
.build();
103103
return client.putMultipart("/organizations/" + id + "/logo", multipartBody, Organization.class);
104104
}
@@ -110,27 +110,18 @@ public Organization uploadCertificate(String id, File cerFile, File keyFile, Str
110110
return uploadCertificate(
111111
id,
112112
Files.readAllBytes(cerFile.toPath()),
113-
cerFile.getName(),
114113
Files.readAllBytes(keyFile.toPath()),
115-
keyFile.getName(),
116114
password
117115
);
118116
}
119117

120118
/**
121119
* Uploads organization CSD certificate file bytes.
122120
*/
123-
public Organization uploadCertificate(
124-
String id,
125-
byte[] cerFileBytes,
126-
String cerFileName,
127-
byte[] keyFileBytes,
128-
String keyFileName,
129-
String password
130-
) {
121+
public Organization uploadCertificate(String id, byte[] cerFileBytes, byte[] keyFileBytes, String password) {
131122
MultipartBody multipartBody = new MultipartBodyBuilder()
132-
.addFile("cer", cerFileName, cerFileBytes, "application/octet-stream")
133-
.addFile("key", keyFileName, keyFileBytes, "application/octet-stream")
123+
.addFile("cer", "certificate.cer", cerFileBytes, "application/octet-stream")
124+
.addFile("key", "certificate.key", keyFileBytes, "application/octet-stream")
134125
.addField("password", password)
135126
.build();
136127
return client.putMultipart("/organizations/" + id + "/certificate", multipartBody, Organization.class);

src/test/java/io/facturapi/FacturapiResourcesTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ void organizationUploadsAcceptBytes() {
7373
.build()
7474
);
7575

76-
var response = sdk.organizations().uploadLogo("org_1", "logo-bytes".getBytes(StandardCharsets.UTF_8), "logo.png");
76+
var response = sdk.organizations().uploadLogo("org_1", "logo-bytes".getBytes(StandardCharsets.UTF_8));
7777

7878
assertEquals("org_1", response.getId());
7979
assertEquals("PUT", httpClient.requests().get(0).method());
@@ -94,9 +94,7 @@ void organizationCertificateUploadsAcceptBytes() {
9494
var response = sdk.organizations().uploadCertificate(
9595
"org_1",
9696
"cer-bytes".getBytes(StandardCharsets.UTF_8),
97-
"certificate.cer",
9897
"key-bytes".getBytes(StandardCharsets.UTF_8),
99-
"certificate.key",
10098
"secret"
10199
);
102100

0 commit comments

Comments
 (0)