From 46738d1580f129a33f2360ef51b527825e06dfe1 Mon Sep 17 00:00:00 2001 From: ruwin Date: Thu, 18 Jul 2024 07:15:41 +0530 Subject: [PATCH] Remove three overrides causing installation failure This commit addresses an installation failure issue caused by three problematic overrides. The overrides of the following methods have been removed: - getOwnersWithDeviceIds(String s) - getOwnerWithDeviceByDeviceId(int i) - getDevicesByTenantId(int i) These overrides were causing conflicts during the installation process, leading to failures. Testing: - Verified successful installation on multiple environments. --- .../DeviceManagementProviderServiceMock.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/DeviceManagementProviderServiceMock.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/DeviceManagementProviderServiceMock.java index 3a6413ca0..c02f5e6ae 100644 --- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/DeviceManagementProviderServiceMock.java +++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/DeviceManagementProviderServiceMock.java @@ -927,16 +927,31 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv } @Override - public OwnerWithDeviceDTO getOwnersWithDeviceIds(String s) throws DeviceManagementDAOException { + public OwnerWithDeviceDTO getOwnersWithDeviceIds(String s, int i, String s1, String s2, String s3) throws DeviceManagementDAOException { return null; } @Override - public OwnerWithDeviceDTO getOwnerWithDeviceByDeviceId(int i) throws DeviceManagementDAOException { + public OwnerWithDeviceDTO getOwnerWithDeviceByDeviceId(int i, String s, String s1, String s2) throws DeviceManagementDAOException { return null; } @Override + public List getDevicesByTenantId(int i, int i1, String s, String s1) throws DeviceManagementDAOException { + return Collections.emptyList(); + } + + + public OwnerWithDeviceDTO getOwnersWithDeviceIds(String s) throws DeviceManagementDAOException { + return null; + } + + + public OwnerWithDeviceDTO getOwnerWithDeviceByDeviceId(int i) throws DeviceManagementDAOException { + return null; + } + + public List getDevicesByTenantId(int i) throws DeviceManagementDAOException { return Collections.emptyList(); }