Merge pull request #18 from tinawenqiao/dev

Fix a bug in matchattribute in complex attribute.

Author: gnuhpc

src/main/java/org/gnuhpc/bigdata/controller/CollectorController.java

@@ -1,6 +1,8 @@
 package org.gnuhpc.bigdata.controller;
 
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.extern.log4j.Log4j;
 import org.gnuhpc.bigdata.model.JMXMetricData;
 import org.gnuhpc.bigdata.model.JMXMetricDataV1;
@@ -12,7 +14,6 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
 import java.util.HashMap;
 import java.util.List;
 

src/main/java/org/gnuhpc/bigdata/model/JMXComplexAttribute.java

@@ -10,7 +10,7 @@ public class JMXComplexAttribute extends JMXAttribute {
 
   public JMXComplexAttribute(MBeanAttributeInfo attribute, ObjectName beanName, MBeanServerConnection connection) {
     super(attribute, beanName, connection);
-    this.subAttributeList = new HashMap<String, HashMap<String, Object>>();
+    this.subAttributeList = new HashMap<>();
   }
 
   @Override
@@ -118,6 +118,7 @@ private void populateSubAttributeList(Object attributeValue) {
 
   private boolean excludeMatchAttribute(JMXConfiguration configuration) {
     JMXFilter exclude = configuration.getExclude();
+    if (exclude == null) return false;
     if (exclude.getAttribute() != null && matchSubAttribute(exclude, getAttributeName(), false)) {
       return true;
     }

src/main/java/org/gnuhpc/bigdata/service/CollectorService.java

@@ -77,7 +77,7 @@ public List<JMXMetricData> collectJMXData(String jmxurl, JMXQuery jmxQuery) {
     for (String host : hostList) {
       JMXClient jmxClient = new JMXClient(host);
       Set<ObjectName> beans = new HashSet<>();
-      this.matchingAttributes = new LinkedList<JMXAttribute>();
+      this.matchingAttributes = new LinkedList<>();
       LinkedList<HashMap<String, Object>> metrics = new LinkedList<>();
       JMXMetricData jmxMetricData = new JMXMetricData(host, metrics);
       try {