add 'this' to Step processing - fix NullPointerException

Denysss · Denysss · commit 85b167c407f7 · 2019-08-06T19:33:40.000+03:00
diff --git a/allure-java-commons/src/main/java/io/qameta/allure/util/AspectUtils.java b/allure-java-commons/src/main/java/io/qameta/allure/util/AspectUtils.java
@@ -76,7 +76,7 @@ public static Map<String, Object> getParametersMap(final MethodSignature signatu
     public static Map<String, Object> getParametersMap(final JoinPoint joinPoint) {
         final MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
         final Map<String, Object> params = getParametersMap(methodSignature, joinPoint.getArgs());
-        params.put("this", joinPoint.getThis());
+        Optional.ofNullable(joinPoint.getThis()).ifPresent(objThis -> params.put("this", objThis));
         return params;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public static Map<String, Object> getParametersMap(final MethodSignature signatu`
`76`	`76`	`public static Map<String, Object> getParametersMap(final JoinPoint joinPoint) {`
`77`	`77`	`final MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();`
`78`	`78`	`final Map<String, Object> params = getParametersMap(methodSignature, joinPoint.getArgs());`
`79`		`- params.put("this", joinPoint.getThis());`
	`79`	`+ Optional.ofNullable(joinPoint.getThis()).ifPresent(objThis -> params.put("this", objThis));`
`80`	`80`	`return params;`
`81`	`81`	`}`
`82`	`82`