X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fdemoscenemusic%2Fdata%2FDataManager.java;h=0c6f4220189809aad824209a9596c647c094cbf9;hb=cc3a4940ce06e23e0d480d5db706878a11c007c3;hp=d8b9d62e3d11309263e60240034eb657e8946b72;hpb=0628c1f427c2abf3d840e9fd0b8f6ce48bce9706;p=demoscenemusic.git

diff --git a/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java b/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
index d8b9d62..0c6f422 100644
--- a/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
+++ b/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
@@ -19,9 +19,7 @@ package net.pterodactylus.demoscenemusic.data;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.Callable;
 
@@ -33,11 +31,9 @@ import net.pterodactylus.util.database.Join;
 import net.pterodactylus.util.database.Join.JoinType;
 import net.pterodactylus.util.database.ObjectCreator;
 import net.pterodactylus.util.database.OrderField;
-import net.pterodactylus.util.database.OrderField.Order;
 import net.pterodactylus.util.database.Parameter.StringParameter;
 import net.pterodactylus.util.database.Query;
 import net.pterodactylus.util.database.Query.Type;
-import net.pterodactylus.util.database.ResultProcessor;
 import net.pterodactylus.util.database.ValueField;
 import net.pterodactylus.util.database.ValueFieldWhereClause;
 
@@ -50,6 +46,7 @@ public class DataManager {
 
 	private final ObjectCreator<Artist> artistCreator = new ArtistCreator();
 	private final ObjectCreator<Group> groupCreator = new GroupCreator();
+	private final ObjectCreator<Track> trackCreator = new TrackCreator();
 
 	private final Database database;
 
@@ -66,15 +63,8 @@ public class DataManager {
 	public Artist getArtistById(String id) throws DatabaseException {
 		Query query = new Query(Type.SELECT, "ARTISTS");
 		query.addField(new Field("ARTISTS.*"));
-		query.addField(new Field("GROUP_ARTISTS.*"));
-		query.addField(new Field("GROUPS.*"));
-		query.addJoin(new Join(JoinType.INNER, "GROUP_ARTISTS", new Field("ARTISTS.ID"), new Field("GROUP_ARTISTS.ARTIST")));
-		query.addJoin(new Join(JoinType.INNER, "GROUPS", new Field("GROUP_ARTISTS.GROUP_"), new Field("GROUPS.ID")));
 		query.addWhereClause(new ValueFieldWhereClause(new ValueField("ARTISTS.ID", new StringParameter(id))));
-		query.addOrderField(new OrderField(new Field("ARTISTS.ID")));
-		ArtistLoader artistLoader = new ArtistLoader();
-		database.process(query, artistLoader);
-		return artistLoader.get();
+		return database.getSingle(query, artistCreator);
 	}
 
 	public Collection<Artist> getArtistsByGroup(String groupId) throws DatabaseException {
@@ -88,39 +78,16 @@ public class DataManager {
 	public Track trackById(String id) throws DatabaseException {
 		Query query = new Query(Type.SELECT, "TRACKS");
 		query.addField(new Field("TRACKS.*"));
-		query.addField(new Field("TRACK_ARTISTS.*"));
-		query.addField(new Field("ARTISTS.*"));
-		query.addField(new Field("TRACK_STYLES.*"));
-		query.addField(new Field("STYLES.*"));
-		query.addJoin(new Join(JoinType.INNER, "TRACK_ARTISTS", new Field("TRACKS.ID"), new Field("TRACK_ARTISTS.TRACK")));
-		query.addJoin(new Join(JoinType.INNER, "ARTISTS", new Field("TRACK_ARTISTS.ARTIST"), new Field("ARTISTS.ID")));
-		query.addJoin(new Join(JoinType.INNER, "TRACK_STYLES", new Field("TRACKS.ID"), new Field("TRACK_STYLES.TRACK")));
-		query.addJoin(new Join(JoinType.INNER, "STYLES", new Field("TRACK_STYLES.STYLE"), new Field("STYLES.ID")));
 		query.addWhereClause(new ValueFieldWhereClause(new ValueField("TRACKS.ID", new StringParameter(id))));
-		query.addOrderField(new OrderField(new Field("TRACKS.ID"), Order.ASCENDING));
-		query.addOrderField(new OrderField(new Field("TRACK_ARTISTS.DISPLAY_ORDER"), Order.ASCENDING));
-		TrackLoader trackLoader = new TrackLoader();
-		database.process(query, trackLoader);
-		return trackLoader.get();
+		return database.getSingle(query, trackCreator);
 	}
 
 	public Collection<Track> getTracksByArtist(String artistId) throws DatabaseException {
 		Query query = new Query(Type.SELECT, "TRACKS");
 		query.addField(new Field("TRACKS.*"));
-		query.addField(new Field("TRACK_ARTISTS.*"));
-		query.addField(new Field("ARTISTS.*"));
-		query.addField(new Field("TRACK_STYLES.*"));
-		query.addField(new Field("STYLES.*"));
 		query.addJoin(new Join(JoinType.INNER, "TRACK_ARTISTS", new Field("TRACKS.ID"), new Field("TRACK_ARTISTS.TRACK")));
-		query.addJoin(new Join(JoinType.INNER, "ARTISTS", new Field("TRACK_ARTISTS.ARTIST"), new Field("ARTISTS.ID")));
-		query.addJoin(new Join(JoinType.INNER, "TRACK_STYLES", new Field("TRACKS.ID"), new Field("TRACK_STYLES.TRACK")));
-		query.addJoin(new Join(JoinType.INNER, "STYLES", new Field("TRACK_STYLES.STYLE"), new Field("STYLES.ID")));
-		query.addWhereClause(new ValueFieldWhereClause(new ValueField("ARTISTS.ID", new StringParameter(artistId))));
-		query.addOrderField(new OrderField(new Field("TRACKS.ID"), Order.ASCENDING));
-		query.addOrderField(new OrderField(new Field("TRACK_ARTISTS.DISPLAY_ORDER"), Order.ASCENDING));
-		TrackLoader trackLoader = new TrackLoader();
-		database.process(query, trackLoader);
-		return trackLoader.all();
+		query.addWhereClause(new ValueFieldWhereClause(new ValueField("TRACK_ARTISTS.ARTIST", new StringParameter(artistId))));
+		return database.getMultiple(query, trackCreator);
 	}
 
 	public Collection<Group> getGroupsByArtist(String artistId) throws DatabaseException {
@@ -131,71 +98,6 @@ public class DataManager {
 		return database.getMultiple(query, groupCreator);
 	}
 
-	private class TrackLoader implements ResultProcessor {
-
-		private final List<Track> loadedTracks = new ArrayList<Track>();
-		private Track track;
-
-		public Track get() {
-			return loadedTracks.isEmpty() ? null : loadedTracks.get(0);
-		}
-
-		public List<Track> all() {
-			return loadedTracks;
-		}
-
-		/**
-		 * {@inheritDoc}
-		 */
-		public void processResult(ResultSet resultSet) throws SQLException {
-			String trackId = resultSet.getString("TRACKS.ID");
-			if ((track == null) || (!track.id().equals(trackId))) {
-				track = new DefaultTrack(trackId).name(resultSet.getString("TRACKS.NAME")).artists(new ArrayList<Artist>()).styles(new HashSet<Style>());
-				loadedTracks.add(track);
-			}
-			Artist artist = new LazyArtist(resultSet.getString("ARTISTS.ID")).name(resultSet.getString("ARTISTS.NAME"));
-			if (!track.artists().contains(artist)) {
-				track.artists().add(artist);
-			}
-			Style style = new DefaultStyle(resultSet.getString("STYLES.ID")).name(resultSet.getString("STYLES.NAME"));
-			track.styles().add(style);
-		}
-
-	}
-
-	private class ArtistLoader implements ResultProcessor {
-
-		private final List<Artist> artists = new ArrayList<Artist>();
-		private Artist artist;
-
-		public Artist get() {
-			return artists.isEmpty() ? null : artists.get(0);
-		}
-
-		public List<Artist> all() {
-			return artists;
-		}
-
-		//
-		// RESULTPROCESSOR METHODS
-		//
-
-		/**
-		 * {@inheritDoc}
-		 */
-		public void processResult(ResultSet resultSet) throws SQLException {
-			String artistId = resultSet.getString("ARTISTS.ID");
-			if ((artist == null) || (!artist.id().equals(artistId))) {
-				artist = new LazyArtist(artistId).name(resultSet.getString("ARTISTS.NAME")).groups(new HashSet<Group>());
-				artists.add(artist);
-			}
-
-			Group group = new DefaultGroup(resultSet.getString("GROUPS.ID")).name(resultSet.getString("GROUPS.NAME")).url(resultSet.getString("GROUPS.URL"));
-			artist.groups().add(group);
-		}
-
-	}
-
 	private class LazyArtist extends DefaultArtist {
 
 		private final Memoizer<Void> tracksMemoizer = new Memoizer<Void>(new Callable<Void>() {
@@ -292,4 +194,57 @@ public class DataManager {
 
 	}
 
+	private class LazyTrack extends DefaultTrack {
+
+		private final Memoizer<Void> artistsMemoizer = new Memoizer<Void>(new Callable<Void>() {
+
+			@Override
+			public Void call() throws Exception {
+				if (!hasValue("artists")) {
+					value("artists", List.class).set(getArtistsByTrack(id()));
+				}
+				return null;
+			}
+
+		});
+
+		/**
+		 * @param id
+		 */
+		public LazyTrack(String id) {
+			super(id);
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public List<Artist> artists() {
+			artistsMemoizer.get();
+			return super.artists();
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public Collection<Style> styles() {
+			// TODO Auto-generated method stub
+			return super.styles();
+		}
+
+	}
+
+	private class TrackCreator implements ObjectCreator<Track> {
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public Track createObject(ResultSet resultSet) throws SQLException {
+			return new LazyTrack(resultSet.getString("TRACKS.ID")).name(resultSet.getString("TRACKS.NAME"));
+		}
+
+	}
+
 }