[jmeter] branch master updated: Try to make method less complex

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new 42abaa3  Try to make method less complex
42abaa3 is described below

commit 42abaa3a4f728828174dd1e539fa0268fc273a60
Author: Felix Schumacher <felix.schumac...@internetallee.de>
AuthorDate: Sun Oct 11 11:20:17 2020 +0200

    Try to make method less complex
    
    Use StringUtils#defaultIfBlank instead of condition.
    Extract complex boolean expression to named helper methods.
    Extract conditional encoding of values in helper method.
---
 .../http/util/GraphQLRequestParamUtils.java        | 36 +++++++++++++++-------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git 
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java
 
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java
index 1c4ec8a..fd387cf 100644
--- 
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java
+++ 
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/util/GraphQLRequestParamUtils.java
@@ -198,8 +198,7 @@ public final class GraphQLRequestParamUtils {
      */
     public static GraphQLRequestParams toGraphQLRequestParams(final Arguments 
arguments, final String contentEncoding)
             throws UnsupportedEncodingException {
-        final String encoding = StringUtils.isNotEmpty(contentEncoding) ? 
contentEncoding
-                : EncoderCache.URL_ARGUMENT_ENCODING;
+        final String encoding = StringUtils.defaultIfEmpty(contentEncoding, 
EncoderCache.URL_ARGUMENT_ENCODING);
 
         String operationName = null;
         String query = null;
@@ -219,29 +218,44 @@ public final class GraphQLRequestParamUtils {
                 final boolean alwaysEncoded = ((HTTPArgument) 
arg).isAlwaysEncoded();
 
                 if (OPERATION_NAME_FIELD.equals(name)) {
-                    operationName = alwaysEncoded ? value : 
URLDecoder.decode(value, encoding);
+                    operationName = encodedField(value, encoding, 
alwaysEncoded);
                 } else if (QUERY_FIELD.equals(name)) {
-                    query = alwaysEncoded ? value : URLDecoder.decode(value, 
encoding);
+                    query = encodedField(value, encoding, alwaysEncoded);
                 } else if (VARIABLES_FIELD.equals(name)) {
-                    variables = alwaysEncoded ? value : 
URLDecoder.decode(value, encoding);
+                    variables = encodedField(value, encoding, alwaysEncoded);
                 }
             }
         }
 
-        if (StringUtils.isEmpty(query)
-                || (!StringUtils.startsWith(query, QUERY_FIELD) && 
!StringUtils.startsWith(query, "mutation"))) {
+        if (isNoQueryOrMutation(query)) {
             throw new IllegalArgumentException("Not a valid GraphQL query.");
         }
 
-        if (StringUtils.isNotEmpty(variables)) {
-            if (!StringUtils.startsWith(variables, "{") || 
!StringUtils.endsWith(variables, "}")) {
-                throw new IllegalArgumentException("Not a valid object node 
for GraphQL variables.");
-            }
+        if (isNoJsonObject(variables)) {
+            throw new IllegalArgumentException("Not a valid object node for 
GraphQL variables.");
         }
 
         return new GraphQLRequestParams(operationName, query, variables);
     }
 
+    private static String encodedField(final String value, final String 
encoding, final boolean isEncoded)
+            throws UnsupportedEncodingException {
+        if (isEncoded) {
+            return value;
+        }
+        return URLDecoder.decode(value, encoding);
+    }
+
+    private static boolean isNoJsonObject(String variables) {
+        return StringUtils.isNotEmpty(variables)
+                && (!StringUtils.startsWith(variables, "{") || 
!StringUtils.endsWith(variables, "}"));
+    }
+
+    private static boolean isNoQueryOrMutation(String query) {
+        return StringUtils.isEmpty(query)
+                || (!StringUtils.startsWith(query, QUERY_FIELD) && 
!StringUtils.startsWith(query, "mutation"));
+    }
+
     private static String getJsonNodeTextContent(final JsonNode jsonNode, 
final boolean nullable) {
         final JsonNodeType nodeType = jsonNode.getNodeType();