community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add policy content store as Json

Browse Source
This commit is contained in:
Lasantha Dharmakeerthi 2024-07-11 10:29:56 +00:00
commit cbbac7e37a
3 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml
View File

@ -180,6 +180,10 @@
<groupId>io.entgra.device.mgt.core</groupId> <groupId>io.entgra.device.mgt.core</groupId>
<artifactId>io.entgra.device.mgt.core.policy.mgt.common</artifactId> <artifactId>io.entgra.device.mgt.core.policy.mgt.common</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
<!--Test Case --> <!--Test Case -->

41
components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/dao/impl/policy/AbstractPolicyDAOImpl.java
View File

@ -18,6 +18,7 @@
package io.entgra.device.mgt.core.policy.mgt.core.dao.impl.policy; package io.entgra.device.mgt.core.policy.mgt.core.dao.impl.policy;
import com.google.gson.Gson;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.context.PrivilegedCarbonContext;
@ -54,6 +55,7 @@ import java.util.Properties;
*/ */
public abstract class AbstractPolicyDAOImpl implements PolicyDAO { public abstract class AbstractPolicyDAOImpl implements PolicyDAO {
private static final Gson gson = new Gson();
private static final Log log = LogFactory.getLog(AbstractPolicyDAOImpl.class); private static final Log log = LogFactory.getLog(AbstractPolicyDAOImpl.class);
@Override @Override
@ -1187,13 +1189,13 @@ public abstract class AbstractPolicyDAOImpl implements PolicyDAO {
stmt = conn.prepareStatement(query); stmt = conn.prepareStatement(query);
stmt.setInt(1, deviceId); stmt.setInt(1, deviceId);
stmt.setInt(2, policy.getId()); stmt.setInt(2, policy.getId());
stmt.setBytes(3, PolicyManagerUtil.getBytes(policy)); stmt.setString(3, PolicyManagerUtil.convertToJson(policy));
stmt.setTimestamp(4, currentTimestamp); stmt.setTimestamp(4, currentTimestamp);
stmt.setTimestamp(5, currentTimestamp); stmt.setTimestamp(5, currentTimestamp);
stmt.setInt(6, tenantId); stmt.setInt(6, tenantId);
stmt.setInt(7, enrolmentId); stmt.setInt(7, enrolmentId);
stmt.executeUpdate(); stmt.executeUpdate();
} catch (SQLException | IOException e) { } catch (SQLException e) {
throw new PolicyManagerDAOException("Error occurred while adding the evaluated feature list to device", e); throw new PolicyManagerDAOException("Error occurred while adding the evaluated feature list to device", e);
} finally { } finally {
PolicyManagementDAOUtil.cleanupResources(stmt, null); PolicyManagementDAOUtil.cleanupResources(stmt, null);
@ -1240,7 +1242,7 @@ public abstract class AbstractPolicyDAOImpl implements PolicyDAO {
"APPLIED = ? WHERE DEVICE_ID = ? AND TENANT_ID = ? AND ENROLMENT_ID = ?"; "APPLIED = ? WHERE DEVICE_ID = ? AND TENANT_ID = ? AND ENROLMENT_ID = ?";
stmt = conn.prepareStatement(query); stmt = conn.prepareStatement(query);
stmt.setInt(1, policy.getId()); stmt.setInt(1, policy.getId());
stmt.setBytes(2, PolicyManagerUtil.getBytes(policy)); stmt.setString(2, PolicyManagerUtil.convertToJson(policy));
stmt.setTimestamp(3, currentTimestamp); stmt.setTimestamp(3, currentTimestamp);
stmt.setBoolean(4, false); stmt.setBoolean(4, false);
stmt.setInt(5, deviceId); stmt.setInt(5, deviceId);
@ -1248,7 +1250,7 @@ public abstract class AbstractPolicyDAOImpl implements PolicyDAO {
stmt.setInt(7, enrolmentId); stmt.setInt(7, enrolmentId);
stmt.executeUpdate(); stmt.executeUpdate();
} catch (SQLException | IOException e) { } catch (SQLException e) {
throw new PolicyManagerDAOException("Error occurred while updating the evaluated feature list " + throw new PolicyManagerDAOException("Error occurred while updating the evaluated feature list " +
"to device", e); "to device", e);
} finally { } finally {
@ -1699,39 +1701,12 @@ public abstract class AbstractPolicyDAOImpl implements PolicyDAO {
resultSet = stmt.executeQuery(); resultSet = stmt.executeQuery();
while (resultSet.next()) { while (resultSet.next()) {
ByteArrayInputStream bais = null; String contentString = resultSet.getString("POLICY_CONTENT");
ObjectInputStream ois = null; policy = gson.fromJson(contentString, Policy.class);
byte[] contentBytes;
try {
contentBytes = resultSet.getBytes("POLICY_CONTENT");
bais = new ByteArrayInputStream(contentBytes);
ois = new ObjectInputStream(bais);
policy = (Policy) ois.readObject();
} finally {
if (bais != null) {
try {
bais.close();
} catch (IOException e) {
log.warn("Error occurred while closing ByteArrayOutputStream", e);
}
}
if (ois != null) {
try {
ois.close();
} catch (IOException e) {
log.warn("Error occurred while closing ObjectOutputStream", e);
}
}
}
} }
} catch (SQLException e) { } catch (SQLException e) {
throw new PolicyManagerDAOException("Error occurred while getting the applied policy", e); throw new PolicyManagerDAOException("Error occurred while getting the applied policy", e);
} catch (IOException e) {
throw new PolicyManagerDAOException("Unable to read the byte stream for content", e);
} catch (ClassNotFoundException e) {
throw new PolicyManagerDAOException("Class not found while converting the object", e);
} finally { } finally {
PolicyManagementDAOUtil.cleanupResources(stmt, resultSet); PolicyManagementDAOUtil.cleanupResources(stmt, resultSet);
} }

11
components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/util/PolicyManagerUtil.java
View File

@ -62,7 +62,7 @@ import java.io.ObjectOutputStream;
import java.util.*; import java.util.*;
public class PolicyManagerUtil { public class PolicyManagerUtil {
private static final Gson gson = new Gson();
public static final String GENERAL_CONFIG_RESOURCE_PATH = "general"; public static final String GENERAL_CONFIG_RESOURCE_PATH = "general";
public static final String MONITORING_FREQUENCY = "notifierFrequency"; public static final String MONITORING_FREQUENCY = "notifierFrequency";
private static final Log log = LogFactory.getLog(PolicyManagerUtil.class); private static final Log log = LogFactory.getLog(PolicyManagerUtil.class);
@ -355,6 +355,15 @@ public class PolicyManagerUtil {
return data; return data;
} }
/**
* Using for converting policy objects into Json strings
* @param obj
* @return
*/
public static String convertToJson(Object obj) {
return gson.toJson(obj);
}
public static boolean convertIntToBoolean(int x) { public static boolean convertIntToBoolean(int x) {
return x == 1; return x == 1;