Author: tv
Date: Tue Mar 5 19:53:39 2019
New Revision: 1854867
URL: http://svn.apache.org/viewvc?rev=1854867&view=rev
Log:
Made Valve and ValveContext functional interfaces
Some cosmetics
Modified:
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultSetEncodingValve.java
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineActionValve.java
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineTargetValve.java
turbine/core/trunk/src/java/org/apache/turbine/pipeline/Valve.java
turbine/core/trunk/src/java/org/apache/turbine/pipeline/ValveContext.java
Modified:
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultSetEncodingValve.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultSetEncodingValve.java?rev=1854867&r1=1854866&r2=1854867&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultSetEncodingValve.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DefaultSetEncodingValve.java
Tue Mar 5 19:53:39 2019
@@ -64,7 +64,6 @@ public class DefaultSetEncodingValve
if (requestEncoding == null)
{
requestEncoding = LocaleUtils.getDefaultInputEncoding();
-
log.debug("Changing Input Encoding to {}", requestEncoding);
try
Modified:
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineActionValve.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineActionValve.java?rev=1854867&r1=1854866&r2=1854867&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineActionValve.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineActionValve.java
Tue Mar 5 19:53:39 2019
@@ -51,7 +51,7 @@ public class DetermineActionValve
throws IOException, TurbineException
{
RunData data = pipelineData.getRunData();
- if (! data.hasAction())
+ if (!data.hasAction())
{
String action =
data.getParameters().getString(URIConstants.CGI_ACTION_PARAM);
@@ -59,7 +59,6 @@ public class DetermineActionValve
if (action != null)
{
data.setAction(action);
-
log.debug("Set action from request parameter");
}
else
Modified:
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineTargetValve.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineTargetValve.java?rev=1854867&r1=1854866&r2=1854867&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineTargetValve.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/pipeline/DetermineTargetValve.java
Tue Mar 5 19:53:39 2019
@@ -41,8 +41,7 @@ import org.apache.turbine.util.uri.URICo
* @author <a href="mailto:[email protected]";>James Taylor</a>
* @author <a href="mailto:[email protected]";>Peter Courcoux</a>
*/
-public class DetermineTargetValve
- implements Valve
+public class DetermineTargetValve implements Valve
{
private static final Logger log
= LogManager.getLogger(DetermineTargetValve.class);
@@ -55,26 +54,19 @@ public class DetermineTargetValve
throws IOException, TurbineException
{
RunData runData = pipelineData.getRunData();
- if (! runData.hasScreen())
+ if (!runData.hasScreen())
{
String target =
runData.getParameters().getString(URIConstants.CGI_SCREEN_PARAM);
if (target != null)
{
runData.setScreen(target);
-
log.debug("Set screen target from request parameter");
}
else
{
- /* data.setScreen(Turbine.getConfiguration().getString(
- Turbine.TEMPLATE_HOMEPAGE));
-
- log.debug("Set target using default value");
- */
log.debug("No target screen");
}
-
}
log.debug("Screen Target is now: {}", runData::getScreen);
Modified: turbine/core/trunk/src/java/org/apache/turbine/pipeline/Valve.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/Valve.java?rev=1854867&r1=1854866&r2=1854867&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/pipeline/Valve.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/pipeline/Valve.java Tue Mar
5 19:53:39 2019
@@ -42,6 +42,7 @@ import org.apache.turbine.util.TurbineEx
*
* @see #invoke(PipelineData, ValveContext)
*/
+@FunctionalInterface
public interface Valve
{
/**
Modified:
turbine/core/trunk/src/java/org/apache/turbine/pipeline/ValveContext.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/ValveContext.java?rev=1854867&r1=1854866&r2=1854867&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/pipeline/ValveContext.java
(original)
+++ turbine/core/trunk/src/java/org/apache/turbine/pipeline/ValveContext.java
Tue Mar 5 19:53:39 2019
@@ -43,6 +43,7 @@ import org.apache.turbine.util.TurbineEx
* @author <a href="mailto:[email protected]";>Daniel Rall</a>
* @version $Revision$ $Date$
*/
+@FunctionalInterface
public interface ValveContext
{
/**
