Changeset 5543

Timestamp:

08/08/14 12:02:07 (10 years ago)

Author:

Twan Goosen

Message:

Made VC validator stateless, factory no longer needed.
Preparing for #607

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main

Files:

• java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionRegistry.java (modified) (5 diffs)
• java/eu/clarin/cmdi/virtualcollectionregistry/service/VirtualCollectionValidatorFactory.java (deleted)
• java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/VirtualCollectionValidatorImpl.java (modified) (4 diffs)
• webapp/WEB-INF/applicationContext.xml (modified) (1 diff)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionRegistry.java

@@ -10 +10 @@
 import eu.clarin.cmdi.virtualcollectionregistry.query.ParsedQuery;
 import eu.clarin.cmdi.virtualcollectionregistry.service.VirtualCollectionValidator;
-import eu.clarin.cmdi.virtualcollectionregistry.service.VirtualCollectionValidatorFactory;
 import java.security.Principal;
 import java.util.Date;
@@ -35 +34 @@
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
@@ -47 +47 @@
     private OAIProvider oaiProvider;
     @Autowired
-    private VirtualCollectionValidatorFactory validatorFactory;
+    @Qualifier("creation")
+    private VirtualCollectionValidator validator;
     @Autowired
     private AdminUsersService adminUsersService;
@@ -112 +113 @@
         logger.debug("creating virtual collection");
 
-        VirtualCollectionValidator validator = validatorFactory.createValidator();
         validator.validate(vc);
         try {
@@ -153 +153 @@
         logger.debug("updating virtual collection (id={})", id);
 
-        VirtualCollectionValidator validator = validatorFactory.createValidator();
         validator.validate(vc);
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/VirtualCollectionValidatorImpl.java

@@ -2 +2 @@
 
 import eu.clarin.cmdi.virtualcollectionregistry.service.VirtualCollectionValidator;
-import eu.clarin.cmdi.virtualcollectionregistry.VirtualCollectionRegistryException;
 import eu.clarin.cmdi.virtualcollectionregistry.VirtualCollectionRegistryUsageException;
 import eu.clarin.cmdi.virtualcollectionregistry.model.Creator;
@@ -13 +12 @@
 import java.util.List;
 import java.util.Set;
-import static org.springframework.beans.factory.config.ConfigurableBeanFactory.SCOPE_PROTOTYPE;
-import org.springframework.beans.factory.config.ServiceLocatorFactoryBean;
-import org.springframework.context.annotation.Scope;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 /**
- * A virtual collection validator. Scoped prototype, because it carries state.
- * Use a factory (e.g. dynamically generated using
- * {@link ServiceLocatorFactoryBean}) to get new instances within a singleton.
+ * A virtual collection validator. Reusable and thread safe.
  *
  * @author twagoo
  */
 @Service
-@Scope(value = SCOPE_PROTOTYPE)
+@Qualifier("creation")
 public class VirtualCollectionValidatorImpl implements VirtualCollectionValidator {
-
-    private final Set<Creator> uniqueCreators = new HashSet<Creator>(16);
-    private final Set<String> uniqueResourceRefs = new HashSet<String>(512);
 
     @Override
@@ -39 +31 @@
         }
 
-        // reset internal state
-        reset();
+        final Set<Creator> uniqueCreators = new HashSet<Creator>(16);
+        final Set<String> uniqueResourceRefs = new HashSet<String>(512);
 
         // proceed to validate ...
@@ -136 +128 @@
     }
 
-    private void reset() {
-        uniqueCreators.clear();
-        uniqueResourceRefs.clear();
-    }
-
 } // class VirtualCollectionValidator

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/webapp/WEB-INF/applicationContext.xml

@@ -24 +24 @@
         <!--<property name="location" value="classpath:vcr-defaults.properties"/>-->
     </bean>
-
-    <!-- 
-    Will generate a factory for virtual collection validator, based on the 
-    prototype bean for the VirtualCollectionValidator implementation
-    see http://docs.spring.io/spring/docs/4.0.5.RELEASE/javadoc-api/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.html
-    -->
-    <bean id="validatorFactory"
-          class="org.springframework.beans.factory.config.ServiceLocatorFactoryBean">
-        <property name="serviceLocatorInterface" value="eu.clarin.cmdi.virtualcollectionregistry.service.VirtualCollectionValidatorFactory"/>
-    </bean>
                 
 </beans>