Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix BZ 65736 replace forceString with a String setter lookup
- Loading branch information
Showing
6 changed files
with
151 additions
and
153 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| * 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.naming.factory; | ||
|
|
||
| import javax.naming.StringRefAddr; | ||
|
|
||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
|
|
||
| import org.apache.naming.ResourceRef; | ||
|
|
||
| public class TestBeanFactory { | ||
|
|
||
| private static final String IP_ADDRESS = "127.0.0.1"; | ||
|
|
||
| @Test | ||
| public void testForceStringAlternativeWithout() throws Exception { | ||
| doTestForceStringAlternatove(false); | ||
| } | ||
|
|
||
|
|
||
| @Test | ||
| public void testForceStringAlternativeWith() throws Exception { | ||
| doTestForceStringAlternatove(true); | ||
| } | ||
|
|
||
|
|
||
| private void doTestForceStringAlternatove(boolean useForceString) throws Exception { | ||
|
|
||
| // Create the resource definition | ||
| ResourceRef resourceRef = new ResourceRef(TesterBean.class.getName(), null, null, null, false); | ||
| StringRefAddr server = new StringRefAddr("server", IP_ADDRESS); | ||
| resourceRef.add(server); | ||
| if (useForceString) { | ||
| StringRefAddr force = new StringRefAddr("forceString", "server"); | ||
| resourceRef.add(force); | ||
| } | ||
|
|
||
| // Create the factory | ||
| BeanFactory factory = new BeanFactory(); | ||
|
|
||
| // Use the factory to create the resource from the definition | ||
| Object obj = factory.getObjectInstance(resourceRef, null, null, null); | ||
|
|
||
| // Check the correct type was created | ||
| Assert.assertNotNull(obj); | ||
| Assert.assertEquals(obj.getClass(), TesterBean.class); | ||
| // Check the server field was set | ||
| TesterBean result = (TesterBean) obj; | ||
| Assert.assertNotNull(result.getServer()); | ||
| Assert.assertEquals(IP_ADDRESS, result.getServer().getHostAddress()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* | ||
| * 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.naming.factory; | ||
|
|
||
| import java.net.InetAddress; | ||
| import java.net.UnknownHostException; | ||
|
|
||
| public class TesterBean { | ||
|
|
||
| private InetAddress server; | ||
|
|
||
| public InetAddress getServer() { | ||
| return server; | ||
| } | ||
|
|
||
| public void setServer(InetAddress server) { | ||
| this.server = server; | ||
| } | ||
|
|
||
| public void setServer(String server) { | ||
| try { | ||
| this.server = InetAddress.getByName(server); | ||
| } catch (UnknownHostException e) { | ||
| throw new IllegalArgumentException(e); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters