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

Resolve comments

Browse Source
This commit is contained in:
osh 2023-07-05 22:38:10 +05:30
parent b978e31ab0
commit dae8c09761
4 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/config/Extension.java
View File

@ -88,8 +88,7 @@ public class Extension {
SubscriptionManager, SubscriptionManager,
VisibilityManager, VisibilityManager,
ApplicationStorageManager, ApplicationStorageManager,
PlatformStorageManager, PlatformStorageManager
MetadataManagementService
} }
} }

1
components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/vpp/GenericVppApplicationDAOImpl.java
View File

@ -458,7 +458,6 @@ public class GenericVppApplicationDAOImpl extends AbstractDAOImpl implements Vp
stmt.setString(5, vppAssociationDTO.getPricingParam()); stmt.setString(5, vppAssociationDTO.getPricingParam());
stmt.setInt(6, vppAssociationDTO.getId()); stmt.setInt(6, vppAssociationDTO.getId());
stmt.setLong(7, tenantId); stmt.setLong(7, tenantId);
stmt.executeUpdate();
if (stmt.executeUpdate() == 1) { if (stmt.executeUpdate() == 1) {
return vppAssociationDTO; return vppAssociationDTO;
} }

23
components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/APIUtil.java
View File

@ -27,7 +27,6 @@ import io.entgra.device.mgt.core.application.mgt.core.serviceprovider.ISServiceP
import io.entgra.device.mgt.core.application.mgt.core.exception.BadRequestException; import io.entgra.device.mgt.core.application.mgt.core.exception.BadRequestException;
import io.entgra.device.mgt.core.application.mgt.core.exception.UnexpectedServerErrorException; import io.entgra.device.mgt.core.application.mgt.core.exception.UnexpectedServerErrorException;
import io.entgra.device.mgt.core.device.mgt.common.metadata.mgt.MetadataManagementService; import io.entgra.device.mgt.core.device.mgt.common.metadata.mgt.MetadataManagementService;
import io.entgra.device.mgt.core.device.mgt.core.internal.DeviceManagementDataHolder;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -117,23 +116,19 @@ public class APIUtil {
} }
public static MetadataManagementService getMetadataManager() { public static MetadataManagementService getMetadataManager() {
try { if (metadataManagementService == null) {
if (metadataManagementService == null) { synchronized (APIUtil.class) {
synchronized (APIUtil.class) { if (metadataManagementService == null) {
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
metadataManagementService =
(MetadataManagementService) ctx.getOSGiService(MetadataManagementService.class, null);
if (metadataManagementService == null) { if (metadataManagementService == null) {
metadataManagementService = ApplicationManagementUtil.getDeviceManagerInstance(); String msg = "MetadataManagement Manager service has not initialized.";
if (metadataManagementService == null) { log.error(msg);
String msg = "MetadataManagement Service service has not initialized."; throw new IllegalStateException(msg);
log.error(msg);
throw new IllegalStateException(msg);
}
} }
} }
} }
} catch (Exception e) {
String msg = "Error occurred while getting the vpp manager";
log.error(msg);
throw new IllegalStateException(msg);
} }
return metadataManagementService; return metadataManagementService;
} }

8
components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/ApplicationManagementUtil.java
View File

@ -210,14 +210,6 @@ public class ApplicationManagementUtil {
// TODO: implement as an extension // TODO: implement as an extension
return new VppApplicationManagerImpl(); return new VppApplicationManagerImpl();
} }
public static MetadataManagementService getDeviceManagerInstance() throws InvalidConfigurationException {
ConfigurationManager configurationManager = ConfigurationManager.getInstance();
Extension extension = configurationManager.getExtension(Extension.Name.MetadataManagementService);
return getInstance(extension, MetadataManagementService.class);
}
/** /**
* This is useful to delete application artifacts if any error occurred while creating release/application * This is useful to delete application artifacts if any error occurred while creating release/application
* after uploading the artifacts * after uploading the artifacts