Skip to content

Commit

Permalink
Merge pull request #34 from fingerprintjs/feat/change-url-format
Browse files Browse the repository at this point in the history 
Change `url` field format to String
  • Loading branch information
@ilfa
ilfa authored Mar 4, 2024
2 parents a92cbba + 700fa96 commit 3f5d6de
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 31 deletions.
2 changes: 1 addition & 1 deletion docs/ProductsResponseIdentificationData.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
|**ipLocation** | [**DeprecatedIPLocation**](DeprecatedIPLocation.md) | | [optional] |
|**timestamp** | **Long** | Timestamp of the event with millisecond precision in Unix time. | |
|**time** | **OffsetDateTime** | Time expressed according to ISO 8601 in UTC format. | |
|**url** | **URI** | Page URL from which the identification request was sent. | |
|**url** | **String** | Page URL from which the identification request was sent. | |
|**tag** | **Map<String, Object>** | A customer-provided value or an object that was sent with identification request. | |
|**linkedId** | **String** | A customer-provided id that was sent with identification request. | [optional] |
|**confidence** | [**Confidence**](Confidence.md) | | [optional] |
Expand Down
2 changes: 1 addition & 1 deletion docs/ResponseVisits.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
|**ipLocation** | [**DeprecatedIPLocation**](DeprecatedIPLocation.md) | | [optional] |
|**timestamp** | **Long** | Timestamp of the event with millisecond precision in Unix time. | |
|**time** | **OffsetDateTime** | Time expressed according to ISO 8601 in UTC format. | |
|**url** | **URI** | Page URL from which the identification request was sent. | |
|**url** | **String** | Page URL from which the identification request was sent. | |
|**tag** | **Map<String, Object>** | A customer-provided value or an object that was sent with identification request. | |
|**linkedId** | **String** | A customer-provided id that was sent with identification request. | [optional] |
|**confidence** | [**Confidence**](Confidence.md) | | [optional] |
Expand Down
2 changes: 1 addition & 1 deletion docs/Visit.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
|**ipLocation** | [**DeprecatedIPLocation**](DeprecatedIPLocation.md) | | [optional] |
|**timestamp** | **Long** | Timestamp of the event with millisecond precision in Unix time. | |
|**time** | **OffsetDateTime** | Time expressed according to ISO 8601 in UTC format. | |
|**url** | **URI** | Page URL from which the identification request was sent. | |
|**url** | **String** | Page URL from which the identification request was sent. | |
|**tag** | **Map<String, Object>** | A customer-provided value or an object that was sent with identification request. | |
|**linkedId** | **String** | A customer-provided id that was sent with identification request. | [optional] |
|**confidence** | [**Confidence**](Confidence.md) | | [optional] |
Expand Down
2 changes: 1 addition & 1 deletion docs/WebhookVisit.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
|**ipLocation** | [**DeprecatedIPLocation**](DeprecatedIPLocation.md) | | [optional] |
|**timestamp** | **Long** | Timestamp of the event with millisecond precision in Unix time. | |
|**time** | **OffsetDateTime** | Time expressed according to ISO 8601 in UTC format. | |
|**url** | **URI** | Page URL from which the identification request was sent. | |
|**url** | **String** | Page URL from which the identification request was sent. | |
|**tag** | **Map<String, Object>** | A customer-provided value or an object that was sent with identification request. | |
|**linkedId** | **String** | A customer-provided id that was sent with identification request. | [optional] |
|**confidence** | [**Confidence**](Confidence.md) | | [optional] |
Expand Down
5 changes: 0 additions & 5 deletions res/fingerprint-server-api.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,6 @@ components:
url:
description: Page URL from which the identification request was sent.
type: string
format: uri
example: https://some.website/path?query=params
tag:
description: >-
Expand Down Expand Up @@ -747,7 +746,6 @@ components:
url:
description: Page URL from which the identification request was sent.
type: string
format: uri
example: https://some.website/path?query=params
tag:
description: >-
Expand Down Expand Up @@ -861,7 +859,6 @@ components:
url:
description: Page URL from which the identification request was sent.
type: string
format: uri
example: https://some.website/path?query=params
tag:
description: >-
Expand Down Expand Up @@ -1164,7 +1161,6 @@ components:
url:
description: Page URL from which the identification request was sent.
type: string
format: uri
example: https://some.website/path?query=params
tag:
description: >-
Expand Down Expand Up @@ -1447,7 +1443,6 @@ components:
url:
description: Page URL from which identification request was sent.
type: string
format: uri-reference
example: https://example.com/login
userAgent:
type: string
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/com/fingerprint/model/ProductsResponseIdentificationData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import com.fingerprint.model.SeenAt;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.net.URI;
import java.time.OffsetDateTime;
import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -80,7 +79,7 @@ public class ProductsResponseIdentificationData {
private OffsetDateTime time;

public static final String JSON_PROPERTY_URL = "url";
private URI url;
private String url;

public static final String JSON_PROPERTY_TAG = "tag";
private Map<String, Object> tag = new HashMap<>();
Expand Down Expand Up @@ -290,7 +289,7 @@ public void setTime(OffsetDateTime time) {
}


public ProductsResponseIdentificationData url(URI url) {
public ProductsResponseIdentificationData url(String url) {
this.url = url;
return this;
}
Expand All @@ -304,14 +303,14 @@ public ProductsResponseIdentificationData url(URI url) {
@JsonProperty(JSON_PROPERTY_URL)
@JsonInclude(value = JsonInclude.Include.ALWAYS)

public URI getUrl() {
public String getUrl() {
return url;
}


@JsonProperty(JSON_PROPERTY_URL)
@JsonInclude(value = JsonInclude.Include.ALWAYS)
public void setUrl(URI url) {
public void setUrl(String url) {
this.url = url;
}

Expand Down
9 changes: 4 additions & 5 deletions src/main/java/com/fingerprint/model/ResponseVisits.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import com.fingerprint.model.SeenAt;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.net.URI;
import java.time.OffsetDateTime;
import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -79,7 +78,7 @@ public class ResponseVisits {
private OffsetDateTime time;

public static final String JSON_PROPERTY_URL = "url";
private URI url;
private String url;

public static final String JSON_PROPERTY_TAG = "tag";
private Map<String, Object> tag = new HashMap<>();
Expand Down Expand Up @@ -286,7 +285,7 @@ public void setTime(OffsetDateTime time) {
}


public ResponseVisits url(URI url) {
public ResponseVisits url(String url) {
this.url = url;
return this;
}
Expand All @@ -300,14 +299,14 @@ public ResponseVisits url(URI url) {
@JsonProperty(JSON_PROPERTY_URL)
@JsonInclude(value = JsonInclude.Include.ALWAYS)

public URI getUrl() {
public String getUrl() {
return url;
}


@JsonProperty(JSON_PROPERTY_URL)
@JsonInclude(value = JsonInclude.Include.ALWAYS)
public void setUrl(URI url) {
public void setUrl(String url) {
this.url = url;
}

Expand Down
9 changes: 4 additions & 5 deletions src/main/java/com/fingerprint/model/Visit.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import com.fingerprint.model.SeenAt;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.net.URI;
import java.time.OffsetDateTime;
import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -79,7 +78,7 @@ public class Visit {
private OffsetDateTime time;

public static final String JSON_PROPERTY_URL = "url";
private URI url;
private String url;

public static final String JSON_PROPERTY_TAG = "tag";
private Map<String, Object> tag = new HashMap<>();
Expand Down Expand Up @@ -286,7 +285,7 @@ public void setTime(OffsetDateTime time) {
}


public Visit url(URI url) {
public Visit url(String url) {
this.url = url;
return this;
}
Expand All @@ -300,14 +299,14 @@ public Visit url(URI url) {
@JsonProperty(JSON_PROPERTY_URL)
@JsonInclude(value = JsonInclude.Include.ALWAYS)

public URI getUrl() {
public String getUrl() {
return url;
}


@JsonProperty(JSON_PROPERTY_URL)
@JsonInclude(value = JsonInclude.Include.ALWAYS)
public void setUrl(URI url) {
public void setUrl(String url) {
this.url = url;
}

Expand Down
9 changes: 4 additions & 5 deletions src/main/java/com/fingerprint/model/WebhookVisit.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
import com.fingerprint.model.VpnResult;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.net.URI;
import java.time.OffsetDateTime;
import java.util.HashMap;
import java.util.Map;
Expand Down Expand Up @@ -186,7 +185,7 @@ public class WebhookVisit {
private OffsetDateTime time;

public static final String JSON_PROPERTY_URL = "url";
private URI url;
private String url;

public static final String JSON_PROPERTY_TAG = "tag";
private Map<String, Object> tag = new HashMap<>();
Expand Down Expand Up @@ -973,7 +972,7 @@ public void setTime(OffsetDateTime time) {
}


public WebhookVisit url(URI url) {
public WebhookVisit url(String url) {
this.url = url;
return this;
}
Expand All @@ -987,14 +986,14 @@ public WebhookVisit url(URI url) {
@JsonProperty(JSON_PROPERTY_URL)
@JsonInclude(value = JsonInclude.Include.ALWAYS)

public URI getUrl() {
public String getUrl() {
return url;
}


@JsonProperty(JSON_PROPERTY_URL)
@JsonInclude(value = JsonInclude.Include.ALWAYS)
public void setUrl(URI url) {
public void setUrl(String url) {
this.url = url;
}

Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/mocks/get_event_200.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"tag": {},
"time": "2019-05-21T16:40:13Z",
"timestamp": 1582299576512,
"url": "https://www.example.com/login",
"url": "https://www.example.com/login?hope{this{works[!",
"ip": "61.127.217.15",
"ipLocation": {
"accuracyRadius": 10,
Expand Down Expand Up @@ -63,7 +63,7 @@
"bot": {
"result": "notDetected"
},
"url": "https://www.example.com/login",
"url": "https://www.example.com/login?hope{this{works}[!",
"ip": "61.127.217.15",
"time": "2019-05-21T16:40:13Z",
"userAgent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 YaBrowser/24.1.0.0 Safari/537.36",
Expand Down

0 comments on commit 3f5d6de

Please sign in to comment.