- * {@code
- * config.setRegion(ContentstackRegion.US);
- * config.setRegion(ContentstackRegion.EU);
- * config.setRegion(ContentstackRegion.AZURE_EU);
- * config.setRegion(ContentstackRegion.AZURE_NA);
- * }
- *
+ * {@code
+ * config.setRegion(ContentstackRegion.US);
+ * config.setRegion(ContentstackRegion.EU);
+ * config.setRegion(ContentstackRegion.AZURE_EU);
+ * config.setRegion(ContentstackRegion.AZURE_NA);
+ * }
+ *
*/
public ContentstackRegion setRegion(ContentstackRegion region) {
this.region = region;
@@ -69,7 +69,10 @@ public String[] getEarlyAccess() {
return this.earlyAccess;
}
- public Config earlyAccess(@NotNull String[] earlyAccess) {
+ public Config earlyAccess(String[] earlyAccess) {
+ if (earlyAccess == null) {
+ Objects.requireNonNull("Null early access");
+ }
this.earlyAccess = earlyAccess;
return this;
}
diff --git a/contentstack/src/main/java/com/contentstack/sdk/Contentstack.java b/contentstack/src/main/java/com/contentstack/sdk/Contentstack.java
index 22433a47..97fe6402 100755
--- a/contentstack/src/main/java/com/contentstack/sdk/Contentstack.java
+++ b/contentstack/src/main/java/com/contentstack/sdk/Contentstack.java
@@ -7,10 +7,8 @@
import com.android.volley.RequestQueue;
import com.android.volley.toolbox.Volley;
-
import java.io.File;
-
-import javax.validation.constraints.NotNull;
+import java.util.Objects;
/**
* Contains all Contentstack SDK Classes And Methods.
@@ -45,7 +43,9 @@ private Contentstack(Context context) {
* @return {@link Stack} instance. Stack stack = Contentstack.stack(context, "apiKey", "deliveryToken", "stag");* @throws Exception the exception */ - public static Stack stack(@NotNull Context context, @NotNull String apiKey, @NotNull String deliveryToken, @NotNull String environment) throws Exception { + public static Stack stack(Context context, String apiKey, String deliveryToken, String environment) throws Exception { + checkIfNull(context, apiKey, deliveryToken, environment); + if (!TextUtils.isEmpty(apiKey) || !TextUtils.isEmpty(deliveryToken) || !TextUtils.isEmpty(environment)) { Config config = new Config(); config.setEnvironment(environment); @@ -56,6 +56,13 @@ public static Stack stack(@NotNull Context context, @NotNull String apiKey, @Not } } + private static void checkIfNull(Context context, String apiKey, String deliveryToken, String environment) { + Objects.requireNonNull(context, "can not be null"); + Objects.requireNonNull(apiKey, "can not be null"); + Objects.requireNonNull(deliveryToken, "can not be null"); + Objects.requireNonNull(environment, "can not be null"); + } + /** * Authenticates the stack api key of your stack. * This must be called before your stack uses Contentstack sdk. @@ -70,7 +77,9 @@ public static Stack stack(@NotNull Context context, @NotNull String apiKey, @Not * @return {@link Stack} instance.
Config config = new Config(); config.setEnvironment("stag"); Stack stack = Contentstack.stack(context, "apiKey", "deliveryToken", config);
* @throws Exception the exception
*/
- public static Stack stack(@NotNull Context context, @NotNull String apiKey, @NotNull String deliveryToken, @NotNull String environment, @NotNull Config config) throws Exception {
+ public static Stack stack(Context context, String apiKey, String deliveryToken, String environment, Config config) throws Exception {
+ checkIfNull(context, apiKey, deliveryToken, environment);
+ Objects.requireNonNull(config, "Config can not be null");
if (!TextUtils.isEmpty(apiKey) || !TextUtils.isEmpty(deliveryToken) || !TextUtils.isEmpty(environment)) {
config.setEnvironment(environment);
ctx = context;
diff --git a/contentstack/src/main/java/com/contentstack/sdk/Stack.java b/contentstack/src/main/java/com/contentstack/sdk/Stack.java
index 3ba27756..d5bcb87b 100755
--- a/contentstack/src/main/java/com/contentstack/sdk/Stack.java
+++ b/contentstack/src/main/java/com/contentstack/sdk/Stack.java
@@ -4,6 +4,7 @@
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.Log;
+
import org.json.JSONException;
import org.json.JSONObject;
@@ -21,8 +22,6 @@
import java.util.Objects;
import java.util.TimeZone;
-import javax.validation.constraints.NotNull;
-
/**
* To fetch stack level information of your application from Contentstack server.
*
@@ -51,7 +50,10 @@ public class Stack implements INotifyClass {
protected Stack() {
}
- protected Stack(@NotNull String apiKey) {
+ protected Stack(String apiKey) {
+ if (apiKey==null){
+ Objects.requireNonNull("Please provide a valid ApiKey");
+ }
this.stackApiKey = apiKey;
if (this.localHeader == null) {
this.localHeader = new ArrayMap<>();
@@ -224,7 +226,7 @@ public void setHeader(String key, String value) {
}
}
- public void setHeaders(@NotNull ArrayMap headers) {
+ public void setHeaders(ArrayMap headers) {
if (this.localHeader == null) {
this.localHeader = new ArrayMap<>();
}
@@ -289,17 +291,17 @@ private String getImageUrl() {
* This call returns comprehensive information of all the content types available in a particular stack in your account.
*
Example :
*
- * JSONObject params = new JSONObject();
- * params.put("include_snippet_schema", true);
- * params.put("limit", 3);
- * stack.getContentTypes(params, new ContentTypesCallback() {
- * @Override public void onCompletion(ContentTypesModel contentTypesModel, Error error) {
- * if (error == null){
- * // do your stuff.
- * }
- * }
- * });
- *
+ * JSONObject params = new JSONObject();
+ * params.put("include_snippet_schema", true);
+ * params.put("limit", 3);
+ * stack.getContentTypes(params, new ContentTypesCallback() {
+ * @Override public void onCompletion(ContentTypesModel contentTypesModel, Error error) {
+ * if (error == null){
+ * // do your stuff.
+ * }
+ * }
+ * });
+ *
*/
public void getContentTypes(JSONObject params, final ContentTypesCallback callback) {
try {
@@ -350,9 +352,9 @@ private void fetchContentTypes(String urlString, JSONObject urlQueries, ArrayMap
*
*
- * Stack stack = Contentstack.stack("apiKey", "deliveryToken", "environment");
- * stack.syncPaginationToken(pagination_token, new SyncResultCallBack()) {}
- *
+ * Stack stack = Contentstack.stack("apiKey", "deliveryToken", "environment");
+ * stack.syncPaginationToken(pagination_token, new SyncResultCallBack()) {}
+ *
*/
public void sync(SyncResultCallBack syncCallBack) {
@@ -402,7 +404,7 @@ public void syncPaginationToken(String paginationToken, SyncResultCallBack syncC
* and the details of the content that was deleted or updated.
* - *+ * */ public void syncToken(String syncToken, SyncResultCallBack syncCallBack) { try { @@ -423,8 +425,8 @@ public void syncToken(String syncToken, SyncResultCallBack syncCallBack) { * *
- * stack.syncFromDate(start_date, new SyncResultCallBack()) { }
- *
+ * stack.syncFromDate(start_date, new SyncResultCallBack()) { }
+ *
*/
public void syncFromDate(Date fromDate, SyncResultCallBack syncCallBack) {
String startFromDate = convertUTCToISO(fromDate);
@@ -494,7 +496,10 @@ public void syncLocale(Language language, SyncResultCallBack syncCallBack) {
* However, if you do this, the subsequent syncs will only include the entries of the specified locales.
*
*/
- public void syncLocale(@NotNull String localeCode, SyncResultCallBack syncCallBack) {
+ public void syncLocale(String localeCode, SyncResultCallBack syncCallBack) {
+ if (localeCode==null){
+ Objects.requireNonNull("localeCode can not be null");
+ }
try {
this.syncParams = new JSONObject();
this.syncParams.put("init", true);
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9f4197d5..6b0e6c07 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,8 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+#distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+#distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
index b7965451..f699c255 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,18 +1,18 @@
pluginManagement {
repositories {
+ google()
mavenCentral()
maven { url "https://plugins.gradle.org/m2/" }
gradlePluginPortal()
- google()
}
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
- mavenCentral()
google()
+ mavenCentral()
}
}
rootProject.name = "contentstack-android"