cosmetic: remove training whitespaces
diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/DateUtils.java b/src/main/java/org/apache/sling/testing/resourceresolver/DateUtils.java
index 3e21b97..be79c52 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/DateUtils.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/DateUtils.java
@@ -29,7 +29,7 @@
* This can be removed when Sling API 2.17.0 or higher is referenced.
*/
final class DateUtils {
-
+
private DateUtils() {
// static methods only
}
@@ -57,7 +57,7 @@
}
return input.getTime();
}
-
+
/**
* @param input Date value
* @return ISO8601 string representation or null
diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/MockFindResourcesHandler.java b/src/main/java/org/apache/sling/testing/resourceresolver/MockFindResourcesHandler.java
index 03798cd..5ec86d7 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/MockFindResourcesHandler.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/MockFindResourcesHandler.java
@@ -34,7 +34,7 @@
/**
* @param query Query
* @param language Language
- * @return Returns a non-null value if a mocked result is available
+ * @return Returns a non-null value if a mocked result is available
*/
@Nullable Iterator<Resource> findResources(final @NotNull String query, final String language);
diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/MockPropertyResource.java b/src/main/java/org/apache/sling/testing/resourceresolver/MockPropertyResource.java
index 2ba585d..011b5f5 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/MockPropertyResource.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/MockPropertyResource.java
@@ -29,7 +29,7 @@
* Resource that wraps a property value.
*/
class MockPropertyResource extends AbstractResource {
-
+
private final String path;
private final ValueMap props;
private final String key;
diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/MockQueryResourceHandler.java b/src/main/java/org/apache/sling/testing/resourceresolver/MockQueryResourceHandler.java
index 8710006..005f021 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/MockQueryResourceHandler.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/MockQueryResourceHandler.java
@@ -34,7 +34,7 @@
/**
* @param query Query
* @param language Language
- * @return Returns a non-null value if a mocked result is available
+ * @return Returns a non-null value if a mocked result is available
*/
@Nullable Iterator<Map<String, Object>> queryResources(@NotNull String query, String language);
diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/MockResource.java b/src/main/java/org/apache/sling/testing/resourceresolver/MockResource.java
index 964b338..6bda1bd 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/MockResource.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/MockResource.java
@@ -116,7 +116,7 @@
}
return super.adaptTo(type);
}
-
+
/**
* Emulate feature of JCR resource implementation that allows adapting to InputStream for nt:file and nt:resource nodes.
* @return InputStream or null if adaption not possible.
diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
index bda9e1b..7b33891 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
@@ -59,9 +59,9 @@
private final MockResourceResolverFactoryOptions options;
private final MockResourceResolverFactory factory;
-
+
private final Map<String,Object> attributes;
-
+
private final List<MockFindResourcesHandler> findResourcesHandlers = new ArrayList<>();
private final List<MockQueryResourceHandler> queryResourcesHandlers = new ArrayList<>();
@@ -96,7 +96,7 @@
urlRemainder = path.substring(urlRemainderPos);
path = path.substring(0, urlRemainderPos);
}
-
+
// unmangle namespaces
if (options.isMangleNamespacePrefixes()) {
path = NamespaceMangler.unmangleNamespaces(path);
@@ -135,7 +135,7 @@
urlRemainder = path.substring(urlRemainderPos);
path = path.substring(0, urlRemainderPos);
}
-
+
// mangle namespaces
if (options.isMangleNamespacePrefixes()) {
path = NamespaceMangler.mangleNamespaces(path);
@@ -144,11 +144,11 @@
// build full path again
return path + (urlRemainder != null ? urlRemainder : "");
}
-
+
@Override
public Resource getResource(final @NotNull String path) {
Resource resource = getResourceInternal(path);
-
+
// if not resource found check if this is a reference to a property
if (resource == null && path != null) {
String parentPath = ResourceUtil.getParent(path);
@@ -163,15 +163,15 @@
}
}
}
-
+
return resource;
}
-
+
private Resource getResourceInternal(final String path) {
if (path == null) {
return null;
}
-
+
String normalizedPath = ResourceUtil.normalize(path);
if (normalizedPath == null) {
return null;
@@ -321,7 +321,7 @@
if ( properties == null ) {
properties = new HashMap<String, Object>();
}
-
+
Resource mockResource = new MockResource(path, properties, this);
this.temporaryResources.put(path, ResourceUtil.getValueMap(mockResource));
return mockResource;
@@ -436,7 +436,7 @@
}
return resourceSuperType;
}
-
+
@Override
public boolean hasChildren(@NotNull Resource resource) {
return this.listChildren(resource).hasNext();
diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java
index 8694865..eb5bad0 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java
@@ -34,7 +34,7 @@
* Simple resource resolver factory
*/
public class MockResourceResolverFactory implements ResourceResolverFactory {
-
+
private static final String ROOT_PRIMARY_TYPE="rep:root";
/** We use a linked hash map to preserve creation order. */
@@ -71,13 +71,13 @@
@Override
public @NotNull ResourceResolver getResourceResolver(
final Map<String, Object> authenticationInfo) throws LoginException {
-
+
// put user name in resolver attributes
Map<String,Object> attributes = new HashMap<String, Object>();
if (authenticationInfo!=null) {
attributes.put(ResourceResolverFactory.USER, authenticationInfo.get(ResourceResolverFactory.USER));
}
-
+
final ResourceResolver result = new MockResourceResolver(options, this, resources, attributes);
Stack<ResourceResolver> resolverStack = resolverStackHolder.get();
if ( resolverStack == null ) {
diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactoryOptions.java b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactoryOptions.java
index c9c93c1..cde8efc 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactoryOptions.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactoryOptions.java
@@ -30,7 +30,7 @@
private EventAdmin eventAdmin;
private String[] searchPaths = new String[] {"/apps/", "/libs/"};
-
+
private boolean mangleNamespacePrefixes;
public @Nullable EventAdmin getEventAdmin() {
@@ -62,5 +62,5 @@
this.mangleNamespacePrefixes = mangleNamespacePrefixes;
return this;
}
-
+
}
diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java b/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java
index 1c7ba44..03e6e40 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/MockValueMap.java
@@ -40,7 +40,7 @@
* </ul>
*/
public class MockValueMap extends DeepReadModifiableValueMapDecorator implements ModifiableValueMap {
-
+
public MockValueMap(Resource resource) {
this(resource, new HashMap<String, Object>());
}
@@ -52,7 +52,7 @@
@SuppressWarnings({ "unchecked", "null", "unused" })
@Override
public <T> T get(String name, Class<T> type) {
-
+
if (type == InputStream.class) {
// Support conversion from byte array to InputStream
byte[] data = get(name, byte[].class);
@@ -68,7 +68,7 @@
}
return super.get(name, type);
}
-
+
@Override
public Object put(String key, Object value) {
return super.put(key, convertForWrite(value));
@@ -79,10 +79,10 @@
public void putAll(Map<? extends String, ?> map) {
super.putAll((Map<? extends String, ?>)convertForWriteAll((Map<String, Object>)map));
}
-
+
private static Object convertForWrite(Object value) {
if (value instanceof Date) {
- // Store Date values as Calendar values
+ // Store Date values as Calendar values
Calendar calendar = Calendar.getInstance();
calendar.setTime((Date)value);
value = calendar;
@@ -97,7 +97,7 @@
}
return value;
}
-
+
private static Map<String, Object> convertForWriteAll(Map<String, Object> map) {
Map<String,Object> newMap = new HashMap<String, Object>();
if (map != null) {
diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/ObjectConverter.java b/src/main/java/org/apache/sling/testing/resourceresolver/ObjectConverter.java
index 6d1e60a..a1b0339 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/ObjectConverter.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/ObjectConverter.java
@@ -31,7 +31,7 @@
* This can be removed when Sling API 2.17.0 or higher is referenced.
*/
final class ObjectConverter {
-
+
private ObjectConverter() {
// static methods only
}
@@ -47,17 +47,17 @@
if (obj == null) {
return null;
}
-
+
// check if direct assignment is possible
if (type.isAssignableFrom(obj.getClass())) {
return (T)obj;
}
-
+
// convert array elements individually
if (type.isArray()) {
return (T)convertToArray(obj, type.getComponentType());
}
-
+
// convert Calendar in Date and vice versa
if (Calendar.class.isAssignableFrom(type) && obj instanceof Date) {
return (T)DateUtils.toCalendar((Date)obj);
@@ -66,7 +66,7 @@
return (T)DateUtils.toDate((Calendar)obj);
}
- // no direct conversion - format to string and try to parse to target type
+ // no direct conversion - format to string and try to parse to target type
String result = getSingleValue(obj);
if (result == null) {
return null;
@@ -181,5 +181,5 @@
return arrayResult;
}
}
-
+
}
diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/ReadonlyValueMapDecorator.java b/src/main/java/org/apache/sling/testing/resourceresolver/ReadonlyValueMapDecorator.java
index 5248346..febb7e1 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/ReadonlyValueMapDecorator.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/ReadonlyValueMapDecorator.java
@@ -29,7 +29,7 @@
* Decorator that disallows access to all methods that modify the value map.
*/
class ReadonlyValueMapDecorator implements ValueMap {
-
+
private final ValueMap delegate;
public ReadonlyValueMapDecorator(ValueMap base) {
diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/ResourceTypeUtil.java b/src/main/java/org/apache/sling/testing/resourceresolver/ResourceTypeUtil.java
index a837f20..23b315d 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/ResourceTypeUtil.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/ResourceTypeUtil.java
@@ -27,10 +27,10 @@
/**
* Returns <code>true</code> if the given resource type are equal.
- *
- * In case the value of any of the given resource types
+ *
+ * In case the value of any of the given resource types
* starts with one of the resource resolver's search paths
- * it is converted to a relative resource type by stripping off
+ * it is converted to a relative resource type by stripping off
* the resource resolver's search path before doing the comparison.
*
* @param resourceType A resource type
diff --git a/src/test/java/org/apache/sling/testing/resourceresolver/Convert.java b/src/test/java/org/apache/sling/testing/resourceresolver/Convert.java
index 8614677..153f244 100644
--- a/src/test/java/org/apache/sling/testing/resourceresolver/Convert.java
+++ b/src/test/java/org/apache/sling/testing/resourceresolver/Convert.java
@@ -32,11 +32,11 @@
* This is copied from org.apache.sling.api.wrappers.impl.Convert
*/
final class Convert {
-
+
private Convert() {
// static methods only
}
-
+
@SuppressWarnings({ "unchecked", "null" })
public static class ConversionAssert<T,U> {
private final T input1;
@@ -46,7 +46,7 @@
private U expected2;
private U nullValue;
private Class<U> expectedType;
-
+
private ConversionAssert(T input1, T input2, boolean inputTypePrimitive) {
this.input1 = input1;
this.input2 = input2;
@@ -55,7 +55,7 @@
this.inputType = (Class<T>)ClassUtils.wrapperToPrimitive(this.inputType);
}
}
-
+
private void expected(U expected1, U expected2, boolean expectedTypePrimitive) {
this.expected1 = expected1;
this.expected2 = expected2;
@@ -64,7 +64,7 @@
expectedType = (Class<U>)ClassUtils.wrapperToPrimitive(this.expectedType);
}
}
-
+
/**
* @param expected1 Singleton or first array expected result value
* @param expected2 Second array expected result value
@@ -84,7 +84,7 @@
expected(expected1, expected2, true);
return this;
}
-
+
/**
* @param expected1 Singleton or first array expected result value
* @param expected2 Second array expected result value
@@ -96,7 +96,7 @@
this.expectedType = expectedType;
return this;
}
-
+
/**
* @param nullValue Result value in case of null
*/
@@ -104,7 +104,7 @@
this.nullValue = nullValue;
return this;
}
-
+
/**
* Do assertion
*/
@@ -132,10 +132,10 @@
private static <T,U> void assertPermuations(T input1, T input2, Class<T> inputType,
U expected1, U expected2, U nullValue, Class<U> expectedType, Class<U[]> expectedArrayType) {
-
+
// single value to single value
assertConversion(expected1, input1, expectedType);
-
+
// single value to array
Object expectedSingletonArray;
if (expected1 == null && expected2 == null) {
@@ -146,7 +146,7 @@
Array.set(expectedSingletonArray, 0, expected1);
}
assertConversion(expectedSingletonArray, input1, expectedArrayType);
-
+
// array to array
Object inputDoubleArray = Array.newInstance(inputType, 2);
Array.set(inputDoubleArray, 0, input1);
@@ -161,16 +161,16 @@
Array.set(expectedDoubleArray, 1, expected2);
}
assertConversion(expectedDoubleArray, inputDoubleArray, expectedArrayType);
-
+
// array to single (first) value
assertConversion(expected1, inputDoubleArray, expectedType);
-
+
// null to single value
assertConversion(nullValue, null, expectedType);
-
+
// null to array
assertConversion(null, null, expectedArrayType);
-
+
// empty array to single value
Object inputEmptyArray = Array.newInstance(inputType, 0);
assertConversion(nullValue, inputEmptyArray, expectedType);
@@ -179,7 +179,7 @@
Object expectedEmptyArray = Array.newInstance(expectedType, 0);
assertConversion(expectedEmptyArray, inputEmptyArray, expectedArrayType);
}
-
+
@SuppressWarnings("unchecked")
private static <T,U> void assertConversion(Object expected, Object input, Class<U> type) {
U result = ObjectConverter.convert(input, type);
@@ -194,7 +194,7 @@
assertEquals(msg, toStringIfDate(expected), toStringIfDate(result));
}
}
-
+
private static String toString(Object input) {
if (input == null) {
return "null";
@@ -215,7 +215,7 @@
return toStringIfDate(input).toString();
}
}
-
+
private static Object toStringIfDate(Object input) {
if (input == null) {
return null;
@@ -238,5 +238,5 @@
}
return input;
}
-
+
}
diff --git a/src/test/java/org/apache/sling/testing/resourceresolver/CreateDeleteResourceResolverTest.java b/src/test/java/org/apache/sling/testing/resourceresolver/CreateDeleteResourceResolverTest.java
index 4a88be9..67a3b18 100644
--- a/src/test/java/org/apache/sling/testing/resourceresolver/CreateDeleteResourceResolverTest.java
+++ b/src/test/java/org/apache/sling/testing/resourceresolver/CreateDeleteResourceResolverTest.java
@@ -39,7 +39,7 @@
* Tests combinations of create and deletion of resources and conflict detection.
*/
public class CreateDeleteResourceResolverTest {
-
+
private static final Map<String,Object> PROPS1 = ImmutableMap.<String, Object>builder()
.put("prop1", "value1").build();
private static final Map<String,Object> PROPS2 = ImmutableMap.<String, Object>builder()
@@ -61,7 +61,7 @@
// create new node without commit
Resource resource = resourceResolver.create(testRoot, "node", PROPS1);
assertEquals(PROPS1, ResourceUtil.getValueMap(resource));
-
+
// delete node without commit
resourceResolver.delete(resource);
assertNull(resourceResolver.getResource(testRoot.getPath() + "/node"));
@@ -76,7 +76,7 @@
// create new node without commit
Resource resource = resourceResolver.create(testRoot, "node", PROPS1);
assertEquals(PROPS1, ResourceUtil.getValueMap(resource));
-
+
// delete node without commit
resourceResolver.delete(resource);
assertNull(resourceResolver.getResource(testRoot.getPath() + "/node"));
@@ -93,7 +93,7 @@
Resource resource = resourceResolver.create(testRoot, "node", PROPS1);
assertEquals(PROPS1, ResourceUtil.getValueMap(resource));
resourceResolver.commit();
-
+
// delete node without commit
resourceResolver.delete(resource);
assertNull(resourceResolver.getResource(testRoot.getPath() + "/node"));
@@ -110,7 +110,7 @@
Resource resource = resourceResolver.create(testRoot, "node", PROPS1);
assertEquals(PROPS1, ResourceUtil.getValueMap(resource));
resourceResolver.commit();
-
+
// delete node with commit
resourceResolver.delete(resource);
assertNull(resourceResolver.getResource(testRoot.getPath() + "/node"));
diff --git a/src/test/java/org/apache/sling/testing/resourceresolver/FindQueryResourcesTest.java b/src/test/java/org/apache/sling/testing/resourceresolver/FindQueryResourcesTest.java
index cc53d6d..53af208 100644
--- a/src/test/java/org/apache/sling/testing/resourceresolver/FindQueryResourcesTest.java
+++ b/src/test/java/org/apache/sling/testing/resourceresolver/FindQueryResourcesTest.java
@@ -66,7 +66,7 @@
@Test
public void testFindResourcesSingleHandler() {
List<Resource> expected = ImmutableList.of(resource1, resource2);
- ((MockResourceResolver)resourceResolver).addFindResourceHandler((query, language) -> expected.iterator());
+ ((MockResourceResolver)resourceResolver).addFindResourceHandler((query, language) -> expected.iterator());
assertEquals(expected, ImmutableList.copyOf(resourceResolver.findResources("any-query", "any-language")));
}
@@ -74,12 +74,12 @@
@Test
public void testFindResourcesMultipleHandlers() {
List<Resource> expected1 = ImmutableList.of(resource1);
- ((MockResourceResolver)resourceResolver).addFindResourceHandler((query, language) ->
- StringUtils.equals(query, "q1") ? expected1.iterator() : null);
+ ((MockResourceResolver)resourceResolver).addFindResourceHandler((query, language) ->
+ StringUtils.equals(query, "q1") ? expected1.iterator() : null);
List<Resource> expected2 = ImmutableList.of(resource2);
- ((MockResourceResolver)resourceResolver).addFindResourceHandler((query, language) ->
- StringUtils.equals(query, "q2") ? expected2.iterator() : null);
+ ((MockResourceResolver)resourceResolver).addFindResourceHandler((query, language) ->
+ StringUtils.equals(query, "q2") ? expected2.iterator() : null);
assertEquals(expected1, ImmutableList.copyOf(resourceResolver.findResources("q1", "any-language")));
assertEquals(expected2, ImmutableList.copyOf(resourceResolver.findResources("q2", "any-language")));
@@ -94,7 +94,7 @@
@Test
public void testQueryResourcesSingleHandler() {
List<Map<String,Object>> expected = ImmutableList.of(resource1.getValueMap(), resource2.getValueMap());
- ((MockResourceResolver)resourceResolver).addQueryResourceHandler((query, language) -> expected.iterator());
+ ((MockResourceResolver)resourceResolver).addQueryResourceHandler((query, language) -> expected.iterator());
assertEquals(expected, ImmutableList.copyOf(resourceResolver.queryResources("any-query", "any-language")));
}
@@ -102,12 +102,12 @@
@Test
public void testQueryResourcesMultipleHandlers() {
List<Map<String,Object>> expected1 = ImmutableList.of(resource1.getValueMap());
- ((MockResourceResolver)resourceResolver).addQueryResourceHandler((query, language) ->
- StringUtils.equals(query, "q1") ? expected1.iterator() : null);
+ ((MockResourceResolver)resourceResolver).addQueryResourceHandler((query, language) ->
+ StringUtils.equals(query, "q1") ? expected1.iterator() : null);
List<Map<String,Object>> expected2 = ImmutableList.of(resource2.getValueMap());
- ((MockResourceResolver)resourceResolver).addQueryResourceHandler((query, language) ->
- StringUtils.equals(query, "q2") ? expected2.iterator() : null);
+ ((MockResourceResolver)resourceResolver).addQueryResourceHandler((query, language) ->
+ StringUtils.equals(query, "q2") ? expected2.iterator() : null);
assertEquals(expected1, ImmutableList.copyOf(resourceResolver.queryResources("q1", "any-language")));
assertEquals(expected2, ImmutableList.copyOf(resourceResolver.queryResources("q2", "any-language")));
diff --git a/src/test/java/org/apache/sling/testing/resourceresolver/IsResourceTypeTest.java b/src/test/java/org/apache/sling/testing/resourceresolver/IsResourceTypeTest.java
index 26acfa2..44e26d7 100644
--- a/src/test/java/org/apache/sling/testing/resourceresolver/IsResourceTypeTest.java
+++ b/src/test/java/org/apache/sling/testing/resourceresolver/IsResourceTypeTest.java
@@ -42,7 +42,7 @@
public final void setUp() throws LoginException {
resolver = new MockResourceResolverFactory().getResourceResolver(null);
}
-
+
@Test
public void testIsResourceType() {
/**
diff --git a/src/test/java/org/apache/sling/testing/resourceresolver/NamespaceManglerTest.java b/src/test/java/org/apache/sling/testing/resourceresolver/NamespaceManglerTest.java
index 53d11bb..d16ecb1 100644
--- a/src/test/java/org/apache/sling/testing/resourceresolver/NamespaceManglerTest.java
+++ b/src/test/java/org/apache/sling/testing/resourceresolver/NamespaceManglerTest.java
@@ -27,7 +27,7 @@
import com.google.common.collect.ImmutableMap;
public class NamespaceManglerTest {
-
+
private Map<String, String> TEST_PATHS = ImmutableMap.<String, String>builder()
.put("/content/aa/bb/content.png", "/content/aa/bb/content.png")
.put("/content/aa/bb/jcr:content.png", "/content/aa/bb/_jcr_content.png")
diff --git a/src/test/java/org/apache/sling/testing/resourceresolver/NamespaceManglingResourceResolverTest.java b/src/test/java/org/apache/sling/testing/resourceresolver/NamespaceManglingResourceResolverTest.java
index 59b6a3c..65bef6c 100644
--- a/src/test/java/org/apache/sling/testing/resourceresolver/NamespaceManglingResourceResolverTest.java
+++ b/src/test/java/org/apache/sling/testing/resourceresolver/NamespaceManglingResourceResolverTest.java
@@ -30,7 +30,7 @@
public class NamespaceManglingResourceResolverTest {
private ResourceResolver resolver;
-
+
@Before
@SuppressWarnings("null")
public void setUp() throws Exception {
@@ -38,20 +38,20 @@
options.setMangleNamespacePrefixes(true);
ResourceResolverFactory factory = new MockResourceResolverFactory(options);
resolver = factory.getResourceResolver(null);
-
+
Resource res1 = resolver.create(resolver.getResource("/"), "res1", ValueMap.EMPTY);
Resource content = resolver.create(res1, "jcr:content", ValueMap.EMPTY);
resolver.create(content, "res2", ValueMap.EMPTY);
}
-
+
@Test
public void testMap() {
assertEquals("/res1/_jcr_content/res2", resolver.map("/res1/jcr:content/res2"));
}
-
+
@Test
public void testResolve() {
assertEquals("/res1/jcr:content/res2", resolver.resolve("/res1/_jcr_content/res2").getPath());
}
-
+
}
diff --git a/src/test/java/org/apache/sling/testing/resourceresolver/NtFileResourceTest.java b/src/test/java/org/apache/sling/testing/resourceresolver/NtFileResourceTest.java
index 6c01d44..f61b336 100644
--- a/src/test/java/org/apache/sling/testing/resourceresolver/NtFileResourceTest.java
+++ b/src/test/java/org/apache/sling/testing/resourceresolver/NtFileResourceTest.java
@@ -64,7 +64,7 @@
Resource file = resourceResolver.create(testRoot, "ntFile", ImmutableMap.<String, Object>builder()
.put(JCR_PRIMARYTYPE, NT_FILE)
.build());
- resourceResolver.create(file, JCR_CONTENT, ImmutableMap.<String, Object>builder()
+ resourceResolver.create(file, JCR_CONTENT, ImmutableMap.<String, Object>builder()
.put(JCR_PRIMARYTYPE, NT_RESOURCE)
.put(JCR_DATA, new ByteArrayInputStream(BINARY_VALUE))
.build());
@@ -73,7 +73,7 @@
Resource resource = resourceResolver.getResource(path);
InputStream is = resource.adaptTo(InputStream.class);
assertNotNull(is);
-
+
assertArrayEquals(BINARY_VALUE, IOUtils.toByteArray(is));
is.close();
}
@@ -89,7 +89,7 @@
Resource resource = resourceResolver.getResource(path);
InputStream is = resource.adaptTo(InputStream.class);
assertNotNull(is);
-
+
assertArrayEquals(BINARY_VALUE, IOUtils.toByteArray(is));
is.close();
}
diff --git a/src/test/java/org/apache/sling/testing/resourceresolver/ObjectConverterTest.java b/src/test/java/org/apache/sling/testing/resourceresolver/ObjectConverterTest.java
index bda6a39..b9204e8 100644
--- a/src/test/java/org/apache/sling/testing/resourceresolver/ObjectConverterTest.java
+++ b/src/test/java/org/apache/sling/testing/resourceresolver/ObjectConverterTest.java
@@ -37,7 +37,7 @@
*/
@SuppressWarnings("null")
public class ObjectConverterTest {
-
+
private static final String STRING_1 = "item1";
private static final String STRING_2 = "item2";
private static final boolean BOOLEAN_1 = true;
@@ -86,24 +86,24 @@
Convert.from(CALENDAR_1, CALENDAR_2).to(calendarToString(CALENDAR_1), calendarToString(CALENDAR_2)).test();
Convert.from(DATE_1, DATE_2).to(calendarToString(toCalendar(DATE_1)), calendarToString(toCalendar(DATE_2))).test();
}
-
+
@Test
public void testToBoolean() {
Convert.fromPrimitive(BOOLEAN_1, BOOLEAN_2).to(BOOLEAN_1, BOOLEAN_2).test();
Convert.from(BOOLEAN_1, BOOLEAN_2).to(BOOLEAN_1, BOOLEAN_2).test();
Convert.from(Boolean.toString(BOOLEAN_1), Boolean.toString(BOOLEAN_2)).to(BOOLEAN_1, BOOLEAN_2).test();
-
+
// test other types that should not be converted
Convert.<Integer,Boolean>from(INT_1, INT_2).toNull(Boolean.class).test();
Convert.<Date,Boolean>from(DATE_1, DATE_2).toNull(Boolean.class).test();
}
-
+
@Test
public void testToByte() {
Convert.fromPrimitive(BYTE_1, BYTE_2).to(BYTE_1, BYTE_2).test();
Convert.from(BYTE_1, BYTE_2).to(BYTE_1, BYTE_2).test();
Convert.from(Byte.toString(BYTE_1), Byte.toString(BYTE_2)).to(BYTE_1, BYTE_2).test();
-
+
// test conversion from other number types
Convert.from(INT_1, INT_2).to((byte)INT_1, (byte)INT_2).test();
Convert.fromPrimitive(INT_1, INT_2).to((byte)INT_1, (byte)INT_2).test();
@@ -111,13 +111,13 @@
// test other types that should not be converted
Convert.<Date,Byte>from(DATE_1, DATE_2).toNull(Byte.class).test();
}
-
+
@Test
public void testToShort() {
Convert.fromPrimitive(SHORT_1, SHORT_2).to(SHORT_1, SHORT_2).test();
Convert.from(SHORT_1, SHORT_2).to(SHORT_1, SHORT_2).test();
Convert.from(Short.toString(SHORT_1), Short.toString(SHORT_2)).to(SHORT_1, SHORT_2).test();
-
+
// test conversion from other number types
Convert.from(INT_1, INT_2).to((short)INT_1, (short)INT_2).test();
Convert.fromPrimitive(INT_1, INT_2).to((short)INT_1, (short)INT_2).test();
@@ -125,13 +125,13 @@
// test other types that should not be converted
Convert.<Date,Short>from(DATE_1, DATE_2).toNull(Short.class).test();
}
-
+
@Test
public void testToInteger() {
Convert.fromPrimitive(INT_1, INT_2).to(INT_1, INT_2).test();
Convert.from(INT_1, INT_2).to(INT_1, INT_2).test();
Convert.from(Integer.toString(INT_1), Integer.toString(INT_2)).to(INT_1, INT_2).test();
-
+
// test conversion from other number types
Convert.from(SHORT_1, SHORT_2).to((int)SHORT_1, (int)SHORT_2).test();
Convert.fromPrimitive(SHORT_1, SHORT_2).to((int)SHORT_1, (int)SHORT_2).test();
@@ -139,13 +139,13 @@
// test other types that should not be converted
Convert.<Date,Integer>from(DATE_1, DATE_2).toNull(Integer.class).test();
}
-
+
@Test
public void testToLong() {
Convert.fromPrimitive(LONG_1, LONG_2).to(LONG_1, LONG_2).test();
Convert.from(LONG_1, LONG_2).to(LONG_1, LONG_2).test();
Convert.from(Long.toString(LONG_1), Long.toString(LONG_2)).to(LONG_1, LONG_2).test();
-
+
// test conversion from other number types
Convert.from(SHORT_1, SHORT_2).to((long)SHORT_1, (long)SHORT_2).test();
Convert.fromPrimitive(SHORT_1, SHORT_2).to((long)SHORT_1, (long)SHORT_2).test();
@@ -153,13 +153,13 @@
// test other types that should not be converted
Convert.<Date,Long>from(DATE_1, DATE_2).toNull(Long.class).test();
}
-
+
@Test
public void testToFloat() {
Convert.fromPrimitive(FLOAT_1, FLOAT_2).to(FLOAT_1, FLOAT_2).test();
Convert.from(FLOAT_1, FLOAT_2).to(FLOAT_1, FLOAT_2).test();
Convert.from(Float.toString(FLOAT_1), Float.toString(FLOAT_2)).to(FLOAT_1, FLOAT_2).test();
-
+
// test conversion from other number types
Convert.from(SHORT_1, SHORT_2).to((float)SHORT_1, (float)SHORT_2).test();
Convert.fromPrimitive(SHORT_1, SHORT_2).to((float)SHORT_1, (float)SHORT_2).test();
@@ -167,13 +167,13 @@
// test other types that should not be converted
Convert.<Date,Float>from(DATE_1, DATE_2).toNull(Float.class).test();
}
-
+
@Test
public void testToDouble() {
Convert.fromPrimitive(DOUBLE_1, DOUBLE_2).to(DOUBLE_1, DOUBLE_2).test();
Convert.from(DOUBLE_1, DOUBLE_2).to(DOUBLE_1, DOUBLE_2).test();
Convert.from(Double.toString(DOUBLE_1), Double.toString(DOUBLE_2)).to(DOUBLE_1, DOUBLE_2).test();
-
+
// test conversion from other number types
Convert.from(SHORT_1, SHORT_2).to((double)SHORT_1, (double)SHORT_2).test();
Convert.fromPrimitive(SHORT_1, SHORT_2).to((double)SHORT_1, (double)SHORT_2).test();
@@ -181,12 +181,12 @@
// test other types that should not be converted
Convert.<Date,Double>from(DATE_1, DATE_2).toNull(Double.class).test();
}
-
+
@Test
public void testToBigDecimal() {
Convert.from(BIGDECIMAL_1, BIGDECIMAL_2).to(BIGDECIMAL_1, BIGDECIMAL_2).test();
Convert.from(BIGDECIMAL_1.toString(), BIGDECIMAL_2.toString()).to(BIGDECIMAL_1, BIGDECIMAL_2).test();
-
+
// test conversion from other number types
Convert.from(LONG_1, LONG_2).to(BigDecimal.valueOf(LONG_1), BigDecimal.valueOf(LONG_2)).test();
Convert.fromPrimitive(LONG_1, LONG_2).to(BigDecimal.valueOf(LONG_1), BigDecimal.valueOf(LONG_2)).test();
@@ -196,12 +196,12 @@
// test other types that should not be converted
Convert.<Date,BigDecimal>from(DATE_1, DATE_2).toNull(BigDecimal.class).test();
}
-
+
@Test
public void testToCalendar() {
Convert.from(CALENDAR_1, CALENDAR_2).to(CALENDAR_1, CALENDAR_2).test();
Convert.from(DateUtils.calendarToString(CALENDAR_1), DateUtils.calendarToString(CALENDAR_2)).to(CALENDAR_1, CALENDAR_2).test();
-
+
// test conversion from other date types
Convert.from(DATE_1, DATE_2).to(toCalendar(DATE_1), toCalendar(DATE_2)).test();
@@ -209,12 +209,12 @@
Convert.<String,Calendar>from(STRING_1, STRING_2).toNull(Calendar.class).test();
Convert.<Boolean,Calendar>from(BOOLEAN_1, BOOLEAN_2).toNull(Calendar.class).test();
}
-
+
@Test
public void testToDate() {
Convert.from(DATE_1, DATE_2).to(DATE_1, DATE_2).test();
Convert.from(DateUtils.dateToString(DATE_1), DateUtils.dateToString(DATE_2)).to(DATE_1, DATE_2).test();
-
+
// test conversion from other date types
Convert.from(CALENDAR_1, CALENDAR_2).to(toDate(CALENDAR_1), toDate(CALENDAR_2)).test();
@@ -222,7 +222,7 @@
Convert.<String,Date>from(STRING_1, STRING_2).toNull(Date.class).test();
Convert.<Boolean,Date>from(BOOLEAN_1, BOOLEAN_2).toNull(Date.class).test();
}
-
+
@Test
public void testPrimitiveByteArray() {
byte[] array = new byte[] { 0x01, 0x02, 0x03 };
@@ -230,5 +230,5 @@
assertArrayEquals(new byte[0], ObjectConverter.convert(new byte[0], byte[].class));
assertNull(ObjectConverter.convert(null, byte[].class));
}
-
+
}
diff --git a/src/test/java/org/apache/sling/testing/resourceresolver/ResourceResolverLoginTest.java b/src/test/java/org/apache/sling/testing/resourceresolver/ResourceResolverLoginTest.java
index 13adf0b..dc45cbc 100644
--- a/src/test/java/org/apache/sling/testing/resourceresolver/ResourceResolverLoginTest.java
+++ b/src/test/java/org/apache/sling/testing/resourceresolver/ResourceResolverLoginTest.java
@@ -39,9 +39,9 @@
private static final Map<String,Object> AUTH_INFO = ImmutableMap.<String, Object>of(
ResourceResolverFactory.USER, "myUser");
-
+
private MockResourceResolverFactory factory;
-
+
@Before
public void setUp() {
factory = new MockResourceResolverFactory();
diff --git a/src/test/java/org/apache/sling/testing/resourceresolver/RootResourceTypeTest.java b/src/test/java/org/apache/sling/testing/resourceresolver/RootResourceTypeTest.java
index 3ae3363..8a11945 100644
--- a/src/test/java/org/apache/sling/testing/resourceresolver/RootResourceTypeTest.java
+++ b/src/test/java/org/apache/sling/testing/resourceresolver/RootResourceTypeTest.java
@@ -33,7 +33,7 @@
@Before
public final void setUp() throws IOException, LoginException {
- resourceResolver = new MockResourceResolverFactory().getResourceResolver(null);
+ resourceResolver = new MockResourceResolverFactory().getResourceResolver(null);
}
@Test
diff --git a/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java b/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
index f86c43b..16bf7c0 100644
--- a/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
+++ b/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
@@ -135,7 +135,7 @@
assertEquals(new BigDecimal(DOUBLE_VALUE).doubleValue(), props.get("doubleProp", BigDecimal.class).doubleValue(), 0.0001d);
assertEquals(BIGDECIMAL_VALUE.doubleValue() , props.get("bigDecimalProp", Double.class), 0.0001d);
}
-
+
@Test
public void testSimpleProperties_DeepPathAccess() throws IOException {
Resource resource1 = resourceResolver.getResource(testRoot.getPath());
@@ -171,7 +171,7 @@
assertNotNull(calendarValue);
assertEquals(DATE_VALUE, calendarValue.getTime());
}
-
+
@Test
public void testCalendarProperty() throws IOException {
Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
@@ -187,19 +187,19 @@
assertNotNull(dateValue);
assertEquals(CALENDAR_VALUE.getTime(), dateValue);
}
-
+
@Test
public void testStringToCalendarConversion() throws IOException {
Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
ModifiableValueMap modProps = resource1.adaptTo(ModifiableValueMap.class);
modProps.put("dateISO8601String", ISO8601.format(CALENDAR_VALUE));
resourceResolver.commit();
-
+
resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
ValueMap props = ResourceUtil.getValueMap(resource1);
assertEquals(CALENDAR_VALUE.getTime(), props.get("calendarProp", Calendar.class).getTime());
}
-
+
@Test
public void testListChildren() throws IOException {
Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
@@ -283,14 +283,14 @@
assertNotNull(resource);
assertEquals(testRoot.getPath() + "/node1", resource.getPath());
}
-
+
@Test
public void testResolveNonexistingResource() {
Resource resource = resourceResolver.resolve("/non/existing/path");
assertTrue(resource instanceof NonExistingResource);
assertEquals("/non/existing/path", resource.getPath());
}
-
+
@Test
public void testGetParentResourceType() throws PersistenceException {
Resource r1 = resourceResolver.create(testRoot, "resource1", ImmutableMap.<String, Object>of());
@@ -300,14 +300,14 @@
"sling:resourceType", testRoot.getPath() + "/resource2"));
Resource r4 = resourceResolver.create(testRoot, "resource4", ImmutableMap.<String, Object>of(
"sling:resourceSuperType", testRoot.getPath() + "/resource2"));
-
+
assertNull(resourceResolver.getParentResourceType(r1));
assertEquals(r1.getPath(), resourceResolver.getParentResourceType(r2));
assertEquals(r1.getPath(), resourceResolver.getParentResourceType(r3));
assertEquals(r2.getPath(), resourceResolver.getParentResourceType(r4));
assertEquals(r2.getPath(), resourceResolver.getParentResourceType(r4.getPath()));
}
-
+
@Test
public void testResourceMetadata() throws IOException {
diff --git a/src/test/java/org/apache/sling/testing/resourceresolver/ValueMapDecoratorTest.java b/src/test/java/org/apache/sling/testing/resourceresolver/ValueMapDecoratorTest.java
index 1067997..26d3547 100644
--- a/src/test/java/org/apache/sling/testing/resourceresolver/ValueMapDecoratorTest.java
+++ b/src/test/java/org/apache/sling/testing/resourceresolver/ValueMapDecoratorTest.java
@@ -158,17 +158,17 @@
Assert.assertFalse("Two ValueMapDecorators based on maps with different entries should not be equal",
valueMap.equals(valueMap2));
}
-
+
@Test
public void testDelegateToValueMap() {
ValueMap original = mock(ValueMap.class);
ValueMap decorated = new ValueMapDecorator(original);
-
+
decorated.get("prop1", String.class);
verify(original, times(1)).get("prop1", String.class);
decorated.get("prop1", "defValue");
verify(original, times(1)).get("prop1", "defValue");
}
-
+
}
diff --git a/src/test/java/org/apache/sling/testing/resourceresolver/ValueMapTest.java b/src/test/java/org/apache/sling/testing/resourceresolver/ValueMapTest.java
index 916cf17..25b0927 100644
--- a/src/test/java/org/apache/sling/testing/resourceresolver/ValueMapTest.java
+++ b/src/test/java/org/apache/sling/testing/resourceresolver/ValueMapTest.java
@@ -60,10 +60,10 @@
@Test
public void testMap() throws IOException {
Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
-
+
Map<String, Object> map = resource1.adaptTo(Map.class);
assertTrue(map instanceof ValueMap && !(map instanceof ModifiableValueMap));
-
+
assertEquals("value1", map.get("prop1"));
}
@@ -71,7 +71,7 @@
@Test(expected = UnsupportedOperationException.class)
public void testMap_Readonly() throws IOException {
Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
-
+
Map<String, Object> map = resource1.adaptTo(Map.class);
map.put("prop1", "value2");
}
@@ -79,17 +79,17 @@
@Test
public void testValueMap() throws IOException {
Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
-
+
ValueMap map = resource1.adaptTo(ValueMap.class);
assertTrue(map instanceof ValueMap && !(map instanceof ModifiableValueMap));
-
+
assertEquals("value1", map.get("prop1"));
}
@Test(expected = UnsupportedOperationException.class)
public void testValueMapMap_Readonly() throws IOException {
Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
-
+
ValueMap map = resource1.adaptTo(ValueMap.class);
map.put("prop1", "value2");
}
@@ -97,10 +97,10 @@
@Test
public void testModifiableValueMap() throws IOException {
Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
-
+
ValueMap map = resource1.adaptTo(ModifiableValueMap.class);
assertTrue(map instanceof ValueMap && map instanceof ModifiableValueMap);
-
+
assertEquals("value1", map.get("prop1"));
map.put("prop1", "value2");
}
