From 2ec9331f4a478e2f490d2c32d5f8a270aef28720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Mon, 22 Nov 2010 14:00:32 +0000 Subject: [PATCH] fixed Nullable cases --- .../com/mysema/query/maven/AbstractMetaDataExportMojo.java | 5 +++-- .../src/main/java/com/mysema/query/sql/MetaDataExporter.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/AbstractMetaDataExportMojo.java b/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/AbstractMetaDataExportMojo.java index 6313b0c89..45cae16d0 100644 --- a/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/AbstractMetaDataExportMojo.java +++ b/querydsl-maven-plugin/src/main/java/com/mysema/query/maven/AbstractMetaDataExportMojo.java @@ -116,7 +116,6 @@ public class AbstractMetaDataExportMojo extends AbstractMojo{ namingStrategy = new DefaultNamingStrategy(); } Serializer serializer = new MetaDataSerializer(namePrefix, namingStrategy, innerClassesForKeys); - Serializer beanSerializer = exportBeans ? new BeanSerializer() : null; MetaDataExporter exporter = new MetaDataExporter(); exporter.setNamePrefix(namePrefix); @@ -124,7 +123,9 @@ public class AbstractMetaDataExportMojo extends AbstractMojo{ exporter.setTargetFolder(new File(targetFolder)); exporter.setNamingStrategy(namingStrategy); exporter.setSerializer(serializer); - exporter.setBeanSerializer(beanSerializer); + if (exportBeans){ + exporter.setBeanSerializer(new BeanSerializer()); + } exporter.setSchemaPattern(schemaPattern); exporter.setTableNamePattern(tableNamePattern); diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/MetaDataExporter.java b/querydsl-sql/src/main/java/com/mysema/query/sql/MetaDataExporter.java index 23a2afdf3..51598a9ff 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/MetaDataExporter.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/MetaDataExporter.java @@ -88,6 +88,7 @@ public class MetaDataExporter { @Nullable private String schemaPattern, tableNamePattern; + @Nullable private Serializer serializer; @Nullable @@ -161,7 +162,7 @@ public class MetaDataExporter { if (serializer == null){ serializer = new MetaDataSerializer(namePrefix, namingStrategy); } - + ResultSet tables = md.getTables(null, schemaPattern, tableNamePattern, null); try{ while (tables.next()) {