diff --git a/mongodbreader/src/main/java/com/alibaba/datax/plugin/reader/mongodbreader/MongoDBReaderErrorCode.java b/mongodbreader/src/main/java/com/alibaba/datax/plugin/reader/mongodbreader/MongoDBReaderErrorCode.java index 4b3780c2..46e50e22 100644 --- a/mongodbreader/src/main/java/com/alibaba/datax/plugin/reader/mongodbreader/MongoDBReaderErrorCode.java +++ b/mongodbreader/src/main/java/com/alibaba/datax/plugin/reader/mongodbreader/MongoDBReaderErrorCode.java @@ -7,15 +7,24 @@ import com.alibaba.datax.common.spi.ErrorCode; */ public enum MongoDBReaderErrorCode implements ErrorCode { + /** + * 参数不合法 + */ ILLEGAL_VALUE("ILLEGAL_PARAMETER_VALUE","参数不合法"), + /** + * 不合法的Mongo地址 + */ ILLEGAL_ADDRESS("ILLEGAL_ADDRESS","不合法的Mongo地址"), - UNEXCEPT_EXCEPTION("UNEXCEPT_EXCEPTION","未知异常"); + /** + * 未知异常 + */ + UNEXPECTED_EXCEPTION("UNEXPECTED_EXCEPTION","未知异常"); private final String code; private final String description; - private MongoDBReaderErrorCode(String code,String description) { + MongoDBReaderErrorCode(String code,String description) { this.code = code; this.description = description; } diff --git a/mongodbreader/src/main/java/com/alibaba/datax/plugin/reader/mongodbreader/util/MongoUtil.java b/mongodbreader/src/main/java/com/alibaba/datax/plugin/reader/mongodbreader/util/MongoUtil.java index ae7a2dd3..95544078 100644 --- a/mongodbreader/src/main/java/com/alibaba/datax/plugin/reader/mongodbreader/util/MongoUtil.java +++ b/mongodbreader/src/main/java/com/alibaba/datax/plugin/reader/mongodbreader/util/MongoUtil.java @@ -3,6 +3,7 @@ package com.alibaba.datax.plugin.reader.mongodbreader.util; import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import com.alibaba.datax.common.exception.DataXException; @@ -33,7 +34,7 @@ public class MongoUtil { } catch (NumberFormatException e) { throw DataXException.asDataXException(MongoDBReaderErrorCode.ILLEGAL_VALUE,"不合法参数"); } catch (Exception e) { - throw DataXException.asDataXException(MongoDBReaderErrorCode.UNEXCEPT_EXCEPTION,"未知异常"); + throw DataXException.asDataXException(MongoDBReaderErrorCode.UNEXPECTED_EXCEPTION,"未知异常"); } } @@ -45,14 +46,14 @@ public class MongoUtil { } try { MongoCredential credential = MongoCredential.createCredential(userName, database, password.toCharArray()); - return new MongoClient(parseServerAddress(addressList), Arrays.asList(credential)); + return new MongoClient(parseServerAddress(addressList), Collections.singletonList(credential)); } catch (UnknownHostException e) { throw DataXException.asDataXException(MongoDBReaderErrorCode.ILLEGAL_ADDRESS,"不合法的地址"); } catch (NumberFormatException e) { throw DataXException.asDataXException(MongoDBReaderErrorCode.ILLEGAL_VALUE,"不合法参数"); } catch (Exception e) { - throw DataXException.asDataXException(MongoDBReaderErrorCode.UNEXCEPT_EXCEPTION,"未知异常"); + throw DataXException.asDataXException(MongoDBReaderErrorCode.UNEXPECTED_EXCEPTION,"未知异常"); } } /** @@ -79,7 +80,7 @@ public class MongoUtil { for(Object address : rawAddressList) { String[] tempAddress = ((String)address).split(":"); try { - ServerAddress sa = new ServerAddress(tempAddress[0],Integer.valueOf(tempAddress[1])); + ServerAddress sa = new ServerAddress(tempAddress[0],Integer.parseInt(tempAddress[1])); addressList.add(sa); } catch (Exception e) { throw new UnknownHostException(); diff --git a/mongodbwriter/doc/mongodbwriter.md b/mongodbwriter/doc/mongodbwriter.md index 93f50290..b9db6df2 100644 --- a/mongodbwriter/doc/mongodbwriter.md +++ b/mongodbwriter/doc/mongodbwriter.md @@ -132,6 +132,8 @@ MongoDBWriter通过Datax框架获取Reader生成的数据，然后将Datax支持 * address： MongoDB的数据地址信息，因为MonogDB可能是个集群，则ip端口信息需要以Json数组的形式给出。【必填】 * userName：MongoDB的用户名。【选填】 * userPassword： MongoDB的密码。【选填】 +* dbName: MongoDB数据库【选填】 +* authDb: MongoDB认证数据库【选填】 * collectionName： MonogoDB的集合名。【必填】 * column：MongoDB的文档列名。【必填】 * name：Column的名字。【必填】 diff --git a/mongodbwriter/src/main/java/com/alibaba/datax/plugin/writer/mongodbwriter/KeyConstant.java b/mongodbwriter/src/main/java/com/alibaba/datax/plugin/writer/mongodbwriter/KeyConstant.java index 40de3124..0642c0c8 100644 --- a/mongodbwriter/src/main/java/com/alibaba/datax/plugin/writer/mongodbwriter/KeyConstant.java +++ b/mongodbwriter/src/main/java/com/alibaba/datax/plugin/writer/mongodbwriter/KeyConstant.java @@ -25,6 +25,10 @@ public class KeyConstant { * mongodb 数据库名 */ public static final String MONGO_DB_NAME = "dbName"; + /** + * mongodb 认证数据库名 + */ + public static final String MONGO_AUTHDB = "authDb"; /** * mongodb 集合名 */ diff --git a/mongodbwriter/src/main/java/com/alibaba/datax/plugin/writer/mongodbwriter/MongoDBWriter.java b/mongodbwriter/src/main/java/com/alibaba/datax/plugin/writer/mongodbwriter/MongoDBWriter.java index 76f35a40..2aa5bb4b 100644 --- a/mongodbwriter/src/main/java/com/alibaba/datax/plugin/writer/mongodbwriter/MongoDBWriter.java +++ b/mongodbwriter/src/main/java/com/alibaba/datax/plugin/writer/mongodbwriter/MongoDBWriter.java @@ -66,11 +66,12 @@ public class MongoDBWriter extends Writer{ private String password = null; private String database = null; + private String authDb = null; private String collection = null; private Integer batchSize = null; private JSONArray mongodbColumnMeta = null; private JSONObject writeMode = null; - private static int BATCH_SIZE = 1000; + private static final int BATCH_SIZE = 1000; @Override public void prepare() { @@ -320,8 +321,11 @@ public class MongoDBWriter extends Writer{ this.userName = writerSliceConfig.getString(KeyConstant.MONGO_USER_NAME); this.password = writerSliceConfig.getString(KeyConstant.MONGO_USER_PASSWORD); this.database = writerSliceConfig.getString(KeyConstant.MONGO_DB_NAME); + this.authDb = writerSliceConfig.getString(KeyConstant.MONGO_AUTHDB); + // 认证源 + String authSource = Strings.isNullOrEmpty(authDb) ? database : authDb; if(!Strings.isNullOrEmpty(userName) && !Strings.isNullOrEmpty(password)) { - this.mongoClient = MongoUtil.initCredentialMongoClient(this.writerSliceConfig,userName,password,database); + this.mongoClient = MongoUtil.initCredentialMongoClient(this.writerSliceConfig,userName,password,authSource); } else { this.mongoClient = MongoUtil.initMongoClient(this.writerSliceConfig); }