sortOrderColumn = Optional.empty();
@@ -398,6 +414,7 @@ public Builder from(CountCompaniesRequest other) {
monetizedSubscriptions(other.getMonetizedSubscriptions());
planId(other.getPlanId());
planVersionId(other.getPlanVersionId());
+ planVersionUnpublished(other.getPlanVersionUnpublished());
q(other.getQ());
sortOrderColumn(other.getSortOrderColumn());
sortOrderDirection(other.getSortOrderDirection());
@@ -581,6 +598,20 @@ public Builder planVersionId(String planVersionId) {
return this;
}
+ /**
+ * Filter companies assigned to a plan version that is no longer published, meaning the plan has since moved on to a newer version
+ */
+ @JsonSetter(value = "plan_version_unpublished", nulls = Nulls.SKIP)
+ public Builder planVersionUnpublished(Optional planVersionUnpublished) {
+ this.planVersionUnpublished = planVersionUnpublished;
+ return this;
+ }
+
+ public Builder planVersionUnpublished(Boolean planVersionUnpublished) {
+ this.planVersionUnpublished = Optional.ofNullable(planVersionUnpublished);
+ return this;
+ }
+
/**
* Search for companies by name, keys or string traits
*/
@@ -733,6 +764,7 @@ public CountCompaniesRequest build() {
monetizedSubscriptions,
planId,
planVersionId,
+ planVersionUnpublished,
q,
sortOrderColumn,
sortOrderDirection,
diff --git a/src/main/java/com/schematic/api/resources/companies/requests/GetBillingEntityChildSubscriptionsRequest.java b/src/main/java/com/schematic/api/resources/companies/requests/GetBillingEntityChildSubscriptionsRequest.java
index d2e186a..4268643 100644
--- a/src/main/java/com/schematic/api/resources/companies/requests/GetBillingEntityChildSubscriptionsRequest.java
+++ b/src/main/java/com/schematic/api/resources/companies/requests/GetBillingEntityChildSubscriptionsRequest.java
@@ -9,29 +9,27 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonSetter;
-import com.fasterxml.jackson.annotation.Nulls;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.schematic.api.core.ObjectMappers;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
-import java.util.Optional;
+import org.jetbrains.annotations.NotNull;
@JsonInclude(JsonInclude.Include.NON_ABSENT)
@JsonDeserialize(builder = GetBillingEntityChildSubscriptionsRequest.Builder.class)
public final class GetBillingEntityChildSubscriptionsRequest {
- private final Optional companyId;
+ private final String companyId;
private final Map additionalProperties;
- private GetBillingEntityChildSubscriptionsRequest(
- Optional companyId, Map additionalProperties) {
+ private GetBillingEntityChildSubscriptionsRequest(String companyId, Map additionalProperties) {
this.companyId = companyId;
this.additionalProperties = additionalProperties;
}
@JsonProperty("company_id")
- public Optional getCompanyId() {
+ public String getCompanyId() {
return companyId;
}
@@ -61,44 +59,58 @@ public String toString() {
return ObjectMappers.stringify(this);
}
- public static Builder builder() {
+ public static CompanyIdStage builder() {
return new Builder();
}
+ public interface CompanyIdStage {
+ _FinalStage companyId(@NotNull String companyId);
+
+ Builder from(GetBillingEntityChildSubscriptionsRequest other);
+ }
+
+ public interface _FinalStage {
+ GetBillingEntityChildSubscriptionsRequest build();
+
+ _FinalStage additionalProperty(String key, Object value);
+
+ _FinalStage additionalProperties(Map additionalProperties);
+ }
+
@JsonIgnoreProperties(ignoreUnknown = true)
- public static final class Builder {
- private Optional companyId = Optional.empty();
+ public static final class Builder implements CompanyIdStage, _FinalStage {
+ private String companyId;
@JsonAnySetter
private Map additionalProperties = new HashMap<>();
private Builder() {}
+ @java.lang.Override
public Builder from(GetBillingEntityChildSubscriptionsRequest other) {
companyId(other.getCompanyId());
return this;
}
- @JsonSetter(value = "company_id", nulls = Nulls.SKIP)
- public Builder companyId(Optional companyId) {
- this.companyId = companyId;
- return this;
- }
-
- public Builder companyId(String companyId) {
- this.companyId = Optional.ofNullable(companyId);
+ @java.lang.Override
+ @JsonSetter("company_id")
+ public _FinalStage companyId(@NotNull String companyId) {
+ this.companyId = Objects.requireNonNull(companyId, "companyId must not be null");
return this;
}
+ @java.lang.Override
public GetBillingEntityChildSubscriptionsRequest build() {
return new GetBillingEntityChildSubscriptionsRequest(companyId, additionalProperties);
}
+ @java.lang.Override
public Builder additionalProperty(String key, Object value) {
this.additionalProperties.put(key, value);
return this;
}
+ @java.lang.Override
public Builder additionalProperties(Map additionalProperties) {
this.additionalProperties.putAll(additionalProperties);
return this;
diff --git a/src/main/java/com/schematic/api/resources/companies/requests/GetCompanyBillingEntityRequest.java b/src/main/java/com/schematic/api/resources/companies/requests/GetCompanyBillingEntityRequest.java
index 2f99212..39bce77 100644
--- a/src/main/java/com/schematic/api/resources/companies/requests/GetCompanyBillingEntityRequest.java
+++ b/src/main/java/com/schematic/api/resources/companies/requests/GetCompanyBillingEntityRequest.java
@@ -9,28 +9,27 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonSetter;
-import com.fasterxml.jackson.annotation.Nulls;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.schematic.api.core.ObjectMappers;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
-import java.util.Optional;
+import org.jetbrains.annotations.NotNull;
@JsonInclude(JsonInclude.Include.NON_ABSENT)
@JsonDeserialize(builder = GetCompanyBillingEntityRequest.Builder.class)
public final class GetCompanyBillingEntityRequest {
- private final Optional companyId;
+ private final String companyId;
private final Map additionalProperties;
- private GetCompanyBillingEntityRequest(Optional companyId, Map additionalProperties) {
+ private GetCompanyBillingEntityRequest(String companyId, Map additionalProperties) {
this.companyId = companyId;
this.additionalProperties = additionalProperties;
}
@JsonProperty("company_id")
- public Optional getCompanyId() {
+ public String getCompanyId() {
return companyId;
}
@@ -59,44 +58,58 @@ public String toString() {
return ObjectMappers.stringify(this);
}
- public static Builder builder() {
+ public static CompanyIdStage builder() {
return new Builder();
}
+ public interface CompanyIdStage {
+ _FinalStage companyId(@NotNull String companyId);
+
+ Builder from(GetCompanyBillingEntityRequest other);
+ }
+
+ public interface _FinalStage {
+ GetCompanyBillingEntityRequest build();
+
+ _FinalStage additionalProperty(String key, Object value);
+
+ _FinalStage additionalProperties(Map additionalProperties);
+ }
+
@JsonIgnoreProperties(ignoreUnknown = true)
- public static final class Builder {
- private Optional companyId = Optional.empty();
+ public static final class Builder implements CompanyIdStage, _FinalStage {
+ private String companyId;
@JsonAnySetter
private Map additionalProperties = new HashMap<>();
private Builder() {}
+ @java.lang.Override
public Builder from(GetCompanyBillingEntityRequest other) {
companyId(other.getCompanyId());
return this;
}
- @JsonSetter(value = "company_id", nulls = Nulls.SKIP)
- public Builder companyId(Optional companyId) {
- this.companyId = companyId;
- return this;
- }
-
- public Builder companyId(String companyId) {
- this.companyId = Optional.ofNullable(companyId);
+ @java.lang.Override
+ @JsonSetter("company_id")
+ public _FinalStage companyId(@NotNull String companyId) {
+ this.companyId = Objects.requireNonNull(companyId, "companyId must not be null");
return this;
}
+ @java.lang.Override
public GetCompanyBillingEntityRequest build() {
return new GetCompanyBillingEntityRequest(companyId, additionalProperties);
}
+ @java.lang.Override
public Builder additionalProperty(String key, Object value) {
this.additionalProperties.put(key, value);
return this;
}
+ @java.lang.Override
public Builder additionalProperties(Map additionalProperties) {
this.additionalProperties.putAll(additionalProperties);
return this;
diff --git a/src/main/java/com/schematic/api/resources/companies/requests/ListCompaniesRequest.java b/src/main/java/com/schematic/api/resources/companies/requests/ListCompaniesRequest.java
index 67fe63f..1216f80 100644
--- a/src/main/java/com/schematic/api/resources/companies/requests/ListCompaniesRequest.java
+++ b/src/main/java/com/schematic/api/resources/companies/requests/ListCompaniesRequest.java
@@ -45,6 +45,8 @@ public final class ListCompaniesRequest {
private final Optional planVersionId;
+ private final Optional planVersionUnpublished;
+
private final Optional q;
private final Optional sortOrderColumn;
@@ -78,6 +80,7 @@ private ListCompaniesRequest(
Optional monetizedSubscriptions,
Optional planId,
Optional planVersionId,
+ Optional planVersionUnpublished,
Optional q,
Optional sortOrderColumn,
Optional sortOrderDirection,
@@ -99,6 +102,7 @@ private ListCompaniesRequest(
this.monetizedSubscriptions = monetizedSubscriptions;
this.planId = planId;
this.planVersionId = planVersionId;
+ this.planVersionUnpublished = planVersionUnpublished;
this.q = q;
this.sortOrderColumn = sortOrderColumn;
this.sortOrderDirection = sortOrderDirection;
@@ -192,6 +196,14 @@ public Optional getPlanVersionId() {
return planVersionId;
}
+ /**
+ * @return Filter companies assigned to a plan version that is no longer published, meaning the plan has since moved on to a newer version
+ */
+ @JsonProperty("plan_version_unpublished")
+ public Optional getPlanVersionUnpublished() {
+ return planVersionUnpublished;
+ }
+
/**
* @return Search for companies by name, keys or string traits
*/
@@ -294,6 +306,7 @@ private boolean equalTo(ListCompaniesRequest other) {
&& monetizedSubscriptions.equals(other.monetizedSubscriptions)
&& planId.equals(other.planId)
&& planVersionId.equals(other.planVersionId)
+ && planVersionUnpublished.equals(other.planVersionUnpublished)
&& q.equals(other.q)
&& sortOrderColumn.equals(other.sortOrderColumn)
&& sortOrderDirection.equals(other.sortOrderDirection)
@@ -319,6 +332,7 @@ public int hashCode() {
this.monetizedSubscriptions,
this.planId,
this.planVersionId,
+ this.planVersionUnpublished,
this.q,
this.sortOrderColumn,
this.sortOrderDirection,
@@ -362,6 +376,8 @@ public static final class Builder {
private Optional planVersionId = Optional.empty();
+ private Optional planVersionUnpublished = Optional.empty();
+
private Optional q = Optional.empty();
private Optional sortOrderColumn = Optional.empty();
@@ -398,6 +414,7 @@ public Builder from(ListCompaniesRequest other) {
monetizedSubscriptions(other.getMonetizedSubscriptions());
planId(other.getPlanId());
planVersionId(other.getPlanVersionId());
+ planVersionUnpublished(other.getPlanVersionUnpublished());
q(other.getQ());
sortOrderColumn(other.getSortOrderColumn());
sortOrderDirection(other.getSortOrderDirection());
@@ -581,6 +598,20 @@ public Builder planVersionId(String planVersionId) {
return this;
}
+ /**
+ * Filter companies assigned to a plan version that is no longer published, meaning the plan has since moved on to a newer version
+ */
+ @JsonSetter(value = "plan_version_unpublished", nulls = Nulls.SKIP)
+ public Builder planVersionUnpublished(Optional planVersionUnpublished) {
+ this.planVersionUnpublished = planVersionUnpublished;
+ return this;
+ }
+
+ public Builder planVersionUnpublished(Boolean planVersionUnpublished) {
+ this.planVersionUnpublished = Optional.ofNullable(planVersionUnpublished);
+ return this;
+ }
+
/**
* Search for companies by name, keys or string traits
*/
@@ -733,6 +764,7 @@ public ListCompaniesRequest build() {
monetizedSubscriptions,
planId,
planVersionId,
+ planVersionUnpublished,
q,
sortOrderColumn,
sortOrderDirection,
diff --git a/src/main/java/com/schematic/api/resources/companies/types/CountCompaniesParams.java b/src/main/java/com/schematic/api/resources/companies/types/CountCompaniesParams.java
index d4a60ff..3dc019a 100644
--- a/src/main/java/com/schematic/api/resources/companies/types/CountCompaniesParams.java
+++ b/src/main/java/com/schematic/api/resources/companies/types/CountCompaniesParams.java
@@ -44,6 +44,8 @@ public final class CountCompaniesParams {
private final Optional> planVersionIds;
+ private final Optional planVersionUnpublished;
+
private final Optional q;
private final Optional sortOrderColumn;
@@ -77,6 +79,7 @@ private CountCompaniesParams(
Optional> planIds,
Optional planVersionId,
Optional> planVersionIds,
+ Optional planVersionUnpublished,
Optional q,
Optional sortOrderColumn,
Optional sortOrderDirection,
@@ -98,6 +101,7 @@ private CountCompaniesParams(
this.planIds = planIds;
this.planVersionId = planVersionId;
this.planVersionIds = planVersionIds;
+ this.planVersionUnpublished = planVersionUnpublished;
this.q = q;
this.sortOrderColumn = sortOrderColumn;
this.sortOrderDirection = sortOrderDirection;
@@ -191,6 +195,14 @@ public Optional> getPlanVersionIds() {
return planVersionIds;
}
+ /**
+ * @return Filter companies assigned to a plan version that is no longer published, meaning the plan has since moved on to a newer version
+ */
+ @JsonProperty("plan_version_unpublished")
+ public Optional getPlanVersionUnpublished() {
+ return planVersionUnpublished;
+ }
+
/**
* @return Search for companies by name, keys or string traits
*/
@@ -293,6 +305,7 @@ private boolean equalTo(CountCompaniesParams other) {
&& planIds.equals(other.planIds)
&& planVersionId.equals(other.planVersionId)
&& planVersionIds.equals(other.planVersionIds)
+ && planVersionUnpublished.equals(other.planVersionUnpublished)
&& q.equals(other.q)
&& sortOrderColumn.equals(other.sortOrderColumn)
&& sortOrderDirection.equals(other.sortOrderDirection)
@@ -318,6 +331,7 @@ public int hashCode() {
this.planIds,
this.planVersionId,
this.planVersionIds,
+ this.planVersionUnpublished,
this.q,
this.sortOrderColumn,
this.sortOrderDirection,
@@ -361,6 +375,8 @@ public static final class Builder {
private Optional> planVersionIds = Optional.empty();
+ private Optional planVersionUnpublished = Optional.empty();
+
private Optional q = Optional.empty();
private Optional sortOrderColumn = Optional.empty();
@@ -397,6 +413,7 @@ public Builder from(CountCompaniesParams other) {
planIds(other.getPlanIds());
planVersionId(other.getPlanVersionId());
planVersionIds(other.getPlanVersionIds());
+ planVersionUnpublished(other.getPlanVersionUnpublished());
q(other.getQ());
sortOrderColumn(other.getSortOrderColumn());
sortOrderDirection(other.getSortOrderDirection());
@@ -550,6 +567,20 @@ public Builder planVersionIds(List planVersionIds) {
return this;
}
+ /**
+ * Filter companies assigned to a plan version that is no longer published, meaning the plan has since moved on to a newer version
+ */
+ @JsonSetter(value = "plan_version_unpublished", nulls = Nulls.SKIP)
+ public Builder planVersionUnpublished(Optional planVersionUnpublished) {
+ this.planVersionUnpublished = planVersionUnpublished;
+ return this;
+ }
+
+ public Builder planVersionUnpublished(Boolean planVersionUnpublished) {
+ this.planVersionUnpublished = Optional.ofNullable(planVersionUnpublished);
+ return this;
+ }
+
/**
* Search for companies by name, keys or string traits
*/
@@ -702,6 +733,7 @@ public CountCompaniesParams build() {
planIds,
planVersionId,
planVersionIds,
+ planVersionUnpublished,
q,
sortOrderColumn,
sortOrderDirection,
diff --git a/src/main/java/com/schematic/api/resources/companies/types/ListCompaniesParams.java b/src/main/java/com/schematic/api/resources/companies/types/ListCompaniesParams.java
index 9bf973a..f2688c7 100644
--- a/src/main/java/com/schematic/api/resources/companies/types/ListCompaniesParams.java
+++ b/src/main/java/com/schematic/api/resources/companies/types/ListCompaniesParams.java
@@ -44,6 +44,8 @@ public final class ListCompaniesParams {
private final Optional> planVersionIds;
+ private final Optional planVersionUnpublished;
+
private final Optional q;
private final Optional sortOrderColumn;
@@ -77,6 +79,7 @@ private ListCompaniesParams(
Optional> planIds,
Optional planVersionId,
Optional> planVersionIds,
+ Optional planVersionUnpublished,
Optional q,
Optional sortOrderColumn,
Optional sortOrderDirection,
@@ -98,6 +101,7 @@ private ListCompaniesParams(
this.planIds = planIds;
this.planVersionId = planVersionId;
this.planVersionIds = planVersionIds;
+ this.planVersionUnpublished = planVersionUnpublished;
this.q = q;
this.sortOrderColumn = sortOrderColumn;
this.sortOrderDirection = sortOrderDirection;
@@ -191,6 +195,14 @@ public Optional> getPlanVersionIds() {
return planVersionIds;
}
+ /**
+ * @return Filter companies assigned to a plan version that is no longer published, meaning the plan has since moved on to a newer version
+ */
+ @JsonProperty("plan_version_unpublished")
+ public Optional getPlanVersionUnpublished() {
+ return planVersionUnpublished;
+ }
+
/**
* @return Search for companies by name, keys or string traits
*/
@@ -293,6 +305,7 @@ private boolean equalTo(ListCompaniesParams other) {
&& planIds.equals(other.planIds)
&& planVersionId.equals(other.planVersionId)
&& planVersionIds.equals(other.planVersionIds)
+ && planVersionUnpublished.equals(other.planVersionUnpublished)
&& q.equals(other.q)
&& sortOrderColumn.equals(other.sortOrderColumn)
&& sortOrderDirection.equals(other.sortOrderDirection)
@@ -318,6 +331,7 @@ public int hashCode() {
this.planIds,
this.planVersionId,
this.planVersionIds,
+ this.planVersionUnpublished,
this.q,
this.sortOrderColumn,
this.sortOrderDirection,
@@ -361,6 +375,8 @@ public static final class Builder {
private Optional> planVersionIds = Optional.empty();
+ private Optional planVersionUnpublished = Optional.empty();
+
private Optional q = Optional.empty();
private Optional sortOrderColumn = Optional.empty();
@@ -397,6 +413,7 @@ public Builder from(ListCompaniesParams other) {
planIds(other.getPlanIds());
planVersionId(other.getPlanVersionId());
planVersionIds(other.getPlanVersionIds());
+ planVersionUnpublished(other.getPlanVersionUnpublished());
q(other.getQ());
sortOrderColumn(other.getSortOrderColumn());
sortOrderDirection(other.getSortOrderDirection());
@@ -550,6 +567,20 @@ public Builder planVersionIds(List planVersionIds) {
return this;
}
+ /**
+ * Filter companies assigned to a plan version that is no longer published, meaning the plan has since moved on to a newer version
+ */
+ @JsonSetter(value = "plan_version_unpublished", nulls = Nulls.SKIP)
+ public Builder planVersionUnpublished(Optional planVersionUnpublished) {
+ this.planVersionUnpublished = planVersionUnpublished;
+ return this;
+ }
+
+ public Builder planVersionUnpublished(Boolean planVersionUnpublished) {
+ this.planVersionUnpublished = Optional.ofNullable(planVersionUnpublished);
+ return this;
+ }
+
/**
* Search for companies by name, keys or string traits
*/
@@ -702,6 +733,7 @@ public ListCompaniesParams build() {
planIds,
planVersionId,
planVersionIds,
+ planVersionUnpublished,
q,
sortOrderColumn,
sortOrderDirection,
diff --git a/src/main/java/com/schematic/api/resources/credits/AsyncCreditsClient.java b/src/main/java/com/schematic/api/resources/credits/AsyncCreditsClient.java
index 015e66d..1ee266c 100644
--- a/src/main/java/com/schematic/api/resources/credits/AsyncCreditsClient.java
+++ b/src/main/java/com/schematic/api/resources/credits/AsyncCreditsClient.java
@@ -264,14 +264,6 @@ public CompletableFuture grantBillingCredi
.thenApply(response -> response.body());
}
- public CompletableFuture countCompanyGrants() {
- return this.rawClient.countCompanyGrants().thenApply(response -> response.body());
- }
-
- public CompletableFuture countCompanyGrants(RequestOptions requestOptions) {
- return this.rawClient.countCompanyGrants(requestOptions).thenApply(response -> response.body());
- }
-
public CompletableFuture countCompanyGrants(CountCompanyGrantsRequest request) {
return this.rawClient.countCompanyGrants(request).thenApply(response -> response.body());
}
@@ -281,14 +273,6 @@ public CompletableFuture countCompanyGrants(
return this.rawClient.countCompanyGrants(request, requestOptions).thenApply(response -> response.body());
}
- public CompletableFuture listCompanyGrants() {
- return this.rawClient.listCompanyGrants().thenApply(response -> response.body());
- }
-
- public CompletableFuture listCompanyGrants(RequestOptions requestOptions) {
- return this.rawClient.listCompanyGrants(requestOptions).thenApply(response -> response.body());
- }
-
public CompletableFuture listCompanyGrants(ListCompanyGrantsRequest request) {
return this.rawClient.listCompanyGrants(request).thenApply(response -> response.body());
}
diff --git a/src/main/java/com/schematic/api/resources/credits/AsyncRawCreditsClient.java b/src/main/java/com/schematic/api/resources/credits/AsyncRawCreditsClient.java
index d792b26..3b6fc3c 100644
--- a/src/main/java/com/schematic/api/resources/credits/AsyncRawCreditsClient.java
+++ b/src/main/java/com/schematic/api/resources/credits/AsyncRawCreditsClient.java
@@ -1734,15 +1734,6 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
return future;
}
- public CompletableFuture> countCompanyGrants() {
- return countCompanyGrants(CountCompanyGrantsRequest.builder().build());
- }
-
- public CompletableFuture> countCompanyGrants(
- RequestOptions requestOptions) {
- return countCompanyGrants(CountCompanyGrantsRequest.builder().build(), requestOptions);
- }
-
public CompletableFuture> countCompanyGrants(
CountCompanyGrantsRequest request) {
return countCompanyGrants(request, null);
@@ -1753,10 +1744,7 @@ public CompletableFuture>
HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
.addPathSegments("billing/credits/grants/company/count");
- if (request.getCompanyId().isPresent()) {
- QueryStringMapper.addQueryParameter(
- httpUrl, "company_id", request.getCompanyId().get(), false);
- }
+ QueryStringMapper.addQueryParameter(httpUrl, "company_id", request.getCompanyId(), false);
if (request.getOrder().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl, "order", request.getOrder().get(), false);
@@ -1860,15 +1848,6 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
return future;
}
- public CompletableFuture> listCompanyGrants() {
- return listCompanyGrants(ListCompanyGrantsRequest.builder().build());
- }
-
- public CompletableFuture> listCompanyGrants(
- RequestOptions requestOptions) {
- return listCompanyGrants(ListCompanyGrantsRequest.builder().build(), requestOptions);
- }
-
public CompletableFuture> listCompanyGrants(
ListCompanyGrantsRequest request) {
return listCompanyGrants(request, null);
@@ -1879,10 +1858,7 @@ public CompletableFuture> l
HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
.addPathSegments("billing/credits/grants/company/list");
- if (request.getCompanyId().isPresent()) {
- QueryStringMapper.addQueryParameter(
- httpUrl, "company_id", request.getCompanyId().get(), false);
- }
+ QueryStringMapper.addQueryParameter(httpUrl, "company_id", request.getCompanyId(), false);
if (request.getOrder().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl, "order", request.getOrder().get(), false);
diff --git a/src/main/java/com/schematic/api/resources/credits/CreditsClient.java b/src/main/java/com/schematic/api/resources/credits/CreditsClient.java
index f9ce4fa..8889d90 100644
--- a/src/main/java/com/schematic/api/resources/credits/CreditsClient.java
+++ b/src/main/java/com/schematic/api/resources/credits/CreditsClient.java
@@ -257,14 +257,6 @@ public GrantBillingCreditsToCompanyResponse grantBillingCreditsToCompany(
.body();
}
- public CountCompanyGrantsResponse countCompanyGrants() {
- return this.rawClient.countCompanyGrants().body();
- }
-
- public CountCompanyGrantsResponse countCompanyGrants(RequestOptions requestOptions) {
- return this.rawClient.countCompanyGrants(requestOptions).body();
- }
-
public CountCompanyGrantsResponse countCompanyGrants(CountCompanyGrantsRequest request) {
return this.rawClient.countCompanyGrants(request).body();
}
@@ -274,14 +266,6 @@ public CountCompanyGrantsResponse countCompanyGrants(
return this.rawClient.countCompanyGrants(request, requestOptions).body();
}
- public ListCompanyGrantsResponse listCompanyGrants() {
- return this.rawClient.listCompanyGrants().body();
- }
-
- public ListCompanyGrantsResponse listCompanyGrants(RequestOptions requestOptions) {
- return this.rawClient.listCompanyGrants(requestOptions).body();
- }
-
public ListCompanyGrantsResponse listCompanyGrants(ListCompanyGrantsRequest request) {
return this.rawClient.listCompanyGrants(request).body();
}
diff --git a/src/main/java/com/schematic/api/resources/credits/RawCreditsClient.java b/src/main/java/com/schematic/api/resources/credits/RawCreditsClient.java
index d0d9daa..fd6f7ed 100644
--- a/src/main/java/com/schematic/api/resources/credits/RawCreditsClient.java
+++ b/src/main/java/com/schematic/api/resources/credits/RawCreditsClient.java
@@ -1348,14 +1348,6 @@ public BaseSchematicHttpResponse grantBill
}
}
- public BaseSchematicHttpResponse countCompanyGrants() {
- return countCompanyGrants(CountCompanyGrantsRequest.builder().build());
- }
-
- public BaseSchematicHttpResponse countCompanyGrants(RequestOptions requestOptions) {
- return countCompanyGrants(CountCompanyGrantsRequest.builder().build(), requestOptions);
- }
-
public BaseSchematicHttpResponse countCompanyGrants(CountCompanyGrantsRequest request) {
return countCompanyGrants(request, null);
}
@@ -1365,10 +1357,7 @@ public BaseSchematicHttpResponse countCompanyGrants(
HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
.addPathSegments("billing/credits/grants/company/count");
- if (request.getCompanyId().isPresent()) {
- QueryStringMapper.addQueryParameter(
- httpUrl, "company_id", request.getCompanyId().get(), false);
- }
+ QueryStringMapper.addQueryParameter(httpUrl, "company_id", request.getCompanyId(), false);
if (request.getOrder().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl, "order", request.getOrder().get(), false);
@@ -1447,14 +1436,6 @@ public BaseSchematicHttpResponse countCompanyGrants(
}
}
- public BaseSchematicHttpResponse listCompanyGrants() {
- return listCompanyGrants(ListCompanyGrantsRequest.builder().build());
- }
-
- public BaseSchematicHttpResponse listCompanyGrants(RequestOptions requestOptions) {
- return listCompanyGrants(ListCompanyGrantsRequest.builder().build(), requestOptions);
- }
-
public BaseSchematicHttpResponse listCompanyGrants(ListCompanyGrantsRequest request) {
return listCompanyGrants(request, null);
}
@@ -1464,10 +1445,7 @@ public BaseSchematicHttpResponse listCompanyGrants(
HttpUrl.Builder httpUrl = HttpUrl.parse(this.clientOptions.environment().getUrl())
.newBuilder()
.addPathSegments("billing/credits/grants/company/list");
- if (request.getCompanyId().isPresent()) {
- QueryStringMapper.addQueryParameter(
- httpUrl, "company_id", request.getCompanyId().get(), false);
- }
+ QueryStringMapper.addQueryParameter(httpUrl, "company_id", request.getCompanyId(), false);
if (request.getOrder().isPresent()) {
QueryStringMapper.addQueryParameter(
httpUrl, "order", request.getOrder().get(), false);
diff --git a/src/main/java/com/schematic/api/resources/credits/requests/CountCompanyGrantsRequest.java b/src/main/java/com/schematic/api/resources/credits/requests/CountCompanyGrantsRequest.java
index 8a7a48d..104a8f9 100644
--- a/src/main/java/com/schematic/api/resources/credits/requests/CountCompanyGrantsRequest.java
+++ b/src/main/java/com/schematic/api/resources/credits/requests/CountCompanyGrantsRequest.java
@@ -18,11 +18,12 @@
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
+import org.jetbrains.annotations.NotNull;
@JsonInclude(JsonInclude.Include.NON_ABSENT)
@JsonDeserialize(builder = CountCompanyGrantsRequest.Builder.class)
public final class CountCompanyGrantsRequest {
- private final Optional companyId;
+ private final String companyId;
private final Optional order;
@@ -35,7 +36,7 @@ public final class CountCompanyGrantsRequest {
private final Map additionalProperties;
private CountCompanyGrantsRequest(
- Optional companyId,
+ String companyId,
Optional order,
Optional dir,
Optional limit,
@@ -50,7 +51,7 @@ private CountCompanyGrantsRequest(
}
@JsonProperty("company_id")
- public Optional getCompanyId() {
+ public String getCompanyId() {
return companyId;
}
@@ -109,27 +110,64 @@ public String toString() {
return ObjectMappers.stringify(this);
}
- public static Builder builder() {
+ public static CompanyIdStage builder() {
return new Builder();
}
- @JsonIgnoreProperties(ignoreUnknown = true)
- public static final class Builder {
- private Optional companyId = Optional.empty();
+ public interface CompanyIdStage {
+ _FinalStage companyId(@NotNull String companyId);
- private Optional order = Optional.empty();
+ Builder from(CountCompanyGrantsRequest other);
+ }
- private Optional dir = Optional.empty();
+ public interface _FinalStage {
+ CountCompanyGrantsRequest build();
- private Optional limit = Optional.empty();
+ _FinalStage additionalProperty(String key, Object value);
+
+ _FinalStage additionalProperties(Map additionalProperties);
+
+ _FinalStage order(Optional order);
+
+ _FinalStage order(CreditGrantSortOrder order);
+
+ _FinalStage dir(Optional dir);
+
+ _FinalStage dir(SortDirection dir);
+
+ /**
+ * Page limit (default 100)
+ */
+ _FinalStage limit(Optional limit);
+
+ _FinalStage limit(Long limit);
+
+ /**
+ * Page offset (default 0)
+ */
+ _FinalStage offset(Optional offset);
+
+ _FinalStage offset(Long offset);
+ }
+
+ @JsonIgnoreProperties(ignoreUnknown = true)
+ public static final class Builder implements CompanyIdStage, _FinalStage {
+ private String companyId;
private Optional offset = Optional.empty();
+ private Optional limit = Optional.empty();
+
+ private Optional dir = Optional.empty();
+
+ private Optional order = Optional.empty();
+
@JsonAnySetter
private Map additionalProperties = new HashMap<>();
private Builder() {}
+ @java.lang.Override
public Builder from(CountCompanyGrantsRequest other) {
companyId(other.getCompanyId());
order(other.getOrder());
@@ -139,76 +177,91 @@ public Builder from(CountCompanyGrantsRequest other) {
return this;
}
- @JsonSetter(value = "company_id", nulls = Nulls.SKIP)
- public Builder companyId(Optional companyId) {
- this.companyId = companyId;
- return this;
- }
-
- public Builder companyId(String companyId) {
- this.companyId = Optional.ofNullable(companyId);
- return this;
- }
-
- @JsonSetter(value = "order", nulls = Nulls.SKIP)
- public Builder order(Optional order) {
- this.order = order;
+ @java.lang.Override
+ @JsonSetter("company_id")
+ public _FinalStage companyId(@NotNull String companyId) {
+ this.companyId = Objects.requireNonNull(companyId, "companyId must not be null");
return this;
}
- public Builder order(CreditGrantSortOrder order) {
- this.order = Optional.ofNullable(order);
+ /**
+ * Page offset (default 0)
+ * @return Reference to {@code this} so that method calls can be chained together.
+ */
+ @java.lang.Override
+ public _FinalStage offset(Long offset) {
+ this.offset = Optional.ofNullable(offset);
return this;
}
- @JsonSetter(value = "dir", nulls = Nulls.SKIP)
- public Builder dir(Optional dir) {
- this.dir = dir;
+ /**
+ * Page offset (default 0)
+ */
+ @java.lang.Override
+ @JsonSetter(value = "offset", nulls = Nulls.SKIP)
+ public _FinalStage offset(Optional offset) {
+ this.offset = offset;
return this;
}
- public Builder dir(SortDirection dir) {
- this.dir = Optional.ofNullable(dir);
+ /**
+ * Page limit (default 100)
+ * @return Reference to {@code this} so that method calls can be chained together.
+ */
+ @java.lang.Override
+ public _FinalStage limit(Long limit) {
+ this.limit = Optional.ofNullable(limit);
return this;
}
/**
* Page limit (default 100)
*/
+ @java.lang.Override
@JsonSetter(value = "limit", nulls = Nulls.SKIP)
- public Builder limit(Optional limit) {
+ public _FinalStage limit(Optional limit) {
this.limit = limit;
return this;
}
- public Builder limit(Long limit) {
- this.limit = Optional.ofNullable(limit);
+ @java.lang.Override
+ public _FinalStage dir(SortDirection dir) {
+ this.dir = Optional.ofNullable(dir);
return this;
}
- /**
- * Page offset (default 0)
- */
- @JsonSetter(value = "offset", nulls = Nulls.SKIP)
- public Builder offset(Optional offset) {
- this.offset = offset;
+ @java.lang.Override
+ @JsonSetter(value = "dir", nulls = Nulls.SKIP)
+ public _FinalStage dir(Optional dir) {
+ this.dir = dir;
return this;
}
- public Builder offset(Long offset) {
- this.offset = Optional.ofNullable(offset);
+ @java.lang.Override
+ public _FinalStage order(CreditGrantSortOrder order) {
+ this.order = Optional.ofNullable(order);
+ return this;
+ }
+
+ @java.lang.Override
+ @JsonSetter(value = "order", nulls = Nulls.SKIP)
+ public _FinalStage order(Optional order) {
+ this.order = order;
return this;
}
+ @java.lang.Override
public CountCompanyGrantsRequest build() {
return new CountCompanyGrantsRequest(companyId, order, dir, limit, offset, additionalProperties);
}
+ @java.lang.Override
public Builder additionalProperty(String key, Object value) {
this.additionalProperties.put(key, value);
return this;
}
+ @java.lang.Override
public Builder additionalProperties(Map additionalProperties) {
this.additionalProperties.putAll(additionalProperties);
return this;
diff --git a/src/main/java/com/schematic/api/resources/credits/requests/ListCompanyGrantsRequest.java b/src/main/java/com/schematic/api/resources/credits/requests/ListCompanyGrantsRequest.java
index 9942d53..7fb731c 100644
--- a/src/main/java/com/schematic/api/resources/credits/requests/ListCompanyGrantsRequest.java
+++ b/src/main/java/com/schematic/api/resources/credits/requests/ListCompanyGrantsRequest.java
@@ -18,11 +18,12 @@
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
+import org.jetbrains.annotations.NotNull;
@JsonInclude(JsonInclude.Include.NON_ABSENT)
@JsonDeserialize(builder = ListCompanyGrantsRequest.Builder.class)
public final class ListCompanyGrantsRequest {
- private final Optional companyId;
+ private final String companyId;
private final Optional order;
@@ -35,7 +36,7 @@ public final class ListCompanyGrantsRequest {
private final Map additionalProperties;
private ListCompanyGrantsRequest(
- Optional companyId,
+ String companyId,
Optional order,
Optional dir,
Optional limit,
@@ -50,7 +51,7 @@ private ListCompanyGrantsRequest(
}
@JsonProperty("company_id")
- public Optional getCompanyId() {
+ public String getCompanyId() {
return companyId;
}
@@ -109,27 +110,64 @@ public String toString() {
return ObjectMappers.stringify(this);
}
- public static Builder builder() {
+ public static CompanyIdStage builder() {
return new Builder();
}
- @JsonIgnoreProperties(ignoreUnknown = true)
- public static final class Builder {
- private Optional companyId = Optional.empty();
+ public interface CompanyIdStage {
+ _FinalStage companyId(@NotNull String companyId);
- private Optional order = Optional.empty();
+ Builder from(ListCompanyGrantsRequest other);
+ }
- private Optional dir = Optional.empty();
+ public interface _FinalStage {
+ ListCompanyGrantsRequest build();
- private Optional limit = Optional.empty();
+ _FinalStage additionalProperty(String key, Object value);
+
+ _FinalStage additionalProperties(Map additionalProperties);
+
+ _FinalStage order(Optional order);
+
+ _FinalStage order(CreditGrantSortOrder order);
+
+ _FinalStage dir(Optional dir);
+
+ _FinalStage dir(SortDirection dir);
+
+ /**
+ * Page limit (default 100)
+ */
+ _FinalStage limit(Optional limit);
+
+ _FinalStage limit(Long limit);
+
+ /**
+ * Page offset (default 0)
+ */
+ _FinalStage offset(Optional offset);
+
+ _FinalStage offset(Long offset);
+ }
+
+ @JsonIgnoreProperties(ignoreUnknown = true)
+ public static final class Builder implements CompanyIdStage, _FinalStage {
+ private String companyId;
private Optional offset = Optional.empty();
+ private Optional limit = Optional.empty();
+
+ private Optional dir = Optional.empty();
+
+ private Optional order = Optional.empty();
+
@JsonAnySetter
private Map additionalProperties = new HashMap<>();
private Builder() {}
+ @java.lang.Override
public Builder from(ListCompanyGrantsRequest other) {
companyId(other.getCompanyId());
order(other.getOrder());
@@ -139,76 +177,91 @@ public Builder from(ListCompanyGrantsRequest other) {
return this;
}
- @JsonSetter(value = "company_id", nulls = Nulls.SKIP)
- public Builder companyId(Optional companyId) {
- this.companyId = companyId;
- return this;
- }
-
- public Builder companyId(String companyId) {
- this.companyId = Optional.ofNullable(companyId);
- return this;
- }
-
- @JsonSetter(value = "order", nulls = Nulls.SKIP)
- public Builder order(Optional order) {
- this.order = order;
+ @java.lang.Override
+ @JsonSetter("company_id")
+ public _FinalStage companyId(@NotNull String companyId) {
+ this.companyId = Objects.requireNonNull(companyId, "companyId must not be null");
return this;
}
- public Builder order(CreditGrantSortOrder order) {
- this.order = Optional.ofNullable(order);
+ /**
+ * Page offset (default 0)
+ * @return Reference to {@code this} so that method calls can be chained together.
+ */
+ @java.lang.Override
+ public _FinalStage offset(Long offset) {
+ this.offset = Optional.ofNullable(offset);
return this;
}
- @JsonSetter(value = "dir", nulls = Nulls.SKIP)
- public Builder dir(Optional dir) {
- this.dir = dir;
+ /**
+ * Page offset (default 0)
+ */
+ @java.lang.Override
+ @JsonSetter(value = "offset", nulls = Nulls.SKIP)
+ public _FinalStage offset(Optional offset) {
+ this.offset = offset;
return this;
}
- public Builder dir(SortDirection dir) {
- this.dir = Optional.ofNullable(dir);
+ /**
+ * Page limit (default 100)
+ * @return Reference to {@code this} so that method calls can be chained together.
+ */
+ @java.lang.Override
+ public _FinalStage limit(Long limit) {
+ this.limit = Optional.ofNullable(limit);
return this;
}
/**
* Page limit (default 100)
*/
+ @java.lang.Override
@JsonSetter(value = "limit", nulls = Nulls.SKIP)
- public Builder limit(Optional limit) {
+ public _FinalStage limit(Optional limit) {
this.limit = limit;
return this;
}
- public Builder limit(Long limit) {
- this.limit = Optional.ofNullable(limit);
+ @java.lang.Override
+ public _FinalStage dir(SortDirection dir) {
+ this.dir = Optional.ofNullable(dir);
return this;
}
- /**
- * Page offset (default 0)
- */
- @JsonSetter(value = "offset", nulls = Nulls.SKIP)
- public Builder offset(Optional offset) {
- this.offset = offset;
+ @java.lang.Override
+ @JsonSetter(value = "dir", nulls = Nulls.SKIP)
+ public _FinalStage dir(Optional dir) {
+ this.dir = dir;
return this;
}
- public Builder offset(Long offset) {
- this.offset = Optional.ofNullable(offset);
+ @java.lang.Override
+ public _FinalStage order(CreditGrantSortOrder order) {
+ this.order = Optional.ofNullable(order);
+ return this;
+ }
+
+ @java.lang.Override
+ @JsonSetter(value = "order", nulls = Nulls.SKIP)
+ public _FinalStage order(Optional order) {
+ this.order = order;
return this;
}
+ @java.lang.Override
public ListCompanyGrantsRequest build() {
return new ListCompanyGrantsRequest(companyId, order, dir, limit, offset, additionalProperties);
}
+ @java.lang.Override
public Builder additionalProperty(String key, Object value) {
this.additionalProperties.put(key, value);
return this;
}
+ @java.lang.Override
public Builder additionalProperties(Map additionalProperties) {
this.additionalProperties.putAll(additionalProperties);
return this;
diff --git a/src/main/java/com/schematic/api/resources/entitlements/AsyncEntitlementsClient.java b/src/main/java/com/schematic/api/resources/entitlements/AsyncEntitlementsClient.java
index 735fc81..fd8f4a1 100644
--- a/src/main/java/com/schematic/api/resources/entitlements/AsyncEntitlementsClient.java
+++ b/src/main/java/com/schematic/api/resources/entitlements/AsyncEntitlementsClient.java
@@ -20,6 +20,7 @@
import com.schematic.api.resources.entitlements.requests.GetUserUsageDetailRequest;
import com.schematic.api.resources.entitlements.requests.ListCompanyOverridesRequest;
import com.schematic.api.resources.entitlements.requests.ListFeatureCompaniesRequest;
+import com.schematic.api.resources.entitlements.requests.ListFeatureUsageHistoryRequest;
import com.schematic.api.resources.entitlements.requests.ListFeatureUsageRequest;
import com.schematic.api.resources.entitlements.requests.ListFeatureUsersRequest;
import com.schematic.api.resources.entitlements.requests.ListPlanEntitlementsRequest;
@@ -43,6 +44,7 @@
import com.schematic.api.resources.entitlements.types.GetUserUsageDetailResponse;
import com.schematic.api.resources.entitlements.types.ListCompanyOverridesResponse;
import com.schematic.api.resources.entitlements.types.ListFeatureCompaniesResponse;
+import com.schematic.api.resources.entitlements.types.ListFeatureUsageHistoryResponse;
import com.schematic.api.resources.entitlements.types.ListFeatureUsageResponse;
import com.schematic.api.resources.entitlements.types.ListFeatureUsersResponse;
import com.schematic.api.resources.entitlements.types.ListPlanEntitlementsResponse;
@@ -183,6 +185,16 @@ public CompletableFuture listFeatureUsage(
return this.rawClient.listFeatureUsage(request, requestOptions).thenApply(response -> response.body());
}
+ public CompletableFuture listFeatureUsageHistory(
+ ListFeatureUsageHistoryRequest request) {
+ return this.rawClient.listFeatureUsageHistory(request).thenApply(response -> response.body());
+ }
+
+ public CompletableFuture listFeatureUsageHistory(
+ ListFeatureUsageHistoryRequest request, RequestOptions requestOptions) {
+ return this.rawClient.listFeatureUsageHistory(request, requestOptions).thenApply(response -> response.body());
+ }
+
public CompletableFuture getFeatureUsageTimeSeries(
GetFeatureUsageTimeSeriesRequest request) {
return this.rawClient.getFeatureUsageTimeSeries(request).thenApply(response -> response.body());
diff --git a/src/main/java/com/schematic/api/resources/entitlements/AsyncRawEntitlementsClient.java b/src/main/java/com/schematic/api/resources/entitlements/AsyncRawEntitlementsClient.java
index 90c32d4..edd85d0 100644
--- a/src/main/java/com/schematic/api/resources/entitlements/AsyncRawEntitlementsClient.java
+++ b/src/main/java/com/schematic/api/resources/entitlements/AsyncRawEntitlementsClient.java
@@ -33,6 +33,7 @@
import com.schematic.api.resources.entitlements.requests.GetUserUsageDetailRequest;
import com.schematic.api.resources.entitlements.requests.ListCompanyOverridesRequest;
import com.schematic.api.resources.entitlements.requests.ListFeatureCompaniesRequest;
+import com.schematic.api.resources.entitlements.requests.ListFeatureUsageHistoryRequest;
import com.schematic.api.resources.entitlements.requests.ListFeatureUsageRequest;
import com.schematic.api.resources.entitlements.requests.ListFeatureUsersRequest;
import com.schematic.api.resources.entitlements.requests.ListPlanEntitlementsRequest;
@@ -56,6 +57,7 @@
import com.schematic.api.resources.entitlements.types.GetUserUsageDetailResponse;
import com.schematic.api.resources.entitlements.types.ListCompanyOverridesResponse;
import com.schematic.api.resources.entitlements.types.ListFeatureCompaniesResponse;
+import com.schematic.api.resources.entitlements.types.ListFeatureUsageHistoryResponse;
import com.schematic.api.resources.entitlements.types.ListFeatureUsageResponse;
import com.schematic.api.resources.entitlements.types.ListFeatureUsersResponse;
import com.schematic.api.resources.entitlements.types.ListPlanEntitlementsResponse;
@@ -1138,6 +1140,127 @@ public void onFailure(@NotNull Call call, @NotNull IOException e) {
return future;
}
+ public CompletableFuture