diff --git a/src/main/java/org/spongepowered/api/Game.java b/src/main/java/org/spongepowered/api/Game.java index a09106d37d4..beb99328eea 100644 --- a/src/main/java/org/spongepowered/api/Game.java +++ b/src/main/java/org/spongepowered/api/Game.java @@ -37,7 +37,6 @@ import org.spongepowered.api.registry.RegistryHolder; import org.spongepowered.api.scheduler.Scheduler; import org.spongepowered.api.service.ServiceProvider; -import org.spongepowered.api.sql.SqlManager; import org.spongepowered.api.util.metric.MetricsConfigManager; import java.nio.file.Path; @@ -183,13 +182,6 @@ default Client client() { */ MetricsConfigManager metricsConfigManager(); - /** - * Gets the {@link SqlManager} for grabbing sql data sources. - * - * @return The {@link SqlManager} instance. - */ - SqlManager sqlManager(); - /** * Gets the {@link ServiceProvider.GameScoped}, used to provide Sponge * services that plugins may provide. Services provided here are diff --git a/src/main/java/org/spongepowered/api/Sponge.java b/src/main/java/org/spongepowered/api/Sponge.java index e7b0cf796e5..f7eb56024ef 100644 --- a/src/main/java/org/spongepowered/api/Sponge.java +++ b/src/main/java/org/spongepowered/api/Sponge.java @@ -34,7 +34,6 @@ import org.spongepowered.api.plugin.PluginManager; import org.spongepowered.api.scheduler.Scheduler; import org.spongepowered.api.service.ServiceProvider; -import org.spongepowered.api.sql.SqlManager; import org.spongepowered.api.util.metric.MetricsConfigManager; /** @@ -193,15 +192,6 @@ public static Scheduler asyncScheduler() { return Sponge.game().asyncScheduler(); } - /** - * Gets the {@link SqlManager} for grabbing sql data sources. - * - * @return The {@link SqlManager} instance. - */ - public static SqlManager sqlManager() { - return Sponge.game().sqlManager(); - } - /** * Gets the {@link Game} scoped {@link ServiceProvider} for providing * services. diff --git a/src/main/java/org/spongepowered/api/sql/SqlManager.java b/src/main/java/org/spongepowered/api/sql/SqlManager.java deleted file mode 100644 index d0a1321d5e0..00000000000 --- a/src/main/java/org/spongepowered/api/sql/SqlManager.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package org.spongepowered.api.sql; - -import org.spongepowered.plugin.PluginContainer; - -import java.sql.SQLException; -import java.util.Optional; - -import javax.sql.DataSource; - -/** - * This manager provides the basics for an abstraction over SQL connections. - */ -public interface SqlManager { - - /** - * Returns a data source for the provided JDBC connection string or - * an alias. - * - *

A jdbc connection url is expected to be of the form: - * jdbc:<engine>://[<username>[:<password>]@]<host - * >/<database> or an alias (available aliases are known only by - * the service provider)

- * - * @param jdbcConnection The jdbc url or connection alias - * @return A data source providing connections to the given URL. - * @throws SQLException if a connection to the given database could not - * be established - */ - DataSource dataSource(String jdbcConnection) throws SQLException; - - /** - * Returns a data source for the provided JDBC connection string or an - * alias. - * - *

A jdbc connection url is expected to be of the form: - * jdbc:<engine>://[<username>[:<password>]@] - * <host>/<database> - * or an alias (available aliases are known only by the service - * provider)

- * - * @param plugin The plugin to lookup databases relative to (primarily - * applying to file-backed databases) - * @param jdbcConnection The jdbc url or connection alias - * @return A data source providing connections to the given URL. - * @throws SQLException if a connection to the given database could not - * be established - */ - DataSource dataSource(PluginContainer plugin, String jdbcConnection) throws SQLException; - - /** - * Returns a possible connection URL for a given alias. - * - * @param alias The alias to check - * @return The connection url as a String if it exists, - * or {@link Optional#empty()} - */ - Optional connectionUrlFromAlias(String alias); -} diff --git a/src/main/java/org/spongepowered/api/sql/package-info.java b/src/main/java/org/spongepowered/api/sql/package-info.java deleted file mode 100644 index 7160c701d50..00000000000 --- a/src/main/java/org/spongepowered/api/sql/package-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of SpongeAPI, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -@org.checkerframework.framework.qual.DefaultQualifier(org.checkerframework.checker.nullness.qual.NonNull.class) -package org.spongepowered.api.sql;