Skip to content

Ambiguate RemoteData data field type #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 9, 2024
Merged

Ambiguate RemoteData data field type #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/com/merge/api/MergeApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand All @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/merge/api/core/ClientOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
;
Expand Down
17 changes: 8 additions & 9 deletions src/main/java/com/merge/api/resources/accounting/types/RemoteData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
}
Expand All @@ -30,7 +29,7 @@ public String getPath() {
}

@JsonProperty("data")
public Optional<Map<String, JsonNode>> getData() {
public Optional<JsonNode> getData() {
return data;
}

Expand Down Expand Up @@ -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() {}

Expand All @@ -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;
}
Expand Down
17 changes: 8 additions & 9 deletions src/main/java/com/merge/api/resources/ats/types/RemoteData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
}
Expand All @@ -30,7 +29,7 @@ public String getPath() {
}

@JsonProperty("data")
public Optional<Map<String, JsonNode>> getData() {
public Optional<JsonNode> getData() {
return data;
}

Expand Down Expand Up @@ -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() {}

Expand All @@ -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;
}
Expand Down
17 changes: 8 additions & 9 deletions src/main/java/com/merge/api/resources/crm/types/RemoteData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
}
Expand All @@ -30,7 +29,7 @@ public String getPath() {
}

@JsonProperty("data")
public Optional<Map<String, JsonNode>> getData() {
public Optional<JsonNode> getData() {
return data;
}

Expand Down Expand Up @@ -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() {}

Expand All @@ -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;
}
Expand Down
17 changes: 8 additions & 9 deletions src/main/java/com/merge/api/resources/ticketing/types/RemoteData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
}
Expand All @@ -30,7 +29,7 @@ public String getPath() {
}

@JsonProperty("data")
public Optional<Map<String, JsonNode>> getData() {
public Optional<JsonNode> getData() {
return data;
}

Expand Down Expand Up @@ -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() {}

Expand All @@ -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;
}
Expand Down