From 80ca9fddef09153667dc2d9e978fd8a57912e281 Mon Sep 17 00:00:00 2001 From: hmmachadocx Date: Wed, 28 Sep 2022 17:27:02 +0100 Subject: [PATCH 1/2] AST-14325 - Change authentication screen - Check is base-uri is defined before adding it to commands; --- src/main/java/com/checkmarx/ast/wrapper/CxConfig.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/checkmarx/ast/wrapper/CxConfig.java b/src/main/java/com/checkmarx/ast/wrapper/CxConfig.java index 9f65ba52..e54061b6 100644 --- a/src/main/java/com/checkmarx/ast/wrapper/CxConfig.java +++ b/src/main/java/com/checkmarx/ast/wrapper/CxConfig.java @@ -43,15 +43,17 @@ List toArguments() { commands.add(getClientSecret()); } - if (StringUtils.isNotBlank(getTenant())) { + if (StringUtils.isNotEmpty(getTenant())) { commands.add(CxConstants.TENANT); commands.add(getTenant()); } - commands.add(CxConstants.BASE_URI); - commands.add(getBaseUri()); + if (StringUtils.isNotEmpty(getBaseUri())) { + commands.add(CxConstants.BASE_URI); + commands.add(getBaseUri()); + } - if (StringUtils.isNotBlank(getBaseAuthUri())) { + if (StringUtils.isNotEmpty(getBaseAuthUri())) { commands.add(CxConstants.BASE_AUTH_URI); commands.add(getBaseAuthUri()); } From b173baa8f3882deeec5c95c2dd324884eaff27d2 Mon Sep 17 00:00:00 2001 From: hmmachadocx Date: Wed, 28 Sep 2022 18:05:30 +0100 Subject: [PATCH 2/2] AST-14325 - Change authentication screen - Change isNotEmpty to isNotBlank; --- src/main/java/com/checkmarx/ast/wrapper/CxConfig.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/checkmarx/ast/wrapper/CxConfig.java b/src/main/java/com/checkmarx/ast/wrapper/CxConfig.java index e54061b6..7c0189ca 100644 --- a/src/main/java/com/checkmarx/ast/wrapper/CxConfig.java +++ b/src/main/java/com/checkmarx/ast/wrapper/CxConfig.java @@ -43,17 +43,17 @@ List toArguments() { commands.add(getClientSecret()); } - if (StringUtils.isNotEmpty(getTenant())) { + if (StringUtils.isNotBlank(getTenant())) { commands.add(CxConstants.TENANT); commands.add(getTenant()); } - if (StringUtils.isNotEmpty(getBaseUri())) { + if (StringUtils.isNotBlank(getBaseUri())) { commands.add(CxConstants.BASE_URI); commands.add(getBaseUri()); } - if (StringUtils.isNotEmpty(getBaseAuthUri())) { + if (StringUtils.isNotBlank(getBaseAuthUri())) { commands.add(CxConstants.BASE_AUTH_URI); commands.add(getBaseAuthUri()); }