brianandle commented on code in PR #898: URL: https://github.com/apache/struts/pull/898#discussion_r1540996095
########## core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java: ########## @@ -0,0 +1,34 @@ +/* + * 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.interceptor; + +import org.apache.struts2.dispatcher.HttpParameters; + +import java.util.Map; + +@Deprecated +public interface ParameterAware extends org.apache.struts2.action.ParametersAware { + + void setParameters(Map map); + + @Override + default void withParameters(HttpParameters parameters) { + setParameters(parameters); Review Comment: I created https://issues.apache.org/jira/browse/WW-5403 as well which highlights some other classes/methods I found that (probably not just the ones listed) that were removed in a minor when they really, IMHO, should have been removed only in the next major (7.x). I would worry what other newly deprecated, in 6.x, classes/methods were removed in a minor vs waiting until 7.x. Unless the class/method exposed a significant security risk on it's own. ########## core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java: ########## @@ -0,0 +1,34 @@ +/* + * 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.interceptor; + +import org.apache.struts2.dispatcher.HttpParameters; + +import java.util.Map; + +@Deprecated +public interface ParameterAware extends org.apache.struts2.action.ParametersAware { + + void setParameters(Map map); + + @Override + default void withParameters(HttpParameters parameters) { + setParameters(parameters); Review Comment: We're also missing the restoration of org.apache.struts2.interceptor.RequestAware which would be something like: ```@Deprecated public interface RequestAware extends org.apache.struts2.action..ServletRequestAware { void setRequest(Map<String,Object> request); default void withServletRequest(HttpServletRequest request) { setRequest(request.getParameterMap()); } } ########## core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java: ########## @@ -0,0 +1,34 @@ +/* + * 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.interceptor; + +import org.apache.struts2.dispatcher.HttpParameters; + +import java.util.Map; + +@Deprecated +public interface ParameterAware extends org.apache.struts2.action.ParametersAware { + + void setParameters(Map map); + + @Override + default void withParameters(HttpParameters parameters) { + setParameters(parameters); Review Comment: This would need to be something like the following since the setParameters takes a Map: ```default void withParameters(HttpParameters parameters) { Map<String, String[]> newParams = new HashMap<String, String[]>(); for(String key : parameters.keySet()){ Parameter p = parameters.get(key); if(p instanceof Parameter.Request){ if(p.isMultiple()) { newParams.put(key, p.getMultipleValues()); } else { newParams.put(key, new String[] {p.getValue()}); } } } setParameters(newParams); -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
