jdk-sandbox: comparison src/java.management.rest/share/classes/com/oracle/jmx/remote/rest/http/MBeanCollectionResource.java

equal deleted inserted replaced

-:90cff2ac77b8
+:352a4f213fc6
 * questions.
 */
 package com.oracle.jmx.remote.rest.http;
+import com.oracle.jmx.remote.rest.json.JSONArray;
 import com.oracle.jmx.remote.rest.json.JSONElement;
 import com.oracle.jmx.remote.rest.json.JSONObject;
+import com.oracle.jmx.remote.rest.json.JSONPrimitive;
 import com.oracle.jmx.remote.rest.json.parser.JSONParser;
 import com.oracle.jmx.remote.rest.json.parser.ParseException;
 import com.oracle.jmx.remote.rest.mapper.JSONMapper;
 import com.oracle.jmx.remote.rest.mapper.JSONMappingException;
 import com.oracle.jmx.remote.rest.mapper.JSONMappingFactory;
 import javax.management.*;
 import javax.management.remote.rest.PlatformRestAdapter;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
-import java.net.HttpURLConnection;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 new MBeanResource(mBeanServer, objectName)));
 }
 @Override
 public void handle(HttpExchange exchange) throws IOException {
-String path = exchange.getRequestURI().getPath();
+String path = URLDecoder.decode(exchange.getRequestURI().getPath(), StandardCharsets.UTF_8.displayName());
 if (path.matches(pathPrefix + "/?$")) {
 RestResource.super.handle(exchange);
 } else if (path.matches(pathPrefix + "/[^/]+/?.*")) {
 // Extract mbean name
 // Forward the request to its corresponding rest resource
 }
 }
 @Override
 public HttpResponse doGet(HttpExchange exchange) {
-final String path = PlatformRestAdapter.getDomain()
-+ exchange.getRequestURI().getPath().replaceAll("/$", "");
 try {
+final String path = PlatformRestAdapter.getDomain()
++ URLDecoder.decode(exchange.getRequestURI().getPath(), StandardCharsets.UTF_8.displayName())
+.replaceAll("/$", "");
 List<ObjectName> filteredMBeans = allowedMbeans;
 Map<String, String> queryMap = HttpUtil.getGetRequestQueryMap(exchange);
 String query = exchange.getRequestURI().getQuery();
-if(query != null && queryMap.isEmpty()) {
+if (query != null && queryMap.isEmpty()) {
 return new HttpResponse(HttpResponse.BAD_REQUEST,
-"Invalid query params : Allowed query keys [query,page]");
+"Invalid query params : Allowed query keys [objectname,page]");
-}else if(query != null && !queryMap.isEmpty()) {
+} else if (query != null && !queryMap.isEmpty()) {
 Map<String, String> newMap = new HashMap<>(queryMap);
-newMap.remove("query");
+newMap.remove("objectname");
 newMap.remove("page");
-if(!newMap.isEmpty()) { // Invalid query params
+if (!newMap.isEmpty()) { // Invalid query params
 return new HttpResponse(HttpResponse.BAD_REQUEST,
-"Invalid query params : Allowed query keys [query,page]");
+"Invalid query params : Allowed query keys [objectname,page]");
 }
 }
-if (queryMap.containsKey("query")) {        // Filter based on ObjectName query
+if (queryMap.containsKey("objectname")) {        // Filter based on ObjectName query
 Set<ObjectName> queryMBeans = mBeanServer
-.queryNames(new ObjectName(queryMap.get("query")), null);
+.queryNames(new ObjectName(queryMap.get("objectname")), null);
 queryMBeans.retainAll(allowedMbeans);   // Intersection of two lists
 filteredMBeans = new ArrayList<>(queryMBeans);
 }
 JSONObject _links = HttpUtil.getPaginationLinks(exchange, filteredMBeans, pageSize);
 List<ObjectName> mbeanPage = HttpUtil.filterByPage(exchange, filteredMBeans, pageSize);
 List<Map<String, String>> items = new ArrayList<>(filteredMBeans.size());
-mbeanPage.forEach(objectName -> {
+for (ObjectName objectName : mbeanPage) {
-Map<String, String> item = new LinkedHashMap<>(2);
+Map<String, String> item = new LinkedHashMap<>();
 item.put("name", objectName.toString());
+MBeanResource mBeanResource = mBeanResourceMap.get(objectName.toString());
+try {
+JSONObject mBeanInfo = mBeanResource.getMBeanInfo(mBeanServer, objectName);
+JSONElement element = mBeanInfo.get("descriptor");
+if (element != null) {
+JSONElement element1 = ((JSONObject) element).get("interfaceClassName");
+if (element1 != null) {
+String intfName = (String) ((JSONPrimitive) element1).getValue();
+item.put("interfaceClassName", intfName);
+}
+}
+element = mBeanInfo.get("className");
+if (element != null) {
+String className = (String) ((JSONPrimitive) element).getValue();
+item.put("className", className);
+}
+element = mBeanInfo.get("description");
+if (element != null) {
+String description = (String) ((JSONPrimitive) element).getValue();
+item.put("description", description);
+}
+element = mBeanInfo.get("attributeInfo");
+if(element != null) {
+item.put("attributeCount", ((JSONArray)element).size() + "");
+}
+element = mBeanInfo.get("operationInfo");
+if(element != null) {
+item.put("operationCount", ((JSONArray)element).size() + "");
+}
+} catch (InstanceNotFoundException | IntrospectionException | ReflectionException e) {
+}
 String href = path + "/" + objectName.toString();
 href = HttpUtil.escapeUrl(href);
 item.put("href", href);
 items.add(item);
-});
+String info = HttpUtil.escapeUrl(href + "/info");
+item.put("info", info);
+}
 Map<String, String> properties = new HashMap<>();
 properties.put("mbeanCount", Integer.toString(filteredMBeans.size()));
 }
 }
 @Override
 public HttpResponse doPost(HttpExchange exchange) {
-String path = exchange.getRequestURI().getPath();
-String reqBody = null;
 try {
+String path = URLDecoder.decode(exchange.getRequestURI().getPath(),StandardCharsets.UTF_8.displayName());
+String reqBody = null;
 if (path.matches(pathPrefix + "/?$")) { // POST to current URL
 reqBody = HttpUtil.readRequestBody(exchange);
 if (reqBody == null || reqBody.isEmpty()) { // No Parameters
 return HttpResponse.BAD_REQUEST;
 }

branch	jmx-rest-api
changeset 56006	352a4f213fc6
parent 56002	60ab3b595a8e
child 56007	d6cbabcaf518