fix write boolean to default his default value: that was ignored
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1445272 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/modello-plugin-redback-registry/pom.xml b/modello-plugin-redback-registry/pom.xml
index c2a4576..42e8fc7 100644
--- a/modello-plugin-redback-registry/pom.xml
+++ b/modello-plugin-redback-registry/pom.xml
@@ -101,6 +101,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4jVersion}</version>
@@ -139,6 +144,7 @@
<systemPropertyVariables>
<registryVersion>${project.version}</registryVersion>
<slf4jVersion>${slf4jVersion}</slf4jVersion>
+ <springVersion>${springVersion}</springVersion>
</systemPropertyVariables>
</configuration>
</plugin>
diff --git a/modello-plugin-redback-registry/src/main/resources/org/apache/archiva/redback/components/registry/modello/RegistryWriter.java.vm b/modello-plugin-redback-registry/src/main/resources/org/apache/archiva/redback/components/registry/modello/RegistryWriter.java.vm
index 8a6c023..f3abc55 100644
--- a/modello-plugin-redback-registry/src/main/resources/org/apache/archiva/redback/components/registry/modello/RegistryWriter.java.vm
+++ b/modello-plugin-redback-registry/src/main/resources/org/apache/archiva/redback/components/registry/modello/RegistryWriter.java.vm
@@ -62,8 +62,10 @@
#end
#macro ( writeValueChecker $type $value $field )
-#if ( $type == "boolean" || $type == "double" || $type == "float" || $type == "int" || $type == "long" || $type == "short" )
+#if ( $type == "double" || $type == "float" || $type == "int" || $type == "long" || $type == "short" )
$value != $field.defaultValue
+#elseif ( $type == "boolean" )
+
#elseif ( $type == "char" )
$value != '$field.defaultValue'
#elseif ( $type == "java.util.List" || $type == "java.util.Set" || $type == "java.util.Map" || $type == "java.util.Properties" )
@@ -97,11 +99,15 @@
#set ( $uncapFieldName = $javaTool.uncapitalise($field.name) )
#set ( $value = "value.${javaTool.makeGetter( $field )}()" )
#if ( $field.primitive )
+ #if ($field.type != "boolean")
if ( #writeValueChecker( $field.type $value $field ) )
{
- String name = "$uncapFieldName";
-#writePrimitive( $field.type $value "name" )
+ #end
+ String $uncapFieldName = "$uncapFieldName";
+#writePrimitive( $field.type $value $uncapFieldName )
+ #if ($field.type != "boolean")
}
+ #end
#else
#set ( $assoc = $field )
#if ( $assoc.multiplicity == "1" )
diff --git a/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGeneratorTestCase.java b/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGeneratorTestCase.java
index b2a96ec..193162e 100644
--- a/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGeneratorTestCase.java
+++ b/modello-plugin-redback-registry/src/test/java/org/apache/archiva/redback/components/registry/modello/AbstractRegistryGeneratorTestCase.java
@@ -87,6 +87,7 @@
addDependency( "commons-configuration", "commons-configuration", "1.8" );
addDependency( "commons-lang", "commons-lang", "2.6" );
addDependency( "commons-logging", "commons-logging-api", "1.0.4" );
+ addDependency( "org.springframework","spring-context", System.getProperty( "springVersion" ) );
addDependency( "org.codehaus.plexus", "plexus-interpolation", "1.14" );
addDependency( "org.slf4j", "slf4j-api", System.getProperty( "slf4jVersion" ) );
addDependency( "org.slf4j", "slf4j-simple", System.getProperty( "slf4jVersion" ) );
@@ -147,6 +148,6 @@
}
}
- assertEquals( "There was compilation errors.", 0, error );
+ assertEquals( "There was compilation errors.:" + messages, 0, error );
}
}
diff --git a/modello-plugin-redback-registry/src/test/verifiers/registry-writer/RegistryWriterVerifier.java b/modello-plugin-redback-registry/src/test/verifiers/registry-writer/RegistryWriterVerifier.java
index ba81e69..ee69bb4 100644
--- a/modello-plugin-redback-registry/src/test/verifiers/registry-writer/RegistryWriterVerifier.java
+++ b/modello-plugin-redback-registry/src/test/verifiers/registry-writer/RegistryWriterVerifier.java
@@ -29,6 +29,7 @@
import junit.framework.Assert;
+import java.lang.AssertionError;
import java.util.*;
/**
@@ -126,15 +127,9 @@
// expected
}
- try
- {
- registry.getBoolean( "defBoolean" );
- Assert.fail();
- }
- catch ( NoSuchElementException e )
- {
- // expected
- }
+
+ Assert.assertTrue( registry.getBoolean( "defBoolean" ) );
+
// test removing an element from a list [MODELLO-84]
model.getListReferences().remove( 0 );
