Merge remote-tracking branch 'origin/develop' into develop

dynamic-mapping-service/src/main/java/dynamic/mapping/rest/MappingRestController.java

@@ -211,25 +211,12 @@ public ResponseEntity<String> deleteConnectionConfiguration(@PathVariable String
 			if (configuration.enabled)
 				return ResponseEntity.status(HttpStatus.BAD_REQUEST)
 						.body("Can't delete an enabled connector! Disable connector first.");
-			//Make sure the connector is disconnected before it is deleted.
-			if(connectorRegistry.getClientForTenant(tenant, ident).isConnected())
+			// make sure the connector is disconnected before it is deleted.
+			if (connectorRegistry.getClientForTenant(tenant, ident).isConnected())
 				bootstrapService.disableConnector(tenant, ident);
 			connectorConfigurationComponent.deleteConnectorConfiguration(ident);
 			mappingComponent.removeConnectorFromDeploymentMap(tenant, ident);
 			bootstrapService.shutdownAndRemoveConnector(tenant, ident);
-			// NOTE this block was disabled since a disabled connector is not registered in
-			// connectorRegistry
-
-			// AConnectorClient client = connectorRegistry.getClientForTenant(tenant,
-			// configuration.getIdent());
-			// if (client == null)
-			// return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Client with ident
-			// " + ident + " not found");
-			// client.disconnect();
-			// bootstrapService.shutdownAndRemoveConnector(tenant,
-			// client.getConnectorIdent());
-			// connectorConfigurationComponent.deleteConnectorConfiguration(ident);
-			// mappingComponent.removeConnectorFromDeploymentMap(tenant, ident);
 		} catch (Exception ex) {
 			log.error("Tenant {} - Error getting mqtt broker configuration {}", tenant, ex);
 			throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, ex.getLocalizedMessage());