Merge branch 'release-0.9.7'

[Sone.git] / src / main / java / net / pterodactylus / sone / database / SoneProvider.java

diff --git a/src/main/java/net/pterodactylus/sone/database/SoneProvider.java b/src/main/java/net/pterodactylus/sone/database/SoneProvider.java
index f36eaba..69f7eaf 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/database/SoneProvider.java
+++ b/src/main/java/net/pterodactylus/sone/database/SoneProvider.java
@@ -1,5 +1,5 @@
 /*
- * Sone - SoneProvider.java - Copyright © 2011–2013 David Roden
+ * Sone - SoneProvider.java - Copyright © 2011–2016 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,9 +19,12 @@ package net.pterodactylus.sone.database;
 
 import java.util.Collection;
 
+import javax.annotation.Nonnull;
+
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.data.Sone;
 
+import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.inject.ImplementedBy;
 
@@ -33,6 +36,8 @@ import com.google.inject.ImplementedBy;
 @ImplementedBy(Core.class)
 public interface SoneProvider {
 
+       Function<String, Optional<Sone>> soneLoader();
+
        /**
         * Returns the Sone with the given ID, or {@link Optional#absent()} if it
         * does not exist.
@@ -48,6 +53,7 @@ public interface SoneProvider {
         *
         * @return All Sones
         */
+       @Nonnull
        public Collection<Sone> getSones();
 
        /**