Merge pull request microDreamSheep#11 from microDreamSheep/code

microDreamSheep · web-flow · commit db2ad10e0992 · 2022-11-25T22:14:18.000+08:00
配置类准备工作
diff --git a/src/main/java/com/midream/sheep/swcj/core/APIClassInter/SWCJConfigClassConfiguration.java b/src/main/java/com/midream/sheep/swcj/core/APIClassInter/SWCJConfigClassConfiguration.java
@@ -0,0 +1,4 @@
+package com.midream.sheep.swcj.core.APIClassInter;
+
+public interface SWCJConfigClassConfiguration {
+}
diff --git a/src/main/java/com/midream/sheep/swcj/core/factory/SWCJAbstractFactory.java b/src/main/java/com/midream/sheep/swcj/core/factory/SWCJAbstractFactory.java
@@ -10,8 +10,8 @@
 import com.midream.sheep.swcj.core.classtool.classloader.SWCJClassLoader;
 import com.midream.sheep.swcj.core.classtool.classloader.SWCJClassLoaderInter;
 import com.midream.sheep.swcj.core.classtool.compiler.SWCJCompiler;
-import com.midream.sheep.swcj.core.factory.parse.bystr.BetterXmlParseTool;
-import com.midream.sheep.swcj.core.factory.parse.bystr.SWCJParseI;
+import com.midream.sheep.swcj.core.factory.xmlfactory.bystr.SWCJParseI;
+import com.midream.sheep.swcj.core.factory.xmlfactory.SWCJAbstractXmlFactory;
 import com.midream.sheep.swcj.data.Constant;
 import com.midream.sheep.swcj.data.ReptileConfig;
 import com.midream.sheep.swcj.pojo.buildup.SWCJClass;
@@ -22,22 +22,20 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.lang.reflect.InvocationTargetException;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
-/**
- * @author midreamsheep
- */
-public abstract class  SWCJAbstractFactory implements SWCJXmlFactory{
+public abstract class SWCJAbstractFactory
+        implements SWCJFactory
+{
     //核心配置文件
     public static volatile ReptileConfig config = new ReptileConfig();
     //爬虫文件
     protected Map<String, SWCJClass> swcjClasses = new HashMap<>();
     //构造器
     protected SWCJBuilder swcjBuilder = null;
-    //解析器
-    protected SWCJParseI swcjParseI = null;
     //加载器
     protected SWCJClassLoaderInter classLoader = null;
     @Override
@@ -60,7 +58,7 @@ public Object getWebSpiderById(String id) throws ConfigException, EmptyMatchMeth
                     TimeUnit.MILLISECONDS.sleep(200);
                     i++;
                 } catch (InterruptedException e) {
-                    Logger.getLogger(SWCJAbstractFactory.class.getName()).warning("线程暂停失败");
+                    Logger.getLogger(SWCJAbstractXmlFactory.class.getName()).warning("线程暂停失败");
                 }
                 if(i==10){
                     throw new ConfigException("你的配置文件找不到id="+id);
@@ -71,7 +69,7 @@ public Object getWebSpiderById(String id) throws ConfigException, EmptyMatchMeth
                 try {
                     TimeUnit.MILLISECONDS.sleep(200);
                 } catch (InterruptedException e) {
-                    Logger.getLogger(SWCJAbstractFactory.class.getName()).warning("线程暂停失败");
+                    Logger.getLogger(SWCJAbstractXmlFactory.class.getName()).warning("线程暂停失败");
                 }
             }else {
                 swcjClasses.get(id).setLoad(true);
@@ -81,32 +79,27 @@ public Object getWebSpiderById(String id) throws ConfigException, EmptyMatchMeth
         }
     }
     @Override
-    public SWCJXmlFactory setCompiler(SWCJCompiler swcjCompiler) {
+    public SWCJFactory setCompiler(SWCJCompiler swcjCompiler) {
         if(swcjBuilder==null){
             swcjBuilder = new ReptilesBuilder();
         }
         this.swcjBuilder.setCompiler(swcjCompiler);
         return this;
     }
     @Override
-    public SWCJXmlFactory setBuilder(SWCJBuilder swcjBuilder) {
+    public SWCJFactory setBuilder(SWCJBuilder swcjBuilder) {
         this.swcjBuilder = swcjBuilder;
         return this;
     }
-    @Override
-    public SWCJXmlFactory setParseTool(SWCJParseI swcjParseI) {
-        this.swcjParseI = swcjParseI;
-        return this;
-    }
 
     @Override
-    public SWCJXmlFactory invokeSpecialMethod(Object... args) {
+    public SWCJFactory invokeSpecialMethod(Object... args) {
         System.err.println("此工厂不存在特殊方法");
         return this;
     }
 
     @Override
-    public SWCJXmlFactory setClassLoader(SWCJClassLoaderInter classLoader) {
+    public SWCJFactory setClassLoader(SWCJClassLoaderInter classLoader) {
         if(this.swcjBuilder==null){
             this.swcjBuilder = new ReptilesBuilder();
         }
diff --git a/src/main/java/com/midream/sheep/swcj/core/factory/SWCJFactory.java b/src/main/java/com/midream/sheep/swcj/core/factory/SWCJFactory.java
@@ -6,27 +6,13 @@
 import com.midream.sheep.swcj.core.build.inter.SWCJBuilder;
 import com.midream.sheep.swcj.core.classtool.classloader.SWCJClassLoaderInter;
 import com.midream.sheep.swcj.core.classtool.compiler.SWCJCompiler;
-import com.midream.sheep.swcj.core.factory.parse.bystr.SWCJParseI;
-import org.xml.sax.SAXException;
+import com.midream.sheep.swcj.core.factory.xmlfactory.bystr.SWCJParseI;
 
-import javax.xml.parsers.ParserConfigurationException;
-import java.io.File;
-import java.io.IOException;
 /**
  * 这是工厂类的模板，自定义工厂需要实现这些方法
  * @author midreamsheep
  * */
-public interface SWCJXmlFactory {
-    /**
-     * 通过文件流解析文件
-     * @param xmlFile 文件流
-     * */
-    SWCJXmlFactory parse(File xmlFile) throws IOException, SAXException, ConfigException, ParserConfigurationException;
-    /**
-     * 通过文件流解析文件
-     * @param xmlString 文件
-     * */
-    SWCJXmlFactory parse(String xmlString) throws IOException, SAXException, ConfigException, ParserConfigurationException;
+public interface SWCJFactory {
     /**
      * 获取具体的实现类
      * @param id 配置文件的具体id
@@ -37,25 +23,25 @@ public interface SWCJXmlFactory {
      * 设置编译器
      * @param swcjCompiler 编译器
      * */
-    SWCJXmlFactory setCompiler(SWCJCompiler swcjCompiler);
+    SWCJFactory setCompiler(SWCJCompiler swcjCompiler);
     /**
      * 设置构建器
      * @param swcjBuilder 构建器
      * */
-    SWCJXmlFactory setBuilder(SWCJBuilder swcjBuilder);
+    SWCJFactory setBuilder(SWCJBuilder swcjBuilder);
     /**
      * 设置类加载器
      * @param classLoader 加载器
      * */
-    SWCJXmlFactory setClassLoader(SWCJClassLoaderInter classLoader);
+    SWCJFactory setClassLoader(SWCJClassLoaderInter classLoader);
     /**
      * 设置解析器
      * @param swcjParseI 解析器
      * */
-    SWCJXmlFactory setParseTool(SWCJParseI swcjParseI);
+    SWCJFactory setParseTool(SWCJParseI swcjParseI);
     /**
      * 调用专属特殊方法
      * @param args 传递值
      * */
-    SWCJXmlFactory invokeSpecialMethod(Object... args);
+    SWCJFactory invokeSpecialMethod(Object... args);
 }
diff --git a/src/main/java/com/midream/sheep/swcj/core/factory/annotationfactory/SWCJAnnotationAbstractFactory.java b/src/main/java/com/midream/sheep/swcj/core/factory/annotationfactory/SWCJAnnotationAbstractFactory.java
@@ -0,0 +1,16 @@
+package com.midream.sheep.swcj.core.factory.annotationfactory;
+
+import com.midream.sheep.swcj.core.APIClassInter.SWCJConfigClassConfiguration;
+import com.midream.sheep.swcj.core.factory.SWCJAbstractFactory;
+import com.midream.sheep.swcj.core.factory.xmlfactory.bystr.SWCJParseI;
+
+public abstract class SWCJAnnotationAbstractFactory
+    extends SWCJAbstractFactory
+{
+    @Override
+    public SWCJAnnotationAbstractFactory setParseTool(SWCJParseI swcjParseI) {
+        System.err.println("AnnotationFactory can't set parse tool");
+        return this;
+    }
+    public abstract SWCJAnnotationAbstractFactory parse(Class<? extends SWCJConfigClassConfiguration> configClass);
+}
diff --git a/src/main/java/com/midream/sheep/swcj/core/factory/xmlfactory/CoreXmlFactory.java b/src/main/java/com/midream/sheep/swcj/core/factory/xmlfactory/CoreXmlFactory.java
@@ -5,9 +5,8 @@
 import com.midream.sheep.swcj.Exception.InterfaceIllegal;
 import com.midream.sheep.swcj.core.build.builds.javanative.BuildTool;
 import com.midream.sheep.swcj.core.build.builds.javanative.ReptilesBuilder;
-import com.midream.sheep.swcj.core.factory.SWCJAbstractFactory;
-import com.midream.sheep.swcj.core.factory.SWCJXmlFactory;
-import com.midream.sheep.swcj.core.factory.parse.bystr.BetterXmlParseTool;
+import com.midream.sheep.swcj.core.factory.SWCJFactory;
+import com.midream.sheep.swcj.core.factory.xmlfactory.bystr.BetterXmlParseTool;
 import com.midream.sheep.swcj.pojo.buildup.SWCJClass;
 import com.midream.sheep.swcj.pojo.swc.passvalue.ReptlileMiddle;
 import org.xml.sax.SAXException;
@@ -21,7 +20,7 @@
 /**
  * 工厂类，读取配置文件，获取具体实现类
  */
-public class CoreXmlFactory extends SWCJAbstractFactory {
+public class CoreXmlFactory extends SWCJAbstractXmlFactory {
 
     public CoreXmlFactory(){}
 
@@ -33,7 +32,7 @@ public CoreXmlFactory(boolean isLoadCache,String workplace) throws ConfigExcepti
 
     //解析文档
     @Override
-    public SWCJXmlFactory parse(File xmlFile) {
+    public SWCJAbstractXmlFactory parse(File xmlFile) {
         notNull();
         try {
             parse(swcjParseI.parseXmlFile(xmlFile, config));
@@ -46,7 +45,7 @@ public SWCJXmlFactory parse(File xmlFile) {
     }
 
     @Override
-    public SWCJXmlFactory parse(String File) {
+    public SWCJAbstractXmlFactory parse(String File) {
         notNull();
         try {
             parse(swcjParseI.parseStringXml(File, config));
diff --git a/src/main/java/com/midream/sheep/swcj/core/factory/xmlfactory/SWCJAbstractXmlFactory.java b/src/main/java/com/midream/sheep/swcj/core/factory/xmlfactory/SWCJAbstractXmlFactory.java
@@ -0,0 +1,36 @@
+package com.midream.sheep.swcj.core.factory.xmlfactory;
+
+import com.midream.sheep.swcj.Exception.ConfigException;
+import com.midream.sheep.swcj.core.factory.SWCJAbstractFactory;
+import com.midream.sheep.swcj.core.factory.SWCJFactory;
+import com.midream.sheep.swcj.core.factory.xmlfactory.bystr.SWCJParseI;
+import org.xml.sax.SAXException;
+
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * @author midreamsheep
+ */
+public abstract class SWCJAbstractXmlFactory
+        extends SWCJAbstractFactory
+{
+    //解析器
+    protected SWCJParseI swcjParseI = null;
+    @Override
+    public SWCJAbstractXmlFactory setParseTool(SWCJParseI swcjParseI) {
+        this.swcjParseI = swcjParseI;
+        return this;
+    }
+    /**
+     * 通过文件流解析文件
+     * @param xmlFile 文件流
+     * */
+    public abstract SWCJAbstractXmlFactory parse(File xmlFile) throws IOException, SAXException, ConfigException, ParserConfigurationException;
+    /**
+     * 通过文件流解析文件
+     * @param xmlString 文件
+     * */
+    public abstract SWCJAbstractXmlFactory parse(String xmlString) throws IOException, SAXException, ConfigException, ParserConfigurationException;
+}
diff --git a/src/main/java/com/midream/sheep/swcj/core/factory/xmlfactory/ThreadXmlFactory.java b/src/main/java/com/midream/sheep/swcj/core/factory/xmlfactory/ThreadXmlFactory.java
@@ -4,9 +4,8 @@
 import com.midream.sheep.swcj.Exception.EmptyMatchMethodException;
 import com.midream.sheep.swcj.Exception.InterfaceIllegal;
 import com.midream.sheep.swcj.core.build.builds.javanative.ReptilesBuilder;
-import com.midream.sheep.swcj.core.factory.SWCJAbstractFactory;
-import com.midream.sheep.swcj.core.factory.SWCJXmlFactory;
-import com.midream.sheep.swcj.core.factory.parse.bystr.BetterXmlParseTool;
+import com.midream.sheep.swcj.core.factory.SWCJFactory;
+import com.midream.sheep.swcj.core.factory.xmlfactory.bystr.BetterXmlParseTool;
 import com.midream.sheep.swcj.pojo.buildup.SWCJClass;
 import com.midream.sheep.swcj.pojo.swc.passvalue.ReptlileMiddle;
 import org.xml.sax.SAXException;
@@ -21,7 +20,7 @@
 /**
  * 工厂类，读取配置文件，获取具体实现类
  */
-public class ThreadXmlFactory extends SWCJAbstractFactory {
+public class ThreadXmlFactory extends SWCJAbstractXmlFactory {
     private static final ExecutorService execute = new ThreadPoolExecutor(1,1,
             5, TimeUnit.SECONDS,
             new LinkedBlockingQueue<>()
@@ -34,7 +33,7 @@ public ThreadXmlFactory(boolean isLoadCache,String workplace) throws ConfigExcep
     }
     //解析文档
     @Override
-    public SWCJXmlFactory parse(File xmlFile) {
+    public SWCJAbstractXmlFactory parse(File xmlFile) {
         if (this.swcjParseI == null) {
             this.swcjParseI = new BetterXmlParseTool();
         }
@@ -50,7 +49,7 @@ public SWCJXmlFactory parse(File xmlFile) {
         return this;
     }
     @Override
-    public SWCJXmlFactory parse(String File) {
+    public SWCJAbstractXmlFactory parse(String File) {
         if (this.swcjParseI == null) {
             this.swcjParseI = new BetterXmlParseTool();
         }
@@ -88,7 +87,7 @@ private void parse(List<SWCJClass> list){
     }
 
     @Override
-    public SWCJXmlFactory invokeSpecialMethod(Object... args) {
+    public SWCJFactory invokeSpecialMethod(Object... args) {
         execute.shutdown();
         return this;
     }
diff --git a/src/main/java/com/midream/sheep/swcj/core/factory/xmlfactory/bystr/BetterXmlParseTool.java b/src/main/java/com/midream/sheep/swcj/core/factory/xmlfactory/bystr/BetterXmlParseTool.java
@@ -1,11 +1,10 @@
-package com.midream.sheep.swcj.core.factory.parse.bystr;
+package com.midream.sheep.swcj.core.factory.xmlfactory.bystr;
 
 import com.midream.sheep.swcj.Exception.ConfigException;
 import com.midream.sheep.swcj.Exception.InterfaceIllegal;
 import com.midream.sheep.swcj.cache.CacheCorn;
 import com.midream.sheep.swcj.core.APIClassInter.ExecuteConfigurationClass;
 import com.midream.sheep.swcj.core.build.builds.javanative.BuildTool;
-import com.midream.sheep.swcj.core.factory.SWCJAbstractFactory;
 import com.midream.sheep.swcj.core.factory.xmlfactory.CoreXmlFactory;
 import com.midream.sheep.swcj.data.Constant;
 import com.midream.sheep.swcj.data.ReptileConfig;
@@ -18,7 +17,6 @@
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Logger;
 
 public class BetterXmlParseTool implements SWCJParseI {
diff --git a/src/main/java/com/midream/sheep/swcj/core/factory/xmlfactory/bystr/SWCJParseI.java b/src/main/java/com/midream/sheep/swcj/core/factory/xmlfactory/bystr/SWCJParseI.java
@@ -1,4 +1,4 @@
-package com.midream.sheep.swcj.core.factory.parse.bystr;
+package com.midream.sheep.swcj.core.factory.xmlfactory.bystr;
 
 import com.midream.sheep.swcj.Exception.InterfaceIllegal;
 import com.midream.sheep.swcj.data.ReptileConfig;
diff --git a/src/test/java/Test.java b/src/test/java/Test.java
@@ -3,8 +3,9 @@
 import com.midream.sheep.swcj.Exception.EmptyMatchMethodException;
 import com.midream.sheep.swcj.Exception.InterfaceIllegal;
 import com.midream.sheep.swcj.core.build.builds.effecient.EffecientCompiler;
-import com.midream.sheep.swcj.core.factory.SWCJXmlFactory;
+import com.midream.sheep.swcj.core.factory.SWCJFactory;
 import com.midream.sheep.swcj.core.factory.xmlfactory.CoreXmlFactory;
+import com.midream.sheep.swcj.core.factory.xmlfactory.SWCJAbstractXmlFactory;
 import org.xml.sax.SAXException;
 import test.pojo;
 
@@ -18,7 +19,7 @@
  */
 public class Test {
     public static void main(String[] args) throws ConfigException, IOException, ParserConfigurationException, SAXException, EmptyMatchMethodException, InterfaceIllegal {
-        SWCJXmlFactory swcjXmlFactory = new CoreXmlFactory(true,"E://临时文件");
+        SWCJAbstractXmlFactory swcjXmlFactory = new CoreXmlFactory(true,"E://临时文件");
         long start1 = System.currentTimeMillis();
         swcjXmlFactory.parse(new File(Objects.requireNonNull(Test.class.getClassLoader().getResource("")).getPath() + "/text_reg.xml"));
         long end1 = System.currentTimeMillis();

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +package com.midream.sheep.swcj.core.APIClassInter;
++
 +public interface SWCJConfigClassConfiguration {
 +}
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.midream.sheep.swcj.core.factory.parse.bystr;`
	`1`	`+package com.midream.sheep.swcj.core.factory.xmlfactory.bystr;`
`2`	`2`
`3`	`3`	`import com.midream.sheep.swcj.Exception.InterfaceIllegal;`
`4`	`4`	`import com.midream.sheep.swcj.data.ReptileConfig;`