From 90502c34d7a836ffec2b9a93fd4d93e567dffcd7 Mon Sep 17 00:00:00 2001 From: prabathabey Date: Thu, 30 Jul 2015 14:44:54 +0530 Subject: [PATCH 1/2] Configuring default license for Android and code cleanup --- .../device/mgt/mobile/dto/MobileDevice.java | 5 + .../impl/android/AndroidDeviceManager.java | 89 +++++------ .../dao/impl/AndroidDeviceDAOImpl.java | 146 +++++++----------- .../impl/android/util/AndroidPluginUtils.java | 58 +++++++ .../impl/android/util/AndroidUtils.java | 37 ----- 5 files changed, 160 insertions(+), 175 deletions(-) create mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/util/AndroidPluginUtils.java delete mode 100644 components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/util/AndroidUtils.java diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileDevice.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileDevice.java index 0caff68a43..185168da49 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileDevice.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dto/MobileDevice.java @@ -19,6 +19,7 @@ package org.wso2.carbon.device.mgt.mobile.dto; import java.io.Serializable; +import java.util.HashMap; import java.util.Map; /** @@ -37,6 +38,10 @@ public class MobileDevice implements Serializable { private String serial; private Map deviceProperties; + public MobileDevice() { + this.deviceProperties = new HashMap<>(); + } + public String getMobileDeviceId() { return mobileDeviceId; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java index 2671fd6ac4..fde575abfe 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java @@ -32,6 +32,7 @@ import org.wso2.carbon.device.mgt.mobile.dao.MobileDeviceManagementDAOException; import org.wso2.carbon.device.mgt.mobile.dao.MobileDeviceManagementDAOFactory; import org.wso2.carbon.device.mgt.mobile.dto.MobileDevice; import org.wso2.carbon.device.mgt.mobile.impl.android.dao.AndroidDAOFactory; +import org.wso2.carbon.device.mgt.mobile.impl.android.util.AndroidPluginUtils; import org.wso2.carbon.device.mgt.mobile.util.MobileDeviceManagementUtil; import org.wso2.carbon.registry.api.Collection; import org.wso2.carbon.registry.api.RegistryException; @@ -42,14 +43,21 @@ import java.util.List; public class AndroidDeviceManager implements DeviceManager { - private MobileDeviceManagementDAOFactory mobileDeviceManagementDAOFactory; + private MobileDeviceManagementDAOFactory daoFactory; private static final Log log = LogFactory.getLog(AndroidDeviceManagementService.class); private FeatureManager featureManager = new AndroidFeatureManager(); private LicenseManager licenseManager; public AndroidDeviceManager() { - this.mobileDeviceManagementDAOFactory = new AndroidDAOFactory(); + this.daoFactory = new AndroidDAOFactory(); this.licenseManager = new RegistryBasedLicenseManager(); + + License defaultLicense = AndroidPluginUtils.getDefaultLicense(); + try { + licenseManager.addLicense(AndroidDeviceManagementService.DEVICE_TYPE_ANDROID, defaultLicense); + } catch (LicenseManagementException e) { + log.error("Error occurred while adding default license for Android devices", e); + } } @Override @@ -88,9 +96,9 @@ public class AndroidDeviceManager implements DeviceManager { @Override public TenantConfiguration getConfiguration() throws DeviceManagementException { - Collection dsCollection = null; + Collection dsCollection; TenantConfiguration tenantConfiguration; - List configs = new ArrayList(); + List configs = new ArrayList<>(); ConfigurationEntry entry; Resource resource; try { @@ -130,7 +138,7 @@ public class AndroidDeviceManager implements DeviceManager { log.debug("Enrolling a new Android device : " + device.getDeviceIdentifier()); } AndroidDAOFactory.beginTransaction(); - status = mobileDeviceManagementDAOFactory.getMobileDeviceDAO().addMobileDevice( + status = daoFactory.getMobileDeviceDAO().addMobileDevice( mobileDevice); AndroidDAOFactory.commitTransaction(); } catch (MobileDeviceManagementDAOException e) { @@ -141,10 +149,8 @@ public class AndroidDeviceManager implements DeviceManager { device.toString(); log.warn(msg, mobileDAOEx); } - String msg = - "Error while enrolling the Android device : " + device.getDeviceIdentifier(); - log.error(msg, e); - throw new DeviceManagementException(msg, e); + throw new DeviceManagementException("Error while enrolling the Android device: '" + + device.getDeviceIdentifier() + "'", e); } return status; } @@ -158,7 +164,7 @@ public class AndroidDeviceManager implements DeviceManager { log.debug("Modifying the Android device enrollment data"); } AndroidDAOFactory.beginTransaction(); - status = mobileDeviceManagementDAOFactory.getMobileDeviceDAO().updateMobileDevice(mobileDevice); + status = daoFactory.getMobileDeviceDAO().updateMobileDevice(mobileDevice); AndroidDAOFactory.commitTransaction(); } catch (MobileDeviceManagementDAOException e) { try { @@ -168,10 +174,8 @@ public class AndroidDeviceManager implements DeviceManager { device.toString(); log.warn(msg, mobileDAOEx); } - String msg = "Error while updating the enrollment of the Android device : " + - device.getDeviceIdentifier(); - log.error(msg, e); - throw new DeviceManagementException(msg, e); + throw new DeviceManagementException("Error while updating the enrollment of the Android device: '" + + device.getDeviceIdentifier() + "'", e); } return status; } @@ -181,23 +185,22 @@ public class AndroidDeviceManager implements DeviceManager { boolean status; try { if (log.isDebugEnabled()) { - log.debug("Dis-enrolling Android device : " + deviceId); + log.debug("Dis-enrolling Android device: " + deviceId); } AndroidDAOFactory.beginTransaction(); - status = mobileDeviceManagementDAOFactory.getMobileDeviceDAO() + status = daoFactory.getMobileDeviceDAO() .deleteMobileDevice(deviceId.getId()); AndroidDAOFactory.commitTransaction(); } catch (MobileDeviceManagementDAOException e) { try { AndroidDAOFactory.rollbackTransaction(); - } catch (MobileDeviceManagementDAOException mobileDAOEx) { + } catch (MobileDeviceManagementDAOException e1) { String msg = "Error occurred while roll back the device dis enrol transaction :" + deviceId.toString(); - log.warn(msg, mobileDAOEx); + log.warn(msg, e1); } - String msg = "Error while removing the Android device : " + deviceId.getId(); - log.error(msg, e); - throw new DeviceManagementException(msg, e); + throw new DeviceManagementException("Error occurred while removing the Android device: '" + + deviceId.getId() + "'", e); } return status; } @@ -210,16 +213,14 @@ public class AndroidDeviceManager implements DeviceManager { log.debug("Checking the enrollment of Android device : " + deviceId.getId()); } MobileDevice mobileDevice = - mobileDeviceManagementDAOFactory.getMobileDeviceDAO().getMobileDevice( + daoFactory.getMobileDeviceDAO().getMobileDevice( deviceId.getId()); if (mobileDevice != null) { isEnrolled = true; } } catch (MobileDeviceManagementDAOException e) { - String msg = "Error while checking the enrollment status of Android device : " + - deviceId.getId(); - log.error(msg, e); - throw new DeviceManagementException(msg, e); + throw new DeviceManagementException("Error occurred while checking the enrollment status of Android " + + "device: '" + deviceId.getId() + "'", e); } return isEnrolled; } @@ -240,15 +241,14 @@ public class AndroidDeviceManager implements DeviceManager { Device device; try { if (log.isDebugEnabled()) { - log.debug("Getting the details of Android device : " + deviceId.getId()); + log.debug("Getting the details of Android device : '" + deviceId.getId() + "'"); } - MobileDevice mobileDevice = mobileDeviceManagementDAOFactory.getMobileDeviceDAO(). + MobileDevice mobileDevice = daoFactory.getMobileDeviceDAO(). getMobileDevice(deviceId.getId()); device = MobileDeviceManagementUtil.convertToDevice(mobileDevice); } catch (MobileDeviceManagementDAOException e) { - String msg = "Error while fetching the Android device : " + deviceId.getId(); - log.error(msg, e); - throw new DeviceManagementException(msg, e); + throw new DeviceManagementException("Error occurred while fetching the Android device: '" + + deviceId.getId() + "'", e); } return device; } @@ -298,25 +298,21 @@ public class AndroidDeviceManager implements DeviceManager { try { if (log.isDebugEnabled()) { - log.debug( - "updating the details of Android device : " + device.getDeviceIdentifier()); + log.debug("updating the details of Android device : " + device.getDeviceIdentifier()); } AndroidDAOFactory.beginTransaction(); - status = mobileDeviceManagementDAOFactory.getMobileDeviceDAO() + status = daoFactory.getMobileDeviceDAO() .updateMobileDevice(mobileDeviceDB); AndroidDAOFactory.commitTransaction(); } catch (MobileDeviceManagementDAOException e) { try { AndroidDAOFactory.rollbackTransaction(); - } catch (MobileDeviceManagementDAOException mobileDAOEx) { - String msg = "Error occurred while roll back the update device info transaction :" + - device.toString(); - log.warn(msg, mobileDAOEx); + } catch (MobileDeviceManagementDAOException e1) { + log.warn("Error occurred while roll back the update device info transaction : '" + + device.toString() + "'", e1); } - String msg = - "Error while updating the Android device : " + device.getDeviceIdentifier(); - log.error(msg, e); - throw new DeviceManagementException(msg, e); + throw new DeviceManagementException("Error occurred while updating the Android device: '" + + device.getDeviceIdentifier() + "'", e); } return status; } @@ -329,18 +325,15 @@ public class AndroidDeviceManager implements DeviceManager { log.debug("Fetching the details of all Android devices"); } List mobileDevices = - mobileDeviceManagementDAOFactory.getMobileDeviceDAO(). - getAllMobileDevices(); + daoFactory.getMobileDeviceDAO().getAllMobileDevices(); if (mobileDevices != null) { - devices = new ArrayList(); + devices = new ArrayList<>(); for (MobileDevice mobileDevice : mobileDevices) { devices.add(MobileDeviceManagementUtil.convertToDevice(mobileDevice)); } } } catch (MobileDeviceManagementDAOException e) { - String msg = "Error while fetching all Android devices."; - log.error(msg, e); - throw new DeviceManagementException(msg, e); + throw new DeviceManagementException("Error occurred while fetching all Android devices", e); } return devices; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/dao/impl/AndroidDeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/dao/impl/AndroidDeviceDAOImpl.java index b980e3c0a3..886039511d 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/dao/impl/AndroidDeviceDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/dao/impl/AndroidDeviceDAOImpl.java @@ -22,14 +22,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.device.mgt.mobile.dao.MobileDeviceDAO; import org.wso2.carbon.device.mgt.mobile.dao.MobileDeviceManagementDAOException; -import org.wso2.carbon.device.mgt.mobile.dao.MobileDeviceManagementDAOFactory; import org.wso2.carbon.device.mgt.mobile.dao.util.MobileDeviceManagementDAOUtil; import org.wso2.carbon.device.mgt.mobile.dto.MobileDevice; import org.wso2.carbon.device.mgt.mobile.impl.android.dao.AndroidDAOFactory; import org.wso2.carbon.device.mgt.mobile.impl.android.util.AndroidPluginConstants; -import org.wso2.carbon.device.mgt.mobile.impl.android.util.AndroidUtils; -import javax.sql.DataSource; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -47,12 +44,11 @@ public class AndroidDeviceDAOImpl implements MobileDeviceDAO{ private static final Log log = LogFactory.getLog(AndroidDeviceDAOImpl.class); @Override - public MobileDevice getMobileDevice(String mblDeviceId) - throws MobileDeviceManagementDAOException { - Connection conn = null; + public MobileDevice getMobileDevice(String mblDeviceId) throws MobileDeviceManagementDAOException { + Connection conn; PreparedStatement stmt = null; MobileDevice mobileDevice = null; - ResultSet resultSet = null; + ResultSet rs = null; try { conn = AndroidDAOFactory.getConnection(); String selectDBQuery = @@ -61,29 +57,25 @@ public class AndroidDeviceDAOImpl implements MobileDeviceDAO{ " FROM AD_DEVICE WHERE ANDROID_DEVICE_ID = ?"; stmt = conn.prepareStatement(selectDBQuery); stmt.setString(1, mblDeviceId); - resultSet = stmt.executeQuery(); + rs = stmt.executeQuery(); - if (resultSet.next()) { + if (rs.next()) { mobileDevice = new MobileDevice(); - mobileDevice.setMobileDeviceId(resultSet.getString(AndroidPluginConstants. + mobileDevice.setMobileDeviceId(rs.getString(AndroidPluginConstants. ANDROID_DEVICE_ID)); - mobileDevice.setModel(resultSet.getString(AndroidPluginConstants.DEVICE_MODEL)); - mobileDevice.setSerial(resultSet.getString(AndroidPluginConstants.SERIAL)); - mobileDevice.setVendor(resultSet.getString(AndroidPluginConstants.VENDOR)); - mobileDevice.setLatitude(resultSet.getString(AndroidPluginConstants.LATITUDE)); - mobileDevice.setLongitude(resultSet.getString(AndroidPluginConstants.LONGITUDE)); - mobileDevice.setImei(resultSet.getString(AndroidPluginConstants.IMEI)); - mobileDevice.setImsi(resultSet.getString(AndroidPluginConstants.IMSI)); - mobileDevice.setOsVersion(resultSet.getString(AndroidPluginConstants.OS_VERSION)); + mobileDevice.setModel(rs.getString(AndroidPluginConstants.DEVICE_MODEL)); + mobileDevice.setSerial(rs.getString(AndroidPluginConstants.SERIAL)); + mobileDevice.setVendor(rs.getString(AndroidPluginConstants.VENDOR)); + mobileDevice.setLatitude(rs.getString(AndroidPluginConstants.LATITUDE)); + mobileDevice.setLongitude(rs.getString(AndroidPluginConstants.LONGITUDE)); + mobileDevice.setImei(rs.getString(AndroidPluginConstants.IMEI)); + mobileDevice.setImsi(rs.getString(AndroidPluginConstants.IMSI)); + mobileDevice.setOsVersion(rs.getString(AndroidPluginConstants.OS_VERSION)); Map propertyMap = new HashMap(); - propertyMap.put(AndroidPluginConstants.GCM_TOKEN, - resultSet.getString(AndroidPluginConstants.GCM_TOKEN)); - propertyMap.put(AndroidPluginConstants.DEVICE_INFO, - resultSet.getString(AndroidPluginConstants.DEVICE_INFO)); - propertyMap.put(AndroidPluginConstants.DEVICE_NAME, - resultSet.getString(AndroidPluginConstants.DEVICE_NAME)); - + propertyMap.put(AndroidPluginConstants.GCM_TOKEN, rs.getString(AndroidPluginConstants.GCM_TOKEN)); + propertyMap.put(AndroidPluginConstants.DEVICE_INFO, rs.getString(AndroidPluginConstants.DEVICE_INFO)); + propertyMap.put(AndroidPluginConstants.DEVICE_NAME, rs.getString(AndroidPluginConstants.DEVICE_NAME)); mobileDevice.setDeviceProperties(propertyMap); if (log.isDebugEnabled()) { @@ -96,7 +88,7 @@ public class AndroidDeviceDAOImpl implements MobileDeviceDAO{ log.error(msg, e); throw new MobileDeviceManagementDAOException(msg, e); } finally { - MobileDeviceManagementDAOUtil.cleanupResources(stmt, resultSet); + MobileDeviceManagementDAOUtil.cleanupResources(stmt, rs); AndroidDAOFactory.closeConnection(); } @@ -104,10 +96,9 @@ public class AndroidDeviceDAOImpl implements MobileDeviceDAO{ } @Override - public boolean addMobileDevice(MobileDevice mobileDevice) - throws MobileDeviceManagementDAOException { + public boolean addMobileDevice(MobileDevice mobileDevice) throws MobileDeviceManagementDAOException { boolean status = false; - Connection conn = null; + Connection conn; PreparedStatement stmt = null; try { conn = AndroidDAOFactory.getConnection(); @@ -119,19 +110,13 @@ public class AndroidDeviceDAOImpl implements MobileDeviceDAO{ stmt = conn.prepareStatement(createDBQuery); stmt.setString(1, mobileDevice.getMobileDeviceId()); - if (mobileDevice.getDeviceProperties() == null) { - mobileDevice.setDeviceProperties(new HashMap()); - } - - stmt.setString(2, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(), - AndroidPluginConstants.GCM_TOKEN)); - stmt.setString(3, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(), - AndroidPluginConstants.DEVICE_INFO)); + Map properties = mobileDevice.getDeviceProperties(); + stmt.setString(2, properties.get(AndroidPluginConstants.GCM_TOKEN)); + stmt.setString(3, properties.get(AndroidPluginConstants.DEVICE_INFO)); stmt.setString(4, mobileDevice.getSerial()); stmt.setString(5, mobileDevice.getVendor()); stmt.setString(6, mobileDevice.getMobileDeviceId()); - stmt.setString(7, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(), - AndroidPluginConstants.DEVICE_NAME)); + stmt.setString(7, properties.get(AndroidPluginConstants.DEVICE_NAME)); stmt.setString(8, mobileDevice.getLongitude()); stmt.setString(9, mobileDevice.getLongitude()); stmt.setString(10, mobileDevice.getImei()); @@ -147,10 +132,8 @@ public class AndroidDeviceDAOImpl implements MobileDeviceDAO{ } } } catch (SQLException e) { - String msg = "Error occurred while adding the Android device '" + - mobileDevice.getMobileDeviceId() + "' to the Android db."; - log.error(msg, e); - throw new MobileDeviceManagementDAOException(msg, e); + throw new MobileDeviceManagementDAOException("Error occurred while adding the Android device '" + + mobileDevice.getMobileDeviceId() + "' information to the Android plugin data store.", e); } finally { MobileDeviceManagementDAOUtil.cleanupResources(stmt, null); } @@ -158,10 +141,9 @@ public class AndroidDeviceDAOImpl implements MobileDeviceDAO{ } @Override - public boolean updateMobileDevice(MobileDevice mobileDevice) - throws MobileDeviceManagementDAOException { + public boolean updateMobileDevice(MobileDevice mobileDevice) throws MobileDeviceManagementDAOException { boolean status = false; - Connection conn = null; + Connection conn; PreparedStatement stmt = null; try { conn = AndroidDAOFactory.getConnection(); @@ -169,23 +151,15 @@ public class AndroidDeviceDAOImpl implements MobileDeviceDAO{ "UPDATE AD_DEVICE SET GCM_TOKEN = ?, DEVICE_INFO = ?, SERIAL = ?, VENDOR = ?, " + "MAC_ADDRESS = ?, DEVICE_NAME = ?, LATITUDE = ?, LONGITUDE = ?, IMEI = ?, " + "IMSI = ?, OS_VERSION = ?, DEVICE_MODEL = ? WHERE ANDROID_DEVICE_ID = ?"; - stmt = conn.prepareStatement(updateDBQuery); - if (mobileDevice.getDeviceProperties() == null) { - mobileDevice.setDeviceProperties(new HashMap()); - } - - stmt.setString(1, AndroidUtils.getDeviceProperty( - mobileDevice.getDeviceProperties(), - AndroidPluginConstants.GCM_TOKEN)); - stmt.setString(2, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(), - AndroidPluginConstants.DEVICE_INFO)); + Map properties = mobileDevice.getDeviceProperties(); + stmt.setString(1, properties.get(AndroidPluginConstants.GCM_TOKEN)); + stmt.setString(2, properties.get(AndroidPluginConstants.DEVICE_INFO)); stmt.setString(3, mobileDevice.getSerial()); stmt.setString(4, mobileDevice.getVendor()); stmt.setString(5, mobileDevice.getMobileDeviceId()); - stmt.setString(6, AndroidUtils.getDeviceProperty(mobileDevice.getDeviceProperties(), - AndroidPluginConstants.DEVICE_NAME)); + stmt.setString(6, properties.get(AndroidPluginConstants.DEVICE_NAME)); stmt.setString(7, mobileDevice.getLatitude()); stmt.setString(8, mobileDevice.getLongitude()); stmt.setString(9, mobileDevice.getImei()); @@ -216,7 +190,7 @@ public class AndroidDeviceDAOImpl implements MobileDeviceDAO{ public boolean deleteMobileDevice(String mblDeviceId) throws MobileDeviceManagementDAOException { boolean status = false; - Connection conn = null; + Connection conn; PreparedStatement stmt = null; try { conn = AndroidDAOFactory.getConnection(); @@ -233,9 +207,8 @@ public class AndroidDeviceDAOImpl implements MobileDeviceDAO{ } } } catch (SQLException e) { - String msg = "Error occurred while deleting android device " + mblDeviceId; - log.error(msg, e); - throw new MobileDeviceManagementDAOException(msg, e); + throw new MobileDeviceManagementDAOException("Error occurred while deleting android device '" + + mblDeviceId + "'", e); } finally { MobileDeviceManagementDAOUtil.cleanupResources(stmt, null); } @@ -243,15 +216,12 @@ public class AndroidDeviceDAOImpl implements MobileDeviceDAO{ } @Override - public List getAllMobileDevices() - throws MobileDeviceManagementDAOException { - - Connection conn = null; + public List getAllMobileDevices() throws MobileDeviceManagementDAOException { + Connection conn; PreparedStatement stmt = null; - ResultSet resultSet = null; + ResultSet rs = null; MobileDevice mobileDevice; List mobileDevices = new ArrayList(); - try { conn = AndroidDAOFactory.getConnection(); String selectDBQuery = @@ -259,29 +229,27 @@ public class AndroidDeviceDAOImpl implements MobileDeviceDAO{ "VENDOR, MAC_ADDRESS, DEVICE_NAME, LATITUDE, LONGITUDE, IMEI, IMSI, OS_VERSION " + "FROM AD_DEVICE"; stmt = conn.prepareStatement(selectDBQuery); - resultSet = stmt.executeQuery(); - while (resultSet.next()) { + rs = stmt.executeQuery(); + + while (rs.next()) { mobileDevice = new MobileDevice(); - mobileDevice.setMobileDeviceId(resultSet.getString(AndroidPluginConstants. + mobileDevice.setMobileDeviceId(rs.getString(AndroidPluginConstants. ANDROID_DEVICE_ID)); - mobileDevice.setModel(resultSet.getString(AndroidPluginConstants.DEVICE_MODEL)); - mobileDevice.setSerial(resultSet.getString(AndroidPluginConstants.SERIAL)); - mobileDevice.setVendor(resultSet.getString(AndroidPluginConstants.VENDOR)); - mobileDevice.setLatitude(resultSet.getString(AndroidPluginConstants.LATITUDE)); - mobileDevice.setLongitude(resultSet.getString(AndroidPluginConstants.LONGITUDE)); - mobileDevice.setImei(resultSet.getString(AndroidPluginConstants.IMEI)); - mobileDevice.setImsi(resultSet.getString(AndroidPluginConstants.IMSI)); - mobileDevice.setOsVersion(resultSet.getString(AndroidPluginConstants.OS_VERSION)); + mobileDevice.setModel(rs.getString(AndroidPluginConstants.DEVICE_MODEL)); + mobileDevice.setSerial(rs.getString(AndroidPluginConstants.SERIAL)); + mobileDevice.setVendor(rs.getString(AndroidPluginConstants.VENDOR)); + mobileDevice.setLatitude(rs.getString(AndroidPluginConstants.LATITUDE)); + mobileDevice.setLongitude(rs.getString(AndroidPluginConstants.LONGITUDE)); + mobileDevice.setImei(rs.getString(AndroidPluginConstants.IMEI)); + mobileDevice.setImsi(rs.getString(AndroidPluginConstants.IMSI)); + mobileDevice.setOsVersion(rs.getString(AndroidPluginConstants.OS_VERSION)); Map propertyMap = new HashMap(); - propertyMap.put(AndroidPluginConstants.GCM_TOKEN, - resultSet.getString(AndroidPluginConstants.GCM_TOKEN)); - propertyMap.put(AndroidPluginConstants.DEVICE_INFO, - resultSet.getString(AndroidPluginConstants.DEVICE_INFO)); - propertyMap.put(AndroidPluginConstants.DEVICE_NAME, - resultSet.getString(AndroidPluginConstants.DEVICE_NAME)); - + propertyMap.put(AndroidPluginConstants.GCM_TOKEN, rs.getString(AndroidPluginConstants.GCM_TOKEN)); + propertyMap.put(AndroidPluginConstants.DEVICE_INFO, rs.getString(AndroidPluginConstants.DEVICE_INFO)); + propertyMap.put(AndroidPluginConstants.DEVICE_NAME, rs.getString(AndroidPluginConstants.DEVICE_NAME)); mobileDevice.setDeviceProperties(propertyMap); + mobileDevices.add(mobileDevice); } if (log.isDebugEnabled()) { @@ -289,11 +257,9 @@ public class AndroidDeviceDAOImpl implements MobileDeviceDAO{ } return mobileDevices; } catch (SQLException e) { - String msg = "Error occurred while fetching all Android device data'"; - log.error(msg, e); - throw new MobileDeviceManagementDAOException(msg, e); + throw new MobileDeviceManagementDAOException("Error occurred while fetching all Android device data", e); } finally { - MobileDeviceManagementDAOUtil.cleanupResources(stmt, resultSet); + MobileDeviceManagementDAOUtil.cleanupResources(stmt, rs); AndroidDAOFactory.closeConnection(); } } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/util/AndroidPluginUtils.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/util/AndroidPluginUtils.java new file mode 100644 index 0000000000..ef733db3fe --- /dev/null +++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/util/AndroidPluginUtils.java @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * you may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.device.mgt.mobile.impl.android.util; + +import org.wso2.carbon.device.mgt.common.license.mgt.License; +import org.wso2.carbon.device.mgt.mobile.impl.android.AndroidDeviceManagementService; + +/** + * Contains utility methods used by Android plugin. + */ +public class AndroidPluginUtils { + + public static License getDefaultLicense() { + License license = new License(); + license.setName(AndroidDeviceManagementService.DEVICE_TYPE_ANDROID); + license.setLanguage("en_US"); + license.setVersion("1.0.0"); + license.setText("This End User License Agreement (“Agreement”) is a legal agreement between you (“You”) " + + "and WSO2, Inc., regarding the enrollment of Your personal mobile device (“Device”) in SoR’s " + + "mobile device management program, and the loading to and removal from Your Device and Your use " + + "of certain applications and any associated software and user documentation, whether provided in " + + "“online” or electronic format, used in connection with the operation of or provision of services " + + "to WSO2, Inc., BY SELECTING “I ACCEPT” DURING INSTALLATION, YOU ARE ENROLLING YOUR DEVICE, AND " + + "THEREBY AUTHORIZING SOR OR ITS AGENTS TO INSTALL, UPDATE AND REMOVE THE APPS FROM YOUR DEVICE AS " + + "DESCRIBED IN THIS AGREEMENT. YOU ARE ALSO EXPLICITLY ACKNOWLEDGING AND AGREEING THAT (1) THIS IS " + + "A BINDING CONTRACT AND (2) YOU HAVE READ AND AGREE TO THE TERMS OF THIS AGREEMENT.\n" + + "\n" + + "IF YOU DO NOT ACCEPT THESE TERMS, DO NOT ENROLL YOUR DEVICE AND DO NOT PROCEED ANY FURTHER.\n" + + "\n" + + "You agree that: (1) You understand and agree to be bound by the terms and conditions contained " + + "in this Agreement, and (2) You are at least 21 years old and have the legal capacity to enter " + + "into this Agreement as defined by the laws of Your jurisdiction. SoR shall have the right, " + + "without prior notice, to terminate or suspend (i) this Agreement, (ii) the enrollment of Your " + + "Device, or (iii) the functioning of the Apps in the event of a violation of this Agreement or " + + "the cessation of Your relationship with SoR (including termination of Your employment if You are " + + "an employee or expiration or termination of Your applicable franchise or supply agreement if You " + + "are a franchisee of or supplier to the WSO2 WSO2, Inc., system). SoR expressly reserves all " + + "rights not expressly granted herein."); + return license; + } + +} diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/util/AndroidUtils.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/util/AndroidUtils.java deleted file mode 100644 index 104856fffd..0000000000 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/util/AndroidUtils.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. - * - * WSO2 Inc. licenses this file to you under the Apache License, - * Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. - * you may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.wso2.carbon.device.mgt.mobile.impl.android.util; - -import java.util.Map; - -/** - * Contains utility methods used by Android plugin. - */ -public class AndroidUtils { - - public static String getDeviceProperty(Map deviceProperties, String property) { - - String deviceProperty = deviceProperties.get(property); - if (deviceProperty == null) { - return ""; - } - - return deviceProperty; - } -} From b4a61b0243da0333074b2a3d9f1c7a8fbda73f7b Mon Sep 17 00:00:00 2001 From: prabathabey Date: Thu, 30 Jul 2015 15:16:45 +0530 Subject: [PATCH 2/2] Adapting packaging changes introduced in device.mgt.extensions for registry based license manager --- .../device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml | 2 +- .../device/mgt/mobile/impl/android/AndroidDeviceManager.java | 2 +- .../device/mgt/mobile/impl/windows/WindowsDeviceManager.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml index 64d5d4aa6c..b72c5b8e09 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml +++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml @@ -76,7 +76,7 @@ org.wso2.carbon.registry.core.service, org.wso2.carbon.registry.core.session, org.wso2.carbon.registry.api, - org.wso2.carbon.device.mgt.extensions.license.mgt + org.wso2.carbon.device.mgt.extensions.license.mgt.registry !org.wso2.carbon.device.mgt.mobile.internal, diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java index fde575abfe..2a2bfd181a 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManager.java @@ -26,7 +26,7 @@ import org.wso2.carbon.device.mgt.common.configuration.mgt.TenantConfiguration; import org.wso2.carbon.device.mgt.common.license.mgt.License; import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException; import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManager; -import org.wso2.carbon.device.mgt.extensions.license.mgt.RegistryBasedLicenseManager; +import org.wso2.carbon.device.mgt.extensions.license.mgt.registry.RegistryBasedLicenseManager; import org.wso2.carbon.device.mgt.mobile.common.MobileDeviceMgtPluginException; import org.wso2.carbon.device.mgt.mobile.dao.MobileDeviceManagementDAOException; import org.wso2.carbon.device.mgt.mobile.dao.MobileDeviceManagementDAOFactory; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/WindowsDeviceManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/WindowsDeviceManager.java index 9dc3014d50..e744e8e82d 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/WindowsDeviceManager.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/WindowsDeviceManager.java @@ -25,7 +25,7 @@ import org.wso2.carbon.device.mgt.common.configuration.mgt.TenantConfiguration; import org.wso2.carbon.device.mgt.common.license.mgt.License; import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException; import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManager; -import org.wso2.carbon.device.mgt.extensions.license.mgt.RegistryBasedLicenseManager; +import org.wso2.carbon.device.mgt.extensions.license.mgt.registry.RegistryBasedLicenseManager; import org.wso2.carbon.device.mgt.mobile.dao.MobileDeviceManagementDAOException; import org.wso2.carbon.device.mgt.mobile.dao.MobileDeviceManagementDAOFactory; import org.wso2.carbon.device.mgt.mobile.dto.MobileDevice;