Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4758 Uses ObjectFactory to create Tiles' ViewPrepare

Browse Source
This commit is contained in:
Lukasz Lenart
2017-06-18 11:11:11 +02:00
parent 216c52095e
commit 93dba5bce2
2 changed files with 59 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsPreparerFactory.java
+53
View File
@@ -0,0 +1,53 @@
/*
* 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.tiles;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ObjectFactory;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.ParameterizedMessage;
import org.apache.tiles.preparer.ViewPreparer;
import org.apache.tiles.preparer.factory.BasicPreparerFactory;
/**
* This is a basic ViewPreparer factory that uses {@link ObjectFactory} to create the ViewPreparer
*/
public class StrutsPreparerFactory extends BasicPreparerFactory {
private static final Logger LOG = LogManager.getLogger(StrutsPreparerFactory.class);
@Override
protected ViewPreparer createPreparer(String name) {
ActionContext actionContext = ActionContext.getContext();
if (actionContext == null) {
LOG.warn("Action context not initialised, request has omitted an action? Fallback to super.createPreparer!");
return super.createPreparer(name);
}
try {
ObjectFactory factory = actionContext.getContainer().getInstance(ObjectFactory.class);
return (ViewPreparer) factory.buildBean(name, ActionContext.getContext().getContextMap());
} catch (Exception e) {
LOG.error(new ParameterizedMessage("Cannot create a ViewPreparer [{}], fallback to super.createPreparer!", name), e);
return super.createPreparer(name);
}
}
}
plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
+6
View File
@@ -52,6 +52,7 @@ import org.apache.tiles.ognl.PropertyAccessorDelegateFactory;
import org.apache.tiles.ognl.ScopePropertyAccessor;
import org.apache.tiles.ognl.TilesApplicationContextNestedObjectExtractor;
import org.apache.tiles.ognl.TilesContextPropertyAccessorDelegateFactory;
import org.apache.tiles.preparer.factory.PreparerFactory;
import org.apache.tiles.request.ApplicationContext;
import org.apache.tiles.request.ApplicationResource;
import org.apache.tiles.request.Request;
@@ -204,6 +205,11 @@ public class StrutsTilesContainerFactory extends BasicTilesContainerFactory {
return filteredResources;
}
@Override
protected PreparerFactory createPreparerFactory(ApplicationContext applicationContext) {
return new StrutsPreparerFactory();
}
protected Set<String> getTilesDefinitions(Map<String, String> params) {
if (params.containsKey(DefinitionsFactory.DEFINITIONS_CONFIG)) {
return TextParseUtil.commaDelimitedStringToSet(params.get(DefinitionsFactory.DEFINITIONS_CONFIG));