From 9102bf97bb7a2e15da2de4679c5e9a4344460a24 Mon Sep 17 00:00:00 2001 From: judy0131 Date: Wed, 26 Sep 2018 17:49:32 +0800 Subject: [PATCH] fix bug: can not find user defined Configurable Stop --- classpath/piflow-external.jar | Bin 7137 -> 7069 bytes piflow-bundle/pom.xml | 5 -- .../cn/piflow/bundle/clean/EmailClean.scala | 2 +- .../bundle/clean/IdentityNumberClean.scala | 2 +- .../bundle/clean/PhoneNumberClean.scala | 2 +- .../cn/piflow/bundle/clean/TitleClean.scala | 2 +- .../scala/cn/piflow/bundle/common/Fork.scala | 2 +- .../scala/cn/piflow/bundle/common/Merge.scala | 2 +- .../cn/piflow/bundle/common/SelectField.scala | 2 +- .../cn/piflow/bundle/csv/CsvParser.scala | 2 +- .../scala/cn/piflow/bundle/csv/CsvSave.scala | 6 +- .../cn/piflow/bundle/file/FetchFile.scala | 2 +- .../scala/cn/piflow/bundle/file/PutFile.scala | 2 +- .../piflow/bundle/file/RegexTextProcess.scala | 2 +- .../cn/piflow/bundle/ftp/LoadFromFtp.scala | 2 +- .../cn/piflow/bundle/ftp/UploadToFtp.scala | 2 +- .../cn/piflow/bundle/hive/PutHiveQL.scala | 2 +- .../piflow/bundle/hive/PutHiveStreaming.scala | 2 +- .../cn/piflow/bundle/hive/SelectHiveQL.scala | 2 +- .../piflow/bundle/http/LoadZipFromUrl.scala | 2 +- .../scala/cn/piflow/bundle/http/UnGZip.scala | 2 +- .../cn/piflow/bundle/jdbc/JdbcRead.scala | 2 +- .../cn/piflow/bundle/jdbc/JdbcWrite.scala | 2 +- .../cn/piflow/bundle/json/JsonParser.scala | 4 +- .../cn/piflow/bundle/json/JsonSave.scala | 2 +- .../bundle/script/DataFrameRowParser.scala | 2 +- .../piflow/bundle/script/ShellExecutor.scala | 2 +- .../piflow/bundle/xml/FolderXmlParser.scala | 6 +- .../cn/piflow/bundle/xml/XmlParser.scala | 2 +- .../scala/cn/piflow/bundle/xml/XmlSave.scala | 2 +- .../cn/piflow/conf/ConfigurableStop.scala | 2 +- .../scala/cn/piflow/conf/util/ClassUtil.scala | 55 +++++++++++++----- 32 files changed, 75 insertions(+), 53 deletions(-) diff --git a/classpath/piflow-external.jar b/classpath/piflow-external.jar index 4425d62804df65b0e58056a5d313dc467ef892b1..5633af9eee9f6377df3376d1ba957fc71ffbf4f5 100644 GIT binary patch delta 6613 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 delta 6700 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 R{WVi3MUdkni<14j{$G?i*yjKM diff --git a/piflow-bundle/pom.xml b/piflow-bundle/pom.xml index 3480ac9..8c6112f 100644 --- a/piflow-bundle/pom.xml +++ b/piflow-bundle/pom.xml @@ -16,11 +16,6 @@ piflow-core 0.9 - org.clapper diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/clean/EmailClean.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/clean/EmailClean.scala index 5769950..c2adf1e 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/clean/EmailClean.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/clean/EmailClean.scala @@ -10,7 +10,7 @@ import cn.piflow.conf.util.MapUtil import org.apache.spark.sql.SparkSession class EmailClean extends ConfigurableStop{ - override val authorEmail: String = "xiaoxiao@cnic.cn" + val authorEmail: String = "xiaoxiao@cnic.cn" val inportCount: Int = 0 val outportCount: Int = 1 var columnName:String=_ diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/clean/IdentityNumberClean.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/clean/IdentityNumberClean.scala index ed6ba18..2ae4560 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/clean/IdentityNumberClean.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/clean/IdentityNumberClean.scala @@ -14,7 +14,7 @@ import org.apache.spark.sql.SparkSession import scala.reflect.macros.ParseException class IdentityNumberClean extends ConfigurableStop{ - override val authorEmail: String = "xiaoxiao@cnic.cn" + val authorEmail: String = "xiaoxiao@cnic.cn" val inportCount: Int = 0 val outportCount: Int = 1 //var regex:String =_ diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/clean/PhoneNumberClean.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/clean/PhoneNumberClean.scala index 84ebc42..5864f01 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/clean/PhoneNumberClean.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/clean/PhoneNumberClean.scala @@ -8,7 +8,7 @@ import cn.piflow.conf.util.MapUtil import org.apache.spark.sql.SparkSession class PhoneNumberClean extends ConfigurableStop{ - override val authorEmail: String = "xiaoxiao@cnic.cn" + val authorEmail: String = "xiaoxiao@cnic.cn" val inportCount: Int = 0 val outportCount: Int = 1 var columnName:String=_ diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/clean/TitleClean.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/clean/TitleClean.scala index cc590fe..fa413b6 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/clean/TitleClean.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/clean/TitleClean.scala @@ -8,7 +8,7 @@ import cn.piflow.conf.util.MapUtil import org.apache.spark.sql.SparkSession class TitleClean extends ConfigurableStop{ - override val authorEmail: String = "xiaoxiao@cnic.cn" + val authorEmail: String = "xiaoxiao@cnic.cn" val inportCount: Int = 0 val outportCount: Int = 1 var columnName:String=_ diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/common/Fork.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/common/Fork.scala index 491a900..94d5fbf 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/common/Fork.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/common/Fork.scala @@ -9,7 +9,7 @@ import scala.beans.BeanProperty class Fork extends ConfigurableStop{ - override val authorEmail: String = "xjzhu@cnic.cn" + val authorEmail: String = "xjzhu@cnic.cn" val inportCount: Int = 1 val outportCount: Int = -1 diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/common/Merge.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/common/Merge.scala index 1a6eb9b..a042581 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/common/Merge.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/common/Merge.scala @@ -8,7 +8,7 @@ import scala.beans.BeanProperty class Merge extends ConfigurableStop{ - override val authorEmail: String = "xjzhu@cnic.cn" + val authorEmail: String = "xjzhu@cnic.cn" val inportCount: Int = -1 val outportCount: Int = 1 diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/common/SelectField.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/common/SelectField.scala index 3e60fb5..e9deaac 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/common/SelectField.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/common/SelectField.scala @@ -11,7 +11,7 @@ import scala.beans.BeanProperty class SelectField extends ConfigurableStop { - override val authorEmail: String = "xjzhu@cnic.cn" + val authorEmail: String = "xjzhu@cnic.cn" val inportCount: Int = 1 val outportCount: Int = 1 diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/csv/CsvParser.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/csv/CsvParser.scala index 5fb6117..02bb4de 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/csv/CsvParser.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/csv/CsvParser.scala @@ -10,7 +10,7 @@ import org.apache.spark.sql.{DataFrame, SparkSession} class CsvParser extends ConfigurableStop{ - override val authorEmail: String = "xjzhu@cnic.cn" + val authorEmail: String = "xjzhu@cnic.cn" val inportCount: Int = 0 val outportCount: Int = 1 diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/csv/CsvSave.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/csv/CsvSave.scala index 5e339de..4f01cb2 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/csv/CsvSave.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/csv/CsvSave.scala @@ -7,9 +7,9 @@ import cn.piflow.conf.{ConfigurableStop, CsvGroup, StopGroup, StopGroupEnum} import org.apache.spark.sql.SaveMode class CsvSave extends ConfigurableStop{ - override val authorEmail: String = "xjzhu@cnic.cn" - override val inportCount: Int = 1 - override val outportCount: Int = 0 + val authorEmail: String = "xjzhu@cnic.cn" + val inportCount: Int = 1 + val outportCount: Int = 0 var csvSavePath: String = _ var header: Boolean = _ diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/file/FetchFile.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/file/FetchFile.scala index 339df31..95cc489 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/file/FetchFile.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/file/FetchFile.scala @@ -10,7 +10,7 @@ import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.{FileSystem, Path} class FetchFile extends ConfigurableStop{ - override val authorEmail: String = "xiaoxiao@cnic.cn" + val authorEmail: String = "xiaoxiao@cnic.cn" val inportCount: Int = 0 val outportCount: Int = 1 var hdfs_path:String =_ diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/file/PutFile.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/file/PutFile.scala index 9c9433d..b4460a7 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/file/PutFile.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/file/PutFile.scala @@ -13,7 +13,7 @@ import org.apache.hadoop.conf.Configuration import org.apache.spark.sql.SparkSession class PutFile extends ConfigurableStop{ - override val authorEmail: String = "xiaoxiao@cnic.cn" + val authorEmail: String = "xiaoxiao@cnic.cn" val inportCount: Int = 0 val outportCount: Int = 1 var hdfs_path:String =_ diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/file/RegexTextProcess.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/file/RegexTextProcess.scala index 8c80fc1..00fb7d8 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/file/RegexTextProcess.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/file/RegexTextProcess.scala @@ -9,7 +9,7 @@ import org.apache.spark.sql.SparkSession class RegexTextProcess extends ConfigurableStop{ - override val authorEmail: String = "xiaoxiao@cnic.cn" + val authorEmail: String = "xiaoxiao@cnic.cn" val inportCount: Int = 0 val outportCount: Int = 1 var regex:String =_ diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/ftp/LoadFromFtp.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/ftp/LoadFromFtp.scala index f5728f5..8e60bb3 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/ftp/LoadFromFtp.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/ftp/LoadFromFtp.scala @@ -13,7 +13,7 @@ import sun.net.ftp.{FtpClient, FtpDirEntry} import scala.reflect.io.Directory class LoadFromFtp extends ConfigurableStop{ - override val authorEmail: String = "xiaoxiao@cnic.cn" + val authorEmail: String = "xiaoxiao@cnic.cn" val inportCount: Int = 0 val outportCount: Int = 1 var url_str:String =_ diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/ftp/UploadToFtp.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/ftp/UploadToFtp.scala index 2db23c0..ce7e89f 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/ftp/UploadToFtp.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/ftp/UploadToFtp.scala @@ -13,7 +13,7 @@ import sun.net.ftp.{FtpClient, FtpDirEntry} import scala.reflect.io.Directory class UploadToFtp extends ConfigurableStop{ - override val authorEmail: String = "xiaoxiao@cnic.cn" + val authorEmail: String = "xiaoxiao@cnic.cn" val inportCount: Int = 0 val outportCount: Int = 1 var url_str:String =_ diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/hive/PutHiveQL.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/hive/PutHiveQL.scala index 77dd709..a7d5e5a 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/hive/PutHiveQL.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/hive/PutHiveQL.scala @@ -8,7 +8,7 @@ import org.apache.spark.sql.SparkSession class PutHiveQL extends ConfigurableStop { - override val authorEmail: String = "xiaoxiao@cnic.cn" + val authorEmail: String = "xiaoxiao@cnic.cn" val inportCount: Int = 0 val outportCount: Int = 1 diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/hive/PutHiveStreaming.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/hive/PutHiveStreaming.scala index 8a73821..449aec8 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/hive/PutHiveStreaming.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/hive/PutHiveStreaming.scala @@ -10,7 +10,7 @@ import scala.beans.BeanProperty class PutHiveStreaming extends ConfigurableStop { - override val authorEmail: String = "xjzhu@cnic.cn" + val authorEmail: String = "xjzhu@cnic.cn" val inportCount: Int = 1 val outportCount: Int = 0 diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/hive/SelectHiveQL.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/hive/SelectHiveQL.scala index f6accf4..4235ef6 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/hive/SelectHiveQL.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/hive/SelectHiveQL.scala @@ -13,7 +13,7 @@ import scala.beans.BeanProperty class SelectHiveQL extends ConfigurableStop { - override val authorEmail: String = "xjzhu@cnic.cn" + val authorEmail: String = "xjzhu@cnic.cn" val inportCount: Int = 0 val outportCount: Int = 1 diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/http/LoadZipFromUrl.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/http/LoadZipFromUrl.scala index fefd11d..25c1906 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/http/LoadZipFromUrl.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/http/LoadZipFromUrl.scala @@ -10,7 +10,7 @@ import cn.piflow.{JobContext, JobInputStream, JobOutputStream, ProcessContext} import org.apache.spark.sql.SparkSession class LoadZipFromUrl extends ConfigurableStop{ - override val authorEmail: String = "xiaoxiao@cnic.cn" + val authorEmail: String = "xiaoxiao@cnic.cn" val inportCount: Int = 0 val outportCount: Int = 1 var url_str:String =_ diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/http/UnGZip.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/http/UnGZip.scala index c0fa8df..57864b9 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/http/UnGZip.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/http/UnGZip.scala @@ -11,7 +11,7 @@ import org.apache.commons.compress.archivers.tar.{TarArchiveEntry, TarArchiveInp import org.apache.spark.sql.{DataFrame, SparkSession} class UnGZip extends ConfigurableStop { - override val authorEmail: String = "xiaoxiao@cnic.cn" + val authorEmail: String = "xiaoxiao@cnic.cn" val inportCount: Int = 0 val outportCount: Int = 1 val fileTypes:List[String]=List("tar.gz","tar","gz") diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/jdbc/JdbcRead.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/jdbc/JdbcRead.scala index 2290f06..7e0a52c 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/jdbc/JdbcRead.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/jdbc/JdbcRead.scala @@ -9,7 +9,7 @@ import org.apache.spark.sql.SparkSession import scala.beans.BeanProperty class JdbcRead extends ConfigurableStop { - override val authorEmail: String = "xjzhu@cnic.cn" + val authorEmail: String = "xjzhu@cnic.cn" val inportCount: Int = 0 val outportCount: Int = 1 diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/jdbc/JdbcWrite.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/jdbc/JdbcWrite.scala index 2c0ef2b..081a936 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/jdbc/JdbcWrite.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/jdbc/JdbcWrite.scala @@ -12,7 +12,7 @@ import scala.beans.BeanProperty class JdbcWrite extends ConfigurableStop{ - override val authorEmail: String = "xjzhu@cnic.cn" + val authorEmail: String = "xjzhu@cnic.cn" val inportCount: Int = 1 val outportCount: Int = 0 diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/json/JsonParser.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/json/JsonParser.scala index 929bc27..cce204d 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/json/JsonParser.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/json/JsonParser.scala @@ -10,7 +10,7 @@ import scala.beans.BeanProperty class JsonPathParser extends ConfigurableStop{ - override val authorEmail: String = "xjzhu@cnic.cn" + val authorEmail: String = "xjzhu@cnic.cn" val inportCount: Int = 1 val outportCount: Int = 1 @@ -49,7 +49,7 @@ class JsonPathParser extends ConfigurableStop{ } class JsonStringParser extends ConfigurableStop{ - override val authorEmail: String = "xjzhu@cnic.cn" + val authorEmail: String = "xjzhu@cnic.cn" val inportCount: Int = 1 val outportCount: Int = 1 diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/json/JsonSave.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/json/JsonSave.scala index c15a18c..0f42dab 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/json/JsonSave.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/json/JsonSave.scala @@ -10,7 +10,7 @@ import scala.beans.BeanProperty class JsonSave extends ConfigurableStop{ - override val authorEmail: String = "xjzhu@cnic.cn" + val authorEmail: String = "xjzhu@cnic.cn" val inportCount: Int = 1 val outportCount: Int = 0 diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/script/DataFrameRowParser.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/script/DataFrameRowParser.scala index 8882ed2..c54b222 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/script/DataFrameRowParser.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/script/DataFrameRowParser.scala @@ -11,7 +11,7 @@ import scala.beans.BeanProperty class DataFrameRowParser extends ConfigurableStop{ - override val authorEmail: String = "xjzhu@cnic.cn" + val authorEmail: String = "xjzhu@cnic.cn" val inportCount: Int = 1 val outportCount: Int = 1 diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/script/ShellExecutor.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/script/ShellExecutor.scala index 2b77657..b3353f6 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/script/ShellExecutor.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/script/ShellExecutor.scala @@ -12,7 +12,7 @@ import sys.process._ class ShellExecutor extends ConfigurableStop{ - override val authorEmail: String = "xjzhu@cnic.cn" + val authorEmail: String = "xjzhu@cnic.cn" val inportCount: Int = 0 val outportCount: Int = 1 diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/FolderXmlParser.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/FolderXmlParser.scala index 154196b..53de666 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/FolderXmlParser.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/FolderXmlParser.scala @@ -17,9 +17,9 @@ import scala.util.control.Breaks._ * Created by admin on 2018/8/27. */ class FolderXmlParser extends ConfigurableStop{ - override val authorEmail: String = "lijie" - override val inportCount: Int = -1 - override val outportCount: Int = 1 + val authorEmail: String = "lijie" + val inportCount: Int = -1 + val outportCount: Int = 1 var rowTag:String = _ var xmlpath:String = _ diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/XmlParser.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/XmlParser.scala index cde5e46..586e84a 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/XmlParser.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/XmlParser.scala @@ -11,7 +11,7 @@ import scala.beans.BeanProperty class XmlParser extends ConfigurableStop { - override val authorEmail: String = "xjzhu@cnic.cn" + val authorEmail: String = "xjzhu@cnic.cn" val inportCount: Int = 1 val outportCount: Int = 1 diff --git a/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/XmlSave.scala b/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/XmlSave.scala index 522ea54..b8c64fa 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/XmlSave.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/bundle/xml/XmlSave.scala @@ -10,7 +10,7 @@ import scala.beans.BeanProperty class XmlSave extends ConfigurableStop{ - override val authorEmail: String = "xjzhu@cnic.cn" + val authorEmail: String = "xjzhu@cnic.cn" val inportCount: Int = 1 val outportCount: Int = 0 diff --git a/piflow-bundle/src/main/scala/cn/piflow/conf/ConfigurableStop.scala b/piflow-bundle/src/main/scala/cn/piflow/conf/ConfigurableStop.scala index 1f15704..f02fa27 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/conf/ConfigurableStop.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/conf/ConfigurableStop.scala @@ -4,7 +4,7 @@ import cn.piflow.Stop import cn.piflow.conf.bean.PropertyDescriptor -trait ConfigurableStop extends Stop{ +abstract class ConfigurableStop extends Stop{ val authorEmail : String val inportCount : Int diff --git a/piflow-bundle/src/main/scala/cn/piflow/conf/util/ClassUtil.scala b/piflow-bundle/src/main/scala/cn/piflow/conf/util/ClassUtil.scala index b37ec88..7fa8a6a 100644 --- a/piflow-bundle/src/main/scala/cn/piflow/conf/util/ClassUtil.scala +++ b/piflow-bundle/src/main/scala/cn/piflow/conf/util/ClassUtil.scala @@ -16,7 +16,7 @@ object ClassUtil { val configurableStopClass:String = "cn.piflow.conf.ConfigurableStop" //val classpath:String = "/opt/project/piflow/classpath" - /*def findAllConfigurableStop() : List[String] = { + /*def findAllConfigurableStopByClassFinder() : List[String] = { val classpath = System.getProperty("user.dir") var stopList : List[String] = List() @@ -63,17 +63,29 @@ object ClassUtil { var stopList:List[ConfigurableStop] = List() val classpathFile = new File(classpath) - println("classpath is " + classpath) + //println("classpath is " + classpath) val finder = ClassFinder(getJarFile(classpathFile)) val classes = finder.getClasses - val classMap = ClassFinder.classInfoMap(classes) + val it = classes.iterator + + while(it.hasNext) { + val externalClass = it.next() + if(externalClass.superClassName.equals(configurableStopClass)){ + + val stopIntance = Class.forName(externalClass.name).newInstance() + stopList = stopIntance.asInstanceOf[ConfigurableStop] +: stopList + } + } + stopList + + /*val classMap = ClassFinder.classInfoMap(classes) val plugins = ClassFinder.concreteSubclasses(configurableStopClass,classMap) plugins.foreach{ pluginClassInfo => val plugin = Class.forName(pluginClassInfo.name).newInstance() stopList = plugin.asInstanceOf[ConfigurableStop] +: stopList } - stopList + stopList*/ } def findAllGroups() : List[String] = { @@ -89,10 +101,22 @@ object ClassUtil { var stop:Option[ConfigurableStop] = None val classpathFile = new File(classpath) - println("classpath is " + classpath) + //println("classpath is " + classpath) val finder = ClassFinder(getJarFile(classpathFile)) val classes = finder.getClasses - val classMap = ClassFinder.classInfoMap(classes) + val it = classes.iterator + + while(it.hasNext) { + val externalClass = it.next() + if(externalClass.superClassName.equals(configurableStopClass)){ + if (externalClass.name.equals(bundle)){ + val stopIntance = Class.forName(externalClass.name).newInstance() + stop = Some(stopIntance.asInstanceOf[ConfigurableStop]) + return stop + } + } + } + /*val classMap = ClassFinder.classInfoMap(classes) val plugins = ClassFinder.concreteSubclasses(configurableStopClass,classMap) plugins.foreach{ pluginClassInfo => @@ -101,7 +125,7 @@ object ClassUtil { stop = Some(plugin.asInstanceOf[ConfigurableStop]) return stop } - } + }*/ stop } @@ -153,9 +177,10 @@ object ClassUtil { ("sensitive" -> property.sensitive.toString)) }) ) val jsonString = compactRender(json) jsonString + } - def main(args: Array[String]): Unit = { + /*def main(args: Array[String]): Unit = { //val stop = findConfigurableStop("cn.piflow.bundle.Class1") //val allConfigurableStopList = findAllConfigurableStop() /*val propertyDescriptorList = findConfigurableStopPropertyDescriptor("cn.piflow.bundle.Xjzhu") @@ -166,13 +191,15 @@ object ClassUtil { val str = propertyJsonList.mkString(start, ",", end) println(str)*/ - val stop = findConfigurableStopInClasspath("cn.piflow.bundle.Xjzhu") - val temp = 1 - //println(findAllGroups()); + /*val stop = findAllConfigurableStop() + stop.foreach(s => println(s.getClass.getName)) + val temp = 1*/ - //val stoplist = findAllGroups(); - //println(stoplist) - } + /*val stop = findConfigurableStop("cn.piflow.bundle.Xjzhu") + println(stop.getClass.getName)*/ + + + }*/ }