[jboss-cvs] JBossAS SVN: r111694 - branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent.

[jboss-cvs-commits at lists.jboss.org]

Author: thauser at redhat.com
Date: 2011-06-29 13:07:51 -0400 (Wed, 29 Jun 2011)
New Revision: 111694

Modified:
   branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/RequestHandlerImpl.java
Log:
merging changes from mobicents; factor out BindEntry internal class

Modified: branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/RequestHandlerImpl.java
===================================================================
--- branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/RequestHandlerImpl.java	2011-06-29 17:07:30 UTC (rev 111693)
+++ branches/snmp4j-int/varia/src/main/java/org/jboss/jmx/adaptor/snmp/agent/RequestHandlerImpl.java	2011-06-29 17:07:51 UTC (rev 111694)
@@ -73,12 +73,10 @@
 public class RequestHandlerImpl extends RequestHandlerSupport
    implements Reconfigurable
 {
-	// Protected Data ------------------------------------------------
+	public static final String NO_ENTRY_FOUND_FOR_OID = "No bind entry found for oid ";
+	public static final String SKIP_ENTRY = " - skipping entry";
 
-	private static final String NO_ENTRY_FOUND_FOR_OID = "No bind entry found for oid ";
-	private static final String SKIP_ENTRY = " - skipping entry";
-
-
+	// Protected Data ------------------------------------------------
 	/** Bindings from oid to mbean */
 	protected SortedMap<OID, BindEntry> bindings = new TreeMap<OID, BindEntry>();
 	
@@ -93,7 +91,6 @@
 	/** Has this RequestHandler instance been initialized? */
 	private boolean initialized = false;
 
-
 	// Constructors --------------------------------------------------
 
 	/**
@@ -635,35 +632,6 @@
    }
 	
 	/**
-	 * hacked together method that iterates through a list of object names and adds metrics to the 
-	 * bind entry set 
-	 * @param mbeanNames Set of ObjectNames associated with a wildcard ObjectName
-	 * @param attrs List of attributes that we want to know about for each entry in mbeanNames
-	 * @param oidPrefix the oidPrefix for each of these, because Ideally we are creating a table.
-	 */
-	
-	private void createTableRows(Set<ObjectName> mbeanNames, List<MappedAttribute> attrs, String tableOid){
-		ArrayList<String> onameStrings = new ArrayList<String>(1);
-		for (ObjectName oname : mbeanNames){
-			onameStrings.add(oname.toString());
-		}
-		for (String mbeanRealName : onameStrings){
-			for (MappedAttribute ma : attrs){
-				String oid;
-				if (tableOid != null){
-					oid = tableOid + ma.getOid();
-					addObjectEntry(new OID(tableOid));
-				}else{
-					oid = ma.getOid();
-					OID objectOID = new OID(oid);
-					addObjectEntry(objectOID.trim());
-				}
-				addBindEntry(oid, mbeanRealName, ma.getName(), ma.isReadWrite());
-			}
-		}
-	}
-
-	/**
 	 * @param mappings
 	 */
 	public void addAttributeMappings(List<ManagedBean> mappings) {