From: <eri...@us...> - 2009-01-08 13:35:41
|
Revision: 1913 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=1913&view=rev Author: erikvaningen Date: 2009-01-08 13:35:36 +0000 (Thu, 08 Jan 2009) Log Message: ----------- Finished Dao for Service, ServiceBinding and SpecificationLink. Modified Paths: -------------- sandbox/3.0.x/geonetwork-domain-ebrim/src/main/java/org/geonetwork/domain/ebrim/informationmodel/service/Service.java sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/dao/ebrim/informationmodel/ServiceDao.java sandbox/3.0.x/geonetwork-persistence-ebrim/src/test/java/org/geonetwork/dao/ebrim/informationmodel/ServiceDaoTest.java sandbox/3.0.x/geonetwork-persistence-ebrim/src/test/java/org/geonetwork/dao/ebrim/provenance/ProvenanceSearchDaoTest.java Modified: sandbox/3.0.x/geonetwork-domain-ebrim/src/main/java/org/geonetwork/domain/ebrim/informationmodel/service/Service.java =================================================================== --- sandbox/3.0.x/geonetwork-domain-ebrim/src/main/java/org/geonetwork/domain/ebrim/informationmodel/service/Service.java 2009-01-08 13:26:21 UTC (rev 1912) +++ sandbox/3.0.x/geonetwork-domain-ebrim/src/main/java/org/geonetwork/domain/ebrim/informationmodel/service/Service.java 2009-01-08 13:35:36 UTC (rev 1913) @@ -29,25 +29,35 @@ /** * * @author Heikki Doeleman - * + * */ public class Service extends RegistryObject { + private Set<ServiceBinding> serviceBindings; + + public Set<ServiceBinding> getServiceBindings() { + return serviceBindings; + } + + public void setServiceBindings(Set<ServiceBinding> serviceBindings) { + this.serviceBindings = serviceBindings; + } + /** * For Jixb binding. + * * @return */ @SuppressWarnings("unused") private static Set<ServiceBinding> serviceBindingSetFactory() { return new HashSet<ServiceBinding>(); } - + @Override public int hashCode() { final int prime = 31; int result = super.hashCode(); - result = prime * result - + ((serviceBindings == null) ? 0 : serviceBindings.hashCode()); + result = prime * result + ((serviceBindings == null) ? 0 : serviceBindings.hashCode()); return result; } @@ -68,15 +78,4 @@ return true; } - private Set<ServiceBinding> serviceBindings; - - public Set<ServiceBinding> getServiceBindings() { - return serviceBindings; - } - - public void setServiceBindings(Set<ServiceBinding> serviceBindings) { - this.serviceBindings = serviceBindings; - } - - } Modified: sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/dao/ebrim/informationmodel/ServiceDao.java =================================================================== --- sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/dao/ebrim/informationmodel/ServiceDao.java 2009-01-08 13:26:21 UTC (rev 1912) +++ sandbox/3.0.x/geonetwork-persistence-ebrim/src/main/java/org/geonetwork/dao/ebrim/informationmodel/ServiceDao.java 2009-01-08 13:35:36 UTC (rev 1913) @@ -3,6 +3,8 @@ import java.util.List; import org.geonetwork.domain.ebrim.informationmodel.service.Service; +import org.geonetwork.domain.ebrim.informationmodel.service.ServiceBinding; +import org.geonetwork.domain.ebrim.informationmodel.service.SpecificationLink; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; /** @@ -39,4 +41,63 @@ return (Service) this.getHibernateTemplate().load(Service.class, id); } + + /** + * ServiceBinding + */ + public void saveServiceBinding(ServiceBinding serviceBinding) { + this.getHibernateTemplate().save(serviceBinding); + } + + public void mergeServiceBinding(ServiceBinding serviceBinding) { + this.getHibernateTemplate().merge(serviceBinding); + } + + public void deleteServiceBinding(ServiceBinding serviceBinding) { + this.getHibernateTemplate().delete(serviceBinding); + } + + @SuppressWarnings("unchecked") + public List<ServiceBinding> loadAllServiceBinding() { + return this.getHibernateTemplate().loadAll(ServiceBinding.class); + } + + public ServiceBinding findServiceBindingById(long id) { + return (ServiceBinding) this.getHibernateTemplate().load(ServiceBinding.class, id); + } + + + + + /** + * SpecificationLink + */ + public void saveSpecificationLink(SpecificationLink specificationLink) { + this.getHibernateTemplate().save(specificationLink); + } + + public void mergeSpecificationLink(SpecificationLink specificationLink) { + this.getHibernateTemplate().merge(specificationLink); + } + + public void deleteSpecificationLink(SpecificationLink specificationLink) { + this.getHibernateTemplate().delete(specificationLink); + } + + @SuppressWarnings("unchecked") + public List<SpecificationLink> loadAllSpecificationLink() { + return this.getHibernateTemplate().loadAll(SpecificationLink.class); + } + + public SpecificationLink findSpecificationLinkById(long id) { + return (SpecificationLink) this.getHibernateTemplate().load(SpecificationLink.class, id); + } + + + + + + + + } Modified: sandbox/3.0.x/geonetwork-persistence-ebrim/src/test/java/org/geonetwork/dao/ebrim/informationmodel/ServiceDaoTest.java =================================================================== --- sandbox/3.0.x/geonetwork-persistence-ebrim/src/test/java/org/geonetwork/dao/ebrim/informationmodel/ServiceDaoTest.java 2009-01-08 13:26:21 UTC (rev 1912) +++ sandbox/3.0.x/geonetwork-persistence-ebrim/src/test/java/org/geonetwork/dao/ebrim/informationmodel/ServiceDaoTest.java 2009-01-08 13:35:36 UTC (rev 1913) @@ -7,6 +7,7 @@ import org.geonetwork.dao.ebrim.provenance.DaoTestDelegate; import org.geonetwork.domain.ebrim.informationmodel.service.Service; import org.geonetwork.domain.ebrim.informationmodel.service.ServiceBinding; +import org.geonetwork.domain.ebrim.informationmodel.service.SpecificationLink; import org.geonetwork.domain.ebrim.test.utilities.service.ServiceBindingFactory; import org.geonetwork.domain.ebrim.test.utilities.service.ServiceFactory; @@ -28,17 +29,17 @@ public void testMergeService1() { Service service = ServiceFactory.create(); ServiceBinding serviceBinding = ServiceBindingFactory.create(); - Set <ServiceBinding> serviceBindings = new HashSet<ServiceBinding>(); - serviceBindings.add(serviceBinding); + Set<ServiceBinding> serviceBindings = new HashSet<ServiceBinding>(); + serviceBindings.add(serviceBinding); service.setServiceBindings(serviceBindings); assertEquals(0, serviceDao.loadAllService().size()); serviceDao.saveService(service); assertEquals(1, serviceDao.loadAllService().size()); - serviceBinding.getAccessURI().setValue("check"); + serviceBinding.getAccessURI().setValue("check"); serviceDao.mergeService(service); Service serviceFound = serviceDao.findServiceById(service.getHibernateId()); - ServiceBinding serviceBindingFound = serviceFound.getServiceBindings().iterator().next(); - assertEquals("check", serviceBindingFound.getAccessURI().getValue()); + ServiceBinding serviceBindingFound = serviceFound.getServiceBindings().iterator().next(); + assertEquals("check", serviceBindingFound.getAccessURI().getValue()); } public void testDeleteService() { @@ -49,4 +50,55 @@ new DaoTestDelegate(serviceDao).testfindById(Service.class); } + /** + * ServiceBinding + */ + public void testSaveServiceBinding() { + new DaoTestDelegate(serviceDao).testSave(ServiceBinding.class); + } + + public void testMergeServiceBinding1() { + new DaoTestDelegate(serviceDao).testMerge(ServiceBinding.class, "accessURI"); + } + + public void testMergeServiceBinding2() { + new DaoTestDelegate(serviceDao).testMerge(ServiceBinding.class, "service"); + } + + public void testMergeServiceBinding3() { + new DaoTestDelegate(serviceDao).testMerge(ServiceBinding.class, "targetBinding"); + } + + public void testDeleteServiceBinding() { + new DaoTestDelegate(serviceDao).testDelete(ServiceBinding.class); + } + + public void testfindServiceBindingById() { + new DaoTestDelegate(serviceDao).testfindById(ServiceBinding.class); + } + + /** + * SpecificationLink + */ + public void testSaveSpecificationLink() { + new DaoTestDelegate(serviceDao).testSave(SpecificationLink.class); + } + + public void testMergeSpecificationLink1() { + new DaoTestDelegate(serviceDao).testMerge(SpecificationLink.class, "serviceBinding"); + } + + public void testMergeSpecificationLink2() { + new DaoTestDelegate(serviceDao).testMerge(SpecificationLink.class, "specificationObject"); + } + + + public void testDeleteSpecificationLink() { + new DaoTestDelegate(serviceDao).testDelete(SpecificationLink.class); + } + + public void testfindSpecificationLinkById() { + new DaoTestDelegate(serviceDao).testfindById(SpecificationLink.class); + } + } Modified: sandbox/3.0.x/geonetwork-persistence-ebrim/src/test/java/org/geonetwork/dao/ebrim/provenance/ProvenanceSearchDaoTest.java =================================================================== --- sandbox/3.0.x/geonetwork-persistence-ebrim/src/test/java/org/geonetwork/dao/ebrim/provenance/ProvenanceSearchDaoTest.java 2009-01-08 13:26:21 UTC (rev 1912) +++ sandbox/3.0.x/geonetwork-persistence-ebrim/src/test/java/org/geonetwork/dao/ebrim/provenance/ProvenanceSearchDaoTest.java 2009-01-08 13:35:36 UTC (rev 1913) @@ -1,5 +1,7 @@ package org.geonetwork.dao.ebrim.provenance; +import java.util.List; + import junit.framework.TestCase; import org.geonetwork.domain.ebrim.exception.GeoNetworkException; @@ -34,6 +36,14 @@ emailAddress.getAddress().setValue(address); emailAddress.getType().setValue(type); + // make sure no email addresses do exist. + List<EmailAddress> list = provenanceDao.loadAllEmailAddress(); + for (EmailAddress emailAddresss : list) { + provenanceDao.deleteEmailAddress(emailAddresss); + } + + + assertEquals(0, provenanceDao.loadAllEmailAddress().size()); assertEquals(0, provenanceSearchDao.searchEmailAddressHql(searchTerm1).size()); assertEquals(0, provenanceSearchDao.searchEmailAddressHql(searchTerm2).size()); @@ -48,11 +58,16 @@ } public void testSearchEmailAddressLucene() throws GeoNetworkException { - ApplicationContext ac = new ClassPathXmlApplicationContext("applicationContext-hibernate-test.xml"); ProvenanceDao provenanceDao = (ProvenanceDao) ac.getBean("provenanceDao"); ProvenanceSearchDao provenanceSearchDao = (ProvenanceSearchDao) ac.getBean("provenanceSearchDao"); + // make sure no email addresses do exist. + List<EmailAddress> list = provenanceDao.loadAllEmailAddress(); + for (EmailAddress emailAddress : list) { + provenanceDao.deleteEmailAddress(emailAddress); + } + String address = "via della puta madre"; String type = "buona fide"; String searchTerm1 = "puta"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |