Changeset 8173

Timestamp:

21/03/12 12:46:22 (9 years ago)

Author:

mnagni

Message:

Corrected a bug which caused the ListNames? to be not correctly retrieved.
Some refactoring

Location:

mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services

Files:

• discovery/basic/DiscoveryDictionaryDPWS.java (modified) (1 diff)
• jpa/ListNames.java (modified) (1 diff)
• revitalization/ejb/discovery/DiscoveryService.java (modified) (5 diffs)
• revitalization/ejb/discovery/SearchHelper.java (modified) (4 diffs)
• revitalization/ejb/interfaces/DiscoveryServiceLocal.java (modified) (1 diff)
• revitalization/ejb/interfaces/DiscoveryServiceRemote.java (modified) (1 diff)
• revitalization/executor/DiscoveryServiceExecutor.java (modified) (2 diffs)

mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/discovery/basic/DiscoveryDictionaryDPWS.java

@@ -153 +153 @@
          * */
         public static ListNamesItem getRecordDetails(String label) throws NdgExecutionException{
-                return getListNameItem("RecordDetailsList", label);             
+                return getListNameItem("RecordDetailList", label);              
         }               
         

mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/jpa/ListNames.java

@@ -81 +81 @@
                 this.listNamesItems = listNamesItems;
         }
+
+        @Override
+        public String toString() {
+                return "ListNames [name=" + name + ", label=" + label + "]";
+        }
 }

mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/revitalization/ejb/discovery/DiscoveryService.java

@@ -31 +31 @@
 import javax.sql.DataSource;
 
-import ndg.common.exception.AssembleQueryException;
 import ndg.common.exception.NdgException;
 import ndg.common.exception.NdgExecutionException;
 import ndg.common.exception.NdgSQLException;
-import ndg.common.exception.ResourceNotAvailable;
 import ndg.services.jpa.ListNames;
 import ndg.services.jpa.ListNamesItem;
@@ -100 +98 @@
                 Query query = em.createNamedQuery("findListNamesByLabel");
                 query.setParameter("label", label);
-                return ListNames.class.cast(query.getSingleResult());
+                return executeSingleResult(query, ListNames.class); 
         }
         
         @Override
-        public ListNames getNamesListByName(String name) throws NoResultException {
+        public ListNames getNamesListByName(String name) {
                 Query query = em.createNamedQuery("findListNamesByName");
                 query.setParameter("name", name);
-                return ListNames.class.cast(query.getSingleResult());
+                return executeSingleResult(query, ListNames.class);
         }       
 
@@ -114 +112 @@
                 Query query = em.createNamedQuery("findListNamesItemByLabel");
                 query.setParameter("label", label);
-                return ListNamesItem.class.cast(query.getSingleResult());
+                return executeSingleResult(query, ListNamesItem.class); 
         }
         
@@ -121 +119 @@
                 Query query = em.createNamedQuery("findLisNamesItemtByName");
                 query.setParameter("name", name);
-                return ListNamesItem.class.cast(query.getSingleResult());
+                return executeSingleResult(query, ListNamesItem.class);
         }       
         
@@ -129 +127 @@
                 query.setParameter("listName", listName);
                 query.setParameter("itemName", itemName);
-                return ListNamesItem.class.cast(query.getSingleResult());
+                return executeSingleResult(query, ListNamesItem.class);         
         }       
         

mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/revitalization/ejb/discovery/SearchHelper.java

@@ -8 +8 @@
 import java.util.Comparator;
 import java.util.List;
-
-import javax.persistence.NoResultException;
 
 import ndg.common.TermParser;
@@ -107 +105 @@
         private List<OriginalDocument> searchDocuments(DoSearchType doSearchType) throws NdgExecutionException, AssembleQueryException, NdgSQLException, ResourceNotAvailable {
                 List<OriginalDocument> res = new ArrayList<OriginalDocument>();         
-                        List<String> toFilter = executeSearch(conn, assembleSearch(doSearchType));
+                List<String> toFilter = executeSearch(conn, assembleSearch(doSearchType));
 
                         /* -- sets the number of hits -- */
@@ -194 +192 @@
                 TermSearchType newTS = null;
                 ObjectFactory of = new ObjectFactory();         
-                ListNames listNames = null;
-                try {
-                        listNames = EJBBeanFactory.getDiscoveryService().getNamesListByName(DiscoveryDictionaryDPWS.TERM_TARGET);
-                } catch (NoResultException ex) {
-                        return retList;
+                ListNames listNames = EJBBeanFactory.getDiscoveryService().getNamesListByName(DiscoveryDictionaryDPWS.TERM_TARGET);
+                
+                if (listNames == null) {
+                        throw new NdgExecutionException("No TermTargetsList exists");
                 }
                  
@@ -263 +260 @@
                         try {
                                 listNamesItem = EJBBeanFactory.getDiscoveryService().getNamesListItemByLabel(termType.getTermTarget());
-                        } catch (NoResultException e) {
-                                throw new AssembleQueryException(e);
                         } catch (NdgExecutionException e) {
                                 throw new AssembleQueryException(e);
+                        }
+                        
+                        if (listNamesItem == null) {
+                                throw new AssembleQueryException("Required TermTarget does not exist");
                         }
                         //logHelper.logMessage("Search term - TermTarget: " + term + " - " + termTarget, Level.DEBUG);

mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/revitalization/ejb/interfaces/DiscoveryServiceLocal.java

@@ -53 +53 @@
         
         public List<ListNames> getAllNamesList();
-        public ListNames getNamesListByLabel(String label) throws NoResultException;
-        public ListNames getNamesListByName(String name) throws NoResultException;      
-        public ListNamesItem getNamesListItemByLabel(String label) throws NoResultException;
-        public ListNamesItem getNamesListItemByName(String name) throws NoResultException;
-        public ListNamesItem getListNamesItemByParentAndName(String listName, String itemName) throws NoResultException;        
+        public ListNames getNamesListByLabel(String label);
+        public ListNames getNamesListByName(String name);       
+        public ListNamesItem getNamesListItemByLabel(String label);
+        public ListNamesItem getNamesListItemByName(String name);
+        public ListNamesItem getListNamesItemByParentAndName(String listName, String itemName); 
 }

mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/revitalization/ejb/interfaces/DiscoveryServiceRemote.java

@@ -53 +53 @@
 
         public List<ListNames> getAllNamesList();
-        public ListNames getNamesListByLabel(String label) throws NoResultException;
-        public ListNames getNamesListByName(String name) throws NoResultException;      
-        public ListNamesItem getNamesListItemByLabel(String label) throws NoResultException;
-        public ListNamesItem getNamesListItemByName(String name) throws NoResultException;      
-        public ListNamesItem getListNamesItemByParentAndName(String listName, String itemName) throws NoResultException;        
+        public ListNames getNamesListByLabel(String label);
+        public ListNames getNamesListByName(String name);       
+        public ListNamesItem getNamesListItemByLabel(String label);
+        public ListNamesItem getNamesListItemByName(String name);       
+        public ListNamesItem getListNamesItemByParentAndName(String listName, String itemName); 
 }

mauRepo/revitalizationProject/branches/MEDIN/dpws/src/main/java/ndg/services/revitalization/executor/DiscoveryServiceExecutor.java

@@ -5 +5 @@
 import java.util.ArrayList;
 import java.util.List;
+
+import javax.persistence.NoResultException;
 
 import ndg.common.MessageFormatter;
@@ -191 +193 @@
                 try {
                         listNames = EJBBeanFactory.getDiscoveryService().getNamesListByLabel(name);
-                        status = true;                  
                 } catch (NdgExecutionException e) {
                         statusMsg = "Generic Error";
                 }
-                for (ListNamesItem item : listNames.getListNamesItems()) {
-                        response.getList().getListMember().add(ListNamesItem.class.cast(item).getLabel());
-                }
-                
+
+                if (listNames != null) {
+                        for (ListNamesItem item : listNames.getListNamesItems()) {
+                                response.getList().getListMember().add(ListNamesItem.class.cast(item).getLabel());
+                        }
+                        status = true;
+                } else {
+                        statusMsg = "No results";
+                }
+
                 response.setStatus(status);
                 response.setStatusMessage(statusMsg);