From 5adc2e1908b834cad1d953dd5103a6f3c42e620d Mon Sep 17 00:00:00 2001 From: Fernando Ojeda Date: Fri, 8 Jun 2018 15:39:17 -0400 Subject: [PATCH 1/3] Fixed the object mask to work with result limit. --- src/main/java/com/softlayer/api/Mask.java | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/softlayer/api/Mask.java b/src/main/java/com/softlayer/api/Mask.java index 3c35061..cabf6de 100644 --- a/src/main/java/com/softlayer/api/Mask.java +++ b/src/main/java/com/softlayer/api/Mask.java @@ -4,6 +4,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import java.util.regex.Pattern; /** Object mask parameter. See http://sldn.softlayer.com/article/Object-Masks */ public class Mask { @@ -44,7 +45,26 @@ protected String getMask() { @Override public String toString() { - return toString(new StringBuilder()).toString(); + String objectMask = new String(); + String builtedMask = toString(new StringBuilder()).toString(); + if(builtedMask.contains("[")){ + String [] mask = builtedMask.split(Pattern.quote("[")); + for (int count = 0; count < mask.length; count ++ ) { + if (count != 0){ + objectMask = new StringBuilder().append(objectMask).append(mask[count]).toString(); + } + } + } + else { + String [] mask = builtedMask.split(Pattern.quote(".")); + for (int count = 0; count < mask.length; count ++ ) { + if (count != 0){ + objectMask = new StringBuilder().append(objectMask).append(mask[count]).append(".").toString(); + } + } + } + String resultMask = objectMask.substring(0, objectMask.length()-1); + return resultMask; } /** Append this mask's string representation to the given builder and return it */ From 16571b82e6934e3640061a5c71c91849991454bc Mon Sep 17 00:00:00 2001 From: Fernando Ojeda Date: Thu, 14 Jun 2018 09:54:28 -0400 Subject: [PATCH 2/3] Fixed the object mask to work with result limit. --- src/main/java/com/softlayer/api/Mask.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/softlayer/api/Mask.java b/src/main/java/com/softlayer/api/Mask.java index cabf6de..2839bb1 100644 --- a/src/main/java/com/softlayer/api/Mask.java +++ b/src/main/java/com/softlayer/api/Mask.java @@ -56,11 +56,15 @@ public String toString() { } } else { - String [] mask = builtedMask.split(Pattern.quote(".")); - for (int count = 0; count < mask.length; count ++ ) { - if (count != 0){ - objectMask = new StringBuilder().append(objectMask).append(mask[count]).append(".").toString(); + if(builtedMask.contains(".")){ + String [] mask = builtedMask.split(Pattern.quote(".")); + for (int count = 0; count < mask.length; count ++ ) { + if (count != 0){ + objectMask = new StringBuilder().append(objectMask).append(mask[count]).append(".").toString(); + } } + }else { + objectMask = builtedMask + "."; } } String resultMask = objectMask.substring(0, objectMask.length()-1); From be56b0da04656d5f769230a50f1937ecc9c8e39c Mon Sep 17 00:00:00 2001 From: Fernando Ojeda Date: Thu, 14 Jun 2018 16:23:06 -0400 Subject: [PATCH 3/3] Fixed the object mask to work with result limit. --- src/main/java/com/softlayer/api/Mask.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/softlayer/api/Mask.java b/src/main/java/com/softlayer/api/Mask.java index 2839bb1..d457c82 100644 --- a/src/main/java/com/softlayer/api/Mask.java +++ b/src/main/java/com/softlayer/api/Mask.java @@ -45,26 +45,28 @@ protected String getMask() { @Override public String toString() { + String subMask = new String(); String objectMask = new String(); - String builtedMask = toString(new StringBuilder()).toString(); - if(builtedMask.contains("[")){ - String [] mask = builtedMask.split(Pattern.quote("[")); + String builtMask = toString(new StringBuilder()).toString(); + if(builtMask.contains("[")){ + String [] mask = builtMask.split(Pattern.quote("[")); for (int count = 0; count < mask.length; count ++ ) { if (count != 0){ - objectMask = new StringBuilder().append(objectMask).append(mask[count]).toString(); + subMask = new StringBuilder().append(subMask).append("[").append(mask[count]).toString(); } } + objectMask = subMask.substring(1, subMask.length()); } else { - if(builtedMask.contains(".")){ - String [] mask = builtedMask.split(Pattern.quote(".")); + if(builtMask.contains(".")){ + String [] mask = builtMask.split(Pattern.quote(".")); for (int count = 0; count < mask.length; count ++ ) { if (count != 0){ objectMask = new StringBuilder().append(objectMask).append(mask[count]).append(".").toString(); } } }else { - objectMask = builtedMask + "."; + objectMask = builtMask + "."; } } String resultMask = objectMask.substring(0, objectMask.length()-1);