perfsonar development work

Author: mac
Date: 2009-03-10 10:59:00 -0400 (Tue, 10 Mar 2009)
New Revision: 5051

Modified:
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/registration/ExistDBRegisterDataSource.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/registration/GenericLSRegistrator.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/registration/LSRegistrator.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/registration/RegisterDataSource.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/scheduler/SchedulingComponent.java
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/storage/xml/XMLDBComponent.java
   
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/CommonExistDAOImpl.java
Log:
Changes that should eliminate the possibility of Null Pointer Exception after 
Roman's getOption change.
Some other changes: formatting, imports removed, comments

Modified: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
        2009-03-10 14:36:15 UTC (rev 5050)
+++ 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
        2009-03-10 14:59:00 UTC (rev 5051)
@@ -55,21 +55,15 @@
     protected void checkAuth(Configuration c, String messageType) throws 
PerfSONARException {
        String authR = "no";
        String authN = "no";
-       try {
-               authR = 
c.getMessageHandler(messageType).getOption("authR").getValue();
-       } catch (PerfSONARException e) {
-       }
-       try {
-               authN = 
c.getMessageHandler(messageType).getOption("authN").getValue();
-       } catch (PerfSONARException e) {
-       }
+        authR = 
c.getMessageHandler(messageType).getOption("authR").getValue();
+        authN = 
c.getMessageHandler(messageType).getOption("authN").getValue();
        logger.debug("Checking authorization: "+authR);
        logger.debug("Checking authentication: "+authN);
-       if (authR.equals("yes")) {
+       if ("yes".equals(authR)) {
                AuthNComponent authComponent = 
(AuthNComponent)c.getAuxiliaryComponent("auth");
                authComponent.requestAuthR(messageType, null);
        }
-       else if (authN.equals("yes")) {
+       else if ("yes".equals(authN)) {
                AuthNComponent authComponent = 
(AuthNComponent)c.getAuxiliaryComponent("auth");
                authComponent.requestAuthN(messageType);
        }

Modified: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/registration/ExistDBRegisterDataSource.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/registration/ExistDBRegisterDataSource.java
        2009-03-10 14:36:15 UTC (rev 5050)
+++ 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/registration/ExistDBRegisterDataSource.java
        2009-03-10 14:59:00 UTC (rev 5051)
@@ -4,22 +4,20 @@
  */
 package org.perfsonar.base2.service.registration;
 
-import org.perfsonar.base2.service.configuration.ConfigurationManager;
+import java.util.Collection;
+
 import org.perfsonar.base2.service.configuration.Configuration;
+import org.perfsonar.base2.service.configuration.ConfigurationManager;
+import org.perfsonar.base2.service.exceptions.PerfSONARException;
 import org.perfsonar.base2.service.requesthandler.ServiceMessage;
 import org.perfsonar.base2.service.storage.xml.XMLDBComponent;
 import org.perfsonar.base2.service.storage.xml.XMLDBResult;
 import org.perfsonar.base2.service.storage.xml.exist.ExistHTTPDataStorage;
-import 
org.perfsonar.base2.service.storage.xml.exist.ExtendedExistHTTPDataStorage;
-import org.perfsonar.base2.service.exceptions.PerfSONARException;
 import org.perfsonar.base2.xml.Element;
 import org.perfsonar.base2.xml.nmwg.Message;
 
-import java.util.Collection;
 
-//import org.apache.log4j.Logger;
 
-
 public class ExistDBRegisterDataSource implements RegisterDataSource {
 
 

Modified: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/registration/GenericLSRegistrator.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/registration/GenericLSRegistrator.java
     2009-03-10 14:36:15 UTC (rev 5050)
+++ 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/registration/GenericLSRegistrator.java
     2009-03-10 14:59:00 UTC (rev 5051)
@@ -41,8 +41,7 @@
     public ServiceMessage deregister(Key key, URL lsUrl) 
         throws PerfSONARException {
 
-        //TODO
-        return null;
+        throw new PerfSONARException("error/not_implemented","Action 
deregister is not implemented yet");
 
     }
 
@@ -50,8 +49,7 @@
     public ServiceMessage update(Key key, URL lsUrl) 
         throws PerfSONARException {
 
-        //TODO
-        return null;
+        throw new PerfSONARException("error/not_implemented","Action update 
is not implemented yet");
 
     }
 

Modified: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/registration/LSRegistrator.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/registration/LSRegistrator.java
    2009-03-10 14:36:15 UTC (rev 5050)
+++ 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/registration/LSRegistrator.java
    2009-03-10 14:59:00 UTC (rev 5051)
@@ -4,32 +4,30 @@
  */
 package org.perfsonar.base2.service.registration;
 
-import org.perfsonar.base2.service.requesthandler.ServiceMessage;
-import org.perfsonar.base2.service.configuration.LookupInformation;
-import org.perfsonar.base2.service.exceptions.PerfSONARException;
+import java.net.URL;
 
+import org.perfsonar.base2.service.exceptions.PerfSONARException;
+import org.perfsonar.base2.service.requesthandler.ServiceMessage;
 import org.perfsonar.base2.xml.Element;
-import org.perfsonar.base2.xml.nmwg.Message;
 import org.perfsonar.base2.xml.nmwg.Key;
+import org.perfsonar.base2.xml.nmwg.Message;
 
-import java.net.URL;
 
-
 public interface LSRegistrator {
 
 
     public ServiceMessage register(Message requestMessage, URL lsUrl) 
         throws PerfSONARException;
 
-
+    //TODO: why Key, not String?
     public ServiceMessage deregister(Key key, URL lsUrl) 
         throws PerfSONARException;
 
-
+    //TODO: why Key, not String?    
     public ServiceMessage update(Key key, URL lsUrl) 
         throws PerfSONARException;
 
-
+    //TODO: why Key, not String?
     public ServiceMessage keepalive(Element key, URL lsUrl) 
         throws PerfSONARException;
 

Modified: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/registration/RegisterDataSource.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/registration/RegisterDataSource.java
       2009-03-10 14:36:15 UTC (rev 5050)
+++ 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/registration/RegisterDataSource.java
       2009-03-10 14:59:00 UTC (rev 5051)
@@ -3,7 +3,6 @@
 import org.perfsonar.base2.service.requesthandler.ServiceMessage;
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
 
-
 public interface RegisterDataSource {
 
     public ServiceMessage getRegisterData() throws PerfSONARException;

Modified: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/scheduler/SchedulingComponent.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/scheduler/SchedulingComponent.java
 2009-03-10 14:36:15 UTC (rev 5050)
+++ 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/scheduler/SchedulingComponent.java
 2009-03-10 14:59:00 UTC (rev 5051)
@@ -50,10 +50,10 @@
         String intervalStr = getOption("interval").getValue();
         try {
             interval = Integer.parseInt(intervalStr);
-        } catch (NumberFormatException nfex) {
+        } catch (Exception ex) {
             logger
                     .warn("Can not get correct interval value for scheduling 
from the configuration. "
-                            + " Default value is taken.");
+                            + " Default value is taken. Nester exception is: 
"+ex.getMessage());
             interval = DEFAULT_INTERVAL;
         }
 
@@ -146,6 +146,9 @@
                             "interval").getValue());
                     
                 } catch (Exception ex) {
+                    //NullPointer if no option
+                    //or
+                    //NumberFormatException
                     ex.printStackTrace();
                 }
                 scheduler.addTask(actionInterval, (SchedulerAction) action);

Modified: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/storage/xml/XMLDBComponent.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/storage/xml/XMLDBComponent.java
    2009-03-10 14:36:15 UTC (rev 5050)
+++ 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/storage/xml/XMLDBComponent.java
    2009-03-10 14:59:00 UTC (rev 5051)
@@ -57,10 +57,14 @@
 
     protected boolean loadSettings() throws PerfSONARException {
 
-        dataStorageClassName = getOption("dataStorageClassName").getValue();
-        uri = getOption("uri").getValue();
-        username = getOption("username").getValue();
-        password = getOption("password").getValue();
+        try {
+            dataStorageClassName = 
getOption("dataStorageClassName").getValue();
+            uri = getOption("uri").getValue();
+            username = getOption("username").getValue();
+            password = getOption("password").getValue();
+        } catch (Exception ex) {
+            throw new PerfSONARException("error/xmldb/no_settings", "Cannot 
load XML DB settings from configuration file");
+        }
         return true;
     }
     

Modified: 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/CommonExistDAOImpl.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/CommonExistDAOImpl.java
 2009-03-10 14:36:15 UTC (rev 5050)
+++ 
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/storage/exist/CommonExistDAOImpl.java
 2009-03-10 14:59:00 UTC (rev 5051)
@@ -169,15 +169,19 @@
     // --------------------------------------------------------- from 
Component
     
     public void init() throws PerfSONARException {
+        try {
+            String existConfigComponent = 
getOption("exist-config").getValue();
+            XMLDBComponent xmlDbComponent = 
+                (XMLDBComponent) 
ConfigurationManager.getInstance().getConfiguration().
+                getAuxiliaryComponent(existConfigComponent);
+            
+            setDataCollection(xmlDbComponent.getUri());
+            setDataCredential(xmlDbComponent.getCredential());
+        } catch (Exception ex) {
+            throw new PerfSONARException("error/xmldb", 
+                    "LS Exist DAO cannot load settings. exist-config 
configuration block is missing or wrong setting");
+        }
         
-        String existConfigComponent = getOption("exist-config").getValue();
-        XMLDBComponent xmlDbComponent = 
-            (XMLDBComponent) 
ConfigurationManager.getInstance().getConfiguration().
-            getAuxiliaryComponent(existConfigComponent);
-        
-        setDataCollection(xmlDbComponent.getUri());
-        setDataCredential(xmlDbComponent.getCredential());
-        
     }