You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2013/08/28 14:11:30 UTC
[3/3] git commit: MARMOTTA-242: Set default output-encoding for
freemarker
MARMOTTA-242: Set default output-encoding for freemarker
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/0eed0277
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/0eed0277
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/0eed0277
Branch: refs/heads/develop
Commit: 0eed02773c8de1dda60a3c075a4d20cf102e763a
Parents: 54b7650
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Aug 27 12:21:51 2013 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Wed Aug 28 14:09:47 2013 +0200
----------------------------------------------------------------------
.../ldpath/template/engine/LDPathDirective.java | 5 +++--
.../template/engine/NamespaceDirective.java | 1 +
.../ldpath/template/engine/TemplateEngine.java | 18 +++++++++---------
.../model/freemarker/TemplateNodeModel.java | 2 +-
.../model/freemarker/TemplateWrapperModel.java | 2 +-
.../transformers/TemplateLongTransformer.java | 4 ++--
6 files changed, 17 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/0eed0277/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/LDPathDirective.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/LDPathDirective.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/LDPathDirective.java
index 78902e8..d5deeaa 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/LDPathDirective.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/LDPathDirective.java
@@ -116,8 +116,9 @@ public class LDPathDirective<Node> implements TemplateDirectiveModel {
*
* @throws java.io.IOException
*/
+ @SuppressWarnings("unchecked")
@Override
- public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) throws TemplateException, IOException {
+ public void execute(Environment env, @SuppressWarnings("rawtypes") Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) throws TemplateException, IOException {
TemplateStackModel contextStack = (TemplateStackModel)env.getVariable("context");
if(contextStack == null || contextStack.empty()) {
throw new TemplateModelException("error; no context node available");
@@ -147,7 +148,7 @@ public class LDPathDirective<Node> implements TemplateDirectiveModel {
path = path + ":: xsd:string";
}
try {
- Collection results = ldpath.pathTransform(context.getNode(),path,namespaces);
+ Collection<?> results = ldpath.pathTransform(context.getNode(),path,namespaces);
if(results.size() > 0) {
Object result = results.iterator().next();
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/0eed0277/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/NamespaceDirective.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/NamespaceDirective.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/NamespaceDirective.java
index fc5ea85..a111963 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/NamespaceDirective.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/NamespaceDirective.java
@@ -70,6 +70,7 @@ public class NamespaceDirective implements TemplateDirectiveModel {
*
* @throws java.io.IOException
*/
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) throws TemplateException, IOException {
TemplateWrapperModel<Map<String,String>> namespacesWrapped = (TemplateWrapperModel<Map<String,String>>)env.getGlobalVariable("namespaces");
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/0eed0277/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/TemplateEngine.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/TemplateEngine.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/TemplateEngine.java
index d99d542..a10534e 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/TemplateEngine.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/TemplateEngine.java
@@ -28,7 +28,6 @@ import java.io.IOException;
import java.io.Writer;
import java.util.HashMap;
import java.util.Map;
-import java.util.Set;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.template.model.freemarker.TemplateNodeModel;
@@ -52,6 +51,7 @@ public class TemplateEngine<Node> {
this.backend = backend;
freemarker = new Configuration();
+ freemarker.setDefaultEncoding("utf-8");
freemarker.setObjectWrapper(new DefaultObjectWrapper());
@@ -77,7 +77,7 @@ public class TemplateEngine<Node> {
freemarker.setServletContextForTemplateLoading(sctxt, path);
}
- public void setClassForTemplateLoading(Class clazz, String pathPrefix) {
+ public void setClassForTemplateLoading(Class<?> clazz, String pathPrefix) {
freemarker.setClassForTemplateLoading(clazz, pathPrefix);
}
@@ -109,26 +109,26 @@ public class TemplateEngine<Node> {
* @throws IOException
* @throws TemplateException
*/
- public void processFileTemplate(Node context, String templateName, Map initialEnv, Writer out) throws IOException, TemplateException {
+ public void processFileTemplate(Node context, String templateName, Map<String, ?> initialEnv, Writer out) throws IOException, TemplateException {
processTemplate(context,freemarker.getTemplate(templateName),initialEnv,out);
}
- private void processTemplate(Node context, Template template, Map initialEnv, Writer out) throws IOException, TemplateException {
- Map root = new HashMap();
+ private void processTemplate(Node context, Template template, Map<String, ?> initialEnv, Writer out) throws IOException, TemplateException {
+ Map<String, Object> root = new HashMap<>();
if(initialEnv != null) {
- for(Map.Entry entry : (Set<Map.Entry>) initialEnv.entrySet()) {
+ for(Map.Entry<String, ?> entry : initialEnv.entrySet()) {
root.put(entry.getKey(), entry.getValue());
}
}
root.put("namespace", new NamespaceDirective());
- root.put("evalLDPath",new LDPathMethod(backend));
- root.put("ldpath",new LDPathDirective(backend));
+ root.put("evalLDPath",new LDPathMethod<>(backend));
+ root.put("ldpath",new LDPathDirective<>(backend));
TemplateStackModel contexts = new TemplateStackModel();
- contexts.push(new TemplateNodeModel(context,backend));
+ contexts.push(new TemplateNodeModel<>(context,backend));
root.put("context",contexts);
template.process(root,out);
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/0eed0277/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/freemarker/TemplateNodeModel.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/freemarker/TemplateNodeModel.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/freemarker/TemplateNodeModel.java
index 91fc21c..6d369fa 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/freemarker/TemplateNodeModel.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/freemarker/TemplateNodeModel.java
@@ -105,7 +105,7 @@ public class TemplateNodeModel<Node> implements TemplateModel, TemplateHashModel
* class.
*/
@Override
- public Object getAdaptedObject(Class hint) {
+ public Object getAdaptedObject(@SuppressWarnings("rawtypes") Class hint) {
return node;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/0eed0277/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/freemarker/TemplateWrapperModel.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/freemarker/TemplateWrapperModel.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/freemarker/TemplateWrapperModel.java
index 90b066f..2f24609 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/freemarker/TemplateWrapperModel.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/freemarker/TemplateWrapperModel.java
@@ -50,7 +50,7 @@ public class TemplateWrapperModel<T> implements AdapterTemplateModel {
* class.
*/
@Override
- public T getAdaptedObject(Class hint) {
+ public T getAdaptedObject(@SuppressWarnings("rawtypes") Class hint) {
return object;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/0eed0277/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateLongTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateLongTransformer.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateLongTransformer.java
index 3e55e01..8f12d36 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateLongTransformer.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateLongTransformer.java
@@ -33,10 +33,10 @@ import java.util.Map;
*/
public class TemplateLongTransformer<Node> implements NodeTransformer<TemplateNumberModel,Node> {
- private LongTransformer delegate;
+ private LongTransformer<Node> delegate;
public TemplateLongTransformer() {
- delegate = new LongTransformer();
+ delegate = new LongTransformer<>();
}
/**