From commits-return-66199-archive-asf-public=cust-asf.ponee.io@sling.apache.org Mon Apr 2 11:30:41 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id C7AC8180627 for ; Mon, 2 Apr 2018 11:30:40 +0200 (CEST) Received: (qmail 29506 invoked by uid 500); 2 Apr 2018 09:30:39 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 29496 invoked by uid 99); 2 Apr 2018 09:30:39 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Apr 2018 09:30:39 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 326358090E; Mon, 2 Apr 2018 09:30:39 +0000 (UTC) Date: Mon, 02 Apr 2018 09:30:39 +0000 To: "commits@sling.apache.org" Subject: [sling-org-apache-sling-commons-html] branch master updated: SLING-6783 Updates for Commons HTML MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <152266143916.5040.911975325124457322@gitbox.apache.org> From: olli@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: sling-org-apache-sling-commons-html X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: a765ddaa13027e3a8d3ba92c4254e88254b469b4 X-Git-Newrev: 8dca770393fdd1f7134ad1abb9706eeab3c680e6 X-Git-Rev: 8dca770393fdd1f7134ad1abb9706eeab3c680e6 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. olli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-html.git The following commit(s) were added to refs/heads/master by this push: new 8dca770 SLING-6783 Updates for Commons HTML 8dca770 is described below commit 8dca770393fdd1f7134ad1abb9706eeab3c680e6 Author: Oliver Lietz AuthorDate: Mon Apr 2 11:30:31 2018 +0200 SLING-6783 Updates for Commons HTML fix features/properties mess --- .../commons/html/internal/TagsoupHtmlParser.java | 20 ++++++++++---------- .../internal/TagsoupHtmlParserConfiguration.java | 6 +++--- .../sling/commons/html/it/TagsoupHtmlParserIT.java | 10 +++++----- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/apache/sling/commons/html/internal/TagsoupHtmlParser.java b/src/main/java/org/apache/sling/commons/html/internal/TagsoupHtmlParser.java index 082f5b0..6b63a65 100644 --- a/src/main/java/org/apache/sling/commons/html/internal/TagsoupHtmlParser.java +++ b/src/main/java/org/apache/sling/commons/html/internal/TagsoupHtmlParser.java @@ -49,7 +49,7 @@ import org.xml.sax.ext.LexicalHandler; ) public class TagsoupHtmlParser implements HtmlParser { - private Map properties = Collections.synchronizedMap(new LinkedHashMap<>()); + private Map features = Collections.synchronizedMap(new LinkedHashMap<>()); @Activate private void activate(final TagsoupHtmlParserConfiguration configuration) { @@ -63,14 +63,14 @@ public class TagsoupHtmlParser implements HtmlParser { @Deactivate private void deactivate() { - properties.clear(); + features.clear(); } private void configure(final TagsoupHtmlParserConfiguration configuration) { - properties.clear(); - final Map map = PropertiesUtil.toMap(configuration.parser_properties(), new String[]{}); + features.clear(); + final Map map = PropertiesUtil.toMap(configuration.parser_features(), new String[]{}); for (final String key : map.keySet()) { - properties.put(key, Boolean.valueOf(map.get(key))); + features.put(key, Boolean.valueOf(map.get(key))); } } @@ -79,7 +79,7 @@ public class TagsoupHtmlParser implements HtmlParser { */ @Override public void parse(final InputStream stream, final String encoding, final ContentHandler contentHandler) throws SAXException { - final Parser parser = buildParser(properties, contentHandler); + final Parser parser = buildParser(features, contentHandler); final InputSource source = new InputSource(stream); source.setEncoding(encoding); try { @@ -101,7 +101,7 @@ public class TagsoupHtmlParser implements HtmlParser { source.setSystemId(systemId); try { - final Parser parser = buildParser(properties, builder); + final Parser parser = buildParser(features, builder); parser.parse(source); } catch (SAXException se) { if (se.getCause() instanceof IOException) { @@ -112,14 +112,14 @@ public class TagsoupHtmlParser implements HtmlParser { return builder.getDocument(); } - private Parser buildParser(final Map properties, final ContentHandler contentHandler) throws SAXException { + private Parser buildParser(final Map features, final ContentHandler contentHandler) throws SAXException { final Parser parser = new Parser(); parser.setContentHandler(contentHandler); if (contentHandler instanceof LexicalHandler) { parser.setProperty("http://xml.org/sax/properties/lexical-handler", contentHandler); } - for (final String key : properties.keySet()) { - parser.setProperty(key, properties.get(key)); + for (final String key : features.keySet()) { + parser.setFeature(key, features.get(key)); } return parser; } diff --git a/src/main/java/org/apache/sling/commons/html/internal/TagsoupHtmlParserConfiguration.java b/src/main/java/org/apache/sling/commons/html/internal/TagsoupHtmlParserConfiguration.java index 95fd232..dd1ccef 100644 --- a/src/main/java/org/apache/sling/commons/html/internal/TagsoupHtmlParserConfiguration.java +++ b/src/main/java/org/apache/sling/commons/html/internal/TagsoupHtmlParserConfiguration.java @@ -28,9 +28,9 @@ import org.osgi.service.metatype.annotations.ObjectClassDefinition; @interface TagsoupHtmlParserConfiguration { @AttributeDefinition( - name = "parser properties", - description = "Additional properties to be applied to the underlying parser in the format of key=[true|false]" + name = "parser features", + description = "Turn features in the underlying parser on or off by setting featureID=[true|false]" ) - String[] parser_properties() default {}; + String[] parser_features() default {}; } diff --git a/src/test/java/org/apache/sling/commons/html/it/TagsoupHtmlParserIT.java b/src/test/java/org/apache/sling/commons/html/it/TagsoupHtmlParserIT.java index 1f4c585..095aabc 100644 --- a/src/test/java/org/apache/sling/commons/html/it/TagsoupHtmlParserIT.java +++ b/src/test/java/org/apache/sling/commons/html/it/TagsoupHtmlParserIT.java @@ -50,7 +50,7 @@ public class TagsoupHtmlParserIT extends HtmlTestSupport { return new Option[]{ this.baseConfiguration(), newConfiguration("org.apache.sling.commons.html.internal.TagsoupHtmlParser") - .put("parser.properties", "foo=true") + .put("parser.features", "foo=true") .asOption(), }; } @@ -61,10 +61,10 @@ public class TagsoupHtmlParserIT extends HtmlTestSupport { } @Test - public void testConfiguration() throws IllegalAccessException { - @SuppressWarnings("unchecked") final Map properties = (Map) FieldUtils.readDeclaredField(htmlParser, "properties", true); - assertNotNull(properties); - final Boolean foo = properties.get("foo"); + public void testFeaturesConfiguration() throws IllegalAccessException { + @SuppressWarnings("unchecked") final Map features = (Map) FieldUtils.readDeclaredField(htmlParser, "features", true); + assertNotNull(features); + final Boolean foo = features.get("foo"); assertTrue(foo); } -- To stop receiving notification emails like this one, please contact olli@apache.org.