Ambiguate RemoteData data field type (#29)

fern-api[bot] · web-flow · commit b236e1b881d5 · 2024-01-08T16:54:11.000-08:00
Co-authored-by: fern-api &lt;115122769+fern-api[bot]@users.noreply.github.com&gt;
diff --git a/build.gradle b/build.gradle
@@ -40,7 +40,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'dev.merge'
             artifactId = 'merge-java-client'
-            version = '1.0.3'
+            version = '1.0.4'
             from components.java
         }
     }
diff --git a/src/main/java/com/merge/api/MergeApiClient.java b/src/main/java/com/merge/api/MergeApiClient.java
@@ -19,19 +19,19 @@ public class MergeApiClient {
 
     protected final Supplier<CrmClient> crmClient;
 
-    protected final Supplier<HrisClient> hrisClient;
-
     protected final Supplier<TicketingClient> ticketingClient;
 
+    protected final Supplier<HrisClient> hrisClient;
+
     protected final Supplier<AccountingClient> accountingClient;
 
     public MergeApiClient(ClientOptions clientOptions) {
         this.clientOptions = clientOptions;
         this.atsClient = Suppliers.memoize(() -> new AtsClient(clientOptions));
         this.filestorageClient = Suppliers.memoize(() -> new FilestorageClient(clientOptions));
         this.crmClient = Suppliers.memoize(() -> new CrmClient(clientOptions));
-        this.hrisClient = Suppliers.memoize(() -> new HrisClient(clientOptions));
         this.ticketingClient = Suppliers.memoize(() -> new TicketingClient(clientOptions));
+        this.hrisClient = Suppliers.memoize(() -> new HrisClient(clientOptions));
         this.accountingClient = Suppliers.memoize(() -> new AccountingClient(clientOptions));
     }
 
@@ -47,14 +47,14 @@ public CrmClient crm() {
         return this.crmClient.get();
     }
 
-    public HrisClient hris() {
-        return this.hrisClient.get();
-    }
-
     public TicketingClient ticketing() {
         return this.ticketingClient.get();
     }
 
+    public HrisClient hris() {
+        return this.hrisClient.get();
+    }
+
     public AccountingClient accounting() {
         return this.accountingClient.get();
     }
diff --git a/src/main/java/com/merge/api/core/ClientOptions.java b/src/main/java/com/merge/api/core/ClientOptions.java
@@ -23,7 +23,7 @@ private ClientOptions(
         this.headers = new HashMap<>();
         this.headers.putAll(headers);
         this.headers.putAll(Map.of(
-                "X-Fern-SDK-Name", "com.merge.fern:api-sdk", "X-Fern-SDK-Version", "1.0.3", "X-Fern-Language", "JAVA"));
+                "X-Fern-SDK-Name", "com.merge.fern:api-sdk", "X-Fern-SDK-Version", "1.0.4", "X-Fern-Language", "JAVA"));
         this.headerSuppliers = headerSuppliers;
         this.httpClient = httpClient;
         ;
diff --git a/src/main/java/com/merge/api/resources/accounting/types/RemoteData.java b/src/main/java/com/merge/api/resources/accounting/types/RemoteData.java
@@ -8,7 +8,6 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.merge.api.core.ObjectMappers;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -17,9 +16,9 @@
 public final class RemoteData {
     private final String path;
 
-    private final Optional<Map<String, JsonNode>> data;
+    private final Optional<JsonNode> data;
 
-    private RemoteData(String path, Optional<Map<String, JsonNode>> data) {
+    private RemoteData(String path, Optional<JsonNode> data) {
         this.path = path;
         this.data = data;
     }
@@ -30,7 +29,7 @@ public String getPath() {
     }
 
     @JsonProperty("data")
-    public Optional<Map<String, JsonNode>> getData() {
+    public Optional<JsonNode> getData() {
         return data;
     }
 
@@ -67,16 +66,16 @@ public interface PathStage {
     public interface _FinalStage {
         RemoteData build();
 
-        _FinalStage data(Optional<Map<String, JsonNode>> data);
+        _FinalStage data(Optional<JsonNode> data);
 
-        _FinalStage data(Map<String, JsonNode> data);
+        _FinalStage data(JsonNode data);
     }
 
     @JsonIgnoreProperties(ignoreUnknown = true)
     public static final class Builder implements PathStage, _FinalStage {
         private String path;
 
-        private Optional<Map<String, JsonNode>> data = Optional.empty();
+        private Optional<JsonNode> data = Optional.empty();
 
         private Builder() {}
 
@@ -95,14 +94,14 @@ public _FinalStage path(String path) {
         }
 
         @Override
-        public _FinalStage data(Map<String, JsonNode> data) {
+        public _FinalStage data(JsonNode data) {
             this.data = Optional.of(data);
             return this;
         }
 
         @Override
         @JsonSetter(value = "data", nulls = Nulls.SKIP)
-        public _FinalStage data(Optional<Map<String, JsonNode>> data) {
+        public _FinalStage data(Optional<JsonNode> data) {
             this.data = data;
             return this;
         }
diff --git a/src/main/java/com/merge/api/resources/ats/types/RemoteData.java b/src/main/java/com/merge/api/resources/ats/types/RemoteData.java
@@ -8,7 +8,6 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.merge.api.core.ObjectMappers;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -17,9 +16,9 @@
 public final class RemoteData {
     private final String path;
 
-    private final Optional<Map<String, JsonNode>> data;
+    private final Optional<JsonNode> data;
 
-    private RemoteData(String path, Optional<Map<String, JsonNode>> data) {
+    private RemoteData(String path, Optional<JsonNode> data) {
         this.path = path;
         this.data = data;
     }
@@ -30,7 +29,7 @@ public String getPath() {
     }
 
     @JsonProperty("data")
-    public Optional<Map<String, JsonNode>> getData() {
+    public Optional<JsonNode> getData() {
         return data;
     }
 
@@ -67,16 +66,16 @@ public interface PathStage {
     public interface _FinalStage {
         RemoteData build();
 
-        _FinalStage data(Optional<Map<String, JsonNode>> data);
+        _FinalStage data(Optional<JsonNode> data);
 
-        _FinalStage data(Map<String, JsonNode> data);
+        _FinalStage data(JsonNode data);
     }
 
     @JsonIgnoreProperties(ignoreUnknown = true)
     public static final class Builder implements PathStage, _FinalStage {
         private String path;
 
-        private Optional<Map<String, JsonNode>> data = Optional.empty();
+        private Optional<JsonNode> data = Optional.empty();
 
         private Builder() {}
 
@@ -95,14 +94,14 @@ public _FinalStage path(String path) {
         }
 
         @Override
-        public _FinalStage data(Map<String, JsonNode> data) {
+        public _FinalStage data(JsonNode data) {
             this.data = Optional.of(data);
             return this;
         }
 
         @Override
         @JsonSetter(value = "data", nulls = Nulls.SKIP)
-        public _FinalStage data(Optional<Map<String, JsonNode>> data) {
+        public _FinalStage data(Optional<JsonNode> data) {
             this.data = data;
             return this;
         }
diff --git a/src/main/java/com/merge/api/resources/crm/types/RemoteData.java b/src/main/java/com/merge/api/resources/crm/types/RemoteData.java
@@ -8,7 +8,6 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.merge.api.core.ObjectMappers;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -17,9 +16,9 @@
 public final class RemoteData {
     private final String path;
 
-    private final Optional<Map<String, JsonNode>> data;
+    private final Optional<JsonNode> data;
 
-    private RemoteData(String path, Optional<Map<String, JsonNode>> data) {
+    private RemoteData(String path, Optional<JsonNode> data) {
         this.path = path;
         this.data = data;
     }
@@ -30,7 +29,7 @@ public String getPath() {
     }
 
     @JsonProperty("data")
-    public Optional<Map<String, JsonNode>> getData() {
+    public Optional<JsonNode> getData() {
         return data;
     }
 
@@ -67,16 +66,16 @@ public interface PathStage {
     public interface _FinalStage {
         RemoteData build();
 
-        _FinalStage data(Optional<Map<String, JsonNode>> data);
+        _FinalStage data(Optional<JsonNode> data);
 
-        _FinalStage data(Map<String, JsonNode> data);
+        _FinalStage data(JsonNode data);
     }
 
     @JsonIgnoreProperties(ignoreUnknown = true)
     public static final class Builder implements PathStage, _FinalStage {
         private String path;
 
-        private Optional<Map<String, JsonNode>> data = Optional.empty();
+        private Optional<JsonNode> data = Optional.empty();
 
         private Builder() {}
 
@@ -95,14 +94,14 @@ public _FinalStage path(String path) {
         }
 
         @Override
-        public _FinalStage data(Map<String, JsonNode> data) {
+        public _FinalStage data(JsonNode data) {
             this.data = Optional.of(data);
             return this;
         }
 
         @Override
         @JsonSetter(value = "data", nulls = Nulls.SKIP)
-        public _FinalStage data(Optional<Map<String, JsonNode>> data) {
+        public _FinalStage data(Optional<JsonNode> data) {
             this.data = data;
             return this;
         }
diff --git a/src/main/java/com/merge/api/resources/ticketing/types/RemoteData.java b/src/main/java/com/merge/api/resources/ticketing/types/RemoteData.java
@@ -8,7 +8,6 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.merge.api.core.ObjectMappers;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -17,9 +16,9 @@
 public final class RemoteData {
     private final String path;
 
-    private final Optional<Map<String, JsonNode>> data;
+    private final Optional<JsonNode> data;
 
-    private RemoteData(String path, Optional<Map<String, JsonNode>> data) {
+    private RemoteData(String path, Optional<JsonNode> data) {
         this.path = path;
         this.data = data;
     }
@@ -30,7 +29,7 @@ public String getPath() {
     }
 
     @JsonProperty("data")
-    public Optional<Map<String, JsonNode>> getData() {
+    public Optional<JsonNode> getData() {
         return data;
     }
 
@@ -67,16 +66,16 @@ public interface PathStage {
     public interface _FinalStage {
         RemoteData build();
 
-        _FinalStage data(Optional<Map<String, JsonNode>> data);
+        _FinalStage data(Optional<JsonNode> data);
 
-        _FinalStage data(Map<String, JsonNode> data);
+        _FinalStage data(JsonNode data);
     }
 
     @JsonIgnoreProperties(ignoreUnknown = true)
     public static final class Builder implements PathStage, _FinalStage {
         private String path;
 
-        private Optional<Map<String, JsonNode>> data = Optional.empty();
+        private Optional<JsonNode> data = Optional.empty();
 
         private Builder() {}
 
@@ -95,14 +94,14 @@ public _FinalStage path(String path) {
         }
 
         @Override
-        public _FinalStage data(Map<String, JsonNode> data) {
+        public _FinalStage data(JsonNode data) {
             this.data = Optional.of(data);
             return this;
         }
 
         @Override
         @JsonSetter(value = "data", nulls = Nulls.SKIP)
-        public _FinalStage data(Optional<Map<String, JsonNode>> data) {
+        public _FinalStage data(Optional<JsonNode> data) {
             this.data = data;
             return this;
         }

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ publishing {`
`40`	`40`	`maven(MavenPublication) {`
`41`	`41`	`groupId = 'dev.merge'`
`42`	`42`	`artifactId = 'merge-java-client'`
`43`		`- version = '1.0.3'`
	`43`	`+ version = '1.0.4'`
`44`	`44`	`from components.java`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ private ClientOptions(`
`23`	`23`	`this.headers = new HashMap<>();`
`24`	`24`	`this.headers.putAll(headers);`
`25`	`25`	`this.headers.putAll(Map.of(`
`26`		`- "X-Fern-SDK-Name", "com.merge.fern:api-sdk", "X-Fern-SDK-Version", "1.0.3", "X-Fern-Language", "JAVA"));`
	`26`	`+ "X-Fern-SDK-Name", "com.merge.fern:api-sdk", "X-Fern-SDK-Version", "1.0.4", "X-Fern-Language", "JAVA"));`
`27`	`27`	`this.headerSuppliers = headerSuppliers;`
`28`	`28`	`this.httpClient = httpClient;`
`29`	`29`	`;`