[jboss-cvs] JBossAS SVN: r85825 - in branches/Branch_5_x/system/src: tests/org/jboss/test/server/profileservice/persistence/support and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 13 09:57:32 EDT 2009
Author: emuckenhuber
Date: 2009-03-13 09:57:32 -0400 (Fri, 13 Mar 2009)
New Revision: 85825
Modified:
branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/persistence/ManagedObjectPeristenceHandler.java
branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/persistence/ManagedObjectRecreation.java
branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/support/ObjectNameMetaData.java
branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/BasicPersistenceFormatUnitTestCase.java
branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/ObjectNameUnitTestCase.java
branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/PersistenceFormatTestSuite.java
branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/TestNestedPeristenceFormatUnitTestCase.java
Log:
fix recreation of primitive types
Modified: branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/persistence/ManagedObjectPeristenceHandler.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/persistence/ManagedObjectPeristenceHandler.java 2009-03-13 13:41:46 UTC (rev 85824)
+++ branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/persistence/ManagedObjectPeristenceHandler.java 2009-03-13 13:57:32 UTC (rev 85825)
@@ -45,7 +45,6 @@
import org.jboss.metatype.api.values.PropertiesMetaValue;
import org.jboss.metatype.api.values.SimpleValue;
import org.jboss.metatype.api.values.TableValue;
-import org.jboss.system.server.profileservice.persistence.xml.ModificationInfo;
import org.jboss.system.server.profileservice.persistence.xml.NullValue;
import org.jboss.system.server.profileservice.persistence.xml.PersistedArrayValue;
import org.jboss.system.server.profileservice.persistence.xml.PersistedCollectionValue;
@@ -182,7 +181,7 @@
PersistedProperty property = new PersistedProperty(name);
// Create persisted value
PersistedValue persistedValue = createPersistedValue(value, metaType);
- persistedValue.setModificationInfo(ModificationInfo.MODIFIED);
+// persistedValue.setModificationInfo(ModificationInfo.MODIFIED);
//
property.setValue(persistedValue);
// Return
Modified: branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/persistence/ManagedObjectRecreation.java
===================================================================
--- branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/persistence/ManagedObjectRecreation.java 2009-03-13 13:41:46 UTC (rev 85824)
+++ branches/Branch_5_x/system/src/main/org/jboss/system/server/profileservice/persistence/ManagedObjectRecreation.java 2009-03-13 13:57:32 UTC (rev 85825)
@@ -371,7 +371,7 @@
converted = convert2Type(metaType.getTypeName(), elementValue);
}
}
- return SimpleValueSupport.wrap(converted);
+ return new SimpleValueSupport(metaType, converted);
}
/**
Modified: branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/support/ObjectNameMetaData.java
===================================================================
--- branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/support/ObjectNameMetaData.java 2009-03-13 13:41:46 UTC (rev 85824)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/support/ObjectNameMetaData.java 2009-03-13 13:57:32 UTC (rev 85825)
@@ -25,6 +25,8 @@
import org.jboss.managed.api.annotation.ManagementObject;
import org.jboss.managed.api.annotation.ManagementProperty;
+import org.jboss.metatype.api.annotations.MetaMapping;
+import org.jboss.metatype.plugins.values.mappers.StringObjectNameMetaMapper;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
@@ -33,8 +35,11 @@
@ManagementObject
public class ObjectNameMetaData
{
+ /** The object name. */
+ ObjectName name;
- ObjectName name;
+ /** The other object name. */
+ ObjectName otherName;
@ManagementProperty
public ObjectName getName()
@@ -46,5 +51,17 @@
{
this.name = name;
}
+
+ @ManagementProperty
+ @MetaMapping(StringObjectNameMetaMapper.class)
+ public ObjectName getOtherName()
+ {
+ return otherName;
+ }
+
+ public void setOtherName(ObjectName otherName)
+ {
+ this.otherName = otherName;
+ }
}
Modified: branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/BasicPersistenceFormatUnitTestCase.java
===================================================================
--- branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/BasicPersistenceFormatUnitTestCase.java 2009-03-13 13:41:46 UTC (rev 85824)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/BasicPersistenceFormatUnitTestCase.java 2009-03-13 13:57:32 UTC (rev 85825)
@@ -76,7 +76,9 @@
mo = handler.update(createPrimitive(), restored);
assertEquals("newName", getMVF().unwrap(mo.getProperty("name").getValue()));
- assertEquals(111, getMVF().unwrap(mo.getProperty("integer").getValue()));
+ SimpleValue integer = (SimpleValue) mo.getProperty("integer").getValue();
+ assertEquals(111, getMVF().unwrap(integer));
+ assertTrue("actual " + integer , SimpleMetaType.INTEGER_PRIMITIVE.isValue(integer));
assertEquals("optional", ((SimpleValue) mo.getProperty("optionalName").getValue()).getValue());
}
Modified: branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/ObjectNameUnitTestCase.java
===================================================================
--- branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/ObjectNameUnitTestCase.java 2009-03-13 13:41:46 UTC (rev 85824)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/ObjectNameUnitTestCase.java 2009-03-13 13:57:32 UTC (rev 85825)
@@ -59,7 +59,9 @@
PersistedManagedObject restoredElement = restore(mo);
assertNotNull(restoredElement);
- PersistedProperty pp = restoredElement.getProperties().get(0);
+
+ // The objectName
+ PersistedProperty pp = restoredElement.getProperties().get(1);
assertNotNull(pp);
PersistedCompositeValue pcv = (PersistedCompositeValue) pp.getValue();
@@ -71,12 +73,18 @@
PersistedPropertiesValue ppv = (PersistedPropertiesValue) pcv.getValues().get(1);
assertEquals("keyPropertyList", ppv.getName());
- assertEquals(1, ppv.getEntries().size());
+ assertEquals(2, ppv.getEntries().size());
+ // The other object name
+ PersistedProperty po = restoredElement.getProperties().get(0);
+ assertNotNull(po);
+ assertTrue(po.getValue() instanceof PersistedSimpleValue);
+
//
ManagedGenericOverrideHandler handler = new ManagedGenericOverrideHandler();
ManagedObject restored = handler.update(createMD(), restoredElement);
assertNotNull(restored);
+
}
@@ -84,14 +92,15 @@
{
ObjectNameMetaData md = new ObjectNameMetaData();
// Set objectName
- md.setName(createObjectName());
+ md.setName(createObjectName("value1"));
+ md.setOtherName(createObjectName("value2"));
return md;
}
- protected ObjectName createObjectName() throws Exception
+ protected ObjectName createObjectName(String v) throws Exception
{
- return new ObjectName("org.jboss:test=test");
+ return new ObjectName("org.jboss:test=test,v="+v);
}
}
Modified: branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/PersistenceFormatTestSuite.java
===================================================================
--- branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/PersistenceFormatTestSuite.java 2009-03-13 13:41:46 UTC (rev 85824)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/PersistenceFormatTestSuite.java 2009-03-13 13:57:32 UTC (rev 85825)
@@ -42,6 +42,7 @@
suite.addTestSuite(MapCompositeUnitTestCase.class);
suite.addTestSuite(TableValueUnitTestCase.class);
suite.addTestSuite(TestNestedPeristenceFormatUnitTestCase.class);
+ suite.addTestSuite(ObjectNameUnitTestCase.class);
return suite;
}
Modified: branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/TestNestedPeristenceFormatUnitTestCase.java
===================================================================
--- branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/TestNestedPeristenceFormatUnitTestCase.java 2009-03-13 13:41:46 UTC (rev 85824)
+++ branches/Branch_5_x/system/src/tests/org/jboss/test/server/profileservice/persistence/test/TestNestedPeristenceFormatUnitTestCase.java 2009-03-13 13:57:32 UTC (rev 85825)
@@ -76,7 +76,7 @@
valueMap.put("optionalName",
new SimpleValueSupport(SimpleMetaType.STRING, "changed"));
valueMap.put("integer", new SimpleValueSupport(
- SimpleMetaType.INTEGER, 111));
+ SimpleMetaType.INTEGER_PRIMITIVE, 111));
//
p.setValue(new CompositeValueSupport(composite.getMetaType(), valueMap));
More information about the jboss-cvs-commits
mailing list