Merge pull request #769 from madhawap/master

Reformatting code

components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/src/main/java/org/wso2/carbon/apimgt/handlers/utils/Utils.java

@@ -44,6 +44,8 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Contains util methods for synapse gateway authentication handler
@@ -62,21 +64,47 @@ public class Utils {
     public static IOTServerConfiguration initConfig() {
         try {
 
-            String IOTServerAPIConfigurationPath =
+            String IOTServerAPIConfigurationPath = CarbonUtils.getCarbonConfigDirPath() + File.separator
-                    CarbonUtils.getCarbonConfigDirPath() + File.separator + IOT_APIS_CONFIG_FILE;
+                    + IOT_APIS_CONFIG_FILE;
             File file = new File(IOTServerAPIConfigurationPath);
             Document doc = Utils.convertToDocument(file);
 
             JAXBContext fileContext = JAXBContext.newInstance(IOTServerConfiguration.class);
             Unmarshaller unmarshaller = fileContext.createUnmarshaller();
-            return (IOTServerConfiguration) unmarshaller.unmarshal(doc);
 
+            IOTServerConfiguration iotServerConfiguration = (IOTServerConfiguration) unmarshaller.unmarshal(
+                    doc);
+            iotServerConfiguration.setHostname(replaceProperties(iotServerConfiguration.getHostname()));
+            iotServerConfiguration.setVerificationEndpoint(
+                    replaceProperties(iotServerConfiguration.getVerificationEndpoint()));
+            iotServerConfiguration.setDynamicClientRegistrationEndpoint(
+                    replaceProperties(iotServerConfiguration.getDynamicClientRegistrationEndpoint()));
+            iotServerConfiguration.setOauthTokenEndpoint(
+                    replaceProperties(iotServerConfiguration.getOauthTokenEndpoint()));
+            return iotServerConfiguration;
         } catch (JAXBException | APIMCertificateMGTException e) {
             log.error("Error occurred while initializing Data Source config", e);
             return null;
         }
     }
 
+    /**
+     * This method gets the values from system variables and sets to xml.
+     */
+    public static String replaceProperties(String text) {
+        String regex = "\\$\\{(.*?)\\}";
+        Pattern pattern = Pattern.compile(regex);
+        Matcher matchPattern = pattern.matcher(text);
+        while (matchPattern.find()) {
+            String sysPropertyName = matchPattern.group(1);
+            String sysPropertyValue = System.getProperty(sysPropertyName);
+            if (sysPropertyValue != null && !sysPropertyName.isEmpty()) {
+                text = text.replaceAll("\\$\\{(" + sysPropertyName + ")\\}", sysPropertyValue);
+            }
+        }
+        return text;
+    }
+
     /**
      * This class build the iot-api-config.xml file.
      * @param file

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DeviceTaskManagerImpl.java

@@ -92,13 +92,19 @@ public class DeviceTaskManagerImpl implements DeviceTaskManager {
             operations = this.getValidOperationNames(); //list operations for each device type
             devices = deviceManagementProviderService.getAllDevices(deviceType, false);//list devices for each type
             if (!devices.isEmpty()) {
-                for (String str : operations) {
+                if (operations != null) {
-                    CommandOperation operation = new CommandOperation();
+                    for (String str : operations) {
-                    operation.setEnabled(true);
+                        CommandOperation operation = new CommandOperation();
-                    operation.setType(Operation.Type.COMMAND);
+                        operation.setEnabled(true);
-                    operation.setCode(str);
+                        operation.setType(Operation.Type.COMMAND);
-                    deviceManagementProviderService.addOperation(deviceType, operation,
+                        operation.setCode(str);
-                            DeviceManagerUtil.getValidDeviceIdentifiers(devices));
+                        deviceManagementProviderService.addOperation(deviceType, operation,
+                                DeviceManagerUtil.getValidDeviceIdentifiers(devices));
+                    }
+                } else {
+                    if (log.isDebugEnabled()) {
+                        log.debug("No operations are available.");
+                    }
                 }
             } else {
                 if (log.isDebugEnabled()) {

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DeviceTaskManagerServiceImpl.java

@@ -53,7 +53,6 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
         log.info("Task adding for " + deviceType);
 
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-
         try {
             TaskService taskService = DeviceManagementDataHolder.getInstance().getTaskService();
             taskService.registerTaskType(TASK_TYPE);

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml

@@ -54,10 +54,6 @@
         <!--Merged ->  Merged policy evaluation point -->
         <PolicyEvaluationPoint>Simple</PolicyEvaluationPoint>
     </PolicyConfiguration>
-    <!--<TaskConfiguration>-->
-        <!--<Enable>true</Enable>-->
-        <!--<Frequency>600000</Frequency>-->
-    <!--</TaskConfiguration>-->
     <!-- Default Page size configuration for paginated DM APIs-->
     <PaginationConfiguration>
         <DeviceListPageSize>20</DeviceListPageSize>