fix errors after merge

adamkorynta · Dec 16, 2024 · 500efb2 · 500efb2
1 parent 067b103
commit 500efb2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/java/opendcs-api/src/main/java/org/opendcs/database/api/DataTransaction.java b/java/opendcs-api/src/main/java/org/opendcs/database/api/DataTransaction.java
@@ -29,7 +29,7 @@ public interface DataTransaction extends AutoCloseable {
      *            for the connections they use.
      * @param connectionType
      * @return optional with the instance of the connection type, if available.
-     * @throws OpenDCSDataException any issues with the connection, if implementations check validity.
+     * @throws OpenDcsDataException any issues with the connection, if implementations check validity.
      */
     <T> Optional<T> connection(Class<T> connectionType) throws OpenDcsDataException;
 

diff --git a/java/opendcs/src/main/java/opendcs/dai/EnumDAI.java b/java/opendcs/src/main/java/opendcs/dai/EnumDAI.java
@@ -21,8 +21,7 @@
  * Data Access Interface for database-resident enumerations
  * @author mmaloney Mike Maloney
  */
-public interface EnumDAI
-	extends AutoCloseable
+public interface EnumDAI extends DaiBase
 {
 	@Deprecated
 	public DbEnum getEnum(String enumName) throws DbIoException;

diff --git a/java/opendcs/src/main/java/org/opendcs/database/SimpleOpenDcsDatabaseWrapper.java b/java/opendcs/src/main/java/org/opendcs/database/SimpleOpenDcsDatabaseWrapper.java
@@ -9,6 +9,9 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
+import javax.sql.DataSource;
+
+import org.opendcs.database.api.DataTransaction;
 import org.opendcs.database.api.OpenDcsDao;
 import org.opendcs.database.api.OpenDcsDataException;
 import org.opendcs.database.api.OpenDcsDatabase;