add method for subscribed mappings

Cumulocity-IoT · Mar 22, 2024 · 8fc1829 · 8fc1829
1 parent 1c3647a
commit 8fc1829
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/...mapping-service/src/main/java/dynamic/mapping/connector/core/client/AConnectorClient.java b/...mapping-service/src/main/java/dynamic/mapping/connector/core/client/AConnectorClient.java
@@ -118,7 +118,8 @@ public abstract class AConnectorClient {
 
     // structure < ident, mapping >
     // public Map<String, Mapping> subscribedMappings = new HashMap<>();
-    public List<String> subscribedMappings = new ArrayList<>();
+    @Getter
+    private List<String> subscribedMappings = new ArrayList<>();
 
     private Instant start = Instant.now();
 

diff --git a/dynamic-mapping-service/src/main/java/dynamic/mapping/model/MappingSubscribed.java b/dynamic-mapping-service/src/main/java/dynamic/mapping/model/MappingSubscribed.java
@@ -35,6 +35,11 @@
 @Setter
 @NoArgsConstructor
 public class MappingSubscribed implements Serializable {
+    public MappingSubscribed(String ident) {
+        this.ident = ident;
+        this.connectorSubscribed = new ArrayList<>();
+    }
+
     @NotNull
     public String ident;
     @NotNull

diff --git a/dynamic-mapping-service/src/main/java/dynamic/mapping/rest/MappingRestController.java b/dynamic-mapping-service/src/main/java/dynamic/mapping/rest/MappingRestController.java
@@ -76,6 +76,7 @@
 import dynamic.mapping.model.TreeNode;
 import dynamic.mapping.model.Mapping;
 import dynamic.mapping.model.MappingStatus;
+import dynamic.mapping.model.MappingSubscribed;
 
 @Slf4j
 @RestController
@@ -453,6 +454,33 @@ public ResponseEntity<Map<String, Integer>> getActiveSubscriptions(@PathVariable
 
     }
 
+    @RequestMapping(value = "/monitoring/mappings", method = RequestMethod.GET, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<Map<String,MappingSubscribed>> getMappingsSubscribed() {
+        String tenant = contextService.getContext().getTenant();
+        Map<String,MappingSubscribed> mappingsSubscribed = new HashMap<>();
+        try {
+            HashMap<String, AConnectorClient> connectorMap = connectorRegistry
+                    .getClientsForTenant(tenant);
+            if (connectorMap != null) {
+                for (AConnectorClient client : connectorMap.values()) {
+                    ConnectorConfiguration cleanedConfiguration = getCleanedConfig(client.getConnectorConfiguration());
+                    List<String> subscribedMappings = client.getSubscribedMappings();
+                    subscribedMappings.forEach(ident -> {
+                        MappingSubscribed mappingSubscribed = mappingsSubscribed.getOrDefault(ident, new MappingSubscribed(ident));
+                        mappingSubscribed.getConnectorSubscribed().add(cleanedConfiguration);
+                        mappingsSubscribed.put(ident, mappingSubscribed);
+                    });
+                }
+            }
+
+            log.info("Tenant {} - Get active subscriptions!", tenant);
+            return ResponseEntity.status(HttpStatus.OK).body(mappingsSubscribed);
+        } catch (ConnectorRegistryException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
     @RequestMapping(value = "/mapping", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<List<Mapping>> getMappings() {
         String tenant = contextService.getContext().getTenant();
@@ -610,7 +638,8 @@ public ResponseEntity<Extension> getProcessorExtension(@PathVariable String exte
     public ResponseEntity<Extension> deleteProcessorExtension(@PathVariable String extensionName) {
         String tenant = contextService.getContext().getTenant();
         if (!userHasMappingAdminRole()) {
-            log.error("Tenant {} - Insufficient Permission, user does not have required permission to access this API", tenant);
+            log.error("Tenant {} - Insufficient Permission, user does not have required permission to access this API",
+                    tenant);
             throw new ResponseStatusException(HttpStatus.FORBIDDEN,
                     "Insufficient Permission, user does not have required permission to access this API");
         }