You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by to...@apache.org on 2014/05/08 14:28:39 UTC
svn commit: r1593249 - in
/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication:
communication/ monitor/ servlet/
Author: tommaso
Date: Thu May 8 12:28:38 2014
New Revision: 1593249
URL: http://svn.apache.org/r1593249
Log:
SLING-3548 - using a dedicated enum for parameters, using the queue param in ReplicationQueueAgentServlet
Added:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationParameter.java (with props)
Modified:
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationHeader.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/monitor/ReplicationQueueHealthCheck.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentQueueServlet.java
sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentServlet.java
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationHeader.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationHeader.java?rev=1593249&r1=1593248&r2=1593249&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationHeader.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationHeader.java Thu May 8 12:28:38 2014
@@ -25,8 +25,7 @@ public enum ReplicationHeader {
TYPE("X-replication-type"),
ACTION("X-replication-action"),
- PATH("X-replication-path"),
- QUEUE("X-replication-queue");
+ PATH("X-replication-path");
private final String name;
Added: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationParameter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationParameter.java?rev=1593249&view=auto
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationParameter.java (added)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationParameter.java Thu May 8 12:28:38 2014
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.replication.communication;
+
+/**
+ * HTTP Parameters for replication
+ */
+public enum ReplicationParameter {
+
+ QUEUE("queue");
+
+ private final String name;
+
+ ReplicationParameter(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public String toString() {
+ return name;
+ }
+}
Propchange: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/communication/ReplicationParameter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/monitor/ReplicationQueueHealthCheck.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/monitor/ReplicationQueueHealthCheck.java?rev=1593249&r1=1593248&r2=1593249&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/monitor/ReplicationQueueHealthCheck.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/monitor/ReplicationQueueHealthCheck.java Thu May 8 12:28:38 2014
@@ -107,7 +107,7 @@ public class ReplicationQueueHealthCheck
public Result execute() {
final FormattingResultLog resultLog = new FormattingResultLog();
Map<String, Integer> failures = new HashMap<String, Integer>();
- if (replicationQueueProviders != null && replicationQueueProviders.size() > 0) {
+ if (replicationQueueProviders.size() > 0) {
for (ReplicationQueueProvider replicationQueueProvider : replicationQueueProviders) {
for (ReplicationQueue q : replicationQueueProvider.getAllQueues())
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentQueueServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentQueueServlet.java?rev=1593249&r1=1593248&r2=1593249&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentQueueServlet.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentQueueServlet.java Thu May 8 12:28:38 2014
@@ -32,6 +32,7 @@ import org.apache.sling.api.servlets.Sli
import org.apache.sling.replication.agent.ReplicationAgent;
import org.apache.sling.replication.communication.ReplicationHeader;
+import org.apache.sling.replication.communication.ReplicationParameter;
import org.apache.sling.replication.queue.ReplicationQueue;
import org.apache.sling.replication.queue.ReplicationQueueItem;
import org.apache.sling.replication.queue.ReplicationQueueItemState;
@@ -53,13 +54,13 @@ public class ReplicationAgentQueueServle
throws ServletException, IOException {
response.setContentType("application/json");
- String queueName = request.getParameter(ReplicationHeader.QUEUE.toString());
+ String queueName = request.getParameter(ReplicationParameter.QUEUE.toString());
ReplicationAgent agent = request.getResource().adaptTo(ReplicationAgent.class);
if (agent != null) {
try {
- ReplicationQueue queue = agent.getQueue("");
+ ReplicationQueue queue = agent.getQueue(queueName);
response.getWriter().write(toJSoN(queue));
} catch (Exception e) {
Modified: sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentServlet.java?rev=1593249&r1=1593248&r2=1593249&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentServlet.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentServlet.java Thu May 8 12:28:38 2014
@@ -39,10 +39,7 @@ import org.apache.sling.api.servlets.Sli
import org.apache.sling.replication.agent.AgentReplicationException;
import org.apache.sling.replication.agent.ReplicationAgent;
-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.communication.*;
import org.apache.sling.replication.queue.ReplicationQueueItemState.ItemState;
import org.apache.sling.replication.resources.ReplicationConstants;
import org.apache.sling.replication.serialization.ReplicationPackage;
@@ -119,7 +116,7 @@ public class ReplicationAgentServlet ext
response.setContentType(ContentType.APPLICATION_OCTET_STREAM.toString());
- String queueName = request.getParameter(ReplicationHeader.QUEUE.toString());
+ String queueName = request.getParameter(ReplicationParameter.QUEUE.toString());
ReplicationAgent agent = request.getResource().adaptTo(ReplicationAgent.class);