Skip to content

Commit 3a35062

Browse files
committed
fix: ExcaptionHandler.validateArgs logic bug fixed
1 parent f2387a3 commit 3a35062

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

‎python_framework/api/src/service/ExceptionHandler.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,18 @@ def validateArgs(resourceInstance, resourceInstanceMethod, objectRequest, expect
108108
) or (
109109
ObjectHelper.isNotList(expecteObjectClass) and Serializer.isSerializerList(objectRequest)
110110
) or (
111-
not expecteObjectClass == type(objectRequest)
112-
) or (
113-
not type(expecteObjectClass) == type(objectRequest.__class__)
111+
not isinstance(objectRequest, expecteObjectClass)
114112
)
115113
):
116-
raise GlobalException(logMessage = f'Invalid args{c.DOT_SPACE}{ReflectionHelper.getClassName(resourceInstance)}{c.DOT}{ReflectionHelper.getName(resourceInstanceMethod)} call got an unnexpected object request class: {ReflectionHelper.getClassName(objectRequest)}{c.DOT_SPACE}It should be a {ReflectionHelper.getName(expecteObjectClass)} class{c.DOT_SPACE}Object request: {objectRequest}')
114+
completeName = f'{ReflectionHelper.getClassName(resourceInstance)}{c.DOT}{ReflectionHelper.getName(resourceInstanceMethod)}'
115+
expectedClassName = f'{ReflectionHelper.getClassName(expecteObjectClass) if Serializer.isSerializerList(expecteObjectClass) else ReflectionHelper.getName(expecteObjectClass)}'
116+
raise GlobalException(logMessage = f'Invalid args{c.DOT_SPACE}{completeName} call got an unnexpected object request class: {ReflectionHelper.getClassName(objectRequest)}{c.DOT_SPACE}It should be a {expectedClassName} class{c.DOT_SPACE}Object request: {objectRequest}')
117117
except GlobalException as globalException:
118118
raise globalException
119119
except Exception as exception:
120-
errorMessage = f'Failed to validate args of {ReflectionHelper.getClassName(resourceInstance)}{c.DOT}{ReflectionHelper.getName(resourceInstanceMethod)} method{c.DOT_SPACE}Object request: {objectRequest}'
120+
completeName = f'{ReflectionHelper.getClassName(resourceInstance)}{c.DOT}{ReflectionHelper.getName(resourceInstanceMethod)}'
121+
expectedClassName = f'{ReflectionHelper.getClassName(expecteObjectClass) if Serializer.isSerializerList(expecteObjectClass) else ReflectionHelper.getName(expecteObjectClass)}'
122+
errorMessage = f'Failed to validate args of {completeName} method{c.DOT_SPACE}Object request: {objectRequest}{c.DOT_SPACE}Expected request class: {expectedClassName}'
121123
raise GlobalException(logMessage = f'{errorMessage}{c.DOT_SPACE_CAUSE}{str(exception)}')
122124

123125

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
sudo ln -s /usr/local/bin/pipX.Y /usr/bin/pip
1616
''')
1717

18-
VERSION = '0.4.16'
18+
VERSION = '0.4.17'
1919

2020
NAME = 'python_framework'
2121
PACKAGE_NAME = NAME

0 commit comments

Comments
 (0)