SSDM-2601: some tiny refactoring of FullSampleIdentifier.

SVN: 35015

openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/sample/FullSampleIdentifier.java

@@ -37,55 +37,27 @@ class FullSampleIdentifier
     
     FullSampleIdentifier(String sampleIdentifier)
     {
-        //Parts Validation
-        if (StringUtils.isBlank(sampleIdentifier))
-        {
-            throw new IllegalArgumentException("Unspecified sample identifier.");
-        }
-        if (sampleIdentifier.startsWith("/") == false)
-        {
-            throw new IllegalArgumentException("Sample identifier has to start with a '/': " + sampleIdentifier);
-        }
-        
-        String[] parts = sampleIdentifier.split("/");
-        
-        if (parts.length == 0)
-        {
-            throw new IllegalArgumentException("Sample identifier don't contain any codes: " + sampleIdentifier);
-        } else if (parts.length > 4)
-        {
-            throw new IllegalArgumentException("Sample identifier can not contain more than three '/': " + sampleIdentifier);
-        }
-        
-        //Parts Parsing
+        String[] parts = extractParts(sampleIdentifier);
         String spaceCode = null;
         String projectCode = null;
         String containerCode = null;
         String plainSampleCode = null;
-
         String code = null;
         if (parts.length == 2)
         {
             code = parts[1];
-        } if (parts.length == 3)
+        } else if (parts.length == 3)
         {
             spaceCode = parts[1];
             code = parts[2];
-        } else if (parts.length == 4)
+        } else
         {
             spaceCode = parts[1];
             projectCode = parts[2];
             code = parts[3];
         }
         
-        //Container:Contained validation
-        String[] splittedCode = code.split(":");
-        if (splittedCode.length > 2)
-        {
-            throw new IllegalArgumentException("Sample code can not contain more than one ':': " + sampleIdentifier);
-        }
-        
-        //Container:Contained parsing
+        String[] splittedCode = splitCode(code, sampleIdentifier);
         if (splittedCode.length == 2)
         {
             containerCode = splittedCode[0];
@@ -105,6 +77,39 @@ class FullSampleIdentifier
         
     }
 
+    private String[] splitCode(String code, String sampleIdentifier)
+    {
+        String[] splittedCode = code.split(":");
+        if (splittedCode.length > 2)
+        {
+            throw new IllegalArgumentException("Sample code can not contain more than one ':': " + sampleIdentifier);
+        }
+        return splittedCode;
+    }
+
+    private String[] extractParts(String sampleIdentifier)
+    {
+        if (StringUtils.isBlank(sampleIdentifier))
+        {
+            throw new IllegalArgumentException("Unspecified sample identifier.");
+        }
+        if (sampleIdentifier.startsWith("/") == false)
+        {
+            throw new IllegalArgumentException("Sample identifier has to start with a '/': " + sampleIdentifier);
+        }
+        
+        String[] parts = sampleIdentifier.split("/");
+        
+        if (parts.length == 0)
+        {
+            throw new IllegalArgumentException("Sample identifier don't contain any codes: " + sampleIdentifier);
+        } else if (parts.length > 4)
+        {
+            throw new IllegalArgumentException("Sample identifier can not contain more than three '/': " + sampleIdentifier);
+        }
+        return parts;
+    }
+
     private void verifyCodePattern(String code) {
         if(code != null && code.matches(CODE_PATTERN) == false) {
             throw new IllegalArgumentException("Code field containing other characters than letters, numbers, '_', '-' and '.': " + code);