community
/
device-mgt-core
12
0
Fork 43
Code Issues Pull Requests 18 Packages Projects Releases Wiki Activity
Labels Milestones
New Pull Request

Add certificate search by partial serial number #274

Merged
tcdlpds merged 1 commits from prathabanKavin/device-mgt-core:migscriptstructure into master 12 months ago
Conversation 0 Commits 1 Files Changed 4
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File

8
components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/GenericCertificateDAOImpl.java
Unescape View File

@ -63,7 +63,7 @@ public class GenericCertificateDAOImpl extends AbstractCertificateDAOImpl {
"WHERE TENANT_ID = ?"; "WHERE TENANT_ID = ?";
if (StringUtils.isNotEmpty(serialNumber)) { if (StringUtils.isNotEmpty(serialNumber)) {
sql += " AND SERIAL_NUMBER = ?"; sql += " AND SERIAL_NUMBER LIKE ?";
} }
if (StringUtils.isNotEmpty(deviceIdentifier)) { if (StringUtils.isNotEmpty(deviceIdentifier)) {
@ -79,7 +79,7 @@ public class GenericCertificateDAOImpl extends AbstractCertificateDAOImpl {
int paramIdx = 2; int paramIdx = 2;
if (StringUtils.isNotEmpty(serialNumber)) { if (StringUtils.isNotEmpty(serialNumber)) {
stmt.setString(paramIdx++, serialNumber); stmt.setString(paramIdx++, "%" + serialNumber + "%");
} }
if (StringUtils.isNotEmpty(deviceIdentifier)) { if (StringUtils.isNotEmpty(deviceIdentifier)) {
@ -124,7 +124,7 @@ public class GenericCertificateDAOImpl extends AbstractCertificateDAOImpl {
"WHERE TENANT_ID = ? "; "WHERE TENANT_ID = ? ";
if (StringUtils.isNotEmpty(serialNumber)) { if (StringUtils.isNotEmpty(serialNumber)) {
query += "AND SERIAL_NUMBER = ? "; query += "AND SERIAL_NUMBER LIKE ? ";
isCertificateSerialNumberProvided = true; isCertificateSerialNumberProvided = true;
} }
@ -144,7 +144,7 @@ public class GenericCertificateDAOImpl extends AbstractCertificateDAOImpl {
int paramIdx = 1; int paramIdx = 1;
stmt.setInt(paramIdx++, tenantId); stmt.setInt(paramIdx++, tenantId);
if (isCertificateSerialNumberProvided) { if (isCertificateSerialNumberProvided) {
stmt.setString(paramIdx++, serialNumber); stmt.setString(paramIdx++, "%" + serialNumber + "%");
} }
if (isCertificateDeviceIdentifierProvided) { if (isCertificateDeviceIdentifierProvided) {
stmt.setString(paramIdx++, deviceIdentifier); stmt.setString(paramIdx++, deviceIdentifier);

8
components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/OracleCertificateDAOImpl.java
Unescape View File

@ -63,7 +63,7 @@ public class OracleCertificateDAOImpl extends AbstractCertificateDAOImpl {
"FROM DM_DEVICE_CERTIFICATE " + "FROM DM_DEVICE_CERTIFICATE " +
"WHERE TENANT_ID = ? "; "WHERE TENANT_ID = ? ";
if (StringUtils.isNotEmpty(serialNumber)) { if (StringUtils.isNotEmpty(serialNumber)) {
query += "AND SERIAL_NUMBER = ? "; query += "AND SERIAL_NUMBER LIKE ? ";
isCertificateSerialNumberProvided = true; isCertificateSerialNumberProvided = true;
} }
@ -83,7 +83,7 @@ public class OracleCertificateDAOImpl extends AbstractCertificateDAOImpl {
int paramIdx = 1; int paramIdx = 1;
stmt.setInt(paramIdx++, tenantId); stmt.setInt(paramIdx++, tenantId);
if (isCertificateSerialNumberProvided) { if (isCertificateSerialNumberProvided) {
stmt.setString(paramIdx++, serialNumber); stmt.setString(paramIdx++, "%" + serialNumber+ "%");
} }
if (isCertificateDeviceIdentifierProvided) { if (isCertificateDeviceIdentifierProvided) {
stmt.setString(paramIdx++, deviceIdentifier); stmt.setString(paramIdx++, deviceIdentifier);
@ -136,7 +136,7 @@ public class OracleCertificateDAOImpl extends AbstractCertificateDAOImpl {
"WHERE TENANT_ID = ?"; "WHERE TENANT_ID = ?";
if (StringUtils.isNotEmpty(serialNumber)) { if (StringUtils.isNotEmpty(serialNumber)) {
sql += " AND SERIAL_NUMBER = ?"; sql += " AND SERIAL_NUMBER LIKE ?";
} }
if (StringUtils.isNotEmpty(deviceIdentifier)) { if (StringUtils.isNotEmpty(deviceIdentifier)) {
@ -152,7 +152,7 @@ public class OracleCertificateDAOImpl extends AbstractCertificateDAOImpl {
int paramIdx = 2; int paramIdx = 2;
if (StringUtils.isNotEmpty(serialNumber)) { if (StringUtils.isNotEmpty(serialNumber)) {
stmt.setString(paramIdx++, serialNumber); stmt.setString(paramIdx++, "%" + serialNumber + "%");
} }
if (StringUtils.isNotEmpty(deviceIdentifier)) { if (StringUtils.isNotEmpty(deviceIdentifier)) {

10
components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/PostgreSQLCertificateDAOImpl.java
Unescape View File

@ -63,7 +63,7 @@ public class PostgreSQLCertificateDAOImpl extends AbstractCertificateDAOImpl {
"FROM DM_DEVICE_CERTIFICATE " + "FROM DM_DEVICE_CERTIFICATE " +
"WHERE TENANT_ID = ? "; "WHERE TENANT_ID = ? ";
if (StringUtils.isNotEmpty(serialNumber)) { if (StringUtils.isNotEmpty(serialNumber)) {
query += "AND SERIAL_NUMBER = ? "; query += "AND SERIAL_NUMBER LIKE ? ";
isCertificateSerialNumberProvided = true; isCertificateSerialNumberProvided = true;
} }
@ -83,7 +83,7 @@ public class PostgreSQLCertificateDAOImpl extends AbstractCertificateDAOImpl {
int paramIdx = 1; int paramIdx = 1;
stmt.setInt(paramIdx++, tenantId); stmt.setInt(paramIdx++, tenantId);
if (isCertificateSerialNumberProvided) { if (isCertificateSerialNumberProvided) {
stmt.setString(paramIdx++, serialNumber); stmt.setString(paramIdx++, "%" + serialNumber + "%");
} }
if (isCertificateDeviceIdentifierProvided) { if (isCertificateDeviceIdentifierProvided) {
stmt.setString(paramIdx++, deviceIdentifier); stmt.setString(paramIdx++, deviceIdentifier);
@ -136,7 +136,7 @@ public class PostgreSQLCertificateDAOImpl extends AbstractCertificateDAOImpl {
"WHERE TENANT_ID = ?"; "WHERE TENANT_ID = ?";
if (StringUtils.isNotEmpty(serialNumber)) { if (StringUtils.isNotEmpty(serialNumber)) {
sql += " AND SERIAL_NUMBER = ?"; sql += " AND SERIAL_NUMBER LIKE ?";
} }
if (StringUtils.isNotEmpty(deviceIdentifier)) { if (StringUtils.isNotEmpty(deviceIdentifier)) {
@ -144,7 +144,7 @@ public class PostgreSQLCertificateDAOImpl extends AbstractCertificateDAOImpl {
} }
if (StringUtils.isNotEmpty(username)) { if (StringUtils.isNotEmpty(username)) {
sql += " AND USERNAME ILIKE ?"; sql += " AND USERNAME LIKE ?";
} }
try (PreparedStatement stmt = conn.prepareStatement(sql)) { try (PreparedStatement stmt = conn.prepareStatement(sql)) {
@ -152,7 +152,7 @@ public class PostgreSQLCertificateDAOImpl extends AbstractCertificateDAOImpl {
int paramIdx = 2; int paramIdx = 2;
if (StringUtils.isNotEmpty(serialNumber)) { if (StringUtils.isNotEmpty(serialNumber)) {
stmt.setString(paramIdx++, serialNumber); stmt.setString(paramIdx++, "%" + serialNumber + "%");
} }
if (StringUtils.isNotEmpty(deviceIdentifier)) { if (StringUtils.isNotEmpty(deviceIdentifier)) {

8
components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/SQLServerCertificateDAOImpl.java
Unescape View File

@ -63,7 +63,7 @@ public class SQLServerCertificateDAOImpl extends AbstractCertificateDAOImpl {
"FROM DM_DEVICE_CERTIFICATE " + "FROM DM_DEVICE_CERTIFICATE " +
"WHERE TENANT_ID = ? "; "WHERE TENANT_ID = ? ";
if (StringUtils.isNotEmpty(serialNumber)) { if (StringUtils.isNotEmpty(serialNumber)) {
query += "AND SERIAL_NUMBER = ? "; query += "AND SERIAL_NUMBER LIKE ? ";
isCertificateSerialNumberProvided = true; isCertificateSerialNumberProvided = true;
} }
@ -83,7 +83,7 @@ public class SQLServerCertificateDAOImpl extends AbstractCertificateDAOImpl {
int paramIdx = 1; int paramIdx = 1;
stmt.setInt(paramIdx++, tenantId); stmt.setInt(paramIdx++, tenantId);
if (isCertificateSerialNumberProvided) { if (isCertificateSerialNumberProvided) {
stmt.setString(paramIdx++, serialNumber); stmt.setString(paramIdx++, "%" + serialNumber + "%");
} }
if (isCertificateDeviceIdentifierProvided) { if (isCertificateDeviceIdentifierProvided) {
stmt.setString(paramIdx++, deviceIdentifier); stmt.setString(paramIdx++, deviceIdentifier);
@ -136,7 +136,7 @@ public class SQLServerCertificateDAOImpl extends AbstractCertificateDAOImpl {
"WHERE TENANT_ID = ?"; "WHERE TENANT_ID = ?";
if (StringUtils.isNotEmpty(serialNumber)) { if (StringUtils.isNotEmpty(serialNumber)) {
sql += " AND SERIAL_NUMBER = ?"; sql += " AND SERIAL_NUMBER LIKE ?";
} }
if (StringUtils.isNotEmpty(deviceIdentifier)) { if (StringUtils.isNotEmpty(deviceIdentifier)) {
@ -152,7 +152,7 @@ public class SQLServerCertificateDAOImpl extends AbstractCertificateDAOImpl {
int paramIdx = 2; int paramIdx = 2;
if (StringUtils.isNotEmpty(serialNumber)) { if (StringUtils.isNotEmpty(serialNumber)) {
stmt.setString(paramIdx++, serialNumber); stmt.setString(paramIdx++, "%" + serialNumber + "%");
} }
if (StringUtils.isNotEmpty(deviceIdentifier)) { if (StringUtils.isNotEmpty(deviceIdentifier)) {

Write Preview
Loading…
Cancel
Save