Skip to content

Commit 8243b6b

Browse files
committed
Chore : indentation and dummy ids added
1 parent af0d340 commit 8243b6b

File tree

3 files changed

+25
-20
lines changed

3 files changed

+25
-20
lines changed

src/main/java/com/contentstack/sdk/Entry.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,14 +1111,15 @@ public Entry includeMetadata() {
11111111
* Stack stack = contentstack.Stack("apiKey", "deliveryToken", "environment");
11121112
* Entry entry = stack.contentType("user").entry("entry_uid").variant("variant_uid").fetch();
11131113
*/
1114-
public Entry variants(@NotNull String variants){
1115-
if (variants != null && variants.length() > 0) {
1116-
this.headers.put("x-cs-variant-uid", variants.trim());
1114+
public Entry variants(@NotNull String variants) {
1115+
if (variants != null && variants.length() > 0) {
1116+
this.headers.put("x-cs-variant-uid", variants.trim());
11171117
}
11181118
return this;
11191119

11201120
}
1121-
public Entry variants(@NotNull String[] variants){
1121+
1122+
public Entry variants(@NotNull String[] variants) {
11221123
if (variants != null && variants.length > 0) {
11231124
List<String> variantList = new ArrayList<>();
11241125
for (String variant : variants) {
@@ -1131,7 +1132,8 @@ public Entry variants(@NotNull String[] variants){
11311132
}
11321133
return this;
11331134
}
1135+
11341136
public LinkedHashMap<String, Object> getHeaders() {
11351137
return headers;
1136-
}
1138+
}
11371139
}

src/test/java/com/contentstack/sdk/Credentials.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import io.github.cdimascio.dotenv.Dotenv;
33

44
import java.rmi.AccessException;
5+
import java.util.Arrays;
56

67
public class Credentials {
78
static Dotenv env = getEnv();
@@ -32,7 +33,18 @@ public static Dotenv getEnv() {
3233
public final static String ENVIRONMENT = (env.get("ENVIRONMENT") != null) ? env.get("ENVIRONMENT") : "env1";
3334
public final static String CONTENT_TYPE = (env.get("contentType") != null) ? env.get("contentType") : "product";
3435
public final static String ENTRY_UID = (env.get("assetUid") != null) ? env.get("assetUid") : "";
36+
public final static String VARIANT_UID = (env.get("variantUid") != null) ? env.get("variantUid") : "";
37+
public final static String[] VARIANTS_UID ;
38+
static { String variantsUidString = env.get("variantsUid");
3539

40+
if (variantsUidString != null && !variantsUidString.trim().isEmpty()) {
41+
VARIANTS_UID = Arrays.stream(variantsUidString.split(","))
42+
.map(String::trim)
43+
.toArray(String[]::new);
44+
} else {
45+
VARIANTS_UID = new String[]{};
46+
}
47+
}
3648

3749
private static volatile Stack stack;
3850

src/test/java/com/contentstack/sdk/TestEntry.java

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ class TestEntry {
2020
private final Stack stack = Credentials.getStack();
2121
private Entry entry;
2222
private final String CONTENT_TYPE = Credentials.CONTENT_TYPE;
23-
23+
private final String VARIANT_UID = Credentials.VARIANT_UID;
24+
private static final String[] VARIANT_UIDS = Credentials.VARIANTS_UID ;
25+
2426
@Test
2527
@Order(1)
2628
void entryCallingPrivateModifier() {
@@ -66,18 +68,18 @@ public void onCompletion(ResponseType responseType, Error error) {
6668
}
6769
@Test
6870
void VariantsTestSingleUid(){
69-
entry = stack.contentType(CONTENT_TYPE).entry(entryUid).variants(" cs672c33271558d8b0 ");
71+
entry = stack.contentType(CONTENT_TYPE).entry(entryUid).variants(VARIANT_UID);
7072
entry.fetch(new EntryResultCallBack() {
7173
@Override
7274
public void onCompletion(ResponseType responseType, Error error) {
73-
assertEquals("cs672c33271558d8b0", entry.getHeaders().get("x-cs-variant-uid"));
75+
assertEquals(VARIANT_UID.trim(), entry.getHeaders().get("x-cs-variant-uid"));
7476
System.out.println(entry.toJSON());
7577
}
7678
});
7779
}
7880
@Test
7981
void VariantsTestArray(){
80-
entry = stack.contentType(CONTENT_TYPE).entry(entryUid).variants(new String[]{" cs672c33271558d8b0"," cs321fbc07ec71861b"," cs321fbc07ec71861b "});
82+
entry = stack.contentType(CONTENT_TYPE).entry(entryUid).variants(VARIANT_UIDS);
8183
entry.fetch(new EntryResultCallBack() {
8284
@Override
8385
public void onCompletion(ResponseType responseType, Error error) {
@@ -86,17 +88,6 @@ public void onCompletion(ResponseType responseType, Error error) {
8688
});
8789
}
8890

89-
@Test
90-
void VariantsTestArrayWithMixedElements() {
91-
entry = stack.contentType(CONTENT_TYPE).entry(entryUid).variants(new String[]{"", " cs672c33271558d8b0 ", null, " "});
92-
entry.fetch(new EntryResultCallBack() {
93-
@Override
94-
public void onCompletion(ResponseType responseType, Error error) {
95-
System.out.println(entry.toJSON());
96-
}
97-
});
98-
}
99-
10091
@Test
10192
void VariantsTestNullString() {
10293
entry = stack.contentType(CONTENT_TYPE).entry(entryUid).variants((String) null);

0 commit comments

Comments
 (0)