Use Collection instead of Set.

[demoscenemusic.git] / src / main / java / net / pterodactylus / demoscenemusic / data / DataManager.java

diff --git a/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java b/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
index 5183226..85f35fa 100644 (file)
--- a/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
+++ b/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
@@ -118,6 +118,14 @@ public class DataManager {
                return trackLoader.all();
        }
 
+       public Collection<Group> getGroupsByArtist(String artistId) throws DatabaseException {
+               Query query = new Query(Type.SELECT, "GROUPS");
+               query.addField(new Field("GROUPS.*"));
+               query.addJoin(new Join(JoinType.INNER, "GROUP_ARTISTS", new Field("GROUPS.ID"), new Field("GROUP_ARTISTS.GROUP_")));
+               query.addWhereClause(new ValueFieldWhereClause(new ValueField("GROUP_ARTISTS.ARTIST", new StringParameter(artistId))));
+               return database.getMultiple(query, DefaultGroup.CREATOR);
+       }
+
        private class TrackLoader implements ResultProcessor {
 
                private final List<Track> loadedTracks = new ArrayList<Track>();
@@ -140,7 +148,7 @@ public class DataManager {
                                track = new DefaultTrack(trackId).name(resultSet.getString("TRACKS.NAME")).artists(new ArrayList<Artist>()).styles(new HashSet<Style>());
                                loadedTracks.add(track);
                        }
-                       Artist artist = new DefaultArtist(resultSet.getString("ARTISTS.ID")).name(resultSet.getString("ARTISTS.NAME"));
+                       Artist artist = new LazyArtist(resultSet.getString("ARTISTS.ID")).name(resultSet.getString("ARTISTS.NAME"));
                        if (!track.artists().contains(artist)) {
                                track.artists().add(artist);
                        }
@@ -173,7 +181,7 @@ public class DataManager {
                public void processResult(ResultSet resultSet) throws SQLException {
                        String artistId = resultSet.getString("ARTISTS.ID");
                        if ((artist == null) || (!artist.id().equals(artistId))) {
-                               artist = new DefaultArtist(artistId).name(resultSet.getString("ARTISTS.NAME")).groups(new HashSet<Group>());
+                               artist = new LazyArtist(artistId).name(resultSet.getString("ARTISTS.NAME")).groups(new HashSet<Group>());
                                artists.add(artist);
                        }
 
@@ -185,7 +193,7 @@ public class DataManager {
 
        private class LazyArtist extends DefaultArtist {
 
-               private final Memoizer<Void> tracks = new Memoizer<Void>(new Callable<Void>() {
+               private final Memoizer<Void> tracksMemoizer = new Memoizer<Void>(new Callable<Void>() {
                        public Void call() throws DatabaseException {
                                if (!hasValue("tracks")) {
                                        value("tracks", Collection.class).set(getTracksByArtist(id()));
@@ -199,8 +207,8 @@ public class DataManager {
                }
 
                public Collection<Track> tracks() {
-                       tracks.get();
-                       return value("tracks", Collection.class).get();
+                       tracksMemoizer.get();
+                       return super.tracks();
                }
 
        }