diff --git a/core/src/main/java/org/apache/struts2/factory/DefaultResultFactory.java b/core/src/main/java/org/apache/struts2/factory/DefaultResultFactory.java deleted file mode 100644 index 54efb6972..000000000 --- a/core/src/main/java/org/apache/struts2/factory/DefaultResultFactory.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * 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.factory; - -import org.apache.struts2.ObjectFactory; -import org.apache.struts2.Result; -import org.apache.struts2.config.ConfigurationException; -import org.apache.struts2.config.entities.ResultConfig; -import org.apache.struts2.inject.Inject; -import org.apache.struts2.util.reflection.ReflectionException; -import org.apache.struts2.util.reflection.ReflectionExceptionHandler; -import org.apache.struts2.util.reflection.ReflectionProvider; - -import java.util.Map; - -/** - * Default implementation - * - * @deprecated since 6.7.0, use {@link StrutsResultFactory} instead. - */ -@Deprecated -public class DefaultResultFactory implements ResultFactory { - - private ObjectFactory objectFactory; - private ReflectionProvider reflectionProvider; - - @Inject - public void setObjectFactory(ObjectFactory objectFactory) { - this.objectFactory = objectFactory; - } - - @Inject - public void setReflectionProvider(ReflectionProvider reflectionProvider) { - this.reflectionProvider = reflectionProvider; - } - - public Result buildResult(ResultConfig resultConfig, Map extraContext) throws Exception { - String resultClassName = resultConfig.getClassName(); - if (resultClassName == null) { - return null; - } - - Object o = objectFactory.buildBean(resultClassName, extraContext); - - if (!(o instanceof Result result)) { - throw new ConfigurationException("Class [" + resultClassName + "] does not implement Result", resultConfig); - } - - Map params = resultConfig.getParams(); - if (params != null) { - for (Map.Entry paramEntry : params.entrySet()) { - try { - reflectionProvider.setProperty(paramEntry.getKey(), paramEntry.getValue(), result, extraContext, true); - } catch (ReflectionException ex) { - if (result instanceof ReflectionExceptionHandler reflectionExceptionHandler) { - reflectionExceptionHandler.handle(ex); - } - } - } - } - - return result; - } - -}