dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #37311
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19100: simplified collection merging for now, added collection test
------------------------------------------------------------
revno: 19100
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-05-07 14:12:52 +0700
message:
simplified collection merging for now, added collection test
added:
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/merge/SimpleCollection.java
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultMergeService.java
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/MergeServiceTest.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-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultMergeService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultMergeService.java 2015-05-07 06:27:49 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultMergeService.java 2015-05-07 07:12:52 +0000
@@ -55,45 +55,29 @@
}
Schema schema = schemaService.getDynamicSchema( source.getClass() );
+ System.err.println( "p: " + schema.getPropertyMap().keySet() );
for ( Property property : schema.getProperties() )
{
if ( property.isCollection() )
{
- Collection<?> sourceObject = ReflectionUtils.invokeMethod( source, property.getGetterMethod() );
+ Collection sourceObject = ReflectionUtils.invokeMethod( source, property.getGetterMethod() );
+ Collection targetObject = ReflectionUtils.invokeMethod( target, property.getGetterMethod() );
if ( sourceObject == null )
{
continue;
}
- sourceObject.clear();
-
- if ( property.isOwner() )
- {
- if ( property.isManyToMany() )
- {
- Collection targetObject = ReflectionUtils.invokeMethod( target, property.getGetterMethod() );
- sourceObject.addAll( targetObject );
- }
- else
- {
- // one-to-many
- }
- }
- else
- {
- if ( property.isManyToMany() )
- {
- Schema owningSchema = schemaService.getDynamicSchema( property.getItemKlass() );
- }
- else
- {
- // one-to-many
- }
- }
-
- ReflectionUtils.invokeMethod( source, property.getSetterMethod(), sourceObject );
+ if ( targetObject == null )
+ {
+ targetObject = ReflectionUtils.newCollectionInstance( property.getKlass() );
+ }
+
+ targetObject.clear();
+ targetObject.addAll( sourceObject );
+
+ ReflectionUtils.invokeMethod( target, property.getSetterMethod(), targetObject );
}
else
{
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/MergeServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/MergeServiceTest.java 2015-05-07 06:39:25 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/MergeServiceTest.java 2015-05-07 07:12:52 +0000
@@ -31,6 +31,7 @@
import org.hisp.dhis.DhisSpringTest;
import org.hisp.dhis.common.MergeStrategy;
import org.hisp.dhis.dxf2.metadata.merge.Simple;
+import org.hisp.dhis.dxf2.metadata.merge.SimpleCollection;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -81,4 +82,21 @@
Assert.assertEquals( date, target.getDate() );
Assert.assertEquals( true, target.getBool() );
}
+
+ @Test
+ public void simpleCollection()
+ {
+ Date date = new Date();
+
+ SimpleCollection source = new SimpleCollection( "source" );
+ source.getSimples().add( new Simple( "simple", 10, date, false ) );
+ source.getSimples().add( new Simple( "simple", 20, date, false ) );
+ source.getSimples().add( new Simple( "simple", 30, date, false ) );
+
+ SimpleCollection target = new SimpleCollection( "target" );
+
+ mergeService.merge( source, target, MergeStrategy.MERGE );
+
+ Assert.assertEquals( 3, target.getSimples().size() );
+ }
}
=== added file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/merge/SimpleCollection.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/merge/SimpleCollection.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/merge/SimpleCollection.java 2015-05-07 07:12:52 +0000
@@ -0,0 +1,80 @@
+package org.hisp.dhis.dxf2.metadata.merge;
+
+/*
+ * 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 com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
+ */
+public class SimpleCollection
+{
+ private String name;
+
+ private List<Simple> simples = new ArrayList<>();
+
+ public SimpleCollection()
+ {
+ }
+
+ public SimpleCollection( String name )
+ {
+ this.name = name;
+ }
+
+ @JsonProperty
+ @JacksonXmlProperty
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName( String name )
+ {
+ this.name = name;
+ }
+
+ @JsonProperty
+ @JacksonXmlProperty( localName = "simple" )
+ @JacksonXmlElementWrapper( localName = "simples" )
+ public List<Simple> getSimples()
+ {
+ return simples;
+ }
+
+ public void setSimples( List<Simple> simples )
+ {
+ this.simples = simples;
+ }
+}
