Repository: cayenne Updated Branches: refs/heads/master 915f1c2b6 -> f0c0326f3
cleanup Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a30d9a75 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a30d9a75 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a30d9a75 Branch: refs/heads/master Commit: a30d9a7577201b0006a96ee043c71d83774fa688 Parents: 915f1c2 Author: Andrus Adamchik <and...@objectstyle.com> Authored: Fri Nov 4 12:27:20 2016 +0300 Committer: Andrus Adamchik <and...@objectstyle.com> Committed: Fri Nov 4 12:27:20 2016 +0300 ---------------------------------------------------------------------- .../cayenne/dbsync/reverse/db/DbLoader.java | 3 +-- .../dbsync/reverse/db/DbLoaderConfiguration.java | 3 --- .../dbsync/reverse/db/DbLoaderDelegate.java | 7 +++---- .../tools/dbimport/DbImportConfiguration.java | 18 ++++++++++++------ 4 files changed, 16 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/a30d9a75/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoader.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoader.java index 02de407..ad5f189 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoader.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoader.java @@ -297,8 +297,7 @@ public class DbLoader { rs = getMetaData().getExportedKeys(catalog, schema, dbEntity.getName()); } catch (SQLException cay182Ex) { // Sybase-specific - the line above blows on VIEWS, see CAY-182. - LOGGER.info( - "Error getting relationships for '" + catalog + "." + schema + "', ignoring. " + LOGGER.info("Error getting relationships for '" + catalog + "." + schema + "', ignoring. " + cay182Ex.getMessage(), cay182Ex); return new HashMap<>(); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/a30d9a75/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoaderConfiguration.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoaderConfiguration.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoaderConfiguration.java index 53c1aff..e7c5e81 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoaderConfiguration.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoaderConfiguration.java @@ -28,11 +28,8 @@ import org.apache.cayenne.dbsync.reverse.filters.PatternFilter; public class DbLoaderConfiguration { private Boolean skipRelationshipsLoading; - private Boolean skipPrimaryKeyLoading; - private String[] tableTypes; - private FiltersConfig filtersConfig; public String[] getTableTypes() { http://git-wip-us.apache.org/repos/asf/cayenne/blob/a30d9a75/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoaderDelegate.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoaderDelegate.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoaderDelegate.java index 8516c23..94705c6 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoaderDelegate.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/db/DbLoaderDelegate.java @@ -33,11 +33,10 @@ public interface DbLoaderDelegate { void dbEntityRemoved(DbEntity entity); /** - * Called before relationship loading for db-entity + * Called before relationship loading for a {@link DbEntity}. * - * @param entity - * @return true in case you want process relationships for this entity - * false otherwise + * @param entity DbEntity for which {@link DbRelationship} is about to be loaded. + * @return true in case you want process relationships for this entity, false otherwise. */ boolean dbRelationship(DbEntity entity); http://git-wip-us.apache.org/repos/asf/cayenne/blob/a30d9a75/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportConfiguration.java ---------------------------------------------------------------------- diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportConfiguration.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportConfiguration.java index 16f5abf..82410aa 100644 --- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportConfiguration.java +++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DbImportConfiguration.java @@ -46,12 +46,10 @@ import java.util.regex.Pattern; public class DbImportConfiguration { private static final String DATA_MAP_LOCATION_SUFFIX = ".map.xml"; - private final DataSourceInfo dataSourceInfo = new DataSourceInfo(); - private final DbLoaderConfiguration dbLoaderConfiguration = new DbLoaderConfiguration(); + + private final DataSourceInfo dataSourceInfo; + private final DbLoaderConfiguration dbLoaderConfiguration; private File targetDataMap; - /** - * A default package for ObjEntity Java classes. - */ private String defaultPackage; private String meaningfulPkTables; private String adapter; @@ -59,6 +57,11 @@ public class DbImportConfiguration { private Log logger; private String namingStrategy; + public DbImportConfiguration() { + this.dataSourceInfo = new DataSourceInfo(); + this.dbLoaderConfiguration = new DbLoaderConfiguration(); + } + public Log getLogger() { return logger; } @@ -68,7 +71,7 @@ public class DbImportConfiguration { } /** - * Retruns DataMap XML file representing the target of the DB import operation. + * Returns DataMap XML file representing the target of the DB import operation. */ public File getTargetDataMap() { return targetDataMap; @@ -78,6 +81,9 @@ public class DbImportConfiguration { this.targetDataMap = map; } + /** + * Returns a default package for ObjEntity Java classes. + */ public String getDefaultPackage() { return defaultPackage; }
