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

equal deleted inserted replaced

-:2db04c2274fd
+:054866e5113c
 private final MBeanServer mBeanServer;
 private final Map<String, MBeanResource> mBeanResourceMap = new ConcurrentHashMap<>();
 private static final int pageSize = 10;
 private static final String pathPrefix = "^/?jmx/servers/[a-zA-Z0-9\\-\\.]+/mbeans";
+// Only MXBean or any other MBean that uses types
+// that have a valid mapper functions
 private boolean isMBeanAllowed(ObjectName objName) {
 try {
 MBeanInfo mInfo = mBeanServer.getMBeanInfo(objName);
+// Return true for MXbean
+Descriptor desc = mInfo.getDescriptor();
+String isMxBean = (String) desc.getFieldValue("mxbean");
+if (isMxBean.equalsIgnoreCase("true"))
+return true;
+// Check attribute types
 MBeanAttributeInfo[] attrsInfo = mInfo.getAttributes();
 for (MBeanAttributeInfo attrInfo : attrsInfo) {
 String type = attrInfo.getType();
 if (!JSONMappingFactory.INSTANCE.isTypeMapped(type)) {
 return false;
 }
 }
+// Check operation parameters and return types
 MBeanOperationInfo[] operations = mInfo.getOperations();
 for (MBeanOperationInfo opInfo : operations) {
 MBeanParameterInfo[] signature = opInfo.getSignature();
 for (MBeanParameterInfo sig : signature) {
 if (!JSONMappingFactory.INSTANCE.isTypeMapped(sig.getType())) {
 if (!JSONMappingFactory.INSTANCE.isTypeMapped(opInfo.getReturnType())) {
 return false;
 }
 }
 return true;
-} catch (InstanceNotFoundException | IntrospectionException | ReflectionException | ClassNotFoundException ex) {
+} catch (InstanceNotFoundException | IntrospectionException |
+ReflectionException | ClassNotFoundException ex) {
 ex.printStackTrace();
 return false;
 }
 }
 public MBeanCollectionResource(MBeanServer mBeanServer) {
 this.mBeanServer = mBeanServer;
 allowedMbeans = new ArrayList<>();
 introspectMBeanTypes(mBeanServer);
 allowedMbeans = new CopyOnWriteArrayList<>(allowedMbeans);
+// Create a REST handler for each MBean
 allowedMbeans.forEach(objectName -> mBeanResourceMap.put(objectName.toString(),
 new MBeanResource(mBeanServer, objectName)));
 }
 @Override
 if (ss.indexOf('/') != -1) {
 mBeanName = ss.substring(0, ss.indexOf('/'));
 }
 MBeanResource mBeanResource = mBeanResourceMap.get(mBeanName);
 if (mBeanResource == null) {
-HttpUtil.sendResponse(exchange, new HttpResponse(404, "Not found"));
+HttpUtil.sendResponse(exchange, HttpResponse.REQUEST_NOT_FOUND);
 return;
 }
 mBeanResource.handle(exchange);
 }
 }
 }
 @Override
 public HttpResponse doGet(HttpExchange exchange) {
-// add links
+final String path = PlatformRestAdapter.getDomain()
++ exchange.getRequestURI().getPath().replaceAll("/$", "");
-final String path = PlatformRestAdapter.getDomain() + exchange.getRequestURI().getPath().replaceAll("\\/$", "");
+try {
-try {
+List<ObjectName> filteredMBeans = allowedMbeans;
-List<ObjectName> mbeans = allowedMbeans;
 Map<String, String> queryMap = HttpUtil.getGetRequestQueryMap(exchange);
-if (queryMap.containsKey("query")) {
+if (queryMap.containsKey("query")) {        // Filter based on ObjectName query
-Set<ObjectName> queryMBeans = mBeanServer.queryNames(new ObjectName(queryMap.get("query")), null);
+Set<ObjectName> queryMBeans = mBeanServer
-queryMBeans.retainAll(allowedMbeans);
+.queryNames(new ObjectName(queryMap.get("query")), null);
-mbeans = new ArrayList<>(queryMBeans);
+queryMBeans.retainAll(allowedMbeans);   // Intersection of two lists
-}
+filteredMBeans = new ArrayList<>(queryMBeans);
+}
-JSONObject _links = HttpUtil.getPaginationLinks(exchange, mbeans, pageSize);
-List<ObjectName> filteredMBeans = HttpUtil.filterByPage(exchange, mbeans, pageSize);
+JSONObject _links = HttpUtil.getPaginationLinks(exchange, filteredMBeans, pageSize);
+filteredMBeans = HttpUtil.filterByPage(exchange, filteredMBeans, pageSize);
 List<Map<String, String>> items = new ArrayList<>(filteredMBeans.size());
 filteredMBeans.forEach(objectName -> {
 Map<String, String> item = new LinkedHashMap<>(2);
 item.put("name", objectName.toString());
 String href = path + "/" + objectName.toString();
 items.add(item);
 });
 Map<String, String> properties = new HashMap<>();
-properties.put("mbeanCount", Integer.toString(mbeans.size()));
+properties.put("mbeanCount", Integer.toString(filteredMBeans.size()));
 JSONMapper typeMapper1 = JSONMappingFactory.INSTANCE.getTypeMapper(items);
 JSONMapper typeMapper2 = JSONMappingFactory.INSTANCE.getTypeMapper(properties);
 JSONElement linkElem = typeMapper1.toJsonValue(items);
 JSONElement propElem = typeMapper2.toJsonValue(properties);
 JSONObject jobj = new JSONObject();
+jobj.putAll((JSONObject) propElem);
+jobj.put("mbeans", linkElem);
 if (_links != null && !_links.isEmpty()) {
 jobj.put("_links", _links);
 }
+return new HttpResponse(jobj.toJsonString());
-jobj.putAll((JSONObject) propElem);
-jobj.put("items", linkElem);
-return new HttpResponse(200, jobj.toJsonString());
 } catch (JSONMappingException e) {
-return new HttpResponse(500, "Internal server error");
+return HttpResponse.SERVER_ERROR;
 } catch (UnsupportedEncodingException e) {
-return HttpResponse.SERVER_ERROR;
+return HttpResponse.BAD_REQUEST;
 } catch (MalformedObjectNameException e) {
 return new HttpResponse(HttpResponse.BAD_REQUEST, "Invalid query string");
 }
-}
-@Override
-public HttpResponse doPut(HttpExchange exchange) {
-return null;
 }
 @Override
 public HttpResponse doPost(HttpExchange exchange) {
 String path = exchange.getRequestURI().getPath();
 JSONObject jsonObject = (JSONObject) jsonElement;
 JSONObject result = new JSONObject();
 for (String mBeanName : jsonObject.keySet()) {
 MBeanResource mBeanResource = mBeanResourceMap.get(mBeanName);
-try {
+if (mBeanResource != null) {
-if (mBeanResource == null) {
-result.put(mBeanName, "Invalid MBean");
-} else {
 JSONElement element = jsonObject.get(mBeanName);
 if (element instanceof JSONObject) {
-JSONElement res = mBeanResource.handleBulkRequest(exchange, (JSONObject) element);
+JSONElement res = mBeanResource.handleBulkRequest
+((JSONObject) element);
 result.put(mBeanName, res);
 } else {
 result.put(mBeanName, "Invalid input");
 }
-}} catch (Throwable e) {
+} else {
-e.printStackTrace();
+result.put(mBeanName, "Invalid MBean");
 }
 }
-return new HttpResponse(HttpURLConnection.HTTP_OK, result.toJsonString());
+return new HttpResponse(result.toJsonString());
 } else {
 return HttpResponse.METHOD_NOT_ALLOWED;
 }
 } catch (ParseException e) {
 return new HttpResponse(HttpResponse.BAD_REQUEST, "Invalid JSON String for request body");
 } catch (IOException e) {
 return HttpResponse.BAD_REQUEST;
 }
 }
-@Override
-public HttpResponse doDelete(HttpExchange exchange) {
-return null;
-}
-@Override
-public HttpResponse doHead(HttpExchange exchange) {
-return null;
-}
 }

branch	jmx-rest-api
changeset 56000	054866e5113c
parent 55997	f881344569d9
child 56001	95c0323f0c1a