Author: rfrovarp
Date: Tue Mar 8 16:11:37 2011
New Revision: 1079411
URL: http://svn.apache.org/viewvc?rev=1079411&view=rev
Log:
Put annotations on their own line when annotating methods.
Modified:
incubator/droids/trunk/droids-crawler/src/main/java/org/apache/droids/core/Entity.java
incubator/droids/trunk/droids-crawler/src/main/java/org/apache/droids/crawler/fetcher/AbstractFetcher.java
incubator/droids/trunk/droids-crawler/src/main/java/org/apache/droids/crawler/fetcher/HttpFetcher.java
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/DependencyTest.java
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/LinkTest.java
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/LocalCrawlerServiceTest.java
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/RoundRobinCrawlerServiceTest.java
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/SimpleCrawlerControllerTest.java
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/extractor/HtmlElementLinkExtractorTest.java
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/fetcher/HttpFetcherTest.java
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/fetcher/appengine/AppEngineFetcherTest.java
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/filter/StatsFilterTest.java
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/parser/DefaultParserFactoryTest.java
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/parser/impl/NekoHtmlParserTest.java
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/util/ParamUtilsTest.java
Modified:
incubator/droids/trunk/droids-crawler/src/main/java/org/apache/droids/core/Entity.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-crawler/src/main/java/org/apache/droids/core/Entity.java?rev=1079411&r1=1079410&r2=1079411&view=diff
==============================================================================
---
incubator/droids/trunk/droids-crawler/src/main/java/org/apache/droids/core/Entity.java
(original)
+++
incubator/droids/trunk/droids-crawler/src/main/java/org/apache/droids/core/Entity.java
Tue Mar 8 16:11:37 2011
@@ -55,7 +55,8 @@ public class Entity implements Serializa
this.httpEntity = new BufferedHttpEntity(new
InputStreamEntity(inputStream, size));
}*/
- @Override public String toString(){
+ @Override
+ public String toString(){
StringBuilder out = new StringBuilder();
out.append("Entity ( ");
out.append("content.length: ").append(content.length).append(", ");
Modified:
incubator/droids/trunk/droids-crawler/src/main/java/org/apache/droids/crawler/fetcher/AbstractFetcher.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-crawler/src/main/java/org/apache/droids/crawler/fetcher/AbstractFetcher.java?rev=1079411&r1=1079410&r2=1079411&view=diff
==============================================================================
---
incubator/droids/trunk/droids-crawler/src/main/java/org/apache/droids/crawler/fetcher/AbstractFetcher.java
(original)
+++
incubator/droids/trunk/droids-crawler/src/main/java/org/apache/droids/crawler/fetcher/AbstractFetcher.java
Tue Mar 8 16:11:37 2011
@@ -36,7 +36,8 @@ public abstract class AbstractFetcher<T
@Autowired(required = false) protected List<Delay<T>> delays;
@Autowired(required = false) @Qualifier("fetcher.filterComparator")
protected Comparator filterComparator;
- @PostConstruct public Fetcher<T> init(){
+ @PostConstruct
+ public Fetcher<T> init(){
if (filters != null && filterComparator != null)
Collections.sort(filters, filterComparator);
return this;
}
Modified:
incubator/droids/trunk/droids-crawler/src/main/java/org/apache/droids/crawler/fetcher/HttpFetcher.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-crawler/src/main/java/org/apache/droids/crawler/fetcher/HttpFetcher.java?rev=1079411&r1=1079410&r2=1079411&view=diff
==============================================================================
---
incubator/droids/trunk/droids-crawler/src/main/java/org/apache/droids/crawler/fetcher/HttpFetcher.java
(original)
+++
incubator/droids/trunk/droids-crawler/src/main/java/org/apache/droids/crawler/fetcher/HttpFetcher.java
Tue Mar 8 16:11:37 2011
@@ -56,7 +56,8 @@ public class HttpFetcher<T extends Link>
this.httpClient = httpClient;
}
- @PostConstruct public HttpFetcher init(){
+ @PostConstruct
+ public HttpFetcher init(){
if (log.isDebugEnabled()) log.debug("init() - filters: " + filters +
", httpClient: " + httpClient);
return this;
}
Modified:
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/DependencyTest.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/DependencyTest.java?rev=1079411&r1=1079410&r2=1079411&view=diff
==============================================================================
---
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/DependencyTest.java
(original)
+++
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/DependencyTest.java
Tue Mar 8 16:11:37 2011
@@ -21,7 +21,8 @@ import static org.junit.Assert.assertNot
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class DependencyTest{
- @Test public void testSpring(){
+ @Test
+ public void testSpring(){
assertNotNull(new
ClassPathXmlApplicationContext("test-fetcher.HttpFetcherTest.xml"));
//assertNotNull(new
ClassPathXmlApplicationContext("test-fetcher.HttpFetcherTest.xml").getBean("httpClient"));
}
Modified:
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/LinkTest.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/LinkTest.java?rev=1079411&r1=1079410&r2=1079411&view=diff
==============================================================================
---
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/LinkTest.java
(original)
+++
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/LinkTest.java
Tue Mar 8 16:11:37 2011
@@ -23,7 +23,8 @@ import java.util.Map;
public class LinkTest{
- @Test public void testType(){
+ @Test
+ public void testType(){
assertTrue(new Link() instanceof Map);
}
}
Modified:
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/LocalCrawlerServiceTest.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/LocalCrawlerServiceTest.java?rev=1079411&r1=1079410&r2=1079411&view=diff
==============================================================================
---
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/LocalCrawlerServiceTest.java
(original)
+++
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/LocalCrawlerServiceTest.java
Tue Mar 8 16:11:37 2011
@@ -34,7 +34,8 @@ public class LocalCrawlerServiceTest{
ApplicationContext context = new
ClassPathXmlApplicationContext("test-LocalCrawlerServiceTest.xml");
static String url = "http://www.apache.org";;
- @Test public void testFetch() throws URISyntaxException, FetcherException{
+ @Test
+ public void testFetch() throws URISyntaxException, FetcherException{
CrawlerService crawlerService = context.getBean("crawlerService",
CrawlerService.class);
assertNotNull(crawlerService);
Link fetchedLink = crawlerService.fetch(new Link(url));
@@ -44,7 +45,8 @@ public class LocalCrawlerServiceTest{
assertNotNull(fetchedLink.get("fetched", Fetcher.class).getEntity());
}
- @Test public void testFetchParse() throws URISyntaxException,
FetcherException, ParserException{
+ @Test
+ public void testFetchParse() throws URISyntaxException, FetcherException,
ParserException{
CrawlerService crawlerService = context.getBean("crawlerService",
CrawlerService.class);
Link fetchedLink = crawlerService.fetch(new Link(url));
Link parsedLink = crawlerService.parse(fetchedLink);
@@ -52,7 +54,8 @@ public class LocalCrawlerServiceTest{
assertNotNull(parsedLink.get("parsed", Parser.class).getData());
}
- @Test public void testParseWithoutFetch() throws URISyntaxException,
FetcherException, ParserException{
+ @Test
+ public void testParseWithoutFetch() throws URISyntaxException,
FetcherException, ParserException{
CrawlerService crawlerService = context.getBean("crawlerService",
CrawlerService.class);
Link parsedLink = crawlerService.parse(new Link(url));
assertTrue(parsedLink.get("parsed") instanceof Parser);
@@ -61,7 +64,8 @@ public class LocalCrawlerServiceTest{
assertEquals(3, data.size());
}
- @Test public void testExtractWithoutFetchAndParse() throws
ExtractorException, URISyntaxException{
+ @Test
+ public void testExtractWithoutFetchAndParse() throws ExtractorException,
URISyntaxException{
CrawlerService crawlerService = context.getBean("crawlerService",
CrawlerService.class);
Link link = crawlerService.extract(new Link(url));
assertFalse(link.containsKey("parsed"));
Modified:
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/RoundRobinCrawlerServiceTest.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/RoundRobinCrawlerServiceTest.java?rev=1079411&r1=1079410&r2=1079411&view=diff
==============================================================================
---
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/RoundRobinCrawlerServiceTest.java
(original)
+++
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/RoundRobinCrawlerServiceTest.java
Tue Mar 8 16:11:37 2011
@@ -27,7 +27,8 @@ import java.net.URISyntaxException;
public class RoundRobinCrawlerServiceTest{
ApplicationContext context = new
ClassPathXmlApplicationContext("test-RoundRobinCrawlerServiceTest.xml");
- @Test public void testFetch() throws FetcherException, URISyntaxException{
+ @Test
+ public void testFetch() throws FetcherException, URISyntaxException{
RoundRobinCrawlerService service = context.getBean("crawlerService",
RoundRobinCrawlerService.class);
assertEquals(3, service.getCrawlerServices().size());
for (int i = 0; i < 30; i++){
Modified:
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/SimpleCrawlerControllerTest.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/SimpleCrawlerControllerTest.java?rev=1079411&r1=1079410&r2=1079411&view=diff
==============================================================================
---
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/SimpleCrawlerControllerTest.java
(original)
+++
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/SimpleCrawlerControllerTest.java
Tue Mar 8 16:11:37 2011
@@ -25,13 +25,15 @@ import org.springframework.context.Appli
public class SimpleCrawlerControllerTest{
ApplicationContext context = new
ClassPathXmlApplicationContext("test-StandaloneCrawlerControllerTest.xml");
- @Test public void testCrawlerControllerInit() throws DroidsException{
+ @Test
+ public void testCrawlerControllerInit() throws DroidsException{
StandaloneCrawlerController controller = new
StandaloneCrawlerController();
controller.init();
assertNotNull(controller.getQueue());
}
- @Test public void testCrawlerControllerStart() throws CrawlerException{
+ @Test
+ public void testCrawlerControllerStart() throws CrawlerException{
CrawlerController controller = context.getBean("crawlerController",
CrawlerController.class);
controller.start();
}
Modified:
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/extractor/HtmlElementLinkExtractorTest.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/extractor/HtmlElementLinkExtractorTest.java?rev=1079411&r1=1079410&r2=1079411&view=diff
==============================================================================
---
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/extractor/HtmlElementLinkExtractorTest.java
(original)
+++
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/extractor/HtmlElementLinkExtractorTest.java
Tue Mar 8 16:11:37 2011
@@ -42,7 +42,8 @@ import java.net.URISyntaxException;
public class HtmlElementLinkExtractorTest{
ApplicationContext context = new
ClassPathXmlApplicationContext("test-extractor.HtmlElementLinkExtractorTest.xml");
- @Test public void testParser() throws URISyntaxException, ParserException,
FetcherException{
+ @Test
+ public void testParser() throws URISyntaxException, ParserException,
FetcherException{
Link link = new Link("http://www.apache.org";);
Parser parser = context.getBean("nekoHtmlParser0",
NekoHtmlParser.class);
parser.parse(link, new HttpFetcher().fetch(link).getEntity(), null);
@@ -52,7 +53,8 @@ public class HtmlElementLinkExtractorTes
}
- @Test public void testExtractStyleBackground() throws URISyntaxException{
+ @Test
+ public void testExtractStyleBackground() throws URISyntaxException{
Link link = new
Link("http://www.w3schools.com/css/tryit_view.asp?filename=trycss_background-image";);
final Map data = new HashMap(), style = new HashMap();
Set blank = new HashSet();
@@ -73,7 +75,8 @@ public class HtmlElementLinkExtractorTes
assertEquals("http://www.w3schools.com/css/paper.gif";,
links.iterator().next().getUrl());
}
- @Test public void testExtractFilterSorting(){ //TODO move to another test
class
+ @Test
+ public void testExtractFilterSorting(){ //TODO move to another test class
IncludeFilter includeFilter = new IncludeFilter("");
includeFilter.setWeight(100);
@@ -90,7 +93,8 @@ public class HtmlElementLinkExtractorTes
}
- @Test public void testCSSBackground(){
+ @Test
+ public void testCSSBackground(){
Matcher matcher = null;
matcher = HtmlElementLinkExtractor.CSS_BG.matcher("body
{background-image:url('paper.gif')}");
Modified:
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/fetcher/HttpFetcherTest.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/fetcher/HttpFetcherTest.java?rev=1079411&r1=1079410&r2=1079411&view=diff
==============================================================================
---
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/fetcher/HttpFetcherTest.java
(original)
+++
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/fetcher/HttpFetcherTest.java
Tue Mar 8 16:11:37 2011
@@ -31,7 +31,8 @@ import java.io.IOException;
//TODO find a better way to test than making http request to apache
public class HttpFetcherTest{
- @Test public void testDefaultFetch() throws FetcherException,
URISyntaxException, IOException{
+ @Test
+ public void testDefaultFetch() throws FetcherException,
URISyntaxException, IOException{
Fetcher fetcher = new HttpFetcher().fetch(new
Link("http://incubator.apache.org/droids/";));
assertEquals(200, fetcher.getStatusCode());
assertNotNull(fetcher.getEntity());
@@ -41,7 +42,8 @@ public class HttpFetcherTest{
assertTrue(out.toByteArray().length > 15000);
}
- @Test public void testDefaultFetch_Spring() throws FetcherException,
URISyntaxException{
+ @Test
+ public void testDefaultFetch_Spring() throws FetcherException,
URISyntaxException{
Fetcher fetcher = new
ClassPathXmlApplicationContext("test-fetcher.HttpFetcherTest.xml").getBean("httpFetcher",
HttpFetcher.class);
fetcher.fetch(new Link("http://incubator.apache.org/droids/";), null);
assertEquals(200, fetcher.getStatusCode());
Modified:
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/fetcher/appengine/AppEngineFetcherTest.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/fetcher/appengine/AppEngineFetcherTest.java?rev=1079411&r1=1079410&r2=1079411&view=diff
==============================================================================
---
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/fetcher/appengine/AppEngineFetcherTest.java
(original)
+++
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/fetcher/appengine/AppEngineFetcherTest.java
Tue Mar 8 16:11:37 2011
@@ -24,7 +24,8 @@ import java.net.URISyntaxException;
public class AppEngineFetcherTest{
- @Test public void testMatch() throws URISyntaxException{
+ @Test
+ public void testMatch() throws URISyntaxException{
assertTrue(new AppEngineFetcher().matches(new
Link("http://www.apache.org";)));
}
}
Modified:
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/filter/StatsFilterTest.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/filter/StatsFilterTest.java?rev=1079411&r1=1079410&r2=1079411&view=diff
==============================================================================
---
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/filter/StatsFilterTest.java
(original)
+++
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/filter/StatsFilterTest.java
Tue Mar 8 16:11:37 2011
@@ -25,7 +25,8 @@ import java.util.Map;
public class StatsFilterTest{
- @Test public void testPollCount() throws URISyntaxException{
+ @Test
+ public void testPollCount() throws URISyntaxException{
StatsFilter filter = new StatsFilter().init();
for (int i = 0; i < 10; i++) filter.polled(new
Link("http://www.apache.org/page/"; + i));
Modified:
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/parser/DefaultParserFactoryTest.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/parser/DefaultParserFactoryTest.java?rev=1079411&r1=1079410&r2=1079411&view=diff
==============================================================================
---
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/parser/DefaultParserFactoryTest.java
(original)
+++
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/parser/DefaultParserFactoryTest.java
Tue Mar 8 16:11:37 2011
@@ -31,7 +31,8 @@ import java.net.URISyntaxException;
public class DefaultParserFactoryTest{
- @Test public void testAutowiringOfParsers(){
+ @Test
+ public void testAutowiringOfParsers(){
ApplicationContext context = new
ClassPathXmlApplicationContext("test-parser.DefaultParserFactoryTest.xml");
DefaultParserFactory factory = context.getBean("parserFactory",
DefaultParserFactory.class);
assertNotNull(factory);
@@ -39,7 +40,8 @@ public class DefaultParserFactoryTest{
assertEquals(3, factory.getParsers().size());
}
- @Test public void testTextHtml() throws URISyntaxException{
+ @Test
+ public void testTextHtml() throws URISyntaxException{
ApplicationContext context = new
ClassPathXmlApplicationContext("test-parser.DefaultParserFactoryTest.xml");
DefaultParserFactory factory = context.getBean("parserFactory",
DefaultParserFactory.class);
Link link = new Link("http://www.apache.org";);
@@ -49,4 +51,4 @@ public class DefaultParserFactoryTest{
assertTrue(parser instanceof NekoHtmlParser);
}
-}
\ No newline at end of file
+}
Modified:
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/parser/impl/NekoHtmlParserTest.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/parser/impl/NekoHtmlParserTest.java?rev=1079411&r1=1079410&r2=1079411&view=diff
==============================================================================
---
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/parser/impl/NekoHtmlParserTest.java
(original)
+++
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/parser/impl/NekoHtmlParserTest.java
Tue Mar 8 16:11:37 2011
@@ -40,7 +40,8 @@ public class NekoHtmlParserTest{
context = ;
}*/
- @Test public void testParser_A_href() throws URISyntaxException,
FetcherException, ParserException{
+ @Test
+ public void testParser_A_href() throws URISyntaxException,
FetcherException, ParserException{
Link link = new Link("http://www.apache.org/";);
Entity entity = new HttpFetcher().fetch(link).getEntity();
Parser parser = new
ClassPathXmlApplicationContext("test-parser.impl.NekoHtmlParserTest.xml").getBean("nekoHtmlParser0",
NekoHtmlParser.class);
@@ -54,7 +55,8 @@ public class NekoHtmlParserTest{
}
- @Test public void testParser_Style() throws URISyntaxException,
FetcherException, ParserException{
+ @Test
+ public void testParser_Style() throws URISyntaxException,
FetcherException, ParserException{
Link link = new
Link("http://www.w3schools.com/css/tryit_view.asp?filename=trycss_background-image";);
Entity entity = new HttpFetcher().fetch(link).getEntity();
Parser parser = new
ClassPathXmlApplicationContext("test-parser.impl.NekoHtmlParserTest.xml").getBean("nekoHtmlParser1",
NekoHtmlParser.class);
@@ -67,4 +69,4 @@ public class NekoHtmlParserTest{
assertTrue(result.get("STYLE").get("").size() == 1);
assertEquals("body {background-image:url('paper.gif')}",
result.get("STYLE").get("").toArray()[0]);
}
-}
\ No newline at end of file
+}
Modified:
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/util/ParamUtilsTest.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/util/ParamUtilsTest.java?rev=1079411&r1=1079410&r2=1079411&view=diff
==============================================================================
---
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/util/ParamUtilsTest.java
(original)
+++
incubator/droids/trunk/droids-crawler/src/test/java/org/apache/droids/crawler/util/ParamUtilsTest.java
Tue Mar 8 16:11:37 2011
@@ -26,7 +26,8 @@ import java.util.Map;
public class ParamUtilsTest{
- @Test public void testResolve(){
+ @Test
+ public void testResolve(){
ApplicationContext context = new
ClassPathXmlApplicationContext("test-util.ParamUtilsTest.xml");
assertTrue(context.containsBean("map"));
![http://www.w3schools.com/css/paper.gif"](http://www.w3schools.com/css/paper.gif"){kind=link}