You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2008/12/09 18:59:47 UTC
svn commit: r724800 - in /activemq/camel/trunk/components/camel-rss/src:
main/java/org/apache/camel/component/rss/
test/java/org/apache/camel/component/rss/
Author: janstey
Date: Tue Dec 9 09:59:47 2008
New Revision: 724800
URL: http://svn.apache.org/viewvc?rev=724800&view=rev
Log:
Fix CS errors
Modified:
activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedCollection.java
activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedStrategy.java
activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssDateComparator.java
activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssCustomAggregatorTest.java
activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortDefaultsTest.java
activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java
Modified: activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedCollection.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedCollection.java?rev=724800&r1=724799&r2=724800&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedCollection.java (original)
+++ activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedCollection.java Tue Dec 9 09:59:47 2008
@@ -6,7 +6,7 @@
* (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
+ * 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,
Modified: activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedStrategy.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedStrategy.java?rev=724800&r1=724799&r2=724800&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedStrategy.java (original)
+++ activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedStrategy.java Tue Dec 9 09:59:47 2008
@@ -6,7 +6,7 @@
* (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
+ * 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,
@@ -17,18 +17,18 @@
package org.apache.camel.component.rss;
-import com.sun.syndication.feed.synd.SyndFeed;
-
import java.util.ArrayList;
import java.util.List;
+import com.sun.syndication.feed.synd.SyndFeed;
+
import org.apache.camel.Exchange;
import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
public class AggregateRssFeedStrategy implements AggregationStrategy {
- protected final transient Log LOG = LogFactory.getLog(AggregateRssFeedStrategy.class);
+ protected final transient Log log = LogFactory.getLog(AggregateRssFeedStrategy.class);
public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
SyndFeed oldFeed = oldExchange.getIn().getBody(SyndFeed.class);
@@ -41,7 +41,7 @@
mergedList.addAll(newEntries);
oldFeed.setEntries(mergedList);
} else {
- LOG.debug("Could not merge exchanges. One body was null.");
+ log.debug("Could not merge exchanges. One body was null.");
}
return oldExchange;
}
Modified: activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssDateComparator.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssDateComparator.java?rev=724800&r1=724799&r2=724800&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssDateComparator.java (original)
+++ activemq/camel/trunk/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssDateComparator.java Tue Dec 9 09:59:47 2008
@@ -6,7 +6,7 @@
* (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
+ * 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,
@@ -17,11 +17,11 @@
package org.apache.camel.component.rss;
-import com.sun.syndication.feed.synd.SyndEntry;
-
import java.util.Comparator;
import java.util.Date;
+import com.sun.syndication.feed.synd.SyndEntry;
+
public class RssDateComparator implements Comparator<SyndEntry> {
public int compare(SyndEntry s1, SyndEntry s2) {
Modified: activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssCustomAggregatorTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssCustomAggregatorTest.java?rev=724800&r1=724799&r2=724800&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssCustomAggregatorTest.java (original)
+++ activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssCustomAggregatorTest.java Tue Dec 9 09:59:47 2008
@@ -19,31 +19,17 @@
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Arrays;
-import java.util.Collections;
-
-import javax.naming.Context;
import com.sun.syndication.feed.synd.SyndFeed;
-import org.apache.camel.Body;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.apache.camel.builder.ExpressionBuilder;
-import org.apache.camel.builder.PredicateBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.processor.MyAggregationStrategy;
-import org.apache.camel.processor.aggregate.AggregationCollection;
-import org.apache.camel.util.jndi.JndiContext;
public class RssCustomAggregatorTest extends ContextTestSupport {
@@ -73,7 +59,7 @@
BufferedWriter output = new BufferedWriter(new FileWriter(new File(destination)));
String line = null;
- while (( line = input.readLine()) != null) {
+ while ((line = input.readLine()) != null) {
output.write(line);
}
input.close();
Modified: activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortDefaultsTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortDefaultsTest.java?rev=724800&r1=724799&r2=724800&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortDefaultsTest.java (original)
+++ activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortDefaultsTest.java Tue Dec 9 09:59:47 2008
@@ -16,19 +16,7 @@
*/
package org.apache.camel.component.rss;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-
-import java.util.Date;
-
-import javax.naming.Context;
-
-import org.apache.camel.Body;
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.builder.ExpressionBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.util.jndi.JndiContext;
public class RssEntrySortDefaultsTest extends RssEntrySortTest {
protected RouteBuilder createRouteBuilder() throws Exception {
Modified: activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java?rev=724800&r1=724799&r2=724800&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java (original)
+++ activemq/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java Tue Dec 9 09:59:47 2008
@@ -16,13 +16,13 @@
*/
package org.apache.camel.component.rss;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-
import java.util.Date;
import javax.naming.Context;
+import com.sun.syndication.feed.synd.SyndEntry;
+import com.sun.syndication.feed.synd.SyndFeed;
+
import org.apache.camel.Body;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.ExpressionBuilder;