------------------------------------------------------------ revno: 21075 committer: Morten Olav Hansen <[email protected]> branch nick: dhis2 timestamp: Tue 2015-11-17 11:18:36 +0700 message: add AttributeValueStore added: dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeValueStore.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/hibernate/HibernateAttributeValueStore.java modified: dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeStore.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/hibernate/HibernateAttributeStore.java dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/attribute/AttributeValueStoreTest.java
-- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeStore.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeStore.java 2015-08-19 05:26:31 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeStore.java 2015-11-17 04:18:36 +0000 @@ -33,7 +33,7 @@ import org.hisp.dhis.common.GenericIdentifiableObjectStore; /** - * @author mortenoh + * @author Morten Olav Hansen <[email protected]> */ public interface AttributeStore extends GenericIdentifiableObjectStore<Attribute> === added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeValueStore.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeValueStore.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeValueStore.java 2015-11-17 04:18:36 +0000 @@ -0,0 +1,39 @@ +package org.hisp.dhis.attribute; + +/* + * Copyright (c) 2004-2015, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import org.hisp.dhis.common.GenericStore; + +/** + * @author Morten Olav Hansen <[email protected]> + */ +public interface AttributeValueStore + extends GenericStore<AttributeValue> +{ +} === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java 2015-08-19 05:26:31 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java 2015-11-17 04:18:36 +0000 @@ -28,17 +28,16 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import static org.hisp.dhis.i18n.I18nUtils.i18n; +import org.hisp.dhis.i18n.I18nService; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; -import org.hisp.dhis.common.GenericStore; -import org.hisp.dhis.i18n.I18nService; -import org.springframework.transaction.annotation.Transactional; +import static org.hisp.dhis.i18n.I18nUtils.i18n; /** - * @author mortenoh + * @author Morten Olav Hansen <[email protected]> */ @Transactional public class DefaultAttributeService @@ -55,9 +54,9 @@ this.attributeStore = attributeStore; } - private GenericStore<AttributeValue> attributeValueStore; + private AttributeValueStore attributeValueStore; - public void setAttributeValueStore( GenericStore<AttributeValue> attributeValueStore ) + public void setAttributeValueStore( AttributeValueStore attributeValueStore ) { this.attributeValueStore = attributeValueStore; } === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/hibernate/HibernateAttributeStore.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/hibernate/HibernateAttributeStore.java 2015-08-19 05:26:31 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/hibernate/HibernateAttributeStore.java 2015-11-17 04:18:36 +0000 @@ -37,7 +37,7 @@ import java.util.List; /** - * @author mortenoh + * @author Morten Olav Hansen <[email protected]> */ public class HibernateAttributeStore extends HibernateIdentifiableObjectStore<Attribute> === added file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/hibernate/HibernateAttributeValueStore.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/hibernate/HibernateAttributeValueStore.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/hibernate/HibernateAttributeValueStore.java 2015-11-17 04:18:36 +0000 @@ -0,0 +1,42 @@ +package org.hisp.dhis.attribute.hibernate; + +/* + * Copyright (c) 2004-2015, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import org.hisp.dhis.attribute.AttributeValue; +import org.hisp.dhis.attribute.AttributeValueStore; +import org.hisp.dhis.hibernate.HibernateGenericStore; + +/** + * @author Morten Olav Hansen <[email protected]> + */ +public class HibernateAttributeValueStore + extends HibernateGenericStore<AttributeValue> + implements AttributeValueStore +{ +} === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2015-11-16 22:52:04 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2015-11-17 04:18:36 +0000 @@ -339,7 +339,7 @@ <property name="cacheable" value="true" /> </bean> - <bean id="org.hisp.dhis.attribute.AttributeValueStore" class="org.hisp.dhis.hibernate.HibernateGenericStore"> + <bean id="org.hisp.dhis.attribute.AttributeValueStore" class="org.hisp.dhis.attribute.hibernate.HibernateAttributeValueStore"> <property name="sessionFactory" ref="sessionFactory" /> <property name="clazz" value="org.hisp.dhis.attribute.AttributeValue" /> <property name="cacheable" value="true" /> === modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/attribute/AttributeValueStoreTest.java' --- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/attribute/AttributeValueStoreTest.java 2015-11-16 05:51:35 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/attribute/AttributeValueStoreTest.java 2015-11-17 04:18:36 +0000 @@ -29,11 +29,10 @@ */ import org.hisp.dhis.DhisSpringTest; -import org.hisp.dhis.common.GenericStore; import org.hisp.dhis.common.ValueType; +import org.junit.Ignore; import org.junit.Test; - -import javax.annotation.Resource; +import org.springframework.beans.factory.annotation.Autowired; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -41,20 +40,22 @@ public class AttributeValueStoreTest extends DhisSpringTest { - @Resource( name = "org.hisp.dhis.attribute.AttributeValueStore" ) - private GenericStore<AttributeValue> attributeValueStore; + @Autowired + private AttributeValueStore attributeValueStore; - @Resource( name = "org.hisp.dhis.attribute.AttributeStore" ) + @Autowired private AttributeStore attributeStore; private AttributeValue attributeValue1; private AttributeValue attributeValue2; + private Attribute attribute1; + @Override protected void setUpTest() { - Attribute attribute1 = new Attribute(); + attribute1 = new Attribute(); attribute1.setName( "attribute_simple" ); attribute1.setValueType( ValueType.TEXT );
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
