inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added capability to search for published nodes on PublishingEventFilter. Also, improved robustness of publishing-queue.post REST method.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28704 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
N Smith
2011-06-29 16:54:11 +00:00
parent 1aad9f6ac4
commit b6b0c8fae9
2 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/web/scripts/publishing/PublishingJsonParser.java
View File

@@ -68,14 +68,14 @@ public class PublishingJsonParser
return new JSONObject(new JSONTokener(jsonStr)); return new JSONObject(new JSONTokener(jsonStr));
} }
public String schedulePublishingEvent(PublishingQueue queue, String jsonStr) throws JSONException, ParseException public String schedulePublishingEvent(PublishingQueue queue, String jsonStr) throws ParseException, JSONException
{ {
JSONObject json = getJson(jsonStr); JSONObject json = getJson(jsonStr);
String channelName = json.optString(CHANNEL_NAME); String channelName = json.optString(CHANNEL_NAME);
String comment = json.optString(COMMENT); String comment = json.optString(COMMENT);
Calendar schedule = getCalendar(json.optJSONObject(SCHEDULE)); Calendar schedule = getCalendar(json.optJSONObject(SCHEDULE));
PublishingPackage publishingPackage = getPublishingPackage(queue, json); PublishingPackage publishingPackage = getPublishingPackage(queue, json);
StatusUpdate statusUpdate = getStatusUpdate(queue, json.getJSONObject(STATUS_UPDATE)); StatusUpdate statusUpdate = getStatusUpdate(queue, json.optJSONObject(STATUS_UPDATE));
return queue.scheduleNewEvent(publishingPackage, channelName, schedule, comment, statusUpdate); return queue.scheduleNewEvent(publishingPackage, channelName, schedule, comment, statusUpdate);
} }
@@ -88,7 +88,7 @@ public class PublishingJsonParser
String message = json.optString(MESSAGE); String message = json.optString(MESSAGE);
NodeRef nodeToLinkTo = null; NodeRef nodeToLinkTo = null;
String nodeStr = json.optString(NODE_REF); String nodeStr = json.optString(NODE_REF);
if(nodeStr!=null) if(nodeStr!=null && nodeStr.isEmpty() == false)
{ {
nodeToLinkTo = new NodeRef(nodeStr); nodeToLinkTo = new NodeRef(nodeStr);
} }

36
source/java/org/alfresco/repo/web/scripts/publishing/PublishingRestApiTest.java
View File

@@ -33,7 +33,6 @@ import static org.alfresco.repo.web.scripts.publishing.PublishingModelBuilder.CA
import static org.alfresco.repo.web.scripts.publishing.PublishingModelBuilder.CAN_UNPUBLISH; import static org.alfresco.repo.web.scripts.publishing.PublishingModelBuilder.CAN_UNPUBLISH;
import static org.alfresco.repo.web.scripts.publishing.PublishingModelBuilder.CHANNEL_NODE_TYPE; import static org.alfresco.repo.web.scripts.publishing.PublishingModelBuilder.CHANNEL_NODE_TYPE;
import static org.alfresco.repo.web.scripts.publishing.PublishingModelBuilder.CHANNEL_TYPE; import static org.alfresco.repo.web.scripts.publishing.PublishingModelBuilder.CHANNEL_TYPE;
import static org.alfresco.repo.web.scripts.publishing.PublishingModelBuilder.CONTENT_ROOT_NODE_TYPE;
import static org.alfresco.repo.web.scripts.publishing.PublishingModelBuilder.ICON; import static org.alfresco.repo.web.scripts.publishing.PublishingModelBuilder.ICON;
import static org.alfresco.repo.web.scripts.publishing.PublishingModelBuilder.ID; import static org.alfresco.repo.web.scripts.publishing.PublishingModelBuilder.ID;
import static org.alfresco.repo.web.scripts.publishing.PublishingModelBuilder.MAX_STATUS_LENGTH; import static org.alfresco.repo.web.scripts.publishing.PublishingModelBuilder.MAX_STATUS_LENGTH;
@@ -47,10 +46,10 @@ import static org.mockito.Matchers.anyMap;
import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset; import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import static org.mockito.Mockito.never;
import java.io.File; import java.io.File;
import java.text.MessageFormat; import java.text.MessageFormat;
@@ -65,8 +64,6 @@ import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.content.transform.AbstractContentTransformerTest; import org.alfresco.repo.content.transform.AbstractContentTransformerTest;
import org.alfresco.repo.publishing.ChannelHelper; import org.alfresco.repo.publishing.ChannelHelper;
import org.alfresco.repo.publishing.ChannelServiceImpl; import org.alfresco.repo.publishing.ChannelServiceImpl;
import org.alfresco.repo.publishing.EnvironmentHelper;
import org.alfresco.repo.publishing.PublishingEventHelper;
import org.alfresco.repo.publishing.PublishingObjectFactory; import org.alfresco.repo.publishing.PublishingObjectFactory;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.web.scripts.BaseWebScriptTest; import org.alfresco.repo.web.scripts.BaseWebScriptTest;
@@ -225,19 +222,18 @@ public class PublishingRestApiTest extends BaseWebScriptTest
NodeRef textNode = createContentNode("plainContent", "Some plain text", MimetypeMap.MIMETYPE_TEXT_PLAIN); NodeRef textNode = createContentNode("plainContent", "Some plain text", MimetypeMap.MIMETYPE_TEXT_PLAIN);
String pubQueueUrl = MessageFormat.format(PUBLISHING_QUEUE_URL, siteId); String pubQueueUrl = MessageFormat.format(PUBLISHING_QUEUE_URL, siteId);
String jsonStr = "";
// Post empty content. // Post empty content.
sendRequest(new PostRequest(pubQueueUrl, jsonStr, JSON), 500); sendRequest(new PostRequest(pubQueueUrl, "", JSON), 500);
String comment = "The comment"; String comment = "The comment";
String statusMessage = "The status message"; String statusMessage = "The status message";
JSONObject json = buildJson(textNode, publishChannel, comment, statusMessage, statusChannel); JSONObject json = buildJson(textNode, publishChannel, comment, statusMessage, statusChannel);
jsonStr = json.toString(); String jsonStr = json.toString();
// Post empty content. // Post JSON content.
sendRequest(new PostRequest(pubQueueUrl, jsonStr, JSON), 200); sendRequest(new PostRequest(pubQueueUrl, jsonStr, JSON), 200);
PublishingEventFilter filter = environment.createPublishingEventFilter(); PublishingEventFilter filter = environment.createPublishingEventFilter();
@@ -264,7 +260,7 @@ public class PublishingRestApiTest extends BaseWebScriptTest
assertTrue(channelNames.contains(statusChannel.getName())); assertTrue(channelNames.contains(statusChannel.getName()));
// Wait for Publishing Event to execute asynchronously // Wait for Publishing Event to execute asynchronously
Thread.sleep(2000); Thread.sleep(3000);
ChannelType publishAnyChannelType = channelService.getChannelType(publishAnyType); ChannelType publishAnyChannelType = channelService.getChannelType(publishAnyType);
ChannelType statusUpdateChannelType = channelService.getChannelType(statusUpdateType); ChannelType statusUpdateChannelType = channelService.getChannelType(statusUpdateType);
@@ -285,6 +281,19 @@ public class PublishingRestApiTest extends BaseWebScriptTest
verify(statusUpdateChannelType, never()).publish(any(NodeRef.class), anyMap()); verify(statusUpdateChannelType, never()).publish(any(NodeRef.class), anyMap());
verify(publishAnyChannelType, never()).updateStatus(anyString(), anyMap()); verify(publishAnyChannelType, never()).updateStatus(anyString(), anyMap());
JSONObject status = json.optJSONObject(STATUS_UPDATE);
status.remove(NODE_REF);
jsonStr = json.toString();
// Post JSON without NodeRef in status.
sendRequest(new PostRequest(pubQueueUrl, jsonStr, JSON), 200);
json.remove(STATUS_UPDATE);
jsonStr = json.toString();
// Post JSON without Status Update.
sendRequest(new PostRequest(pubQueueUrl, jsonStr, JSON), 200);
} }
private JSONObject buildJson(NodeRef node, Channel publishChannel, private JSONObject buildJson(NodeRef node, Channel publishChannel,
@@ -501,7 +510,14 @@ public class PublishingRestApiTest extends BaseWebScriptTest
@Override @Override
public void tearDown() throws Exception public void tearDown() throws Exception
{ {
siteService.deleteSite(siteId); try
{
siteService.deleteSite(siteId);
}
catch(Throwable t)
{
//NOOP
}
super.tearDown(); super.tearDown();
} }
} }