Improve APPM logic

components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/ApplicationStorageManager.java

@@ -88,5 +88,5 @@ public interface ApplicationStorageManager {
      * @return {@link InputStream}
      * @throws ApplicationStorageManagementException throws if an error occurs when accessing the file.
      */
-    InputStream getFileSttream(String path) throws ApplicationStorageManagementException;
+    InputStream getFileStream(String path) throws ApplicationStorageManagementException;
 }

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationManagerImpl.java

@@ -583,12 +583,14 @@ public class ApplicationManagerImpl implements ApplicationManager {
             log.error(msg);
             throw new ApplicationManagementException(msg, e);
         } catch (UserStoreException e) {
-            throw new ApplicationManagementException(
+            String msg = "User-store exception while checking whether the user " + userName + " of tenant " + tenantId
-                    "User-store exception while checking whether the user " + userName + " of tenant " + tenantId
+                    + " has the publisher permission";
-                            + " has the publisher permission", e);
+            log.error(msg);
+            throw new ApplicationManagementException(msg, e);
         } catch (ApplicationManagementDAOException e) {
-            throw new ApplicationManagementException(
+            String msg = "DAO exception while getting applications for the user " + userName + " of tenant " + tenantId;
-                    "DAO exception while getting applications for the user " + userName + " of tenant " + tenantId, e);
+            log.error(msg);
+            throw new ApplicationManagementException(msg, e);
         } finally {
             ConnectionManagerUtil.closeDBConnection();
         }
@@ -792,23 +794,26 @@ public class ApplicationManagerImpl implements ApplicationManager {
             ConnectionManagerUtil.commitDBTransaction();
             return applicationRelease;
         } catch (TransactionManagementException e) {
-            throw new ApplicationManagementException(
+            String msg = "Error occurred while staring application release creating transaction for application Id: "
-                    "Error occurred while staring application release creating transaction for application Id: "
+                    + applicationId;
-                            + applicationId, e);
+            log.error(msg);
+            throw new ApplicationManagementException(msg, e);
         } catch (DBConnectionException e) {
-            throw new ApplicationManagementException(
+            String msg = "Error occurred while adding application release into IoTS app management ApplicationDTO id of"
-                    "Error occurred while adding application release into IoTS app management ApplicationDTO id of the "
+                    + " the application release: " + applicationId;
-                            + "application release: " + applicationId, e);
+            log.error(msg);
-
+            throw new ApplicationManagementException(msg, e);
         } catch (LifeCycleManagementDAOException e) {
             ConnectionManagerUtil.rollbackDBTransaction();
-            throw new ApplicationManagementException(
+            String msg = "Error occurred while adding new application release lifecycle state to the application"
-                    "Error occurred while adding new application release lifecycle state to the application release: "
+                    + " release: " + applicationId;
-                            + applicationId, e);
+            log.error(msg);
+            throw new ApplicationManagementException(msg, e);
         } catch (ApplicationManagementDAOException e) {
             ConnectionManagerUtil.rollbackDBTransaction();
-            throw new ApplicationManagementException(
+            String msg = "Error occurred while adding new application release for application " + applicationId;
-                    "Error occurred while adding new application release for application " + applicationId, e);
+            log.error(msg);
+            throw new ApplicationManagementException(msg, e);
         } finally {
             ConnectionManagerUtil.closeDBConnection();
         }

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationStorageManagerImpl.java

@@ -212,7 +212,7 @@ public class ApplicationStorageManagerImpl implements ApplicationStorageManager
     }
 
     @Override
-    public InputStream getFileSttream (String path) throws ApplicationStorageManagementException {
+    public InputStream getFileStream(String path) throws ApplicationStorageManagementException {
         String filePath = storagePath + path;
         try {
             return StorageManagementUtil.getInputStream(filePath);

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/AppmDataHandlerImpl.java

@@ -80,7 +80,7 @@ public class AppmDataHandlerImpl implements AppmDataHandler {
                 throw new NotFoundException(msg);
             }
             artifactPath = appReleaseHashValue + Constants.FORWARD_SLASH + artifactName;
-            InputStream inputStream = applicationStorageManager.getFileSttream(artifactPath);
+            InputStream inputStream = applicationStorageManager.getFileStream(artifactPath);
             if (inputStream == null) {
                 String msg = "Couldn't file the file in the file system. File path: " + artifactPath;
                 log.error(msg);