Author: cbrisson
Date: Fri Dec 9 23:00:21 2016
New Revision: 1773482
URL: http://svn.apache.org/viewvc?rev=1773482&view=rev
Log:
[engine] review global configuration getters/setters - do not expose
ExtProperties in Velocity and VelocityEngine
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/Velocity.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/VelocityEngine.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeSingleton.java
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/Velocity.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/Velocity.java?rev=1773482&r1=1773481&r2=1773482&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/Velocity.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/Velocity.java
Fri Dec 9 23:00:21 2016
@@ -26,7 +26,6 @@ import org.apache.velocity.exception.Par
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.util.ExtProperties;
import org.slf4j.Logger;
import java.io.Reader;
@@ -142,9 +141,9 @@ public class Velocity implements Runtime
* @since 2.0
*
*/
- public static void setExtendedProperties( ExtProperties configuration)
+ public static void setProperties( Properties configuration)
{
- RuntimeSingleton.setConfiguration( configuration );
+ RuntimeSingleton.setProperties(configuration);
}
/**
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/VelocityEngine.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/VelocityEngine.java?rev=1773482&r1=1773481&r2=1773482&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/VelocityEngine.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/VelocityEngine.java
Fri Dec 9 23:00:21 2016
@@ -26,7 +26,6 @@ import org.apache.velocity.exception.Par
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.runtime.RuntimeInstance;
-import org.apache.velocity.util.ExtProperties;
import org.slf4j.Logger;
import java.io.Reader;
@@ -159,9 +158,9 @@ public class VelocityEngine implements R
* @param configuration
* @since 2.0
*/
- public void setExtendedProperties( ExtProperties configuration)
+ public void setProperties(Properties configuration)
{
- ri.setConfiguration( configuration );
+ ri.setProperties( configuration );
}
/**
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java?rev=1773482&r1=1773481&r2=1773482&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/EscapeReference.java
Fri Dec 9 23:00:21 2016
@@ -124,7 +124,7 @@ public abstract class EscapeReference im
log = rs.getLog("event");
// Get the regular expression pattern.
- matchRegExp =
StringUtils.nullTrim(rs.getConfiguration().getString(getMatchAttribute()));
+ matchRegExp = StringUtils.nullTrim(rs.getString(getMatchAttribute()));
if (org.apache.commons.lang3.StringUtils.isEmpty(matchRegExp))
{
matchRegExp = null;
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java?rev=1773482&r1=1773481&r2=1773482&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
Fri Dec 9 23:00:21 2016
@@ -680,22 +680,10 @@ public class RuntimeInstance implements
*/
public void init(Properties p)
{
- setProperties(ExtProperties.convertProperties(p));
+ setConfiguration(ExtProperties.convertProperties(p));
init();
}
- private void setProperties(ExtProperties p)
- {
- if (overridingProperties == null)
- {
- overridingProperties = p;
- }
- else
- {
- overridingProperties.combine(p);
- }
- }
-
/**
* Initialize the Velocity Runtime with a
* properties file path.
@@ -706,7 +694,7 @@ public class RuntimeInstance implements
{
try
{
- setProperties(new ExtProperties(configurationFile));
+ setConfiguration(new ExtProperties(configurationFile));
}
catch (IOException e)
{
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeSingleton.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeSingleton.java?rev=1773482&r1=1773481&r2=1773482&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeSingleton.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeSingleton.java
Fri Dec 9 23:00:21 2016
@@ -30,7 +30,6 @@ import org.apache.velocity.runtime.parse
import org.apache.velocity.runtime.parser.node.SimpleNode;
import org.apache.velocity.runtime.resource.ContentResource;
import org.apache.velocity.util.ExtProperties;
-import org.apache.velocity.util.introspection.Introspector;
import org.apache.velocity.util.introspection.Uberspect;
import org.slf4j.Logger;
@@ -146,15 +145,15 @@ public class RuntimeSingleton implements
}
/**
- * Allow an external system to set an ExtProperties
+ * Allow an external system to set a Properties
* object to use.
*
* @param configuration
- * @see RuntimeInstance#setConfiguration(ExtProperties)
+ * @see RuntimeInstance#setProperties(Properties)
*/
- public static void setConfiguration( ExtProperties configuration)
+ public static void setProperties(Properties configuration)
{
- ri.setConfiguration(configuration);
+ ri.setProperties(configuration);
}
/**
@@ -222,7 +221,7 @@ public class RuntimeSingleton implements
/**
* Initialize the Velocity Runtime with the name of
- * ExtProperties object.
+ * a properties file.
*
* @param configurationFile
* @see RuntimeInstance#init(String)
@@ -460,7 +459,7 @@ public class RuntimeSingleton implements
*/
public static int getInt( String key )
{
- return ri.getInt( key );
+ return ri.getInt(key);
}
/**
@@ -486,10 +485,21 @@ public class RuntimeSingleton implements
*/
public static boolean getBoolean( String key, boolean def )
{
- return ri.getBoolean( key, def );
+ return ri.getBoolean(key, def);
}
/**
+ * Directly set the ExtProperties configuration object
+ *
+ * @see RuntimeInstance#setConfiguration(ExtProperties)
+ */
+ public static void setConfiguration(ExtProperties configuration)
+ {
+ ri.setConfiguration(configuration);
+ }
+
+
+ /**
* Return the velocity runtime configuration object.
*
* @return ExtProperties configuration object which houses
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java?rev=1773482&r1=1773481&r2=1773482&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
Fri Dec 9 23:00:21 2016
@@ -140,7 +140,7 @@ public class VelocimacroProxy extends Di
rsvc = rs;
log = rs.getLog("macro");
- strictArguments = rsvc.getConfiguration().getBoolean(
+ strictArguments = rsvc.getBoolean(
RuntimeConstants.VM_ARGUMENTS_STRICT, false);
// get the macro call depth limit
