perfsonar development work

Author: nordunet.behrmann
Date: 2012-09-11 08:41:38 +0100 (Tue, 11 Sep 2012)
New Revision: 5999

Modified:
   
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/nmwg/OwampAggregationDatum.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/ComponentsConfigurationReader.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/Scheduler.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/actions/SchedulerAction.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/StringBufferUtilities.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/xquery/lookupService/GenericXQueryExpression.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrResponse.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/DataRequest.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LinkRequest.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/Request.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHTTPAccess.java
Log:
Use Java 5 style string handling

Modified: 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/nmwg/OwampAggregationDatum.java
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/nmwg/OwampAggregationDatum.java
  2012-09-11 07:41:36 UTC (rev 5998)
+++ 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/nmwg/OwampAggregationDatum.java
  2012-09-11 07:41:38 UTC (rev 5999)
@@ -290,7 +290,7 @@
                else if(attr.equals("ttl")) {
                        setTTL(value);
                }               
-               else if (attr.indexOf("xmlns") >= 0) {
+               else if (attr.contains("xmlns")) {
                        if (attr.split(":").length == 1) {
                                if (nss.getURI("") == null) {
                                        nss.declarePrefix("", value);

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/ComponentsConfigurationReader.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/ComponentsConfigurationReader.java
  2012-09-11 07:41:36 UTC (rev 5998)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/ComponentsConfigurationReader.java
  2012-09-11 07:41:38 UTC (rev 5999)
@@ -34,7 +34,7 @@
             String trimmed = line.trim();
             if ((trimmed.length() > 0) && // not empty
                     (!trimmed.startsWith("#")) && // not a comment
-                    (trimmed.indexOf("=") != -1) // contains EQ sign
+                    (trimmed.contains("=")) // contains EQ sign
             ) {
                 // split by [spaces]=[spaces]
                 String[] tokens = trimmed.split("(\\ |\\t)*\\=(\\ |\\t)*", 
2);

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/Scheduler.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/Scheduler.java
 2012-09-11 07:41:36 UTC (rev 5998)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/Scheduler.java
 2012-09-11 07:41:38 UTC (rev 5999)
@@ -216,8 +216,8 @@
            
            logger.debug("Scheduler.readSchedules: reading schedules from xml 
db repository using XPath");
            
-           String queryForSchedules = new 
String("//*:parameters/*:parameter[@name='Repetetion_Seconds'"
 +
-                       " and 
text()='"+scheduleSeconds+"']/ancestor::*:metadata");
+           String queryForSchedules = 
"//*:parameters/*:parameter[@name='Repetetion_Seconds'"
 +
+            " and text()='" + scheduleSeconds + "']/ancestor::*:metadata";
            
            logger.debug("Scheduler.readSchedules: reading schedules from " +
                        "xml db repository using XPath expression: 
"+queryForSchedules);
@@ -283,8 +283,8 @@
                logger.debug("Scheduler.readSchedules: Schedule metadata 
points " +
                                "to a metadata with id: 
"+leafMetadataIds[itr]);
                
-               String queryForLeafMetadataContent = 
-                   new 
String("/*:message/*:metadata[@id='"+leafMetadataIds[itr]+"']");
+               String queryForLeafMetadataContent =
+                
"/*:message/*:metadata[@id='"
 + leafMetadataIds[itr] + "']";
                //StringDataQuery queryForLeafMetadataContent = new 
StringDataQuery("//*:metadata[@id='meta2']");
                
                String[] metadataLeafResults = (String[]) 
storageManager.fetch(queryForLeafMetadataContent);
@@ -347,7 +347,7 @@
                    
                    if(nextNodeIdRef!=null) {
                        
-                       String queryForNextMetadataContent = new 
String("/*:message/*:metadata[@id='"+nextNodeIdRef+"']");
+                       String queryForNextMetadataContent = 
"/*:message/*:metadata[@id='"
 + nextNodeIdRef + "']";
                        
                        String[] nextMetadataResults = (String[]) 
storageManager.fetch(queryForNextMetadataContent);
                        

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/actions/SchedulerAction.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/actions/SchedulerAction.java
   2012-09-11 07:41:36 UTC (rev 5998)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/scheduler/actions/SchedulerAction.java
   2012-09-11 07:41:38 UTC (rev 5999)
@@ -158,10 +158,8 @@
                 
                 String eventTypeClassName = eventTypeString.concat("_class");
                 String eventTypeInterfaceName = 
eventTypeString.concat("_interface");
-                
-                eventTypeClassName = new 
String("SchedulerAction.").concat(eventTypeClassName);
-                eventTypeInterfaceName = new 
String("SchedulerAction.").concat(eventTypeInterfaceName);
-                
+                eventTypeClassName = 
"SchedulerAction.".concat(eventTypeClassName);
+                eventTypeInterfaceName = 
"SchedulerAction.".concat(eventTypeInterfaceName);
                 String handlerClassName = null;
                
                 try {

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/StringBufferUtilities.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/StringBufferUtilities.java
        2012-09-11 07:41:36 UTC (rev 5998)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/iptrie/StringBufferUtilities.java
        2012-09-11 07:41:38 UTC (rev 5999)
@@ -14,7 +14,7 @@
 public class StringBufferUtilities {
 
     public static String getContents(String fileName) {
-        StringBuffer contents = new StringBuffer();
+        StringBuilder contents = new StringBuilder();
 
         BufferedReader input = null;
         try {

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/xquery/lookupService/GenericXQueryExpression.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/xquery/lookupService/GenericXQueryExpression.java
      2012-09-11 07:41:36 UTC (rev 5998)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/xquery/lookupService/GenericXQueryExpression.java
      2012-09-11 07:41:38 UTC (rev 5999)
@@ -285,7 +285,7 @@
         }
         
         public String getXQueryCondition(String prefix) {
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             if (getConditionType() == IS) {
                 sb.append("(");
                 if (prefix!=null) sb.append(prefix);

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrResponse.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrResponse.java
       2012-09-11 07:41:36 UTC (rev 5998)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrResponse.java
       2012-09-11 07:41:38 UTC (rev 5999)
@@ -77,7 +77,7 @@
                }
 
         if (et != null) {
-            if (et.getEventType().trim().indexOf("success.as.attr") != -1) {
+            if (et.getEventType().trim().contains("success.as.attr")) {
                        res.setStatus(AttrResponse.ATTR_BAD_RESPONSE);
                        res.setResultCode(et.getEventType());
             }

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/DataRequest.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/DataRequest.java
     2012-09-11 07:41:36 UTC (rev 5998)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/DataRequest.java
     2012-09-11 07:41:38 UTC (rev 5999)
@@ -34,7 +34,7 @@
 
     public DataRequest()
         throws PerfSONARException{
-        type = new String("DataRequest");
+        type = "DataRequest";
     }
 
     // ---------------------------------- protected methods

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LinkRequest.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LinkRequest.java
     2012-09-11 07:41:36 UTC (rev 5998)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/LinkRequest.java
     2012-09-11 07:41:38 UTC (rev 5999)
@@ -33,7 +33,7 @@
     public LinkRequest() throws PerfSONARException {
 
         super();
-        type = new String("LinkRequest");
+        type = "LinkRequest";
     }
 
 

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/Request.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/Request.java
 2012-09-11 07:41:36 UTC (rev 5998)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/messages/Request.java
 2012-09-11 07:41:38 UTC (rev 5999)
@@ -55,7 +55,7 @@
 
     public Request() throws PerfSONARException {
 
-        type = new String("Request");
+        type = "Request";
 
         // get a logger
         logger = (LoggerComponent)AuxiliaryComponentManager.

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
     2012-09-11 07:41:36 UTC (rev 5998)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
     2012-09-11 07:41:38 UTC (rev 5999)
@@ -232,7 +232,7 @@
         //for every single summary get XML
         for (ServiceSummary s :summaries.values()) {
             
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             
             sb.append("<nmwg:metadata id=\"summmary.md.1\" ");
             sb.append(XMLNS_DEF); //add namespace definition (important!)
@@ -249,15 +249,15 @@
                 
                 sb.append("    <nmtl3:network>\n");
                 sb.append("      <nmtl3:subnet>\n");
-                sb.append("        <nmtl3:address 
type=\"ipv4\">"+ipvals[0]+"</nmtl3:address>\n");
-                sb.append("        
<nmtl3:netmask>"+ipvals[1]+"</nmtl3:netmask>\n");
+                sb.append("        <nmtl3:address 
type=\"ipv4\">").append(ipvals[0]).append("</nmtl3:address>\n");
+                sb.append("        
<nmtl3:netmask>").append(ipvals[1]).append("</nmtl3:netmask>\n");
                 sb.append("      </nmtl3:subnet>\n");
                 sb.append("    </nmtl3:network>\n");
             }
             
             for (String dom : s.domains) {
                 sb.append("    <nmtb:domain>\n");
-                sb.append("      <nmtb:name 
type=\"dns\">"+dom+"</nmtb:name>\n");
+                sb.append("      <nmtb:name 
type=\"dns\">").append(dom).append("</nmtb:name>\n");
                 sb.append("    </nmtb:domain>\n");
             }
             
@@ -277,11 +277,11 @@
             if (paramsSum>0) {
                 sb.append("  <summary:parameters id=\"summmary.md.1\">\n");
                 for (String evt : s.eventTypes) {
-                    sb.append("    <nmwg:parameter name=\"eventType\" 
value=\""+evt+"\" />\n");
+                    sb.append("    <nmwg:parameter name=\"eventType\" 
value=\"").append(evt).append("\" />\n");
                     //sb.append("    <nmwg:parameter 
name=\"eventType\">"+evt+"</nmwg:parameter>\n");
                 }
                 for (String kw : s.keywords) {
-                    sb.append("    <nmwg:parameter name=\"keyword\" 
value=\""+kw+"\" />\n");
+                    sb.append("    <nmwg:parameter name=\"keyword\" 
value=\"").append(kw).append("\" />\n");
                     //sb.append("    <nmwg:parameter 
name=\"keyword\">"+kw+"</nmwg:parameter>\n");
                 }
                 sb.append("  </summary:parameters>\n");
@@ -569,7 +569,7 @@
 
         public String toString() {
             
-            StringBuffer sb = new StringBuffer();
+            StringBuilder sb = new StringBuilder();
             
             sb.append("1. eventTypes:\n");
             for (String s:eventTypes) { 

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHTTPAccess.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHTTPAccess.java
       2012-09-11 07:41:36 UTC (rev 5998)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/storage/xmldb/exist/rest/ExistDbHTTPAccess.java
       2012-09-11 07:41:38 UTC (rev 5999)
@@ -147,7 +147,7 @@
         boolean exResult = false;
         
         //read each line
-        StringBuffer response = new StringBuffer();
+        StringBuilder response = new StringBuilder();
         ArrayList<String> responseList = new ArrayList<String>();
         
         String str;