Fixed up the multiple doctor actors being one doctor bug (around John Hurt)

jimwebber · jimwebber · commit 85a26d662020 · 2014-04-28T11:29:16.000+01:00
diff --git a/src/main/java/org/neo4j/tutorial/DoctorWhoUniverseGenerator.java b/src/main/java/org/neo4j/tutorial/DoctorWhoUniverseGenerator.java
@@ -60,7 +60,8 @@ private void createDatabaseCache( String currentDbDir ) throws IOException
 
     private boolean cachedDatabaseExists()
     {
-        return cachedCleanDatabaseDirectory.exists() && cachedCleanDatabaseDirectory.isDirectory();
+        return false; // for debugging
+//        return cachedCleanDatabaseDirectory.exists() && cachedCleanDatabaseDirectory.isDirectory();
     }
 
     private String copyDatabaseFromCachedDirectoryToTempDirectory() throws IOException
diff --git a/src/main/java/org/neo4j/tutorial/EpisodeBuilder.java b/src/main/java/org/neo4j/tutorial/EpisodeBuilder.java
@@ -1,18 +1,17 @@
 package org.neo4j.tutorial;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import org.neo4j.cypher.ExecutionEngine;
 
 import static java.lang.String.format;
+import static java.util.Collections.addAll;
 
 import static org.neo4j.tutorial.ShortIdGenerator.shortId;
 
 public class EpisodeBuilder
 {
-
     private String title;
     private List<String> companionNames = new ArrayList<>();
     private String episodeNumber = null;
@@ -53,25 +52,25 @@ public EpisodeBuilder title( String title )
 
     public EpisodeBuilder doctor( String... actorNames )
     {
-        Collections.addAll( doctorActors, actorNames );
+        addAll( doctorActors, actorNames );
         return this;
     }
 
     public EpisodeBuilder companion( String... namesOfCompanions )
     {
-        Collections.addAll( companionNames, namesOfCompanions );
+        addAll( companionNames, namesOfCompanions );
         return this;
     }
 
     public EpisodeBuilder enemySpecies( String... enemySpecies )
     {
-        Collections.addAll( this.enemySpecies, enemySpecies );
+        addAll( this.enemySpecies, enemySpecies );
         return this;
     }
 
     public EpisodeBuilder enemy( String... enemies )
     {
-        Collections.addAll( this.enemies, enemies );
+        addAll( this.enemies, enemies );
         return this;
     }
 
@@ -229,13 +228,13 @@ public EpisodeBuilder allies( String... allies )
 
     public EpisodeBuilder alliedSpecies( String... alliedSpecies )
     {
-        Collections.addAll( this.alliedSpecies, alliedSpecies );
+        addAll( this.alliedSpecies, alliedSpecies );
         return this;
     }
 
     public EpisodeBuilder others( String... others )
     {
-        Collections.addAll( this.others, others );
+        addAll( this.others, others );
         return this;
     }
 
diff --git a/src/main/java/org/neo4j/tutorial/Episodes.java b/src/main/java/org/neo4j/tutorial/Episodes.java
@@ -144,18 +144,18 @@ private void season34()
                 .others( "War Doctor" )
                 .fact( engine );
         episode( "Special" ).title( "The Night of the Doctor" )
-                .doctor( "Paul McGann, John Hurt" )
+                .doctor( "Paul McGann", "John Hurt" )
                 .allies( "Sisterhood of Karn" )
                 .others( "War Doctor" )
                 .fact( engine );
         episode( 240 ).title( "The Day of the Doctor" )
-                .doctor( "David Tennant, Matt Smith, John Hurt" )
+                .doctor( "David Tennant", "Matt Smith", "John Hurt" )
                 .companion( "Clara Oswald" )
                 .enemySpecies( "Zygon" )
                 .others( "War Doctor" )
                 .fact( engine );
         episode( 241 ).title( "The Time of the Doctor" )
-                .doctor( "Matt Smith, Peter Capaldi" )
+                .doctor( "Matt Smith", "Peter Capaldi" )
                 .companion( "Clara Oswald" )
                 .allies( "Tasha Lem" )
                 .enemySpecies( "Cyberman", "Dalek" )
diff --git a/src/main/java/org/neo4j/tutorial/server/ServerBuilder.java b/src/main/java/org/neo4j/tutorial/server/ServerBuilder.java
@@ -8,6 +8,8 @@
 import java.util.Properties;
 
 import org.neo4j.helpers.collection.MapUtil;
+import org.neo4j.kernel.configuration.Config;
+import org.neo4j.kernel.logging.ClassicLoggingService;
 import org.neo4j.server.CommunityNeoServer;
 import org.neo4j.server.configuration.Configurator;
 import org.neo4j.server.configuration.PropertyFileConfigurator;
@@ -16,6 +18,8 @@
 import org.neo4j.server.database.CommunityDatabase;
 import org.neo4j.server.database.Database;
 
+import static org.neo4j.kernel.logging.ConsoleLogger.DEV_NULL;
+
 public class ServerBuilder
 {
     private String portNo = "7474";
@@ -45,13 +49,12 @@ public CommunityNeoServer build() throws IOException
         }
         File configFile = createPropertiesFiles();
 
-        return new CommunityNeoServer(
-                new PropertyFileConfigurator( new Validator( new DatabaseLocationMustBeSpecifiedRule() ), configFile ) )
+        return new CommunityNeoServer( new PropertyFileConfigurator( new Validator( new DatabaseLocationMustBeSpecifiedRule() ), configFile, DEV_NULL), new ClassicLoggingService( new Config(  ) ) )
         {
             @Override
             protected Database createDatabase()
             {
-                return new CommunityDatabase( configurator );
+                return new CommunityDatabase( configurator, logging );
             }
         };
     }

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,8 @@ private void createDatabaseCache( String currentDbDir ) throws IOException`
`60`	`60`
`61`	`61`	`private boolean cachedDatabaseExists()`
`62`	`62`	`{`
`63`		`- return cachedCleanDatabaseDirectory.exists() && cachedCleanDatabaseDirectory.isDirectory();`
	`63`	`+ return false; // for debugging`
	`64`	`+// return cachedCleanDatabaseDirectory.exists() && cachedCleanDatabaseDirectory.isDirectory();`
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`private String copyDatabaseFromCachedDirectoryToTempDirectory() throws IOException`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,17 @@`
`1`	`1`	`package org.neo4j.tutorial;`
`2`	`2`
`3`	`3`	`import java.util.ArrayList;`
`4`		`-import java.util.Collections;`
`5`	`4`	`import java.util.List;`
`6`	`5`
`7`	`6`	`import org.neo4j.cypher.ExecutionEngine;`
`8`	`7`
`9`	`8`	`import static java.lang.String.format;`
	`9`	`+import static java.util.Collections.addAll;`
`10`	`10`
`11`	`11`	`import static org.neo4j.tutorial.ShortIdGenerator.shortId;`
`12`	`12`
`13`	`13`	`public class EpisodeBuilder`
`14`	`14`	`{`
`15`		`-`
`16`	`15`	`private String title;`
`17`	`16`	`private List<String> companionNames = new ArrayList<>();`
`18`	`17`	`private String episodeNumber = null;`
`@@ -53,25 +52,25 @@ public EpisodeBuilder title( String title )`
`53`	`52`
`54`	`53`	`public EpisodeBuilder doctor( String... actorNames )`
`55`	`54`	`{`
`56`		`- Collections.addAll( doctorActors, actorNames );`
	`55`	`+ addAll( doctorActors, actorNames );`
`57`	`56`	`return this;`
`58`	`57`	`}`
`59`	`58`
`60`	`59`	`public EpisodeBuilder companion( String... namesOfCompanions )`
`61`	`60`	`{`
`62`		`- Collections.addAll( companionNames, namesOfCompanions );`
	`61`	`+ addAll( companionNames, namesOfCompanions );`
`63`	`62`	`return this;`
`64`	`63`	`}`
`65`	`64`
`66`	`65`	`public EpisodeBuilder enemySpecies( String... enemySpecies )`
`67`	`66`	`{`
`68`		`- Collections.addAll( this.enemySpecies, enemySpecies );`
	`67`	`+ addAll( this.enemySpecies, enemySpecies );`
`69`	`68`	`return this;`
`70`	`69`	`}`
`71`	`70`
`72`	`71`	`public EpisodeBuilder enemy( String... enemies )`
`73`	`72`	`{`
`74`		`- Collections.addAll( this.enemies, enemies );`
	`73`	`+ addAll( this.enemies, enemies );`
`75`	`74`	`return this;`
`76`	`75`	`}`
`77`	`76`
`@@ -229,13 +228,13 @@ public EpisodeBuilder allies( String... allies )`
`229`	`228`
`230`	`229`	`public EpisodeBuilder alliedSpecies( String... alliedSpecies )`
`231`	`230`	`{`
`232`		`- Collections.addAll( this.alliedSpecies, alliedSpecies );`
	`231`	`+ addAll( this.alliedSpecies, alliedSpecies );`
`233`	`232`	`return this;`
`234`	`233`	`}`
`235`	`234`
`236`	`235`	`public EpisodeBuilder others( String... others )`
`237`	`236`	`{`
`238`		`- Collections.addAll( this.others, others );`
	`237`	`+ addAll( this.others, others );`
`239`	`238`	`return this;`
`240`	`239`	`}`
`241`	`240`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`	`import java.util.Properties;`
`9`	`9`
`10`	`10`	`import org.neo4j.helpers.collection.MapUtil;`
	`11`	`+import org.neo4j.kernel.configuration.Config;`
	`12`	`+import org.neo4j.kernel.logging.ClassicLoggingService;`
`11`	`13`	`import org.neo4j.server.CommunityNeoServer;`
`12`	`14`	`import org.neo4j.server.configuration.Configurator;`
`13`	`15`	`import org.neo4j.server.configuration.PropertyFileConfigurator;`
`@@ -16,6 +18,8 @@`
`16`	`18`	`import org.neo4j.server.database.CommunityDatabase;`
`17`	`19`	`import org.neo4j.server.database.Database;`
`18`	`20`
	`21`	`+import static org.neo4j.kernel.logging.ConsoleLogger.DEV_NULL;`
	`22`	`+`
`19`	`23`	`public class ServerBuilder`
`20`	`24`	`{`
`21`	`25`	`private String portNo = "7474";`
`@@ -45,13 +49,12 @@ public CommunityNeoServer build() throws IOException`
`45`	`49`	`}`
`46`	`50`	`File configFile = createPropertiesFiles();`
`47`	`51`
`48`		`- return new CommunityNeoServer(`
`49`		`- new PropertyFileConfigurator( new Validator( new DatabaseLocationMustBeSpecifiedRule() ), configFile ) )`
	`52`	`+ return new CommunityNeoServer( new PropertyFileConfigurator( new Validator( new DatabaseLocationMustBeSpecifiedRule() ), configFile, DEV_NULL), new ClassicLoggingService( new Config( ) ) )`
`50`	`53`	`{`
`51`	`54`	`@Override`
`52`	`55`	`protected Database createDatabase()`
`53`	`56`	`{`
`54`		`- return new CommunityDatabase( configurator );`
	`57`	`+ return new CommunityDatabase( configurator, logging );`
`55`	`58`	`}`
`56`	`59`	`};`
`57`	`60`	`}`