Author: tommaso
Date: Fri Jan 17 16:19:54 2014
New Revision: 1559168
URL: http://svn.apache.org/r1559168
Log:
SLING-3315 - fixed some javadocs / warnings
Modified:
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationConfigurationRootServlet.java
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationConfigurationServlet.java
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationQueueServlet.java
Modified:
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationConfigurationRootServlet.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationConfigurationRootServlet.java?rev=1559168&r1=1559167&r2=1559168&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationConfigurationRootServlet.java
(original)
+++
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationConfigurationRootServlet.java
Fri Jan 17 16:19:54 2014
@@ -19,7 +19,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Servlet to create {@link
org.apache.sling.replication.agent.ReplicationAgent}s (via HTTP PUT).
+ * Servlet to :
+ * - create {@link org.apache.sling.replication.agent.ReplicationAgent}s (via
HTTP POST).
+ * - retrieve the list of existing {@link
org.apache.sling.replication.agent.ReplicationAgent}s (via HTTP GET)
*/
@SuppressWarnings("serial")
@Component(metatype = false)
Modified:
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationConfigurationServlet.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationConfigurationServlet.java?rev=1559168&r1=1559167&r2=1559168&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationConfigurationServlet.java
(original)
+++
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationConfigurationServlet.java
Fri Jan 17 16:19:54 2014
@@ -20,10 +20,8 @@ package org.apache.sling.replication.ser
import java.io.IOException;
import java.util.Map;
-
import javax.servlet.Servlet;
import javax.servlet.ServletException;
-
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Properties;
import org.apache.felix.scr.annotations.Property;
@@ -33,21 +31,22 @@ import org.apache.sling.api.SlingHttpSer
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.sling.replication.agent.AgentConfigurationException;
-import org.apache.sling.replication.agent.ReplicationAgent;
import org.apache.sling.replication.agent.ReplicationAgentConfiguration;
import org.apache.sling.replication.agent.ReplicationAgentConfigurationManager;
import
org.apache.sling.replication.agent.impl.ReplicationAgentConfigurationResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+/**
+ * ReST API for {@link
org.apache.sling.replication.agent.ReplicationAgentConfiguration}s
+ */
@SuppressWarnings("serial")
@Component(metatype = false)
@Service(value = Servlet.class)
@Properties({
@Property(name = "sling.servlet.resourceTypes", value =
ReplicationAgentConfigurationResource.RESOURCE_TYPE),
- @Property(name = "sling.servlet.methods", value = { "POST", "PUT",
"GET", "DELETE" }) })
+ @Property(name = "sling.servlet.methods", value = {"POST", "PUT",
"GET", "DELETE"})})
public class ReplicationConfigurationServlet extends SlingAllMethodsServlet {
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -57,49 +56,44 @@ public class ReplicationConfigurationSer
@Override
protected void doPost(SlingHttpServletRequest request,
SlingHttpServletResponse response)
- throws ServletException, IOException {
-
-
+ throws ServletException, IOException {
- @SuppressWarnings("unchecked")
String operation = request.getParameter(":operation");
- if("delete".equals(operation)) {
+ if ("delete".equals(operation)) {
doDelete(request, response);
- return;
- };
+ } else {
+ response.setContentType("application/json");
- response.setContentType("application/json");
-
- Resource configurationResource = request.getResource();
- ReplicationAgentConfiguration configuration =
configurationResource.adaptTo(ReplicationAgentConfiguration.class);
- String agentName = configuration.getName();
-
- Map parameterMap = request.getParameterMap();
- try {
- configuration =
agentConfigurationManager.updateConfiguration(agentName, parameterMap);
- response.getWriter().write(configuration.toString());
- } catch (AgentConfigurationException e) {
- log.error("cannot update configuration for agent {}", agentName,
e);
+ Resource configurationResource = request.getResource();
+ ReplicationAgentConfiguration configuration =
configurationResource.adaptTo(ReplicationAgentConfiguration.class);
+ String agentName = configuration.getName();
+
+ @SuppressWarnings("unchecked")
+ Map<String, Object> parameterMap = request.getParameterMap();
+ try {
+ configuration =
agentConfigurationManager.updateConfiguration(agentName, parameterMap);
+ response.getWriter().write(configuration.toString());
+ } catch (AgentConfigurationException e) {
+ log.error("cannot update configuration for agent {}",
agentName, e);
+ }
}
}
@Override
protected void doGet(SlingHttpServletRequest request,
SlingHttpServletResponse response)
- throws ServletException, IOException {
+ throws ServletException, IOException {
response.setContentType("application/json");
Resource resource = request.getResource();
ReplicationAgentConfiguration configuration =
resource.adaptTo(ReplicationAgentConfiguration.class);
response.getWriter().write(configuration.toString());
}
-
@Override
protected void doDelete(SlingHttpServletRequest request,
SlingHttpServletResponse response)
throws ServletException, IOException {
@SuppressWarnings("unchecked")
-
Resource configurationResource = request.getResource();
ReplicationAgentConfiguration configuration =
configurationResource.adaptTo(ReplicationAgentConfiguration.class);
String agentName = configuration.getName();
Modified:
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationQueueServlet.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationQueueServlet.java?rev=1559168&r1=1559167&r2=1559168&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationQueueServlet.java
(original)
+++
sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationQueueServlet.java
Fri Jan 17 16:19:54 2014
@@ -19,46 +19,30 @@
package org.apache.sling.replication.servlet;
import java.io.IOException;
-
import javax.servlet.Servlet;
import javax.servlet.ServletException;
-
-import org.apache.commons.io.IOUtils;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Properties;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
-import org.apache.http.entity.ContentType;
-import org.apache.jackrabbit.util.Text;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
-import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
-
-import org.apache.sling.replication.agent.AgentReplicationException;
-import org.apache.sling.replication.agent.ReplicationAgent;
import org.apache.sling.replication.agent.impl.ReplicationAgentQueueResource;
-import org.apache.sling.replication.agent.impl.ReplicationAgentResource;
-import org.apache.sling.replication.communication.ReplicationActionType;
import org.apache.sling.replication.communication.ReplicationHeader;
-import org.apache.sling.replication.communication.ReplicationRequest;
-import org.apache.sling.replication.communication.ReplicationResponse;
import org.apache.sling.replication.queue.ReplicationQueue;
import org.apache.sling.replication.queue.ReplicationQueueItemState;
-import org.apache.sling.replication.queue.ReplicationQueueItemState.ItemState;
import org.apache.sling.replication.serialization.ReplicationPackage;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
- * Servlet to ask {@link ReplicationAgent}s to replicate (via HTTP POST).
+ * Servlet to retrieve a {@link
org.apache.sling.replication.queue.ReplicationQueue} status.
*/
@SuppressWarnings("serial")
@Component(metatype = false)
@Service(value = Servlet.class)
@Properties({
@Property(name = "sling.servlet.resourceTypes", value =
ReplicationAgentQueueResource.RESOURCE_TYPE),
- @Property(name = "sling.servlet.methods", value = { "GET" } ) })
+ @Property(name = "sling.servlet.methods", value = {"GET"})})
public class ReplicationQueueServlet extends SlingAllMethodsServlet {
@Override
@@ -107,7 +91,7 @@ public class ReplicationQueueServlet ext
private String toJSoN(ReplicationPackage item) {
StringBuilder builder = new StringBuilder();
- builder.append("\"id\":\"").append(item.getId().replace("\\","\\\\"));
+ builder.append("\"id\":\"").append(item.getId().replace("\\", "\\\\"));
builder.append("\",\"paths\":[");
for (int i = 0; i < item.getPaths().length; i++) {
builder.append("\"");
