X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fakraino%2Fvalidation%2Fui%2Fservice%2FIntegratedResultService.java;h=1a707a99c311d86ee22e354f2d8883f46f67e4f6;hb=c4f35d65a835e53a7847524eea61cb172a2433f5;hp=e97b5d1274fa9b63f2bd0a98067916b87f62a48d;hpb=87506c97b41778215c9061a2273039820a8c5ae3;p=validation.git

diff --git a/ui/src/main/java/org/akraino/validation/ui/service/IntegratedResultService.java b/ui/src/main/java/org/akraino/validation/ui/service/IntegratedResultService.java
index e97b5d1..1a707a9 100644
--- a/ui/src/main/java/org/akraino/validation/ui/service/IntegratedResultService.java
+++ b/ui/src/main/java/org/akraino/validation/ui/service/IntegratedResultService.java
@@ -16,8 +16,6 @@
 package org.akraino.validation.ui.service;
 
 import java.io.IOException;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -36,6 +34,7 @@ import org.akraino.validation.ui.client.nexus.NexusExecutorClient;
 import org.akraino.validation.ui.entity.LabInfo;
 import org.akraino.validation.ui.entity.Submission;
 import org.akraino.validation.ui.entity.ValidationDbTestResult;
+import org.apache.commons.httpclient.HttpException;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.portalsdk.core.web.support.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,8 +43,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
-import com.sun.jersey.api.client.ClientHandlerException;
-import com.sun.jersey.api.client.UniformInterfaceException;
 
 @Service
 @Transactional
@@ -60,17 +57,12 @@ public class IntegratedResultService {
     NexusExecutorClient nexusService;
 
     @Autowired
-    LabService labService;
+    DbAdapter dbAdapter;
 
-    @Autowired
-    DbResultAdapter dbAdapter;
-
-    public List<String> getLabsFromNexus()
-            throws JsonParseException, JsonMappingException, KeyManagementException, ClientHandlerException,
-            UniformInterfaceException, NoSuchAlgorithmException, IOException, IllegalArgumentException, ParseException {
+    public List<String> getLabsFromNexus() throws IndexOutOfBoundsException, HttpException, NullPointerException {
         List<String> labs = new ArrayList<String>();
         for (String cLabSilo : nexusService.getResource(null)) {
-            for (LabInfo labInfo : labService.getLabs()) {
+            for (LabInfo labInfo : dbAdapter.getLabs()) {
                 if (labInfo.getSilo().equals(cLabSilo)) {
                     labs.add(labInfo.getLab());
                 }
@@ -80,48 +72,48 @@ public class IntegratedResultService {
     }
 
     public List<String> getBlueprintNamesOfLabFromNexus(@Nonnull String lab)
-            throws JsonParseException, JsonMappingException, KeyManagementException, ClientHandlerException,
-            UniformInterfaceException, NoSuchAlgorithmException, IOException, IllegalArgumentException, ParseException {
-        LabInfo labInfo = labService.getLab(lab);
+            throws IndexOutOfBoundsException, HttpException, NullPointerException, IllegalArgumentException {
+        LabInfo labInfo = dbAdapter.getLab(lab);
         if (labInfo == null) {
             throw new IllegalArgumentException("Could not retrieve lab : " + lab.toString());
         }
-        List<String> cNames = nexusService.getResource(labService.getLab(lab).getSilo());
         List<String> rNames = new ArrayList<String>();
+        List<String> cNames = nexusService.getResource(dbAdapter.getLab(lab).getSilo() + "/bluval_results");
         for (String cName : cNames) {
             if (cName.equals("family") || cName.equals("ta") || cName.equals("job")) {
                 continue;
             }
             rNames.add(cName);
         }
+
         return rNames;
     }
 
     public List<String> getBlueprintVersionsFromNexus(@Nonnull String name, @Nonnull String lab)
-            throws JsonParseException, JsonMappingException, KeyManagementException, ClientHandlerException,
-            UniformInterfaceException, NoSuchAlgorithmException, IOException, IllegalArgumentException, ParseException {
-        LabInfo labInfo = labService.getLab(lab);
+            throws IndexOutOfBoundsException, HttpException, NullPointerException, IllegalArgumentException {
+        LabInfo labInfo = dbAdapter.getLab(lab);
         if (labInfo == null) {
             throw new IllegalArgumentException("Could not retrieve lab : " + lab.toString());
         }
-        return nexusService.getResource(labInfo.getSilo(), name);
+        return nexusService.getResource(labInfo.getSilo() + "/bluval_results", name);
     }
 
     public List<String> getBlueprintTimeStampsFromNexus(@Nonnull String name, @Nonnull String version,
-            @Nonnull String lab) throws JsonParseException, JsonMappingException, KeyManagementException,
-    ClientHandlerException, UniformInterfaceException, NoSuchAlgorithmException, IOException, ParseException {
-        LabInfo labInfo = labService.getLab(lab);
+            @Nonnull String lab)
+            throws IndexOutOfBoundsException, HttpException, NullPointerException, IllegalArgumentException {
+        LabInfo labInfo = dbAdapter.getLab(lab);
         if (labInfo == null) {
             throw new IllegalArgumentException("Could not retrieve lab : " + lab.toString());
         }
-        return nexusService.getResource(labInfo.getSilo(), name, version);
+        List<String> timestamps = new ArrayList<String>();
+        timestamps = nexusService.getResource(labInfo.getSilo() + "/bluval_results", name, version);
+        return timestamps;
     }
 
     public List<ValidationDbTestResult> getResultsFromNexus(@Nonnull String name, @Nonnull String version,
             @Nonnull String lab, int noTimestamps)
-                    throws JsonParseException, JsonMappingException, KeyManagementException, ClientHandlerException,
-                    UniformInterfaceException, NoSuchAlgorithmException, IOException, IllegalArgumentException, ParseException {
-        LabInfo labInfo = labService.getLab(lab);
+            throws IndexOutOfBoundsException, HttpException, NullPointerException, IllegalArgumentException {
+        LabInfo labInfo = dbAdapter.getLab(lab);
         if (labInfo == null) {
             throw new IllegalArgumentException("Could not retrieve lab : " + lab.toString());
         }
@@ -129,66 +121,62 @@ public class IntegratedResultService {
     }
 
     public ValidationDbTestResult getResultFromNexus(@Nonnull String name, @Nonnull String version, @Nonnull String lab,
-            @Nonnull String timestamp) throws JsonParseException, JsonMappingException, IOException,
-    KeyManagementException, ClientHandlerException, UniformInterfaceException, NoSuchAlgorithmException,
-    NullPointerException, ParseException {
-        LabInfo labInfo = labService.getLab(lab);
+            @Nonnull String timestamp)
+            throws IndexOutOfBoundsException, HttpException, NullPointerException, IllegalArgumentException {
+        LabInfo labInfo = dbAdapter.getLab(lab);
         if (labInfo == null) {
             throw new IllegalArgumentException("Could not retrieve lab : " + lab.toString());
         }
         ValidationDbTestResult vNexusResult = nexusService.getResult(name, version, labInfo.getSilo(), timestamp);
-        if (!dbAdapter.checkValidityOfNexusResult(vNexusResult)) {
-            return null;
+        if (vNexusResult != null && dbAdapter.checkValidityOfNexusResult(vNexusResult)) {
+            vNexusResult.setLab(labInfo);
+            return vNexusResult;
         }
-        vNexusResult.setLab(labInfo);
-        return vNexusResult;
+        return null;
     }
 
     public ValidationDbTestResult getLastResultBasedOnOutcomeFromNexus(@Nonnull String name, @Nonnull String version,
             @Nonnull String lab, Boolean allLayers, Boolean optional, boolean outcome)
-                    throws JsonParseException, JsonMappingException, KeyManagementException, ClientHandlerException,
-                    UniformInterfaceException, NoSuchAlgorithmException, NullPointerException, IOException, ParseException {
-        LabInfo labInfo = labService.getLab(lab);
+            throws IndexOutOfBoundsException, HttpException, NullPointerException, IllegalArgumentException {
+        LabInfo labInfo = dbAdapter.getLab(lab);
         if (labInfo == null) {
             throw new IllegalArgumentException("Could not retrieve lab : " + lab.toString());
         }
         ValidationDbTestResult vNexusResult = nexusService.getLastResultBasedOnOutcome(name, version, labInfo.getSilo(),
                 allLayers, optional, outcome);
-        if (!dbAdapter.checkValidityOfNexusResult(vNexusResult)) {
-            return null;
+        if (vNexusResult != null && dbAdapter.checkValidityOfNexusResult(vNexusResult)) {
+            vNexusResult.setLab(labInfo);
+            return vNexusResult;
         }
-        vNexusResult.setLab(labInfo);
-        return vNexusResult;
+        return null;
     }
 
     public ValidationDbTestResult getLastResultBasedOnOutcomeFromNexus(@Nonnull String name, @Nonnull String version,
             @Nonnull String lab, @Nonnull List<String> layers, Boolean optional, boolean outcome)
-                    throws JsonParseException, JsonMappingException, KeyManagementException, ClientHandlerException,
-                    UniformInterfaceException, NoSuchAlgorithmException, NullPointerException, IOException, ParseException {
-        LabInfo labInfo = labService.getLab(lab);
+            throws IndexOutOfBoundsException, HttpException, NullPointerException, IllegalArgumentException {
+        LabInfo labInfo = dbAdapter.getLab(lab);
         if (labInfo == null) {
             throw new IllegalArgumentException("Could not retrieve lab : " + lab.toString());
         }
         ValidationDbTestResult vNexusResult = nexusService.getLastResultBasedOnOutcome(name, version, labInfo.getSilo(),
                 layers, optional, outcome);
-        if (!dbAdapter.checkValidityOfNexusResult(vNexusResult)) {
-            return null;
+        if (vNexusResult != null && dbAdapter.checkValidityOfNexusResult(vNexusResult)) {
+            vNexusResult.setLab(labInfo);
+            return vNexusResult;
         }
-        vNexusResult.setLab(labInfo);
-        return vNexusResult;
+        return null;
     }
 
     public List<ValidationDbTestResult> getBasedOnDateFromNexus(@Nonnull String name, @Nonnull String version,
-            @Nonnull String lab, @Nonnull Date date)
-                    throws JsonParseException, JsonMappingException, IOException, ParseException, KeyManagementException,
-                    ClientHandlerException, UniformInterfaceException, NoSuchAlgorithmException, NullPointerException {
-        LabInfo labInfo = labService.getLab(lab);
+            @Nonnull String lab, @Nonnull Date date) throws IndexOutOfBoundsException, HttpException,
+            NullPointerException, IllegalArgumentException, ParseException {
+        LabInfo labInfo = dbAdapter.getLab(lab);
         if (labInfo == null) {
             throw new IllegalArgumentException("Could not retrieve lab : " + lab.toString());
         }
         List<ValidationDbTestResult> vNexusResults = new ArrayList<ValidationDbTestResult>();
         List<ValidationDbTestResult> vResults = nexusService.getResults(name, version, labInfo.getSilo(), date);
-        if (vResults != null && vResults.size() > 1) {
+        if (vResults != null && vResults.size() >= 1) {
             for (ValidationDbTestResult vNexusResult : vResults) {
                 if (dbAdapter.checkValidityOfNexusResult(vNexusResult)) {
                     vNexusResult.setLab(labInfo);
@@ -220,9 +208,8 @@ public class IntegratedResultService {
         return blueprintVersions;
     }
 
-    public ValidationDbTestResult getResults(@Nonnull String submissionId)
-            throws JsonParseException, JsonMappingException, KeyManagementException, ClientHandlerException,
-            UniformInterfaceException, NoSuchAlgorithmException, IOException, NullPointerException, ParseException {
+    public ValidationDbTestResult getResults(@Nonnull String submissionId) throws IndexOutOfBoundsException,
+            NullPointerException, JsonParseException, JsonMappingException, IOException {
         Submission submission = submissionService.getSubmission(submissionId);
         ValidationDbTestResult vDbResult = dbAdapter.readResultFromDb(submissionId);
         return vDbResult == null ? this.getResultFromNexus(
@@ -233,10 +220,9 @@ public class IntegratedResultService {
     }
 
     public ValidationDbTestResult getResult(@Nonnull String name, @Nonnull String version, @Nonnull String lab,
-            @Nonnull String timestamp)
-                    throws JsonParseException, JsonMappingException, KeyManagementException, ClientHandlerException,
-                    UniformInterfaceException, NoSuchAlgorithmException, NullPointerException, IOException, ParseException {
-        LabInfo actualLabInfo = labService.getLab(lab);
+            @Nonnull String timestamp) throws IndexOutOfBoundsException, NullPointerException, JsonParseException,
+            JsonMappingException, IOException {
+        LabInfo actualLabInfo = dbAdapter.getLab(lab);
         if (actualLabInfo == null) {
             return null;
         }
@@ -245,10 +231,9 @@ public class IntegratedResultService {
     }
 
     public ValidationDbTestResult getLastResultBasedOnOutcome(@Nonnull String name, @Nonnull String version,
-            @Nonnull String lab, Boolean allLayers, Boolean optional, boolean outcome)
-                    throws JsonParseException, JsonMappingException, KeyManagementException, ClientHandlerException,
-                    UniformInterfaceException, NoSuchAlgorithmException, IOException, NullPointerException, ParseException {
-        LabInfo actualLabInfo = labService.getLab(lab);
+            @Nonnull String lab, Boolean allLayers, Boolean optional, boolean outcome) throws IndexOutOfBoundsException,
+            NullPointerException, JsonParseException, JsonMappingException, IOException {
+        LabInfo actualLabInfo = dbAdapter.getLab(lab);
         if (actualLabInfo == null) {
             return null;
         }
@@ -277,9 +262,9 @@ public class IntegratedResultService {
 
     public ValidationDbTestResult getLastResultBasedOnOutcome(@Nonnull String name, @Nonnull String version,
             @Nonnull String lab, List<String> layers, Boolean optional, boolean outcome)
-                    throws JsonParseException, JsonMappingException, KeyManagementException, ClientHandlerException,
-                    UniformInterfaceException, NoSuchAlgorithmException, IOException, NullPointerException, ParseException {
-        LabInfo actualLabInfo = labService.getLab(lab);
+            throws IndexOutOfBoundsException, NullPointerException, JsonParseException, JsonMappingException,
+            IOException {
+        LabInfo actualLabInfo = dbAdapter.getLab(lab);
         if (actualLabInfo == null) {
             return null;
         }