From 78d5cb0f42f5564db979681ce6fc0908c56252a2 Mon Sep 17 00:00:00 2001 From: Brian Remmington Date: Wed, 20 Jul 2011 15:54:43 +0000 Subject: [PATCH] Publishing: - channels.post webscript now returns authCallbackUrl in addition to previous data git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29230 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/publishing/ChannelHelper.java | 2 +- .../repo/publishing/MockChannelType.java | 2 +- .../publishing/PublishEventActionTest.java | 4 ++-- .../facebook/FacebookChannelType.java | 3 +-- .../publishing/flickr/FlickrChannelType.java | 21 +++++++++++++++++-- .../slideshare/SlideShareChannelType.java | 2 +- .../publishing/test/TestChannelType1.java | 2 +- .../publishing/test/TestChannelType2.java | 2 +- .../publishing/test/TestChannelType3.java | 2 +- .../twitter/TwitterChannelType.java | 2 +- .../youtube/YouTubeChannelType.java | 2 +- .../cmr/publishing/channels/ChannelType.java | 2 +- 12 files changed, 31 insertions(+), 15 deletions(-) diff --git a/source/java/org/alfresco/repo/publishing/ChannelHelper.java b/source/java/org/alfresco/repo/publishing/ChannelHelper.java index cd85863a05..30ac71b6e4 100644 --- a/source/java/org/alfresco/repo/publishing/ChannelHelper.java +++ b/source/java/org/alfresco/repo/publishing/ChannelHelper.java @@ -200,7 +200,7 @@ public class ChannelHelper private boolean isMimetypeSupported(String mimetype, ChannelType type) { - Set supportedMimetypes = type.getSupportedMimetypes(); + Set supportedMimetypes = type.getSupportedMimeTypes(); if (supportedMimetypes == null || supportedMimetypes.isEmpty()) { return true; diff --git a/source/java/org/alfresco/repo/publishing/MockChannelType.java b/source/java/org/alfresco/repo/publishing/MockChannelType.java index 0985bb5e95..1b04ae0cad 100644 --- a/source/java/org/alfresco/repo/publishing/MockChannelType.java +++ b/source/java/org/alfresco/repo/publishing/MockChannelType.java @@ -119,7 +119,7 @@ public class MockChannelType extends AbstractChannelType * {@inheritDoc} */ @Override - public Set getSupportedMimetypes() + public Set getSupportedMimeTypes() { return null; } diff --git a/source/java/org/alfresco/repo/publishing/PublishEventActionTest.java b/source/java/org/alfresco/repo/publishing/PublishEventActionTest.java index d40a7af853..93d7622737 100644 --- a/source/java/org/alfresco/repo/publishing/PublishEventActionTest.java +++ b/source/java/org/alfresco/repo/publishing/PublishEventActionTest.java @@ -305,7 +305,7 @@ public class PublishEventActionTest extends AbstractPublishingIntegrationTest // Set supported type to XML Set mimeTypes = Collections.singleton(MimetypeMap.MIMETYPE_XML); - when(channelType.getSupportedMimetypes()).thenReturn(mimeTypes); + when(channelType.getSupportedMimeTypes()).thenReturn(mimeTypes); // Publish source node but don't call ChannelType.publish(). publishNode(source); @@ -315,7 +315,7 @@ public class PublishEventActionTest extends AbstractPublishingIntegrationTest // Change supported type to plain text. mimeTypes = Collections.singleton(MimetypeMap.MIMETYPE_TEXT_PLAIN); - when(channelType.getSupportedMimetypes()).thenReturn(mimeTypes); + when(channelType.getSupportedMimeTypes()).thenReturn(mimeTypes); // Publish source node publishNode(source); diff --git a/source/java/org/alfresco/repo/publishing/facebook/FacebookChannelType.java b/source/java/org/alfresco/repo/publishing/facebook/FacebookChannelType.java index a4a1f2bbd6..673c2f2575 100644 --- a/source/java/org/alfresco/repo/publishing/facebook/FacebookChannelType.java +++ b/source/java/org/alfresco/repo/publishing/facebook/FacebookChannelType.java @@ -92,7 +92,7 @@ public class FacebookChannelType extends AbstractChannelType } @Override - public Set getSupportedMimetypes() + public Set getSupportedMimeTypes() { return Collections.emptySet(); } @@ -124,7 +124,6 @@ public class FacebookChannelType extends AbstractChannelType public String getAuthorisationUrl(Channel channel, String callbackUrl) { ParameterCheck.mandatory("channel", channel); - ParameterCheck.mandatory("callbackUrl", callbackUrl); if (!ID.equals(channel.getChannelType().getId())) { throw new IllegalArgumentException("Invalid channel type: " + channel.getChannelType().getId()); diff --git a/source/java/org/alfresco/repo/publishing/flickr/FlickrChannelType.java b/source/java/org/alfresco/repo/publishing/flickr/FlickrChannelType.java index f47474509c..fe33a5de2e 100644 --- a/source/java/org/alfresco/repo/publishing/flickr/FlickrChannelType.java +++ b/source/java/org/alfresco/repo/publishing/flickr/FlickrChannelType.java @@ -23,7 +23,9 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Set; +import java.util.TreeSet; +import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.publishing.AbstractChannelType; import org.alfresco.repo.publishing.PublishingModel; import org.alfresco.service.cmr.action.Action; @@ -43,9 +45,19 @@ import org.springframework.util.MultiValueMap; public class FlickrChannelType extends AbstractChannelType { public final static String ID = "flickr"; + private final static Set DEFAULT_SUPPORTED_MIME_TYPES = new TreeSet(); + + static + { + DEFAULT_SUPPORTED_MIME_TYPES.add(MimetypeMap.MIMETYPE_IMAGE_GIF); + DEFAULT_SUPPORTED_MIME_TYPES.add(MimetypeMap.MIMETYPE_IMAGE_JPEG); + DEFAULT_SUPPORTED_MIME_TYPES.add(MimetypeMap.MIMETYPE_IMAGE_PNG); + } + private NodeService nodeService; private FlickrPublishingHelper publishingHelper; private ActionService actionService; + private Set supportedMimeTypes = Collections.unmodifiableSet(DEFAULT_SUPPORTED_MIME_TYPES); public void setNodeService(NodeService nodeService) { @@ -61,6 +73,11 @@ public class FlickrChannelType extends AbstractChannelType { this.actionService = actionService; } + + public void setSupportedMimeTypes(Set mimeTypes) + { + supportedMimeTypes = Collections.unmodifiableSet(new TreeSet(mimeTypes)); + } @Override public boolean canPublish() @@ -99,9 +116,9 @@ public class FlickrChannelType extends AbstractChannelType } @Override - public Set getSupportedMimetypes() + public Set getSupportedMimeTypes() { - return Collections.emptySet(); + return supportedMimeTypes; } @Override diff --git a/source/java/org/alfresco/repo/publishing/slideshare/SlideShareChannelType.java b/source/java/org/alfresco/repo/publishing/slideshare/SlideShareChannelType.java index a5bfecc434..378ab6e96c 100644 --- a/source/java/org/alfresco/repo/publishing/slideshare/SlideShareChannelType.java +++ b/source/java/org/alfresco/repo/publishing/slideshare/SlideShareChannelType.java @@ -92,7 +92,7 @@ public class SlideShareChannelType extends AbstractChannelType } @Override - public Set getSupportedMimetypes() + public Set getSupportedMimeTypes() { return publishingHelper.getAllowedMimeTypes().keySet(); } diff --git a/source/java/org/alfresco/repo/publishing/test/TestChannelType1.java b/source/java/org/alfresco/repo/publishing/test/TestChannelType1.java index 1a34c31ff9..f67d832cbd 100644 --- a/source/java/org/alfresco/repo/publishing/test/TestChannelType1.java +++ b/source/java/org/alfresco/repo/publishing/test/TestChannelType1.java @@ -95,7 +95,7 @@ public class TestChannelType1 extends AbstractChannelType } @Override - public Set getSupportedMimetypes() + public Set getSupportedMimeTypes() { return null; } diff --git a/source/java/org/alfresco/repo/publishing/test/TestChannelType2.java b/source/java/org/alfresco/repo/publishing/test/TestChannelType2.java index 2014fd78a1..658ff18de2 100644 --- a/source/java/org/alfresco/repo/publishing/test/TestChannelType2.java +++ b/source/java/org/alfresco/repo/publishing/test/TestChannelType2.java @@ -95,7 +95,7 @@ public class TestChannelType2 extends AbstractChannelType } @Override - public Set getSupportedMimetypes() + public Set getSupportedMimeTypes() { return null; } diff --git a/source/java/org/alfresco/repo/publishing/test/TestChannelType3.java b/source/java/org/alfresco/repo/publishing/test/TestChannelType3.java index 57fe2246e8..be032eff7a 100644 --- a/source/java/org/alfresco/repo/publishing/test/TestChannelType3.java +++ b/source/java/org/alfresco/repo/publishing/test/TestChannelType3.java @@ -95,7 +95,7 @@ public class TestChannelType3 extends AbstractChannelType } @Override - public Set getSupportedMimetypes() + public Set getSupportedMimeTypes() { return null; } diff --git a/source/java/org/alfresco/repo/publishing/twitter/TwitterChannelType.java b/source/java/org/alfresco/repo/publishing/twitter/TwitterChannelType.java index c24f4448b2..2ce38fbdb1 100644 --- a/source/java/org/alfresco/repo/publishing/twitter/TwitterChannelType.java +++ b/source/java/org/alfresco/repo/publishing/twitter/TwitterChannelType.java @@ -91,7 +91,7 @@ public class TwitterChannelType extends AbstractChannelType } @Override - public Set getSupportedMimetypes() + public Set getSupportedMimeTypes() { return Collections.emptySet(); } diff --git a/source/java/org/alfresco/repo/publishing/youtube/YouTubeChannelType.java b/source/java/org/alfresco/repo/publishing/youtube/YouTubeChannelType.java index 71eebc1c8a..8d02125cd3 100644 --- a/source/java/org/alfresco/repo/publishing/youtube/YouTubeChannelType.java +++ b/source/java/org/alfresco/repo/publishing/youtube/YouTubeChannelType.java @@ -85,7 +85,7 @@ public class YouTubeChannelType extends AbstractChannelType } @Override - public Set getSupportedMimetypes() + public Set getSupportedMimeTypes() { return Collections.emptySet(); } diff --git a/source/java/org/alfresco/service/cmr/publishing/channels/ChannelType.java b/source/java/org/alfresco/service/cmr/publishing/channels/ChannelType.java index c9c835cd3b..0d334465a4 100644 --- a/source/java/org/alfresco/service/cmr/publishing/channels/ChannelType.java +++ b/source/java/org/alfresco/service/cmr/publishing/channels/ChannelType.java @@ -46,7 +46,7 @@ public interface ChannelType boolean canUnpublish(); boolean canPublishStatusUpdates(); - Set getSupportedMimetypes(); + Set getSupportedMimeTypes(); Set getSupportedContentTypes(); /**