You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by je...@apache.org on 2019/08/23 17:45:32 UTC
[sling-whiteboard] branch master updated: remove unneeded code and
clean classes
This is an automated email from the ASF dual-hosted git repository.
jeb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new 595353a remove unneeded code and clean classes
595353a is described below
commit 595353a62b25acb9da47945cf05bd24e1605c6d9
Author: JE Bailey <je...@apache.org>
AuthorDate: Fri Aug 23 13:45:12 2019 -0400
remove unneeded code and clean classes
---
...sformationStepManager.java => TransformationManager.java} | 2 +-
.../org/apache/sling/transformer/impl/LinkTransformer.java | 3 +--
.../apache/sling/transformer/impl/TransformationFilter.java | 2 +-
...onStepManagerImpl.java => TransformationManagerImpl.java} | 12 ++++++------
...{TransformerResponse.java => TransformationResponse.java} | 6 +++---
.../impl/{ParserWriter.java => TransformationWriter.java} | 4 ++--
6 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/transformer/src/main/java/org/apache/sling/transformer/TransformationStepManager.java b/transformer/src/main/java/org/apache/sling/transformer/TransformationManager.java
similarity index 93%
rename from transformer/src/main/java/org/apache/sling/transformer/TransformationStepManager.java
rename to transformer/src/main/java/org/apache/sling/transformer/TransformationManager.java
index 9da9f46..d62f335 100644
--- a/transformer/src/main/java/org/apache/sling/transformer/TransformationStepManager.java
+++ b/transformer/src/main/java/org/apache/sling/transformer/TransformationManager.java
@@ -20,7 +20,7 @@ import java.util.List;
import org.apache.sling.api.SlingHttpServletRequest;
-public interface TransformationStepManager {
+public interface TransformationManager {
List<TransformationStep> getSteps(SlingHttpServletRequest request);
diff --git a/transformer/src/main/java/org/apache/sling/transformer/impl/LinkTransformer.java b/transformer/src/main/java/org/apache/sling/transformer/impl/LinkTransformer.java
index a54ca25..6755e99 100644
--- a/transformer/src/main/java/org/apache/sling/transformer/impl/LinkTransformer.java
+++ b/transformer/src/main/java/org/apache/sling/transformer/impl/LinkTransformer.java
@@ -74,7 +74,7 @@ public class LinkTransformer implements TransformationStep {
case END_TAG:
if (element.getValue().equalsIgnoreCase("body")) {
String headerValue = Base64.getEncoder().encodeToString(d.digest());
- process.getResponse().addHeader("X-Sucks", headerValue);
+ process.getResponse().setHeader("X-Sucks", headerValue);
HtmlElement br = ElementFactory.create(HtmlElementType.START_TAG, "br");
br.setAttribute("data-hash",headerValue );
process.next(br);
@@ -82,7 +82,6 @@ public class LinkTransformer implements TransformationStep {
break;
default:
break;
-
}
break;
default:
diff --git a/transformer/src/main/java/org/apache/sling/transformer/impl/TransformationFilter.java b/transformer/src/main/java/org/apache/sling/transformer/impl/TransformationFilter.java
index 9d2ba07..15c31b8 100644
--- a/transformer/src/main/java/org/apache/sling/transformer/impl/TransformationFilter.java
+++ b/transformer/src/main/java/org/apache/sling/transformer/impl/TransformationFilter.java
@@ -75,7 +75,7 @@ public class TransformationFilter implements Filter {
if (slingRequest.getRequestURI().endsWith(".html")){
TransformationContextImpl stepProcess = new TransformationContextImpl(slingRequest, slingResponse);
- response = new TransformerResponse(stepProcess);
+ response = new TransformationResponse(stepProcess);
}
chain.doFilter(request, response);
diff --git a/transformer/src/main/java/org/apache/sling/transformer/impl/TransformationStepManagerImpl.java b/transformer/src/main/java/org/apache/sling/transformer/impl/TransformationManagerImpl.java
similarity index 84%
rename from transformer/src/main/java/org/apache/sling/transformer/impl/TransformationStepManagerImpl.java
rename to transformer/src/main/java/org/apache/sling/transformer/impl/TransformationManagerImpl.java
index ca5e1b8..6d9970d 100644
--- a/transformer/src/main/java/org/apache/sling/transformer/impl/TransformationStepManagerImpl.java
+++ b/transformer/src/main/java/org/apache/sling/transformer/impl/TransformationManagerImpl.java
@@ -22,7 +22,7 @@ import java.util.Map;
import java.util.TreeMap;
import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.transformer.TransformationStepManager;
+import org.apache.sling.transformer.TransformationManager;
import org.apache.sling.transformer.TransformationStep;
import org.osgi.framework.Constants;
import org.osgi.service.component.annotations.Component;
@@ -32,18 +32,18 @@ import org.osgi.service.component.annotations.ReferencePolicy;
import org.osgi.service.component.annotations.ReferencePolicyOption;
@Component
-public class TransformationStepManagerImpl implements TransformationStepManager {
+public class TransformationManagerImpl implements TransformationManager {
// comparison in the same manner of a filter, where the highest ranking goes
// first
// in a situation where ranking is identical, then the lowest service id goes
// first
private Map<Map<String, Object>, TransformationStep> mapping = new TreeMap<>((map1, map2) -> {
- Integer value1 = (Integer) map1.getOrDefault(Constants.SERVICE_RANKING, (Integer) 0);
- Integer value2 = (Integer) map2.getOrDefault(Constants.SERVICE_RANKING, (Integer) 0);
+ Long value1 = (Long) map1.getOrDefault(Constants.SERVICE_RANKING, (Long) 0L);
+ Long value2 = (Long) map2.getOrDefault(Constants.SERVICE_RANKING, (Long) 0L);
if (value1 - value2 == 0) {
- value1 = (Integer) map1.get(Constants.SERVICE_ID);
- value2 = (Integer) map2.get(Constants.SERVICE_ID);
+ value1 = (Long) map1.get(Constants.SERVICE_ID);
+ value2 = (Long) map2.get(Constants.SERVICE_ID);
return value2.compareTo(value1);
}
return value1.compareTo(value2);
diff --git a/transformer/src/main/java/org/apache/sling/transformer/impl/TransformerResponse.java b/transformer/src/main/java/org/apache/sling/transformer/impl/TransformationResponse.java
similarity index 90%
rename from transformer/src/main/java/org/apache/sling/transformer/impl/TransformerResponse.java
rename to transformer/src/main/java/org/apache/sling/transformer/impl/TransformationResponse.java
index e4bd312..6e779ef 100644
--- a/transformer/src/main/java/org/apache/sling/transformer/impl/TransformerResponse.java
+++ b/transformer/src/main/java/org/apache/sling/transformer/impl/TransformationResponse.java
@@ -21,7 +21,7 @@ import java.io.PrintWriter;
import org.apache.sling.api.wrappers.SlingHttpServletResponseWrapper;
-class TransformerResponse
+class TransformationResponse
extends SlingHttpServletResponseWrapper {
/** wrapped rewriter/servlet writer */
@@ -31,7 +31,7 @@ class TransformerResponse
private TransformationContextImpl process;
- public TransformerResponse(TransformationContextImpl process) {
+ public TransformationResponse(TransformationContextImpl process) {
super(process.getResponse());
this.process = process;
}
@@ -43,7 +43,7 @@ class TransformerResponse
*/
public PrintWriter getWriter() throws IOException {
if ( this.writer == null ) {
- this.writer = new PrintWriter(new ParserWriter(process));
+ this.writer = new PrintWriter(new TransformationWriter(process));
}
return writer;
}
diff --git a/transformer/src/main/java/org/apache/sling/transformer/impl/ParserWriter.java b/transformer/src/main/java/org/apache/sling/transformer/impl/TransformationWriter.java
similarity index 90%
rename from transformer/src/main/java/org/apache/sling/transformer/impl/ParserWriter.java
rename to transformer/src/main/java/org/apache/sling/transformer/impl/TransformationWriter.java
index 7f4cb7b..e84b8a4 100644
--- a/transformer/src/main/java/org/apache/sling/transformer/impl/ParserWriter.java
+++ b/transformer/src/main/java/org/apache/sling/transformer/impl/TransformationWriter.java
@@ -23,13 +23,13 @@ import java.util.stream.Collectors;
import org.apache.sling.commons.html.Html;
import org.apache.sling.commons.html.util.HtmlElements;
-public class ParserWriter extends Writer {
+public class TransformationWriter extends Writer {
private Writer originalWriter;
private TransformationStepWrapper wrapper;
- public ParserWriter(TransformationContextImpl process) throws IOException {
+ public TransformationWriter(TransformationContextImpl process) throws IOException {
this.originalWriter = process.getWriter();
this.wrapper = new TransformationStepWrapper(new LinkTransformer(), process);
}