You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ni...@apache.org on 2009/10/06 17:05:03 UTC
svn commit: r822308 - in /commons/proper/beanutils/trunk/src:
java/org/apache/commons/beanutils/BeanUtilsBean.java
test/org/apache/commons/beanutils/bugs/Jira345TestCase.java
Author: niallp
Date: Tue Oct 6 15:05:02 2009
New Revision: 822308
URL: http://svn.apache.org/viewvc?rev=822308&view=rev
Log:
BEANUTILS-345 BeanUtilsBean.setProperty does not handle some kind of nested properties - thanks to Simone Riccucci for the patch
Added:
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira345TestCase.java (with props)
Modified:
commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java
Modified: commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java?rev=822308&r1=822307&r2=822308&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java (original)
+++ commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java Tue Oct 6 15:05:02 2009
@@ -927,6 +927,8 @@
type = dynaProperty.getType();
} else if (target instanceof Map) {
type = Object.class;
+ } else if (target.getClass().isArray() && index >= 0) {
+ type = Array.get(target, index).getClass();
} else {
PropertyDescriptor descriptor = null;
try {
Added: commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira345TestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira345TestCase.java?rev=822308&view=auto
==============================================================================
--- commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira345TestCase.java (added)
+++ commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira345TestCase.java Tue Oct 6 15:05:02 2009
@@ -0,0 +1,119 @@
+/*
+ * 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.commons.beanutils.bugs;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.commons.beanutils.BeanUtils;
+
+/**
+ * See https://issues.apache.org/jira/browse/BEANUTILS-345
+ * <p />
+ *
+ * @version $Revision$ $Date$
+ */
+public class Jira345TestCase extends TestCase {
+
+ /**
+ * Create a test case with the specified name.
+ *
+ * @param name The name of the test
+ */
+ public Jira345TestCase(String name) {
+ super(name);
+ }
+
+ /**
+ * Run the Test.
+ *
+ * @param args Arguments
+ */
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(suite());
+ }
+
+ /**
+ * Create a test suite for this test.
+ *
+ * @return a test suite
+ */
+ public static Test suite() {
+ return (new TestSuite(Jira345TestCase.class));
+ }
+
+ /**
+ * Set up.
+ *
+ * @throws java.lang.Exception
+ */
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ /**
+ * Tear Down.
+ *
+ * @throws java.lang.Exception
+ */
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ /**
+ * Test {@link BeanUtils} setProperty() with 2D array.
+ */
+ public void testBeanUtilsSetProperty_2DArray() throws Exception{
+ MyBean myBean = new MyBean();
+ BeanUtils.setProperty(myBean, "matr[0][0]","Sample");
+ assertEquals("Sample", myBean.getMatr()[0][0]);
+ }
+
+ /**
+ * Test {@link BeanUtils} setProperty() with 3D array.
+ */
+ public void testBeanUtilsSetProperty_3DArray() throws Exception{
+ MyBean myBean = new MyBean();
+ BeanUtils.setProperty(myBean, "matr3D[0][0][0]","Sample");
+ assertEquals("Sample", myBean.getMatr3D()[0][0][0]);
+ }
+
+ /** Example Bean */
+ public static class MyBean {
+
+ private String[][] matr = new String[][]{{"1","2"},{"3","4"}};
+
+ private String[][][] matr3D = new String[][][] {
+ {{"11","12"}, {"13","14"}},
+ {{"21","22"}, {"23","24"}},
+ };
+
+ public String[][] getMatr() {
+ return matr;
+ }
+ public void setMatr(String[][] matr) {
+ this.matr = matr;
+ }
+ public String[][][] getMatr3D() {
+ return matr3D;
+ }
+ public void setMatr3D(String[][][] matr3D) {
+ this.matr3D = matr3D;
+ }
+ }
+}
Propchange: commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira345TestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira345TestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL