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

removed method and type from feature

Browse Source
This commit is contained in:
ayyoob 2016-05-13 02:53:08 +05:30
parent ec7727e8bf
commit bee9a106cc
2 changed files with 36 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/AnnotationUtil.java
View File

@ -64,6 +64,7 @@ public class AnnotationUtil {
private static final String PACKAGE_ORG_SPRINGFRAMEWORK = "org.springframework"; private static final String PACKAGE_ORG_SPRINGFRAMEWORK = "org.springframework";
private static final String STRING_ARR = "string_arr"; private static final String STRING_ARR = "string_arr";
private static final String STRING = "string"; private static final String STRING = "string";
private static final String METHOD = "method";
private Class<org.wso2.carbon.device.mgt.extensions.feature.mgt.annotations.Feature> private Class<org.wso2.carbon.device.mgt.extensions.feature.mgt.annotations.Feature>
featureAnnotationClazz; featureAnnotationClazz;
private ClassLoader classLoader; private ClassLoader classLoader;
@ -147,8 +148,7 @@ public class AnnotationUtil {
Map<String, Object> apiParams = new HashMap<>(); Map<String, Object> apiParams = new HashMap<>();
for (int i = 0; i < annotations.length; i++) { for (int i = 0; i < annotations.length; i++) {
Annotation currentAnnotation = annotations[i]; Annotation currentAnnotation = annotations[i];
String method = processHttpMethodAnnotation(feature, currentAnnotation); processHttpMethodAnnotation(apiParams, currentAnnotation);
apiParams.put("method", method);
if (currentAnnotation.annotationType().getName().equals(Path.class.getName())) { if (currentAnnotation.annotationType().getName().equals(Path.class.getName())) {
String uri = getPathAnnotationValue(currentMethod); String uri = getPathAnnotationValue(currentMethod);
apiParams.put("uri", uri); apiParams.put("uri", uri);
@ -200,25 +200,20 @@ public class AnnotationUtil {
/** /**
* Read Method annotations indicating HTTP Methods * Read Method annotations indicating HTTP Methods
* @param feature
* @param currentAnnotation
* @return
*/ */
private String processHttpMethodAnnotation(Feature feature, Annotation currentAnnotation) { private void processHttpMethodAnnotation(Map<String, Object> apiParams, Annotation currentAnnotation) {
//Extracting method with which feature is exposed //Extracting method with which feature is exposed
String method = null;
if (currentAnnotation.annotationType().getName().equals(GET.class.getName())) { if (currentAnnotation.annotationType().getName().equals(GET.class.getName())) {
method = HttpMethod.GET; apiParams.put(METHOD, HttpMethod.GET);
} else if (currentAnnotation.annotationType().getName().equals(POST.class.getName())) { } else if (currentAnnotation.annotationType().getName().equals(POST.class.getName())) {
method = HttpMethod.POST; apiParams.put(METHOD, HttpMethod.POST);
} else if (currentAnnotation.annotationType().getName().equals(OPTIONS.class.getName())) { } else if (currentAnnotation.annotationType().getName().equals(OPTIONS.class.getName())) {
method = HttpMethod.OPTIONS; apiParams.put(METHOD, HttpMethod.OPTIONS);
} else if (currentAnnotation.annotationType().getName().equals(DELETE.class.getName())) { } else if (currentAnnotation.annotationType().getName().equals(DELETE.class.getName())) {
method = HttpMethod.DELETE; apiParams.put(METHOD, HttpMethod.DELETE);
} else if (currentAnnotation.annotationType().getName().equals(PUT.class.getName())) { } else if (currentAnnotation.annotationType().getName().equals(PUT.class.getName())) {
method = HttpMethod.PUT; apiParams.put(METHOD, HttpMethod.PUT);
} }
return method;
} }
/** /**

6
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/operation.js
View File

@ -45,9 +45,6 @@ var operationModule = function () {
var feature; var feature;
for (var i = 0; i < features.length; i++) { for (var i = 0; i < features.length; i++) {
feature = {}; feature = {};
if (features[i].type != operationType) {
continue;
} else if (features[i].type == 'monitor') {
var analyticStreams = utility.getDeviceTypeConfig(deviceType)["analyticStreams"]; var analyticStreams = utility.getDeviceTypeConfig(deviceType)["analyticStreams"];
if (analyticStreams) { if (analyticStreams) {
for (var stream in analyticStreams) { for (var stream in analyticStreams) {
@ -57,10 +54,9 @@ var operationModule = function () {
} }
} }
} }
}
feature["operation"] = features[i].code; feature["operation"] = features[i].code;
feature["name"] = features[i].name; feature["name"] = features[i].name;
feature["method"] = features[i].method;
feature["description"] = features[i].description; feature["description"] = features[i].description;
feature["deviceType"] = deviceType; feature["deviceType"] = deviceType;
feature["params"] = []; feature["params"] = [];