3243

pending completion

Build # 3243

Build Type

Pull #581

travis-ci-com

Committed by

web-flow

Commit Message

<a href="https://github.com/apache/struts/commit/<a class=hub.com/apache/struts/commit/5fc93b2e9ed621492babaaf2e1e4af434fa5ed17">5fc93b2e9<a href="https://github.com/apache/struts/commit/5fc93b2e9ed621492babaaf2e1e4af434fa5ed17">">Merge </a><a class="double-link" href="https://github.com/apache/struts/commit/<a class="double-link" href="https://github.com/apache/struts/commit/ab911711641041e66e648ba03c2403b25666584d">ab9117116</a>">ab9117116</a><a href="https://github.com/apache/struts/commit/5fc93b2e9ed621492babaaf2e1e4af434fa5ed17"> into de3dabbe4">de3dabbe4</a>

Pull Request Pull Request #581: [WW-5173] - Fix DI behaviour for custom cache factories

Run Details

7 of 7 new or added lines in 3 files covered. (100.0%)

30151 of 59531 relevant lines covered (50.65%)

0.51 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

54.29

/core/src/main/java/org/apache/struts2/config/AbstractBeanSelectionProvider.java

/*
 * 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.struts2.config;

import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.config.BeanSelectionProvider;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.inject.*;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
import com.opensymphony.xwork2.util.location.LocatableProperties;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.util.Properties;

/**
 * TODO lukaszlenart: write a JavaDoc
 */
public abstract class AbstractBeanSelectionProvider implements BeanSelectionProvider {

    private static final Logger LOG = LogManager.getLogger(AbstractBeanSelectionProvider.class);

    public static final String DEFAULT_BEAN_NAME = "struts";

    public void destroy() {
        // NO-OP
    }

    public void loadPackages() throws ConfigurationException {
        // NO-OP
    }

    public void init(Configuration configuration) throws ConfigurationException {
        // NO-OP
    }

    public boolean needsReload() {
        return false;
    }

    protected void alias(Class type, String key, ContainerBuilder builder, Properties props) {
        alias(type, key, builder, props, Scope.SINGLETON);
    }

    protected void alias(Class type, String key, ContainerBuilder builder, Properties props, Scope scope) {
        if (!builder.contains(type, Container.DEFAULT_NAME)) {
            String foundName = props.getProperty(key, DEFAULT_BEAN_NAME);
            if (builder.contains(type, foundName)) {
                LOG.trace("Choosing bean ({}) for ({})", foundName, type.getName());
                builder.alias(type, foundName, Container.DEFAULT_NAME);
            } else {
                try {
                    Class cls = ClassLoaderUtil.loadClass(foundName, this.getClass());
                    LOG.trace("Choosing bean ({}) for ({})", cls.getName(), type.getName());
                    builder.factory(type, cls, scope);
                } catch (ClassNotFoundException ex) {
                    // Perhaps a spring bean id, so we'll delegate to the object factory at runtime
                    LOG.trace("Choosing bean ({}) for ({}) to be loaded from the ObjectFactory", foundName, type.getName());
                    if (DEFAULT_BEAN_NAME.equals(foundName)) {
                        // Probably an optional bean, will ignore
                    } else {
                        if (ObjectFactory.class != type) {
                            builder.factory(type, new ObjectFactoryDelegateFactory(foundName, type), scope);
                        } else {
                            throw new ConfigurationException("Cannot locate the chosen ObjectFactory implementation: " + foundName);
                        }
                    }
                }
            }
        } else {
            LOG.warn("Unable to alias bean type ({}), default mapping already assigned.", type.getName());
        }
    }

    static class ObjectFactoryDelegateFactory implements Factory {

        String name;
        Class type;

        ObjectFactoryDelegateFactory(String name, Class type) {
            this.name = name;
            this.type = type;
        }

        public Object create(Context context) throws Exception {
            ObjectFactory objFactory = context.getContainer().getInstance(ObjectFactory.class);
            try {
                return objFactory.buildBean(name, null, true);
            } catch (ClassNotFoundException ex) {
                throw new ConfigurationException("Unable to load bean "+type.getName()+" ("+name+")");
            }
        }

        @Override
        public Class type() {
            return type;
        }
    }
}

1	/*
2	* Licensed to the Apache Software Foundation (ASF) under one
3	* or more contributor license agreements. See the NOTICE file
4	* distributed with this work for additional information
5	* regarding copyright ownership. The ASF licenses this file
6	* to you under the Apache License, Version 2.0 (the
7	* "License"); you may not use this file except in compliance
8	* with the License. You may obtain a copy of the License at
9	*
10	* http://www.apache.org/licenses/LICENSE-2.0
11	*
12	* Unless required by applicable law or agreed to in writing,
13	* software distributed under the License is distributed on an
14	* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15	* KIND, either express or implied. See the License for the
16	* specific language governing permissions and limitations
17	* under the License.
18	*/
19	package org.apache.struts2.config;
20
21	import com.opensymphony.xwork2.ObjectFactory;
22	import com.opensymphony.xwork2.config.BeanSelectionProvider;
23	import com.opensymphony.xwork2.config.Configuration;
24	import com.opensymphony.xwork2.config.ConfigurationException;
25	import com.opensymphony.xwork2.inject.*;
26	import com.opensymphony.xwork2.util.ClassLoaderUtil;
27	import com.opensymphony.xwork2.util.location.LocatableProperties;
28	import org.apache.logging.log4j.LogManager;
29	import org.apache.logging.log4j.Logger;
30
31	import java.util.Properties;
32
33	/**
34	* TODO lukaszlenart: write a JavaDoc
35	*/
36	public abstract class AbstractBeanSelectionProvider implements BeanSelectionProvider {	1✔
37
38	private static final Logger LOG = LogManager.getLogger(AbstractBeanSelectionProvider.class);	1✔
39
40	public static final String DEFAULT_BEAN_NAME = "struts";
41
42	public void destroy() {
43	// NO-OP
44	}	1✔
45
46	public void loadPackages() throws ConfigurationException {
47	// NO-OP
48	}	1✔
49
50	public void init(Configuration configuration) throws ConfigurationException {
51	// NO-OP
52	}	1✔
53
54	public boolean needsReload() {
55	return false;	1✔
56	}
57
58	protected void alias(Class type, String key, ContainerBuilder builder, Properties props) {
59	alias(type, key, builder, props, Scope.SINGLETON);	1✔
60	}	1✔
61
62	protected void alias(Class type, String key, ContainerBuilder builder, Properties props, Scope scope) {
63	if (!builder.contains(type, Container.DEFAULT_NAME)) {	1✔
64	String foundName = props.getProperty(key, DEFAULT_BEAN_NAME);	1✔
65	if (builder.contains(type, foundName)) {	1✔
66	LOG.trace("Choosing bean ({}) for ({})", foundName, type.getName());	1✔
67	builder.alias(type, foundName, Container.DEFAULT_NAME);	1✔
68	} else {
69	try {
70	Class cls = ClassLoaderUtil.loadClass(foundName, this.getClass());	×
71	LOG.trace("Choosing bean ({}) for ({})", cls.getName(), type.getName());	×
72	builder.factory(type, cls, scope);	×
73	} catch (ClassNotFoundException ex) {	1✔
74	// Perhaps a spring bean id, so we'll delegate to the object factory at runtime
75	LOG.trace("Choosing bean ({}) for ({}) to be loaded from the ObjectFactory", foundName, type.getName());	1✔
76	if (DEFAULT_BEAN_NAME.equals(foundName)) {	1✔
77	// Probably an optional bean, will ignore
78	} else {
79	if (ObjectFactory.class != type) {	×
80	builder.factory(type, new ObjectFactoryDelegateFactory(foundName, type), scope);	×
81	} else {
82	throw new ConfigurationException("Cannot locate the chosen ObjectFactory implementation: " + foundName);	×
83	}
84	}
85	}	×
86	}
87	} else {	1✔
88	LOG.warn("Unable to alias bean type ({}), default mapping already assigned.", type.getName());	1✔
89	}
90	}	1✔
91
92	static class ObjectFactoryDelegateFactory implements Factory {
93
94	String name;
95	Class type;
96
97	ObjectFactoryDelegateFactory(String name, Class type) {	×
98	this.name = name;	×
99	this.type = type;	×
100	}	×
101
102	public Object create(Context context) throws Exception {
103	ObjectFactory objFactory = context.getContainer().getInstance(ObjectFactory.class);	×
104	try {
105	return objFactory.buildBean(name, null, true);	×
106	} catch (ClassNotFoundException ex) {	×
107	throw new ConfigurationException("Unable to load bean "+type.getName()+" ("+name+")");	×
108	}
109	}
110
111	@Override
112	public Class type() {
113	return type;	×
114	}
115	}
116	}

apache / struts / 3243

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous