Skip to content

Commit 6f1f607

Browse files
fern-api[bot]fern-api[bot]
committed
Release 0.0.13
1 parent 292a146 commit 6f1f607

File tree

62 files changed

+796
-69
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+796
-69
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ publishing {
4040
maven(MavenPublication) {
4141
groupId = 'io.squidex'
4242
artifactId = 'squidex'
43-
version = '0.0.12'
43+
version = '0.0.13'
4444
from components.java
4545
}
4646
}

‎src/main/java/com/squidex/api/resources/assets/AssetsClient.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import java.util.HashMap;
3333
import java.util.List;
3434
import java.util.Map;
35-
import java.util.Optional;
3635
import okhttp3.Headers;
3736
import okhttp3.HttpUrl;
3837
import okhttp3.MediaType;
@@ -48,25 +47,19 @@ public AssetsClient(ClientOptions clientOptions) {
4847
this.clientOptions = clientOptions;
4948
}
5049

51-
public InputStream getAssetContentBySlug(
52-
String idOrSlug, Optional<String> more, AssetsGetAssetContentBySlugRequest request) {
50+
public InputStream getAssetContentBySlug(String idOrSlug, String more, AssetsGetAssetContentBySlugRequest request) {
5351
return getAssetContentBySlug(idOrSlug, more, request, null);
5452
}
5553

5654
public InputStream getAssetContentBySlug(
57-
String idOrSlug,
58-
Optional<String> more,
59-
AssetsGetAssetContentBySlugRequest request,
60-
RequestOptions requestOptions) {
55+
String idOrSlug, String more, AssetsGetAssetContentBySlugRequest request, RequestOptions requestOptions) {
6156
HttpUrl.Builder _httpUrl = HttpUrl.parse(
6257
this.clientOptions.environment().getUrl())
6358
.newBuilder()
6459
.addPathSegments("api/assets")
6560
.addPathSegment(clientOptions.appName())
66-
.addPathSegment(idOrSlug);
67-
if (more.isPresent()) {
68-
_httpUrl.addPathSegment(more.get());
69-
}
61+
.addPathSegment(idOrSlug)
62+
.addPathSegment(more);
7063
if (request.getVersion().isPresent()) {
7164
_httpUrl.addQueryParameter("version", request.getVersion().get().toString());
7265
}
@@ -106,6 +99,9 @@ public InputStream getAssetContentBySlug(
10699
if (request.getForce().isPresent()) {
107100
_httpUrl.addQueryParameter("force", request.getForce().get().toString());
108101
}
102+
if (request.getDeleted().isPresent()) {
103+
_httpUrl.addQueryParameter("deleted", request.getDeleted().get().toString());
104+
}
109105
if (request.getFormat().isPresent()) {
110106
_httpUrl.addQueryParameter("format", request.getFormat().get().toString());
111107
}
@@ -178,6 +174,9 @@ public InputStream getAssetContent(String id, AssetsGetAssetContentRequest reque
178174
if (request.getForce().isPresent()) {
179175
_httpUrl.addQueryParameter("force", request.getForce().get().toString());
180176
}
177+
if (request.getDeleted().isPresent()) {
178+
_httpUrl.addQueryParameter("deleted", request.getDeleted().get().toString());
179+
}
181180
if (request.getFormat().isPresent()) {
182181
_httpUrl.addQueryParameter("format", request.getFormat().get().toString());
183182
}

‎src/main/java/com/squidex/api/resources/assets/requests/AssetsGetAssetContentBySlugRequest.java‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ public final class AssetsGetAssetContentBySlugRequest {
4141

4242
private final Optional<Boolean> force;
4343

44+
private final Optional<Boolean> deleted;
45+
4446
private final Optional<ImageFormat> format;
4547

4648
private AssetsGetAssetContentBySlugRequest(
@@ -57,6 +59,7 @@ private AssetsGetAssetContentBySlugRequest(
5759
Optional<Boolean> nofocus,
5860
Optional<Boolean> auto,
5961
Optional<Boolean> force,
62+
Optional<Boolean> deleted,
6063
Optional<ImageFormat> format) {
6164
this.version = version;
6265
this.cache = cache;
@@ -71,6 +74,7 @@ private AssetsGetAssetContentBySlugRequest(
7174
this.nofocus = nofocus;
7275
this.auto = auto;
7376
this.force = force;
77+
this.deleted = deleted;
7478
this.format = format;
7579
}
7680

@@ -178,6 +182,14 @@ public Optional<Boolean> getForce() {
178182
return force;
179183
}
180184

185+
/**
186+
* @return Also return deleted content items.
187+
*/
188+
@JsonProperty("deleted")
189+
public Optional<Boolean> getDeleted() {
190+
return deleted;
191+
}
192+
181193
/**
182194
* @return True to force a new resize even if it already stored.
183195
*/
@@ -207,6 +219,7 @@ private boolean equalTo(AssetsGetAssetContentBySlugRequest other) {
207219
&& nofocus.equals(other.nofocus)
208220
&& auto.equals(other.auto)
209221
&& force.equals(other.force)
222+
&& deleted.equals(other.deleted)
210223
&& format.equals(other.format);
211224
}
212225

@@ -226,6 +239,7 @@ public int hashCode() {
226239
this.nofocus,
227240
this.auto,
228241
this.force,
242+
this.deleted,
229243
this.format);
230244
}
231245

@@ -266,6 +280,8 @@ public static final class Builder {
266280

267281
private Optional<Boolean> force = Optional.empty();
268282

283+
private Optional<Boolean> deleted = Optional.empty();
284+
269285
private Optional<ImageFormat> format = Optional.empty();
270286

271287
private Builder() {}
@@ -284,6 +300,7 @@ public Builder from(AssetsGetAssetContentBySlugRequest other) {
284300
nofocus(other.getNofocus());
285301
auto(other.getAuto());
286302
force(other.getForce());
303+
deleted(other.getDeleted());
287304
format(other.getFormat());
288305
return this;
289306
}
@@ -431,6 +448,17 @@ public Builder force(Boolean force) {
431448
return this;
432449
}
433450

451+
@JsonSetter(value = "deleted", nulls = Nulls.SKIP)
452+
public Builder deleted(Optional<Boolean> deleted) {
453+
this.deleted = deleted;
454+
return this;
455+
}
456+
457+
public Builder deleted(Boolean deleted) {
458+
this.deleted = Optional.of(deleted);
459+
return this;
460+
}
461+
434462
@JsonSetter(value = "format", nulls = Nulls.SKIP)
435463
public Builder format(Optional<ImageFormat> format) {
436464
this.format = format;
@@ -445,7 +473,7 @@ public Builder format(ImageFormat format) {
445473
public AssetsGetAssetContentBySlugRequest build() {
446474
return new AssetsGetAssetContentBySlugRequest(
447475
version, cache, download, width, height, quality, mode, bg, focusX, focusY, nofocus, auto, force,
448-
format);
476+
deleted, format);
449477
}
450478
}
451479
}

‎src/main/java/com/squidex/api/resources/assets/requests/AssetsGetAssetContentRequest.java‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ public final class AssetsGetAssetContentRequest {
4141

4242
private final Optional<Boolean> force;
4343

44+
private final Optional<Boolean> deleted;
45+
4446
private final Optional<ImageFormat> format;
4547

4648
private AssetsGetAssetContentRequest(
@@ -57,6 +59,7 @@ private AssetsGetAssetContentRequest(
5759
Optional<Boolean> nofocus,
5860
Optional<Boolean> auto,
5961
Optional<Boolean> force,
62+
Optional<Boolean> deleted,
6063
Optional<ImageFormat> format) {
6164
this.version = version;
6265
this.cache = cache;
@@ -71,6 +74,7 @@ private AssetsGetAssetContentRequest(
7174
this.nofocus = nofocus;
7275
this.auto = auto;
7376
this.force = force;
77+
this.deleted = deleted;
7478
this.format = format;
7579
}
7680

@@ -178,6 +182,14 @@ public Optional<Boolean> getForce() {
178182
return force;
179183
}
180184

185+
/**
186+
* @return Also return deleted content items.
187+
*/
188+
@JsonProperty("deleted")
189+
public Optional<Boolean> getDeleted() {
190+
return deleted;
191+
}
192+
181193
/**
182194
* @return True to force a new resize even if it already stored.
183195
*/
@@ -206,6 +218,7 @@ private boolean equalTo(AssetsGetAssetContentRequest other) {
206218
&& nofocus.equals(other.nofocus)
207219
&& auto.equals(other.auto)
208220
&& force.equals(other.force)
221+
&& deleted.equals(other.deleted)
209222
&& format.equals(other.format);
210223
}
211224

@@ -225,6 +238,7 @@ public int hashCode() {
225238
this.nofocus,
226239
this.auto,
227240
this.force,
241+
this.deleted,
228242
this.format);
229243
}
230244

@@ -265,6 +279,8 @@ public static final class Builder {
265279

266280
private Optional<Boolean> force = Optional.empty();
267281

282+
private Optional<Boolean> deleted = Optional.empty();
283+
268284
private Optional<ImageFormat> format = Optional.empty();
269285

270286
private Builder() {}
@@ -283,6 +299,7 @@ public Builder from(AssetsGetAssetContentRequest other) {
283299
nofocus(other.getNofocus());
284300
auto(other.getAuto());
285301
force(other.getForce());
302+
deleted(other.getDeleted());
286303
format(other.getFormat());
287304
return this;
288305
}
@@ -430,6 +447,17 @@ public Builder force(Boolean force) {
430447
return this;
431448
}
432449

450+
@JsonSetter(value = "deleted", nulls = Nulls.SKIP)
451+
public Builder deleted(Optional<Boolean> deleted) {
452+
this.deleted = deleted;
453+
return this;
454+
}
455+
456+
public Builder deleted(Boolean deleted) {
457+
this.deleted = Optional.of(deleted);
458+
return this;
459+
}
460+
433461
@JsonSetter(value = "format", nulls = Nulls.SKIP)
434462
public Builder format(Optional<ImageFormat> format) {
435463
this.format = format;
@@ -444,7 +472,7 @@ public Builder format(ImageFormat format) {
444472
public AssetsGetAssetContentRequest build() {
445473
return new AssetsGetAssetContentRequest(
446474
version, cache, download, width, height, quality, mode, bg, focusX, focusY, nofocus, auto, force,
447-
format);
475+
deleted, format);
448476
}
449477
}
450478
}

‎src/main/java/com/squidex/api/resources/comments/CommentsClient.java‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.squidex.api.types.UpsertCommentDto;
1212
import java.io.IOException;
1313
import java.util.List;
14-
import java.util.Optional;
1514
import okhttp3.Headers;
1615
import okhttp3.HttpUrl;
1716
import okhttp3.MediaType;
@@ -26,22 +25,20 @@ public CommentsClient(ClientOptions clientOptions) {
2625
this.clientOptions = clientOptions;
2726
}
2827

29-
public List<String> getWatchingUsers(Optional<String> resource) {
28+
public List<String> getWatchingUsers(String resource) {
3029
return getWatchingUsers(resource, null);
3130
}
3231

33-
public List<String> getWatchingUsers(Optional<String> resource, RequestOptions requestOptions) {
34-
HttpUrl.Builder _httpUrl = HttpUrl.parse(
35-
this.clientOptions.environment().getUrl())
32+
public List<String> getWatchingUsers(String resource, RequestOptions requestOptions) {
33+
HttpUrl _httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
3634
.newBuilder()
3735
.addPathSegments("api/apps")
3836
.addPathSegment(clientOptions.appName())
39-
.addPathSegments("watching");
40-
if (resource.isPresent()) {
41-
_httpUrl.addPathSegment(resource.get());
42-
}
37+
.addPathSegments("watching")
38+
.addPathSegment(resource)
39+
.build();
4340
Request _request = new Request.Builder()
44-
.url(_httpUrl.build())
41+
.url(_httpUrl)
4542
.method("GET", null)
4643
.headers(Headers.of(clientOptions.headers(requestOptions)))
4744
.addHeader("Content-Type", "application/json")

‎src/main/java/com/squidex/api/resources/contents/ContentsClient.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@ public ContentsDto getContents(String schema, ContentsGetContentsRequest request
8282
.method("GET", _requestBody)
8383
.headers(Headers.of(clientOptions.headers(requestOptions)))
8484
.addHeader("Content-Type", "application/json");
85+
if (request.getFields().isPresent()) {
86+
_requestBuilder.addHeader("X-Fields", request.getFields().get());
87+
}
8588
if (request.getFlatten().isPresent()) {
8689
_requestBuilder.addHeader("X-Flatten", request.getFlatten().get().toString());
8790
}
@@ -193,6 +196,9 @@ public ContentsDto getContentsPost(
193196
.method("POST", _requestBody)
194197
.headers(Headers.of(clientOptions.headers(requestOptions)))
195198
.addHeader("Content-Type", "application/json");
199+
if (request.getFields().isPresent()) {
200+
_requestBuilder.addHeader("X-Fields", request.getFields().get());
201+
}
196202
if (request.getFlatten().isPresent()) {
197203
_requestBuilder.addHeader("X-Flatten", request.getFlatten().get().toString());
198204
}
@@ -246,6 +252,9 @@ public ContentDto getContent(
246252
.method("GET", _requestBody)
247253
.headers(Headers.of(clientOptions.headers(requestOptions)))
248254
.addHeader("Content-Type", "application/json");
255+
if (request.getFields().isPresent()) {
256+
_requestBuilder.addHeader("X-Fields", request.getFields().get());
257+
}
249258
if (request.getFlatten().isPresent()) {
250259
_requestBuilder.addHeader("X-Flatten", request.getFlatten().get().toString());
251260
}
@@ -513,6 +522,9 @@ public ContentsDto getReferences(
513522
.method("GET", _requestBody)
514523
.headers(Headers.of(clientOptions.headers(requestOptions)))
515524
.addHeader("Content-Type", "application/json");
525+
if (request.getFields().isPresent()) {
526+
_requestBuilder.addHeader("X-Fields", request.getFields().get());
527+
}
516528
if (request.getFlatten().isPresent()) {
517529
_requestBuilder.addHeader("X-Flatten", request.getFlatten().get().toString());
518530
}
@@ -567,6 +579,9 @@ public ContentsDto getReferencing(
567579
.method("GET", _requestBody)
568580
.headers(Headers.of(clientOptions.headers(requestOptions)))
569581
.addHeader("Content-Type", "application/json");
582+
if (request.getFields().isPresent()) {
583+
_requestBuilder.addHeader("X-Fields", request.getFields().get());
584+
}
570585
if (request.getFlatten().isPresent()) {
571586
_requestBuilder.addHeader("X-Flatten", request.getFlatten().get().toString());
572587
}

‎src/main/java/com/squidex/api/resources/contents/requests/ChangeStatusDto.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public Optional<Boolean> getUnpublished() {
4646
}
4747

4848
/**
49-
* @return Only resolve these languages (comma-separated).
49+
* @return The list of languages to resolve (comma-separated).
5050
*/
5151
@JsonProperty("X-Languages")
5252
public Optional<String> getLanguages() {
@@ -201,7 +201,7 @@ public _FinalStage dueTime(Optional<OffsetDateTime> dueTime) {
201201
}
202202

203203
/**
204-
* <p>Only resolve these languages (comma-separated).</p>
204+
* <p>The list of languages to resolve (comma-separated).</p>
205205
* @return Reference to {@code this} so that method calls can be chained together.
206206
*/
207207
@Override

‎src/main/java/com/squidex/api/resources/contents/requests/ContentsCreateDraftRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public Optional<Boolean> getUnpublished() {
3131
}
3232

3333
/**
34-
* @return Only resolve these languages (comma-separated).
34+
* @return The list of languages to resolve (comma-separated).
3535
*/
3636
@JsonProperty("X-Languages")
3737
public Optional<String> getLanguages() {

‎src/main/java/com/squidex/api/resources/contents/requests/ContentsDeleteContentStatusRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public Optional<Boolean> getUnpublished() {
3131
}
3232

3333
/**
34-
* @return Only resolve these languages (comma-separated).
34+
* @return The list of languages to resolve (comma-separated).
3535
*/
3636
@JsonProperty("X-Languages")
3737
public Optional<String> getLanguages() {

‎src/main/java/com/squidex/api/resources/contents/requests/ContentsDeleteVersionRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public Optional<Boolean> getUnpublished() {
3131
}
3232

3333
/**
34-
* @return Only resolve these languages (comma-separated).
34+
* @return The list of languages to resolve (comma-separated).
3535
*/
3636
@JsonProperty("X-Languages")
3737
public Optional<String> getLanguages() {

0 commit comments

Comments
 (0)