prathabanKavin
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'kernel-4.6.2' into 'master'

Browse Source 
removed unwanted todos

See merge request entgra/carbon-device-mgt!825
temp
Pahansith Gunathilake 3 years ago
parent 91990141c5 fbc255b7a8
commit 51cf354f4a
10 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File

1
components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/src/main/java/org/wso2/carbon/apimgt/application/extension/APIManagementProviderServiceImpl.java
Unescape View File

@ -148,7 +148,6 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
for (API apiInfo : apisWithTag) {
String id = apiInfo.getId().getProviderName().replace("@", "-AT-")
+ "-" + apiInfo.getId().getName() + "-" + apiInfo.getId().getVersion();
// todo: amalka will this break old apis?
boolean subscriptionExist = false;
if (subscribedAPIs.size() > 0) {
for (SubscribedAPI subscribedAPI : subscribedAPIs) {

4
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceEventManagementService.java
Unescape View File

@ -69,7 +69,6 @@ import javax.ws.rs.core.Response;
@Consumes(MediaType.APPLICATION_JSON)
public interface DeviceEventManagementService {
//todo:amalka
// @POST
// @Path("/{type}")
// @ApiOperation(
@ -181,7 +180,6 @@ public interface DeviceEventManagementService {
"ios, and windows.", required = false)
@PathParam("type")String deviceType);
//todo:amalka
// @GET
// @Path("/{type}/{deviceId}")
// @ApiOperation(
@ -244,7 +242,6 @@ public interface DeviceEventManagementService {
// @ApiParam(name = "limit", value = "limit of the records that needs to be picked up", required = false)
// @QueryParam("limit") int limit);
//todo:amalka
// @GET
// @Path("last-known/{type}/{deviceId}")
// @ApiOperation(
@ -301,7 +298,6 @@ public interface DeviceEventManagementService {
// @ApiParam(name = "limit", value = "limit of the records that needs to be picked up", required = false)
// @QueryParam("limit") int limit);
//todo:amalka
// @GET
// @Path("filter/{type}/{parameter}")
// @ApiOperation(

3
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GeoLocationBasedService.java
Unescape View File

@ -99,7 +99,6 @@ public interface GeoLocationBasedService {
/**
* Retrieve Analytics for the device type
*/
//todo:amalka
// @GET
// @Path("stats/{deviceType}/{deviceId}")
// @ApiOperation(
@ -724,7 +723,6 @@ public interface GeoLocationBasedService {
/**
* Retrieve Geo alerts history
*/
//todo:amalka
// @GET
// @Path("alerts/history/{deviceType}/{deviceId}")
// @ApiOperation(
@ -794,7 +792,6 @@ public interface GeoLocationBasedService {
/**
* Retrieve Geo alerts history for geo clusters
*/
//todo:amalka
// @GET
// @Path("alerts/history")
// @ApiOperation(

3
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceAgentServiceImpl.java
Unescape View File

@ -277,7 +277,6 @@ public class DeviceAgentServiceImpl implements DeviceAgentService {
i++;
}
// todo: amalka: commented data publishing
// if (DeviceMgtAPIUtils.getEventPublisherService().publishEvent(DeviceMgtAPIUtils.getStreamDefinition(type
// , PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain())
// , Constants.DEFAULT_STREAM_VERSION, metaData
@ -378,7 +377,7 @@ public class DeviceAgentServiceImpl implements DeviceAgentService {
i++;
}
// todo: amalka: commented data publishing
// if (DeviceMgtAPIUtils.getEventPublisherService().publishEvent(DeviceMgtAPIUtils.getStreamDefinition(type
// , PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain())
// , Constants.DEFAULT_STREAM_VERSION, metaData

8
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceEventManagementServiceImpl.java
Unescape View File

@ -58,7 +58,7 @@ public class DeviceEventManagementServiceImpl implements DeviceEventManagementSe
private static final String MQTT_CONTENT_VALIDATOR = "default";
private static final String TIMESTAMP_FIELD_NAME = "_timestamp";
//todo:amalka
// private static AnalyticsDataAPI getAnalyticsDataAPI() {
// PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
// AnalyticsDataAPI analyticsDataAPI =
@ -173,7 +173,6 @@ public class DeviceEventManagementServiceImpl implements DeviceEventManagementSe
/**
* Deploy Event Stream, Receiver, Publisher and Store Configuration.
*/
//todo:amalka
// @POST
// @Path("/{type}")
// @Override
@ -328,7 +327,6 @@ public class DeviceEventManagementServiceImpl implements DeviceEventManagementSe
/**
* Returns device specific data for the give period of time.
*/
//todo:amalka
// @GET
// @Path("/{type}/{deviceId}")
// @Override
@ -383,7 +381,7 @@ public class DeviceEventManagementServiceImpl implements DeviceEventManagementSe
* Returns last known data points up to the limit if limit is specified. Otherwise returns last known data point.
* Limit parameter needs to be zero or positive.
*/
//todo:amalka
// @GET
// @Path("/last-known/{type}/{deviceId}")
// @Override
@ -595,7 +593,7 @@ public class DeviceEventManagementServiceImpl implements DeviceEventManagementSe
}
}
//todo:amalka
// private void publishEventStore(String streamName, String version, EventAttributeList eventAttributes)
// throws RemoteException, UserStoreException, JWTClientException,
// EventStreamPersistenceAdminServiceEventStreamPersistenceAdminServiceExceptionException {

4
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/CredentialManagementResponseBuilder.java
Unescape View File

@ -63,7 +63,7 @@ public class CredentialManagementResponseBuilder {
username = CarbonContext.getThreadLocalCarbonContext().getUsername();
userStoreManager.updateCredential(username, credentials.getNewPassword(),
credentials.getOldPassword());
//todo:amalka
// DeviceMgtAPIUtils.getIntegrationClientService().resetUserInfo(username,
// PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain());
return Response.status(Response.Status.OK).entity("UserImpl password by username: " +
@ -108,7 +108,7 @@ public class CredentialManagementResponseBuilder {
new ErrorResponse.ErrorResponseBuilder().setMessage(errorMsg).build()).build();
}
userStoreManager.updateCredentialByAdmin(username, credentials.getNewPassword());
//todo:amalka
// DeviceMgtAPIUtils.getIntegrationClientService().resetUserInfo(username,
// PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain());
return Response.status(Response.Status.OK).entity("UserImpl password by username: " +

1
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/DeviceMgtAPIUtils.java
Unescape View File

@ -616,7 +616,6 @@ public class DeviceMgtAPIUtils {
return username;
}
// todo: amalka: commented
// public static EventsPublisherService getEventPublisherService() {
// PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
// EventsPublisherService eventsPublisherService =

5
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/device/details/mgt/impl/DeviceInformationManagerImpl.java
Unescape View File

@ -169,7 +169,7 @@ public class DeviceInformationManagerImpl implements DeviceInformationManager {
deviceInfo.getAvailableRAMMemory(),
deviceInfo.isPluggedIn()
};
//todo:amalka
// DeviceManagerUtil.getEventPublisherService().publishEvent(
// DEVICE_INFO_EVENT_STREAM_DEFINITION, "1.0.0", metaData, new Object[0], payload
// );
@ -185,7 +185,6 @@ public class DeviceInformationManagerImpl implements DeviceInformationManager {
DeviceManagementDAOFactory.rollbackTransaction();
throw new DeviceDetailsMgtException("Error occurred while updating the last update timestamp of the " +
"device", e);
//todo:amalka
// } catch (DataPublisherConfigurationException e) {
// throw new DeviceDetailsMgtException("Error occurred while publishing the device location information.", e);
} finally {
@ -382,7 +381,6 @@ public class DeviceInformationManagerImpl implements DeviceInformationManager {
deviceLocation.getBearing(),
deviceLocation.getDistance()
};
//todo:amalka
// DeviceManagerUtil.getEventPublisherService().publishEvent(
// LOCATION_EVENT_STREAM_DEFINITION, "1.0.0", metaData, new Object[0], payload
// );
@ -397,7 +395,6 @@ public class DeviceInformationManagerImpl implements DeviceInformationManager {
} catch (DeviceManagementException e) {
DeviceManagementDAOFactory.rollbackTransaction();
throw new DeviceDetailsMgtException("Error occurred while getting the device information.", e);
//todo:amalka
// } catch (DataPublisherConfigurationException e) {
// DeviceManagementDAOFactory.rollbackTransaction();
// throw new DeviceDetailsMgtException("Error occurred while publishing the device location information.", e);

6
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
Unescape View File

@ -1966,7 +1966,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
operation.getStatus() != null ? operation.getStatus().toString() : null,
operation.getOperationResponse()
};
//todo:amalka
// DeviceManagerUtil.getEventPublisherService().publishEvent(
// OPERATION_RESPONSE_EVENT_STREAM_DEFINITION, "1.0.0", metaData, new Object[0], payload
// );
@ -1976,7 +1976,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
String msg = "Error occurred while reading configs.";
log.error(msg, e);
throw new OperationManagementException(msg, e);
//todo:amalka
} //catch (DataPublisherConfigurationException e) {
// String msg = "Error occurred while publishing event.";
// log.error(msg, e);
@ -2010,7 +2010,6 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
operation.getStatus() != null ? operation.getStatus().toString() : null,
operation.getOperationResponse()
};
//todo:amalka
// DeviceManagerUtil.getEventPublisherService().publishEvent(
// OPERATION_RESPONSE_EVENT_STREAM_DEFINITION, "1.0.0", metaData, new Object[0], payload
// );
@ -2020,7 +2019,6 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
String msg = "Error occurred while reading configs.";
log.error(msg, e);
throw new OperationManagementException(msg, e);
//todo:amalka
} //catch (DataPublisherConfigurationException e) {
// String msg = "Error occurred while publishing event.";
// log.error(msg, e);

3
components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authorizer/MatchingResource.java
Unescape View File

@ -1,8 +1,5 @@
package org.wso2.carbon.webapp.authenticator.framework.authorizer;
/**
* Created by amalka on 6/26/21.
*/
public class MatchingResource {
private String urlPattern;
private String permission;

Write Preview
Loading…
Cancel
Save