Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor errorcode #1132

Merged
merged 11 commits into from
Sep 21, 2024
Merged

Refactor errorcode #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
05743d9
add more common error code
wgzhao Sep 20, 2024
ad30696
update
wgzhao Sep 20, 2024
21bc93a
remove DBUtilErrorCode class
wgzhao Sep 20, 2024
4897324
remove CassandraReaderErrorCode
wgzhao Sep 20, 2024
eec9118
remove DataReaderErrorCode class
wgzhao Sep 20, 2024
eaa8e25
remove DbfReaderErrorCode class
wgzhao Sep 20, 2024
3e8040c
remove more Error class
wgzhao Sep 20, 2024
3a4dcc6
remove more ErrorCode classes
wgzhao Sep 21, 2024
5ce9205
update
wgzhao Sep 21, 2024
02c6929
Remove ErrorCode interface class
wgzhao Sep 21, 2024
4ec16e8
Move ErrorCode to the original path for compatibility.
wgzhao Sep 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions build-module.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,21 @@ MODULE_NAME=$1

cd $SRC_DIR
mvn package -B --quiet -pl :$MODULE_NAME -am -Dmaven.test.skip=true || exit 1

if [ "$MODULE_NAME" == "addax-core" ]; then
cp -a core/target/${MODULE_NAME}-${version}.jar ${ADDAX_HOME}/lib
exit 0
fi

if [ "$MODULE_NAME" == "addax-common" ];then
cp -a common/target/${MODULE_NAME}-${version}.jar ${ADDAX_HOME}/lib
exit 0
fi

if [ "$MODULE_NAME" == "addax-rdbms" -o "$MODULE_NAME" == "addax-storage" -o "$MODULE_NAME" == "addax-transformer" ]; then
cp -a lib/${MODULE_NAME}/target/${MODULE_NAME}-${version}.jar ${ADDAX_HOME}/lib
exit 0
fi
# if the module nam ends with reader, then the module base directory is plugin/reader,
# else the directory is plugin/writer
if [[ $MODULE_NAME =~ .*"reader" ]]; then
Expand Down
10 changes: 5 additions & 5 deletions common/src/main/java/com/wgzhao/addax/common/element/BoolColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package com.wgzhao.addax.common.element;

import com.wgzhao.addax.common.exception.CommonErrorCode;
import com.wgzhao.addax.common.spi.ErrorCode;
import com.wgzhao.addax.common.exception.AddaxException;

import java.math.BigDecimal;
Expand Down Expand Up @@ -122,21 +122,21 @@ public BigDecimal asBigDecimal()
public Date asDate()
{
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, "Bool type cannot be converted to Date.");
ErrorCode.CONVERT_NOT_SUPPORT, "Bool type cannot be converted to Date.");
}

@Override
public byte[] asBytes()
{
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, "Bool type cannot be converted to Bytes.");
ErrorCode.CONVERT_NOT_SUPPORT, "Bool type cannot be converted to Bytes.");
}

@Override
public Timestamp asTimestamp()
{
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, "Bool type cannot be converted to Timestamp.");
ErrorCode.CONVERT_NOT_SUPPORT, "Bool type cannot be converted to Timestamp.");
}

private void validate(final String data)
Expand All @@ -150,7 +150,7 @@ private void validate(final String data)
}

throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT,
ErrorCode.CONVERT_NOT_SUPPORT,
String.format("String [%s] cannot be converted to Bool .", data));
}
}
16 changes: 8 additions & 8 deletions common/src/main/java/com/wgzhao/addax/common/element/BytesColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package com.wgzhao.addax.common.element;

import com.wgzhao.addax.common.exception.CommonErrorCode;
import com.wgzhao.addax.common.spi.ErrorCode;
import com.wgzhao.addax.common.exception.AddaxException;
import org.apache.commons.lang3.ArrayUtils;

Expand Down Expand Up @@ -68,7 +68,7 @@ public String asString()
}
catch (Exception e) {
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT,
ErrorCode.CONVERT_NOT_SUPPORT,
String.format("Bytes[%s] cannot be converted to String .", this.toString()));
}
}
Expand All @@ -89,41 +89,41 @@ public Long asLong()
public BigDecimal asBigDecimal()
{
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, "Bytes type cannot converted to BigDecimal.");
ErrorCode.CONVERT_NOT_SUPPORT, "Bytes type cannot converted to BigDecimal.");
}

@Override
public BigInteger asBigInteger()
{
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, "Bytes type cannot converted to BigInteger.");
ErrorCode.CONVERT_NOT_SUPPORT, "Bytes type cannot converted to BigInteger.");
}

@Override
public Timestamp asTimestamp()
{
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, "Bytes type cannot converted to Timestamp.");
ErrorCode.CONVERT_NOT_SUPPORT, "Bytes type cannot converted to Timestamp.");
}

@Override
public Double asDouble()
{
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, "Bytes type cannot converted to Long.");
ErrorCode.CONVERT_NOT_SUPPORT, "Bytes type cannot converted to Long.");
}

@Override
public Date asDate()
{
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, "Bytes type cannot converted to Date.");
ErrorCode.CONVERT_NOT_SUPPORT, "Bytes type cannot converted to Date.");
}

@Override
public Boolean asBoolean()
{
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, "Bytes type cannot converted to Boolean.");
ErrorCode.CONVERT_NOT_SUPPORT, "Bytes type cannot converted to Boolean.");
}
}
4 changes: 2 additions & 2 deletions common/src/main/java/com/wgzhao/addax/common/element/ColumnCast.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package com.wgzhao.addax.common.element;

import com.wgzhao.addax.common.exception.CommonErrorCode;
import com.wgzhao.addax.common.spi.ErrorCode;
import com.wgzhao.addax.common.exception.AddaxException;
import com.wgzhao.addax.common.util.Configuration;
import org.apache.commons.lang3.time.DateFormatUtils;
Expand Down Expand Up @@ -207,7 +207,7 @@ static String asString(final DateColumn column)
DateCast.datetimeFormat, DateCast.timeZoner);
default:
throw AddaxException
.asAddaxException(CommonErrorCode.CONVERT_NOT_SUPPORT,
.asAddaxException(ErrorCode.CONVERT_NOT_SUPPORT,
"An unsupported type occurred for the date type. Currently, only DATE/TIME/DATETIME are supported.");
}
}
Expand Down
14 changes: 7 additions & 7 deletions common/src/main/java/com/wgzhao/addax/common/element/DateColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package com.wgzhao.addax.common.element;

import com.wgzhao.addax.common.exception.CommonErrorCode;
import com.wgzhao.addax.common.spi.ErrorCode;
import com.wgzhao.addax.common.exception.AddaxException;

import java.math.BigDecimal;
Expand Down Expand Up @@ -141,7 +141,7 @@ public String asString()
}
catch (Exception e) {
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT,
ErrorCode.CONVERT_NOT_SUPPORT,
String.format("Date[%s] type cannot be converted to String .", this));
}
}
Expand All @@ -160,28 +160,28 @@ public Date asDate()
public byte[] asBytes()
{
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "Bytes"));
ErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "Bytes"));
}

@Override
public Boolean asBoolean()
{
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "Boolean"));
ErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "Boolean"));
}

@Override
public Double asDouble()
{
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "Double"));
ErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "Double"));
}

@Override
public BigInteger asBigInteger()
{
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "BigInteger"));
ErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "BigInteger"));
}

@Override
Expand All @@ -197,7 +197,7 @@ public Timestamp asTimestamp()
public BigDecimal asBigDecimal()
{
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "BigDecimal"));
ErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "BigDecimal"));
}

public DateType getSubType()
Expand Down
14 changes: 7 additions & 7 deletions common/src/main/java/com/wgzhao/addax/common/element/DoubleColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package com.wgzhao.addax.common.element;

import com.wgzhao.addax.common.exception.CommonErrorCode;
import com.wgzhao.addax.common.spi.ErrorCode;
import com.wgzhao.addax.common.exception.AddaxException;

import java.math.BigDecimal;
Expand Down Expand Up @@ -103,7 +103,7 @@ public BigDecimal asBigDecimal()
}
catch (NumberFormatException e) {
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT,
ErrorCode.CONVERT_NOT_SUPPORT,
String.format("String[%s] cannot be converted to Double.",
this.getRawData()));
}
Expand Down Expand Up @@ -166,28 +166,28 @@ public String asString()
public Boolean asBoolean()
{
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "Boolean"));
ErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "Boolean"));
}

@Override
public Date asDate()
{
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "Date"));
ErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "Date"));
}

@Override
public byte[] asBytes()
{
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "Bytes"));
ErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "Bytes"));
}

@Override
public Timestamp asTimestamp()
{
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "Timestamp"));
ErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "Timestamp"));
}

private void validate( String data)
Expand All @@ -206,7 +206,7 @@ private void validate( String data)
}
catch (Exception e) {
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT,
ErrorCode.CONVERT_NOT_SUPPORT,
String.format("String[%s] cannot be converted to Double.", data));
}
}
Expand Down
6 changes: 3 additions & 3 deletions common/src/main/java/com/wgzhao/addax/common/element/LongColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package com.wgzhao.addax.common.element;

import com.wgzhao.addax.common.exception.AddaxException;
import com.wgzhao.addax.common.exception.CommonErrorCode;
import com.wgzhao.addax.common.spi.ErrorCode;
import org.apache.commons.lang3.math.NumberUtils;

import java.math.BigDecimal;
Expand Down Expand Up @@ -56,7 +56,7 @@ public LongColumn(String data)
}
catch (Exception e) {
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT,
ErrorCode.CONVERT_NOT_SUPPORT,
String.format("Cannot convert the string [%s] to Long.", data));
}
}
Expand Down Expand Up @@ -177,6 +177,6 @@ public Date asDate()
public byte[] asBytes()
{
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, "Long type cannot be converted to Bytes.");
ErrorCode.CONVERT_NOT_SUPPORT, "Long type cannot be converted to Bytes.");
}
}
6 changes: 3 additions & 3 deletions common/src/main/java/com/wgzhao/addax/common/element/OverFlowUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package com.wgzhao.addax.common.element;

import com.wgzhao.addax.common.exception.CommonErrorCode;
import com.wgzhao.addax.common.spi.ErrorCode;
import com.wgzhao.addax.common.exception.AddaxException;

import java.math.BigDecimal;
Expand Down Expand Up @@ -50,7 +50,7 @@ public static void validateLongNotOverFlow(final BigInteger integer)

if (isOverFlow) {
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_OVER_FLOW,
ErrorCode.CONVERT_OVER_FLOW,
String.format("An overflow occurred when converting [%s] to Long type.", integer));
}
}
Expand All @@ -76,7 +76,7 @@ public static void validateDoubleNotOverFlow(final BigDecimal decimal)
boolean isOverFlow = OverFlowUtil.isDoubleOverFlow(decimal);
if (isOverFlow) {
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_OVER_FLOW,
ErrorCode.CONVERT_OVER_FLOW,
String.format("An overflow occurred when converting [%s] to Double type.",
decimal.toPlainString()));
}
Expand Down
16 changes: 8 additions & 8 deletions common/src/main/java/com/wgzhao/addax/common/element/StringColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package com.wgzhao.addax.common.element;

import com.wgzhao.addax.common.exception.CommonErrorCode;
import com.wgzhao.addax.common.spi.ErrorCode;
import com.wgzhao.addax.common.exception.AddaxException;

import java.math.BigDecimal;
Expand Down Expand Up @@ -63,7 +63,7 @@ private void validateDoubleSpecific(final String data)
if ("NaN".equals(data) || "Infinity".equals(data)
|| "-Infinity".equals(data)) {
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT,
ErrorCode.CONVERT_NOT_SUPPORT,
String.format("['%s'] belongs to the special Double type and cannot be converted to other type.", data));
}
}
Expand All @@ -82,7 +82,7 @@ public BigInteger asBigInteger()
}
catch (Exception e) {
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, String.format(
ErrorCode.CONVERT_NOT_SUPPORT, String.format(
"['%s'] cannot be converted to BigInteger.", this.asString()));
}
}
Expand Down Expand Up @@ -112,7 +112,7 @@ public Long asLong()
}
catch (Exception e) {
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "Long"));
ErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "Long"));
}
}

Expand All @@ -130,7 +130,7 @@ public BigDecimal asBigDecimal()
}
catch (Exception e) {
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "BigDecimal"));
ErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "BigDecimal"));
}
}

Expand Down Expand Up @@ -176,7 +176,7 @@ public Boolean asBoolean()
}

throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "Boolean"));
ErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "Boolean"));
}

@Override
Expand All @@ -187,7 +187,7 @@ public Date asDate()
}
catch (Exception e) {
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "Date"));
ErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "Date"));
}
}

Expand All @@ -199,7 +199,7 @@ public byte[] asBytes()
}
catch (Exception e) {
throw AddaxException.asAddaxException(
CommonErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "Bytes"));
ErrorCode.CONVERT_NOT_SUPPORT, String.format(errorTemplate, "Bytes"));
}
}
}
Loading