Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

XML Cleanup Neo4j Output and Neo4j Check connections #2010 #2013 #4503

Merged
merged 8 commits into from
Nov 11, 2024
Merged

XML Cleanup Neo4j Output and Neo4j Check connections #2010 #2013 #4503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6d3171d
XML cleanup for action Neo4j Check Connections. fixes #2010
bamaer Oct 25, 2024
9a3849b
neo4j output XML cleanup. working ITs in Hop GUI, MDI still broken. #…
bamaer Oct 26, 2024
66da23e
added missing ASF headers. #2010
bamaer Oct 27, 2024
339780b
XML cleanup for Neo4j Output transform. #2013
bamaer Oct 29, 2024
c24f6bc
restored original IT. #2010
bamaer Oct 30, 2024
0b3ebac
removed local env config files. #2013
bamaer Oct 30, 2024
56e243b
deleted commented xml methods. #2010
bamaer Oct 30, 2024
40a9867
Minor cleanup
hansva Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...j/tests/neo4j-output-create-nodes-relationship/neo4j-output-create-nodes-relationship.hpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,3 +411,4 @@ limitations under the License.

<attributes/>
</pipeline>

47 changes: 10 additions & 37 deletions plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/actions/check/CheckConnections.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,14 @@
import java.util.List;
import org.apache.hop.core.Result;
import org.apache.hop.core.annotations.Action;
import org.apache.hop.core.annotations.ActionTransformType;
import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.exception.HopXmlException;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.core.xml.XmlHandler;
import org.apache.hop.metadata.api.IHopMetadataProvider;
import org.apache.hop.metadata.api.HopMetadataProperty;
import org.apache.hop.metadata.api.HopMetadataPropertyType;
import org.apache.hop.metadata.api.IHopMetadataSerializer;
import org.apache.hop.neo4j.shared.NeoConnection;
import org.apache.hop.workflow.action.ActionBase;
import org.apache.hop.workflow.action.IAction;
import org.w3c.dom.Node;

@Action(
id = "NEO4J_CHECK_CONNECTIONS",
Expand All @@ -40,10 +38,16 @@
image = "neo4j_check.svg",
categoryDescription = "i18n:org.apache.hop.workflow:ActionCategory.Category.Conditions",
keywords = "i18n::CheckConnections.keyword",
documentationUrl = "/workflow/actions/neo4j-checkconnections.html")
documentationUrl = "/workflow/actions/neo4j-checkconnections.html",
actionTransformTypes = {ActionTransformType.ENV_CHECK, ActionTransformType.GRAPH})
public class CheckConnections extends ActionBase implements IAction {

public static final String CONST_CONNECTIONS = "connections";

@HopMetadataProperty(
key = "connection",
groupKey = "connections",
hopMetadataPropertyType = HopMetadataPropertyType.GRAPH_CONNECTION)
private List<String> connectionNames;

public CheckConnections() {
Expand All @@ -59,37 +63,6 @@ public CheckConnections(String name, String description) {
connectionNames = new ArrayList<>();
}

@Override
public String getXml() {
StringBuilder xml = new StringBuilder();
// Add action name, type, ...
//
xml.append(super.getXml());

xml.append(XmlHandler.openTag(CONST_CONNECTIONS));

for (String connectionName : connectionNames) {
xml.append(XmlHandler.addTagValue("connection", connectionName));
}

xml.append(XmlHandler.closeTag(CONST_CONNECTIONS));
return xml.toString();
}

@Override
public void loadXml(Node node, IHopMetadataProvider iHopMetadataProvider, IVariables iVariables)
throws HopXmlException {
super.loadXml(node);

connectionNames = new ArrayList<>();
Node connectionsNode = XmlHandler.getSubNode(node, CONST_CONNECTIONS);
List<Node> connectionNodes = XmlHandler.getNodes(connectionsNode, "connection");
for (Node connectionNode : connectionNodes) {
String connectionName = XmlHandler.getNodeValue(connectionNode);
connectionNames.add(connectionName);
}
}

@Override
public Result execute(Result result, int nr) throws HopException {

Expand Down
357 changes: 150 additions & 207 deletions plugins/tech/neo4j/src/main/java/org/apache/hop/neo4j/transforms/output/Neo4JOutput.java
View file
Open in desktop

Large diffs are not rendered by default.

188 changes: 97 additions & 91 deletions ...ns/tech/neo4j/src/main/java/org/apache/hop/neo4j/transforms/output/Neo4JOutputDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

package org.apache.hop.neo4j.transforms.output;

import java.util.ArrayList;
import java.util.List;
import org.apache.hop.core.Const;
import org.apache.hop.core.Props;
import org.apache.hop.core.exception.HopException;
Expand All @@ -30,6 +32,8 @@
import org.apache.hop.neo4j.core.Neo4jUtil;
import org.apache.hop.neo4j.model.GraphPropertyType;
import org.apache.hop.neo4j.shared.NeoConnection;
import org.apache.hop.neo4j.transforms.output.fields.LabelField;
import org.apache.hop.neo4j.transforms.output.fields.PropertyField;
import org.apache.hop.pipeline.PipelineMeta;
import org.apache.hop.ui.core.PropsUi;
import org.apache.hop.ui.core.dialog.BaseDialog;
Expand Down Expand Up @@ -346,7 +350,9 @@ public String open() {
fdlFromLabels.top = new FormAttachment(lastFromControl, margin);
wlFromLabel.setLayoutData(fdlFromLabels);
final int fromLabelRows =
(input.getFromNodeLabels() != null ? input.getFromNodeLabels().length : 10);
(!input.getNodeFromField().getLabels().isEmpty()
? input.getNodeFromField().getLabels().size()
: 10);
ColumnInfo[] fromLabelInf =
new ColumnInfo[] {
new ColumnInfo(
Expand Down Expand Up @@ -406,7 +412,9 @@ public void widgetSelected(SelectionEvent arg0) {
fdlFromFields.top = new FormAttachment(lastFromControl, margin);
wlFromFields.setLayoutData(fdlFromFields);
final int fromPropsRows =
(input.getFromNodeProps() != null ? input.getFromNodeProps().length : 10);
(input.getNodeFromField().getProperties() != null
? input.getNodeFromField().getProperties().size()
: 10);
ColumnInfo[] colinf =
new ColumnInfo[] {
new ColumnInfo(
Expand Down Expand Up @@ -462,7 +470,6 @@ public void widgetSelected(SelectionEvent event) {
fdFromPropsGrid.top = new FormAttachment(lastFromControl, margin);
fdFromPropsGrid.bottom = new FormAttachment(100, 0);
wFromPropsGrid.setLayoutData(fdFromPropsGrid);
lastFromControl = wFromPropsGrid;

FormData fdFromComp = new FormData();
fdFromComp.left = new FormAttachment(0, 0);
Expand Down Expand Up @@ -512,7 +519,10 @@ public void widgetSelected(SelectionEvent event) {
fdlToLabels.right = new FormAttachment(middle, 0);
fdlToLabels.top = new FormAttachment(lastToControl, margin);
wlToLabel.setLayoutData(fdlToLabels);
final int toLabelRows = (input.getToNodeLabels() != null ? input.getToNodeLabels().length : 10);
final int toLabelRows =
(input.getNodeToField().getLabels() != null
? input.getNodeToField().getLabels().size()
: 10);
ColumnInfo[] toLabelInf =
new ColumnInfo[] {
new ColumnInfo(
Expand Down Expand Up @@ -570,7 +580,10 @@ public void widgetSelected(SelectionEvent event) {
fdlToFields.right = new FormAttachment(middle, 0);
fdlToFields.top = new FormAttachment(lastToControl, margin);
wlToFields.setLayoutData(fdlToFields);
final int toPropsRows = (input.getToNodeProps() != null ? input.getToNodeProps().length : 10);
final int toPropsRows =
(input.getNodeToField().getProperties() != null
? input.getNodeToField().getProperties().size()
: 10);
ColumnInfo[] toColinf =
new ColumnInfo[] {
new ColumnInfo(
Expand Down Expand Up @@ -702,7 +715,7 @@ public void widgetSelected(SelectionEvent arg0) {
fdlRelProps.right = new FormAttachment(middle, -margin);
wlRelProps.setLayoutData(fdlRelProps);

final int relPropsRows = (input.getRelProps() != null ? input.getRelProps().length : 10);
final int relPropsRows = (input.getRelProps() != null ? input.getRelProps().size() : 10);
ColumnInfo[] relPropsInf =
new ColumnInfo[] {
new ColumnInfo(
Expand Down Expand Up @@ -805,61 +818,67 @@ private void getData() {
wReturnGraph.setSelection(input.isReturningGraph());
wReturnGraphField.setText(Const.NVL(input.getReturnGraphField(), ""));

wReadOnlyFromNode.setSelection(input.isReadOnlyFromNode());
wReadOnlyToNode.setSelection(input.isReadOnlyToNode());
wReadOnlyFromNode.setSelection(input.getNodeFromField().isReadOnly());
wReadOnlyToNode.setSelection(input.getNodeToField().isReadOnly());

if (input.getFromNodeLabels() != null) {
String[] fromNodeLabels = input.getFromNodeLabels();
String[] fromNodeLabelValues = input.getFromNodeLabelValues();
if (input.getNodeFromField().getLabels() != null) {
List<LabelField> labels = input.getNodeFromField().getLabels();

for (int i = 0; i < fromNodeLabels.length; i++) {
for (int i = 0; i < labels.size(); i++) {
TableItem item = wFromLabelGrid.table.getItem(i);
item.setText(1, Const.NVL(fromNodeLabels[i], ""));
item.setText(2, Const.NVL(fromNodeLabelValues[i], ""));
item.setText(1, Const.NVL(labels.get(i).getLabelField(), ""));
item.setText(2, Const.NVL(labels.get(i).getLabel(), ""));
}
}

if (input.getFromNodeProps() != null) {
if (input.getNodeFromField().getProperties() != null) {

for (int i = 0; i < input.getFromNodeProps().length; i++) {
for (int i = 0; i < input.getNodeFromField().getProperties().size(); i++) {
TableItem item = wFromPropsGrid.table.getItem(i);
item.setText(1, Const.NVL(input.getFromNodeProps()[i], ""));
item.setText(2, Const.NVL(input.getFromNodePropNames()[i], ""));
item.setText(3, Const.NVL(input.getFromNodePropTypes()[i], ""));
item.setText(4, input.getFromNodePropPrimary()[i] ? "Y" : "N");
item.setText(
1, Const.NVL(input.getNodeFromField().getProperties().get(i).getPropertyValue(), ""));
item.setText(
2, Const.NVL(input.getNodeFromField().getProperties().get(i).getPropertyName(), ""));
item.setText(
3, Const.NVL(input.getNodeFromField().getProperties().get(i).getPropertyType(), ""));
item.setText(
4, input.getNodeFromField().getProperties().get(i).isPropertyPrimary() ? "Y" : "N");
}
}

if (input.getToNodeLabels() != null) {
String[] toNodeLabels = input.getToNodeLabels();
String[] toNodeLabelValues = input.getToNodeLabelValues();
if (input.getNodeToField().getLabels() != null) {
List<LabelField> toLabels = input.getNodeToField().getLabels();

for (int i = 0; i < toNodeLabels.length; i++) {
for (int i = 0; i < toLabels.size(); i++) {
TableItem item = wToLabelGrid.table.getItem(i);
item.setText(1, Const.NVL(toNodeLabels[i], ""));
item.setText(2, Const.NVL(toNodeLabelValues[i], ""));
item.setText(1, Const.NVL(toLabels.get(i).getLabelField(), ""));
item.setText(2, Const.NVL(toLabels.get(i).getLabel(), ""));
}
}

if (input.getToNodeProps() != null) {
for (int i = 0; i < input.getToNodeProps().length; i++) {
if (input.getNodeToField().getProperties() != null) {
for (int i = 0; i < input.getNodeToField().getProperties().size(); i++) {
TableItem item = wToPropsGrid.table.getItem(i);
item.setText(1, Const.NVL(input.getToNodeProps()[i], ""));
item.setText(2, Const.NVL(input.getToNodePropNames()[i], ""));
item.setText(3, Const.NVL(input.getToNodePropTypes()[i], ""));
item.setText(4, input.getToNodePropPrimary()[i] ? "Y" : "N");
item.setText(
1, Const.NVL(input.getNodeToField().getProperties().get(i).getPropertyValue(), ""));
item.setText(
2, Const.NVL(input.getNodeToField().getProperties().get(i).getPropertyName(), ""));
item.setText(
3, Const.NVL(input.getNodeToField().getProperties().get(i).getPropertyType(), ""));
item.setText(
4, input.getNodeToField().getProperties().get(i).isPropertyPrimary() ? "Y" : "N");
}
}

wRel.setText(Const.NVL(input.getRelationship(), ""));
wRelValue.setText(Const.NVL(input.getRelationshipValue(), ""));

if (input.getRelProps() != null) {
for (int i = 0; i < input.getRelProps().length; i++) {
for (int i = 0; i < input.getRelProps().size(); i++) {
TableItem item = wRelPropsGrid.table.getItem(i);
item.setText(1, Const.NVL(input.getRelProps()[i], ""));
item.setText(2, Const.NVL(input.getRelPropNames()[i], ""));
item.setText(3, Const.NVL(input.getRelPropTypes()[i], ""));
item.setText(1, Const.NVL(input.getRelProps().get(i).getPropertyValue(), ""));
item.setText(2, Const.NVL(input.getRelProps().get(i).getPropertyName(), ""));
item.setText(3, Const.NVL(input.getRelProps().get(i).getPropertyType(), ""));
}
}

Expand All @@ -883,81 +902,68 @@ private void ok() {
input.setReturningGraph(wReturnGraph.getSelection());
input.setReturnGraphField(wReturnGraphField.getText());

input.setReadOnlyFromNode(wReadOnlyFromNode.getSelection());
input.setReadOnlyToNode(wReadOnlyToNode.getSelection());
input.getNodeFromField().setReadOnly(wReadOnlyFromNode.getSelection());
input.getNodeToField().setReadOnly(wReadOnlyToNode.getSelection());

String[] fromNodeLabels = new String[wFromLabelGrid.nrNonEmpty()];
String[] fromNodeLabelValues = new String[wFromLabelGrid.nrNonEmpty()];
for (int i = 0; i < fromNodeLabels.length; i++) {
List<LabelField> fromNodeLabels = new ArrayList<>();
for (int i = 0; i < wFromLabelGrid.nrNonEmpty(); i++) {
TableItem item = wFromLabelGrid.table.getItem(i);
fromNodeLabels[i] = item.getText(1);
fromNodeLabelValues[i] = item.getText(2);
LabelField labelField = new LabelField();
labelField.setLabelField(item.getText(1));
labelField.setLabel(item.getText(2));
fromNodeLabels.add(labelField);
}
input.setFromNodeLabels(fromNodeLabels);
input.setFromNodeLabelValues(fromNodeLabelValues);
input.getNodeFromField().setLabels(fromNodeLabels);

String[] toNodeLabels = new String[wToLabelGrid.nrNonEmpty()];
String[] toNodeLabelValues = new String[wToLabelGrid.nrNonEmpty()];
for (int i = 0; i < toNodeLabels.length; i++) {
List<LabelField> toNodeLabels = new ArrayList<>();
for (int i = 0; i < wToLabelGrid.nrNonEmpty(); i++) {
TableItem item = wToLabelGrid.table.getItem(i);
toNodeLabels[i] = item.getText(1);
toNodeLabelValues[i] = item.getText(2);
LabelField labelField = new LabelField();
labelField.setLabelField(item.getText(1));
labelField.setLabel(item.getText(2));
toNodeLabels.add(labelField);
}
input.setToNodeLabels(toNodeLabels);
input.setToNodeLabelValues(toNodeLabelValues);
input.getNodeToField().setLabels(toNodeLabels);

int nbFromPropLines = wFromPropsGrid.nrNonEmpty();
String[] fromNodeProps = new String[nbFromPropLines];
String[] fromNodePropNames = new String[nbFromPropLines];
String[] fromNodePropTypes = new String[nbFromPropLines];
boolean[] fromNodePropPrimary = new boolean[nbFromPropLines];

for (int i = 0; i < fromNodeProps.length; i++) {
List<PropertyField> fromNodeProps = new ArrayList<>();
for (int i = 0; i < nbFromPropLines; i++) {
TableItem item = wFromPropsGrid.table.getItem(i);
fromNodeProps[i] = item.getText(1);
fromNodePropNames[i] = item.getText(2);
fromNodePropTypes[i] = item.getText(3);
fromNodePropPrimary[i] = "Y".equalsIgnoreCase(item.getText(4));
PropertyField nodePropertyField = new PropertyField();
nodePropertyField.setPropertyValue(item.getText(1));
nodePropertyField.setPropertyName(item.getText(2));
nodePropertyField.setPropertyType(item.getText(3));
nodePropertyField.setPropertyPrimary("Y".equalsIgnoreCase(item.getText(4)));
fromNodeProps.add(nodePropertyField);
}
input.setFromNodeProps(fromNodeProps);
input.setFromNodePropNames(fromNodePropNames);
input.setFromNodePropTypes(fromNodePropTypes);
input.setFromNodePropPrimary(fromNodePropPrimary);

int nbToPropLines = wToPropsGrid.nrNonEmpty();
String[] toNodeProps = new String[nbToPropLines];
String[] toNodePropNames = new String[nbToPropLines];
String[] toNodePropTypes = new String[nbToPropLines];
boolean[] toNodePropPrimary = new boolean[nbToPropLines];

for (int i = 0; i < toNodeProps.length; i++) {
input.getNodeFromField().setProperties(fromNodeProps);

List<PropertyField> toNodeProps = new ArrayList<>();
for (int i = 0; i < wToPropsGrid.nrNonEmpty(); i++) {
TableItem item = wToPropsGrid.table.getItem(i);
toNodeProps[i] = item.getText(1);
toNodePropNames[i] = item.getText(2);
toNodePropTypes[i] = item.getText(3);
toNodePropPrimary[i] = "Y".equalsIgnoreCase(item.getText(4));
PropertyField nodePropertyField = new PropertyField();
nodePropertyField.setPropertyValue(item.getText(1));
nodePropertyField.setPropertyName(item.getText(2));
nodePropertyField.setPropertyType(item.getText(3));
nodePropertyField.setPropertyPrimary("Y".equalsIgnoreCase(item.getText(4)));
toNodeProps.add(nodePropertyField);
}
input.setToNodeProps(toNodeProps);
input.setToNodePropNames(toNodePropNames);
input.setToNodePropTypes(toNodePropTypes);
input.setToNodePropPrimary(toNodePropPrimary);
input.getNodeToField().setProperties(toNodeProps);

input.setRelationship(wRel.getText());
input.setRelationshipValue(wRelValue.getText());

int nbRelProps = wRelPropsGrid.nrNonEmpty();
String[] relProps = new String[nbRelProps];
String[] relPropNames = new String[nbRelProps];
String[] relPropTypes = new String[nbRelProps];
for (int i = 0; i < relProps.length; i++) {
List<PropertyField> relProps = new ArrayList<>();
for (int i = 0; i < nbRelProps; i++) {
TableItem item = wRelPropsGrid.table.getItem(i);
relProps[i] = item.getText(1);
relPropNames[i] = item.getText(2);
relPropTypes[i] = item.getText(3);
PropertyField relPropField = new PropertyField();
relPropField.setPropertyValue(item.getText(1));
relPropField.setPropertyName(item.getText(2));
relPropField.setPropertyType(item.getText(3));
relProps.add(relPropField);
}
input.setRelProps(relProps);
input.setRelPropNames(relPropNames);
input.setRelPropTypes(relPropTypes);

// Mark transform as changed
transformMeta.setChanged();
Expand Down
Loading
Loading