type, CDAClient client) {
this.type = type;
@@ -357,7 +357,7 @@ public Query reverseOrderBy(String key) {
* Limits the amount of elements to a given number.
*
* If more then the number given elements are present, you can use {@link #skip(int)} and
- * {@link #limit(int)} for pagination.
+ * {@see #limit(int)} for pagination.
*
* @param limit a non negative number less than 1001 to include elements.
* @return the calling query for chaining.
diff --git a/src/main/java/com/contentful/java/cda/ArrayResource.java b/src/main/java/com/contentful/java/cda/ArrayResource.java
index 75221d26..99901b10 100644
--- a/src/main/java/com/contentful/java/cda/ArrayResource.java
+++ b/src/main/java/com/contentful/java/cda/ArrayResource.java
@@ -8,7 +8,8 @@
*
* @see CDAResource
*/
-abstract class ArrayResource extends CDAResource {
+public abstract class ArrayResource extends CDAResource {
+ private static final long serialVersionUID = -2702554830040250962L;
List items;
Map assets;
diff --git a/src/main/java/com/contentful/java/cda/CDAArray.java b/src/main/java/com/contentful/java/cda/CDAArray.java
index be2b770d..2aad79a9 100644
--- a/src/main/java/com/contentful/java/cda/CDAArray.java
+++ b/src/main/java/com/contentful/java/cda/CDAArray.java
@@ -8,6 +8,7 @@
* Collection of CDA resources.
*/
public class CDAArray extends ArrayResource {
+ private static final long serialVersionUID = 6596224363025698245L;
int total;
int skip;
diff --git a/src/main/java/com/contentful/java/cda/CDAAsset.java b/src/main/java/com/contentful/java/cda/CDAAsset.java
index 592289cc..b304124b 100644
--- a/src/main/java/com/contentful/java/cda/CDAAsset.java
+++ b/src/main/java/com/contentful/java/cda/CDAAsset.java
@@ -10,6 +10,8 @@
*/
public class CDAAsset extends LocalizedResource {
+ private static final long serialVersionUID = -4645571481643616657L;
+
/**
* @return title of this asset.
*/
@@ -53,7 +55,7 @@ public String urlForImageWith(ImageOption... options) {
}
final Map mappedOptions
- = new LinkedHashMap(options.length);
+ = new LinkedHashMap<>(options.length);
for (final ImageOption option : options) {
mappedOptions.put(option.getOperation(), option);
diff --git a/src/main/java/com/contentful/java/cda/CDAClient.java b/src/main/java/com/contentful/java/cda/CDAClient.java
index d7ef80ba..79e35943 100644
--- a/src/main/java/com/contentful/java/cda/CDAClient.java
+++ b/src/main/java/com/contentful/java/cda/CDAClient.java
@@ -31,7 +31,6 @@
import io.reactivex.functions.Function;
import okhttp3.Call;
import okhttp3.OkHttpClient;
-import retrofit2.Response;
import retrofit2.Retrofit;
import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
import retrofit2.converter.gson.GsonConverterFactory;
@@ -126,7 +125,7 @@ private static CDAService createService(Builder clientBuilder) {
* @see #fetchSpace()
*/
public FetchQuery fetch(Class type) {
- return new FetchQuery(type, this);
+ return new FetchQuery<>(type, this);
}
/**
@@ -140,7 +139,7 @@ public FetchQuery fetch(Class type) {
* @see #observeSpace()
*/
public ObserveQuery observe(Class type) {
- return new ObserveQuery(type, this);
+ return new ObserveQuery<>(type, this);
}
/**
@@ -223,7 +222,7 @@ public Flowable observeContentTypeCachePopulation(final int limit) {
.all()
.map(
new Function() {
- @Override public CDAArray apply(CDAArray array) throws Exception {
+ @Override public CDAArray apply(CDAArray array) {
if (array.skip() + array.limit() < array.total()) {
return nextPage(array);
} else {
@@ -250,20 +249,18 @@ private CDAArray nextPage(CDAArray array) {
}
)
.map(
- new Function() {
- @Override public Integer apply(CDAArray array) throws Exception {
- for (CDAResource resource : array.items) {
- if (resource instanceof CDAContentType) {
- cache.types().put(resource.id(), (CDAContentType) resource);
- } else {
- throw new IllegalStateException(
- "Requesting a list of content types should not return "
- + "any other type.");
- }
+ array -> {
+ for (CDAResource resource : array.items) {
+ if (resource instanceof CDAContentType) {
+ cache.types().put(resource.id(), (CDAContentType) resource);
+ } else {
+ throw new IllegalStateException(
+ "Requesting a list of content types should not return "
+ + "any other type.");
}
-
- return array.total;
}
+
+ return array.total;
}
);
}
@@ -363,11 +360,7 @@ public > C fetchSpace(C callback) {
* @return an {@link Flowable} that fetches the space for this client.
*/
public Flowable observeSpace() {
- return service.space(spaceId).map(new Function, CDASpace>() {
- @Override public CDASpace apply(Response response) throws Exception {
- return fromResponse(response);
- }
- });
+ return service.space(spaceId).map(ResourceFactory::fromResponse);
}
/**
@@ -375,28 +368,18 @@ public Flowable observeSpace() {
*/
Flowable cacheAll(final boolean invalidate) {
return cacheLocales(invalidate)
- .flatMap(new Function, Flowable>>() {
- @Override public Flowable> apply(List locales) {
- return cacheTypes(invalidate);
- }
- })
- .map(new Function, Cache>() {
- @Override public Cache apply(Map stringCDAContentTypeMap) {
- return cache;
- }
- });
+ .flatMap(locales -> cacheTypes(invalidate))
+ .map(stringCDAContentTypeMap -> cache);
}
Flowable> cacheLocales(boolean invalidate) {
List locales = invalidate ? null : cache.locales();
if (locales == null) {
- return service.array(spaceId, environmentId, PATH_LOCALES, new HashMap())
- .map(new Function, List>() {
- @Override public List apply(Response localesResponse) {
- final List locales = fromArrayToItems(fromResponse(localesResponse));
- cache.setLocales(locales);
- return locales;
- }
+ return service.array(spaceId, environmentId, PATH_LOCALES, new HashMap<>())
+ .map(localesResponse -> {
+ final List locales1 = fromArrayToItems(fromResponse(localesResponse));
+ cache.setLocales(locales1);
+ return locales1;
});
}
return Flowable.just(locales);
@@ -409,18 +392,16 @@ Flowable> cacheTypes(boolean invalidate) {
spaceId,
environmentId,
PATH_CONTENT_TYPES,
- new HashMap()
+ new HashMap<>()
).map(
- new Function, Map>() {
- @Override public Map apply(Response arrayResponse) {
- CDAArray array = ResourceFactory.array(arrayResponse, CDAClient.this);
- Map tmp = new ConcurrentHashMap();
- for (CDAResource resource : array.items()) {
- tmp.put(resource.id(), (CDAContentType) resource);
- }
- cache.setTypes(tmp);
- return tmp;
+ arrayResponse -> {
+ CDAArray array = ResourceFactory.array(arrayResponse, CDAClient.this);
+ Map tmp = new ConcurrentHashMap<>();
+ for (CDAResource resource : array.items()) {
+ tmp.put(resource.id(), (CDAContentType) resource);
}
+ cache.setTypes(tmp);
+ return tmp;
});
}
return Flowable.just(types);
@@ -432,13 +413,11 @@ Flowable cacheTypeWithId(String id) {
return observe(CDAContentType.class)
.one(id)
.map(
- new Function() {
- @Override public CDAContentType apply(CDAContentType resource) {
- if (resource != null) {
- cache.types().put(resource.id(), resource);
- }
- return resource;
+ resource -> {
+ if (resource != null) {
+ cache.types().put(resource.id(), resource);
}
+ return resource;
}
);
}
diff --git a/src/main/java/com/contentful/java/cda/CDAContentType.java b/src/main/java/com/contentful/java/cda/CDAContentType.java
index e195c0f4..0391e436 100644
--- a/src/main/java/com/contentful/java/cda/CDAContentType.java
+++ b/src/main/java/com/contentful/java/cda/CDAContentType.java
@@ -6,6 +6,7 @@
* Represents a single content type.
*/
public class CDAContentType extends CDAResource {
+ private static final long serialVersionUID = 7901798878659781364L;
List fields;
String name;
diff --git a/src/main/java/com/contentful/java/cda/CDAContentTypeNotFoundException.java b/src/main/java/com/contentful/java/cda/CDAContentTypeNotFoundException.java
index 6801e055..9b33a3c7 100644
--- a/src/main/java/com/contentful/java/cda/CDAContentTypeNotFoundException.java
+++ b/src/main/java/com/contentful/java/cda/CDAContentTypeNotFoundException.java
@@ -10,6 +10,8 @@
*/
public class CDAContentTypeNotFoundException extends RuntimeException {
+ private static final long serialVersionUID = -5839900656195732862L;
+
/**
* Create a new exception.
*
diff --git a/src/main/java/com/contentful/java/cda/CDAEntry.java b/src/main/java/com/contentful/java/cda/CDAEntry.java
index d3b9e955..df860368 100644
--- a/src/main/java/com/contentful/java/cda/CDAEntry.java
+++ b/src/main/java/com/contentful/java/cda/CDAEntry.java
@@ -4,6 +4,7 @@
* The class represents a basic entry in the space.
*/
public class CDAEntry extends LocalizedResource {
+ private static final long serialVersionUID = 5902790363045498307L;
private CDAContentType contentType;
/**
diff --git a/src/main/java/com/contentful/java/cda/CDAField.java b/src/main/java/com/contentful/java/cda/CDAField.java
index 82c70dfc..018052d7 100644
--- a/src/main/java/com/contentful/java/cda/CDAField.java
+++ b/src/main/java/com/contentful/java/cda/CDAField.java
@@ -6,6 +6,7 @@
/** Represents a single content type field. */
public class CDAField implements Serializable {
+ private static final long serialVersionUID = -2852530837647669035L;
String name;
String id;
diff --git a/src/main/java/com/contentful/java/cda/CDAHttpException.java b/src/main/java/com/contentful/java/cda/CDAHttpException.java
index 2d980a05..a29718df 100644
--- a/src/main/java/com/contentful/java/cda/CDAHttpException.java
+++ b/src/main/java/com/contentful/java/cda/CDAHttpException.java
@@ -16,6 +16,7 @@
* This class will represent known Contentful exceptions
*/
public class CDAHttpException extends RuntimeException {
+ private static final long serialVersionUID = 637581021148308658L;
private final Request request;
private final Response response;
private final String responseBody;
diff --git a/src/main/java/com/contentful/java/cda/CDALocale.java b/src/main/java/com/contentful/java/cda/CDALocale.java
index 677bc9a9..bf1fea1c 100644
--- a/src/main/java/com/contentful/java/cda/CDALocale.java
+++ b/src/main/java/com/contentful/java/cda/CDALocale.java
@@ -6,6 +6,7 @@
* Represents a single locale.
*/
public class CDALocale extends CDAResource {
+ private static final long serialVersionUID = -5710267672379169621L;
String code;
String name;
diff --git a/src/main/java/com/contentful/java/cda/CDAResource.java b/src/main/java/com/contentful/java/cda/CDAResource.java
index 3b205080..d17a7afc 100644
--- a/src/main/java/com/contentful/java/cda/CDAResource.java
+++ b/src/main/java/com/contentful/java/cda/CDAResource.java
@@ -12,6 +12,7 @@
* for CDAContentType, CDASpace and, indirectly, for CDAEntry.
*/
public abstract class CDAResource implements Serializable {
+ private static final long serialVersionUID = -160701290783423915L;
@SerializedName("sys")
Map attrs;
diff --git a/src/main/java/com/contentful/java/cda/CDAResourceNotFoundException.java b/src/main/java/com/contentful/java/cda/CDAResourceNotFoundException.java
index 57afb1d8..275ad990 100644
--- a/src/main/java/com/contentful/java/cda/CDAResourceNotFoundException.java
+++ b/src/main/java/com/contentful/java/cda/CDAResourceNotFoundException.java
@@ -7,6 +7,8 @@
*/
public class CDAResourceNotFoundException extends RuntimeException {
+ private static final long serialVersionUID = -7419778969492055048L;
+
/**
* Create a new exception
*
diff --git a/src/main/java/com/contentful/java/cda/CDASpace.java b/src/main/java/com/contentful/java/cda/CDASpace.java
index 2844656d..9e9d8a3c 100644
--- a/src/main/java/com/contentful/java/cda/CDASpace.java
+++ b/src/main/java/com/contentful/java/cda/CDASpace.java
@@ -4,6 +4,7 @@
* Represents a single space.
*/
public class CDASpace extends CDAResource {
+ private static final long serialVersionUID = 8920494351623297673L;
String name;
/**
diff --git a/src/main/java/com/contentful/java/cda/Callbacks.java b/src/main/java/com/contentful/java/cda/Callbacks.java
index b89707a0..0fa5ff68 100644
--- a/src/main/java/com/contentful/java/cda/Callbacks.java
+++ b/src/main/java/com/contentful/java/cda/Callbacks.java
@@ -15,7 +15,7 @@ static CDACallback subscribeAs
ConnectableFlowable connectable = flowable.observeOn(Schedulers.io()).publish();
callback.setSubscription(connectable.subscribe(
- new SuccessAction(callback, client),
+ new SuccessAction<>(callback, client),
new FailureAction(callback, client)));
connectable.connect();
@@ -55,7 +55,7 @@ static class SuccessAction extends BaseAction {
@SuppressWarnings("unchecked")
@Override
protected void doCall(E e) {
- execute(new SuccessRunnable(e, (CDACallback) callback));
+ execute(new SuccessRunnable<>(e, (CDACallback) callback));
}
}
diff --git a/src/main/java/com/contentful/java/cda/DeletedResource.java b/src/main/java/com/contentful/java/cda/DeletedResource.java
index 4bd0b6fa..e0c60206 100644
--- a/src/main/java/com/contentful/java/cda/DeletedResource.java
+++ b/src/main/java/com/contentful/java/cda/DeletedResource.java
@@ -2,4 +2,5 @@
/** Represents a deleted resource (via the Sync API). */
public class DeletedResource extends CDAResource {
+ private static final long serialVersionUID = 5881271494348347577L;
}
diff --git a/src/main/java/com/contentful/java/cda/LocalizedResource.java b/src/main/java/com/contentful/java/cda/LocalizedResource.java
index d453bc51..2e989b2b 100644
--- a/src/main/java/com/contentful/java/cda/LocalizedResource.java
+++ b/src/main/java/com/contentful/java/cda/LocalizedResource.java
@@ -6,6 +6,8 @@
* Represents a resource which may contain field values for multiple locales.
*/
public abstract class LocalizedResource extends CDAResource {
+ private static final long serialVersionUID = 5713028146014748949L;
+
public class Localizer {
private final String locale;
@@ -85,6 +87,22 @@ public T getField(String locale, String key) {
return localize(locale).getField(key);
}
+ /**
+ * Internal method for updating contents of a field.
+ *
+ * This method is used by the SDK to generate objects based on raw fields.
+ *
+ * Do not use this field to update data on Contentful. Take a look at the CMA-SDK for that.
+ *
+ * @param locale locale to be updated.
+ * @param key the key of the field to be updated.
+ * @param value the value of the field to be used.
+ */
+ @SuppressWarnings("unchecked")
+ public void setField(String locale, String key, Object value) {
+ ((Map) fields.get(key)).put(locale, value);
+ }
+
/**
* @return raw unprocessed fields.
*/
diff --git a/src/main/java/com/contentful/java/cda/ObserveQuery.java b/src/main/java/com/contentful/java/cda/ObserveQuery.java
index 250ca13b..c1c245a7 100644
--- a/src/main/java/com/contentful/java/cda/ObserveQuery.java
+++ b/src/main/java/com/contentful/java/cda/ObserveQuery.java
@@ -1,8 +1,6 @@
package com.contentful.java.cda;
import io.reactivex.Flowable;
-import io.reactivex.functions.Function;
-import retrofit2.Response;
import static com.contentful.java.cda.CDAType.ASSET;
import static com.contentful.java.cda.CDAType.CONTENTTYPE;
@@ -30,39 +28,36 @@ public class ObserveQuery extends AbsQuery one(final String id) {
- Flowable flowable = where("sys.id", id).all().map(new Function() {
- @Override @SuppressWarnings("unchecked") public T apply(CDAArray array) {
- if (array.items().size() == 0) {
+ Flowable flowable = where("sys.id", id).all().map(array -> {
+ if (array.items().size() == 0) {
+ throw new CDAResourceNotFoundException(type, id);
+ }
+ CDAType resourceType = typeForClass(type);
+ if (ASSET.equals(resourceType)) {
+ return (T) array.assets().get(id);
+ } else if (ENTRY.equals(resourceType)) {
+ return (T) array.entries().get(id);
+ } else if (CONTENTTYPE.equals(resourceType)) {
+ return (T) array.items().get(0);
+ } else if (LOCALE.equals(resourceType)) {
+ T found = findById(array, id);
+ if (found == null) {
throw new CDAResourceNotFoundException(type, id);
}
- CDAType resourceType = typeForClass(type);
- if (ASSET.equals(resourceType)) {
- return (T) array.assets().get(id);
- } else if (ENTRY.equals(resourceType)) {
- return (T) array.entries().get(id);
- } else if (CONTENTTYPE.equals(resourceType)) {
- return (T) array.items().get(0);
- } else if (LOCALE.equals(resourceType)) {
- T found = findById(array, id);
- if (found == null) {
- throw new CDAResourceNotFoundException(type, id);
- }
- return found;
- } else {
- throw new IllegalArgumentException("Cannot invoke query for type: " + type.getName());
- }
+ return found;
+ } else {
+ throw new IllegalArgumentException("Cannot invoke query for type: " + type.getName());
}
});
if (CONTENTTYPE.equals(typeForClass(type))) {
- flowable = flowable.map(new Function() {
- @Override public T apply(T t) {
- if (t != null) {
- client.cache.types().put(t.id(), (CDAContentType) t);
- }
- return t;
+ flowable = flowable.map(t -> {
+ if (t != null) {
+ client.cache.types().put(t.id(), (CDAContentType) t);
}
+ return t;
});
}
return flowable;
@@ -86,14 +81,8 @@ T findById(CDAArray array, String id) {
*/
public Flowable all() {
return client.cacheAll(false)
- .flatMap(new Function>>() {
- @Override public Flowable> apply(Cache cache) {
- return client.service.array(client.spaceId, client.environmentId, path(), params);
- }
- }).map(new Function, CDAArray>() {
- @Override public CDAArray apply(Response response) {
- return ResourceFactory.array(response, client);
- }
- });
+ .flatMap(
+ cache -> client.service.array(client.spaceId, client.environmentId, path(), params)
+ ).map(response -> ResourceFactory.array(response, client));
}
}
diff --git a/src/main/java/com/contentful/java/cda/QueryOperation.java b/src/main/java/com/contentful/java/cda/QueryOperation.java
index 8c1b50d6..6350ead6 100644
--- a/src/main/java/com/contentful/java/cda/QueryOperation.java
+++ b/src/main/java/com/contentful/java/cda/QueryOperation.java
@@ -7,34 +7,33 @@
*/
public class QueryOperation {
- public static final QueryOperation IsEqualTo = new QueryOperation("");
- public static final QueryOperation IsNotEqualTo = new QueryOperation("[ne]");
- public static final QueryOperation HasOneOf = new QueryOperation("[in]");
- public static final QueryOperation HasNoneOf = new QueryOperation("[nin]");
- public static final QueryOperation HasAllOf = new QueryOperation("[all]");
+ public static final QueryOperation IsEqualTo = new QueryOperation<>("");
+ public static final QueryOperation IsNotEqualTo = new QueryOperation<>("[ne]");
+ public static final QueryOperation HasOneOf = new QueryOperation<>("[in]");
+ public static final QueryOperation HasNoneOf = new QueryOperation<>("[nin]");
+ public static final QueryOperation HasAllOf = new QueryOperation<>("[all]");
- public static final QueryOperation IsLessThan = new QueryOperation("[lt]");
+ public static final QueryOperation IsLessThan = new QueryOperation<>("[lt]");
public static final QueryOperation IsLessThanOrEqualTo
- = new QueryOperation("[lte]");
- public static final QueryOperation IsGreaterThan = new QueryOperation("[gt]");
+ = new QueryOperation<>("[lte]");
+ public static final QueryOperation IsGreaterThan = new QueryOperation<>("[gt]");
public static final QueryOperation IsGreaterThanOrEqualTo
- = new QueryOperation("[gte]");
+ = new QueryOperation<>("[gte]");
- public static final QueryOperation Exists = new QueryOperation("[exists]"
- , true);
+ public static final QueryOperation Exists = new QueryOperation<>("[exists]", true);
- public static final QueryOperation IsEarlierThan = new QueryOperation("[lt]");
- public static final QueryOperation IsEarlierOrAt = new QueryOperation("[lte]");
- public static final QueryOperation IsLaterThan = new QueryOperation("[gt]");
- public static final QueryOperation IsLaterOrAt = new QueryOperation("[gte]");
+ public static final QueryOperation IsEarlierThan = new QueryOperation<>("[lt]");
+ public static final QueryOperation IsEarlierOrAt = new QueryOperation<>("[lte]");
+ public static final QueryOperation IsLaterThan = new QueryOperation<>("[gt]");
+ public static final QueryOperation IsLaterOrAt = new QueryOperation<>("[gte]");
- public static final QueryOperation Matches = new QueryOperation("[match]");
+ public static final QueryOperation Matches = new QueryOperation<>("[match]");
- public static final QueryOperation IsCloseTo = new QueryOperation("[near]");
+ public static final QueryOperation IsCloseTo = new QueryOperation<>("[near]");
public static final QueryOperation IsWithinBoundingBoxOf
- = new QueryOperation("[within]");
+ = new QueryOperation<>("[within]");
public static final QueryOperation IsWithinCircleOf
- = new QueryOperation("[within]");
+ = new QueryOperation<>("[within]");
final String operator;
final T defaultValue;
diff --git a/src/main/java/com/contentful/java/cda/ResourceFactory.java b/src/main/java/com/contentful/java/cda/ResourceFactory.java
index 747404e2..6aced5af 100644
--- a/src/main/java/com/contentful/java/cda/ResourceFactory.java
+++ b/src/main/java/com/contentful/java/cda/ResourceFactory.java
@@ -13,6 +13,8 @@
import retrofit2.Response;
+import static com.contentful.java.cda.rich.RichTextFactory.resolveRichTextField;
+
final class ResourceFactory {
private ResourceFactory() {
throw new AssertionError();
@@ -22,19 +24,20 @@ private ResourceFactory() {
static CDAArray array(Response arrayResponse, CDAClient client) {
CDAArray array = arrayResponse.body();
- array.assets = new LinkedHashMap();
- array.entries = new LinkedHashMap();
+ array.assets = new LinkedHashMap<>();
+ array.entries = new LinkedHashMap<>();
Set resources = collectResources(array);
ResourceUtils.localizeResources(resources, client.cache);
ResourceUtils.mapResources(resources, array.assets, array.entries);
ResourceUtils.setRawFields(array);
+ resolveRichTextField(array, client);
ResourceUtils.resolveLinks(array, client);
return array;
}
private static Set collectResources(CDAArray array) {
- Set resources = new LinkedHashSet(array.items());
+ Set resources = new LinkedHashSet<>(array.items());
if (array.includes != null) {
if (array.includes.assets != null) {
resources.addAll(array.includes.assets);
@@ -50,8 +53,8 @@ static SynchronizedSpace sync(
Response newSpace,
SynchronizedSpace oldSpace,
CDAClient client) {
- Map assets = new HashMap();
- Map entries = new HashMap();
+ Map assets = new HashMap<>();
+ Map entries = new HashMap<>();
// Map resources from existing space
if (oldSpace != null) {
@@ -62,7 +65,7 @@ static SynchronizedSpace sync(
ResourceUtils.mapResources(result.items(), assets, entries);
ResourceUtils.mapDeletedResources(result);
- List items = new ArrayList();
+ List items = new ArrayList<>();
items.addAll(assets.values());
items.addAll(entries.values());
result.items = items;
@@ -70,6 +73,7 @@ static SynchronizedSpace sync(
result.entries = entries;
ResourceUtils.setRawFields(result);
+ resolveRichTextField(result, client);
ResourceUtils.resolveLinks(result, client);
return result;
@@ -81,7 +85,7 @@ static T fromResponse(Response response) {
@SuppressWarnings("unchecked")
static List fromArrayToItems(CDAArray array) {
- final List result = new ArrayList(array.items.size());
+ final List result = new ArrayList<>(array.items.size());
for (CDAResource resource : array.items) {
result.add((T) resource);
diff --git a/src/main/java/com/contentful/java/cda/ResourceUtils.java b/src/main/java/com/contentful/java/cda/ResourceUtils.java
index 3a88dc02..99781348 100644
--- a/src/main/java/com/contentful/java/cda/ResourceUtils.java
+++ b/src/main/java/com/contentful/java/cda/ResourceUtils.java
@@ -9,8 +9,6 @@
import java.util.Set;
import io.reactivex.Flowable;
-import io.reactivex.functions.Consumer;
-import io.reactivex.functions.Predicate;
import retrofit2.Response;
import static com.contentful.java.cda.CDAType.ASSET;
@@ -21,7 +19,7 @@
import static com.contentful.java.cda.Util.extractNested;
import static com.contentful.java.cda.Util.queryParam;
-final class ResourceUtils {
+public final class ResourceUtils {
private ResourceUtils() {
throw new AssertionError();
}
@@ -74,7 +72,7 @@ static void resolveLinks(ArrayResource array, CDAClient client) {
}
}
- static void ensureContentType(CDAEntry entry, CDAClient client) {
+ public static void ensureContentType(CDAEntry entry, CDAClient client) {
CDAContentType contentType = entry.contentType();
if (contentType != null) {
return;
@@ -103,9 +101,9 @@ static void resolveArrayOfLinks(CDAEntry entry, CDAField field, ArrayResource ar
if (links == null) {
continue;
}
- List resolved = new ArrayList();
- for (int i = 0; i < links.size(); i++) {
- String linkId = getLinkId(links.get(i));
+ List resolved = new ArrayList<>();
+ for (final Object link : links) {
+ String linkId = getLinkId(link);
if (linkId == null) {
continue;
}
@@ -125,7 +123,7 @@ static void resolveSingleLink(CDAEntry entry, CDAField field, ArrayResource arra
if (value == null) {
return;
}
- Set toRemove = new HashSet();
+ Set toRemove = new HashSet<>();
for (String locale : value.keySet()) {
String linkId = getLinkId(value.get(locale));
if (linkId == null) {
@@ -184,32 +182,28 @@ static void mapResources(Collection resources,
static void mapDeletedResources(SynchronizedSpace space) {
final Set assets;
if (space.deletedAssets == null) {
- assets = new HashSet();
+ assets = new HashSet<>();
} else {
- assets = new HashSet(space.deletedAssets);
+ assets = new HashSet<>(space.deletedAssets);
}
final Set entries;
if (space.deletedEntries == null) {
- entries = new HashSet();
+ entries = new HashSet<>();
} else {
- entries = new HashSet(space.deletedEntries);
+ entries = new HashSet<>(space.deletedEntries);
}
Flowable.fromIterable(space.items())
- .filter(new Predicate() {
- @Override public boolean test(CDAResource resource) {
- CDAType type = resource.type();
- return DELETEDASSET.equals(type) || DELETEDENTRY.equals(type);
- }
+ .filter(resource -> {
+ CDAType type = resource.type();
+ return DELETEDASSET.equals(type) || DELETEDENTRY.equals(type);
})
- .subscribe(new Consumer() {
- @Override public void accept(CDAResource resource) {
- if (DELETEDASSET.equals(resource.type())) {
- assets.add(resource.id());
- } else {
- entries.add(resource.id());
- }
+ .subscribe(resource -> {
+ if (DELETEDASSET.equals(resource.type())) {
+ assets.add(resource.id());
+ } else {
+ entries.add(resource.id());
}
});
space.deletedAssets = assets;
@@ -239,7 +233,7 @@ static void localize(LocalizedResource resource, Cache cache) {
}
private static Map getFallbackLocaleMap(Cache cache) {
- final Map fallbackLocales = new HashMap(cache.locales().size());
+ final Map fallbackLocales = new HashMap<>(cache.locales().size());
for (final CDALocale locale : cache.locales()) {
final String fallback = locale.fallbackLocaleCode();
@@ -252,7 +246,7 @@ private static Map getFallbackLocaleMap(Cache cache) {
}
static void normalizeFields(LocalizedResource resource) {
- Map fields = new HashMap();
+ Map fields = new HashMap<>();
for (String key : resource.fields.keySet()) {
Object value = resource.fields.get(key);
if (value == null) {
@@ -260,7 +254,7 @@ static void normalizeFields(LocalizedResource resource) {
} else if (resourceContainsLocaleMap(resource, value)) {
fields.put(key, value);
} else {
- Map map = new HashMap();
+ Map map = new HashMap<>();
map.put(resource.defaultLocale, value);
fields.put(key, map);
}
@@ -284,10 +278,9 @@ static void setRawFields(ArrayResource array) {
@SuppressWarnings("unchecked")
private static void setRawFields(LocalizedResource resource) {
- Map rawFields = new HashMap();
+ Map rawFields = new HashMap<>();
for (String key : resource.fields.keySet()) {
- Map map = new HashMap();
- map.putAll((Map) resource.fields.get(key));
+ Map map = new HashMap<>((Map) resource.fields.get(key));
rawFields.put(key, map);
}
resource.rawFields = rawFields;
diff --git a/src/main/java/com/contentful/java/cda/SyncQuery.java b/src/main/java/com/contentful/java/cda/SyncQuery.java
index e81c71e2..91af8bba 100644
--- a/src/main/java/com/contentful/java/cda/SyncQuery.java
+++ b/src/main/java/com/contentful/java/cda/SyncQuery.java
@@ -1,8 +1,6 @@
package com.contentful.java.cda;
import io.reactivex.Flowable;
-import io.reactivex.functions.Function;
-import retrofit2.Response;
import static com.contentful.java.cda.Util.checkNotNull;
@@ -46,20 +44,15 @@ public Flowable observe() {
token = syncToken;
}
return client.cacheAll(true)
- .flatMap(new Function>>() {
- @Override public Flowable> apply(Cache cache) {
- return client.service.sync(
- client.spaceId,
- client.environmentId,
- initial ? initial : null, token,
- initial && type != null ? type.getName() : null,
- initial && type != null ? type.getContentType() : null);
- }
- }).map(new Function, SynchronizedSpace>() {
- @Override public SynchronizedSpace apply(Response synchronizedSpace) {
- return ResourceFactory.sync(synchronizedSpace, space, client);
- }
- });
+ .flatMap(cache -> client.service.sync(
+ client.spaceId,
+ client.environmentId,
+ initial ? initial : null,
+ token,
+ initial && type != null ? type.getName() : null,
+ initial && type != null ? type.getContentType() : null)).map(
+ synchronizedSpace -> ResourceFactory.sync(synchronizedSpace, space, client)
+ );
}
/**
diff --git a/src/main/java/com/contentful/java/cda/SyncType.java b/src/main/java/com/contentful/java/cda/SyncType.java
index 09553aeb..06f96154 100644
--- a/src/main/java/com/contentful/java/cda/SyncType.java
+++ b/src/main/java/com/contentful/java/cda/SyncType.java
@@ -39,8 +39,8 @@ public enum Type {
DeletedEntry
}
- Type type;
- String contentType;
+ final Type type;
+ final String contentType;
SyncType(Type type, String contentType) {
this.type = type;
diff --git a/src/main/java/com/contentful/java/cda/SynchronizedSpace.java b/src/main/java/com/contentful/java/cda/SynchronizedSpace.java
index 25d39af6..ee03031c 100644
--- a/src/main/java/com/contentful/java/cda/SynchronizedSpace.java
+++ b/src/main/java/com/contentful/java/cda/SynchronizedSpace.java
@@ -6,6 +6,7 @@
* Represents results for synchronization via the Sync API.
*/
public class SynchronizedSpace extends ArrayResource {
+ private static final long serialVersionUID = 8618757744312417604L;
String nextPageUrl;
String nextSyncUrl;
diff --git a/src/main/java/com/contentful/java/cda/TlsSocketFactory.java b/src/main/java/com/contentful/java/cda/TlsSocketFactory.java
index fbbeb346..bd6809d6 100644
--- a/src/main/java/com/contentful/java/cda/TlsSocketFactory.java
+++ b/src/main/java/com/contentful/java/cda/TlsSocketFactory.java
@@ -66,7 +66,7 @@ public Socket createSocket(InetAddress address, int port, InetAddress localAddre
}
private Socket enableTlsOnSocket(Socket socket) {
- if (socket != null && (socket instanceof SSLSocket)) {
+ if (socket instanceof SSLSocket) {
((SSLSocket) socket).setEnabledProtocols(PROTOCOLS_TLS_1_2_ONLY);
}
return socket;
diff --git a/src/main/java/com/contentful/java/cda/interceptor/ContentfulUserAgentHeaderInterceptor.java b/src/main/java/com/contentful/java/cda/interceptor/ContentfulUserAgentHeaderInterceptor.java
index 97134299..7a13282d 100644
--- a/src/main/java/com/contentful/java/cda/interceptor/ContentfulUserAgentHeaderInterceptor.java
+++ b/src/main/java/com/contentful/java/cda/interceptor/ContentfulUserAgentHeaderInterceptor.java
@@ -362,7 +362,7 @@ private static Section[] checkSections(Section[] sections) {
private static String sectionsToString(Section[] sections) {
// take last section of same identifier
- final LinkedHashMap mappedSections = new LinkedHashMap();
+ final LinkedHashMap mappedSections = new LinkedHashMap<>();
for (final Section section : sections) {
if (section != null) {
final String identifier = section.getIdentifier();
diff --git a/src/main/java/com/contentful/java/cda/rich/CDARichBlock.java b/src/main/java/com/contentful/java/cda/rich/CDARichBlock.java
new file mode 100644
index 00000000..a449caae
--- /dev/null
+++ b/src/main/java/com/contentful/java/cda/rich/CDARichBlock.java
@@ -0,0 +1,18 @@
+package com.contentful.java.cda.rich;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * A collection of several nodes.
+ */
+public class CDARichBlock extends CDARichNode {
+ final List content = new LinkedList<>();
+
+ /**
+ * @return a changeable list of contents of this block
+ */
+ public List getContent() {
+ return content;
+ }
+}
diff --git a/src/main/java/com/contentful/java/cda/rich/CDARichDocument.java b/src/main/java/com/contentful/java/cda/rich/CDARichDocument.java
new file mode 100644
index 00000000..d87fbf28
--- /dev/null
+++ b/src/main/java/com/contentful/java/cda/rich/CDARichDocument.java
@@ -0,0 +1,7 @@
+package com.contentful.java.cda.rich;
+
+/**
+ * The base of a rich text field, containing all the other nodes.
+ */
+public class CDARichDocument extends CDARichBlock {
+}
diff --git a/src/main/java/com/contentful/java/cda/rich/CDARichEmbeddedLink.java b/src/main/java/com/contentful/java/cda/rich/CDARichEmbeddedLink.java
new file mode 100644
index 00000000..d29b7e83
--- /dev/null
+++ b/src/main/java/com/contentful/java/cda/rich/CDARichEmbeddedLink.java
@@ -0,0 +1,17 @@
+package com.contentful.java.cda.rich;
+
+/**
+ * This node is an inline link to a CDAEntry
+ *
+ * @see com.contentful.java.cda.CDAEntry
+ */
+public class CDARichEmbeddedLink extends CDARichHyperLink {
+ /**
+ * Create a link pointing to a CDAEntry.
+ *
+ * @param target an entry to be pointed to.
+ */
+ public CDARichEmbeddedLink(Object target) {
+ super(target);
+ }
+}
diff --git a/src/main/java/com/contentful/java/cda/rich/CDARichHeading.java b/src/main/java/com/contentful/java/cda/rich/CDARichHeading.java
new file mode 100644
index 00000000..ba99e9c1
--- /dev/null
+++ b/src/main/java/com/contentful/java/cda/rich/CDARichHeading.java
@@ -0,0 +1,26 @@
+package com.contentful.java.cda.rich;
+
+/**
+ * Defines a headline of the text.
+ *
+ * Can have an arbitrary level assigned, but useful probably between 1 and 6.
+ */
+public class CDARichHeading extends CDARichBlock {
+ private final int level;
+
+ /**
+ * Create a heading block, describing a level elements deep nested heading.
+ *
+ * @param level a number indicating the level of this heading.
+ */
+ public CDARichHeading(int level) {
+ this.level = level;
+ }
+
+ /**
+ * @return the current nesting level of this heading.
+ */
+ public int getLevel() {
+ return level;
+ }
+}
diff --git a/src/main/java/com/contentful/java/cda/rich/CDARichHorizontalRule.java b/src/main/java/com/contentful/java/cda/rich/CDARichHorizontalRule.java
new file mode 100644
index 00000000..c788cf60
--- /dev/null
+++ b/src/main/java/com/contentful/java/cda/rich/CDARichHorizontalRule.java
@@ -0,0 +1,12 @@
+package com.contentful.java.cda.rich;
+
+/**
+ * A node representing a division, called a horizontal rule.
+ */
+public class CDARichHorizontalRule extends CDARichNode {
+ /**
+ * Construct this node.
+ */
+ public CDARichHorizontalRule() {
+ }
+}
diff --git a/src/main/java/com/contentful/java/cda/rich/CDARichHyperLink.java b/src/main/java/com/contentful/java/cda/rich/CDARichHyperLink.java
new file mode 100644
index 00000000..5b012da4
--- /dev/null
+++ b/src/main/java/com/contentful/java/cda/rich/CDARichHyperLink.java
@@ -0,0 +1,24 @@
+package com.contentful.java.cda.rich;
+
+/**
+ * This block represents a link to a website.
+ */
+public class CDARichHyperLink extends CDARichBlock {
+ Object data;
+
+ /**
+ * Create a new hyper link.
+ *
+ * @param target point to the target.
+ */
+ public CDARichHyperLink(Object target) {
+ this.data = target;
+ }
+
+ /**
+ * @return the target this link points to.
+ */
+ public Object getData() {
+ return data;
+ }
+}
diff --git a/src/main/java/com/contentful/java/cda/rich/CDARichList.java b/src/main/java/com/contentful/java/cda/rich/CDARichList.java
new file mode 100644
index 00000000..022524bd
--- /dev/null
+++ b/src/main/java/com/contentful/java/cda/rich/CDARichList.java
@@ -0,0 +1,28 @@
+package com.contentful.java.cda.rich;
+
+/**
+ * Parent class for all list classes
+ */
+public class CDARichList extends CDARichBlock {
+ final CharSequence decoration;
+
+ /**
+ * Create a list of the given symbols per nesting level
+ *
+ * @param decoration a symbol to be added for differentiation. Can be [1,A,a,I,i] for
+ * prefixing each node with an arabic number (1., 2., …), a capitalized letter
+ * (A., B., …), a lowercase letter (a., b., …) or roman numerals in capital
+ * (I, II, …) or non capitalized form (i, ii, …). Alternatively unordered
+ * symbols can be used: `*` for bullets, `-` for dashes and `⭐` for stars etc.
+ */
+ public CDARichList(CharSequence decoration) {
+ this.decoration = decoration;
+ }
+
+ /**
+ * @return decoration for this list.
+ */
+ public CharSequence getDecoration() {
+ return decoration;
+ }
+}
diff --git a/src/main/java/com/contentful/java/cda/rich/CDARichListItem.java b/src/main/java/com/contentful/java/cda/rich/CDARichListItem.java
new file mode 100644
index 00000000..4818321b
--- /dev/null
+++ b/src/main/java/com/contentful/java/cda/rich/CDARichListItem.java
@@ -0,0 +1,7 @@
+package com.contentful.java.cda.rich;
+
+/**
+ * A block representing an item inside a list.
+ */
+public class CDARichListItem extends CDARichBlock {
+}
diff --git a/src/main/java/com/contentful/java/cda/rich/CDARichMark.java b/src/main/java/com/contentful/java/cda/rich/CDARichMark.java
new file mode 100644
index 00000000..9ffc26f1
--- /dev/null
+++ b/src/main/java/com/contentful/java/cda/rich/CDARichMark.java
@@ -0,0 +1,55 @@
+package com.contentful.java.cda.rich;
+
+/**
+ * How to draw a given text.
+ *
+ * Subclasses are used for further differentiation.
+ */
+public class CDARichMark {
+ /**
+ * A bold mark of a rich text.
+ */
+ public static class CDARichMarkBold extends CDARichMark {
+ }
+
+ /**
+ * Declares the text as being displayed in italics.
+ */
+ public static class CDARichMarkItalic extends CDARichMark {
+ }
+
+ /**
+ * Marker for making the rich text displayed as underline.
+ */
+ public static class CDARichMarkUnderline extends CDARichMark {
+ }
+
+ /**
+ * The text marked by this marker should be represented by Code.
+ */
+ public static class CDARichMarkCode extends CDARichMark {
+ }
+
+ /**
+ * Any custom marker for a given rich text.
+ */
+ public static class CDARichMarkCustom extends CDARichMark {
+ private final String type;
+
+ /**
+ * Create a custom marker using the given type.
+ *
+ * @param type which type should this marker have?
+ */
+ public CDARichMarkCustom(String type) {
+ this.type = type;
+ }
+
+ /**
+ * @return the custom type of the marker.
+ */
+ public String getType() {
+ return type;
+ }
+ }
+}
diff --git a/src/main/java/com/contentful/java/cda/rich/CDARichNode.java b/src/main/java/com/contentful/java/cda/rich/CDARichNode.java
new file mode 100644
index 00000000..22a30c76
--- /dev/null
+++ b/src/main/java/com/contentful/java/cda/rich/CDARichNode.java
@@ -0,0 +1,7 @@
+package com.contentful.java.cda.rich;
+
+/**
+ * A leaf node of the rich text hierarchy.
+ */
+public class CDARichNode {
+}
diff --git a/src/main/java/com/contentful/java/cda/rich/CDARichOrderedList.java b/src/main/java/com/contentful/java/cda/rich/CDARichOrderedList.java
new file mode 100644
index 00000000..931b44b3
--- /dev/null
+++ b/src/main/java/com/contentful/java/cda/rich/CDARichOrderedList.java
@@ -0,0 +1,13 @@
+package com.contentful.java.cda.rich;
+
+/**
+ * A list of elements, ordered by number.
+ */
+public class CDARichOrderedList extends CDARichList {
+ /**
+ * Create a list with numbers.
+ */
+ public CDARichOrderedList() {
+ super("1");
+ }
+}
diff --git a/src/main/java/com/contentful/java/cda/rich/CDARichParagraph.java b/src/main/java/com/contentful/java/cda/rich/CDARichParagraph.java
new file mode 100644
index 00000000..f56b1238
--- /dev/null
+++ b/src/main/java/com/contentful/java/cda/rich/CDARichParagraph.java
@@ -0,0 +1,7 @@
+package com.contentful.java.cda.rich;
+
+/**
+ * A paragraph of nodes, usually rendered together.
+ */
+public class CDARichParagraph extends CDARichBlock {
+}
diff --git a/src/main/java/com/contentful/java/cda/rich/CDARichQuote.java b/src/main/java/com/contentful/java/cda/rich/CDARichQuote.java
new file mode 100644
index 00000000..3a9bec84
--- /dev/null
+++ b/src/main/java/com/contentful/java/cda/rich/CDARichQuote.java
@@ -0,0 +1,7 @@
+package com.contentful.java.cda.rich;
+
+/**
+ * A block of nodes rendered as a direct quote.
+ */
+public class CDARichQuote extends CDARichBlock {
+}
diff --git a/src/main/java/com/contentful/java/cda/rich/CDARichText.java b/src/main/java/com/contentful/java/cda/rich/CDARichText.java
new file mode 100644
index 00000000..b98a81a2
--- /dev/null
+++ b/src/main/java/com/contentful/java/cda/rich/CDARichText.java
@@ -0,0 +1,43 @@
+package com.contentful.java.cda.rich;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A leaf element of the rich text node graph: Render a given text with the given markings.
+ */
+public class CDARichText extends CDARichNode {
+ private final List marks = new ArrayList<>();
+ private final CharSequence text;
+
+ /**
+ * Create a text with the given marks
+ *
+ * @param text the text to be displayed
+ * @param marks the marks to be used if any
+ */
+ public CDARichText(CharSequence text, List marks) {
+ if (text == null) {
+ text = "";
+ }
+
+ this.marks.addAll(marks);
+ this.text = text;
+ }
+
+ /**
+ * @return the text of this node.
+ */
+ public CharSequence getText() {
+ return text;
+ }
+
+ /**
+ * @return the marks of this text.
+ *
+ * @see CDARichMark.CDARichMarkBold
+ */
+ public List getMarks() {
+ return marks;
+ }
+}
diff --git a/src/main/java/com/contentful/java/cda/rich/CDARichUnorderedList.java b/src/main/java/com/contentful/java/cda/rich/CDARichUnorderedList.java
new file mode 100644
index 00000000..8838e4c2
--- /dev/null
+++ b/src/main/java/com/contentful/java/cda/rich/CDARichUnorderedList.java
@@ -0,0 +1,13 @@
+package com.contentful.java.cda.rich;
+
+/**
+ * Representation of a block of unordered items.
+ */
+public class CDARichUnorderedList extends CDARichList {
+ /**
+ * Create a list with bullet points.
+ */
+ public CDARichUnorderedList() {
+ super("*");
+ }
+}
diff --git a/src/main/java/com/contentful/java/cda/rich/RichTextFactory.java b/src/main/java/com/contentful/java/cda/rich/RichTextFactory.java
new file mode 100644
index 00000000..dbec1932
--- /dev/null
+++ b/src/main/java/com/contentful/java/cda/rich/RichTextFactory.java
@@ -0,0 +1,344 @@
+package com.contentful.java.cda.rich;
+
+import com.contentful.java.cda.ArrayResource;
+import com.contentful.java.cda.CDAClient;
+import com.contentful.java.cda.CDAEntry;
+import com.contentful.java.cda.CDAField;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+
+import static com.contentful.java.cda.ResourceUtils.ensureContentType;
+
+/**
+ * This factory will be used in order to create the {@link CDARichNode}-graph representation of
+ * the Contentful data returned by a rich text - field.
+ */
+@SuppressWarnings("unchecked")
+public class RichTextFactory {
+ private static final int HEADING_LEVEL_1 = 1;
+ private static final int HEADING_LEVEL_2 = 2;
+ private static final int HEADING_LEVEL_3 = 3;
+ private static final int HEADING_LEVEL_4 = 4;
+ private static final int HEADING_LEVEL_5 = 5;
+ private static final int HEADING_LEVEL_6 = 6;
+
+ /**
+ * Interface for resolving the type of a node by its raw representation.
+ */
+ private interface Resolver {
+ CDARichNode resolve(Map raw);
+ }
+
+ /**
+ * Resolves a block of rich text
+ *
+ * @param a block to be resolved.
+ */
+ private static class BlockResolver implements Resolver {
+ final Supplier supplier;
+
+ /**
+ * Create a block resolver based on its given supplier.
+ *
+ * @param supplier an object to create more objects of type T.
+ */
+ BlockResolver(Supplier supplier) {
+ this.supplier = supplier;
+ }
+
+ /**
+ * This method is called in order to try to create rich text block node from a raw map
+ * representation.
+ *
+ * @param raw representation of the block node coming from Contentful.
+ * @return the rich node if resolving was successful.
+ */
+ @Override public CDARichNode resolve(Map raw) {
+ final T resolved = getCDAType(raw);
+
+ final List> contents = (List>) raw.get("content");
+ for (final Map rawNode : contents) {
+ final CDARichNode resolvedNode = resolveRichNode(rawNode);
+ if (resolvedNode != null) {
+ resolved.content.add(resolvedNode);
+ }
+ }
+ return resolved;
+ }
+
+ /**
+ * Convenience method to try and find out the type of the given raw map representation.
+ *
+ * @param raw a map coming from Contentful, parsed from the json response.
+ * @return a new node based on the type of T.
+ */
+ T getCDAType(Map raw) {
+ return supplier.get();
+ }
+ }
+
+ /**
+ * Resolve only headings from Contentful.
+ */
+ private static class HeadingResolver extends BlockResolver {
+ final int level;
+
+ /**
+ * Create resolver using the given heading.
+ *
+ * @param level the level of the headings nesting. Should be positive and less then 7.
+ */
+ HeadingResolver(int level) {
+ super(() -> new CDARichHeading(level));
+ this.level = level;
+ }
+ }
+
+ /**
+ * Simple interface for providing an instance based on a type.
+ *
+ * @param the type an instance should be created for.
+ */
+ private interface SupplierWithData {
+ /**
+ * Create an object of type T.
+ *
+ * @param data the initialization data needed.
+ * @return An instance of type T.
+ */
+ T get(Object data);
+ }
+
+ /**
+ * Resolves a block containing more data.
+ *
+ * @param Which type should the block be?
+ */
+ private static class BlockAndDataResolver
+ extends BlockResolver {
+ final SupplierWithData supplier;
+ final String dataFieldKey;
+
+ /**
+ * Create the resolver.
+ *
+ * @param supplier how to generate an object of type T?
+ * @param dataFieldKey what other keys to be filtered?
+ */
+ BlockAndDataResolver(SupplierWithData supplier, String dataFieldKey) {
+ super(null);
+ this.supplier = supplier;
+ this.dataFieldKey = dataFieldKey;
+ }
+
+ /**
+ * Create an object of T
+ *
+ * @param raw a map coming from Contentful, parsed from the json response.
+ * @return an object of Type T.
+ */
+ @Override
+ T getCDAType(Map raw) {
+ return supplier.get(raw.get(dataFieldKey));
+ }
+ }
+
+ private static final Map RESOLVER_MAP = new HashMap<>();
+
+ static {
+ // add leafs
+ RESOLVER_MAP.put("text", raw -> new CDARichText(
+ (CharSequence) raw.get("value"),
+ resolveMarks((List>) raw.get("marks"))
+ ));
+ RESOLVER_MAP.put("hr", raw -> new CDARichHorizontalRule());
+
+ // add blocks
+ RESOLVER_MAP.put("blockquote", new BlockResolver<>(CDARichQuote::new));
+ RESOLVER_MAP.put("paragraph", new BlockResolver<>(CDARichParagraph::new));
+ RESOLVER_MAP.put("document", new BlockResolver<>(CDARichDocument::new));
+ RESOLVER_MAP.put("list-item", new BlockResolver<>(CDARichListItem::new));
+ RESOLVER_MAP.put("ordered-list", new BlockResolver<>(CDARichOrderedList::new));
+ RESOLVER_MAP.put("unordered-list", new BlockResolver<>(CDARichUnorderedList::new));
+ RESOLVER_MAP.put("hyperlink", new BlockAndDataResolver<>(CDARichHyperLink::new, "data"));
+ RESOLVER_MAP.put("embedded-entry-block",
+ new BlockAndDataResolver<>(CDARichEmbeddedLink::new, "data"));
+ RESOLVER_MAP.put("heading-1", new HeadingResolver(HEADING_LEVEL_1));
+ RESOLVER_MAP.put("heading-2", new HeadingResolver(HEADING_LEVEL_2));
+ RESOLVER_MAP.put("heading-3", new HeadingResolver(HEADING_LEVEL_3));
+ RESOLVER_MAP.put("heading-4", new HeadingResolver(HEADING_LEVEL_4));
+ RESOLVER_MAP.put("heading-5", new HeadingResolver(HEADING_LEVEL_5));
+ RESOLVER_MAP.put("heading-6", new HeadingResolver(HEADING_LEVEL_6));
+ }
+
+ /**
+ * Walk through the given array and resolve all rich text fields.
+ *
+ * @param array the array to be walked.
+ * @param client the client to be used if updating of types is needed.
+ */
+ public static void resolveRichTextField(ArrayResource array, CDAClient client) {
+ for (CDAEntry entry : array.entries().values()) {
+ ensureContentType(entry, client);
+ for (CDAField field : entry.contentType().fields()) {
+ if ("RichText".equals(field.type())) {
+ resolveRichDocument(entry, field);
+ resolveRichLink(array, entry, field);
+ }
+ }
+ }
+ }
+
+ /**
+ * Resolve all children of the top most document block.
+ *
+ * @param entry the entry to contain the field to be walked
+ * @param field the id of the field to be walked.
+ */
+ @SuppressWarnings("unchecked")
+ private static void resolveRichDocument(CDAEntry entry, CDAField field) {
+ final Map rawValue = (Map) entry.rawFields().get(field.id());
+ if (rawValue == null) {
+ return;
+ }
+
+ for (final String locale : rawValue.keySet()) {
+ final Map raw = (Map) rawValue.get(locale);
+ if (raw == null) {
+ continue;
+ }
+
+ entry.setField(locale, field.id(), RESOLVER_MAP.get("document").resolve(raw));
+ }
+ }
+
+ /**
+ * Specific method for resolving rich text marks.
+ *
+ * @param rawMarks the json responded map from Contentful
+ * @return objectified and parsed objects.
+ */
+ static List resolveMarks(List> rawMarks) {
+ final List marks = new ArrayList<>(rawMarks.size());
+ for (final Map rawMark : rawMarks) {
+ final String type = (String) rawMark.get("type");
+ if ("bold".equals(type)) {
+ marks.add(new CDARichMark.CDARichMarkBold());
+ } else if ("italic".equals(type)) {
+ marks.add(new CDARichMark.CDARichMarkItalic());
+ } else if ("underline".equals(type)) {
+ marks.add(new CDARichMark.CDARichMarkUnderline());
+ } else if ("code".equals(type)) {
+ marks.add(new CDARichMark.CDARichMarkCode());
+ } else {
+ marks.add(new CDARichMark.CDARichMarkCustom(type));
+ }
+ }
+ return marks;
+ }
+
+ /**
+ * Resolve one node.
+ *
+ * @param rawNode the map response from Contentful
+ * @return a CDARichNode from this SDK.
+ */
+ static CDARichNode resolveRichNode(Map rawNode) {
+ final String type = (String) rawNode.get("nodeType");
+ if (RESOLVER_MAP.containsKey(type)) {
+ return RESOLVER_MAP.get(type).resolve(rawNode);
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * Resolve all links if possible. If linked to entry is not found, null it's field.
+ *
+ * @param array the array containing the complete response
+ * @param entry the entry to be completed.
+ * @param field the field pointing to a link.
+ */
+ private static void resolveRichLink(ArrayResource array, CDAEntry entry, CDAField field) {
+ final Map rawValue = (Map) entry.rawFields().get(field.id());
+ if (rawValue == null) {
+ return;
+ }
+
+ for (final String locale : rawValue.keySet()) {
+ final CDARichDocument document = entry.getField(locale, field.id());
+ for (final CDARichNode node : document.getContent()) {
+ resolveOneLink(array, field, locale, node);
+ }
+ }
+ }
+
+ /**
+ * Link found, resolve it.
+ *
+ * @param array the complete response from Contentful.
+ * @param field the field containing a link.
+ * @param locale the locale of the link to be updated.
+ * @param node the node build from the response.
+ */
+ private static void resolveOneLink(ArrayResource array, CDAField field, String locale,
+ CDARichNode node) {
+ if (node instanceof CDARichHyperLink) {
+ final CDARichHyperLink link = (CDARichHyperLink) node;
+ final Map data = (Map) link.data;
+ final Object target = data.get("target");
+
+ if (target instanceof Map) {
+ if (isLink(target)) {
+ final Map map = (Map) target;
+ final Map sys = (Map) map.get("sys");
+ final String linkType = (String) sys.get("linkType");
+ final String id = (String) sys.get("id");
+
+ if ("Asset".equals(linkType)) {
+ link.data = array.assets().get(id);
+ } else if ("Entry".equals(linkType)) {
+ link.data = array.entries().get(id);
+ }
+
+ } else {
+ throw new IllegalStateException("Could not parse content of data field '"
+ + field.id() + "' for locale '" + locale + "' at node '" + node
+ + "'. Please check your content type model.");
+ }
+ } else if (target == null && data.containsKey("uri")) {
+ link.data = data.get("uri");
+ }
+ } else if (node instanceof CDARichParagraph) {
+ for (final CDARichNode child : ((CDARichParagraph) node).getContent()) {
+ resolveOneLink(array, field, locale, child);
+ }
+ }
+ }
+
+ /**
+ * Is the give object a link of any kind?
+ */
+ private static boolean isLink(Object data) {
+ try {
+ final Map map = (Map) data;
+ final Map sys = (Map) map.get("sys");
+ final String type = (String) sys.get("type");
+ final String linkType = (String) sys.get("linkType");
+ final String id = (String) sys.get("id");
+
+ if ("Link".equals(type)
+ && ("Entry".equals(linkType) || "Asset".equals(linkType)
+ && id != null)) {
+ return true;
+ }
+ } catch (ClassCastException cast) {
+ return false;
+ }
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/src/test/bash/create_folders.sh b/src/test/bash/create_folders.sh
new file mode 100755
index 00000000..ca85f6b7
--- /dev/null
+++ b/src/test/bash/create_folders.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+mkdir --parents ../resources/rich_text
diff --git a/src/test/bash/create_recordings.sh b/src/test/bash/create_recordings.sh
new file mode 100755
index 00000000..69545a65
--- /dev/null
+++ b/src/test/bash/create_recordings.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+echo $0
+
+
+for i in *.sh; do
+ if [ "$(basename $0)" != "$i" ]; then
+ echo "Executing $i"
+ ./${i}
+ fi
+done
diff --git a/src/test/bash/rich_text-all.sh b/src/test/bash/rich_text-all.sh
new file mode 100755
index 00000000..6dc257b4
--- /dev/null
+++ b/src/test/bash/rich_text-all.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+folder="../resources/$(basename $(echo $0) | cut -d'-' -f1)"
+file="$(basename $0 | cut -d'-' -f2)"
+
+mkdir --parent ${folder}
+
+for id in $(curl \
+ --silent \
+ -H "Authorization: Bearer ${RICH_TEXT_DELIVERY_TOKEN}" \
+ "https://cdn.contentful.com/spaces/${RICH_TEXT_SPACE_ID}/entries?content_type=rich&select=sys.id" \
+ | grep id | cut -d'"' -f4); do
+ name="$(curl \
+ --silent \
+ -H "Authorization: Bearer ${RICH_TEXT_DELIVERY_TOKEN}" \
+ "https://cdn.contentful.com/spaces/${RICH_TEXT_SPACE_ID}/entries?content_type=rich&sys.id=${id}&select=fields.name" \
+ | grep name | cut -d'"' -f4)"
+ output="$(echo ${folder}/${name}.json)"
+ echo ${name}
+
+ curl --silent \
+ -H "Authorization: Bearer ${RICH_TEXT_DELIVERY_TOKEN}" \
+ "https://cdn.contentful.com/spaces/${RICH_TEXT_SPACE_ID}/entries?sys.id=${id}" \
+ | sed 's/'${RICH_TEXT_SPACE_ID}'//g' \
+ | sed 's/'${RICH_TEXT_DELIVERY_TOKEN}'//g' \
+ | tee ${output}
+done
diff --git a/src/test/bash/rich_text-content_types.sh b/src/test/bash/rich_text-content_types.sh
new file mode 100755
index 00000000..a786b05c
--- /dev/null
+++ b/src/test/bash/rich_text-content_types.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+folder="../resources/$(basename $(echo $0) | cut -d'-' -f1)"
+file="$(basename $0 | cut -d'-' -f2)"
+output="$(echo ${folder}/${file} | sed 's#sh#json#g')"
+
+mkdir --parent ${folder}
+touch ${output}
+
+curl --verbose \
+ -H 'Authorization: Bearer '${RICH_TEXT_DELIVERY_TOKEN} \
+ 'https://cdn.contentful.com/spaces/'${RICH_TEXT_SPACE_ID}'/content_types' \
+ | sed 's/'${RICH_TEXT_SPACE_ID}'//g' \
+ | sed 's/'${RICH_TEXT_DELIVERY_TOKEN}'//g' \
+ | tee ${output}
diff --git a/src/test/bash/rich_text-locales.sh b/src/test/bash/rich_text-locales.sh
new file mode 100755
index 00000000..2a92f7d5
--- /dev/null
+++ b/src/test/bash/rich_text-locales.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+folder="../resources/$(basename $(echo $0) | cut -d'-' -f1)"
+file="$(basename $0 | cut -d'-' -f2)"
+output="$(echo ${folder}/${file} | sed 's#sh#json#g')"
+
+mkdir --parent ${folder}
+touch ${output}
+
+curl --verbose \
+ -H 'Authorization: Bearer '${RICH_TEXT_DELIVERY_TOKEN} \
+ 'https://cdn.contentful.com/spaces/'${RICH_TEXT_SPACE_ID}'/locales' \
+ | sed 's/'${RICH_TEXT_SPACE_ID}'//g' \
+ | sed 's/'${RICH_TEXT_DELIVERY_TOKEN}'//g' \
+ | tee ${output}
diff --git a/src/test/java/com/contentful/java/cda/AbsQueryTest.java b/src/test/java/com/contentful/java/cda/AbsQueryTest.java
index 91114ed0..8468c6a0 100644
--- a/src/test/java/com/contentful/java/cda/AbsQueryTest.java
+++ b/src/test/java/com/contentful/java/cda/AbsQueryTest.java
@@ -43,24 +43,24 @@ public class AbsQueryTest {
@Before
public void setup() {
- query = new FetchQuery(CDAResource.class, client);
+ query = new FetchQuery<>(CDAResource.class, client);
}
@Test
- public void contentType() throws Exception {
+ public void contentType() {
query.withContentType("foo");
assertThat(query.params).containsEntry("content_type", "foo");
}
@Test(expected = IllegalStateException.class)
- public void settingContentTypeTwiceThrows() throws Exception {
+ public void settingContentTypeTwiceThrows() {
query.withContentType("foo");
query.withContentType("bar");
}
@Test
- public void select() throws Exception {
+ public void select() {
query.withContentType("foo");
query.select("fields.bar");
@@ -68,19 +68,19 @@ public void select() throws Exception {
}
@Test(expected = IllegalStateException.class)
- public void selectWithoutContentTypeThrows() throws Exception {
+ public void selectWithoutContentTypeThrows() {
query.select("fields.bar");
}
@Test
- public void selectWithSys() throws Exception {
+ public void selectWithSys() {
query.select("sys");
assertThat(query.params).containsEntry("select", "sys");
}
@Test
- public void selectWithSysAndFields() throws Exception {
+ public void selectWithSysAndFields() {
query.withContentType("foo");
query.select("sys");
query.select("fields.bar");
@@ -89,18 +89,18 @@ public void selectWithSysAndFields() throws Exception {
}
@Test(expected = IllegalArgumentException.class)
- public void emptySelectThrows() throws Exception {
+ public void emptySelectThrows() {
query.withContentType("foo");
query.select();
}
@Test(expected = IllegalArgumentException.class)
- public void selectWithEmptyNameThrows() throws Exception {
+ public void selectWithEmptyNameThrows() {
query.select("");
}
@Test
- public void selectDifferentFieldNames() throws Exception {
+ public void selectDifferentFieldNames() {
query.withContentType("foo");
query.select("fields.bar");
query.select("fields.bar2");
@@ -109,13 +109,13 @@ public void selectDifferentFieldNames() throws Exception {
}
@Test(expected = IllegalArgumentException.class)
- public void selectWithToManyLevelsThrows() throws Exception {
+ public void selectWithToManyLevelsThrows() {
query.withContentType("foo");
query.select("fields.baz.bar");
}
@Test
- public void selects() throws Exception {
+ public void selects() {
query.withContentType("foo");
query.select("fields.bar", "fields.bar2");
@@ -123,32 +123,32 @@ public void selects() throws Exception {
}
@Test
- public void linksToEntryId() throws Exception {
+ public void linksToEntryId() {
query.linksToEntryId("nyancat");
assertThat(query.params).containsEntry("links_to_entry", "nyancat");
}
@Test
- public void linksToAssetId() throws Exception {
+ public void linksToAssetId() {
query.linksToAssetId("nyancat");
assertThat(query.params).containsEntry("links_to_asset", "nyancat");
}
@Test(expected = IllegalStateException.class)
- public void selectsWithoutTypeThrows() throws Exception {
+ public void selectsWithoutTypeThrows() {
query.select("fields.bar", "fields.bar2");
}
@Test(expected = IllegalArgumentException.class)
- public void selectsWithoutFieldNames() throws Exception {
+ public void selectsWithoutFieldNames() {
query.withContentType("foo");
query.select();
}
@Test(expected = IllegalArgumentException.class)
- public void selectsWithoutNullEntry() throws Exception {
+ public void selectsWithoutNullEntry() {
query.withContentType("foo");
query.select("bar", null);
}
@@ -197,7 +197,7 @@ public void equalsWithNoValuesThrows() {
}
@Test
- public void notEqual() throws Exception {
+ public void notEqual() {
query.withContentType("foo");
query.where("fields.bar", IsNotEqualTo, "baz");
@@ -205,7 +205,7 @@ public void notEqual() throws Exception {
}
@Test
- public void all() throws Exception {
+ public void all() {
query.withContentType("foo");
query.where("fields.bar", HasAllOf, "a,b,c,d");
@@ -213,7 +213,7 @@ public void all() throws Exception {
}
@Test
- public void allSeparated() throws Exception {
+ public void allSeparated() {
query.withContentType("foo");
query.where("fields.bar", HasAllOf, "a", "b", "c", "d");
@@ -221,7 +221,7 @@ public void allSeparated() throws Exception {
}
@Test
- public void atLeasOnOf() throws Exception {
+ public void atLeasOnOf() {
query.withContentType("foo");
query.where("fields.bar", HasOneOf, "a", "b", "c", "d");
@@ -229,7 +229,7 @@ public void atLeasOnOf() throws Exception {
}
@Test
- public void noneOf() throws Exception {
+ public void noneOf() {
query.withContentType("foo");
query.where("fields.bar", HasNoneOf, "a", "b", "c", "d");
@@ -237,7 +237,7 @@ public void noneOf() throws Exception {
}
@Test
- public void fieldExists() throws Exception {
+ public void fieldExists() {
query.withContentType("foo");
query.where("fields.bar", Exists);
@@ -245,7 +245,7 @@ public void fieldExists() throws Exception {
}
@Test
- public void fieldDoesNotExists() throws Exception {
+ public void fieldDoesNotExists() {
query.withContentType("foo");
query.where("fields.bar", Exists, false);
@@ -253,7 +253,7 @@ public void fieldDoesNotExists() throws Exception {
}
@Test
- public void isLessThan() throws Exception {
+ public void isLessThan() {
query.withContentType("foo");
query.where("fields.bar", IsLessThan, 1);
@@ -261,7 +261,7 @@ public void isLessThan() throws Exception {
}
@Test
- public void isLessOrEqualTo() throws Exception {
+ public void isLessOrEqualTo() {
query.withContentType("foo");
query.where("fields.bar", IsLessThanOrEqualTo, 1);
@@ -269,7 +269,7 @@ public void isLessOrEqualTo() throws Exception {
}
@Test
- public void isGreaterThan() throws Exception {
+ public void isGreaterThan() {
query.withContentType("foo");
query.where("fields.bar", IsGreaterThan, 1);
@@ -277,7 +277,7 @@ public void isGreaterThan() throws Exception {
}
@Test
- public void isGreaterThanOrEqualTo() throws Exception {
+ public void isGreaterThanOrEqualTo() {
query.withContentType("foo");
query.where("fields.bar", IsGreaterThanOrEqualTo, 1);
@@ -285,7 +285,7 @@ public void isGreaterThanOrEqualTo() throws Exception {
}
@Test
- public void isEarlierThan() throws Exception {
+ public void isEarlierThan() {
query.withContentType("foo");
query.where("fields.bar", IsEarlierThan, "2013-02-02T14:34+01:00");
@@ -293,7 +293,7 @@ public void isEarlierThan() throws Exception {
}
@Test
- public void isEarlierThanOrAt() throws Exception {
+ public void isEarlierThanOrAt() {
query.withContentType("foo");
query.where("fields.bar", IsEarlierOrAt, "2013-02-02T14:34+01:00");
@@ -302,7 +302,7 @@ public void isEarlierThanOrAt() throws Exception {
@Test
- public void isLaterThan() throws Exception {
+ public void isLaterThan() {
query.withContentType("foo");
query.where("fields.bar", IsLaterThan, "2013-02-02T14:34+01:00");
@@ -310,7 +310,7 @@ public void isLaterThan() throws Exception {
}
@Test
- public void isLaterThanOrEqualTo() throws Exception {
+ public void isLaterThanOrEqualTo() {
query.withContentType("foo");
query.where("fields.bar", IsLaterOrAt, "2013-02-02T14:34+01:00");
@@ -318,7 +318,7 @@ public void isLaterThanOrEqualTo() throws Exception {
}
@Test
- public void matchQuery() throws Exception {
+ public void matchQuery() {
query.withContentType("foo");
query.where("fields.bar", Matches, "bar");
@@ -327,18 +327,18 @@ public void matchQuery() throws Exception {
}
@Test(expected = IllegalArgumentException.class)
- public void matchQueryWithEmptyValueThrows() throws Exception {
+ public void matchQueryWithEmptyValueThrows() {
query.withContentType("foo");
query.where("fields.bar", Matches);
}
@Test(expected = IllegalStateException.class)
- public void matchQueryWithNoContentTypeButFieldsThrows() throws Exception {
+ public void matchQueryWithNoContentTypeButFieldsThrows() {
query.where("fields.foo", Matches, "b");
}
@Test
- public void matchQueryWithSys() throws Exception {
+ public void matchQueryWithSys() {
query.where("sys.id", Matches, "foo");
assertThat(query.params).containsEntry("sys.id[match]", "foo");
@@ -346,7 +346,7 @@ public void matchQueryWithSys() throws Exception {
}
@Test
- public void near() throws Exception {
+ public void near() {
query.withContentType("foo");
query.where("fields.bar", IsCloseTo, new Location(52d, 14d));
@@ -359,12 +359,12 @@ public void near() throws Exception {
}
@Test(expected = IllegalStateException.class)
- public void nearThrowsIfNotUsedWithContentType() throws Exception {
+ public void nearThrowsIfNotUsedWithContentType() {
query.where("fields.bar", IsCloseTo, new Location(52, 14));
}
@Test
- public void withinBoundingBox() throws Exception {
+ public void withinBoundingBox() {
query.withContentType("foo");
query.where("fields.bar", IsWithinBoundingBoxOf,
new BoundingBox(new Location(0, 1), new Location(2, 3)));
@@ -380,7 +380,7 @@ public void withinBoundingBox() throws Exception {
}
@Test
- public void withinBoundingBoxOfDoubles() throws Exception {
+ public void withinBoundingBoxOfDoubles() {
query.withContentType("foo");
query.where("fields.bar", IsWithinBoundingBoxOf, new BoundingBox(0, 1, 2, 3));
@@ -395,7 +395,7 @@ public void withinBoundingBoxOfDoubles() throws Exception {
}
@Test
- public void withinBoundingCircle() throws Exception {
+ public void withinBoundingCircle() {
query.withContentType("foo");
query.where("fields.bar", IsWithinCircleOf, new BoundingCircle(52d, 14d, 10d));
@@ -409,7 +409,7 @@ public void withinBoundingCircle() throws Exception {
}
@Test
- public void withinTypeSaveBoundingCircle() throws Exception {
+ public void withinTypeSaveBoundingCircle() {
query.withContentType("foo");
query.where("fields.bar", IsWithinCircleOf, new BoundingCircle(new Location(52d, 14d), 10d));
@@ -423,7 +423,7 @@ public void withinTypeSaveBoundingCircle() throws Exception {
}
@Test
- public void orderByField() throws Exception {
+ public void orderByField() {
query.withContentType("foo");
query.orderBy("fields.bar");
@@ -432,7 +432,7 @@ public void orderByField() throws Exception {
}
@Test
- public void orderBySysWithoutField() throws Exception {
+ public void orderBySysWithoutField() {
query.orderBy("sys.foo");
assertThat(query.params).doesNotContainKey("content_type");
@@ -440,22 +440,22 @@ public void orderBySysWithoutField() throws Exception {
}
@Test(expected = IllegalStateException.class)
- public void orderByThrowsOnFieldWithoutContentType() throws Exception {
+ public void orderByThrowsOnFieldWithoutContentType() {
query.orderBy("fields.foo");
}
@Test(expected = IllegalArgumentException.class)
- public void orderByThrowsOnEmptyKey() throws Exception {
+ public void orderByThrowsOnEmptyKey() {
query.orderBy("");
}
@Test(expected = IllegalArgumentException.class)
- public void orderByThrowsOnNullKey() throws Exception {
+ public void orderByThrowsOnNullKey() {
query.orderBy((String) null);
}
@Test
- public void orderByMultipleFields() throws Exception {
+ public void orderByMultipleFields() {
query.withContentType("foo");
query.orderBy("fields.bar", "fields.baz");
@@ -464,7 +464,7 @@ public void orderByMultipleFields() throws Exception {
}
@Test
- public void orderByMultipleFieldsWithSys() throws Exception {
+ public void orderByMultipleFieldsWithSys() {
query.withContentType("foo");
query.orderBy("fields.bar", "sys.id");
@@ -473,7 +473,7 @@ public void orderByMultipleFieldsWithSys() throws Exception {
}
@Test
- public void orderByMultipleOnlySysAndNoContentType() throws Exception {
+ public void orderByMultipleOnlySysAndNoContentType() {
query.orderBy("sys.foo", "sys.bar");
assertThat(query.params).doesNotContainKey("content_type");
@@ -481,26 +481,26 @@ public void orderByMultipleOnlySysAndNoContentType() throws Exception {
}
@Test
- public void orderByMultipleOneReverse() throws Exception {
+ public void orderByMultipleOneReverse() {
query.orderBy("sys.foo", "-sys.bar");
assertThat(query.params).containsEntry("order", "sys.foo,-sys.bar");
}
@Test(expected = IllegalArgumentException.class)
- public void orderByOneNullThrows() throws Exception {
+ public void orderByOneNullThrows() {
query.withContentType("foo");
query.orderBy("fields.bar", null);
}
@Test(expected = IllegalArgumentException.class)
- public void orderByOneEmptyThrows() throws Exception {
+ public void orderByOneEmptyThrows() {
query.withContentType("foo");
query.orderBy("fields.bar", "", "fields.baz");
}
@Test
- public void reverseOrderByField() throws Exception {
+ public void reverseOrderByField() {
query.withContentType("foo");
query.reverseOrderBy("fields.bar");
@@ -509,7 +509,7 @@ public void reverseOrderByField() throws Exception {
}
@Test
- public void reverseOrderBySysWithoutField() throws Exception {
+ public void reverseOrderBySysWithoutField() {
query.reverseOrderBy("sys.foo");
assertThat(query.params).doesNotContainKey("content_type");
@@ -517,87 +517,87 @@ public void reverseOrderBySysWithoutField() throws Exception {
}
@Test(expected = IllegalStateException.class)
- public void reverseOrderByThrowsOnFieldWithoutContentType() throws Exception {
+ public void reverseOrderByThrowsOnFieldWithoutContentType() {
query.reverseOrderBy("fields.foo");
}
@Test(expected = IllegalArgumentException.class)
- public void reverseOrderByThrowsOnEmptyKey() throws Exception {
+ public void reverseOrderByThrowsOnEmptyKey() {
query.reverseOrderBy("");
}
@Test(expected = IllegalArgumentException.class)
- public void reverseOrderByThrowsOnNullKey() throws Exception {
+ public void reverseOrderByThrowsOnNullKey() {
query.reverseOrderBy(null);
}
@Test
- public void limit() throws Exception {
+ public void limit() {
query.limit(3);
assertThat(query.params).containsEntry("limit", "3");
}
@Test(expected = IllegalArgumentException.class)
- public void limitWithNegativeThrows() throws Exception {
+ public void limitWithNegativeThrows() {
query.limit(-1);
}
@Test(expected = IllegalArgumentException.class)
- public void limitWithMoreThen1kThrows() throws Exception {
+ public void limitWithMoreThen1kThrows() {
query.limit(1001);
}
@Test
- public void skip() throws Exception {
+ public void skip() {
query.skip(3);
assertThat(query.params).containsEntry("skip", "3");
}
@Test(expected = IllegalArgumentException.class)
- public void skipWithNegativeThrows() throws Exception {
+ public void skipWithNegativeThrows() {
query.skip(-1);
}
@Test(expected = IllegalArgumentException.class)
- public void skipWithNegInfThrows() throws Exception {
+ public void skipWithNegInfThrows() {
query.skip(Integer.MIN_VALUE);
}
@Test
- public void includeZero() throws Exception {
+ public void includeZero() {
query.include(0);
assertThat(query.params).containsEntry("include", "0");
}
@Test
- public void includeTen() throws Exception {
+ public void includeTen() {
query.include(10);
assertThat(query.params).containsEntry("include", "10");
}
@Test(expected = IllegalArgumentException.class)
- public void includeToManyLevelThrows() throws Exception {
+ public void includeToManyLevelThrows() {
query.include(11);
}
@Test(expected = IllegalArgumentException.class)
- public void includeNegative() throws Exception {
+ public void includeNegative() {
query.include(-1);
}
@Test
public void queryingAssetTitlesDoesNotThrowWithoutTypeSet() {
- final FetchQuery