Skip to content

Refactor NodeManager initialization #5

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

Open
joordih wants to merge 1 commit into
base: codex-merge
Choose a base branch
from
Open

Refactor NodeManager initialization #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions src/main/java/dev/joordih/zenmap/Zenmap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ public class Zenmap {

private final ProviderManager providerManager;

private final NodeManager nodeManager;


public Zenmap() {
instance = this;
Expand All @@ -35,11 +37,16 @@ public Zenmap() {
this.providerManager.loadProviders();

System.out.println("Instancing and loading nodes...");
new NodeManager();
this.nodeManager = new NodeManager();
}

public void runTests() {
this.nodeManager.runAllTests();
}

public static void main(String[] args) {
new Zenmap();
Zenmap app = new Zenmap();
app.runTests();

Thread keepAliveThread = new Thread(() -> {
while (true) {
Expand Down
31 changes: 0 additions & 31 deletions src/main/java/dev/joordih/zenmap/managers/nodes/NodeManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
package dev.joordih.zenmap.managers.nodes;

import com.google.common.collect.Lists;
import dev.joordih.zenmap.managers.nodes.city.City;
import dev.joordih.zenmap.managers.nodes.city.CityStrategy;
import dev.joordih.zenmap.managers.nodes.intersection.Intersection;
import dev.joordih.zenmap.managers.nodes.intersection.IntersectionStrategy;
import dev.joordih.zenmap.managers.nodes.lane.Lane;
import dev.joordih.zenmap.managers.nodes.lane.LaneStrategy;
import dev.joordih.zenmap.managers.nodes.track.Track;
import dev.joordih.zenmap.managers.nodes.track.TrackStrategy;
import dev.joordih.zenmap.managers.providers.impl.Neo4jProvider;
import dev.joordih.zenmap.managers.repository.NeoObjectRepository;
import dev.joordih.zenmap.managers.service.RouteService;
Expand All @@ -17,7 +12,6 @@

import java.util.Collection;
import java.util.List;
import java.util.Optional;

public class NodeManager {

Expand All @@ -27,38 +21,13 @@ public class NodeManager {
private final NeoObjectRepository<Intersection> intersectionRepository;
private final RouteService routeService;

private void initializeStrategyIfEmpty(Collection<?> collection, Runnable strategyInitializer, String strategyName) {
if (collection.isEmpty()) {
strategyInitializer.run();
System.out.println(strategyName + " initialized.");
}
}

public NodeManager() {
Neo4jProvider provider = new Neo4jProvider();
Session session = Neo4jProvider.getSessionFactory().openSession();
this.laneRepository = new NeoObjectRepository<>(session, Lane.class);
this.cityRepository = new NeoObjectRepository<>(session, City.class);
this.trackRepository = new NeoObjectRepository<>(session, Track.class);
this.intersectionRepository = new NeoObjectRepository<>(session, Intersection.class);
this.routeService = new RouteService();

Collection<City> cities = Optional.ofNullable(this.cityRepository.findAll()).orElse(Lists.newArrayList());
Collection<Lane> lanes = Optional.ofNullable(this.laneRepository.findAll()).orElse(Lists.newArrayList());
Collection<Track> tracks = Optional.ofNullable(this.trackRepository.findAll()).orElse(Lists.newArrayList());
Collection<Intersection> intersections = Optional.ofNullable(this.intersectionRepository.findAll()).orElse(Lists.newArrayList());

System.out.println("Cities: " + cities.size());
System.out.println("Lanes: " + lanes.size());
System.out.println("Tracks: " + tracks.size());
System.out.println("Intersections: " + intersections.size());

initializeStrategyIfEmpty(cities, () -> new CityStrategy(provider, session), "Cities");
initializeStrategyIfEmpty(lanes, () -> new LaneStrategy(provider, session, cities), "Lanes");
initializeStrategyIfEmpty(tracks, () -> new TrackStrategy(provider, session, lanes), "Tracks");
initializeStrategyIfEmpty(intersections, () -> new IntersectionStrategy(provider, session, tracks), "Intersections");

runAllTests();
}

public void testUpdateDirections() {
Expand Down