This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.contentparser-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-contentparser.git
commit d81cfcd25575599aa1f9fc9d7b7689d30478de77 Author: Stefan Seifert <[email protected]> AuthorDate: Tue Mar 14 10:41:47 2017 +0000 SLING-6592 move and rename to jcr/contentparser, change java package and class names accordingly git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/contentparser@1786869 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 12 ++++---- .../contentparser/ContentParser.java} | 10 +++---- .../contentparser/ContentParserFactory.java} | 32 +++++++++++----------- .../contentparser/ContentType.java} | 12 ++++---- .../contentparser}/ParseException.java | 2 +- .../contentparser}/ParserOptions.java | 2 +- .../contentparser/impl/JcrXmlContentParser.java} | 12 ++++---- .../contentparser}/impl/JcrXmlValueConverter.java | 2 +- .../contentparser/impl/JsonContentParser.java} | 12 ++++---- .../contentparser}/impl/ParserHelper.java | 6 ++-- .../contentparser}/package-info.java | 2 +- .../impl/JcrXmlContentParserTest.java} | 30 ++++++++++---------- .../impl/JcrXmlValueConverterTest.java | 4 +-- .../contentparser/impl/JsonContentParserTest.java} | 32 +++++++++++----------- .../contentparser}/impl/ParserHelperTest.java | 10 +++---- .../contentparser}/impl/TestUtils.java | 2 +- 16 files changed, 91 insertions(+), 91 deletions(-) diff --git a/pom.xml b/pom.xml index 1f775e7..e092a3a 100644 --- a/pom.xml +++ b/pom.xml @@ -26,19 +26,19 @@ <relativePath /> </parent> - <artifactId>org.apache.sling.commons.fscontentparser</artifactId> + <artifactId>org.apache.sling.jcr.contentparser</artifactId> <packaging>bundle</packaging> <version>1.0.0-SNAPSHOT</version> - <name>Apache Sling File System Content File Parser</name> + <name>Apache Sling Content Parser</name> <description> - Parser for repository content stored in files (e.g. JSON, JCR XML). + Parser for JCR repository content stored in files (e.g. JSON, FileVault XML). </description> <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/commons/fscontentparser</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/fscontentparser</developerConnection> - <url>http://svn.apache.org/viewvc/sling/trunk/bundles/commons/fscontentparser</url> + <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/contentparser</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/contentparser</developerConnection> + <url>http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser</url> </scm> <build> diff --git a/src/main/java/org/apache/sling/fscontentparser/ContentFileParser.java b/src/main/java/org/apache/sling/jcr/contentparser/ContentParser.java similarity index 89% rename from src/main/java/org/apache/sling/fscontentparser/ContentFileParser.java rename to src/main/java/org/apache/sling/jcr/contentparser/ContentParser.java index 4aa32e5..cb6d013 100644 --- a/src/main/java/org/apache/sling/fscontentparser/ContentFileParser.java +++ b/src/main/java/org/apache/sling/jcr/contentparser/ContentParser.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.fscontentparser; +package org.apache.sling.jcr.contentparser; import java.io.File; import java.io.IOException; @@ -27,7 +27,7 @@ import java.util.Map; * Parses repository content from a file. * Implementations have to be thread-safe. */ -public interface ContentFileParser { +public interface ContentParser { /** * Parse content file. @@ -39,9 +39,9 @@ public interface ContentFileParser { Map<String,Object> parse(File file) throws IOException, ParseException; /** - * Parse content file. - * @param file File - * @return Content + * Parse content. + * @param is Stream with serialized content + * @return Content as Map * @throws IOException When I/O error occurs. * @throws ParseException When parsing error occurs. */ diff --git a/src/main/java/org/apache/sling/fscontentparser/ContentFileParserFactory.java b/src/main/java/org/apache/sling/jcr/contentparser/ContentParserFactory.java similarity index 60% rename from src/main/java/org/apache/sling/fscontentparser/ContentFileParserFactory.java rename to src/main/java/org/apache/sling/jcr/contentparser/ContentParserFactory.java index 7fc66e7..7ae64e2 100644 --- a/src/main/java/org/apache/sling/fscontentparser/ContentFileParserFactory.java +++ b/src/main/java/org/apache/sling/jcr/contentparser/ContentParserFactory.java @@ -16,43 +16,43 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.fscontentparser; +package org.apache.sling.jcr.contentparser; -import org.apache.sling.fscontentparser.impl.JcrXmlContentFileParser; -import org.apache.sling.fscontentparser.impl.JsonContentFileParser; +import org.apache.sling.jcr.contentparser.impl.JcrXmlContentParser; +import org.apache.sling.jcr.contentparser.impl.JsonContentParser; /** * Factory for content file parsers. */ -public final class ContentFileParserFactory { +public final class ContentParserFactory { - private ContentFileParserFactory() { + private ContentParserFactory() { // static methods only } /** - * Create content file parser. - * @param type Content file type - * @return Content file parser + * Create content parser. + * @param type Content type + * @return Content parser */ - public static ContentFileParser create(ContentFileType type) { + public static ContentParser create(ContentType type) { return create(type, new ParserOptions()); } /** - * Create content file parser. - * @param type Content file type + * Create content parser. + * @param type Content type * @param options Parser options - * @return Content file parser + * @return Content parser */ - public static ContentFileParser create(ContentFileType type, ParserOptions options) { + public static ContentParser create(ContentType type, ParserOptions options) { switch (type) { case JSON: - return new JsonContentFileParser(options); + return new JsonContentParser(options); case JCR_XML: - return new JcrXmlContentFileParser(options); + return new JcrXmlContentParser(options); default: - throw new IllegalArgumentException("Unsupported file extension: " + type); + throw new IllegalArgumentException("Unsupported type: " + type); } } diff --git a/src/main/java/org/apache/sling/fscontentparser/ContentFileType.java b/src/main/java/org/apache/sling/jcr/contentparser/ContentType.java similarity index 84% rename from src/main/java/org/apache/sling/fscontentparser/ContentFileType.java rename to src/main/java/org/apache/sling/jcr/contentparser/ContentType.java index 72ca467..167722f 100644 --- a/src/main/java/org/apache/sling/fscontentparser/ContentFileType.java +++ b/src/main/java/org/apache/sling/jcr/contentparser/ContentType.java @@ -16,27 +16,27 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.fscontentparser; +package org.apache.sling.jcr.contentparser; /** - * Content file types. + * Content types. */ -public enum ContentFileType { +public enum ContentType { /** - * JSON content files. + * JSON content. */ JSON("json"), /** - * JCR XML content files. + * JCR XML content. */ JCR_XML("jcr.xml"); private final String extension; - private ContentFileType(String extension) { + private ContentType(String extension) { this.extension = extension; } diff --git a/src/main/java/org/apache/sling/fscontentparser/ParseException.java b/src/main/java/org/apache/sling/jcr/contentparser/ParseException.java similarity index 96% rename from src/main/java/org/apache/sling/fscontentparser/ParseException.java rename to src/main/java/org/apache/sling/jcr/contentparser/ParseException.java index 13bdab1..4df0160 100644 --- a/src/main/java/org/apache/sling/fscontentparser/ParseException.java +++ b/src/main/java/org/apache/sling/jcr/contentparser/ParseException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.fscontentparser; +package org.apache.sling.jcr.contentparser; /** * Parsing exception. diff --git a/src/main/java/org/apache/sling/fscontentparser/ParserOptions.java b/src/main/java/org/apache/sling/jcr/contentparser/ParserOptions.java similarity index 98% rename from src/main/java/org/apache/sling/fscontentparser/ParserOptions.java rename to src/main/java/org/apache/sling/jcr/contentparser/ParserOptions.java index 9f5fbcb..0911dac 100644 --- a/src/main/java/org/apache/sling/fscontentparser/ParserOptions.java +++ b/src/main/java/org/apache/sling/jcr/contentparser/ParserOptions.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.fscontentparser; +package org.apache.sling.jcr.contentparser; import java.util.Arrays; import java.util.Collections; diff --git a/src/main/java/org/apache/sling/fscontentparser/impl/JcrXmlContentFileParser.java b/src/main/java/org/apache/sling/jcr/contentparser/impl/JcrXmlContentParser.java similarity index 93% rename from src/main/java/org/apache/sling/fscontentparser/impl/JcrXmlContentFileParser.java rename to src/main/java/org/apache/sling/jcr/contentparser/impl/JcrXmlContentParser.java index c97317e..dde8c16 100644 --- a/src/main/java/org/apache/sling/fscontentparser/impl/JcrXmlContentFileParser.java +++ b/src/main/java/org/apache/sling/jcr/contentparser/impl/JcrXmlContentParser.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.fscontentparser.impl; +package org.apache.sling.jcr.contentparser.impl; import java.io.File; import java.io.FileInputStream; @@ -32,9 +32,9 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.apache.jackrabbit.util.ISO9075; -import org.apache.sling.fscontentparser.ContentFileParser; -import org.apache.sling.fscontentparser.ParseException; -import org.apache.sling.fscontentparser.ParserOptions; +import org.apache.sling.jcr.contentparser.ContentParser; +import org.apache.sling.jcr.contentparser.ParseException; +import org.apache.sling.jcr.contentparser.ParserOptions; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; @@ -44,12 +44,12 @@ import org.xml.sax.helpers.DefaultHandler; * Parses JCR XML files that contains content fragments. * Instance of this class is thread-safe. */ -public final class JcrXmlContentFileParser implements ContentFileParser { +public final class JcrXmlContentParser implements ContentParser { private final ParserHelper helper; private final SAXParserFactory saxParserFactory; - public JcrXmlContentFileParser(ParserOptions options) { + public JcrXmlContentParser(ParserOptions options) { this.helper = new ParserHelper(options); saxParserFactory = SAXParserFactory.newInstance(); saxParserFactory.setNamespaceAware(true); diff --git a/src/main/java/org/apache/sling/fscontentparser/impl/JcrXmlValueConverter.java b/src/main/java/org/apache/sling/jcr/contentparser/impl/JcrXmlValueConverter.java similarity index 99% rename from src/main/java/org/apache/sling/fscontentparser/impl/JcrXmlValueConverter.java rename to src/main/java/org/apache/sling/jcr/contentparser/impl/JcrXmlValueConverter.java index cb65b30..f4cdfc4 100644 --- a/src/main/java/org/apache/sling/fscontentparser/impl/JcrXmlValueConverter.java +++ b/src/main/java/org/apache/sling/jcr/contentparser/impl/JcrXmlValueConverter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.fscontentparser.impl; +package org.apache.sling.jcr.contentparser.impl; import java.lang.reflect.Array; import java.math.BigDecimal; diff --git a/src/main/java/org/apache/sling/fscontentparser/impl/JsonContentFileParser.java b/src/main/java/org/apache/sling/jcr/contentparser/impl/JsonContentParser.java similarity index 93% rename from src/main/java/org/apache/sling/fscontentparser/impl/JsonContentFileParser.java rename to src/main/java/org/apache/sling/jcr/contentparser/impl/JsonContentParser.java index 4dca092..b070701 100644 --- a/src/main/java/org/apache/sling/fscontentparser/impl/JsonContentFileParser.java +++ b/src/main/java/org/apache/sling/jcr/contentparser/impl/JsonContentParser.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.fscontentparser.impl; +package org.apache.sling.jcr.contentparser.impl; import java.io.File; import java.io.FileInputStream; @@ -37,20 +37,20 @@ import javax.json.JsonString; import javax.json.JsonValue; import javax.json.stream.JsonParsingException; -import org.apache.sling.fscontentparser.ContentFileParser; -import org.apache.sling.fscontentparser.ParseException; -import org.apache.sling.fscontentparser.ParserOptions; +import org.apache.sling.jcr.contentparser.ContentParser; +import org.apache.sling.jcr.contentparser.ParseException; +import org.apache.sling.jcr.contentparser.ParserOptions; /** * Parses JSON files that contains content fragments. * Instance of this class is thread-safe. */ -public final class JsonContentFileParser implements ContentFileParser { +public final class JsonContentParser implements ContentParser { private final ParserHelper helper; private final JsonReaderFactory jsonReaderFactory; - public JsonContentFileParser(ParserOptions options) { + public JsonContentParser(ParserOptions options) { this.helper = new ParserHelper(options); // allow comments in JSON files Map<String,Object> jsonReaderFactoryConfig = new HashMap<>(); diff --git a/src/main/java/org/apache/sling/fscontentparser/impl/ParserHelper.java b/src/main/java/org/apache/sling/jcr/contentparser/impl/ParserHelper.java similarity index 96% rename from src/main/java/org/apache/sling/fscontentparser/impl/ParserHelper.java rename to src/main/java/org/apache/sling/jcr/contentparser/impl/ParserHelper.java index 0f54015..160cd0e 100644 --- a/src/main/java/org/apache/sling/fscontentparser/impl/ParserHelper.java +++ b/src/main/java/org/apache/sling/jcr/contentparser/impl/ParserHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.fscontentparser.impl; +package org.apache.sling.jcr.contentparser.impl; import java.lang.reflect.Array; import java.text.DateFormat; @@ -28,8 +28,8 @@ import java.util.Map; import java.util.Set; import org.apache.commons.lang3.StringUtils; -import org.apache.sling.fscontentparser.ParseException; -import org.apache.sling.fscontentparser.ParserOptions; +import org.apache.sling.jcr.contentparser.ParseException; +import org.apache.sling.jcr.contentparser.ParserOptions; /** * Helper parsing logic based on parser options. diff --git a/src/main/java/org/apache/sling/fscontentparser/package-info.java b/src/main/java/org/apache/sling/jcr/contentparser/package-info.java similarity index 95% rename from src/main/java/org/apache/sling/fscontentparser/package-info.java rename to src/main/java/org/apache/sling/jcr/contentparser/package-info.java index 4179ffd..21b7f41 100644 --- a/src/main/java/org/apache/sling/fscontentparser/package-info.java +++ b/src/main/java/org/apache/sling/jcr/contentparser/package-info.java @@ -20,4 +20,4 @@ * Parser for repository content stored in files (e.g. JSON, JCR XML). */ @org.osgi.annotation.versioning.Version("1.0.0") -package org.apache.sling.fscontentparser; +package org.apache.sling.jcr.contentparser; diff --git a/src/test/java/org/apache/sling/fscontentparser/impl/JcrXmlContentFileParserTest.java b/src/test/java/org/apache/sling/jcr/contentparser/impl/JcrXmlContentParserTest.java similarity index 78% rename from src/test/java/org/apache/sling/fscontentparser/impl/JcrXmlContentFileParserTest.java rename to src/test/java/org/apache/sling/jcr/contentparser/impl/JcrXmlContentParserTest.java index cf78f49..d99a025 100644 --- a/src/test/java/org/apache/sling/fscontentparser/impl/JcrXmlContentFileParserTest.java +++ b/src/test/java/org/apache/sling/jcr/contentparser/impl/JcrXmlContentParserTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.fscontentparser.impl; +package org.apache.sling.jcr.contentparser.impl; -import static org.apache.sling.fscontentparser.impl.TestUtils.getDeep; +import static org.apache.sling.jcr.contentparser.impl.TestUtils.getDeep; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -31,18 +31,18 @@ import java.util.Map; import java.util.TimeZone; import org.apache.jackrabbit.util.ISO9075; -import org.apache.sling.fscontentparser.ContentFileType; -import org.apache.sling.fscontentparser.ContentFileParser; -import org.apache.sling.fscontentparser.ContentFileParserFactory; -import org.apache.sling.fscontentparser.ParseException; -import org.apache.sling.fscontentparser.ParserOptions; +import org.apache.sling.jcr.contentparser.ContentParser; +import org.apache.sling.jcr.contentparser.ContentParserFactory; +import org.apache.sling.jcr.contentparser.ContentType; +import org.apache.sling.jcr.contentparser.ParseException; +import org.apache.sling.jcr.contentparser.ParserOptions; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; import com.google.common.collect.ImmutableSet; -public class JcrXmlContentFileParserTest { +public class JcrXmlContentParserTest { private File file; @@ -54,7 +54,7 @@ public class JcrXmlContentFileParserTest { @SuppressWarnings("unchecked") @Test public void testParseJcrXml() throws Exception { - ContentFileParser underTest = ContentFileParserFactory.create(ContentFileType.JCR_XML); + ContentParser underTest = ContentParserFactory.create(ContentType.JCR_XML); Map<String,Object> content = underTest.parse(file); assertNotNull(content); assertEquals("app:Page", content.get("jcr:primaryType")); @@ -64,13 +64,13 @@ public class JcrXmlContentFileParserTest { @Test(expected=ParseException.class) public void testParseInvalidJcrXml() throws Exception { file = new File("src/test/resources/invalid-test/invalid.jcr.xml"); - ContentFileParser underTest = ContentFileParserFactory.create(ContentFileType.JCR_XML); + ContentParser underTest = ContentParserFactory.create(ContentType.JCR_XML); underTest.parse(file); } @Test public void testDataTypes() throws Exception { - ContentFileParser underTest = ContentFileParserFactory.create(ContentFileType.JCR_XML); + ContentParser underTest = ContentParserFactory.create(ContentType.JCR_XML); Map<String,Object> content = underTest.parse(file); Map<String,Object> props = getDeep(content, "jcr:content"); @@ -95,13 +95,13 @@ public class JcrXmlContentFileParserTest { @Test public void testDecodeName() { - assertEquals("jcr:title", JcrXmlContentFileParser.decodeName("jcr:" + ISO9075.encode("title"))); - assertEquals("sling:123", JcrXmlContentFileParser.decodeName("sling:" + ISO9075.encode("123"))); + assertEquals("jcr:title", JcrXmlContentParser.decodeName("jcr:" + ISO9075.encode("title"))); + assertEquals("sling:123", JcrXmlContentParser.decodeName("sling:" + ISO9075.encode("123"))); } @Test public void testIgnoreResourcesProperties() throws Exception { - ContentFileParser underTest = ContentFileParserFactory.create(ContentFileType.JCR_XML, new ParserOptions() + ContentParser underTest = ContentParserFactory.create(ContentType.JCR_XML, new ParserOptions() .ignoreResourceNames(ImmutableSet.of("teaserbar", "aside")) .ignorePropertyNames(ImmutableSet.of("longProp", "jcr:title"))); Map<String,Object> content = underTest.parse(file); @@ -119,7 +119,7 @@ public class JcrXmlContentFileParserTest { @Test @Ignore public void testSameNamePropertyAndSubResource() throws Exception { - ContentFileParser underTest = ContentFileParserFactory.create(ContentFileType.JCR_XML); + ContentParser underTest = ContentParserFactory.create(ContentType.JCR_XML); Map<String,Object> content = underTest.parse(file); Map<String,Object> props = getDeep(content, "jcr:content/teaserbar"); // teaserbaritem is a direct property as well as a sub resource diff --git a/src/test/java/org/apache/sling/fscontentparser/impl/JcrXmlValueConverterTest.java b/src/test/java/org/apache/sling/jcr/contentparser/impl/JcrXmlValueConverterTest.java similarity index 97% rename from src/test/java/org/apache/sling/fscontentparser/impl/JcrXmlValueConverterTest.java rename to src/test/java/org/apache/sling/jcr/contentparser/impl/JcrXmlValueConverterTest.java index a3b51ab..c3ec747 100644 --- a/src/test/java/org/apache/sling/fscontentparser/impl/JcrXmlValueConverterTest.java +++ b/src/test/java/org/apache/sling/jcr/contentparser/impl/JcrXmlValueConverterTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.fscontentparser.impl; +package org.apache.sling.jcr.contentparser.impl; -import static org.apache.sling.fscontentparser.impl.JcrXmlValueConverter.parseValue; +import static org.apache.sling.jcr.contentparser.impl.JcrXmlValueConverter.parseValue; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/src/test/java/org/apache/sling/fscontentparser/impl/JsonContentFileParserTest.java b/src/test/java/org/apache/sling/jcr/contentparser/impl/JsonContentParserTest.java similarity index 80% rename from src/test/java/org/apache/sling/fscontentparser/impl/JsonContentFileParserTest.java rename to src/test/java/org/apache/sling/jcr/contentparser/impl/JsonContentParserTest.java index 6a0b8f6..a98757a 100644 --- a/src/test/java/org/apache/sling/fscontentparser/impl/JsonContentFileParserTest.java +++ b/src/test/java/org/apache/sling/jcr/contentparser/impl/JsonContentParserTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.fscontentparser.impl; +package org.apache.sling.jcr.contentparser.impl; -import static org.apache.sling.fscontentparser.impl.TestUtils.getDeep; +import static org.apache.sling.jcr.contentparser.impl.TestUtils.getDeep; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -30,17 +30,17 @@ import java.util.Calendar; import java.util.Map; import java.util.TimeZone; -import org.apache.sling.fscontentparser.ContentFileType; -import org.apache.sling.fscontentparser.ContentFileParser; -import org.apache.sling.fscontentparser.ContentFileParserFactory; -import org.apache.sling.fscontentparser.ParseException; -import org.apache.sling.fscontentparser.ParserOptions; +import org.apache.sling.jcr.contentparser.ContentParser; +import org.apache.sling.jcr.contentparser.ContentParserFactory; +import org.apache.sling.jcr.contentparser.ContentType; +import org.apache.sling.jcr.contentparser.ParseException; +import org.apache.sling.jcr.contentparser.ParserOptions; import org.junit.Before; import org.junit.Test; import com.google.common.collect.ImmutableSet; -public class JsonContentFileParserTest { +public class JsonContentParserTest { private File file; @@ -51,7 +51,7 @@ public class JsonContentFileParserTest { @Test public void testPageJcrPrimaryType() throws Exception { - ContentFileParser underTest = ContentFileParserFactory.create(ContentFileType.JSON); + ContentParser underTest = ContentParserFactory.create(ContentType.JSON); Map<String, Object> content = underTest.parse(file); assertEquals("app:Page", content.get("jcr:primaryType")); @@ -59,7 +59,7 @@ public class JsonContentFileParserTest { @Test public void testDataTypes() throws Exception { - ContentFileParser underTest = ContentFileParserFactory.create(ContentFileType.JSON); + ContentParser underTest = ContentParserFactory.create(ContentType.JSON); Map<String, Object> content = underTest.parse(file); Map<String, Object> props = getDeep(content, "toolbar/profiles/jcr:content"); @@ -76,7 +76,7 @@ public class JsonContentFileParserTest { @Test public void testContentProperties() throws Exception { - ContentFileParser underTest = ContentFileParserFactory.create(ContentFileType.JSON); + ContentParser underTest = ContentParserFactory.create(ContentType.JSON); Map<String, Object> content = underTest.parse(file); Map<String, Object> props = getDeep(content, "jcr:content/header"); @@ -85,7 +85,7 @@ public class JsonContentFileParserTest { @Test public void testCalendar() throws Exception { - ContentFileParser underTest = ContentFileParserFactory.create(ContentFileType.JSON, + ContentParser underTest = ContentParserFactory.create(ContentType.JSON, new ParserOptions().detectCalendarValues(true)); Map<String, Object> content = underTest.parse(file); @@ -107,7 +107,7 @@ public class JsonContentFileParserTest { @Test public void testUTF8Chars() throws Exception { - ContentFileParser underTest = ContentFileParserFactory.create(ContentFileType.JSON); + ContentParser underTest = ContentParserFactory.create(ContentType.JSON); Map<String, Object> content = underTest.parse(file); Map<String, Object> props = getDeep(content, "jcr:content"); @@ -118,7 +118,7 @@ public class JsonContentFileParserTest { @Test(expected = ParseException.class) public void testParseInvalidJson() throws Exception { file = new File("src/test/resources/invalid-test/invalid.json"); - ContentFileParser underTest = ContentFileParserFactory.create(ContentFileType.JSON); + ContentParser underTest = ContentParserFactory.create(ContentType.JSON); Map<String, Object> content = underTest.parse(file); assertNull(content); } @@ -126,14 +126,14 @@ public class JsonContentFileParserTest { @Test(expected = ParseException.class) public void testParseInvalidJsonWithObjectList() throws Exception { file = new File("src/test/resources/invalid-test/contentWithObjectList.json"); - ContentFileParser underTest = ContentFileParserFactory.create(ContentFileType.JSON); + ContentParser underTest = ContentParserFactory.create(ContentType.JSON); Map<String, Object> content = underTest.parse(file); assertNull(content); } @Test public void testIgnoreResourcesProperties() throws Exception { - ContentFileParser underTest = ContentFileParserFactory.create(ContentFileType.JSON, + ContentParser underTest = ContentParserFactory.create(ContentType.JSON, new ParserOptions().ignoreResourceNames(ImmutableSet.of("header", "newslist")) .ignorePropertyNames(ImmutableSet.of("jcr:title"))); Map<String, Object> content = underTest.parse(file); diff --git a/src/test/java/org/apache/sling/fscontentparser/impl/ParserHelperTest.java b/src/test/java/org/apache/sling/jcr/contentparser/impl/ParserHelperTest.java similarity index 95% rename from src/test/java/org/apache/sling/fscontentparser/impl/ParserHelperTest.java rename to src/test/java/org/apache/sling/jcr/contentparser/impl/ParserHelperTest.java index a162a9a..f9e72da 100644 --- a/src/test/java/org/apache/sling/fscontentparser/impl/ParserHelperTest.java +++ b/src/test/java/org/apache/sling/jcr/contentparser/impl/ParserHelperTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.fscontentparser.impl; +package org.apache.sling.jcr.contentparser.impl; -import static org.apache.sling.fscontentparser.ParserOptions.DEFAULT_PRIMARY_TYPE; -import static org.apache.sling.fscontentparser.impl.ParserHelper.JCR_PRIMARYTYPE; +import static org.apache.sling.jcr.contentparser.ParserOptions.DEFAULT_PRIMARY_TYPE; +import static org.apache.sling.jcr.contentparser.impl.ParserHelper.JCR_PRIMARYTYPE; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -32,8 +32,8 @@ import java.util.HashMap; import java.util.Map; import java.util.TimeZone; -import org.apache.sling.fscontentparser.ParseException; -import org.apache.sling.fscontentparser.ParserOptions; +import org.apache.sling.jcr.contentparser.ParseException; +import org.apache.sling.jcr.contentparser.ParserOptions; import org.junit.Test; import com.google.common.collect.ImmutableMap; diff --git a/src/test/java/org/apache/sling/fscontentparser/impl/TestUtils.java b/src/test/java/org/apache/sling/jcr/contentparser/impl/TestUtils.java similarity index 96% rename from src/test/java/org/apache/sling/fscontentparser/impl/TestUtils.java rename to src/test/java/org/apache/sling/jcr/contentparser/impl/TestUtils.java index eb416a7..bd3bb10 100644 --- a/src/test/java/org/apache/sling/fscontentparser/impl/TestUtils.java +++ b/src/test/java/org/apache/sling/jcr/contentparser/impl/TestUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.fscontentparser.impl; +package org.apache.sling.jcr.contentparser.impl; import java.util.Map; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
