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.

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

Correct Session properties #43

Closed
wants to merge 1 commit into from
Closed

Correct Session properties #43

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
14 changes: 8 additions & 6 deletions api/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1256,7 +1256,7 @@ components:
userId: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
parentId: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
referrer: referrer
isAnonymous: true
externalUserId: externalUserId
closeTime: 1
campaign:
name: name
Expand Down Expand Up @@ -1317,9 +1317,11 @@ components:
format: uuid
nullable: true
type: string
isAnonymous:
description: The flag that indicates whether the user is anonymous.
type: boolean
externalUserId:
description: "The external user ID that is used to identify the user on\
\ the application side, unique across the workspace. It is always null\
\ for anonymous users."
type: string
window:
$ref: '#/components/schemas/Session_window'
closeTime:
Expand Down Expand Up @@ -1361,7 +1363,7 @@ components:
userId: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
parentId: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
referrer: referrer
isAnonymous: true
externalUserId: externalUserId
closeTime: 1
campaign:
name: name
Expand Down Expand Up @@ -1408,7 +1410,7 @@ components:
userId: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
parentId: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
referrer: referrer
isAnonymous: true
externalUserId: externalUserId
closeTime: 1
campaign:
name: name
Expand Down
56 changes: 22 additions & 34 deletions src/main/java/com/croct/client/export/model/Session.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,13 @@
import java.util.Objects;
import java.util.Map;
import java.util.HashMap;
import com.croct.client.export.model.Campaign;
import com.croct.client.export.model.Location;
import com.croct.client.export.model.SessionStatistics;
import com.croct.client.export.model.SessionWindow;
import com.croct.client.export.model.WebClient;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonValue;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import org.openapitools.jackson.nullable.JsonNullable;
import com.fasterxml.jackson.annotation.JsonIgnore;
import org.openapitools.jackson.nullable.JsonNullable;
import java.util.NoSuchElementException;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.croct.client.export.JSON;


/**
* Session
Expand All @@ -45,7 +31,7 @@
Session.JSON_PROPERTY_SESSION_ID,
Session.JSON_PROPERTY_USER_ID,
Session.JSON_PROPERTY_PARENT_ID,
Session.JSON_PROPERTY_IS_ANONYMOUS,
Session.JSON_PROPERTY_EXTERNAL_USER_ID,
Session.JSON_PROPERTY_WINDOW,
Session.JSON_PROPERTY_CLOSE_TIME,
Session.JSON_PROPERTY_REFERRER,
Expand All @@ -67,8 +53,8 @@ public class Session {
public static final String JSON_PROPERTY_PARENT_ID = "parentId";
private JsonNullable<UUID> parentId = JsonNullable.<UUID>undefined();

public static final String JSON_PROPERTY_IS_ANONYMOUS = "isAnonymous";
private Boolean isAnonymous;
public static final String JSON_PROPERTY_EXTERNAL_USER_ID = "externalUserId";
private String externalUserId;

public static final String JSON_PROPERTY_WINDOW = "window";
private SessionWindow window;
Expand Down Expand Up @@ -97,7 +83,7 @@ public class Session {
public static final String JSON_PROPERTY_STATISTICS = "statistics";
private SessionStatistics statistics;

public Session() {
public Session() {
}

public Session sessionId(UUID sessionId) {
Expand Down Expand Up @@ -172,7 +158,7 @@ public UUID getParentId() {
public JsonNullable<UUID> getParentId_JsonNullable() {
return parentId;
}

@JsonProperty(JSON_PROPERTY_PARENT_ID)
public void setParentId_JsonNullable(JsonNullable<UUID> parentId) {
this.parentId = parentId;
Expand All @@ -183,28 +169,30 @@ public void setParentId(UUID parentId) {
}


public Session isAnonymous(Boolean isAnonymous) {
this.isAnonymous = isAnonymous;
public Session externalUserId(String externalUserId) {
this.externalUserId = externalUserId;
return this;
}

/**
* The flag that indicates whether the user is anonymous.
* @return isAnonymous
* The external user ID that is used to identify the user on
* the application side, unique across the workspace. It is always null for anonymous users.
*
* @return externalUserId
**/
@javax.annotation.Nullable
@JsonProperty(JSON_PROPERTY_IS_ANONYMOUS)
@JsonProperty(JSON_PROPERTY_EXTERNAL_USER_ID)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)

public Boolean getIsAnonymous() {
return isAnonymous;
public String getExternalUserId() {
return externalUserId;
}


@JsonProperty(JSON_PROPERTY_IS_ANONYMOUS)
@JsonProperty(JSON_PROPERTY_EXTERNAL_USER_ID)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
public void setIsAnonymous(Boolean isAnonymous) {
this.isAnonymous = isAnonymous;
public void setExternalUserId(String externalUserId) {
this.externalUserId = externalUserId;
}


Expand Down Expand Up @@ -280,7 +268,7 @@ public String getReferrer() {
public JsonNullable<String> getReferrer_JsonNullable() {
return referrer;
}

@JsonProperty(JSON_PROPERTY_REFERRER)
public void setReferrer_JsonNullable(JsonNullable<String> referrer) {
this.referrer = referrer;
Expand Down Expand Up @@ -313,7 +301,7 @@ public String getLandingPageUrl() {
public JsonNullable<String> getLandingPageUrl_JsonNullable() {
return landingPageUrl;
}

@JsonProperty(JSON_PROPERTY_LANDING_PAGE_URL)
public void setLandingPageUrl_JsonNullable(JsonNullable<String> landingPageUrl) {
this.landingPageUrl = landingPageUrl;
Expand Down Expand Up @@ -472,7 +460,7 @@ public boolean equals(Object o) {
return Objects.equals(this.sessionId, session.sessionId) &&
Objects.equals(this.userId, session.userId) &&
equalsNullable(this.parentId, session.parentId) &&
Objects.equals(this.isAnonymous, session.isAnonymous) &&
Objects.equals(this.externalUserId, session.externalUserId) &&
Objects.equals(this.window, session.window) &&
Objects.equals(this.closeTime, session.closeTime) &&
equalsNullable(this.referrer, session.referrer) &&
Expand All @@ -490,7 +478,7 @@ private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b)

@Override
public int hashCode() {
return Objects.hash(sessionId, userId, hashCodeNullable(parentId), isAnonymous, window, closeTime, hashCodeNullable(referrer), hashCodeNullable(landingPageUrl), campaign, location, client, attributes, statistics);
return Objects.hash(sessionId, userId, hashCodeNullable(parentId), externalUserId, window, closeTime, hashCodeNullable(referrer), hashCodeNullable(landingPageUrl), campaign, location, client, attributes, statistics);
}

private static <T> int hashCodeNullable(JsonNullable<T> a) {
Expand All @@ -507,7 +495,7 @@ public String toString() {
sb.append(" sessionId: ").append(toIndentedString(sessionId)).append("\n");
sb.append(" userId: ").append(toIndentedString(userId)).append("\n");
sb.append(" parentId: ").append(toIndentedString(parentId)).append("\n");
sb.append(" isAnonymous: ").append(toIndentedString(isAnonymous)).append("\n");
sb.append(" externalUserId: ").append(toIndentedString(externalUserId)).append("\n");
sb.append(" window: ").append(toIndentedString(window)).append("\n");
sb.append(" closeTime: ").append(toIndentedString(closeTime)).append("\n");
sb.append(" referrer: ").append(toIndentedString(referrer)).append("\n");
Expand Down
Loading