fix(api): send both read and write properties

Send both read and read-write properties on
`/configurations/container/{}` endpoint with existing `changeable`
parameter.

Signed-off-by: Gaurav Mishra <[email protected]>

Author: GMishx

rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/configuration/SW360ConfigurationsController.java

@@ -189,9 +189,18 @@ public ResponseEntity<Map<String, String>> getConfigForContainer(
                             allowableValues = {"SW360_CONFIGURATION", "UI_CONFIGURATION"}
                     )
             )
-            @PathVariable(name = "configFor") ConfigFor configFor
+            @PathVariable(name = "configFor") ConfigFor configFor,
+            @RequestParam(required = false, name = "changeable") Boolean changeable
     ) throws TException {
-        return ResponseEntity.ok(sw360ConfigurationsService.getConfigForContainer(configFor));
+        if (changeable == null) {
+            return ResponseEntity.ok(sw360ConfigurationsService.getConfigForContainer(configFor));
+        }
+
+        if (changeable) {
+            return ResponseEntity.ok(sw360ConfigurationsService.getSW360ConfigFromDb(configFor));
+        }
+
+        return ResponseEntity.ok(sw360ConfigurationsService.getSW360ConfigFromProperties());
     }
 
     @PreAuthorize("hasAuthority('ADMIN')")
@@ -268,6 +277,11 @@ public ResponseEntity<?> updateSW360ConfigurationsForContainer(
     private void updateConfigInService(
             ConfigFor configFor, Map<String, String> configuration, User sw360User
     ) throws TException {
+        // Don't update readonly keys silently
+        Map<String, String> readonlyConfigs = sw360ConfigurationsService.getSW360ConfigFromProperties();
+        for (String key : readonlyConfigs.keySet()) {
+            configuration.remove(key);
+        }
         try {
             RequestStatus updateStatus;
             if (configFor == null) {

rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/configuration/SW360ConfigurationsService.java

@@ -67,8 +67,14 @@ public RequestStatus updateSW360Configs(Map<String, String> updatedConfig, User
     }
 
     public Map<String, String> getConfigForContainer(ConfigFor configFor) throws TException {
-        SW360ConfigsService.Iface configsService = getThriftConfigsClient();
-        return configsService.getConfigForContainer(configFor);
+        Map<String, String> combinedConfig = getSW360ConfigFromDb(configFor);
+        combinedConfig.putAll(getSW360ConfigFromProperties());
+        return combinedConfig;
+    }
+
+    public Map<String, String> getSW360ConfigFromDb(ConfigFor configFor) throws TException {
+        SW360ConfigsService.Iface configService = getThriftConfigsClient();
+        return configService.getConfigForContainer(configFor);
     }
 
     public RequestStatus updateSW360ConfigForContainer(ConfigFor configFor, Map<String, String> updatedConfig, User user) throws TException, InvalidPropertiesFormatException {