Merge pull request #783 from damccull/explicit-import-jooq-record

Explicitly import org.jooq.Record to avoid ambiquity
signum-network · Jan 27, 2024 · 32c5f9e · 32c5f9e
2 parents 5b849b5 + 12166b9
commit 32c5f9e
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 0 deletions.
diff --git a/src/brs/db/EntityTable.java b/src/brs/db/EntityTable.java
@@ -1,6 +1,7 @@
 package brs.db;
 
 import org.jooq.*;
+import org.jooq.Record;
 
 import java.util.Collection;
 import java.util.List;

diff --git a/src/brs/db/VersionedBatchEntityTable.java b/src/brs/db/VersionedBatchEntityTable.java
@@ -2,6 +2,7 @@
 
 import org.ehcache.Cache;
 import org.jooq.*;
+import org.jooq.Record;
 
 import java.util.Collection;
 import java.util.List;

diff --git a/src/brs/db/sql/DbKey.java b/src/brs/db/sql/DbKey.java
@@ -3,6 +3,7 @@
 import brs.db.BurstKey;
 import brs.util.StringUtils;
 import org.jooq.*;
+import org.jooq.Record;
 
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/src/brs/db/sql/EntitySqlTable.java b/src/brs/db/sql/EntitySqlTable.java
@@ -5,6 +5,7 @@
 import brs.db.EntityTable;
 import brs.db.store.DerivedTableManager;
 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.impl.DSL;
 import org.jooq.impl.TableImpl;
 

diff --git a/src/brs/db/sql/SqlATStore.java b/src/brs/db/sql/SqlATStore.java
@@ -17,6 +17,7 @@
 
 import brs.util.CollectionWithIndex;
 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.exception.DataAccessException;
 
 import java.util.ArrayList;

diff --git a/src/brs/db/sql/SqlAccountStore.java b/src/brs/db/sql/SqlAccountStore.java
@@ -17,6 +17,7 @@
 import signumj.crypto.SignumCrypto;
 
 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.impl.DSL;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/brs/db/sql/SqlBlockDb.java b/src/brs/db/sql/SqlBlockDb.java
@@ -7,6 +7,7 @@
 import brs.schema.tables.records.BlockRecord;
 import io.reactivex.Maybe;
 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.impl.DSL;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/src/brs/db/sql/SqlSubscriptionStore.java b/src/brs/db/sql/SqlSubscriptionStore.java
@@ -8,6 +8,7 @@
 import brs.db.store.SubscriptionStore;
 
 import org.jooq.*;
+import org.jooq.Record;
 
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/src/brs/db/sql/VersionedBatchEntitySqlTable.java b/src/brs/db/sql/VersionedBatchEntitySqlTable.java
@@ -6,6 +6,7 @@
 import brs.db.store.DerivedTableManager;
 import org.ehcache.Cache;
 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.impl.TableImpl;
 
 import java.util.*;

diff --git a/src/brs/db/sql/VersionedEntitySqlTable.java b/src/brs/db/sql/VersionedEntitySqlTable.java
@@ -5,6 +5,7 @@
 import brs.db.VersionedEntityTable;
 import brs.db.store.DerivedTableManager;
 import org.jooq.*;
+import org.jooq.Record;
 import org.jooq.impl.DSL;
 import org.jooq.impl.TableImpl;
 import org.slf4j.Logger;