Author: atk
Date: Thu Dec 3 08:58:03 2009
New Revision: 886709
URL: http://svn.apache.org/viewvc?rev=886709&view=rev
Log:
ARIES-35 ARIES-36 Implement ServiceState and ConfigurationAdmin MBeans
Added:
incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/PropertyData.java
(with props)
incubator/aries/trunk/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/PropertyDataTest.java
(with props)
Added:
incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/PropertyData.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/PropertyData.java?rev=886709&view=auto
==============================================================================
---
incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/PropertyData.java
(added)
+++
incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/PropertyData.java
Thu Dec 3 08:58:03 2009
@@ -0,0 +1,332 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.aries.jmx.codec;
+
+import static org.apache.aries.jmx.util.TypeUtils.fromString;
+import static org.apache.aries.jmx.util.TypeUtils.primitiveTypes;
+import static org.apache.aries.jmx.util.TypeUtils.types;
+import static org.osgi.jmx.JmxConstants.ARRAY_OF;
+import static org.osgi.jmx.JmxConstants.KEY;
+import static org.osgi.jmx.JmxConstants.PROPERTY_TYPE;
+import static org.osgi.jmx.JmxConstants.P_BOOLEAN;
+import static org.osgi.jmx.JmxConstants.P_BYTE;
+import static org.osgi.jmx.JmxConstants.P_CHAR;
+import static org.osgi.jmx.JmxConstants.P_DOUBLE;
+import static org.osgi.jmx.JmxConstants.P_FLOAT;
+import static org.osgi.jmx.JmxConstants.P_INT;
+import static org.osgi.jmx.JmxConstants.P_LONG;
+import static org.osgi.jmx.JmxConstants.TYPE;
+import static org.osgi.jmx.JmxConstants.VALUE;
+import static org.osgi.jmx.JmxConstants.VECTOR_OF;
+
+import java.lang.reflect.Array;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import javax.management.openmbean.CompositeData;
+import javax.management.openmbean.CompositeDataSupport;
+import javax.management.openmbean.OpenDataException;
+
+import org.osgi.jmx.JmxConstants;
+
+/**
+ * <p>
+ * <tt>PropertyData</tt> represents Property Type @see {...@link
JmxConstants#PROPERTY_TYPE}. It is a codec for the
+ * <code>CompositeData</code> representing a Property with an associated Type
and Value.
+ * </p>
+ *
+ * @version $Rev$ $Date$
+ */
+public class PropertyData<T> {
+
+ /**
+ * @see JmxConstants#KEY_ITEM
+ */
+ private String key;
+
+ /**
+ * @see JmxConstants#SCALAR
+ */
+ private T value;
+
+ /**
+ * @see JmxConstants#VALUE_ITEM
+ */
+ private String encodedValue;
+
+ /**
+ * @see JmxConstants#TYPE_ITEM
+ */
+ private String encodedType;
+
+ private PropertyData() {
+ super();
+ }
+
+
+ @SuppressWarnings("unchecked")
+ private PropertyData(String key, T value, String preservedBaseType) throws
IllegalArgumentException {
+ if (key == null) {
+ throw new IllegalArgumentException("Argument key cannot be null");
+ }
+ if (value == null) {
+ throw new IllegalArgumentException("Argument value cannot be
null");
+ }
+ this.key = key;
+ this.value = value;
+ Class<T> type = (Class<T>) value.getClass();
+ if (type.isArray()) {
+ this.encodedType = ARRAY_OF +
type.getComponentType().getSimpleName();
+ StringBuilder builder = new StringBuilder();
+ int length = Array.getLength(value);
+ boolean useDelimiter = false;
+ for (int i = 0; i < length; i++) {
+ if (useDelimiter) {
+ builder.append(",");
+ } else {
+ useDelimiter = true;
+ }
+ builder.append(Array.get(value, i));
+ }
+ this.encodedValue = builder.toString();
+ } else if (type.equals(Vector.class)) {
+ Vector vector = (Vector) value;
+ Class<? extends Object> componentType = Object.class;
+ if (vector.size() > 0) {
+ componentType = vector.firstElement().getClass();
+ }
+ this.encodedType = VECTOR_OF + componentType.getSimpleName();
+ StringBuilder builder = new StringBuilder();
+ Vector valueVector = (Vector) value;
+ boolean useDelimiter = false;
+ for (Object val: valueVector) {
+ if (useDelimiter) {
+ builder.append(",");
+ } else {
+ useDelimiter = true;
+ }
+ builder.append(val);
+ }
+ this.encodedValue = builder.toString();
+ } else {
+ this.encodedType = (preservedBaseType == null) ?
type.getSimpleName() : preservedBaseType;
+ this.encodedValue = value.toString();
+ }
+ }
+
+ /**
+ * Static factory method for <code>PropertyData</code> instance
parameterized by value's type
+ * @param <T>
+ * @param key
+ * @param value an instance of {...@link JmxConstants#SCALAR}
+ * @return
+ * @throws IllegalArgumentException if key or value are null or value's
type cannot be encoded
+ */
+ public static <T> PropertyData<T> newInstance(String key, T value) throws
IllegalArgumentException {
+ return new PropertyData<T>(key, value, null);
+ }
+
+ /**
+ * Static factory method for <code>PropertyData</code> instance which
preserves encoded type
+ * information for primitive int type
+ * @param key
+ * @param value
+ * @return
+ * @throws IllegalArgumentException if key or value are null or value's
type cannot be encoded
+ */
+ public static PropertyData<Integer> newInstance(String key, int value)
throws IllegalArgumentException {
+ return new PropertyData<Integer>(key, value, P_INT);
+ }
+
+ /**
+ * Static factory method for <code>PropertyData</code> instance which
preserves encoded type
+ * information for primitive long type
+ * @param key
+ * @param value
+ * @return
+ * @throws IllegalArgumentException if key or value are null or value's
type cannot be encoded
+ */
+ public static PropertyData<Long> newInstance(String key, long value)
throws IllegalArgumentException {
+ return new PropertyData<Long>(key, value, P_LONG);
+ }
+
+ /**
+ * Static factory method for <code>PropertyData</code> instance which
preserves encoded type
+ * information for primitive float type
+ * @param key
+ * @param value
+ * @return
+ * @throws IllegalArgumentException if key or value are null or value's
type cannot be encoded
+ */
+ public static PropertyData<Float> newInstance(String key, float value)
throws IllegalArgumentException {
+ return new PropertyData<Float>(key, value, P_FLOAT);
+ }
+
+ /**
+ * Static factory method for <code>PropertyData</code> instance which
preserves encoded type
+ * information for primitive double type
+ * @param key
+ * @param value
+ * @return
+ * @throws IllegalArgumentException if key or value are null or value's
type cannot be encoded
+ */
+ public static PropertyData<Double> newInstance(String key, double value)
throws IllegalArgumentException {
+ return new PropertyData<Double>(key, value, P_DOUBLE);
+ }
+
+ /**
+ * Static factory method for <code>PropertyData</code> instance which
preserves encoded type
+ * information for primitive byte type
+ * @param key
+ * @param value
+ * @return
+ * @throws IllegalArgumentException if key or value are null or value's
type cannot be encoded
+ */
+ public static PropertyData<Byte> newInstance(String key, byte value)
throws IllegalArgumentException {
+ return new PropertyData<Byte>(key, value, P_BYTE);
+ }
+
+ /**
+ * Static factory method for <code>PropertyData</code> instance which
preserves encoded type
+ * information for primitive char type
+ * @param key
+ * @param value
+ * @return
+ * @throws IllegalArgumentException if key or value are null or value's
type cannot be encoded
+ */
+ public static PropertyData<Character> newInstance(String key, char value)
throws IllegalArgumentException {
+ return new PropertyData<Character>(key, value, P_CHAR);
+ }
+
+ /**
+ * Static factory method for <code>PropertyData</code> instance which
preserves encoded type
+ * information for primitive boolean type
+ * @param key
+ * @param value
+ * @return
+ * @throws IllegalArgumentException if key or value are null or value's
type cannot be encoded
+ */
+ public static PropertyData<Boolean> newInstance(String key, boolean value)
throws IllegalArgumentException {
+ return new PropertyData<Boolean>(key, value, P_BOOLEAN);
+ }
+
+
+ /**
+ * Returns CompositeData representing a Property typed by {...@link
JmxConstants#PROPERTY_TYPE}.
+ * @return
+ */
+ public CompositeData toCompositeData() {
+ CompositeData result = null;
+ Map<String, Object> items = new HashMap<String, Object>();
+ items.put(KEY, this.key);
+ items.put(VALUE, this.encodedValue);
+ items.put(TYPE, this.encodedType);
+ try {
+ result = new CompositeDataSupport(PROPERTY_TYPE, items);
+ } catch (OpenDataException e) {
+ throw new IllegalStateException("Failed to create CompositeData
for Property [" + this.key + ":" + this.value + "]", e);
+ }
+ return result;
+ }
+
+ /**
+ * Constructs a <code>PropertyData</code> object from the given
<code>CompositeData</code>
+ * @param compositeData
+ * @return
+ * @throws IlleglArgumentException if compositeData is null or not of type
{...@link JmxConstants#PROPERTY_TYPE}
+ */
+ @SuppressWarnings("unchecked")
+ public static <T> PropertyData<T> from(CompositeData compositeData) throws
IllegalArgumentException {
+ if ( compositeData == null ) {
+ throw new IllegalArgumentException("Argument compositeData cannot
be null");
+ }
+ if (!compositeData.getCompositeType().equals(PROPERTY_TYPE)) {
+ throw new IllegalArgumentException("Invalid CompositeType [" +
compositeData.getCompositeType() + "]");
+ }
+ PropertyData propertyData = new PropertyData();
+ propertyData.key = (String) compositeData.get(KEY);
+ propertyData.encodedType = (String) compositeData.get(TYPE);
+ propertyData.encodedValue = (String) compositeData.get(VALUE);
+ if (propertyData.encodedType == null ||
propertyData.encodedType.length() < 1) {
+ throw new IllegalArgumentException ("Cannot determine type from
compositeData : " + compositeData);
+ }
+ StringTokenizer values = new
StringTokenizer(propertyData.encodedValue, ",");
+ int valuesLength = values.countTokens();
+ if (propertyData.encodedType.startsWith(ARRAY_OF)) {
+ String[] arrayTypeParts = propertyData.encodedType.split("\\s");
+ if (arrayTypeParts.length < 3) {
+ throw new IllegalArgumentException("Cannot parse Array type
from type item : " + propertyData.encodedType);
+ }
+ String arrayTypeName = arrayTypeParts[2].trim();
+ if (!types.containsKey(arrayTypeName)) {
+ throw new IllegalArgumentException ("Cannot determine type
from value : " + arrayTypeName);
+ }
+ Class<? extends Object> arrayType = types.get(arrayTypeName);
+ propertyData.value = Array.newInstance(arrayType, valuesLength);
+ int index = 0;
+ while (values.hasMoreTokens()) {
+ Array.set(propertyData.value, index++, fromString(arrayType,
values.nextToken()));
+ }
+ } else if (propertyData.encodedType.startsWith(VECTOR_OF)) {
+ String[] vectorTypeParts = propertyData.encodedType.split("\\s");
+ if (vectorTypeParts.length < 3) {
+ throw new IllegalArgumentException("Cannot parse Array type
from type item : " + propertyData.encodedType);
+ }
+ String vectorTypeName = vectorTypeParts[2].trim();
+ if (!types.containsKey(vectorTypeName)) {
+ throw new IllegalArgumentException ("Cannot determine type
from value : " + vectorTypeName);
+ }
+ Class<? extends Object> vectorType = types.get(vectorTypeName);
+ Vector vector = new Vector();
+ while (values.hasMoreTokens()) {
+ vector.add(fromString(vectorType, values.nextToken()));
+ }
+ propertyData.value = vector;
+ } else {
+ if (!types.containsKey(propertyData.encodedType)) {
+ throw new IllegalArgumentException ("Cannot determine type
from value : " + propertyData.encodedType);
+ }
+ Class<? extends Object> valueType =
types.get(propertyData.encodedType);
+ propertyData.value = fromString(valueType,
propertyData.encodedValue);
+ }
+ return propertyData;
+ }
+
+
+ public String getKey() {
+ return key;
+ }
+
+ public T getValue() {
+ return value;
+ }
+
+ public String getEncodedType() {
+ return encodedType;
+ }
+
+ public String getEncodedValue() {
+ return encodedValue;
+ }
+
+ public boolean isEncodingPrimitive() {
+ return primitiveTypes.containsKey(encodedType);
+ }
+
+}
Propchange:
incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/PropertyData.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/aries/trunk/jmx/jmx-core/src/main/java/org/apache/aries/jmx/codec/PropertyData.java
------------------------------------------------------------------------------
svn:keywords = Revision Date
Added:
incubator/aries/trunk/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/PropertyDataTest.java
URL:
http://svn.apache.org/viewvc/incubator/aries/trunk/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/PropertyDataTest.java?rev=886709&view=auto
==============================================================================
---
incubator/aries/trunk/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/PropertyDataTest.java
(added)
+++
incubator/aries/trunk/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/PropertyDataTest.java
Thu Dec 3 08:58:03 2009
@@ -0,0 +1,324 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.aries.jmx.codec;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.osgi.jmx.JmxConstants.BIGINTEGER;
+import static org.osgi.jmx.JmxConstants.BOOLEAN;
+import static org.osgi.jmx.JmxConstants.CHARACTER;
+import static org.osgi.jmx.JmxConstants.DOUBLE;
+import static org.osgi.jmx.JmxConstants.INTEGER;
+import static org.osgi.jmx.JmxConstants.KEY;
+import static org.osgi.jmx.JmxConstants.PROPERTY_TYPE;
+import static org.osgi.jmx.JmxConstants.P_BOOLEAN;
+import static org.osgi.jmx.JmxConstants.P_CHAR;
+import static org.osgi.jmx.JmxConstants.P_DOUBLE;
+import static org.osgi.jmx.JmxConstants.P_INT;
+import static org.osgi.jmx.JmxConstants.STRING;
+import static org.osgi.jmx.JmxConstants.TYPE;
+import static org.osgi.jmx.JmxConstants.VALUE;
+
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Vector;
+
+import javax.management.openmbean.CompositeData;
+import javax.management.openmbean.CompositeDataSupport;
+
+import org.junit.Test;
+
+/**
+ *
+ *
+ * @version $Rev$ $Date$
+ */
+public class PropertyDataTest {
+
+
+ @Test
+ public void testToCompositeDataForPrimitiveTypes() throws Exception {
+
+ PropertyData<Integer> intData = PropertyData.newInstance("test", 1);
+ CompositeData intCData = intData.toCompositeData();
+ assertEquals("test", intCData.get(KEY));
+ assertEquals("1", intCData.get(VALUE));
+ assertEquals(P_INT, intCData.get(TYPE));
+
+ PropertyData<Double> doubleData = PropertyData.newInstance("test",
1.0);
+ CompositeData doubleCData = doubleData.toCompositeData();
+ assertEquals("test", doubleCData.get(KEY));
+ assertEquals("1.0", doubleCData.get(VALUE));
+ assertEquals(P_DOUBLE, doubleCData.get(TYPE));
+
+ PropertyData<Character> charData = PropertyData.newInstance("test",
'c');
+ CompositeData charCData = charData.toCompositeData();
+ assertEquals("test", charCData.get(KEY));
+ assertEquals("c", charCData.get(VALUE));
+ assertEquals(P_CHAR, charCData.get(TYPE));
+
+ PropertyData<Boolean> booleanData = PropertyData.newInstance("test",
true);
+ CompositeData booleanCData = booleanData.toCompositeData();
+ assertEquals("test", booleanCData.get(KEY));
+ assertEquals("true", booleanCData.get(VALUE));
+ assertEquals(P_BOOLEAN, booleanCData.get(TYPE));
+ }
+
+ @Test
+ public void testFromCompositeDataForPrimitiveTypes() throws Exception {
+
+ Map<String, Object> items = new HashMap<String, Object>();
+ items.put(KEY, "key");
+ items.put(VALUE, "1");
+ items.put(TYPE, P_INT);
+ CompositeData compositeData = new CompositeDataSupport(PROPERTY_TYPE,
items);
+
+ PropertyData<Integer> intData = PropertyData.from(compositeData);
+ assertEquals("key", intData.getKey());
+ assertEquals(new Integer(1), intData.getValue());
+ assertEquals(P_INT, intData.getEncodedType());
+ assertTrue(intData.isEncodingPrimitive());
+
+ items.clear();
+ items.put(KEY, "key");
+ items.put(VALUE, "1.0");
+ items.put(TYPE, P_DOUBLE);
+ compositeData = new CompositeDataSupport(PROPERTY_TYPE, items);
+
+ PropertyData<Double> doubleData = PropertyData.from(compositeData);
+ assertEquals("key", doubleData.getKey());
+ assertEquals(Double.valueOf(1.0), doubleData.getValue());
+ assertEquals(P_DOUBLE, doubleData.getEncodedType());
+ assertTrue(doubleData.isEncodingPrimitive());
+
+ items.clear();
+ items.put(KEY, "key");
+ items.put(VALUE, "a");
+ items.put(TYPE, P_CHAR);
+ compositeData = new CompositeDataSupport(PROPERTY_TYPE, items);
+
+ PropertyData<Character> charData = PropertyData.from(compositeData);
+ assertEquals("key", charData.getKey());
+ assertEquals(Character.valueOf('a'), charData.getValue());
+ assertEquals(P_CHAR, charData.getEncodedType());
+ assertTrue(charData.isEncodingPrimitive());
+
+ items.clear();
+ items.put(KEY, "key");
+ items.put(VALUE, "true");
+ items.put(TYPE, P_BOOLEAN);
+ compositeData = new CompositeDataSupport(PROPERTY_TYPE, items);
+
+ PropertyData<Boolean> booleanData = PropertyData.from(compositeData);
+ assertEquals("key", booleanData.getKey());
+ assertTrue(booleanData.getValue());
+ assertEquals(P_BOOLEAN, booleanData.getEncodedType());
+ assertTrue(booleanData.isEncodingPrimitive());
+
+ }
+
+ @Test
+ public void testToCompositeDataForWrapperTypes() {
+
+ PropertyData<Integer> intData = PropertyData.newInstance("test", new
Integer(1));
+ CompositeData intCData = intData.toCompositeData();
+ assertEquals("test", intCData.get(KEY));
+ assertEquals("1", intCData.get(VALUE));
+ assertEquals(INTEGER, intCData.get(TYPE));
+
+ PropertyData<Double> doubleData = PropertyData.newInstance("test", new
Double(1.0));
+ CompositeData doubleCData = doubleData.toCompositeData();
+ assertEquals("test", doubleCData.get(KEY));
+ assertEquals("1.0", doubleCData.get(VALUE));
+ assertEquals(DOUBLE, doubleCData.get(TYPE));
+
+ PropertyData<Character> charData = PropertyData.newInstance("test",
Character.valueOf('c'));
+ CompositeData charCData = charData.toCompositeData();
+ assertEquals("test", charCData.get(KEY));
+ assertEquals("c", charCData.get(VALUE));
+ assertEquals(CHARACTER, charCData.get(TYPE));
+
+ PropertyData<Boolean> booleanData = PropertyData.newInstance("test",
Boolean.TRUE);
+ CompositeData booleanCData = booleanData.toCompositeData();
+ assertEquals("test", booleanCData.get(KEY));
+ assertEquals("true", booleanCData.get(VALUE));
+ assertEquals(BOOLEAN, booleanCData.get(TYPE));
+
+ }
+
+ @Test
+ public void testFromCompositeDataForWrapperTypes() throws Exception {
+
+ Map<String, Object> items = new HashMap<String, Object>();
+ items.put(KEY, "key");
+ items.put(VALUE, "1");
+ items.put(TYPE, INTEGER);
+ CompositeData compositeData = new CompositeDataSupport(PROPERTY_TYPE,
items);
+
+ PropertyData<Integer> intData = PropertyData.from(compositeData);
+ assertEquals("key", intData.getKey());
+ assertEquals(new Integer(1), intData.getValue());
+ assertEquals(INTEGER, intData.getEncodedType());
+ assertFalse(intData.isEncodingPrimitive());
+
+ items.clear();
+ items.put(KEY, "key");
+ items.put(VALUE, "1.0");
+ items.put(TYPE, DOUBLE);
+ compositeData = new CompositeDataSupport(PROPERTY_TYPE, items);
+
+ PropertyData<Double> doubleData = PropertyData.from(compositeData);
+ assertEquals("key", doubleData.getKey());
+ assertEquals(Double.valueOf(1.0), doubleData.getValue());
+ assertEquals(DOUBLE, doubleData.getEncodedType());
+ assertFalse(doubleData.isEncodingPrimitive());
+
+ items.clear();
+ items.put(KEY, "key");
+ items.put(VALUE, "a");
+ items.put(TYPE, CHARACTER);
+ compositeData = new CompositeDataSupport(PROPERTY_TYPE, items);
+
+ PropertyData<Character> charData = PropertyData.from(compositeData);
+ assertEquals("key", charData.getKey());
+ assertEquals(Character.valueOf('a'), charData.getValue());
+ assertEquals(CHARACTER, charData.getEncodedType());
+ assertFalse(charData.isEncodingPrimitive());
+
+ items.clear();
+ items.put(KEY, "key");
+ items.put(VALUE, "true");
+ items.put(TYPE, BOOLEAN);
+ compositeData = new CompositeDataSupport(PROPERTY_TYPE, items);
+
+ PropertyData<Boolean> booleanData = PropertyData.from(compositeData);
+ assertEquals("key", booleanData.getKey());
+ assertTrue(booleanData.getValue());
+ assertEquals(BOOLEAN, booleanData.getEncodedType());
+ assertFalse(booleanData.isEncodingPrimitive());
+
+ }
+
+ @Test
+ public void testToFromCompositeDataForAdditionalTypes() {
+
+ PropertyData<String> stringData = PropertyData.newInstance("test",
"value");
+
+ CompositeData stringCData = stringData.toCompositeData();
+ assertEquals("test", stringCData.get(KEY));
+ assertEquals("value", stringCData.get(VALUE));
+ assertEquals(STRING, stringCData.get(TYPE));
+
+ stringData = PropertyData.from(stringCData);
+ assertEquals("test", stringData.getKey());
+ assertEquals("value", stringData.getValue());
+ assertEquals(STRING, stringData.getEncodedType());
+
+ PropertyData<BigInteger> bigIntData = PropertyData.newInstance("test",
new BigInteger("1"));
+
+ CompositeData bigIntCData = bigIntData.toCompositeData();
+ assertEquals("test", bigIntCData.get(KEY));
+ assertEquals("1", bigIntCData.get(VALUE));
+ assertEquals(BIGINTEGER, bigIntCData.get(TYPE));
+
+ bigIntData = PropertyData.from(bigIntCData);
+ assertEquals("test", bigIntData.getKey());
+ assertEquals(new BigInteger("1"), bigIntData.getValue());
+ assertEquals(BIGINTEGER, bigIntData.getEncodedType());
+
+ }
+
+ @Test
+ public void testToFromCompositeDataForArrayTypes() {
+
+ //long[]
+ long[] primitiveLongValues = new long[] { 1, 2, 3 };
+ PropertyData<long[]> primitiveLongArrayData =
PropertyData.newInstance("test", primitiveLongValues);
+ CompositeData primitiveLongArrayCData =
primitiveLongArrayData.toCompositeData();
+ assertEquals("test", primitiveLongArrayCData.get(KEY));
+ assertEquals("1,2,3", primitiveLongArrayCData.get(VALUE));
+ assertEquals("Array of long", primitiveLongArrayCData.get(TYPE));
+ primitiveLongArrayData = PropertyData.from(primitiveLongArrayCData);
+ assertEquals("test", primitiveLongArrayData.getKey());
+ assertEquals("Array of long", primitiveLongArrayData.getEncodedType());
+ assertArrayEquals(primitiveLongValues,
primitiveLongArrayData.getValue());
+
+ //Long[]
+ Long[] longValues = new Long[] { new Long(4), new Long(5), new Long(6)
};
+ PropertyData<Long[]> longArrayData = PropertyData.newInstance("test",
longValues);
+ CompositeData longArrayCData = longArrayData.toCompositeData();
+ assertEquals("test", longArrayCData.get(KEY));
+ assertEquals("4,5,6", longArrayCData.get(VALUE));
+ assertEquals("Array of Long", longArrayCData.get(TYPE));
+ longArrayData = PropertyData.from(longArrayCData);
+ assertEquals("test", longArrayData.getKey());
+ assertEquals("Array of Long", longArrayData.getEncodedType());
+ assertArrayEquals(longValues, longArrayData.getValue());
+
+ //char[]
+ char[] primitiveCharValues = new char[] { 'a', 'b', 'c' };
+ PropertyData<char[]> primitiveCharArrayData =
PropertyData.newInstance("test", primitiveCharValues);
+ CompositeData primitiveCharArrayCData =
primitiveCharArrayData.toCompositeData();
+ assertEquals("test", primitiveCharArrayCData.get(KEY));
+ assertEquals("a,b,c", primitiveCharArrayCData.get(VALUE));
+ assertEquals("Array of char", primitiveCharArrayCData.get(TYPE));
+ primitiveCharArrayData = PropertyData.from(primitiveCharArrayCData);
+ assertEquals("test", primitiveCharArrayData.getKey());
+ assertEquals("Array of char", primitiveCharArrayData.getEncodedType());
+ assertArrayEquals(primitiveCharValues,
primitiveCharArrayData.getValue());
+
+ //Character[]
+ Character[] charValues = new Character[] { 'a', 'b', 'c' };
+ PropertyData<Character[]> charArrayData =
PropertyData.newInstance("test", charValues);
+ CompositeData charArrayCData = charArrayData.toCompositeData();
+ assertEquals("test", charArrayCData.get(KEY));
+ assertEquals("a,b,c", charArrayCData.get(VALUE));
+ assertEquals("Array of Character", charArrayCData.get(TYPE));
+ charArrayData = PropertyData.from(charArrayCData);
+ assertEquals("test", charArrayData.getKey());
+ assertEquals("Array of Character", charArrayData.getEncodedType());
+ assertArrayEquals(charValues, charArrayData.getValue());
+
+ }
+
+ @Test
+ public void testToFromCompositeDataForVector() {
+
+ Vector<Long> vector = new Vector<Long>();
+ vector.add(new Long(40));
+ vector.add(new Long(50));
+ vector.add(new Long(60));
+
+ PropertyData<Vector<Long>> vectorPropertyData =
PropertyData.newInstance("test", vector);
+ CompositeData vectorCompositeData =
vectorPropertyData.toCompositeData();
+
+ assertEquals("test", vectorCompositeData.get(KEY));
+ assertEquals("40,50,60", vectorCompositeData.get(VALUE));
+ assertEquals("Vector of Long", vectorCompositeData.get(TYPE));
+
+ vectorPropertyData = PropertyData.from(vectorCompositeData);
+ assertEquals("test", vectorPropertyData.getKey());
+ assertEquals("Vector of Long", vectorPropertyData.getEncodedType());
+ assertArrayEquals(vector.toArray(new Long[vector.size()]),
vectorPropertyData.getValue().toArray(new Long[vector.size()]));
+
+ }
+
+
+}
Propchange:
incubator/aries/trunk/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/PropertyDataTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/aries/trunk/jmx/jmx-core/src/test/java/org/apache/aries/jmx/codec/PropertyDataTest.java
------------------------------------------------------------------------------
svn:keywords = Revision Date
