CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-06-30 21:08:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

updated version to 0.4.5

Browse Source
This commit is contained in:
Timo Westkämper 2011-11-22 23:58:21 +02:00
parent 2e7a85768e
commit e9abca9778
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.mysema.codegen</groupId>
<artifactId>codegen</artifactId>
<version>0.4.4</version>
<version>0.4.5</version>
<name>Codegen</name>
<description>Code generation and compilation for Java</description>
<parent>

24
src/main/java/com/mysema/codegen/ScalaWriter.java
View File

@ -4,7 +4,6 @@ import static com.mysema.codegen.Symbols.ASSIGN;
import static com.mysema.codegen.Symbols.COMMA;
import static com.mysema.codegen.Symbols.DOT;
import static com.mysema.codegen.Symbols.QUOTE;
import static com.mysema.codegen.Symbols.SEMICOLON;
import java.io.IOException;
import java.lang.annotation.Annotation;
@ -54,6 +53,8 @@ public class ScalaWriter extends AbstractCodeWriter<ScalaWriter>{
private static final String PUBLIC_CLASS = "class ";
private static final String PUBLIC_OBJECT = "object ";
private static final String CASE_CLASS = "case class ";
private static final String VAR = "var ";
@ -185,7 +186,7 @@ public class ScalaWriter extends AbstractCodeWriter<ScalaWriter>{
goIn();
return this;
}
public ScalaWriter beginClass(String header) throws IOException {
line(PUBLIC_CLASS, header, " {");
goIn();
@ -297,6 +298,11 @@ public class ScalaWriter extends AbstractCodeWriter<ScalaWriter>{
public ScalaWriter beginStaticMethod(Type returnType, String methodName, Parameter... args) throws IOException{
return beginMethod(DEF, returnType, methodName, args);
}
public ScalaWriter caseClass(String header, Parameter... parameters) throws IOException {
beginLine(CASE_CLASS, header).params(parameters).nl();
return this;
}
@Override
public ScalaWriter end() throws IOException {
@ -305,17 +311,17 @@ public class ScalaWriter extends AbstractCodeWriter<ScalaWriter>{
}
public ScalaWriter field(Type type, String name) throws IOException {
line(VAR + escape(name) + ": " + getGenericName(true, type) + SEMICOLON);
line(VAR + escape(name) + ": " + getGenericName(true, type));
return compact ? this : nl();
}
private ScalaWriter field(String modifier, Type type, String name) throws IOException{
line(modifier + escape(name) + ": " + getGenericName(true, type) + SEMICOLON);
line(modifier + escape(name) + ": " + getGenericName(true, type));
return compact ? this : nl();
}
private ScalaWriter field(String modifier, Type type, String name, String value) throws IOException{
line(modifier + escape(name) + ": " + getGenericName(true, type) + ASSIGN + value + SEMICOLON);
line(modifier + escape(name) + ": " + getGenericName(true, type) + ASSIGN + value);
return compact ? this : nl();
}
@ -373,7 +379,7 @@ public class ScalaWriter extends AbstractCodeWriter<ScalaWriter>{
public ScalaWriter imports(Class<?>... imports) throws IOException{
for (Class<?> cl : imports){
classes.add(cl.getName());
line(IMPORT + cl.getName() + SEMICOLON);
line(IMPORT + cl.getName());
}
nl();
return this;
@ -383,7 +389,7 @@ public class ScalaWriter extends AbstractCodeWriter<ScalaWriter>{
public ScalaWriter imports(Package... imports) throws IOException {
for (Package p : imports){
packages.add(p.getName());
line(IMPORT + p.getName() + "._;");
line(IMPORT + p.getName() + "._");
}
nl();
return this;
@ -393,7 +399,7 @@ public class ScalaWriter extends AbstractCodeWriter<ScalaWriter>{
public ScalaWriter importClasses(String... imports) throws IOException{
for (String cl : imports){
classes.add(cl);
line(IMPORT + cl + SEMICOLON);
line(IMPORT + cl);
}
nl();
return this;
@ -421,7 +427,7 @@ public class ScalaWriter extends AbstractCodeWriter<ScalaWriter>{
@Override
public ScalaWriter packageDecl(String packageName) throws IOException {
packages.add(packageName);
return line(PACKAGE + packageName + SEMICOLON).nl();
return line(PACKAGE + packageName).nl();
}
private <T> ScalaWriter params(Collection<T> parameters, Transformer<T,Parameter> transformer) throws IOException{

11
src/test/java/com/mysema/codegen/ScalaWriterTest.java
View File

@ -1,5 +1,6 @@
package com.mysema.codegen;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
@ -113,7 +114,7 @@ public class ScalaWriterTest {
writer.end();
System.out.println(w);
assertTrue(w.toString().contains("var stringArray: Array[String];"));
assertTrue(w.toString().contains("var stringArray: Array[String]"));
assertTrue(w.toString().contains("def main(args: Array[String])"));
assertTrue(w.toString().contains("def main2(args: Array[String])"));
}
@ -333,6 +334,14 @@ public class ScalaWriterTest {
}
@Test
public void CaseClass() throws IOException {
writer.caseClass("TestType", new Parameter("a", Types.STRING), new Parameter("b", Types.STRING));
System.out.println(w);
assertEquals("case class TestType(a: String, b: String)\n", w.toString());
}
@Test
public void Primitive() throws IOException {
writer.beginClass(testType);