X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fportal%2Fnonrtric%2Fcontrolpanel%2Fmock%2FEnrichmentControllerMockConfiguration.java;h=c0fb4f11cee98af0ee0605aa987572ec0ce4850a;hb=9d99a37374c9266f3d11ff0a19c2d068571159ba;hp=f407f9f68879130d47716790ab36b9d8393d3114;hpb=6b4c6ef963e37ebdff26337cd90684e3e2ff2a6c;p=portal%2Fnonrtric-controlpanel.git

diff --git a/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/mock/EnrichmentControllerMockConfiguration.java b/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/mock/EnrichmentControllerMockConfiguration.java
index f407f9f..c0fb4f1 100644
--- a/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/mock/EnrichmentControllerMockConfiguration.java
+++ b/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/mock/EnrichmentControllerMockConfiguration.java
@@ -33,10 +33,10 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.oransc.portal.nonrtric.controlpanel.eiproducerapi.EiProducerApi;
+import org.oransc.portal.nonrtric.controlpanel.model.JobInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.test.context.TestConfiguration;
@@ -66,25 +66,6 @@ public class EnrichmentControllerMockConfiguration {
     class MockEiProducerApi implements EiProducerApi {
         private final Database database = new Database();
 
-        @Override
-        public ResponseEntity<String> getAllEiTypeIds() {
-            List<String> result = new ArrayList<>();
-            result.addAll(database.getAllEiTypeIds());
-            return new ResponseEntity<>(gson.toJson(result), HttpStatus.OK);
-        }
-
-        public ResponseEntity<String> getAllEiTypes() {
-            EiTypes result = new EiTypes();
-            result.addAll(database.getAllEiTypes());
-            return new ResponseEntity<>(gson.toJson(result), HttpStatus.OK);
-        }
-
-        @Override
-        public ResponseEntity<String> getEiType(String eiTypeId) {
-            EiType result = database.getEiTypeInstance(eiTypeId);
-            return new ResponseEntity<>(gson.toJson(result), HttpStatus.OK);
-        }
-
         @Override
         public ResponseEntity<String> getAllEiProducerIds() {
             List<String> result = new ArrayList<>();
@@ -107,8 +88,8 @@ public class EnrichmentControllerMockConfiguration {
         @Override
         public ResponseEntity<String> getEiJobsForOneEiProducer(String eiProducerId) {
             EiJobs result = new EiJobs();
-            List<EiJob> inst = database.getEiJobsForOneEiProducer(Optional.of(eiProducerId));
-            result.addAll(inst);
+
+            result.addAll(database.getAllEiJobs());
             return new ResponseEntity<>(gson.toJson(result), HttpStatus.OK);
         }
 
@@ -117,21 +98,6 @@ public class EnrichmentControllerMockConfiguration {
             EiProducer result = database.getEiProducerInstance(eiProducerId);
             return new ResponseEntity<>(gson.toJson(result.status()), HttpStatus.OK);
         }
-
-        public ResponseEntity<String> deleteEiProducerInstance(String eiProducerId) {
-            database.deleteEiProducerInstance(eiProducerId);
-            return new ResponseEntity<>(HttpStatus.OK);
-        }
-
-        public ResponseEntity<String> deleteEiTypeInstance(String eiTypeId) {
-            database.deleteEiTypeInstance(eiTypeId);
-            return new ResponseEntity<>(HttpStatus.OK);
-        }
-
-        public ResponseEntity<String> deleteEiJobInstance(String eiJobId) {
-            database.deleteEiJobInstance(eiJobId);
-            return new ResponseEntity<>(HttpStatus.OK);
-        }
     }
 
     class Database {
@@ -142,12 +108,12 @@ public class EnrichmentControllerMockConfiguration {
 
             // Create EiType instance
             String schema = getStringFromFile("ei-type-1.json");
-            EiType eiType1 = putEiTypeInstance("type1", schema, Arrays.asList("prod-1"));
+            EiType eiType1 = getEiTypeInstance("type1", schema, Arrays.asList("prod-1"));
             supported_types.add(eiType1);
 
             // Create EiType instance
             schema = getStringFromFile("ei-type-2.json");
-            EiType eiType2 = putEiTypeInstance("type2", schema, Arrays.asList("prod-1"));
+            EiType eiType2 = getEiTypeInstance("type2", schema, Arrays.asList("prod-1"));
             supported_types.add(eiType2);
 
             // Create EiProducer instance
@@ -156,7 +122,7 @@ public class EnrichmentControllerMockConfiguration {
 
             // Create EiJob instance
             schema = getStringFromFile("job-1.json");
-            putEiJobInstance("type1", "job1", schema, "prod-1", "http://example.com/");
+            putEiJobInstance("type1", "job1", schema, "owner", "http://example.com/");
         }
 
         private String getStringFromFile(String path) {
@@ -175,13 +141,12 @@ public class EnrichmentControllerMockConfiguration {
         }
 
         void putEiJobInstance(String typeId, String instanceId, Object instanceData, String owner, String targetUrl) {
-            EiJob i = ImmutableEiJob.builder() //
-                .ei_job_data(instanceData) //
-                .ei_job_identity(instanceId) //
+            JobInfo i = JobInfo.builder() //
+                .jobData(instanceData) //
+                .id(instanceId) //
                 .owner(owner) //
-                .ei_type_identity(typeId) //
-                .target_uri(targetUrl) //
-                .status("ENABLED") //
+                .typeId(typeId) //
+                .targetUri(targetUrl) //
                 .build(); //
             eiJobs.put(instanceId, i);
         }
@@ -198,18 +163,12 @@ public class EnrichmentControllerMockConfiguration {
             eiProducers.put(id, eiProducer);
         }
 
-        EiType putEiTypeInstance(String id, Object data, List<String> producer_ids) {
-            EiType i = ImmutableEiType.builder() //
+        EiType getEiTypeInstance(String id, Object data, List<String> producer_ids) {
+            return ImmutableEiType.builder() //
                 .ei_type_identity(id) //
                 .ei_job_data_schema(data) //
                 .ei_producer_ids(producer_ids) //
                 .build(); //
-            eiTypes.put(id, i);
-            return eiTypes.get(id);
-        }
-
-        public void deleteEiTypeInstance(String id) {
-            eiTypes.remove(id);
         }
 
         public void deleteEiProducerInstance(String id) {
@@ -220,14 +179,6 @@ public class EnrichmentControllerMockConfiguration {
             eiJobs.remove(id);
         }
 
-        EiType getEiTypeInstance(String id) throws RestClientException {
-            EiType i = eiTypes.get(id);
-            if (i == null) {
-                throw new RestClientException("Type not found: " + id);
-            }
-            return i;
-        }
-
         EiProducer getEiProducerInstance(String id) throws RestClientException {
             EiProducer i = eiProducers.get(id);
             if (i == null) {
@@ -236,14 +187,6 @@ public class EnrichmentControllerMockConfiguration {
             return i;
         }
 
-        public Collection<String> getAllEiTypeIds() {
-            return Collections.unmodifiableCollection(eiTypes.keySet());
-        }
-
-        public Collection<EiType> getAllEiTypes() {
-            return eiTypes.values();
-        }
-
         public Collection<String> getAllEiProducerIds() {
             return Collections.unmodifiableCollection(eiProducers.keySet());
         }
@@ -252,29 +195,12 @@ public class EnrichmentControllerMockConfiguration {
             return eiProducers.values();
         }
 
-        public Collection<EiJob> getAllEiJobs() {
-            return eiJobs.values();
-        }
+        public List<JobInfo> getAllEiJobs() {
+            return new ArrayList<>(eiJobs.values());
 
-        public List<EiJob> getEiJobsForOneEiProducer(Optional<String> eiProducerId) {
-            List<EiJob> result = new ArrayList<>();
-            for (EiJob i : eiJobs.values()) {
-                if (eiProducerId.isPresent()) {
-                    if (i.owner().equals(eiProducerId.get())) {
-                        result.add(i);
-                    }
-
-                } else {
-                    result.add(i);
-                }
-            }
-            return result;
         }
 
-        private Map<String, EiType> eiTypes = new HashMap<>();
         private Map<String, EiProducer> eiProducers = new HashMap<>();
-        private Map<String, EiJob> eiJobs = new HashMap<>();
-
+        private Map<String, JobInfo> eiJobs = new HashMap<>();
     }
-
 }