This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new bdda48eb9 CAY-2784 Remove 'Use Java primitive types' option from
dbimport
new 7380a949f Merge pull request #555 from
stariy95/5.0-FEATURE-dbimport-remove-primitive-checkbox
bdda48eb9 is described below
commit bdda48eb9e337f3f7d933a3af68d2f8520bca306
Author: Nikita Timofeev <[email protected]>
AuthorDate: Fri Dec 30 16:44:02 2022 +0300
CAY-2784 Remove 'Use Java primitive types' option from dbimport
---
.../org/apache/cayenne/tools/DbImporterTask.java | 7 +++--
.../dbsync/merge/context/EntityMergeSupport.java | 10 +++----
.../dbsync/merge/context/MergerContext.java | 7 -----
.../reverse/dbimport/DbImportConfiguration.java | 15 ++++++++--
.../reverse/dbimport/DefaultDbImportAction.java | 2 --
.../reverse/dbimport/ReverseEngineering.java | 24 +++++++--------
.../apache/cayenne/dbsync/xml/ConfigHandler.java | 18 -----------
.../cayenne/dbsync/merge/EntityMergeSupportIT.java | 1 -
.../reverse/filters/FiltersConfigBuilderTest.java | 18 ++++-------
.../cayenne/tools/model/DbImportConfigTest.java | 3 --
.../upgrade/handlers/UpgradeHandler_V11.java | 16 ++++++++++
.../upgrade/handlers/UpgradeHandler_V11Test.java | 35 ++++++++++++++++++++++
.../project/upgrade/handlers/test-map-v10.map.xml | 1 +
.../org/apache/cayenne/schema/11/dbimport.xsd | 1 -
.../org/apache/cayenne/tools/DbImporterMojo.java | 1 -
.../dbimport/testConfigFromDataMap.map.xml-result | 1 -
.../testCustomObjectLayerSettings.map.xml-result | 4 +--
.../testExcludeRelationshipFirst.map.xml-result | 2 +-
.../tools/dbimport/testOneToOne.map.xml-result | 2 +-
.../dbimport/testTableTypesMap.map.xml-result | 1 -
.../modeler/action/CreateObjEntityAction.java | 2 +-
.../modeler/dialog/db/load/DbLoaderContext.java | 2 --
.../dialog/objentity/EntitySyncController.java | 4 +--
.../modeler/editor/dbimport/DbImportView.java | 4 ---
.../dbimport/ReverseEngineeringConfigPanel.java | 15 ----------
25 files changed, 97 insertions(+), 99 deletions(-)
diff --git
a/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
b/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
index 55cb506dc..53dcdcb95 100644
--- a/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
+++ b/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
@@ -59,7 +59,6 @@ public class DbImporterTask extends Task {
public DbImporterTask() {
this.config = new DbImportConfiguration();
- this.config.setUsePrimitives(true);
this.config.setUseJava7Types(false);
this.config.setNamingStrategy(DefaultObjectNameGenerator.class.getName());
@@ -243,8 +242,12 @@ public class DbImporterTask extends Task {
config.setUsername(username);
}
+ /**
+ * @deprecated since 5.0
+ */
+ @Deprecated
public void setUsePrimitives(boolean flag) {
- config.setUsePrimitives(flag);
+
}
/**
diff --git
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/EntityMergeSupport.java
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/EntityMergeSupport.java
index 66981773e..8ec520086 100644
---
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/EntityMergeSupport.java
+++
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/EntityMergeSupport.java
@@ -87,20 +87,17 @@ public class EntityMergeSupport {
private final List<EntityMergeListener> listeners;
private final boolean removingMeaningfulFKs;
private final NameFilter meaningfulPKsFilter;
- private final boolean usingPrimitives;
private final boolean usingJava7Types;
public EntityMergeSupport(ObjectNameGenerator nameGenerator,
NameFilter meaningfulPKsFilter,
boolean removingMeaningfulFKs,
- boolean usingPrimitives,
boolean usingJava7Types) {
this.listeners = new ArrayList<>();
this.nameGenerator = nameGenerator;
this.removingMeaningfulFKs = removingMeaningfulFKs;
this.meaningfulPKsFilter = meaningfulPKsFilter;
- this.usingPrimitives = usingPrimitives;
this.usingJava7Types = usingJava7Types;
// will ensure that all created ObjRelationships would have
@@ -303,9 +300,10 @@ public class EntityMergeSupport {
}
}
- String type = TypesMapping.getJavaBySqlType(dbAttribute);
- String primitiveType;
- if (usingPrimitives && dbAttribute.isMandatory() && (primitiveType =
CLASS_TO_PRIMITIVE.get(type)) != null) {
+ String type = TypesMapping.getJavaBySqlType(dbAttribute.getType());
+ String primitiveType = CLASS_TO_PRIMITIVE.get(type);
+ // use primitive types for non nullable attributes
+ if (primitiveType != null && dbAttribute.isMandatory()) {
return primitiveType;
}
return type;
diff --git
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/MergerContext.java
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/MergerContext.java
index 80ae5817f..16472e58e 100644
---
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/MergerContext.java
+++
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/MergerContext.java
@@ -102,7 +102,6 @@ public class MergerContext {
public static class Builder {
private MergerContext context;
- private boolean usingPrimitives;
private boolean usingJava7Types;
private NameFilter meaningfulPKsFilter;
@@ -135,7 +134,6 @@ public class MergerContext {
context.entityMergeSupport = new
EntityMergeSupport(context.nameGenerator,
meaningfulPKsFilter,
true,
- usingPrimitives,
usingJava7Types);
return context;
@@ -151,11 +149,6 @@ public class MergerContext {
return this;
}
- public Builder usingPrimitives(boolean flag) {
- this.usingPrimitives = flag;
- return this;
- }
-
public Builder usingJava7Types(boolean flag) {
this.usingJava7Types = flag;
return this;
diff --git
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportConfiguration.java
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportConfiguration.java
index f4e076faf..2aef9b49c 100644
---
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportConfiguration.java
+++
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportConfiguration.java
@@ -54,7 +54,6 @@ public class DbImportConfiguration {
private String defaultPackage;
private String meaningfulPkTables;
private String adapter;
- private boolean usePrimitives;
private boolean useJava7Types;
private Logger logger;
private String namingStrategy;
@@ -140,12 +139,22 @@ public class DbImportConfiguration {
this.meaningfulPkTables = meaningfulPkTables;
}
+ /**
+ * @deprecated since 5.0
+ * @return false
+ */
+ @Deprecated
public boolean isUsePrimitives() {
- return usePrimitives;
+ return false;
}
+ /**
+ * does nothing
+ * @param usePrimitives not used
+ * @deprecated since 5.0
+ */
+ @Deprecated
public void setUsePrimitives(boolean usePrimitives) {
- this.usePrimitives = usePrimitives;
}
public boolean isUseJava7Types() {
diff --git
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java
index 2192b5443..0aa1f7059 100644
---
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java
+++
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java
@@ -249,7 +249,6 @@ public class DefaultDbImportAction implements
DbImportAction {
config.setForceDataMapCatalog(reverseEngineering.isForceDataMapCatalog());
config.setForceDataMapSchema(reverseEngineering.isForceDataMapSchema());
config.setDefaultPackage(reverseEngineering.getDefaultPackage());
- config.setUsePrimitives(reverseEngineering.isUsePrimitives());
config.setUseJava7Types(reverseEngineering.isUseJava7Types());
}
@@ -416,7 +415,6 @@ public class DefaultDbImportAction implements
DbImportAction {
MergerContext mergerContext = MergerContext.builder(targetDataMap)
.delegate(mergeDelegate)
.nameGenerator(nameGenerator)
- .usingPrimitives(config.isUsePrimitives())
.usingJava7Types(config.isUseJava7Types())
.meaningfulPKFilter(config.createMeaningfulPKFilter())
.build();
diff --git
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/ReverseEngineering.java
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/ReverseEngineering.java
index e1eb23c5d..0a80e5cfd 100644
---
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/ReverseEngineering.java
+++
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/ReverseEngineering.java
@@ -97,12 +97,6 @@ public class ReverseEngineering extends SchemaContainer
implements Serializable,
*/
private String stripFromTableNames = "";
- /**
- * <p>If true, would use primitives instead of numeric and boolean
classes.</p>
- * <p>Default is <b>"true"</b>, i.e. primitives will be used.</p>
- */
- private boolean usePrimitives = true;
-
/**
* Use old Java 7 date types
*/
@@ -137,7 +131,6 @@ public class ReverseEngineering extends SchemaContainer
implements Serializable,
this.setForceDataMapSchema(original.isForceDataMapSchema());
this.setForceDataMapCatalog(original.isForceDataMapCatalog());
this.setUseJava7Types(original.isUseJava7Types());
- this.setUsePrimitives(original.isUsePrimitives());
this.setTableTypes(Arrays.asList(original.getTableTypes()));
this.setName(original.getName());
for (Catalog catalog : original.getCatalogs()) {
@@ -220,9 +213,6 @@ public class ReverseEngineering extends SchemaContainer
implements Serializable,
if (forceDataMapSchema) {
res.append("\n Force DataMap schema");
}
- if (usePrimitives) {
- res.append("\n Use primitives");
- }
if (useJava7Types) {
res.append("\n Use Java 7 types");
}
@@ -253,8 +243,13 @@ public class ReverseEngineering extends SchemaContainer
implements Serializable,
return stripFromTableNames;
}
+ /**
+ * @return false
+ * @deprecated since 5.0
+ */
+ @Deprecated
public boolean isUsePrimitives() {
- return usePrimitives;
+ return false;
}
public boolean isUseJava7Types() {
@@ -285,8 +280,12 @@ public class ReverseEngineering extends SchemaContainer
implements Serializable,
this.stripFromTableNames = stripFromTableNames;
}
+ /**
+ * does nothing
+ * @deprecated since 5.0
+ */
+ @Deprecated
public void setUsePrimitives(boolean usePrimitives) {
- this.usePrimitives = usePrimitives;
}
public void setUseJava7Types(boolean useJava7Types) {
@@ -322,7 +321,6 @@ public class ReverseEngineering extends SchemaContainer
implements Serializable,
.simpleTag("skipRelationshipsLoading",
this.getSkipRelationshipsLoading().toString())
.simpleTag("stripFromTableNames",
this.getStripFromTableNames())
.simpleTag("useJava7Types",
Boolean.toString(this.isUseJava7Types()))
- .simpleTag("usePrimitives",
Boolean.toString(this.isUsePrimitives()))
.end();
}
diff --git
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/xml/ConfigHandler.java
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/xml/ConfigHandler.java
index e9921b515..40f2d8ab6 100644
---
a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/xml/ConfigHandler.java
+++
b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/xml/ConfigHandler.java
@@ -51,7 +51,6 @@ class ConfigHandler extends NamespaceAwareNestedTagHandler {
private static final String SKIP_RELATIONSHIPS_LOADING_TAG =
"skipRelationshipsLoading";
private static final String STRIP_FROM_TABLE_NAMES_TAG =
"stripFromTableNames";
private static final String USE_JAVA7_TYPES_TAG = "useJava7Types";
- private static final String USE_PRIMITIVES_TAG = "usePrimitives";
private static final String INCLUDE_TABLE_TAG = "includeTable";
private static final String EXCLUDE_TABLE_TAG = "excludeTable";
private static final String INCLUDE_COLUMN_TAG = "includeColumn";
@@ -132,9 +131,6 @@ class ConfigHandler extends NamespaceAwareNestedTagHandler {
case USE_JAVA7_TYPES_TAG:
createUseJava7Types(data);
break;
- case USE_PRIMITIVES_TAG:
- createUsePrimitives(data);
- break;
case EXCLUDE_TABLE_TAG:
createExcludeTable(data);
break;
@@ -203,20 +199,6 @@ class ConfigHandler extends NamespaceAwareNestedTagHandler
{
}
}
- private void createUsePrimitives(String usePrimitives) {
- if (usePrimitives.trim().length() == 0) {
- return;
- }
-
- if (configuration != null) {
- if (usePrimitives.equals(TRUE)) {
- configuration.setUsePrimitives(true);
- } else {
- configuration.setUsePrimitives(false);
- }
- }
- }
-
private void createUseJava7Types(String useJava7Types) {
if (useJava7Types.trim().length() == 0) {
return;
diff --git
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/EntityMergeSupportIT.java
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/EntityMergeSupportIT.java
index 68d15c016..c794c1888 100644
---
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/EntityMergeSupportIT.java
+++
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/EntityMergeSupportIT.java
@@ -94,7 +94,6 @@ public class EntityMergeSupportIT extends MergeCase {
new
DefaultObjectNameGenerator(NoStemStemmer.getInstance()),
NamePatternMatcher.EXCLUDE_ALL,
true,
- true,
false);
assertTrue(entityMergeSupport.synchronizeWithDbEntities(Arrays.asList(objEntity1,
objEntity2)));
assertNotNull(objEntity1.getAttribute("name"));
diff --git
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/filters/FiltersConfigBuilderTest.java
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/filters/FiltersConfigBuilderTest.java
index 9f5a45958..1dd86a9c9 100644
---
a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/filters/FiltersConfigBuilderTest.java
+++
b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/filters/FiltersConfigBuilderTest.java
@@ -54,8 +54,7 @@ public class FiltersConfigBuilderTest {
" IncludeTable: table2\n" +
" IncludeColumn: includeColumn\n" +
" IncludeTable: table3\n" +
- " IncludeColumn: includeColumn\n\n" +
- " Use primitives", engineering.toString());
+ " IncludeColumn: includeColumn\n",
engineering.toString());
}
@Test
@@ -82,8 +81,7 @@ public class FiltersConfigBuilderTest {
" Schema: schemaName02\n" +
" IncludeTable: table1\n" +
" IncludeColumn: includeColumn\n" +
- " ExcludeTable: table2\n\n"+
- " Use primitives", engineering.toString());
+ " ExcludeTable: table2\n", engineering.toString());
}
@Test
@@ -108,8 +106,7 @@ public class FiltersConfigBuilderTest {
" Schema: null\n" +
" IncludeTable: null\n" +
" ExcludeColumn: calculated_.*\n" +
- " ExcludeTable: SYS_.*\n\n" +
- " Use primitives", engineering.toString());
+ " ExcludeTable: SYS_.*\n", engineering.toString());
}
@Test
@@ -123,8 +120,7 @@ public class FiltersConfigBuilderTest {
"ReverseEngineering: \n" +
" Catalog: null\n" +
" Schema: s\n" +
- " IncludeTable: null\n\n" +
- " Use primitives", engineering.toString());
+ " IncludeTable: null\n", engineering.toString());
}
@Test
@@ -207,8 +203,7 @@ public class FiltersConfigBuilderTest {
" IncludeColumn: c_xxx1\n" +
" ExcludeColumn: c_xxx2\n" +
" IncludeProcedure: p7\n" +
- " ExcludeProcedure: p8\n\n" +
- " Use primitives", engineering.toString());
+ " ExcludeProcedure: p8\n", engineering.toString());
builder.compact();
@@ -264,8 +259,7 @@ public class FiltersConfigBuilderTest {
" IncludeProcedure: p5\n" +
" IncludeProcedure: p7\n" +
" ExcludeProcedure: p6\n" +
- " ExcludeProcedure: p8\n\n" +
- " Use primitives", engineering.toString());
+ " ExcludeProcedure: p8\n",
engineering.toString());
}
protected IncludeTable includeTable(String name, String incCol, String
excCol) {
diff --git
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/DbImportConfigTest.java
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/DbImportConfigTest.java
index 78466aef3..555543037 100644
---
a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/DbImportConfigTest.java
+++
b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/model/DbImportConfigTest.java
@@ -56,7 +56,6 @@ public class DbImportConfigTest {
assertFalse(rr.isForceDataMapCatalog());
assertFalse(rr.isForceDataMapSchema());
assertFalse(rr.isUseJava7Types());
- assertTrue(rr.isUsePrimitives());
assertTrue(rr.isEmptyContainer());
}
@@ -80,7 +79,6 @@ public class DbImportConfigTest {
config.setForceDataMapCatalog(true);
config.setForceDataMapSchema(true);
config.setUseJava7Types(true);
- config.setUsePrimitives(false);
ReverseEngineering rr = config.toReverseEngineering();
@@ -108,7 +106,6 @@ public class DbImportConfigTest {
assertTrue(rr.isForceDataMapCatalog());
assertTrue(rr.isForceDataMapSchema());
assertTrue(rr.isUseJava7Types());
- assertFalse(rr.isUsePrimitives());
}
}
diff --git
a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java
b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java
index 1f9d1a2e1..efa19727f 100644
---
a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java
+++
b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java
@@ -84,6 +84,7 @@ public class UpgradeHandler_V11 implements UpgradeHandler {
dropROPProperties(upgradeUnit);
dropObjEntityClientInfo(upgradeUnit);
updateCgenConfig(upgradeUnit);
+ updateDbImportConfig(upgradeUnit);
}
private void upgradeComments(UpgradeUnit upgradeUnit) {
@@ -145,6 +146,21 @@ public class UpgradeHandler_V11 implements UpgradeHandler {
}
}
+ private void updateDbImportConfig(UpgradeUnit upgradeUnit) {
+ XPath xpath = XPathFactory.newInstance().newXPath();
+ NodeList nodes;
+ try {
+ nodes = (NodeList)
xpath.evaluate("/data-map/*[local-name()='dbimport']/*[local-name()='usePrimitives']",
+ upgradeUnit.getDocument(), XPathConstants.NODESET);
+ } catch (Exception e) {
+ return;
+ }
+ for (int j = 0; j < nodes.getLength(); j++) {
+ Element element = (Element) nodes.item(j);
+ element.getParentNode().removeChild(element);
+ }
+ }
+
private void updateCgenConfig(UpgradeUnit upgradeUnit) {
renameQueryTemplates(upgradeUnit);
dropCgenClientConfig(upgradeUnit);
diff --git
a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java
b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java
index c78db1382..b5419295d 100644
---
a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java
+++
b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java
@@ -146,6 +146,41 @@ public class UpgradeHandler_V11Test extends
BaseUpgradeHandlerTest {
}
}
+ @Test
+ public void testDbImportDomUpgrade() throws Exception {
+ Document document = processDataMapDom("test-map-v10.map.xml");
+ Element root = document.getDocumentElement();
+
+ // check cgen config is updated
+ NodeList dbimport = root.getElementsByTagName("dbimport");
+ assertEquals(1, dbimport.getLength());
+ Node dbimportConfig = dbimport.item(0);
+ assertEquals("http://cayenne.apache.org/schema/11/dbimport";,
+
dbimportConfig.getAttributes().getNamedItem("xmlns").getNodeValue());
+
+ NodeList childNodes = dbimportConfig.getChildNodes();
+ int elements = 0;
+ boolean defaultPackageSeen = false;
+ for (int i = 0; i < childNodes.getLength(); i++) {
+ Node node = childNodes.item(i);
+ if (node.getNodeType() == Node.ELEMENT_NODE) {
+ elements++;
+ switch (node.getNodeName()) {
+ case "usePrimitives":
+ fail("<usePrimitives> tag is still present in the
<dbimport> config");
+ case "defaultPackage":
+ defaultPackageSeen = true;
+ break;
+ default:
+ fail("Unexpected element <" + node.getNodeName() + ">
in the <dbimport> config");
+ }
+ }
+ }
+
+ assertTrue(defaultPackageSeen);
+ assertEquals(1, elements);
+ }
+
@Test
public void testModelUpgrade() {
DataChannelDescriptor descriptor = mock(DataChannelDescriptor.class);
diff --git
a/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/handlers/test-map-v10.map.xml
b/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/handlers/test-map-v10.map.xml
index 70a308962..92adb7718 100644
---
a/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/handlers/test-map-v10.map.xml
+++
b/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/handlers/test-map-v10.map.xml
@@ -27,5 +27,6 @@
</cgen>
<dbimport xmlns="http://cayenne.apache.org/schema/10/dbimport";>
<defaultPackage>org.example</defaultPackage>
+ <usePrimitives>true</usePrimitives>
</dbimport>
</data-map>
diff --git
a/cayenne-server/src/main/resources/org/apache/cayenne/schema/11/dbimport.xsd
b/cayenne-server/src/main/resources/org/apache/cayenne/schema/11/dbimport.xsd
index 2ba23dfb5..e5cadae70 100644
---
a/cayenne-server/src/main/resources/org/apache/cayenne/schema/11/dbimport.xsd
+++
b/cayenne-server/src/main/resources/org/apache/cayenne/schema/11/dbimport.xsd
@@ -41,7 +41,6 @@
<xs:element name="skipRelationshipsLoading"
minOccurs="0" type="xs:boolean"/>
<xs:element name="stripFromTableNames" minOccurs="0"
type="xs:string"/>
<xs:element name="useJava7Types" minOccurs="0"
type="xs:boolean"/>
- <xs:element name="usePrimitives" minOccurs="0"
type="xs:boolean"/>
<xs:any minOccurs="0" maxOccurs="unbounded"
namespace="##other" processContents="lax"/>
</xs:sequence>
diff --git
a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
index 94a5c1599..b23b4d3cd 100644
---
a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
+++
b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
@@ -176,7 +176,6 @@ public class DbImporterMojo extends AbstractMojo {
config.setCayenneProject(cayenneProject);
config.setUrl(dataSource.getUrl());
config.setUsername(dataSource.getUsername());
- config.setUsePrimitives(dbImportConfig.isUsePrimitives());
config.setUseJava7Types(dbImportConfig.isUseJava7Types());
return config;
diff --git
a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testConfigFromDataMap.map.xml-result
b/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testConfigFromDataMap.map.xml-result
index 8aa265490..cc8142a62 100644
---
a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testConfigFromDataMap.map.xml-result
+++
b/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testConfigFromDataMap.map.xml-result
@@ -43,6 +43,5 @@
<skipPrimaryKeyLoading>false</skipPrimaryKeyLoading>
<skipRelationshipsLoading>false</skipRelationshipsLoading>
<useJava7Types>false</useJava7Types>
- <usePrimitives>true</usePrimitives>
</dbImport>
</data-map>
diff --git
a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml-result
b/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml-result
index 8ee073872..508f166c3 100644
---
a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml-result
+++
b/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testCustomObjectLayerSettings.map.xml-result
@@ -34,10 +34,10 @@
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true"
isMandatory="true" length="10"/>
</db-entity>
<obj-entity name="ExistingTable" className="ExistingTable"
dbEntityName="EXISTING_TABLE">
- <obj-attribute name="col2" type="int" db-attribute-path="COL2"/>
+ <obj-attribute name="col2" type="java.lang.Integer"
db-attribute-path="COL2"/>
</obj-entity>
<obj-entity name="NewTable" className="NewTable" dbEntityName="NEW_TABLE">
- <obj-attribute name="col2" type="int" db-attribute-path="COL2"/>
+ <obj-attribute name="col2" type="java.lang.Integer"
db-attribute-path="COL2"/>
<obj-attribute name="id" type="int" db-attribute-path="ID"/>
</obj-entity>
<obj-entity name="PrefixedNewTable" className="PrefixedNewTable"
dbEntityName="XYZ_PREFIXED_NEW_TABLE">
diff --git
a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationshipFirst.map.xml-result
b/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationshipFirst.map.xml-result
index 423f81963..284f981ac 100644
---
a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationshipFirst.map.xml-result
+++
b/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testExcludeRelationshipFirst.map.xml-result
@@ -33,7 +33,7 @@
<obj-entity name="Test1" className="Test1" dbEntityName="TEST1"/>
<obj-entity name="Test2" className="Test2" dbEntityName="TEST2">
- <obj-attribute name="test1Id" type="int" db-attribute-path="TEST1_ID"/>
+ <obj-attribute name="test1Id" type="java.lang.Integer"
db-attribute-path="TEST1_ID"/>
</obj-entity>
diff --git
a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.map.xml-result
b/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.map.xml-result
index 118c8c954..9d7f01edb 100644
---
a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.map.xml-result
+++
b/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testOneToOne.map.xml-result
@@ -33,7 +33,7 @@
<db-attribute name="PLAYER_ID" type="INTEGER"
isPrimaryKey="true" isMandatory="true" length="10"/>
</db-entity>
<obj-entity name="PickSchedule" className="PickSchedule"
dbEntityName="PICK_SCHEDULE">
- <obj-attribute name="ownerId" type="int"
db-attribute-path="OWNER_ID"/>
+ <obj-attribute name="ownerId" type="java.lang.Integer"
db-attribute-path="OWNER_ID"/>
</obj-entity>
<obj-entity name="Player" className="Player" dbEntityName="PLAYER">
</obj-entity>
diff --git
a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypesMap.map.xml-result
b/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypesMap.map.xml-result
index 3c5a05803..3ca344899 100644
---
a/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypesMap.map.xml-result
+++
b/maven-plugins/cayenne-maven-plugin/src/test/resources/org/apache/cayenne/tools/dbimport/testTableTypesMap.map.xml-result
@@ -36,6 +36,5 @@
<skipPrimaryKeyLoading>false</skipPrimaryKeyLoading>
<skipRelationshipsLoading>false</skipRelationshipsLoading>
<useJava7Types>false</useJava7Types>
- <usePrimitives>true</usePrimitives>
</dbImport>
</data-map>
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateObjEntityAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateObjEntityAction.java
index b21410f6d..5fde3d080 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateObjEntityAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateObjEntityAction.java
@@ -107,7 +107,7 @@ public class CreateObjEntityAction extends CayenneAction {
// TODO: Modeler-controlled defaults for all the hardcoded boolean
flags here.
EntityMergeSupport merger = new EntityMergeSupport(new
DefaultObjectNameGenerator(NoStemStemmer.getInstance()),
- NamePatternMatcher.EXCLUDE_ALL, true, true, false);
+ NamePatternMatcher.EXCLUDE_ALL, true, false);
merger.setNameGenerator(new
DbEntitySyncAction.PreserveRelationshipNameGenerator());
merger.addEntityMergeListener(DeleteRuleUpdater.getEntityMergeListener());
merger.synchronizeWithDbEntity(entity);
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java
index 2654e230e..bd513b83d 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java
@@ -116,7 +116,6 @@ public class DbLoaderContext {
}
private void fillReverseEngineeringFromView(ReverseEngineering
reverseEngineering, DbImportView view) {
- reverseEngineering.setUsePrimitives(view.isUsePrimitives());
reverseEngineering.setUseJava7Types(view.isUseJava7Typed());
reverseEngineering.setForceDataMapCatalog(view.isForceDataMapCatalog());
reverseEngineering.setForceDataMapSchema(view.isForceDataMapSchema());
@@ -179,7 +178,6 @@ public class DbLoaderContext {
config.setNamingStrategy(reverseEngineering.getNamingStrategy());
config.setDefaultPackage(reverseEngineering.getDefaultPackage());
config.setStripFromTableNames(reverseEngineering.getStripFromTableNames());
- config.setUsePrimitives(reverseEngineering.isUsePrimitives());
config.setUseJava7Types(reverseEngineering.isUseJava7Types());
config.setForceDataMapCatalog(reverseEngineering.isForceDataMapCatalog());
config.setForceDataMapSchema(reverseEngineering.isForceDataMapSchema());
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/EntitySyncController.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/EntitySyncController.java
index 91c0f1fe8..da91fe9fc 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/EntitySyncController.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/EntitySyncController.java
@@ -70,7 +70,7 @@ public class EntitySyncController extends CayenneController {
}
// TODO: Modeler-controlled defaults for all the hardcoded boolean
flags here.
- EntityMergeSupport merger = new EntityMergeSupport(namingStrategy,
NamePatternMatcher.EXCLUDE_ALL, true, true, false);
+ EntityMergeSupport merger = new EntityMergeSupport(namingStrategy,
NamePatternMatcher.EXCLUDE_ALL, true, false);
// see if we need to remove meaningful attributes...
for (ObjEntity entity : entities) {
@@ -110,7 +110,7 @@ public class EntitySyncController extends CayenneController
{
view.setVisible(true);
// TODO: Modeler-controlled defaults for all the hardcoded flags here.
- return cancel[0] ? null : new EntityMergeSupport(namingStrategy,
NamePatternMatcher.EXCLUDE_ALL, removeFKs[0], true, false);
+ return cancel[0] ? null : new EntityMergeSupport(namingStrategy,
NamePatternMatcher.EXCLUDE_ALL, removeFKs[0], false);
}
@Override
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportView.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportView.java
index c99be2658..07586b44c 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportView.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportView.java
@@ -241,10 +241,6 @@ public class DbImportView extends JPanel {
return configPanel.getForceDataMapSchema().isSelected();
}
- public boolean isUsePrimitives() {
- return configPanel.getUsePrimitives().isSelected();
- }
-
public boolean isUseJava7Typed() {
return configPanel.getUseJava7Types().isSelected();
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/ReverseEngineeringConfigPanel.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/ReverseEngineeringConfigPanel.java
index c9ce34215..2165fca24 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/ReverseEngineeringConfigPanel.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/ReverseEngineeringConfigPanel.java
@@ -52,7 +52,6 @@ public class ReverseEngineeringConfigPanel extends JPanel {
private JCheckBox skipPrimaryKeyLoading;
private JCheckBox forceDataMapCatalog;
private JCheckBox forceDataMapSchema;
- private JCheckBox usePrimitives;
private JCheckBox useJava7Types;
private TextAdapter tableTypes;
@@ -80,7 +79,6 @@ public class ReverseEngineeringConfigPanel extends JPanel {
panelBuilder.append("Skip primary key loading:",
skipPrimaryKeyLoading);
panelBuilder.append("Force datamap catalog:", forceDataMapCatalog);
panelBuilder.append("Force datamap schema:", forceDataMapSchema);
- panelBuilder.append("Use Java primitive types:", usePrimitives);
panelBuilder.append("Use java.util.Date type:", useJava7Types);
panelBuilder.append("Naming strategy:", strategyCombo);
panelBuilder.append("Table types:", tableTypes.getComponent());
@@ -93,7 +91,6 @@ public class ReverseEngineeringConfigPanel extends JPanel {
skipPrimaryKeyLoading.setSelected(reverseEngineering.getSkipPrimaryKeyLoading());
forceDataMapCatalog.setSelected(reverseEngineering.isForceDataMapCatalog());
forceDataMapSchema.setSelected(reverseEngineering.isForceDataMapSchema());
- usePrimitives.setSelected(reverseEngineering.isUsePrimitives());
useJava7Types.setSelected(reverseEngineering.isUseJava7Types());
}
@@ -189,8 +186,6 @@ public class ReverseEngineeringConfigPanel extends JPanel {
useJava7Types = new JCheckBox();
useJava7Types.setToolTipText("<html>Use <b>java.util.Date</b> for all
columns with <i>DATE/TIME/TIMESTAMP</i> types.<br>" +
"By default <b>java.time.*</b> types will be used.</html>");
- usePrimitives = new JCheckBox();
- usePrimitives.setToolTipText("<html>Use primitive types (e.g. int) or
Object types (e.g. java.lang.Integer)</html>");
}
private void initListeners() {
@@ -218,12 +213,6 @@ public class ReverseEngineeringConfigPanel extends JPanel {
projectController.setDirty(true);
}
});
- usePrimitives.addActionListener(e -> {
-
getReverseEngineeringBySelectedMap().setUsePrimitives(usePrimitives.isSelected());
- if(!dbImportView.isInitFromModel()) {
- projectController.setDirty(true);
- }
- });
useJava7Types.addActionListener(e -> {
getReverseEngineeringBySelectedMap().setUseJava7Types(useJava7Types.isSelected());
if(!dbImportView.isInitFromModel()) {
@@ -281,10 +270,6 @@ public class ReverseEngineeringConfigPanel extends JPanel {
return forceDataMapSchema;
}
- JCheckBox getUsePrimitives() {
- return usePrimitives;
- }
-
JCheckBox getUseJava7Types() {
return useJava7Types;
}
