Skip to content

Commit 2f92b8c

Browse files
Updated SocialActivityAttachment and SocialActivityModel classes to implement ImportableItem class (#1197)
* Updated SocialActivityAttachment and SocialActivityModel classes to implement ImportableItem class Updated SocialActivityAttachment and SocialActivityModel classes to implement ImportableItem class * Made IdempotentId field Nonnull Made IdempotentId field Nonnull * Update SocialActivityModel.java
1 parent 6137d31 commit 2f92b8c

File tree

2 files changed

+21
-2
lines changed

2 files changed

+21
-2
lines changed

portability-types-common/src/main/java/org/datatransferproject/types/common/models/social/SocialActivityAttachment.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,14 @@
1717
package org.datatransferproject.types.common.models.social;
1818

1919
import com.fasterxml.jackson.annotation.JsonCreator;
20+
import com.fasterxml.jackson.annotation.JsonIgnore;
2021
import com.fasterxml.jackson.annotation.JsonProperty;
22+
import org.datatransferproject.types.common.ImportableItem;
2123

24+
import javax.annotation.Nonnull;
2225
import java.util.Objects;
2326

24-
public class SocialActivityAttachment {
27+
public class SocialActivityAttachment implements ImportableItem {
2528
private SocialActivityAttachmentType type;
2629
private String url;
2730
private String name;
@@ -43,6 +46,7 @@ public String getUrl() {
4346
return url;
4447
}
4548

49+
@JsonIgnore(false)
4650
public String getName() {
4751
return name;
4852
}
@@ -70,4 +74,8 @@ public boolean equals(Object o) {
7074
public int hashCode() {
7175
return Objects.hash(getType(), getUrl(), getName(), getContent());
7276
}
77+
78+
@Nonnull
79+
@Override
80+
public String getIdempotentId() { return url; }
7381
}

portability-types-common/src/main/java/org/datatransferproject/types/common/models/social/SocialActivityModel.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@
1919
import com.fasterxml.jackson.annotation.JsonCreator;
2020
import com.fasterxml.jackson.annotation.JsonProperty;
2121
import com.google.common.collect.ImmutableList;
22+
import org.datatransferproject.types.common.ImportableItem;
2223

24+
import javax.annotation.Nonnull;
2325
import java.time.Instant;
2426
import java.util.Collection;
2527
import java.util.Objects;
2628

27-
public class SocialActivityModel {
29+
public class SocialActivityModel implements ImportableItem {
2830
private String id;
2931
private Instant published;
3032
private SocialActivityType type;
@@ -114,4 +116,13 @@ public String getContent() {
114116
public String getUrl() {
115117
return url;
116118
}
119+
120+
@Nonnull
121+
@Override
122+
public String getIdempotentId() {
123+
return Integer.toString(hashCode());
124+
}
125+
126+
@Override
127+
public String getName() { return title; }
117128
}

0 commit comments

Comments
 (0)