NIHVIVO-1510 Moved check for valid config for collated property to a separate method.

webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java

@@ -36,13 +36,9 @@ public class CollatedObjectPropertyTemplateModel extends ObjectPropertyTemplateM
         
         super(op, subject, vreq); 
         
-        /* Make sure the query contains a subclass variable. If not, throw an exception so the caller will create
+        if ( ! validConfigurationForCollatedProperty() ) {
-         * an UncollatedObjectPropertyTemplateModel instead.
+            throw new InvalidConfigurationException("Invalid configuration for property " + op.getURI() + 
-         */
+                                                    ": Query does not select a subclass variable."); 
-        String queryString = getQueryString();
-        Matcher m = QUERY_PATTERN.matcher(queryString);
-        if ( ! m.find()) { 
-            throw new InvalidConfigurationException("Invalid configuration: Query does not select a subclass variable."); 
         }
 
         /* Get the data */
@@ -70,6 +66,19 @@ public class CollatedObjectPropertyTemplateModel extends ObjectPropertyTemplateM
         subclasses.putAll(unsortedSubclasses);        
     }
     
+    private boolean validConfigurationForCollatedProperty() {
+        boolean validConfig = true;
+        
+        // Make sure the query selects a ?subclass variable. 
+        String queryString = getQueryString();
+        Matcher m = QUERY_PATTERN.matcher(queryString);
+        if ( ! m.find() ) { 
+            validConfig = false;
+        }    
+        
+        return validConfig;
+    }
+    
     private Map<String, List<ObjectPropertyStatementTemplateModel>> collate(String subjectUri, 
             String propertyUri, List<Map<String, String>> statementData, VitroRequest vreq) {
     

webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java

@@ -65,7 +65,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
             try {
                 return new CollatedObjectPropertyTemplateModel(op, subject, vreq);
             } catch (InvalidConfigurationException e) {
-                log.error(e, e);
+                log.error(e);
                 return new UncollatedObjectPropertyTemplateModel(op, subject, vreq);
             }
         } else {