reorg

.classpath

@@ -36,5 +36,22 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.project

@@ -20,4 +20,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1718972143313</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

src/main/java/eu/m724/wtapi/provider/Providers.java

@@ -0,0 +1,29 @@
+package eu.m724.wtapi.provider;
+
+import eu.m724.wtapi.provider.exception.NoSuchProviderException;
+import eu.m724.wtapi.provider.thunder.ThunderProvider;
+import eu.m724.wtapi.provider.thunder.impl.blitzortung.BlitzortungProvider;
+import eu.m724.wtapi.provider.weather.WeatherProvider;
+import eu.m724.wtapi.provider.weather.impl.openweathermap.OpenWeatherMapProvider;
+
+public class Providers {
+	
+	public static ThunderProvider getThunderProvider(String name, String apiKey) throws NoSuchProviderException {
+		switch (name.toLowerCase()) {
+		case "blitzortung":
+			return new BlitzortungProvider();
+		}
+		
+		throw new NoSuchProviderException();
+	}
+	
+	public static WeatherProvider getWeatherProvider(String name, String apiKey) throws NoSuchProviderException {
+		switch (name.toLowerCase()) {
+		case "openweathermap":
+			return new OpenWeatherMapProvider(apiKey);
+		}
+		
+		throw new NoSuchProviderException();
+	}
+	
+}

src/main/java/eu/m724/wtapi/provider/exception/NoSuchProviderException.java

@@ -0,0 +1,10 @@
+package eu.m724.wtapi.provider.exception;
+
+/**
+ * thrown when there's no known provider with that name
+ */
+public class NoSuchProviderException extends Exception {
+
+	private static final long serialVersionUID = -2740598348303023762L;
+
+}

src/main/java/eu/m724/wtapi/provider/thunder/ThunderProvider.java

@@ -1,4 +1,4 @@
-package eu.m724.wtapi.thunder;
+package eu.m724.wtapi.provider.thunder;
 
 import java.util.function.Consumer;
 

src/main/java/eu/m724/wtapi/provider/thunder/impl/blitzortung/BlitzortungProvider.java

@@ -1,4 +1,4 @@
-package eu.m724.wtapi.thunder.impl.blitzortung;
+package eu.m724.wtapi.provider.thunder.impl.blitzortung;
 
 import java.util.ArrayList;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -6,7 +6,7 @@ import java.util.function.Consumer;
 
 import eu.m724.wtapi.object.Coordinates;
 import eu.m724.wtapi.provider.exception.ProviderException;
-import eu.m724.wtapi.thunder.ThunderProvider;
+import eu.m724.wtapi.provider.thunder.ThunderProvider;
 
 public class BlitzortungProvider extends ThunderProvider {
 	BlitzortungWebsocketClient websocketClient = new BlitzortungWebsocketClient(this);

src/main/java/eu/m724/wtapi/provider/thunder/impl/blitzortung/BlitzortungWebsocketClient.java

@@ -1,4 +1,4 @@
-package eu.m724.wtapi.thunder.impl.blitzortung;
+package eu.m724.wtapi.provider.thunder.impl.blitzortung;
 
 import java.net.URI;
 import java.util.ArrayList;

src/main/java/eu/m724/wtapi/provider/thunder/impl/blitzortung/TimedStrike.java

@@ -1,4 +1,4 @@
-package eu.m724.wtapi.thunder.impl.blitzortung;
+package eu.m724.wtapi.provider.thunder.impl.blitzortung;
 
 import eu.m724.wtapi.object.Coordinates;
 

src/main/java/eu/m724/wtapi/provider/weather/WeatherProvider.java

@@ -1,4 +1,4 @@
-package eu.m724.wtapi.provider;
+package eu.m724.wtapi.provider.weather;
 
 import java.util.concurrent.CompletableFuture;
 

src/main/java/eu/m724/wtapi/provider/weather/impl/openweathermap/OWMResponseConverter.java

@@ -1,4 +1,4 @@
-package eu.m724.wtapi.provider.impl.openweathermap;
+package eu.m724.wtapi.provider.weather.impl.openweathermap;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;

src/main/java/eu/m724/wtapi/provider/weather/impl/openweathermap/OpenWeatherMapProvider.java

@@ -1,4 +1,4 @@
-package eu.m724.wtapi.provider.impl.openweathermap;
+package eu.m724.wtapi.provider.weather.impl.openweathermap;
 
 import java.net.ProxySelector;
 import java.net.URI;
@@ -15,11 +15,11 @@ import com.google.gson.JsonParser;
 
 import eu.m724.wtapi.object.Coordinates;
 import eu.m724.wtapi.object.Weather;
-import eu.m724.wtapi.provider.WeatherProvider;
 import eu.m724.wtapi.provider.exception.AuthorizationException;
 import eu.m724.wtapi.provider.exception.ProviderException;
 import eu.m724.wtapi.provider.exception.QuotaExceededException;
 import eu.m724.wtapi.provider.exception.ServerProviderException;
+import eu.m724.wtapi.provider.weather.WeatherProvider;
 
 public class OpenWeatherMapProvider extends WeatherProvider {
 	private String apiKey;

src/test/java/eu/m724/wtapi/thunder/BlitzortungTest.java

@@ -5,7 +5,8 @@ import java.util.ArrayList;
 import org.junit.Test;
 
 import eu.m724.wtapi.object.Coordinates;
-import eu.m724.wtapi.thunder.impl.blitzortung.BlitzortungProvider;
+import eu.m724.wtapi.provider.thunder.ThunderProvider;
+import eu.m724.wtapi.provider.thunder.impl.blitzortung.BlitzortungProvider;
 
 public class BlitzortungTest {
 	@Test

src/test/java/eu/m724/wtapi/thunder/MockThunderProvider.java

@@ -6,7 +6,8 @@ import java.util.function.Consumer;
 
 import eu.m724.wtapi.object.Coordinates;
 import eu.m724.wtapi.provider.exception.ProviderException;
-import eu.m724.wtapi.thunder.impl.blitzortung.TimedStrike;
+import eu.m724.wtapi.provider.thunder.ThunderProvider;
+import eu.m724.wtapi.provider.thunder.impl.blitzortung.TimedStrike;
 
 public class MockThunderProvider extends ThunderProvider {
 	ArrayList<Consumer<Coordinates>> strikeHandlers = new ArrayList<>();

src/test/java/eu/m724/wtapi/thunder/ThunderProviderTest.java

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import org.junit.Test;
 
 import eu.m724.wtapi.object.Coordinates;
+import eu.m724.wtapi.provider.thunder.ThunderProvider;
 
 public class ThunderProviderTest {
 	@Test

src/test/java/eu/m724/wtapi/weather/MockWeatherProvider.java

@@ -3,10 +3,10 @@ package eu.m724.wtapi.weather;
 import java.util.concurrent.CompletableFuture;
 import eu.m724.wtapi.object.Coordinates;
 import eu.m724.wtapi.object.Weather;
-import eu.m724.wtapi.provider.WeatherProvider;
 import eu.m724.wtapi.provider.exception.ProviderException;
 import eu.m724.wtapi.provider.exception.QuotaExceededException;
 import eu.m724.wtapi.provider.exception.ServerProviderException;
+import eu.m724.wtapi.provider.weather.WeatherProvider;
 
 public class MockWeatherProvider extends WeatherProvider {
 	private boolean faulty;

src/test/java/eu/m724/wtapi/weather/OpenWeatherMapTest.java

@@ -9,8 +9,8 @@ import org.junit.Test;
 
 import eu.m724.wtapi.object.Coordinates;
 import eu.m724.wtapi.object.Weather;
-import eu.m724.wtapi.provider.WeatherProvider;
+import eu.m724.wtapi.provider.weather.WeatherProvider;
-import eu.m724.wtapi.provider.impl.openweathermap.OpenWeatherMapProvider;
+import eu.m724.wtapi.provider.weather.impl.openweathermap.OpenWeatherMapProvider;
 
 public class OpenWeatherMapTest {
 	@Test

src/test/java/eu/m724/wtapi/weather/ProviderTest.java

@@ -12,9 +12,9 @@ import org.junit.Test;
 
 import eu.m724.wtapi.object.Coordinates;
 import eu.m724.wtapi.object.Weather;
-import eu.m724.wtapi.provider.WeatherProvider;
 import eu.m724.wtapi.provider.exception.ProviderException;
 import eu.m724.wtapi.provider.exception.QuotaExceededException;
+import eu.m724.wtapi.provider.weather.WeatherProvider;
 
 public class ProviderTest {
 	@Test