Release 0.0.12

Squidex · Aug 20, 2023 · 55ce9ac · 55ce9ac
1 parent 2bfaeed
commit 55ce9ac
Show file tree

Hide file tree

Showing 210 changed files with 449 additions and 519 deletions.
diff --git a/build.gradle b/build.gradle
@@ -40,7 +40,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'io.squidex'
             artifactId = 'squidex'
-            version = '0.0.8'
+            version = '0.0.12'
             from components.java
         }
     }

diff --git a/src/main/java/com/squidex/api/core/ClientOptions.java b/src/main/java/com/squidex/api/core/ClientOptions.java
diff --git a/src/main/java/com/squidex/api/core/ObjectMappers.java b/src/main/java/com/squidex/api/core/ObjectMappers.java
@@ -1,10 +1,12 @@
 package com.squidex.api.core;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import java.io.IOException;
 
 public final class ObjectMappers {
     public static final ObjectMapper JSON_MAPPER = JsonMapper.builder()
@@ -14,4 +16,15 @@ public final class ObjectMappers {
             .build();
 
     private ObjectMappers() {}
+
+    public static String stringify(Object o) {
+        try {
+            return JSON_MAPPER
+                    .setSerializationInclusion(JsonInclude.Include.ALWAYS)
+                    .writerWithDefaultPrettyPrinter()
+                    .writeValueAsString(o);
+        } catch (IOException e) {
+            return o.getClass().getName() + "@" + Integer.toHexString(o.hashCode());
+        }
+    }
 }
diff --git a/src/main/java/com/squidex/api/resources/apps/AppsClient.java b/src/main/java/com/squidex/api/resources/apps/AppsClient.java
@@ -465,13 +465,16 @@ public AppDto uploadImage(File file, AppsUploadImageRequest request, RequestOpti
                 .addPathSegments("image")
                 .build();
         MultipartBody.Builder _multipartBody = new MultipartBody.Builder().setType(MultipartBody.FORM);
-        _multipartBody.addFormDataPart("file", null, RequestBody.create(null, file));
+        try {
+            _multipartBody.addFormDataPart("file", null, RequestBody.create(null, file));
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
         RequestBody _requestBody = _multipartBody.build();
         Request.Builder _requestBuilder = new Request.Builder()
                 .url(_httpUrl)
                 .method("POST", _requestBody)
-                .headers(Headers.of(clientOptions.headers(requestOptions)))
-                .addHeader("Content-Type", "application/json");
+                .headers(Headers.of(clientOptions.headers(requestOptions)));
         Request _request = _requestBuilder.build();
         try {
             Response _response = clientOptions.httpClient().newCall(_request).execute();

diff --git a/src/main/java/com/squidex/api/resources/apps/requests/AddLanguageDto.java b/src/main/java/com/squidex/api/resources/apps/requests/AddLanguageDto.java
@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.squidex.api.core.ObjectMappers;
 import java.util.Objects;
 
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -41,7 +42,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "AddLanguageDto{" + "language: " + language + "}";
+        return ObjectMappers.stringify(this);
     }
 
     public static LanguageStage builder() {

diff --git a/src/main/java/com/squidex/api/resources/apps/requests/AddRoleDto.java b/src/main/java/com/squidex/api/resources/apps/requests/AddRoleDto.java
@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.squidex.api.core.ObjectMappers;
 import java.util.Objects;
 
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -41,7 +42,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "AddRoleDto{" + "name: " + name + "}";
+        return ObjectMappers.stringify(this);
     }
 
     public static NameStage builder() {

diff --git a/src/main/java/com/squidex/api/resources/apps/requests/AddWorkflowDto.java b/src/main/java/com/squidex/api/resources/apps/requests/AddWorkflowDto.java
@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.squidex.api.core.ObjectMappers;
 import java.util.Objects;
 
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -41,7 +42,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "AddWorkflowDto{" + "name: " + name + "}";
+        return ObjectMappers.stringify(this);
     }
 
     public static NameStage builder() {

diff --git a/src/main/java/com/squidex/api/resources/apps/requests/AppsUploadImageRequest.java b/src/main/java/com/squidex/api/resources/apps/requests/AppsUploadImageRequest.java
@@ -1,5 +1,7 @@
 package com.squidex.api.resources.apps.requests;
 
+import com.squidex.api.core.ObjectMappers;
+
 public final class AppsUploadImageRequest {
     private AppsUploadImageRequest() {}
 
@@ -11,6 +13,6 @@ public boolean equals(Object other) {
 
     @Override
     public String toString() {
-        return "AppsUploadImageRequest{" + "}";
+        return ObjectMappers.stringify(this);
     }
 }
diff --git a/src/main/java/com/squidex/api/resources/apps/requests/CreateAppDto.java b/src/main/java/com/squidex/api/resources/apps/requests/CreateAppDto.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.squidex.api.core.ObjectMappers;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -54,7 +55,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "CreateAppDto{" + "name: " + name + ", template: " + template + "}";
+        return ObjectMappers.stringify(this);
     }
 
     public static NameStage builder() {

diff --git a/src/main/java/com/squidex/api/resources/apps/requests/CreateClientDto.java b/src/main/java/com/squidex/api/resources/apps/requests/CreateClientDto.java
@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.squidex.api.core.ObjectMappers;
 import java.util.Objects;
 
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -41,7 +42,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "CreateClientDto{" + "id: " + id + "}";
+        return ObjectMappers.stringify(this);
     }
 
     public static IdStage builder() {

diff --git a/src/main/java/com/squidex/api/resources/apps/requests/TransferToTeamDto.java b/src/main/java/com/squidex/api/resources/apps/requests/TransferToTeamDto.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.squidex.api.core.ObjectMappers;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -43,7 +44,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "TransferToTeamDto{" + "teamId: " + teamId + "}";
+        return ObjectMappers.stringify(this);
     }
 
     public static Builder builder() {

diff --git a/src/main/java/com/squidex/api/resources/apps/requests/UpdateAppDto.java b/src/main/java/com/squidex/api/resources/apps/requests/UpdateAppDto.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.squidex.api.core.ObjectMappers;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -54,7 +55,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "UpdateAppDto{" + "label: " + label + ", description: " + description + "}";
+        return ObjectMappers.stringify(this);
     }
 
     public static Builder builder() {

diff --git a/src/main/java/com/squidex/api/resources/apps/requests/UpdateAppSettingsDto.java b/src/main/java/com/squidex/api/resources/apps/requests/UpdateAppSettingsDto.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.squidex.api.core.ObjectMappers;
 import com.squidex.api.types.EditorDto;
 import com.squidex.api.types.PatternDto;
 import java.util.ArrayList;
@@ -87,8 +88,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "UpdateAppSettingsDto{" + "patterns: " + patterns + ", editors: " + editors + ", hideScheduler: "
-                + hideScheduler + ", hideDateTimeModeButton: " + hideDateTimeModeButton + "}";
+        return ObjectMappers.stringify(this);
     }
 
     public static Builder builder() {

diff --git a/src/main/java/com/squidex/api/resources/apps/requests/UpdateAssetScriptsDto.java b/src/main/java/com/squidex/api/resources/apps/requests/UpdateAssetScriptsDto.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.squidex.api.core.ObjectMappers;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -122,8 +123,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "UpdateAssetScriptsDto{" + "query: " + query + ", queryPre: " + queryPre + ", create: " + create
-                + ", update: " + update + ", annotate: " + annotate + ", move: " + move + ", delete: " + delete + "}";
+        return ObjectMappers.stringify(this);
     }
 
     public static Builder builder() {

diff --git a/src/main/java/com/squidex/api/resources/apps/requests/UpdateClientDto.java b/src/main/java/com/squidex/api/resources/apps/requests/UpdateClientDto.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.squidex.api.core.ObjectMappers;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -96,8 +97,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "UpdateClientDto{" + "name: " + name + ", role: " + role + ", allowAnonymous: " + allowAnonymous
-                + ", apiCallsLimit: " + apiCallsLimit + ", apiTrafficLimit: " + apiTrafficLimit + "}";
+        return ObjectMappers.stringify(this);
     }
 
     public static Builder builder() {

diff --git a/src/main/java/com/squidex/api/resources/apps/requests/UpdateLanguageDto.java b/src/main/java/com/squidex/api/resources/apps/requests/UpdateLanguageDto.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.squidex.api.core.ObjectMappers;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -69,8 +70,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "UpdateLanguageDto{" + "isMaster: " + isMaster + ", isOptional: " + isOptional + ", fallback: "
-                + fallback + "}";
+        return ObjectMappers.stringify(this);
     }
 
     public static Builder builder() {

diff --git a/src/main/java/com/squidex/api/resources/apps/requests/UpdateRoleDto.java b/src/main/java/com/squidex/api/resources/apps/requests/UpdateRoleDto.java
@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.squidex.api.core.ObjectMappers;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -57,7 +58,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "UpdateRoleDto{" + "permissions: " + permissions + ", properties: " + properties + "}";
+        return ObjectMappers.stringify(this);
     }
 
     public static Builder builder() {