You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2019/04/12 21:32:13 UTC
[sling-org-apache-sling-app-cms] branch master updated: Adding
@Override annotations and leveraging the singleton map utility instead of
constructing a map inline
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
The following commit(s) were added to refs/heads/master by this push:
new b140423 Adding @Override annotations and leveraging the singleton map utility instead of constructing a map inline
b140423 is described below
commit b14042379127b13649e455ce196bd751a3bfb00f
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri Apr 12 17:32:04 2019 -0400
Adding @Override annotations and leveraging the singleton map utility
instead of constructing a map inline
---
.../main/java/org/apache/sling/cms/Reference.java | 1 +
.../cms/core/insights/impl/FakeHttpSession.java | 17 +++++
.../sling/cms/core/insights/impl/FakeRequest.java | 56 ++++++++++++++-
.../cms/core/internal/models/ComponentImpl.java | 6 ++
.../core/internal/models/ComponentManagerImpl.java | 3 +
.../core/internal/models/EditableResourceImpl.java | 5 ++
.../sling/cms/core/internal/models/PageImpl.java | 18 +++++
.../cms/core/internal/models/PageTemplateImpl.java | 6 ++
.../internal/models/PageTemplateManagerImpl.java | 1 +
.../cms/core/internal/models/ReferencesImpl.java | 1 +
.../sling/cms/core/internal/models/SiteImpl.java | 20 ++----
.../cms/core/internal/models/SiteManagerImpl.java | 1 +
.../internal/operations/CheckpointOperation.java | 3 +-
.../core/internal/rewriter/HTML5Serializer.java | 11 +++
.../apache/sling/cms/core/models/ErrorHandler.java | 12 ++--
.../apache/sling/cms/core/models/LocaleList.java | 3 +-
.../impl/ReadabilityServiceFactoryImpl.java | 1 +
.../readability/impl/ReadabilityServiceImpl.java | 1 +
.../usergenerated/impl/ApproveUGCOperation.java | 9 +--
.../cms/reference/impl/SearchServiceImpl.java | 82 +++++++++++-----------
20 files changed, 186 insertions(+), 71 deletions(-)
diff --git a/api/src/main/java/org/apache/sling/cms/Reference.java b/api/src/main/java/org/apache/sling/cms/Reference.java
index 8ae9d2f..927543a 100644
--- a/api/src/main/java/org/apache/sling/cms/Reference.java
+++ b/api/src/main/java/org/apache/sling/cms/Reference.java
@@ -64,6 +64,7 @@ public class Reference {
return null;
}
+ @Override
public String toString() {
return resource.getPath() + "@" + property;
}
diff --git a/core/src/main/java/org/apache/sling/cms/core/insights/impl/FakeHttpSession.java b/core/src/main/java/org/apache/sling/cms/core/insights/impl/FakeHttpSession.java
index ec7a192..93642af 100644
--- a/core/src/main/java/org/apache/sling/cms/core/insights/impl/FakeHttpSession.java
+++ b/core/src/main/java/org/apache/sling/cms/core/insights/impl/FakeHttpSession.java
@@ -30,70 +30,87 @@ import javax.servlet.http.HttpSessionContext;
@SuppressWarnings("deprecation")
public class FakeHttpSession implements HttpSession {
+ @Override
public long getCreationTime() {
throw new UnsupportedOperationException();
}
+ @Override
public String getId() {
throw new UnsupportedOperationException();
}
+ @Override
public long getLastAccessedTime() {
throw new UnsupportedOperationException();
}
+ @Override
public ServletContext getServletContext() {
throw new UnsupportedOperationException();
}
+ @Override
public void setMaxInactiveInterval(int i) {
throw new UnsupportedOperationException();
}
+ @Override
public int getMaxInactiveInterval() {
throw new UnsupportedOperationException();
}
+ @Override
public HttpSessionContext getSessionContext() {
throw new UnsupportedOperationException();
}
+ @Override
public Object getAttribute(String s) {
throw new UnsupportedOperationException();
}
+ @Override
public Object getValue(String s) {
throw new UnsupportedOperationException();
}
+ @Override
public Enumeration<?> getAttributeNames() {
throw new UnsupportedOperationException();
}
+ @Override
public String[] getValueNames() {
throw new UnsupportedOperationException();
}
+ @Override
public void setAttribute(String s, Object o) {
throw new UnsupportedOperationException();
}
+ @Override
public void putValue(String s, Object o) {
throw new UnsupportedOperationException();
}
+ @Override
public void removeAttribute(String s) {
throw new UnsupportedOperationException();
}
+ @Override
public void removeValue(String s) {
throw new UnsupportedOperationException();
}
+ @Override
public void invalidate() {
throw new UnsupportedOperationException();
}
+ @Override
public boolean isNew() {
throw new UnsupportedOperationException();
}
diff --git a/core/src/main/java/org/apache/sling/cms/core/insights/impl/FakeRequest.java b/core/src/main/java/org/apache/sling/cms/core/insights/impl/FakeRequest.java
index 78c3234..22b7d00 100644
--- a/core/src/main/java/org/apache/sling/cms/core/insights/impl/FakeRequest.java
+++ b/core/src/main/java/org/apache/sling/cms/core/insights/impl/FakeRequest.java
@@ -68,93 +68,114 @@ public class FakeRequest implements HttpServletRequest {
String key = iterator.next();
Object value = params.get(key);
if (params.get(key) instanceof String[])
- parameters.put(key, (String[]) (String[]) value);
+ parameters.put(key, (String[]) value);
else
parameters.put(key, new String[] { value.toString() });
}
}
+ @Override
public Object getAttribute(String name) {
return attributes.get(name);
}
+ @Override
public Enumeration<?> getAttributeNames() {
return Collections.enumeration(attributes.keySet());
}
+ @Override
public String getAuthType() {
return null;
}
+ @Override
public String getCharacterEncoding() {
return "utf-8";
}
+ @Override
public int getContentLength() {
return 0;
}
+ @Override
public String getContentType() {
return null;
}
+ @Override
public String getContextPath() {
return "";
}
+ @Override
public Cookie[] getCookies() {
return new Cookie[0];
}
+ @Override
public long getDateHeader(String name) {
return -1L;
}
+ @Override
public String getHeader(String name) {
return null;
}
+ @Override
public Enumeration<?> getHeaderNames() {
return null;
}
+ @Override
public Enumeration<?> getHeaders(String name) {
return null;
}
+ @Override
public ServletInputStream getInputStream() throws IOException {
return null;
}
+ @Override
public int getIntHeader(String name) {
return -1;
}
+ @Override
public String getLocalAddr() {
return null;
}
+ @Override
public Locale getLocale() {
return Locale.getDefault();
}
+ @Override
public Enumeration<?> getLocales() {
return Collections.enumeration(Collections.singleton(Locale.getDefault()));
}
+ @Override
public String getLocalName() {
return null;
}
+ @Override
public int getLocalPort() {
return 0;
}
+ @Override
public String getMethod() {
return method;
}
+ @Override
public String getParameter(String name) {
Object value;
try {
@@ -168,130 +189,163 @@ public class FakeRequest implements HttpServletRequest {
return (String) value;
}
+ @Override
public Map<String,Object> getParameterMap() {
return parameters;
}
+ @Override
public Enumeration<?> getParameterNames() {
return Collections.enumeration(parameters.keySet());
}
+ @Override
public String[] getParameterValues(String name) {
throw new UnsupportedOperationException();
}
+ @Override
public String getPathInfo() {
return null;
}
+ @Override
public String getPathTranslated() {
return null;
}
+ @Override
public String getProtocol() {
return "HTTP/1.1";
}
+ @Override
public String getQueryString() {
return null;
}
+ @Override
public BufferedReader getReader() throws IOException {
return null;
}
+ @Override
public String getRealPath(String path) {
return null;
}
+ @Override
public String getRemoteAddr() {
return null;
}
+ @Override
public String getRemoteHost() {
return null;
}
+ @Override
public int getRemotePort() {
return 0;
}
+ @Override
public String getRemoteUser() {
return null;
}
+ @Override
public RequestDispatcher getRequestDispatcher(String path) {
return null;
}
+ @Override
public String getRequestedSessionId() {
return null;
}
+ @Override
public String getRequestURI() {
return path;
}
+ @Override
public StringBuffer getRequestURL() {
return new StringBuffer("http://localhost:8080" + path);
}
+ @Override
public String getScheme() {
return "http";
}
+ @Override
public String getServerName() {
return null;
}
+ @Override
public int getServerPort() {
return 0;
}
+ @Override
public String getServletPath() {
return this.getRequestURI();
}
+ @Override
public HttpSession getSession() {
return session;
}
+ @Override
public HttpSession getSession(boolean create) {
return session;
}
+ @Override
public Principal getUserPrincipal() {
return null;
}
+ @Override
public boolean isRequestedSessionIdFromCookie() {
return false;
}
+ @Override
public boolean isRequestedSessionIdFromUrl() {
return false;
}
+ @Override
public boolean isRequestedSessionIdFromURL() {
return false;
}
+ @Override
public boolean isRequestedSessionIdValid() {
return false;
}
+ @Override
public boolean isSecure() {
return false;
}
+ @Override
public boolean isUserInRole(String role) {
return false;
}
+ @Override
public void removeAttribute(String name) {
attributes.remove(name);
}
+ @Override
public void setAttribute(String name, Object o) {
attributes.put(name, o);
}
+ @Override
public void setCharacterEncoding(String s) throws UnsupportedEncodingException {
// do nothing
}
diff --git a/core/src/main/java/org/apache/sling/cms/core/internal/models/ComponentImpl.java b/core/src/main/java/org/apache/sling/cms/core/internal/models/ComponentImpl.java
index 3c14bcc..774cbb1 100644
--- a/core/src/main/java/org/apache/sling/cms/core/internal/models/ComponentImpl.java
+++ b/core/src/main/java/org/apache/sling/cms/core/internal/models/ComponentImpl.java
@@ -101,6 +101,7 @@ public class ComponentImpl implements Component {
/**
* @return the componentType
*/
+ @Override
public String[] getComponentType() {
return componentType;
}
@@ -110,6 +111,7 @@ public class ComponentImpl implements Component {
*
* @return the editor path or null
*/
+ @Override
public String getEditPath() {
Resource editResource = getEditResource();
return editResource != null ? editResource.getPath() : null;
@@ -120,6 +122,7 @@ public class ComponentImpl implements Component {
*
* @return the editor resource or null
*/
+ @Override
public Resource getEditResource() {
return getComponentEditPath(resource);
}
@@ -127,6 +130,7 @@ public class ComponentImpl implements Component {
/**
* @return the resource
*/
+ @Override
public Resource getResource() {
return resource;
}
@@ -134,6 +138,7 @@ public class ComponentImpl implements Component {
/**
* @return the title
*/
+ @Override
public String getTitle() {
return title;
}
@@ -163,6 +168,7 @@ public class ComponentImpl implements Component {
* @param type the type of the resource to check
* @return true if the resource is of the specified type
*/
+ @Override
public boolean isType(String type) {
boolean isType = false;
if (this.getComponentType() != null && ArrayUtils.contains(this.getComponentType(), type)) {
diff --git a/core/src/main/java/org/apache/sling/cms/core/internal/models/ComponentManagerImpl.java b/core/src/main/java/org/apache/sling/cms/core/internal/models/ComponentManagerImpl.java
index 75454f5..1493b80 100644
--- a/core/src/main/java/org/apache/sling/cms/core/internal/models/ComponentManagerImpl.java
+++ b/core/src/main/java/org/apache/sling/cms/core/internal/models/ComponentManagerImpl.java
@@ -56,6 +56,7 @@ public class ComponentManagerImpl implements ComponentManager {
*
* @return a list of the components
*/
+ @Override
public List<Component> getAllComponents() {
Set<Component> allComponents = new HashSet<>();
if (componentCache == null) {
@@ -74,6 +75,7 @@ public class ComponentManagerImpl implements ComponentManager {
*
* @return the components organized by componentType
*/
+ @Override
public Map<String, List<Component>> getComponentsByType() {
if (componentCache == null) {
loadComponents();
@@ -86,6 +88,7 @@ public class ComponentManagerImpl implements ComponentManager {
*
* @return the list of component types
*/
+ @Override
public List<String> getComponentTypes() {
if (componentCache == null) {
loadComponents();
diff --git a/core/src/main/java/org/apache/sling/cms/core/internal/models/EditableResourceImpl.java b/core/src/main/java/org/apache/sling/cms/core/internal/models/EditableResourceImpl.java
index 2d0459a..a1b1277 100644
--- a/core/src/main/java/org/apache/sling/cms/core/internal/models/EditableResourceImpl.java
+++ b/core/src/main/java/org/apache/sling/cms/core/internal/models/EditableResourceImpl.java
@@ -33,6 +33,7 @@ public class EditableResourceImpl implements EditableResource {
this.resource = resource;
}
+ @Override
public Component getComponent() {
if (getComponentResource() != null) {
return getComponentResource().adaptTo(Component.class);
@@ -45,6 +46,7 @@ public class EditableResourceImpl implements EditableResource {
*
* @return the component for the specified resource
*/
+ @Override
public Resource getComponentResource() {
String resourceType = resource.getResourceType();
return resource.getResourceResolver().getResource(resourceType);
@@ -55,6 +57,7 @@ public class EditableResourceImpl implements EditableResource {
*
* @return the editor path or null
*/
+ @Override
public String getEditPath() {
if (getComponent() != null) {
return getComponent().getEditPath();
@@ -67,6 +70,7 @@ public class EditableResourceImpl implements EditableResource {
*
* @return the editor resource or null
*/
+ @Override
public Resource getEditResource() {
if (getComponent() != null) {
return getComponent().getEditResource();
@@ -79,6 +83,7 @@ public class EditableResourceImpl implements EditableResource {
*
* @return the current resource
*/
+ @Override
public Resource getResource() {
return resource;
}
diff --git a/core/src/main/java/org/apache/sling/cms/core/internal/models/PageImpl.java b/core/src/main/java/org/apache/sling/cms/core/internal/models/PageImpl.java
index 7808f99..25073a6 100644
--- a/core/src/main/java/org/apache/sling/cms/core/internal/models/PageImpl.java
+++ b/core/src/main/java/org/apache/sling/cms/core/internal/models/PageImpl.java
@@ -107,18 +107,22 @@ public class PageImpl implements Page {
this.resource = resource;
}
+ @Override
public Resource getContentResource() {
return contentResource;
}
+ @Override
public Calendar getCreated() {
return created;
}
+ @Override
public String getCreatedBy() {
return createdBy;
}
+ @Override
public String[] getKeywords() {
List<String> keywords = new ArrayList<>();
if (taxonomy != null) {
@@ -132,30 +136,37 @@ public class PageImpl implements Page {
return keywords.toArray(new String[keywords.size()]);
}
+ @Override
public Calendar getLastModified() {
return lastModified != null ? lastModified : created;
}
+ @Override
public String getLastModifiedBy() {
return lastModifiedBy != null ? lastModifiedBy : createdBy;
}
+ @Override
public String getName() {
return resource.getName();
}
+ @Override
public Resource getParent() {
return resource.getParent();
}
+ @Override
public String getPath() {
return resource.getPath();
}
+ @Override
public ValueMap getProperties() {
return getContentResource().getValueMap();
}
+ @Override
public String getPublishedPath() {
Site site = getSite();
if (site != null) {
@@ -165,6 +176,7 @@ public class PageImpl implements Page {
}
}
+ @Override
public String getPublishedUrl() {
Site site = getSite();
if (site != null) {
@@ -174,10 +186,12 @@ public class PageImpl implements Page {
}
}
+ @Override
public Resource getResource() {
return resource;
}
+ @Override
public Site getSite() {
SiteManager siteMgr = resource.adaptTo(SiteManager.class);
Site site = null;
@@ -187,6 +201,7 @@ public class PageImpl implements Page {
return site;
}
+ @Override
public PageTemplate getTemplate() {
Resource templateResource = this.resource.getResourceResolver().getResource(template);
if (templateResource != null) {
@@ -196,10 +211,12 @@ public class PageImpl implements Page {
}
}
+ @Override
public String getTemplatePath() {
return this.template;
}
+ @Override
public String getTitle() {
if (StringUtils.isNotEmpty(title)) {
return title;
@@ -208,6 +225,7 @@ public class PageImpl implements Page {
}
}
+ @Override
public boolean isPublished() {
return published;
}
diff --git a/core/src/main/java/org/apache/sling/cms/core/internal/models/PageTemplateImpl.java b/core/src/main/java/org/apache/sling/cms/core/internal/models/PageTemplateImpl.java
index c1fa90f..9e121b4 100644
--- a/core/src/main/java/org/apache/sling/cms/core/internal/models/PageTemplateImpl.java
+++ b/core/src/main/java/org/apache/sling/cms/core/internal/models/PageTemplateImpl.java
@@ -68,6 +68,7 @@ public class PageTemplateImpl implements PageTemplate {
/**
* @return the allowedPaths
*/
+ @Override
public String[] getAllowedPaths() {
if (allowedPaths == null) {
return new String[0];
@@ -78,6 +79,7 @@ public class PageTemplateImpl implements PageTemplate {
/**
* @return the availableComponentTypes
*/
+ @Override
public String[] getAvailableComponentTypes() {
return availableComponentTypes;
}
@@ -85,6 +87,7 @@ public class PageTemplateImpl implements PageTemplate {
/**
* @return the componentConfigs
*/
+ @Override
public Map<String, Resource> getComponentConfigs() {
Map<String, Resource> configs = new HashMap<>();
if (componentConfigurations != null) {
@@ -105,6 +108,7 @@ public class PageTemplateImpl implements PageTemplate {
/**
* @return the resource
*/
+ @Override
public Resource getResource() {
return resource;
}
@@ -112,6 +116,7 @@ public class PageTemplateImpl implements PageTemplate {
/**
* @return the template
*/
+ @Override
public String getTemplate() {
return template;
}
@@ -119,6 +124,7 @@ public class PageTemplateImpl implements PageTemplate {
/**
* @return the title
*/
+ @Override
public String getTitle() {
return title;
}
diff --git a/core/src/main/java/org/apache/sling/cms/core/internal/models/PageTemplateManagerImpl.java b/core/src/main/java/org/apache/sling/cms/core/internal/models/PageTemplateManagerImpl.java
index 300e2e7..0094fe0 100644
--- a/core/src/main/java/org/apache/sling/cms/core/internal/models/PageTemplateManagerImpl.java
+++ b/core/src/main/java/org/apache/sling/cms/core/internal/models/PageTemplateManagerImpl.java
@@ -57,6 +57,7 @@ public class PageTemplateManagerImpl implements PageTemplateManager {
configurationResourceResolver.getResourceCollection(resource, "site", "templates"), PageTemplate.class);
}
+ @Override
public List<PageTemplate> getAvailableTemplates() {
String path = resource.getPath();
List<PageTemplate> availableTemplates = new ArrayList<>();
diff --git a/core/src/main/java/org/apache/sling/cms/core/internal/models/ReferencesImpl.java b/core/src/main/java/org/apache/sling/cms/core/internal/models/ReferencesImpl.java
index 41b842f..906d0a0 100644
--- a/core/src/main/java/org/apache/sling/cms/core/internal/models/ReferencesImpl.java
+++ b/core/src/main/java/org/apache/sling/cms/core/internal/models/ReferencesImpl.java
@@ -36,6 +36,7 @@ public class ReferencesImpl extends ReferenceOperation implements References {
super(resource);
}
+ @Override
public List<Reference> getReferences() {
init();
return referenceList;
diff --git a/core/src/main/java/org/apache/sling/cms/core/internal/models/SiteImpl.java b/core/src/main/java/org/apache/sling/cms/core/internal/models/SiteImpl.java
index 6a915e7..de4784f 100644
--- a/core/src/main/java/org/apache/sling/cms/core/internal/models/SiteImpl.java
+++ b/core/src/main/java/org/apache/sling/cms/core/internal/models/SiteImpl.java
@@ -105,10 +105,12 @@ public class SiteImpl implements Site {
return true;
}
+ @Override
public String getDescription() {
return description;
}
+ @Override
public Locale getLocale() {
String[] segments = locale.split("_");
if (segments.length == 3) {
@@ -119,34 +121,31 @@ public class SiteImpl implements Site {
return new Locale(segments[0]);
}
+ @Override
public String getLocaleString() {
return locale;
}
+ @Override
public String getPath() {
return resource.getPath();
}
+ @Override
public Resource getResource() {
return resource;
}
+ @Override
public String getTitle() {
return title;
}
- /**
- * @return the url
- */
+ @Override
public String getUrl() {
return url;
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#hashCode()
- */
@Override
public int hashCode() {
final int prime = 31;
@@ -155,11 +154,6 @@ public class SiteImpl implements Site {
return result;
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
@Override
public String toString() {
return "Site [description=" + description + ", locale=" + locale + ", resource=" + resource + ", title=" + title
diff --git a/core/src/main/java/org/apache/sling/cms/core/internal/models/SiteManagerImpl.java b/core/src/main/java/org/apache/sling/cms/core/internal/models/SiteManagerImpl.java
index 0516e61..24aa344 100644
--- a/core/src/main/java/org/apache/sling/cms/core/internal/models/SiteManagerImpl.java
+++ b/core/src/main/java/org/apache/sling/cms/core/internal/models/SiteManagerImpl.java
@@ -33,6 +33,7 @@ public class SiteManagerImpl implements SiteManager {
site = SiteImpl.getSite(containingResource);
}
+ @Override
public Site getSite() {
return site;
}
diff --git a/core/src/main/java/org/apache/sling/cms/core/internal/operations/CheckpointOperation.java b/core/src/main/java/org/apache/sling/cms/core/internal/operations/CheckpointOperation.java
index ac66d4b..4060485 100644
--- a/core/src/main/java/org/apache/sling/cms/core/internal/operations/CheckpointOperation.java
+++ b/core/src/main/java/org/apache/sling/cms/core/internal/operations/CheckpointOperation.java
@@ -49,7 +49,8 @@ public class CheckpointOperation implements PostOperation {
private static final Logger log = LoggerFactory.getLogger(CheckpointOperation.class);
- public void run(final SlingHttpServletRequest request, final PostResponse response,
+ @Override
+ public void run(final SlingHttpServletRequest request, final PostResponse response,
final SlingPostProcessor[] processors) {
try {
diff --git a/core/src/main/java/org/apache/sling/cms/core/internal/rewriter/HTML5Serializer.java b/core/src/main/java/org/apache/sling/cms/core/internal/rewriter/HTML5Serializer.java
index a36bb36..0331542 100644
--- a/core/src/main/java/org/apache/sling/cms/core/internal/rewriter/HTML5Serializer.java
+++ b/core/src/main/java/org/apache/sling/cms/core/internal/rewriter/HTML5Serializer.java
@@ -69,6 +69,7 @@ public class HTML5Serializer implements Serializer {
this.resolver = resolver;
}
+ @Override
public void characters(char[] buffer, int offset, int length) throws SAXException {
if (length == 0) {
writer.flush();
@@ -82,10 +83,12 @@ public class HTML5Serializer implements Serializer {
// Nothing required
}
+ @Override
public void endDocument() throws SAXException {
writer.flush();
}
+ @Override
public void endElement(String uri, String localName, String name) throws SAXException {
if (!emptyTags.contains(localName)) {
writer.write("</");
@@ -94,10 +97,12 @@ public class HTML5Serializer implements Serializer {
}
}
+ @Override
public void endPrefixMapping(String s) throws SAXException {
// Nothing required
}
+ @Override
public void ignorableWhitespace(char[] ac, int i, int j) throws SAXException {
// Nothing required
}
@@ -112,22 +117,27 @@ public class HTML5Serializer implements Serializer {
}
}
+ @Override
public void processingInstruction(String s, String s1) throws SAXException {
// Nothing required
}
+ @Override
public void setDocumentLocator(Locator locator1) {
// Nothing required
}
+ @Override
public void skippedEntity(String s) throws SAXException {
// Nothing required
}
+ @Override
public void startDocument() throws SAXException {
writer.println(rewriteConfig.getValueMap().get("doctype", String.class));
}
+ @Override
public void startElement(String uri, String localName, String name, Attributes atts) throws SAXException {
boolean endSlash = false;
writer.write(CHAR_LT);
@@ -166,6 +176,7 @@ public class HTML5Serializer implements Serializer {
writer.write(CHAR_GT);
}
+ @Override
public void startPrefixMapping(String s, String s1) throws SAXException {
// Nothing required
}
diff --git a/core/src/main/java/org/apache/sling/cms/core/models/ErrorHandler.java b/core/src/main/java/org/apache/sling/cms/core/models/ErrorHandler.java
index 9c738b0..38efe69 100644
--- a/core/src/main/java/org/apache/sling/cms/core/models/ErrorHandler.java
+++ b/core/src/main/java/org/apache/sling/cms/core/models/ErrorHandler.java
@@ -16,6 +16,7 @@
*/
package org.apache.sling.cms.core.models;
+import java.util.Collections;
import java.util.HashMap;
import javax.annotation.PostConstruct;
@@ -162,12 +163,9 @@ public class ErrorHandler {
log.debug("Validating the resource does not exist for all users");
ResourceResolver adminResolver = null;
try {
- adminResolver = factory.getServiceResourceResolver(new HashMap<String, Object>() {
- private static final long serialVersionUID = 1L;
- {
- put(ResourceResolverFactory.SUBSERVICE, SERVICE_USER_NAME);
- }
- });
+
+ adminResolver = factory.getServiceResourceResolver(
+ Collections.singletonMap(ResourceResolverFactory.SUBSERVICE, SERVICE_USER_NAME));
Resource pResource = adminResolver.resolve(slingRequest, slingRequest.getResource().getPath());
if (!CMSUtils.isPublished(pResource) || pResource.isResourceType(Resource.RESOURCE_TYPE_NON_EXISTING)) {
errorCode = HttpServletResponse.SC_NOT_FOUND;
@@ -221,7 +219,7 @@ public class ErrorHandler {
if (slingRequest.getAttribute(SlingConstants.ERROR_EXCEPTION) != null) {
log.warn("Handing exception of type {}", errorCode,
- (Throwable) slingRequest.getAttribute(SlingConstants.ERROR_EXCEPTION));
+ slingRequest.getAttribute(SlingConstants.ERROR_EXCEPTION));
}
calculateErrorCode(resolver);
diff --git a/core/src/main/java/org/apache/sling/cms/core/models/LocaleList.java b/core/src/main/java/org/apache/sling/cms/core/models/LocaleList.java
index 1eac893..a2388fa 100644
--- a/core/src/main/java/org/apache/sling/cms/core/models/LocaleList.java
+++ b/core/src/main/java/org/apache/sling/cms/core/models/LocaleList.java
@@ -16,6 +16,7 @@
*/
package org.apache.sling.cms.core.models;
+import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
@@ -35,7 +36,7 @@ public class LocaleList {
public List<Locale> getLocales() {
List<Locale> locales = new ArrayList<>();
- for (Locale locale : SimpleDateFormat.getAvailableLocales()) {
+ for (Locale locale : DateFormat.getAvailableLocales()) {
locales.add(locale);
}
Collections.sort(locales, (o1,o2) -> o1.toString().compareTo(o2.toString()));
diff --git a/core/src/main/java/org/apache/sling/cms/core/readability/impl/ReadabilityServiceFactoryImpl.java b/core/src/main/java/org/apache/sling/cms/core/readability/impl/ReadabilityServiceFactoryImpl.java
index 28e0241..fd55f22 100644
--- a/core/src/main/java/org/apache/sling/cms/core/readability/impl/ReadabilityServiceFactoryImpl.java
+++ b/core/src/main/java/org/apache/sling/cms/core/readability/impl/ReadabilityServiceFactoryImpl.java
@@ -38,6 +38,7 @@ public class ReadabilityServiceFactoryImpl implements ReadabilityServiceFactory
@Reference(cardinality = ReferenceCardinality.MULTIPLE)
private List<ReadabilityService> services;
+ @Override
public ReadabilityService getReadabilityService(Locale locale) {
log.debug("Locating readability service for {}", locale);
return services.stream().filter(svc -> locale.equals(svc.getLocale())).findFirst().orElse(services.stream()
diff --git a/core/src/main/java/org/apache/sling/cms/core/readability/impl/ReadabilityServiceImpl.java b/core/src/main/java/org/apache/sling/cms/core/readability/impl/ReadabilityServiceImpl.java
index 1a2dddb..f131d07 100644
--- a/core/src/main/java/org/apache/sling/cms/core/readability/impl/ReadabilityServiceImpl.java
+++ b/core/src/main/java/org/apache/sling/cms/core/readability/impl/ReadabilityServiceImpl.java
@@ -164,6 +164,7 @@ public class ReadabilityServiceImpl implements ReadabilityService {
return word;
}
+ @Override
public Text extractSentences(String input) {
BreakIterator breakIterator = BreakIterator.getSentenceInstance(locale);
breakIterator.setText(input);
diff --git a/core/src/main/java/org/apache/sling/cms/core/usergenerated/impl/ApproveUGCOperation.java b/core/src/main/java/org/apache/sling/cms/core/usergenerated/impl/ApproveUGCOperation.java
index 3e21a44..af3072d 100644
--- a/core/src/main/java/org/apache/sling/cms/core/usergenerated/impl/ApproveUGCOperation.java
+++ b/core/src/main/java/org/apache/sling/cms/core/usergenerated/impl/ApproveUGCOperation.java
@@ -17,6 +17,7 @@
package org.apache.sling.cms.core.usergenerated.impl;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -69,12 +70,8 @@ public class ApproveUGCOperation implements PostOperation {
.valueOf(request.getResource().getValueMap().get("approveaction", String.class));
if (action == APPROVE_ACTION.MOVE) {
ResourceUtil.getOrCreateResource(request.getResourceResolver(), targetPath,
- new HashMap<String, Object>() {
- private static final long serialVersionUID = 1L;
- {
- put(JcrConstants.JCR_PRIMARYTYPE, JcrResourceConstants.NT_SLING_FOLDER);
- }
- }, JcrResourceConstants.NT_SLING_FOLDER, false);
+ Collections.singletonMap(JcrConstants.JCR_PRIMARYTYPE, JcrResourceConstants.NT_SLING_FOLDER),
+ JcrResourceConstants.NT_SLING_FOLDER, false);
for (Resource resource : request.getResource().getChildren()) {
log.debug("Moving {} to {}", resource.getPath(), targetPath);
changes.add(Modification.onMoved(resource.getPath(), targetPath));
diff --git a/reference/src/main/java/org/apache/sling/cms/reference/impl/SearchServiceImpl.java b/reference/src/main/java/org/apache/sling/cms/reference/impl/SearchServiceImpl.java
index d4212db..70b7984 100644
--- a/reference/src/main/java/org/apache/sling/cms/reference/impl/SearchServiceImpl.java
+++ b/reference/src/main/java/org/apache/sling/cms/reference/impl/SearchServiceImpl.java
@@ -16,15 +16,18 @@
*/
package org.apache.sling.cms.reference.impl;
+import java.util.Collections;
import java.util.HashMap;
import org.apache.commons.lang.StringUtils;
+import org.apache.jackrabbit.JcrConstants;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.cms.reference.SearchService;
import org.apache.sling.cms.reference.impl.SearchServiceImpl.Config;
+import org.apache.sling.jcr.resource.JcrResourceConstants;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -41,54 +44,49 @@ import org.slf4j.LoggerFactory;
@Designate(ocd = Config.class)
public class SearchServiceImpl implements SearchService {
- private static final Logger log = LoggerFactory.getLogger(SearchServiceImpl.class);
+ private static final Logger log = LoggerFactory.getLogger(SearchServiceImpl.class);
- @Reference
- private ResourceResolverFactory factory;
+ @Reference
+ private ResourceResolverFactory factory;
- private Config config;
+ private Config config;
- @ObjectClassDefinition(name = "%cms.reference.search.name", description = "%cms.reference.search.description", localization = "OSGI-INF/l10n/bundle")
- public @interface Config {
+ @ObjectClassDefinition(name = "%cms.reference.search.name", description = "%cms.reference.search.description", localization = "OSGI-INF/l10n/bundle")
+ public @interface Config {
- @AttributeDefinition(name = "%searchServiceUsername.name", description = "%searchServiceUsername.description")
- String searchServiceUsername();
- }
+ @AttributeDefinition(name = "%searchServiceUsername.name", description = "%searchServiceUsername.description")
+ String searchServiceUsername();
+ }
- @Activate
- public void init(Config config) {
- this.config = config;
- }
+ @Activate
+ public void init(Config config) {
+ this.config = config;
+ }
- @Override
- public ResourceResolver getResourceResolver(SlingHttpServletRequest request) {
- if (config != null && StringUtils.isNotBlank(config.searchServiceUsername())) {
- try {
- log.debug("Retrieving Service User {}", config.searchServiceUsername());
- return factory.getServiceResourceResolver(new HashMap<String, Object>() {
- private static final long serialVersionUID = 1L;
+ @Override
+ public ResourceResolver getResourceResolver(SlingHttpServletRequest request) {
+ if (config != null && StringUtils.isNotBlank(config.searchServiceUsername())) {
+ try {
+ log.debug("Retrieving Service User {}", config.searchServiceUsername());
+ return factory.getServiceResourceResolver(Collections.singletonMap(ResourceResolverFactory.SUBSERVICE,
+ (Object) config.searchServiceUsername()));
+ } catch (LoginException e) {
+ log.warn("Failed to retrieve Service User {}, falling back to request user",
+ config.searchServiceUsername(), e);
+ return request.getResourceResolver();
+ }
+ } else {
+ log.debug("Using request user");
+ return request.getResourceResolver();
+ }
+ }
- {
- put(ResourceResolverFactory.SUBSERVICE, config.searchServiceUsername());
- }
- });
- } catch (LoginException e) {
- log.warn("Failed to retrieve Service User {}, falling back to request user",
- config.searchServiceUsername());
- return request.getResourceResolver();
- }
- } else {
- log.debug("Using request user");
- return request.getResourceResolver();
- }
- }
-
- @Override
- public void closeResolver(ResourceResolver resolver) {
- if (resolver != null && resolver.isLive() && StringUtils.isNotBlank(config.searchServiceUsername())
- && config.searchServiceUsername().equals(resolver.getUserID())) {
- resolver.close();
- }
- }
+ @Override
+ public void closeResolver(ResourceResolver resolver) {
+ if (resolver != null && resolver.isLive() && StringUtils.isNotBlank(config.searchServiceUsername())
+ && config.searchServiceUsername().equals(resolver.getUserID())) {
+ resolver.close();
+ }
+ }
}