diff --git a/webmagic-core/src/main/java/us/codecraft/webmagic/model/ObjectPageProcessor.java b/webmagic-core/src/main/java/us/codecraft/webmagic/model/ModelPageProcessor.java similarity index 86% rename from webmagic-core/src/main/java/us/codecraft/webmagic/model/ObjectPageProcessor.java rename to webmagic-core/src/main/java/us/codecraft/webmagic/model/ModelPageProcessor.java index 5a707bc1..1fd8c10d 100644 --- a/webmagic-core/src/main/java/us/codecraft/webmagic/model/ObjectPageProcessor.java +++ b/webmagic-core/src/main/java/us/codecraft/webmagic/model/ModelPageProcessor.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; * @date: 13-8-1
* Time: 下午8:46
*/ -public class ObjectPageProcessor implements PageProcessor { +public class ModelPageProcessor implements PageProcessor { private List pageModelExtractorList = new ArrayList(); @@ -26,16 +26,16 @@ public class ObjectPageProcessor implements PageProcessor { private Set targetUrlPatterns = new HashSet(); - public static ObjectPageProcessor create(Site site, Class... clazzs) { - ObjectPageProcessor objectPageProcessor = new ObjectPageProcessor(site); + public static ModelPageProcessor create(Site site, Class... clazzs) { + ModelPageProcessor modelPageProcessor = new ModelPageProcessor(site); for (Class clazz : clazzs) { - objectPageProcessor.addPageModel(clazz); + modelPageProcessor.addPageModel(clazz); } - return objectPageProcessor; + return modelPageProcessor; } - public ObjectPageProcessor addPageModel(Class clazz) { + public ModelPageProcessor addPageModel(Class clazz) { PageModelExtractor pageModelExtractor = PageModelExtractor.create(clazz); targetUrlPatterns.addAll(pageModelExtractor.getTargetUrlPatterns()); targetUrlPatterns.addAll(pageModelExtractor.getHelpUrlPatterns()); @@ -43,7 +43,7 @@ public class ObjectPageProcessor implements PageProcessor { return this; } - private ObjectPageProcessor(Site site) { + private ModelPageProcessor(Site site) { this.site = site; } diff --git a/webmagic-core/src/main/java/us/codecraft/webmagic/model/ObjectPipeline.java b/webmagic-core/src/main/java/us/codecraft/webmagic/model/ModelPipeline.java similarity index 90% rename from webmagic-core/src/main/java/us/codecraft/webmagic/model/ObjectPipeline.java rename to webmagic-core/src/main/java/us/codecraft/webmagic/model/ModelPipeline.java index 41296f53..439a6291 100644 --- a/webmagic-core/src/main/java/us/codecraft/webmagic/model/ObjectPipeline.java +++ b/webmagic-core/src/main/java/us/codecraft/webmagic/model/ModelPipeline.java @@ -14,14 +14,14 @@ import java.util.concurrent.ConcurrentHashMap; * @date: 13-8-2
* Time: 上午10:47
*/ -public class ObjectPipeline implements Pipeline { +public class ModelPipeline implements Pipeline { private Map pageModelPipelines = new ConcurrentHashMap(); - public ObjectPipeline() { + public ModelPipeline() { } - public ObjectPipeline put(Class clazz, PageModelPipeline pageModelPipeline) { + public ModelPipeline put(Class clazz, PageModelPipeline pageModelPipeline) { pageModelPipelines.put(clazz, pageModelPipeline); return this; } diff --git a/webmagic-core/src/main/java/us/codecraft/webmagic/model/OOSpider.java b/webmagic-core/src/main/java/us/codecraft/webmagic/model/OOSpider.java index 900c9b4e..a76144a4 100644 --- a/webmagic-core/src/main/java/us/codecraft/webmagic/model/OOSpider.java +++ b/webmagic-core/src/main/java/us/codecraft/webmagic/model/OOSpider.java @@ -15,22 +15,22 @@ public class OOSpider extends Spider { * * @param pageProcessor 已定义的抽取规则 */ - private ObjectPageProcessor objectPageProcessor; + private ModelPageProcessor modelPageProcessor; - private ObjectPipeline objectPipeline; + private ModelPipeline modelPipeline; - protected OOSpider(ObjectPageProcessor objectPageProcessor) { - super(objectPageProcessor); - this.objectPageProcessor = objectPageProcessor; + protected OOSpider(ModelPageProcessor modelPageProcessor) { + super(modelPageProcessor); + this.modelPageProcessor = modelPageProcessor; } public OOSpider(Site site, PageModelPipeline pageModelPipeline, Class... pageModels) { - this(ObjectPageProcessor.create(site, pageModels)); - this.objectPipeline = new ObjectPipeline(); - super.pipeline(objectPipeline); + this(ModelPageProcessor.create(site, pageModels)); + this.modelPipeline = new ModelPipeline(); + super.pipeline(modelPipeline); if (pageModelPipeline!=null){ for (Class pageModel : pageModels) { - this.objectPipeline.put(pageModel, pageModelPipeline); + this.modelPipeline.put(pageModel, pageModelPipeline); } } } @@ -45,8 +45,8 @@ public class OOSpider extends Spider { public OOSpider addPageModel(PageModelPipeline pageModelPipeline, Class... pageModels) { for (Class pageModel : pageModels) { - objectPageProcessor.addPageModel(pageModel); - objectPipeline.put(pageModel, pageModelPipeline); + modelPageProcessor.addPageModel(pageModel); + modelPipeline.put(pageModel, pageModelPipeline); } return this; } diff --git a/webmagic-core/src/main/java/us/codecraft/webmagic/model/package.html b/webmagic-core/src/main/java/us/codecraft/webmagic/model/package.html index b5f80b15..d62cc002 100644 --- a/webmagic-core/src/main/java/us/codecraft/webmagic/model/package.html +++ b/webmagic-core/src/main/java/us/codecraft/webmagic/model/package.html @@ -1,5 +1,5 @@ -webmagic对抓取器编写的面向对象方式的封装。基于POJO(称为PageModel)及注解即可实现一个PageProcessor。 +webmagic对抓取器编写的面向模型(称为PageModel)的封装。基于POJO及注解即可实现一个PageProcessor。