From be454382808c1f0e46aae3f247698ff1fcff028b Mon Sep 17 00:00:00 2001 From: lresende Date: Fri, 10 Apr 2009 04:37:28 +0000 Subject: Refacroting testcase to use same package pattern for the module git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@763871 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/binding/atom/ContentNegotiationTest.java | 22 ++-- .../sca/binding/atom/MediaCollectionImpl.java | 1 - .../atom/ProviderEntryEntityTagsTestCase.java | 20 +--- .../atom/ProviderFeedEntityTagsTestCase.java | 22 ++-- .../atom/ProviderServiceDocumentTestCase.java | 21 ++-- .../sca/binding/atom/aggregator/Aggregator.java | 29 +++++ .../binding/atom/aggregator/AggregatorImpl.java | 127 +++++++++++++++++++++ .../atom/aggregator/AggregatorTestCase.java | 70 ++++++++++++ .../tuscany/sca/binding/atom/aggregator/Sort.java | 38 ++++++ .../sca/binding/atom/aggregator/SortImpl.java | 62 ++++++++++ .../tuscany/sca/data/collection/Aggregator.java | 27 ----- .../sca/data/collection/AggregatorImpl.java | 127 --------------------- .../sca/data/collection/AggregatorTestCase.java | 67 ----------- .../apache/tuscany/sca/data/collection/Sort.java | 38 ------ .../tuscany/sca/data/collection/SortImpl.java | 62 ---------- 15 files changed, 353 insertions(+), 380 deletions(-) create mode 100644 branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java create mode 100644 branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java create mode 100644 branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java create mode 100644 branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java create mode 100644 branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java delete mode 100644 branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/Aggregator.java delete mode 100644 branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/AggregatorImpl.java delete mode 100644 branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/AggregatorTestCase.java delete mode 100644 branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/Sort.java delete mode 100644 branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/SortImpl.java (limited to 'branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany') diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java index 08f8e3db2a..72101f1531 100644 --- a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java +++ b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java @@ -20,34 +20,26 @@ package org.apache.tuscany.sca.binding.atom; import java.io.IOException; import java.io.Reader; -import java.text.SimpleDateFormat; import java.util.Date; import junit.framework.Assert; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -import org.apache.tuscany.sca.binding.atom.collection.Collection; -import org.apache.tuscany.sca.host.embedded.SCADomain; - import org.apache.abdera.Abdera; -import org.apache.abdera.i18n.iri.IRI; import org.apache.abdera.factory.Factory; -import org.apache.abdera.model.Base; +import org.apache.abdera.i18n.iri.IRI; import org.apache.abdera.model.Content; +import org.apache.abdera.model.Document; import org.apache.abdera.model.Entry; import org.apache.abdera.model.Feed; -import org.apache.abdera.model.Document; -import org.apache.abdera.model.Service; +import org.apache.abdera.parser.Parser; import org.apache.abdera.protocol.Response.ResponseType; import org.apache.abdera.protocol.client.AbderaClient; import org.apache.abdera.protocol.client.ClientResponse; import org.apache.abdera.protocol.client.RequestOptions; -import org.apache.abdera.protocol.client.util.BaseRequestEntity; -import org.apache.abdera.util.EntityTag; -import org.apache.abdera.parser.Parser; +import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; /** diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java index 5d5953aaaa..385510b93f 100644 --- a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java +++ b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionImpl.java @@ -32,7 +32,6 @@ import org.apache.abdera.i18n.iri.IRI; import org.apache.abdera.model.Content; import org.apache.abdera.model.Entry; import org.apache.abdera.model.Feed; -import org.apache.tuscany.sca.binding.atom.collection.Collection; import org.apache.tuscany.sca.binding.atom.collection.MediaCollection; import org.apache.tuscany.sca.binding.atom.collection.NotFoundException; import org.osoa.sca.annotations.Scope; diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java index 703419f527..1ba1dcca11 100644 --- a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java +++ b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java @@ -22,29 +22,21 @@ import java.text.SimpleDateFormat; import java.util.Date; import junit.framework.Assert; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -import org.apache.tuscany.sca.binding.atom.collection.Collection; -import org.apache.tuscany.sca.host.embedded.SCADomain; import org.apache.abdera.Abdera; -import org.apache.abdera.i18n.iri.IRI; import org.apache.abdera.factory.Factory; -import org.apache.abdera.model.Base; +import org.apache.abdera.i18n.iri.IRI; import org.apache.abdera.model.Content; import org.apache.abdera.model.Entry; -import org.apache.abdera.model.Feed; -import org.apache.abdera.model.Document; -import org.apache.abdera.model.Service; -import org.apache.abdera.protocol.Response.ResponseType; +import org.apache.abdera.parser.Parser; import org.apache.abdera.protocol.client.AbderaClient; import org.apache.abdera.protocol.client.ClientResponse; import org.apache.abdera.protocol.client.RequestOptions; import org.apache.abdera.protocol.client.util.BaseRequestEntity; -import org.apache.abdera.util.EntityTag; -import org.apache.abdera.parser.Parser; +import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; /** * Tests use of server provided entry entity tags for Atom binding in Tuscany. diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java index 4915f7426e..030bed62e5 100644 --- a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java +++ b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java @@ -22,35 +22,27 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.StringReader; -import java.net.Socket; import java.text.SimpleDateFormat; import java.util.Date; import junit.framework.Assert; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -import org.apache.tuscany.sca.host.embedded.SCADomain; import org.apache.abdera.Abdera; -import org.apache.abdera.i18n.iri.IRI; import org.apache.abdera.factory.Factory; -import org.apache.abdera.model.Base; +import org.apache.abdera.i18n.iri.IRI; +import org.apache.abdera.model.Collection; import org.apache.abdera.model.Content; import org.apache.abdera.model.Entry; import org.apache.abdera.model.Feed; -import org.apache.abdera.model.Document; -import org.apache.abdera.model.Service; -import org.apache.abdera.model.Collection; +import org.apache.abdera.parser.Parser; import org.apache.abdera.protocol.Response.ResponseType; import org.apache.abdera.protocol.client.AbderaClient; import org.apache.abdera.protocol.client.ClientResponse; import org.apache.abdera.protocol.client.RequestOptions; -import org.apache.abdera.protocol.client.util.BaseRequestEntity; -import org.apache.abdera.util.EntityTag; -import org.apache.abdera.parser.Parser; +import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; /** * Tests use of server provided feed entity tags for Atom binding in Tuscany. diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java index 96ea508210..a92d4577d1 100644 --- a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java +++ b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderServiceDocumentTestCase.java @@ -22,31 +22,24 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; import junit.framework.Assert; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.binding.atom.collection.Collection; import org.apache.abdera.Abdera; -import org.apache.abdera.i18n.iri.IRI; -import org.apache.abdera.factory.Factory; import org.apache.abdera.model.Content; +import org.apache.abdera.model.Document; import org.apache.abdera.model.Entry; import org.apache.abdera.model.Feed; -import org.apache.abdera.model.Document; import org.apache.abdera.model.Service; +import org.apache.abdera.parser.Parser; import org.apache.abdera.protocol.Response.ResponseType; import org.apache.abdera.protocol.client.AbderaClient; import org.apache.abdera.protocol.client.ClientResponse; -import org.apache.abdera.protocol.client.RequestOptions; -import org.apache.abdera.parser.Parser; +import org.apache.tuscany.sca.binding.atom.collection.Collection; +import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; /** * Tests use of service documents provided by atom binding based collections. diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java new file mode 100644 index 0000000000..213ae53527 --- /dev/null +++ b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java @@ -0,0 +1,29 @@ +/* + * 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.tuscany.sca.binding.atom.aggregator; + +import org.apache.tuscany.sca.data.collection.Collection; +import org.apache.tuscany.sca.data.collection.Item; +import org.osoa.sca.annotations.Remotable; + +@Remotable +public interface Aggregator extends Collection{ + +} diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java new file mode 100644 index 0000000000..4037babd13 --- /dev/null +++ b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java @@ -0,0 +1,127 @@ +/* + * 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.tuscany.sca.binding.atom.aggregator; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.tuscany.sca.data.collection.Collection; +import org.apache.tuscany.sca.data.collection.Entry; +import org.apache.tuscany.sca.data.collection.Item; +import org.apache.tuscany.sca.data.collection.NotFoundException; +import org.osoa.sca.annotations.Property; +import org.osoa.sca.annotations.Reference; + +public class AggregatorImpl implements Aggregator { + + @Reference(required = false) + public Collection atomFeed1; + + @Reference(required = false) + public Collection atomFeed2; + + @Reference(required = false) + public Sort sort; + + @Property + public String feedTitle = "Aggregated Feed"; + @Property + public String feedDescription = "Anonymous Aggregated Feed"; + @Property + public String feedAuthor = "anonymous"; + + public Item get(String id) { + + try { + if (atomFeed1.get(id) != null) + return atomFeed1.get(id); + } catch (NotFoundException ex) { + ex.printStackTrace(); + } + + try { + if (atomFeed2.get(id) != null) + return atomFeed2.get(id); + } catch (NotFoundException ex) { + ex.printStackTrace(); + } + + return null; + + } + + public Entry[] getAll() { + + // Aggregate entries from atomFeed1, atomFeed2, rssFeed1 and rssFeed2 + List entries = new ArrayList(); + if (atomFeed1 != null) { + try { + for (Entry entry : atomFeed1.getAll()) { + entries.add(entry); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + if (atomFeed2 != null) { + try { + for (Entry entry : atomFeed2.getAll()) { + entries.add(entry); + } + } catch (Exception e) { + } + } + + // Sort entries by published date + if (sort != null) { + entries = sort.sort(entries); + } + + return entries.toArray(new Entry[entries.size()]); + + } + + public String post(String key, Item entry) { + return null; + } + + public void put(String id, Item entry) { + } + + public Entry[] query(String queryString) { + ArrayList entries = new ArrayList(); + + Entry[] allFeed = getAll(); + if (queryString.startsWith("title=")) { + String title = queryString.substring(6); + + for (Entry entry : allFeed) { + if (entry.getData().getTitle().contains(title)) { + entries.add(entry); + } + } + } + return entries.toArray(new Entry[entries.size()]); + } + + public void delete(String id) { + + } +} diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java new file mode 100644 index 0000000000..547bfe058a --- /dev/null +++ b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java @@ -0,0 +1,70 @@ +/* + * 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.tuscany.sca.binding.atom.aggregator; + +import java.net.Socket; + +import org.apache.tuscany.sca.data.collection.Entry; +import org.apache.tuscany.sca.data.collection.Item; +import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Ignore; +import org.junit.Test; + + +public class AggregatorTestCase { + private static SCADomain domain; + private static Aggregator aggregatorService; + + @BeforeClass + public static void init() throws Exception { + domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite"); + Assert.assertNotNull(domain); + aggregatorService = domain.getService(Aggregator.class, "AtomAggregator"); + Assert.assertNotNull(aggregatorService); + } + + @AfterClass + public static void destroy() throws Exception { + if(domain != null) { + domain.close(); + } + } + + @Test + public void testPing() throws Exception { + new Socket("127.0.0.1", 8085); + } + + @Ignore("TUSCANY-2939") + //@Test + public void testAggregator() throws Exception { + Entry[] entries = aggregatorService.getAll(); + + Assert.assertNotNull(entries); + Assert.assertTrue(entries.length > 0); + + for(int pos = 0; pos < entries.length; pos++) { + System.out.println(">>> Entry[" + pos + "] - " + entries[pos].getData().getTitle()); + } + } +} diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java new file mode 100644 index 0000000000..8b22dd3efa --- /dev/null +++ b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java @@ -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.tuscany.sca.binding.atom.aggregator; + +import java.util.List; + +import org.apache.tuscany.sca.data.collection.Entry; + +/** + * The Sort service business interface. + * + * @version $Rev: 639931 $ $Date: 2008-03-21 18:13:05 -0700 (Fri, 21 Mar 2008) $ + */ +public interface Sort { + + /** + * Sort feed entries by published date. + * @param entries + * @return + */ + List sort(List entries); +} diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java new file mode 100644 index 0000000000..8745683f6e --- /dev/null +++ b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java @@ -0,0 +1,62 @@ +/* + * 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.tuscany.sca.binding.atom.aggregator; + +import java.util.Arrays; +import java.util.Comparator; +import java.util.Date; +import java.util.List; + +import org.apache.tuscany.sca.data.collection.Entry; +import org.apache.tuscany.sca.data.collection.Item; +import org.osoa.sca.annotations.Property; + +/** + * Implementation of a Feed Sort service component. + * + * @version $Rev: 685663 $ $Date: 2008-08-13 13:11:20 -0700 (Wed, 13 Aug 2008) $ + */ +public class SortImpl implements Sort { + + @Property + public boolean newFirst = true; + + @SuppressWarnings("unchecked") + public List sort(List entries) { + Entry[] entriesArray = new Entry[entries.size()]; + entriesArray = (Entry[])entries.toArray(entriesArray); + Arrays.sort(entriesArray, new Comparator() { + public int compare(final Object xObj, final Object yObj) { + Entry x = (Entry) xObj; + Entry y = (Entry) yObj; + Item xItem = (Item) x.getData(); + Item yItem = (Item) y.getData(); + Date xDate = xItem.getDate(); + Date yDate = yItem.getDate(); + if (xDate == null) + return -1; + if (newFirst) + return yDate.compareTo(xDate); + else + return xDate.compareTo(yDate); + } + }); + return Arrays.asList(entriesArray); + } +} diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/Aggregator.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/Aggregator.java deleted file mode 100644 index c07cf0091e..0000000000 --- a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/Aggregator.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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.tuscany.sca.data.collection; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface Aggregator extends Collection{ - -} diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/AggregatorImpl.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/AggregatorImpl.java deleted file mode 100644 index 4e61db9a63..0000000000 --- a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/AggregatorImpl.java +++ /dev/null @@ -1,127 +0,0 @@ -/* - * 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.tuscany.sca.data.collection; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.tuscany.sca.data.collection.Collection; -import org.apache.tuscany.sca.data.collection.Entry; -import org.apache.tuscany.sca.data.collection.Item; -import org.apache.tuscany.sca.data.collection.NotFoundException; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; - -public class AggregatorImpl implements Aggregator { - - @Reference(required = false) - public Collection atomFeed1; - - @Reference(required = false) - public Collection atomFeed2; - - @Reference(required = false) - public Sort sort; - - @Property - public String feedTitle = "Aggregated Feed"; - @Property - public String feedDescription = "Anonymous Aggregated Feed"; - @Property - public String feedAuthor = "anonymous"; - - public Item get(String id) { - - try { - if (atomFeed1.get(id) != null) - return atomFeed1.get(id); - } catch (NotFoundException ex) { - ex.printStackTrace(); - } - - try { - if (atomFeed2.get(id) != null) - return atomFeed2.get(id); - } catch (NotFoundException ex) { - ex.printStackTrace(); - } - - return null; - - } - - public Entry[] getAll() { - - // Aggregate entries from atomFeed1, atomFeed2, rssFeed1 and rssFeed2 - List entries = new ArrayList(); - if (atomFeed1 != null) { - try { - for (Entry entry : atomFeed1.getAll()) { - entries.add(entry); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - if (atomFeed2 != null) { - try { - for (Entry entry : atomFeed2.getAll()) { - entries.add(entry); - } - } catch (Exception e) { - } - } - - // Sort entries by published date - if (sort != null) { - entries = sort.sort(entries); - } - - return entries.toArray(new Entry[entries.size()]); - - } - - public String post(String key, Item entry) { - return null; - } - - public void put(String id, Item entry) { - } - - public Entry[] query(String queryString) { - ArrayList entries = new ArrayList(); - - Entry[] allFeed = getAll(); - if (queryString.startsWith("title=")) { - String title = queryString.substring(6); - - for (Entry entry : allFeed) { - if (entry.getData().getTitle().contains(title)) { - entries.add(entry); - } - } - } - return entries.toArray(new Entry[entries.size()]); - } - - public void delete(String id) { - - } -} diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/AggregatorTestCase.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/AggregatorTestCase.java deleted file mode 100644 index 49f1207f31..0000000000 --- a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/AggregatorTestCase.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * 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.tuscany.sca.data.collection; - -import java.net.Socket; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; - - -public class AggregatorTestCase { - private static SCADomain domain; - private static Aggregator aggregatorService; - - @BeforeClass - public static void init() throws Exception { - domain = SCADomain.newInstance("org/apache/tuscany/sca/data/collection/FeedAggregator.composite"); - Assert.assertNotNull(domain); - aggregatorService = domain.getService(Aggregator.class, "AtomAggregator"); - Assert.assertNotNull(aggregatorService); - } - - @AfterClass - public static void destroy() throws Exception { - if(domain != null) { - domain.close(); - } - } - - @Test - public void testPing() throws Exception { - new Socket("127.0.0.1", 8085); - } - - @Ignore("TUSCANY-2939") - public void testAggregator() throws Exception { - Entry[] entries = aggregatorService.getAll(); - - Assert.assertNotNull(entries); - Assert.assertTrue(entries.length > 0); - - for(int pos = 0; pos < entries.length; pos++) { - System.out.println(">>> Entry[" + pos + "] - " + entries[pos].getData().getTitle()); - } - } -} diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/Sort.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/Sort.java deleted file mode 100644 index b4f4ebe640..0000000000 --- a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/Sort.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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.tuscany.sca.data.collection; - -import java.util.List; - -import org.apache.tuscany.sca.data.collection.Entry; - -/** - * The Sort service business interface. - * - * @version $Rev: 639931 $ $Date: 2008-03-21 18:13:05 -0700 (Fri, 21 Mar 2008) $ - */ -public interface Sort { - - /** - * Sort feed entries by published date. - * @param entries - * @return - */ - List sort(List entries); -} diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/SortImpl.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/SortImpl.java deleted file mode 100644 index 7e270211bc..0000000000 --- a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/SortImpl.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * 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.tuscany.sca.data.collection; - -import java.util.Arrays; -import java.util.Comparator; -import java.util.Date; -import java.util.List; - -import org.apache.tuscany.sca.data.collection.Entry; -import org.apache.tuscany.sca.data.collection.Item; -import org.osoa.sca.annotations.Property; - -/** - * Implementation of a Feed Sort service component. - * - * @version $Rev: 685663 $ $Date: 2008-08-13 13:11:20 -0700 (Wed, 13 Aug 2008) $ - */ -public class SortImpl implements Sort { - - @Property - public boolean newFirst = true; - - @SuppressWarnings("unchecked") - public List sort(List entries) { - Entry[] entriesArray = new Entry[entries.size()]; - entriesArray = (Entry[])entries.toArray(entriesArray); - Arrays.sort(entriesArray, new Comparator() { - public int compare(final Object xObj, final Object yObj) { - Entry x = (Entry) xObj; - Entry y = (Entry) yObj; - Item xItem = (Item) x.getData(); - Item yItem = (Item) y.getData(); - Date xDate = xItem.getDate(); - Date yDate = yItem.getDate(); - if (xDate == null) - return -1; - if (newFirst) - return yDate.compareTo(xDate); - else - return xDate.compareTo(yDate); - } - }); - return Arrays.asList(entriesArray); - } -} -- cgit v1.2.3