Long Ids to UUID strings · stacksync/commons@5525f61 · GitHub
Skip to content

Commit 5525f61

Browse files
author
Adrian Moreno
committed
Long Ids to UUID strings
1 parent 7fd1267 commit 5525f61

13 files changed

Lines changed: 49 additions & 49 deletions

‎src/main/java/com/stacksync/commons/models/AccountInfo.java‎

Lines changed: 4 additions & 4 deletions

‎src/main/java/com/stacksync/commons/models/Device.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class Device implements Serializable {
88

99
private static final long serialVersionUID = -2932481953197148130L;
1010

11-
private Long id;
11+
private String id;
1212
private String name;
1313
private User user;
1414
private String os;
@@ -21,11 +21,11 @@ public Device() {
2121
this.id = null;
2222
}
2323

24-
public Device(Long id) {
24+
public Device(String id) {
2525
this.id = id;
2626
}
2727

28-
public Device(Long id, String name, User user) {
28+
public Device(String id, String name, User user) {
2929
this.id = id;
3030
this.name = name;
3131
this.user = user;
@@ -82,11 +82,11 @@ public void setAppVersion(String appVersion) {
8282
this.appVersion = appVersion;
8383
}
8484

85-
public Long getId() {
85+
public String getId() {
8686
return id;
8787
}
8888

89-
public void setId(Long id) {
89+
public void setId(String id) {
9090
this.id = id;
9191
}
9292

‎src/main/java/com/stacksync/commons/models/Item.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public String toString() {
159159
parentId = parent.getId();
160160
}
161161

162-
Long workspaceId = null;
162+
String workspaceId = null;
163163
if (workspace != null) {
164164
workspaceId = workspace.getId();
165165
}

‎src/main/java/com/stacksync/commons/models/ItemMetadata.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class ItemMetadata implements Serializable {
1212
private Long id;
1313
private Long tempId;
1414
private Long version;
15-
private Long deviceId;
15+
private String deviceId;
1616
private Long parentId;
1717
private Long parentVersion;
1818

@@ -34,7 +34,7 @@ public ItemMetadata() {
3434
this.chunks = new ArrayList<String>();
3535
}
3636

37-
public ItemMetadata(Long id, Long version, Long deviceId, Long parentId,
37+
public ItemMetadata(Long id, Long version, String deviceId, Long parentId,
3838
Long parentVersion, String status, Date modifiedAt, Long checksum,
3939
Long size, boolean isFolder, String filename, String mimetype,
4040
List<String> chunks) {
@@ -84,11 +84,11 @@ public void setVersion(Long version) {
8484
this.version = version;
8585
}
8686

87-
public Long getDeviceId() {
87+
public String getDeviceId() {
8888
return deviceId;
8989
}
9090

91-
public void setDeviceId(Long deviceId) {
91+
public void setDeviceId(String deviceId) {
9292
this.deviceId = deviceId;
9393
}
9494

‎src/main/java/com/stacksync/commons/models/ItemVersion.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public String toString() {
147147
chunksSize = chunks.size();
148148
}
149149

150-
Long deviceId = null;
150+
String deviceId = null;
151151
if (device != null) {
152152
deviceId = device.getId();
153153
}

‎src/main/java/com/stacksync/commons/models/User.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class User implements Serializable{
88

99
private static final long serialVersionUID = -8827608629982195900L;
1010

11-
private Long id;
11+
private String id;
1212
private String name;
1313
private String cloudId;
1414
private String email;
@@ -21,11 +21,11 @@ public User() {
2121
this(null);
2222
}
2323

24-
public User(Long id) {
24+
public User(String id) {
2525
this(id, null, null, null, null, null);
2626
}
2727

28-
public User(Long id, String name, String cloudId, String email, Integer quotaLimit, Integer quotaUsed) {
28+
public User(String id, String name, String cloudId, String email, Integer quotaLimit, Integer quotaUsed) {
2929
this.id = id;
3030
this.name = name;
3131
this.cloudId = cloudId;
@@ -36,11 +36,11 @@ public User(Long id, String name, String cloudId, String email, Integer quotaLim
3636
this.workspaces = new ArrayList<Workspace>();
3737
}
3838

39-
public Long getId() {
39+
public String getId() {
4040
return id;
4141
}
4242

43-
public void setId(Long id) {
43+
public void setId(String id) {
4444
this.id = id;
4545
}
4646

‎src/main/java/com/stacksync/commons/models/Workspace.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class Workspace implements Serializable {
88

99
private static final long serialVersionUID = 243350300638953723L;
1010

11-
private Long id;
11+
private String id;
1212
private String name;
1313
private Item parentItem;
1414
private Integer latestRevision;
@@ -23,11 +23,11 @@ public Workspace() {
2323
this(null);
2424
}
2525

26-
public Workspace(Long id) {
26+
public Workspace(String id) {
2727
this(id, 0, null, false);
2828
}
2929

30-
public Workspace(Long id, Integer latestRevision, User owner, Boolean isShared) {
30+
public Workspace(String id, Integer latestRevision, User owner, Boolean isShared) {
3131
this.id = id;
3232
this.latestRevision = latestRevision;
3333
this.owner = owner;
@@ -36,11 +36,11 @@ public Workspace(Long id, Integer latestRevision, User owner, Boolean isShared)
3636
this.users = new ArrayList<User>();
3737
}
3838

39-
public Long getId() {
39+
public String getId() {
4040
return id;
4141
}
4242

43-
public void setId(Long id) {
43+
public void setId(String id) {
4444
this.id = id;
4545
}
4646

‎src/main/java/com/stacksync/commons/notifications/ShareProposalNotification.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ public class ShareProposalNotification extends Notification implements Serializa
66

77
protected static final long serialVersionUID = -3210149693220010223L;
88

9-
protected Long workspaceId;
9+
protected String workspaceId;
1010
protected String folderName;
1111
protected Long parentItemId;
1212
protected String ownerId;
1313
protected String ownerName;
1414
protected String swiftContainer;
1515
protected String swiftURL;
1616

17-
public ShareProposalNotification(Long workspaceId, String folderName, Long parentItemId, String ownerId,
17+
public ShareProposalNotification(String workspaceId, String folderName, Long parentItemId, String ownerId,
1818
String ownerName, String swiftContainer, String swiftURL) {
1919
super();
2020
this.workspaceId = workspaceId;
@@ -26,11 +26,11 @@ public ShareProposalNotification(Long workspaceId, String folderName, Long paren
2626
this.swiftURL = swiftURL;
2727
}
2828

29-
public Long getWorkspaceId() {
29+
public String getWorkspaceId() {
3030
return workspaceId;
3131
}
3232

33-
public void setWorkspaceId(Long workspaceId) {
33+
public void setWorkspaceId(String workspaceId) {
3434
this.workspaceId = workspaceId;
3535
}
3636

‎src/main/java/com/stacksync/commons/omq/ISyncService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public interface ISyncService extends Remote {
8080
* @throws UserNotFoundException
8181
*/
8282
@SyncMethod(retry = 3, timeout = 5000)
83-
public Long updateDevice(UpdateDeviceRequest request) throws UserNotFoundException, DeviceNotValidException, DeviceNotUpdatedException;
83+
public String updateDevice(UpdateDeviceRequest request) throws UserNotFoundException, DeviceNotValidException, DeviceNotUpdatedException;
8484

8585
/***
8686
* Function used to update information about a workspace.

‎src/main/java/com/stacksync/commons/requests/CommitRequest.java‎

Lines changed: 7 additions & 7 deletions

0 commit comments

Comments
 (0)