Skip to content
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.

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

Remove json patch and related files #111

Merged
merged 1 commit into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 18 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# see http://editorconfig.org/

root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.java]
indent_style = space
indent_size = 4
max_line_length = 120

[*.json]
indent_style = space
indent_size = 2
2 changes: 1 addition & 1 deletion src/main/java/io/falu/FaluClientOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class FaluClientOptions {
/**
* The ApiVersion that the SDK conforms to
*/
private final String apiVersion = "2021-09-03";
private final String apiVersion = "2024-06-01";

/**
* The API Key for authenticating requests to Falu servers
Expand Down
1 change: 0 additions & 1 deletion src/main/java/io/falu/client/AbstractHttpApiClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
public class AbstractHttpApiClient {
protected static final MediaType MEDIA_TYPE_JSON = MediaType.get("application/json; charset=utf-8");
protected static final MediaType MEDIA_TYPE_TEXT_JSON = MediaType.get("text/json");
protected static final MediaType MEDIA_TYPE_PATH_JSON = MediaType.get("application/json-path+json");
protected static final MediaType MEDIA_TYPE_MERGE_PATCH_JSON = MediaType.get("application/merge-patch+json");
protected static final MediaType MEDIA_TYPE_PLUS_JSON = MediaType.get("application/*+json");

Expand Down
45 changes: 0 additions & 45 deletions src/main/java/io/falu/client/patch/JsonPatchDocument.java

This file was deleted.

9 changes: 0 additions & 9 deletions src/main/java/io/falu/client/patch/JsonPatchOperation.java

This file was deleted.

16 changes: 0 additions & 16 deletions src/main/java/io/falu/client/patch/operations/AddOperation.java

This file was deleted.

16 changes: 0 additions & 16 deletions src/main/java/io/falu/client/patch/operations/CopyOperation.java

This file was deleted.

16 changes: 0 additions & 16 deletions src/main/java/io/falu/client/patch/operations/MoveOperation.java

This file was deleted.

14 changes: 0 additions & 14 deletions src/main/java/io/falu/client/patch/operations/RemoveOperation.java

This file was deleted.

This file was deleted.

16 changes: 0 additions & 16 deletions src/main/java/io/falu/client/patch/operations/TestOperation.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
@Getter
@NoArgsConstructor
@SuperBuilder
public abstract class AbstractCreationRequest {
public abstract class AbstractCreateOptions {
/**
* An optional arbitrary string attached to the object. Mainly used to describe the object and often useful for displaying to users.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/falu/models/events/WebhookEvent.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class WebhookEvent<TObject> extends FaluModel {
/**
* Information on the API request that instigated the event.
*/
public WebhookEventRequest request;
public WebhookEventOptions request;

/**
* Object containing data associated with the event.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*/
@SuperBuilder
@NoArgsConstructor
public class WebhookEventRequest {
public class WebhookEventOptions {

/**
* ID of the API request that caused the event. If null, the event was automatic
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
@NoArgsConstructor
@Getter
@SuperBuilder
public class FileCreateRequest {
public class FileCreateOptions {
/**
* Contents of the file
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
@Getter
@NoArgsConstructor
@SuperBuilder
public class FileLinkCreateRequest {
public class FileLinkCreateOptions {
/**
* Unique identifier of the file.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.google.gson.annotations.JsonAdapter;
import io.falu.client.adapters.ISO8601DateAdapter;
import io.falu.models.core.AbstractCreationRequest;
import io.falu.models.core.AbstractCreateOptions;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;

Expand All @@ -13,7 +13,7 @@
*/
@NoArgsConstructor
@SuperBuilder
public class FileLinkPatchModel extends AbstractCreationRequest {
public class FileLinkPatchModel extends AbstractCreateOptions {
/**
* Time at which the link expires
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.falu.models.identityVerification;

import com.google.gson.annotations.SerializedName;
import io.falu.models.core.AbstractCreationRequest;
import io.falu.models.core.AbstractCreateOptions;
import lombok.Setter;
import lombok.experimental.SuperBuilder;

Expand All @@ -10,7 +10,7 @@
*/
@Setter
@SuperBuilder()
public class IdentityVerificationCreateRequest extends AbstractCreationRequest {
public class IdentityVerificationCreateOptions extends AbstractCreateOptions {
/**
* The type of verification check to be performed.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package io.falu.models.identityVerification;

import io.falu.models.core.AbstractCreationRequest;
import io.falu.models.core.AbstractCreateOptions;
import lombok.Getter;
import lombok.experimental.SuperBuilder;

@Getter
@SuperBuilder
public class IdentityVerificationPatchModel extends AbstractCreationRequest {
public class IdentityVerificationUpdateOptions extends AbstractCreateOptions {
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.falu.models.messages;

import io.falu.models.core.AbstractCreationRequest;
import io.falu.models.core.AbstractCreateOptions;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
Expand All @@ -10,7 +10,7 @@
@Getter
@NoArgsConstructor
@SuperBuilder
public class MessageCreateRequest extends AbstractCreationRequest {
public class MessageCreateOptions extends AbstractCreateOptions {
/**
* Destination phone number in ${https://en.wikipedia.org/wiki/E.164} E.164 format</see>.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.falu.models.messages;

import io.falu.models.core.AbstractCreationRequest;
import io.falu.models.core.AbstractCreateOptions;
import lombok.Getter;
import lombok.experimental.SuperBuilder;

Expand All @@ -9,5 +9,5 @@
*/
@Getter
@SuperBuilder
public class MessagePatchModel extends AbstractCreationRequest {
public class MessageUpdateOptions extends AbstractCreateOptions {
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
@Getter
@NoArgsConstructor
@SuperBuilder(toBuilder = true)
public class MessageStreamCreateRequest {
public class MessageStreamCreateOptions {
/**
* A string of 3-50 characters used for easier identification of a message stream.
* This value cannot be changed after creation.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.falu.models.messages.stream;

import io.falu.models.core.AbstractCreationRequest;
import io.falu.models.core.AbstractCreateOptions;
import lombok.Getter;
import lombok.experimental.SuperBuilder;

Expand All @@ -9,7 +9,7 @@
*/
@Getter
@SuperBuilder
public class MessageStreamPatchModel extends AbstractCreationRequest {
public class MessageStreamUpdateOptions extends AbstractCreateOptions {
/**
* Settings for the stream.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
@Getter
@NoArgsConstructor
@SuperBuilder(toBuilder = true)
public class MessageTemplateRequest {
public class MessageTemplateCreateOptions {
/**
* An optional string you can provide to identify this template.
* Allowed characters are numbers, ASCII letters, and ., -, _ characters,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package io.falu.models.messages.template;

import io.falu.models.core.AbstractCreationRequest;
import io.falu.models.core.AbstractCreateOptions;
import lombok.experimental.SuperBuilder;

/**
* A model representing details that can be changed about a template
*/
@SuperBuilder
public class MessageTemplatePatchModel extends AbstractCreationRequest {
public class MessageTemplateUpdateOptions extends AbstractCreateOptions {
/**
* An optional string you can provide to identify this template.
* Allowed characters are numbers, ASCII letters, and ., -, _ characters,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/
@SuperBuilder
@NoArgsConstructor
public class PaymentCreateRequestMpesa {
public class PaymentCreateMpesaOptions {
/**
* The phone number representing the account to be charged.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*/
@SuperBuilder(toBuilder = true)
@NoArgsConstructor
public class PaymentCreateRequest {
public class PaymentCreateOptions {
/**
* Three-letter ISO currency code, in lowercase.
*/
Expand Down
Loading