stariy95 commented on code in PR #559:
URL: https://github.com/apache/cayenne/pull/559#discussion_r1085304861
##########
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbImportTreeNode.java:
##########
@@ -207,4 +210,45 @@ public boolean isLoaded() {
public void setLoaded(boolean loaded) {
isLoaded = loaded;
}
+
+ public List<DbImportTreeNode> getChildNodes() {
+ List<DbImportTreeNode> childNodes = new ArrayList<>();
Review Comment:
Could it be just `return Collections.list(...)`?
##########
cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/ReverseEngineering.java:
##########
@@ -296,14 +296,14 @@ public void setUseJava7Types(boolean useJava7Types) {
public void encodeAsXML(XMLEncoder encoder, ConfigurationNodeVisitor
delegate) {
encoder.start("dbImport")
.attribute("xmlns", DbImportExtension.NAMESPACE)
+ .nested(this.getCatalogs(), delegate)
Review Comment:
Need to check if this change affects `dbimport.xsd` schema
##########
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportSorter.java:
##########
@@ -0,0 +1,110 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************/
+
+package org.apache.cayenne.modeler.editor.dbimport;
+
+import org.apache.cayenne.dbsync.reverse.dbimport.Catalog;
+import org.apache.cayenne.dbsync.reverse.dbimport.FilterContainer;
+import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable;
+import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
+import org.apache.cayenne.dbsync.reverse.dbimport.Schema;
+import org.apache.cayenne.dbsync.reverse.dbimport.SchemaContainer;
+import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.editor.dbimport.tree.NodeType;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * @since 5.0
+ */
+public class DbImportSorter {
+ private static final Comparator<DbImportTreeNode> NODE_COMPARATOR =
Comparator
+ .comparing(DbImportTreeNode::getNodeType)
+ .thenComparing(DbImportTreeNode::getSimpleNodeName);
+
+ public static void sortNode(DbImportTreeNode node) {
+ sortNodeItems(node);
+ syncUserObjectItems(node);
+ }
+
+ public static void sortNodeWithAllChildren(DbImportTreeNode node) {
+ DbImportSorter.sortNode(node);
Review Comment:
No need for a class name here
##########
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportSorter.java:
##########
@@ -0,0 +1,110 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************/
+
+package org.apache.cayenne.modeler.editor.dbimport;
+
+import org.apache.cayenne.dbsync.reverse.dbimport.Catalog;
+import org.apache.cayenne.dbsync.reverse.dbimport.FilterContainer;
+import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable;
+import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
+import org.apache.cayenne.dbsync.reverse.dbimport.Schema;
+import org.apache.cayenne.dbsync.reverse.dbimport.SchemaContainer;
+import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.editor.dbimport.tree.NodeType;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * @since 5.0
+ */
+public class DbImportSorter {
+ private static final Comparator<DbImportTreeNode> NODE_COMPARATOR =
Comparator
+ .comparing(DbImportTreeNode::getNodeType)
+ .thenComparing(DbImportTreeNode::getSimpleNodeName);
+
+ public static void sortNode(DbImportTreeNode node) {
+ sortNodeItems(node);
+ syncUserObjectItems(node);
+ }
+
+ public static void sortNodeWithAllChildren(DbImportTreeNode node) {
Review Comment:
A bit confusing naming of these two methods. `sortNode()` seems to sort
exactly children, and the other one just goes recursively down. Maybe something
like `sortSingleNode(node)` and `sortSubtree(root)` will do better? Not sure as
naming is always a problem..
##########
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportSorter.java:
##########
@@ -0,0 +1,110 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************/
+
+package org.apache.cayenne.modeler.editor.dbimport;
+
+import org.apache.cayenne.dbsync.reverse.dbimport.Catalog;
+import org.apache.cayenne.dbsync.reverse.dbimport.FilterContainer;
+import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable;
+import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
+import org.apache.cayenne.dbsync.reverse.dbimport.Schema;
+import org.apache.cayenne.dbsync.reverse.dbimport.SchemaContainer;
+import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.editor.dbimport.tree.NodeType;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * @since 5.0
+ */
+public class DbImportSorter {
+ private static final Comparator<DbImportTreeNode> NODE_COMPARATOR =
Comparator
+ .comparing(DbImportTreeNode::getNodeType)
+ .thenComparing(DbImportTreeNode::getSimpleNodeName);
+
+ public static void sortNode(DbImportTreeNode node) {
+ sortNodeItems(node);
+ syncUserObjectItems(node);
+ }
+
+ public static void sortNodeWithAllChildren(DbImportTreeNode node) {
+ DbImportSorter.sortNode(node);
+ for (int i = 0; i < node.getChildCount(); i++) {
Review Comment:
May be better to use a new `getChildNodes()` method here. Or event perform
all operations with children in one go (as we have the same iteration a few
lines down in the `sortNodeItems`). But not sure if it worth doing.
##########
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportSorter.java:
##########
@@ -0,0 +1,110 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************/
+
+package org.apache.cayenne.modeler.editor.dbimport;
+
+import org.apache.cayenne.dbsync.reverse.dbimport.Catalog;
+import org.apache.cayenne.dbsync.reverse.dbimport.FilterContainer;
+import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable;
+import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
+import org.apache.cayenne.dbsync.reverse.dbimport.Schema;
+import org.apache.cayenne.dbsync.reverse.dbimport.SchemaContainer;
+import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.editor.dbimport.tree.NodeType;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * @since 5.0
+ */
+public class DbImportSorter {
+ private static final Comparator<DbImportTreeNode> NODE_COMPARATOR =
Comparator
+ .comparing(DbImportTreeNode::getNodeType)
+ .thenComparing(DbImportTreeNode::getSimpleNodeName);
+
+ public static void sortNode(DbImportTreeNode node) {
+ sortNodeItems(node);
+ syncUserObjectItems(node);
+ }
+
+ public static void sortNodeWithAllChildren(DbImportTreeNode node) {
+ DbImportSorter.sortNode(node);
+ for (int i = 0; i < node.getChildCount(); i++) {
+ sortNodeWithAllChildren((DbImportTreeNode) node.getChildAt(i));
+ }
+ }
+
+ private static void sortNodeItems(DbImportTreeNode node) {
+ List<DbImportTreeNode> childNodes = node.getChildNodes();
+ node.removeAllChildren();
+ childNodes.sort(NODE_COMPARATOR);
+ childNodes.forEach(node::add);
+ }
+
+ private static void syncUserObjectItems(DbImportTreeNode parentNode) {
+
+ Object userObject = parentNode.getUserObject();
+
+ if (parentNode.isReverseEngineering()) {
+ syncCatalogs(parentNode, (ReverseEngineering) userObject);
+ syncSchemas(parentNode, (ReverseEngineering) userObject);
+ syncPatternParams(parentNode, (ReverseEngineering) userObject);
+ }
+ if (parentNode.isCatalog()) {
+ syncSchemas(parentNode, (Catalog) userObject);
+ syncPatternParams(parentNode, (Catalog) userObject);
+ }
+ if (parentNode.isSchema()) {
+ syncPatternParams(parentNode, (Schema) userObject);
+ }
+ if (parentNode.isIncludeTable()) {
+ syncTablesColumns(parentNode, (IncludeTable) userObject);
+ }
+ }
+
+ private static void syncCatalogs(DbImportTreeNode node, ReverseEngineering
reverseEngineering) {
+
syncItemsInContainer(reverseEngineering.getCatalogs(),node,NodeType.CATALOG);
+ }
+
+ private static void syncSchemas(DbImportTreeNode node, SchemaContainer
schemaContainer) {
+
syncItemsInContainer(schemaContainer.getSchemas(),node,NodeType.SCHEMA);
+ }
+
+ private static void syncPatternParams(DbImportTreeNode node,
FilterContainer container) {
+
syncItemsInContainer(container.getIncludeTables(),node,NodeType.INCLUDE_TABLE);
+
syncItemsInContainer(container.getExcludeTables(),node,NodeType.EXCLUDE_TABLE);
+
syncItemsInContainer(container.getIncludeColumns(),node,NodeType.INCLUDE_COLUMN);
+
syncItemsInContainer(container.getExcludeColumns(),node,NodeType.EXCLUDE_COLUMN);
+
syncItemsInContainer(container.getIncludeProcedures(),node,NodeType.INCLUDE_PROCEDURE);
+
syncItemsInContainer(container.getExcludeProcedures(),node,NodeType.EXCLUDE_PROCEDURE);
+ }
+
+ private static void syncTablesColumns(DbImportTreeNode node, IncludeTable
table) {
+
syncItemsInContainer(table.getIncludeColumns(),node,NodeType.INCLUDE_COLUMN);
+
syncItemsInContainer(table.getExcludeColumns(),node,NodeType.EXCLUDE_COLUMN);
+ }
+
+ @SuppressWarnings({"rawtypes", "unchecked"})
+ private static void syncItemsInContainer(Collection collection,
DbImportTreeNode node, NodeType type){
Review Comment:
It could be better to add a generic parameter, like `<T>
sync(Collection<T>...)`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@cayenne.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
