Skip to content

Commit 46b7424

Browse files
omarlarusomarlarus
committed
Changed default values
1 parent 588264a commit 46b7424

8 files changed

Lines changed: 45 additions & 21 deletions

File tree

‎neo4j-json/README.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ CREATE (n:JSON_CONFIG {
2525
,root_node_key_property:'_document_key'
2626
,document_default_label:'DocNode'
2727
,document_id_builder:'org.neo4j.helpers.json.document.impl.DocumentIdBuilderTypeId'
28-
,document_relation_builder:'org.neo4j.helpers.json.document.impl.DocumentRelationBuilderTypeArrayKey'
29-
,document_label_builder:'org.neo4j.helpers.json.document.impl.DocumentLabelBuilderConstant'
28+
,document_relation_builder:'org.neo4j.helpers.json.document.impl.DocumentRelationBuilderHasTypeArrayKey'
29+
,document_label_builder:'org.neo4j.helpers.json.document.impl.DocumentLabelBuilderByType'
30+
,log_discard_events: false
3031
})
3132
```
3233

@@ -59,6 +60,7 @@ It's the name of class that implements `org.neo4j.helpers.json.document.Document
5960

6061
You can choose from:
6162
* `org.neo4j.helpers.json.document.impl.DocumentRelationBuilderTypeArrayKey`
63+
* `org.neo4j.helpers.json.document.impl.DocumentRelationBuilderHasTypeArrayKey`
6264
* `org.neo4j.helpers.json.document.impl.DocumentRelationBuilderByKey`
6365
* your own implementation
6466

@@ -67,6 +69,7 @@ It's the name of class that implements `org.neo4j.helpers.json.document.Document
6769

6870
You can choose from:
6971
* `org.neo4j.helpers.json.document.impl.DocumentLabelBuilderConstant`
72+
* `org.neo4j.helpers.json.document.impl.DocumentLabelBuilderByType`
7073
* `org.neo4j.helpers.json.document.impl.DocumentLabelBuilderById`
7174
* your own implementation
7275

‎neo4j-json/src/main/java/org/neo4j/helpers/json/config/impl/JsonHelperConfigurationByNode.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public JsonHelperConfigurationByNode(Node confNode) {
5252
this.configuration.put("document_relation_builder", String.valueOf(confNode.getProperty("document_relation_builder")));
5353
this.configuration.put("document_label_builder", String.valueOf(confNode.getProperty("document_label_builder")));
5454
this.configuration.put("document_default_label", String.valueOf(confNode.getProperty("document_default_label")));
55+
this.configuration.put("log_discard_events", String.valueOf(confNode.getProperty("log_discard_events")));
5556
}
5657

5758
/*
@@ -70,6 +71,7 @@ protected DocumentGrapherExecutionContext buildContext(GraphDatabaseService db,
7071
String docRelBuilderString = this.configuration.get("document_relation_builder");
7172
String docLabelBuilderString = this.configuration.get("document_label_builder");
7273
String defaultLabel = this.configuration.get("document_default_label");
74+
String logDiscardEvent = this.configuration.get("log_discard_events");
7375

7476
context.setRootNodeKeyProperty(keyProperty);
7577

@@ -86,7 +88,8 @@ protected DocumentGrapherExecutionContext buildContext(GraphDatabaseService db,
8688
context.setDocumentLabelBuilder(documentLabelBuilder);
8789
context.setDb(db);
8890
context.setLog(log);
89-
91+
context.setLogDiscard(Boolean.getBoolean(logDiscardEvent));
92+
9093
return context;
9194
}
9295

‎neo4j-json/src/main/java/org/neo4j/helpers/json/config/impl/JsonHelperConfigurationDefault.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.neo4j.helpers.json.config.JsonHelperConfiguration;
2323
import org.neo4j.helpers.json.document.context.DocumentGrapherExecutionContext;
2424
import org.neo4j.helpers.json.document.impl.DocumentIdBuilderTypeId;
25-
import org.neo4j.helpers.json.document.impl.DocumentLabelBuilderConstant;
26-
import org.neo4j.helpers.json.document.impl.DocumentRelationBuilderTypeArrayKey;
25+
import org.neo4j.helpers.json.document.impl.DocumentLabelBuilderByType;
26+
import org.neo4j.helpers.json.document.impl.DocumentRelationBuilderHasTypeArrayKey;
2727
import org.neo4j.logging.Log;
2828

2929
/**
@@ -43,16 +43,17 @@ public DocumentGrapherExecutionContext buildContext(GraphDatabaseService db, Log
4343
context.setRootNodeKeyProperty("_document_key");
4444
context.setDocumentIdBuilder(new DocumentIdBuilderTypeId());
4545

46-
DocumentRelationBuilderTypeArrayKey relBuilder = new DocumentRelationBuilderTypeArrayKey();
46+
DocumentRelationBuilderHasTypeArrayKey relBuilder = new DocumentRelationBuilderHasTypeArrayKey();
4747
relBuilder.setDb(db);
4848
relBuilder.setLog(log);
4949

5050
context.setDocumentRelationBuilder(relBuilder);
51-
DocumentLabelBuilderConstant documentLabelBuilder = new DocumentLabelBuilderConstant();
51+
DocumentLabelBuilderByType documentLabelBuilder = new DocumentLabelBuilderByType();
5252
documentLabelBuilder.setDefaultLabel("DocNode");
5353
context.setDocumentLabelBuilder(documentLabelBuilder);
5454
context.setDb(db);
5555
context.setLog(log);
56+
context.setLogDiscard(false);
5657

5758
return context;
5859
}

‎neo4j-json/src/main/java/org/neo4j/helpers/json/document/context/DocumentGrapherExecutionContext.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ public class DocumentGrapherExecutionContext {
3939
private DocumentRelationBuilder documentRelationBuilder;
4040
private DocumentLabelBuilder documentLabelBuilder;
4141
private String rootNodeKeyProperty;
42+
/**
43+
* True if the system log the discard event
44+
*/
45+
private boolean logDiscard;
4246

4347
/**
4448
* @return the rootNodeKeyProperty
@@ -130,4 +134,12 @@ public void setDocumentRelationBuilder(DocumentRelationBuilder documentRelationB
130134
this.documentRelationBuilder = documentRelationBuilder;
131135
}
132136

137+
public boolean isLogDiscard() {
138+
return logDiscard;
139+
}
140+
141+
public void setLogDiscard(boolean logDiscard) {
142+
this.logDiscard = logDiscard;
143+
}
144+
133145
}

‎neo4j-json/src/main/java/org/neo4j/helpers/json/document/impl/DocumentGrapherRecursive.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public class DocumentGrapherRecursive implements DocumentGrapher {
5353
private DocumentRelationBuilder documentRelationBuilder;
5454
private DocumentLabelBuilder documentLabelBuilder;
5555
private String rootNodeKeyProperty;
56+
private boolean logDiscadEvent;
5657

5758
/**
5859
* Init with context/configuration
@@ -63,8 +64,9 @@ public DocumentGrapherRecursive(DocumentGrapherExecutionContext context) {
6364
this.log = context.getLog();
6465
this.documentIdBuilder = context.getDocumentIdBuilder();
6566
this.documentRelationBuilder = context.getDocumentRelationBuilder();
66-
documentLabelBuilder = context.getDocumentLabelBuilder();
67-
rootNodeKeyProperty = context.getRootNodeKeyProperty();
67+
this.documentLabelBuilder = context.getDocumentLabelBuilder();
68+
this.rootNodeKeyProperty = context.getRootNodeKeyProperty();
69+
this.logDiscadEvent = context.isLogDiscard();
6870
}
6971

7072
/**
@@ -249,7 +251,9 @@ private void manageComplexType(String key, RecursiveReturn result, Map inner, in
249251
result.childrenNodes.add(child);
250252
}catch(Exception e)
251253
{
252-
log.info("Discard document "+inner+": "+e.getMessage());
254+
if(logDiscadEvent){
255+
log.info("Discard document "+inner+": "+e.getMessage());
256+
}
253257
}
254258
}
255259

‎neo4j-json/src/test/java/org/neo4j/helpers/json/JsonHelperCustomTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ public void setUp() throws Exception {
8989
+ ",document_id_builder:'org.neo4j.helpers.json.document.impl.DocumentIdBuilderId'"
9090
+ ",document_relation_builder:'org.neo4j.helpers.json.document.impl.DocumentRelationBuilderByKey'"
9191
+ ",document_label_builder:'org.neo4j.helpers.json.document.impl.DocumentLabelBuilderById'"
92+
+ ",log_discard_events: true"
9293
+ "})");
9394
}
9495

‎neo4j-json/src/test/java/org/neo4j/helpers/json/JsonHelperDefaultTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public void shouldCreateComplexArray1(){
175175
Record single = result.single();
176176
Assert.assertEquals("Wrong node","Genesis", single.get("art.name").asString());
177177
Assert.assertEquals("Wrong inner node","From Genesis to Revelation", single.get("alb.title").asString());
178-
Assert.assertEquals("Wrong inner node","artist_album", single.get("r").asRelationship().type());
178+
Assert.assertEquals("Wrong inner node","HAS_ALBUM", single.get("r").asRelationship().type());
179179

180180
}
181181

@@ -218,13 +218,13 @@ public void shouldCreateRelationKeys(){
218218
Record genesis = list.get(0);
219219
Assert.assertEquals("Wrong node","Genesis", genesis.get("art.name").asString());
220220
Assert.assertEquals("Wrong inner node","From Genesis to Revelation", genesis.get("alb.title").asString());
221-
Assert.assertEquals("Wrong inner node","artist_album", genesis.get("r").asRelationship().type());
221+
Assert.assertEquals("Wrong inner node","HAS_ALBUM", genesis.get("r").asRelationship().type());
222222
Assert.assertEquals("docKeys errato",1, genesis.get("r.docKeys").asList().size());
223223

224224
Record king = list.get(1);
225225
Assert.assertEquals("Wrong node","King Crimson", king.get("art.name").asString());
226226
Assert.assertEquals("Wrong inner node","From Genesis to Revelation", king.get("alb.title").asString());
227-
Assert.assertEquals("Wrong inner node","artist_album", king.get("r").asRelationship().type());
227+
Assert.assertEquals("Wrong inner node","HAS_ALBUM", king.get("r").asRelationship().type());
228228
Assert.assertEquals("docKeys errato",1, king.get("r.docKeys").asList().size());
229229

230230
Assert.assertTrue(genesis.get("r.docKeys").asList().contains("genesis"));
@@ -365,7 +365,7 @@ public void shouldCreateRelation() {
365365
Record single = result.single();
366366
Assert.assertEquals("Wrong node","Genesis", single.get("a.name").asString());
367367
Assert.assertEquals("Wrong inner node","England", single.get("o.country").asString());
368-
Assert.assertEquals("Wrong inner node","artist_origin", single.get("r").asRelationship().type());
368+
Assert.assertEquals("Wrong inner node","HAS_ORIGIN", single.get("r").asRelationship().type());
369369
}
370370

371371
@Test
@@ -394,13 +394,13 @@ public void shouldCreate2LevelRelation(){
394394
Record single = result.single();
395395
Assert.assertEquals("Wrong node","Genesis", single.get("art.name").asString());
396396
Assert.assertEquals("Wrong inner node","From Genesis to Revelation", single.get("alb.title").asString());
397-
Assert.assertEquals("Wrong inner node","artist_album", single.get("r").asRelationship().type());
397+
Assert.assertEquals("Wrong inner node","HAS_ALBUM", single.get("r").asRelationship().type());
398398

399399
StatementResult result1 = session.run("MATCH (alb {type: 'album'}) - [r] -> (tra {type: 'track'}) RETURN alb.title, tra.title,r");
400400
Record single1 = result1.single();
401401
Assert.assertEquals("Wrong album node","From Genesis to Revelation", single1.get("alb.title").asString());
402402
Assert.assertEquals("Wrong track node","Where the Sour Turns to Sweet", single1.get("tra.title").asString());
403-
Assert.assertEquals("Wrong inner node","album_track", single1.get("r").asRelationship().type());
403+
Assert.assertEquals("Wrong inner node","HAS_TRACK", single1.get("r").asRelationship().type());
404404
}
405405

406406
@Test

‎neo4j-json/src/test/java/org/neo4j/helpers/json/config/JsonHelperConfigurationDefaultTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
package org.neo4j.helpers.json.config;
2020

21-
import static org.easymock.EasyMock.*;
21+
import static org.easymock.EasyMock.expect;
2222
import static org.easymock.EasyMock.replay;
2323

2424
import org.easymock.EasyMockRunner;
@@ -33,8 +33,8 @@
3333
import org.neo4j.helpers.json.document.DocumentRelationBuilder;
3434
import org.neo4j.helpers.json.document.context.DocumentGrapherExecutionContext;
3535
import org.neo4j.helpers.json.document.impl.DocumentIdBuilderTypeId;
36-
import org.neo4j.helpers.json.document.impl.DocumentLabelBuilderConstant;
37-
import org.neo4j.helpers.json.document.impl.DocumentRelationBuilderTypeArrayKey;
36+
import org.neo4j.helpers.json.document.impl.DocumentLabelBuilderByType;
37+
import org.neo4j.helpers.json.document.impl.DocumentRelationBuilderHasTypeArrayKey;
3838
import org.neo4j.logging.Log;
3939

4040
/**
@@ -106,7 +106,7 @@ public void testConfigurationType()
106106
Assert.assertTrue(ctx.getLog() == log);
107107
Assert.assertEquals("_document_key",ctx.getRootNodeKeyProperty());
108108
Assert.assertTrue(ctx.getDocumentIdBuilder() instanceof DocumentIdBuilderTypeId);
109-
Assert.assertTrue(ctx.getDocumentLabelBuilder() instanceof DocumentLabelBuilderConstant);
110-
Assert.assertTrue(ctx.getDocumentRelationBuilder() instanceof DocumentRelationBuilderTypeArrayKey);
109+
Assert.assertTrue(ctx.getDocumentLabelBuilder() instanceof DocumentLabelBuilderByType);
110+
Assert.assertTrue(ctx.getDocumentRelationBuilder() instanceof DocumentRelationBuilderHasTypeArrayKey);
111111
}
112112
}

0 commit comments

Comments
 (0)