Skip to content

Commit b0e6357

Browse files
reeshika-hreeshika-h
committed
✨feat: Add POJO support for Entry and EntryListResponse, including fetch methods in EntryService
1 parent 4d79f67 commit b0e6357

5 files changed

Lines changed: 173 additions & 0 deletions

File tree

‎src/main/java/com/contentstack/cms/stack/Entry.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,11 @@ public Call<ResponseBody> find() {
189189
return this.service.fetch(this.headers, this.contentTypeUid, this.params);
190190
}
191191

192+
public Call<EntryListResponse> findAsPojo() {
193+
validateCT();
194+
return this.service.fetchPojo(this.headers, this.contentTypeUid, this.params);
195+
}
196+
192197
/**
193198
* <b>The Get a single entry request fetches a particular entry of a content
194199
* type.</b>
@@ -214,6 +219,11 @@ public Call<ResponseBody> fetch() {
214219
validateEntry();
215220
return this.service.single(headers, this.contentTypeUid, this.entryUid, this.params);
216221
}
222+
public Call<EntryResponse> fetchAsPojo() {
223+
validateCT();
224+
validateEntry();
225+
return this.service.singlePojo(headers, this.contentTypeUid, this.entryUid, this.params);
226+
}
217227

218228
/**
219229
* The Create an entry call creates a new entry for the selected content type.

‎src/main/java/com/contentstack/cms/stack/EntryListResponse.java‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
package com.contentstack.cms.stack;
2+
import com.google.gson.annotations.SerializedName;
3+
import com.google.gson.JsonObject;
4+
import com.google.gson.JsonElement;
5+
import com.google.gson.Gson;
6+
import com.google.gson.GsonBuilder;
7+
import java.util.*;
8+
9+
public class EntryListResponse {
10+
11+
@SerializedName("entries")
12+
private List<JsonObject> rawEntries;
13+
14+
private transient List<EntryPojo> entries;
15+
16+
public List<EntryPojo> getEntries() {
17+
if (entries == null && rawEntries != null) {
18+
Gson gson = new Gson();
19+
entries = new ArrayList<>();
20+
21+
for (JsonObject entryJson : rawEntries) {
22+
EntryPojo entryPojo = gson.fromJson(entryJson, EntryPojo.class);
23+
// Map dynamic fields
24+
Map<String, Object> fields = new LinkedHashMap<>();
25+
for (Map.Entry<String, JsonElement> field : entryJson.entrySet()) {
26+
String key = field.getKey();
27+
if (!EntryPojo.SYSTEM_FIELDS.contains(key)) {
28+
fields.put(key, gson.fromJson(field.getValue(), Object.class));
29+
}
30+
}
31+
entryPojo.setFields(fields);
32+
entries.add(entryPojo);
33+
}
34+
}
35+
return entries;
36+
}
37+
38+
public List<JsonObject> getRawJson() {
39+
return rawEntries;
40+
}
41+
42+
@Override
43+
public String toString() {
44+
return new GsonBuilder().setPrettyPrinting().create().toJson(this);
45+
}
46+
}

‎src/main/java/com/contentstack/cms/stack/EntryPojo.java‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
package com.contentstack.cms.stack;
2+
import java.util.Map;
3+
import java.util.Set;
4+
import java.util.HashSet;
5+
import java.util.Arrays;
6+
import com.google.gson.annotations.SerializedName;
7+
8+
public class EntryPojo {
9+
10+
@SerializedName("title")
11+
public String title;
12+
13+
@SerializedName("uid")
14+
public String uid;
15+
16+
@SerializedName("_version")
17+
public int version;
18+
19+
@SerializedName("locale")
20+
public String locale;
21+
22+
// Additional fields captured dynamically from content type schema
23+
protected Map<String, Object> fields;
24+
25+
public Map<String, Object> getFields() {
26+
return fields;
27+
}
28+
29+
public void setFields(Map<String, Object> fields) {
30+
this.fields = fields;
31+
}
32+
33+
public String getStringField(String key) {
34+
Object value = fields.get(key);
35+
return value != null ? value.toString() : null;
36+
}
37+
38+
public Map<String, Object> getJsonObjectField(String key) {
39+
Object value = fields.get(key);
40+
if (value instanceof Map) {
41+
return (Map<String, Object>) value;
42+
}
43+
return null;
44+
}
45+
// Define system fields to exclude from dynamic mapping
46+
public static final Set<String> SYSTEM_FIELDS = new HashSet<>(Arrays.asList(
47+
"title","uid", "_version", "locale", "tags", "ACL", "created_by", "updated_by",
48+
"created_at", "updated_at", "_in_progress"
49+
));
50+
}
51+
52+

‎src/main/java/com/contentstack/cms/stack/EntryResponse.java‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
package com.contentstack.cms.stack;
2+
import com.google.gson.Gson;
3+
import com.google.gson.GsonBuilder;
4+
import com.google.gson.JsonElement;
5+
import com.google.gson.JsonObject;
6+
import com.google.gson.annotations.SerializedName;
7+
8+
import java.util.LinkedHashMap;
9+
import java.util.Map;
10+
11+
public class EntryResponse {
12+
13+
@SerializedName("entry")
14+
private JsonObject entryJson;
15+
16+
private EntryPojo entryPojo;
17+
18+
public EntryPojo getEntryPojo() {
19+
if (entryPojo == null && entryJson != null) {
20+
Gson gson = new Gson();
21+
// Deserialize system fields automatically
22+
entryPojo = gson.fromJson(entryJson, EntryPojo.class);
23+
// Manually extract and map only non-system (dynamic) fields
24+
Map<String, Object> fields = new LinkedHashMap<>();
25+
for (Map.Entry<String, JsonElement> entry : entryJson.entrySet()) {
26+
String key = entry.getKey();
27+
if (!EntryPojo.SYSTEM_FIELDS.contains(key)) {
28+
fields.put(key, gson.fromJson(entry.getValue(), Object.class));
29+
}
30+
}
31+
entryPojo.setFields(fields);
32+
}
33+
return entryPojo;
34+
}
35+
36+
public JsonObject getRawJson() {
37+
return entryJson;
38+
}
39+
40+
@Override
41+
public String toString() {
42+
return new GsonBuilder().setPrettyPrinting().create().toJson(this);
43+
}
44+
}

‎src/main/java/com/contentstack/cms/stack/EntryService.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ Call<ResponseBody> fetch(
1616
@Path("content_type_uid") String contentTypeUid,
1717
@QueryMap(encoded = true) Map<String, Object> queryParameter);
1818

19+
@GET("content_types/{content_type_uid}/entries")
20+
Call<EntryListResponse> fetchPojo(
21+
@HeaderMap Map<String, Object> headers,
22+
@Path("content_type_uid") String contentTypeUid,
23+
@QueryMap(encoded = true) Map<String, Object> queryParameter);
24+
1925
@Headers("Content-Type: application/json")
2026
@GET("content_types/{content_type_uid}/entries/{entry_uid}")
2127
Call<ResponseBody> single(
@@ -24,6 +30,14 @@ Call<ResponseBody> single(
2430
@Path("entry_uid") String entryUid,
2531
@QueryMap(encoded = true) Map<String, Object> queryParameter);
2632

33+
@Headers("Content-Type: application/json")
34+
@GET("content_types/{content_type_uid}/entries/{entry_uid}")
35+
Call<EntryResponse> singlePojo(
36+
@HeaderMap Map<String, Object> headers,
37+
@Path("content_type_uid") String contentTypeUid,
38+
@Path("entry_uid") String entryUid,
39+
@QueryMap(encoded = true) Map<String, Object> queryParameter);
40+
2741
@Headers("Content-Type: application/json")
2842
@POST("content_types/{content_type_uid}/entries")
2943
Call<ResponseBody> create(
@@ -115,6 +129,13 @@ Call<ResponseBody> export(
115129
@Path("entry_uid") String entryUid,
116130
@QueryMap(encoded = true) Map<String, Object> queryOptions);
117131

132+
@GET("content_types/{content_type_uid}/entries/{entry_uid}/export")
133+
Call<ResponseBody> exportPojo(
134+
@HeaderMap Map<String, Object> headers,
135+
@Path("content_type_uid") String contentTypeUid,
136+
@Path("entry_uid") String entryUid,
137+
@QueryMap(encoded = true) Map<String, Object> queryOptions);
138+
118139
@POST("content_types/{content_type_uid}/entries/import")
119140
Call<ResponseBody> imports(
120141
@HeaderMap Map<String, Object> headers,

0 commit comments

Comments
 (0)