# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1361380499 -3600
# Node ID 0c0fe97fe0c7ccf6a47dc75b905e816b4d4a8e78
# Parent  e320d8156140f1e7bf214dee18a4f3c726185dd4
Processor allows only primitive types and String as its values

diff -r e320d8156140 -r 0c0fe97fe0c7 javaquery/api/pom.xml
--- a/javaquery/api/pom.xml	Tue Feb 19 16:16:22 2013 +0100
+++ b/javaquery/api/pom.xml	Wed Feb 20 18:14:59 2013 +0100
@@ -19,8 +19,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
                 </configuration>
             </plugin>
         </plugins>
diff -r e320d8156140 -r 0c0fe97fe0c7 javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java
--- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java	Tue Feb 19 16:16:22 2013 +0100
+++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java	Wed Feb 20 18:14:59 2013 +0100
@@ -501,30 +501,46 @@
             ret = tm.toString();
         }
         if (p.array()) {
-            if (ret.equals("byte")) {
-                return Byte.class.getName();
-            }
-            if (ret.equals("short")) {
-                return Short.class.getName();
-            }
-            if (ret.equals("char")) {
-                return Character.class.getName();
-            }
-            if (ret.equals("int")) {
-                return Integer.class.getName();
-            }
-            if (ret.equals("long")) {
-                return Long.class.getName();
-            }
-            if (ret.equals("float")) {
-                return Float.class.getName();
-            }
-            if (ret.equals("double")) {
-                return Double.class.getName();
+            String bt = findBoxedType(ret);
+            if (bt != null) {
+                return bt;
             }
         }
+        if ("java.lang.String".equals(ret)) {
+            return ret;
+        }
+        String bt = findBoxedType(ret);
+        if (bt != null) {
+            return ret;
+        }
+        processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Only primitive types supported in the mapping. Not " + ret);
         return ret;
     }
+    
+    private static String findBoxedType(String ret) {
+        if (ret.equals("byte")) {
+            return Byte.class.getName();
+        }
+        if (ret.equals("short")) {
+            return Short.class.getName();
+        }
+        if (ret.equals("char")) {
+            return Character.class.getName();
+        }
+        if (ret.equals("int")) {
+            return Integer.class.getName();
+        }
+        if (ret.equals("long")) {
+            return Long.class.getName();
+        }
+        if (ret.equals("float")) {
+            return Float.class.getName();
+        }
+        if (ret.equals("double")) {
+            return Double.class.getName();
+        }
+        return null;
+    }
 
     private boolean verifyPropName(Element e, String propName, Property[] existingProps) {
         StringBuilder sb = new StringBuilder();
diff -r e320d8156140 -r 0c0fe97fe0c7 javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/Compile.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/Compile.java	Wed Feb 20 18:14:59 2013 +0100
@@ -0,0 +1,203 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.htmlpage;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.tools.Diagnostic;
+import javax.tools.DiagnosticListener;
+import javax.tools.FileObject;
+import javax.tools.ForwardingJavaFileManager;
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileObject;
+import javax.tools.JavaFileObject.Kind;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.StandardLocation;
+import javax.tools.ToolProvider;
+
+/**
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+final class Compile implements DiagnosticListener<JavaFileObject> {
+    private final List<Diagnostic<? extends JavaFileObject>> errors = new ArrayList<>();
+    private final Map<String, byte[]> classes;
+    private final String pkg;
+    private final String cls;
+    private final String html;
+
+    private Compile(String html, String code) throws IOException {
+        this.pkg = findPkg(code);
+        this.cls = findCls(code);
+        this.html = html;
+        classes = compile(html, code);
+    }
+
+    /** Performs compilation of given HTML page and associated Java code
+     */
+    public static Compile create(String html, String code) throws IOException {
+        return new Compile(html, code);
+    }
+    
+    /** Checks for given class among compiled resources */
+    public byte[] get(String res) {
+        return classes.get(res);
+    }
+    
+    /** Obtains errors created during compilation.
+     */
+    public List<Diagnostic<? extends JavaFileObject>> getErrors() {
+        List<Diagnostic<? extends JavaFileObject>> err = new ArrayList<>();
+        for (Diagnostic<? extends JavaFileObject> diagnostic : errors) {
+            if (diagnostic.getKind() == Diagnostic.Kind.ERROR) {
+                err.add(diagnostic);
+            }
+        }
+        return err;
+    }
+    
+    private Map<String, byte[]> compile(final String html, final String code) throws IOException {
+        StandardJavaFileManager sjfm = ToolProvider.getSystemJavaCompiler().getStandardFileManager(this, null, null);
+
+        final Map<String, ByteArrayOutputStream> class2BAOS = new HashMap<>();
+
+        JavaFileObject file = new SimpleJavaFileObject(URI.create("mem://mem"), Kind.SOURCE) {
+            @Override
+            public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+                return code;
+            }
+        };
+        final JavaFileObject htmlFile = new SimpleJavaFileObject(URI.create("mem://mem2"), Kind.OTHER) {
+            @Override
+            public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+                return html;
+            }
+
+            @Override
+            public InputStream openInputStream() throws IOException {
+                return new ByteArrayInputStream(html.getBytes());
+            }
+        };
+        
+        final URI scratch;
+        try {
+            scratch = new URI("mem://mem3");
+        } catch (URISyntaxException ex) {
+            throw new IOException(ex);
+        }
+        
+        JavaFileManager jfm = new ForwardingJavaFileManager<JavaFileManager>(sjfm) {
+            @Override
+            public JavaFileObject getJavaFileForOutput(Location location, String className, Kind kind, FileObject sibling) throws IOException {
+                if (kind  == Kind.CLASS) {
+                    final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+
+                    class2BAOS.put(className.replace('.', '/') + ".class", buffer);
+                    return new SimpleJavaFileObject(sibling.toUri(), kind) {
+                        @Override
+                        public OutputStream openOutputStream() throws IOException {
+                            return buffer;
+                        }
+                    };
+                }
+                
+                if (kind == Kind.SOURCE) {
+                    return new SimpleJavaFileObject(scratch/*sibling.toUri()*/, kind) {
+                        private final ByteArrayOutputStream data = new ByteArrayOutputStream();
+                        @Override
+                        public OutputStream openOutputStream() throws IOException {
+                            return data;
+                        }
+
+                        @Override
+                        public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
+                            data.close();
+                            return new String(data.toByteArray());
+                        }
+                    };
+                }
+                
+                throw new IllegalStateException();
+            }
+
+            @Override
+            public FileObject getFileForInput(Location location, String packageName, String relativeName) throws IOException {
+                if (location == StandardLocation.SOURCE_PATH) {
+                    if (packageName.equals(pkg)) {
+                        return htmlFile;
+                    }
+                }
+                
+                return null;
+            }
+            
+        };
+
+        ToolProvider.getSystemJavaCompiler().getTask(null, jfm, this, /*XXX:*/Arrays.asList("-source", "1.7", "-target", "1.7"), null, Arrays.asList(file)).call();
+
+        Map<String, byte[]> result = new HashMap<>();
+
+        for (Map.Entry<String, ByteArrayOutputStream> e : class2BAOS.entrySet()) {
+            result.put(e.getKey(), e.getValue().toByteArray());
+        }
+
+        return result;
+    }
+
+
+    @Override
+    public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
+        errors.add(diagnostic);
+    }
+    private static String findPkg(String java) throws IOException {
+        Pattern p = Pattern.compile("package\\p{javaWhitespace}*([\\p{Alnum}\\.]+)\\p{javaWhitespace}*;", Pattern.MULTILINE);
+        Matcher m = p.matcher(java);
+        if (!m.find()) {
+            throw new IOException("Can't find package declaration in the java file");
+        }
+        String pkg = m.group(1);
+        return pkg;
+    }
+    private static String findCls(String java) throws IOException {
+        Pattern p = Pattern.compile("class\\p{javaWhitespace}*([\\p{Alnum}\\.]+)\\p{javaWhitespace}", Pattern.MULTILINE);
+        Matcher m = p.matcher(java);
+        if (!m.find()) {
+            throw new IOException("Can't find package declaration in the java file");
+        }
+        String cls = m.group(1);
+        return cls;
+    }
+
+    String getHtml() {
+        String fqn = "'" + pkg + '.' + cls + "'";
+        return html.replace("'${fqn}'", fqn);
+    }
+}
diff -r e320d8156140 -r 0c0fe97fe0c7 javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/PageTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/PageTest.java	Wed Feb 20 18:14:59 2013 +0100
@@ -0,0 +1,50 @@
+/**
+ * Back 2 Browser Bytecode Translator
+ * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. Look for COPYING file in the top folder.
+ * If not, see http://opensource.org/licenses/GPL-2.0.
+ */
+package org.apidesign.bck2brwsr.htmlpage;
+
+import java.io.IOException;
+import java.util.Locale;
+import static org.testng.Assert.*;
+import org.testng.annotations.Test;
+
+/** Verify errors emitted by the processor.
+ *
+ * @author Jaroslav Tulach <jtulach@netbeans.org>
+ */
+public class PageTest {
+    @Test public void verifyWrongType() throws IOException {
+        String html = "<html><body>"
+            + "</body></html>";
+        String code = "package x.y.z;\n"
+            + "import org.apidesign.bck2brwsr.htmlpage.api.*;\n"
+            + "@Page(xhtml=\"index.xhtml\", className=\"Model\", properties={\n"
+            + "  @Property(name=\"prop\", type=Runnable.class)\n"
+            + "})\n"
+            + "class X {\n"
+            + "}\n";
+        
+        Compile c = Compile.create(html, code);
+        assertEquals(c.getErrors().size(), 1, "One error: " + c.getErrors());
+        
+        String msg = c.getErrors().get(0).getMessage(Locale.ENGLISH);
+        if (!msg.contains("Runnable")) {
+            fail("Should contain warning about Runnable: " + msg);
+        }
+    }
+    
+}