svnno****@sourc*****
svnno****@sourc*****
2009年 4月 4日 (土) 22:26:10 JST
Revision: 3103
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=3103
Author: j5ik2o
Date: 2009-04-04 22:26:10 +0900 (Sat, 04 Apr 2009)
Log Message:
-----------
リファクタリング
Modified Paths:
--------------
charon/jiemamy-jpa-importer/trunk/src/main/java/org/jiemamy/composer/importer/JpaImporter.java
-------------- next part --------------
Modified: charon/jiemamy-jpa-importer/trunk/src/main/java/org/jiemamy/composer/importer/JpaImporter.java
===================================================================
--- charon/jiemamy-jpa-importer/trunk/src/main/java/org/jiemamy/composer/importer/JpaImporter.java 2009-04-04 13:25:43 UTC (rev 3102)
+++ charon/jiemamy-jpa-importer/trunk/src/main/java/org/jiemamy/composer/importer/JpaImporter.java 2009-04-04 13:26:10 UTC (rev 3103)
@@ -27,6 +27,7 @@
import org.jiemamy.composer.importer.meta.EntityMeta;
import org.jiemamy.composer.importer.meta.EntityMetaReader;
import org.jiemamy.composer.importer.meta.EntityMetaReaderContext;
+import org.jiemamy.composer.importer.meta.impl.EntityMetaFactoryImpl;
import org.jiemamy.composer.importer.meta.impl.EntityMetaReaderImpl;
import org.jiemamy.composer.importer.utils.ClassUtil;
import org.jiemamy.composer.importer.utils.CollectionsUtil;
@@ -40,7 +41,7 @@
*/
public class JpaImporter implements Importer<JpaImportConfig> {
- private static Logger logger = LoggerFactory.getLogger(JpaImporter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JpaImporter.class);
public String getName() {
@@ -53,25 +54,27 @@
Validate.notNull(config.getRootPackageName());
Validate.notNull(config.getEntityPackageName());
Validate.notNull(config.getJavaFileEncoding());
- Validate.notNull(config.getJavaFileSrcDirs());
- Validate.notEmpty(config.getJavaFileSrcDirs());
- Validate.notNull(config.getEntityClassNamePatterns());
- Validate.notEmpty(config.getEntityClassNamePatterns());
- Validate.notNull(config.getIgnoreEntityClassNamePatterns());
- Validate.notEmpty(config.getIgnoreEntityClassNamePatterns());
+// Validate.notNull(config.getJavaFileSrcDirs());
+// Validate.notEmpty(config.getJavaFileSrcDirs());
+// Validate.notNull(config.getEntityClassNamePatterns());
+// Validate.notEmpty(config.getEntityClassNamePatterns());
+// Validate.notNull(config.getIgnoreEntityClassNamePatterns());
+// Validate.notEmpty(config.getIgnoreEntityClassNamePatterns());
EntityMetaReaderContext context = new EntityMetaReaderContext();
- EntityMetaReader entityMetaReader = new EntityMetaReaderImpl(context);
-
context.setClassPathDirs(toFiles(config.getClassPathDirs()));
- context.setJavaFileSrcDirs(toFiles(config.getJavaFileSrcDirs()));
+// context.setJavaFileSrcDirs(toFiles(config.getJavaFileSrcDirs()));
context.setPackageName(ClassUtil.concatName(config.getRootPackageName(), config.getEntityPackageName()));
context.setJavaFileEncoding(config.getJavaFileEncoding());
+ context.setEntityMetaFactory(new EntityMetaFactoryImpl());
+
+ EntityMetaReader entityMetaReader = new EntityMetaReaderImpl(context);
+
try {
List<EntityMeta> entityMetas = entityMetaReader.read();
for (EntityMeta em : entityMetas) {
- logger.debug(LogMarker.DETAIL, em.toString());
+ LOG.debug(LogMarker.DETAIL, em.toString());
}
} catch (IOException e) {
e.printStackTrace();