Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-20 22:59:54 +01:00
Code Issues Projects Releases Wiki Activity

Removed unnecessary use of unmodifiable collections.

Browse Source
This commit is contained in:
akwizgran
2016-11-16 15:48:08 +00:00
parent ec1f4dccdb
commit c9170fa5a0
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
briar-core/src/org/briarproject/db/JdbcDatabase.java
View File

@@ -1027,7 +1027,7 @@ abstract class JdbcDatabase implements Database<Connection> {
} }
rs.close(); rs.close();
ps.close(); ps.close();
return Collections.unmodifiableList(contacts); return contacts;
} catch (SQLException e) { } catch (SQLException e) {
tryToClose(rs); tryToClose(rs);
tryToClose(ps); tryToClose(ps);
@@ -1050,7 +1050,7 @@ abstract class JdbcDatabase implements Database<Connection> {
while (rs.next()) ids.add(new ContactId(rs.getInt(1))); while (rs.next()) ids.add(new ContactId(rs.getInt(1)));
rs.close(); rs.close();
ps.close(); ps.close();
return Collections.unmodifiableList(ids); return ids;
} catch (SQLException e) { } catch (SQLException e) {
tryToClose(rs); tryToClose(rs);
tryToClose(ps); tryToClose(ps);
@@ -1085,7 +1085,7 @@ abstract class JdbcDatabase implements Database<Connection> {
} }
rs.close(); rs.close();
ps.close(); ps.close();
return Collections.unmodifiableList(contacts); return contacts;
} catch (SQLException e) { } catch (SQLException e) {
tryToClose(rs); tryToClose(rs);
tryToClose(ps); tryToClose(ps);
@@ -1135,7 +1135,7 @@ abstract class JdbcDatabase implements Database<Connection> {
} }
rs.close(); rs.close();
ps.close(); ps.close();
return Collections.unmodifiableList(groups); return groups;
} catch (SQLException e) { } catch (SQLException e) {
tryToClose(rs); tryToClose(rs);
tryToClose(ps); tryToClose(ps);
@@ -1184,7 +1184,7 @@ abstract class JdbcDatabase implements Database<Connection> {
while (rs.next()) visible.add(new ContactId(rs.getInt(1))); while (rs.next()) visible.add(new ContactId(rs.getInt(1)));
rs.close(); rs.close();
ps.close(); ps.close();
return Collections.unmodifiableList(visible); return visible;
} catch (SQLException e) { } catch (SQLException e) {
tryToClose(rs); tryToClose(rs);
tryToClose(ps); tryToClose(ps);
@@ -1244,7 +1244,7 @@ abstract class JdbcDatabase implements Database<Connection> {
} }
rs.close(); rs.close();
ps.close(); ps.close();
return Collections.unmodifiableList(authors); return authors;
} catch (SQLException e) { } catch (SQLException e) {
tryToClose(rs); tryToClose(rs);
tryToClose(ps); tryToClose(ps);
@@ -1266,7 +1266,7 @@ abstract class JdbcDatabase implements Database<Connection> {
while (rs.next()) ids.add(new MessageId(rs.getBytes(1))); while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
rs.close(); rs.close();
ps.close(); ps.close();
return Collections.unmodifiableList(ids); return ids;
} catch (SQLException e) { } catch (SQLException e) {
tryToClose(rs); tryToClose(rs);
tryToClose(ps); tryToClose(ps);
@@ -1289,7 +1289,7 @@ abstract class JdbcDatabase implements Database<Connection> {
while (rs.next()) ids.add(new MessageId(rs.getBytes(1))); while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
rs.close(); rs.close();
ps.close(); ps.close();
return Collections.unmodifiableList(ids); return ids;
} catch (SQLException e) { } catch (SQLException e) {
tryToClose(rs); tryToClose(rs);
tryToClose(ps); tryToClose(ps);
@@ -1329,8 +1329,8 @@ abstract class JdbcDatabase implements Database<Connection> {
// Return early if there are no matches // Return early if there are no matches
if (intersection.isEmpty()) return Collections.emptySet(); if (intersection.isEmpty()) return Collections.emptySet();
} }
if (intersection == null) throw new IllegalStateException(); if (intersection == null) throw new AssertionError();
return Collections.unmodifiableSet(intersection); return intersection;
} catch (SQLException e) { } catch (SQLException e) {
tryToClose(rs); tryToClose(rs);
tryToClose(ps); tryToClose(ps);
@@ -1368,7 +1368,7 @@ abstract class JdbcDatabase implements Database<Connection> {
} }
rs.close(); rs.close();
ps.close(); ps.close();
return Collections.unmodifiableMap(all); return all;
} catch (SQLException e) { } catch (SQLException e) {
tryToClose(rs); tryToClose(rs);
tryToClose(ps); tryToClose(ps);
@@ -1386,7 +1386,7 @@ abstract class JdbcDatabase implements Database<Connection> {
Map<MessageId, Metadata> all = new HashMap<MessageId, Metadata>( Map<MessageId, Metadata> all = new HashMap<MessageId, Metadata>(
matches.size()); matches.size());
for (MessageId m : matches) all.put(m, getMessageMetadata(txn, m)); for (MessageId m : matches) all.put(m, getMessageMetadata(txn, m));
return Collections.unmodifiableMap(all); return all;
} }
@Override @Override
@@ -1491,7 +1491,7 @@ abstract class JdbcDatabase implements Database<Connection> {
} }
rs.close(); rs.close();
ps.close(); ps.close();
return Collections.unmodifiableList(statuses); return statuses;
} catch (SQLException e) { } catch (SQLException e) {
tryToClose(rs); tryToClose(rs);
tryToClose(ps); tryToClose(ps);
@@ -1557,7 +1557,7 @@ abstract class JdbcDatabase implements Database<Connection> {
} }
rs.close(); rs.close();
ps.close(); ps.close();
return Collections.unmodifiableMap(dependencies); return dependencies;
} catch (SQLException e) { } catch (SQLException e) {
tryToClose(rs); tryToClose(rs);
tryToClose(ps); tryToClose(ps);
@@ -1587,7 +1587,7 @@ abstract class JdbcDatabase implements Database<Connection> {
} }
rs.close(); rs.close();
ps.close(); ps.close();
return Collections.unmodifiableMap(dependents); return dependents;
} catch (SQLException e) { } catch (SQLException e) {
tryToClose(rs); tryToClose(rs);
tryToClose(ps); tryToClose(ps);
@@ -1635,7 +1635,7 @@ abstract class JdbcDatabase implements Database<Connection> {
while (rs.next()) ids.add(new MessageId(rs.getBytes(1))); while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
rs.close(); rs.close();
ps.close(); ps.close();
return Collections.unmodifiableList(ids); return ids;
} catch (SQLException e) { } catch (SQLException e) {
tryToClose(rs); tryToClose(rs);
tryToClose(ps); tryToClose(ps);
@@ -1671,7 +1671,7 @@ abstract class JdbcDatabase implements Database<Connection> {
while (rs.next()) ids.add(new MessageId(rs.getBytes(1))); while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
rs.close(); rs.close();
ps.close(); ps.close();
return Collections.unmodifiableList(ids); return ids;
} catch (SQLException e) { } catch (SQLException e) {
tryToClose(rs); tryToClose(rs);
tryToClose(ps); tryToClose(ps);
@@ -1696,7 +1696,7 @@ abstract class JdbcDatabase implements Database<Connection> {
while (rs.next()) ids.add(new MessageId(rs.getBytes(1))); while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
rs.close(); rs.close();
ps.close(); ps.close();
return Collections.unmodifiableList(ids); return ids;
} catch (SQLException e) { } catch (SQLException e) {
tryToClose(rs); tryToClose(rs);
tryToClose(ps); tryToClose(ps);
@@ -1737,7 +1737,7 @@ abstract class JdbcDatabase implements Database<Connection> {
} }
rs.close(); rs.close();
ps.close(); ps.close();
return Collections.unmodifiableList(ids); return ids;
} catch (SQLException e) { } catch (SQLException e) {
tryToClose(rs); tryToClose(rs);
tryToClose(ps); tryToClose(ps);
@@ -1773,7 +1773,7 @@ abstract class JdbcDatabase implements Database<Connection> {
while (rs.next()) ids.add(new MessageId(rs.getBytes(1))); while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
rs.close(); rs.close();
ps.close(); ps.close();
return Collections.unmodifiableList(ids); return ids;
} catch (SQLException e) { } catch (SQLException e) {
tryToClose(rs); tryToClose(rs);
tryToClose(ps); tryToClose(ps);
@@ -1803,7 +1803,7 @@ abstract class JdbcDatabase implements Database<Connection> {
while (rs.next()) ids.add(new MessageId(rs.getBytes(1))); while (rs.next()) ids.add(new MessageId(rs.getBytes(1)));
rs.close(); rs.close();
ps.close(); ps.close();
return Collections.unmodifiableList(ids); return ids;
} catch (SQLException e) { } catch (SQLException e) {
tryToClose(rs); tryToClose(rs);
tryToClose(ps); tryToClose(ps);
@@ -1868,7 +1868,7 @@ abstract class JdbcDatabase implements Database<Connection> {
} }
rs.close(); rs.close();
ps.close(); ps.close();
return Collections.unmodifiableList(ids); return ids;
} catch (SQLException e) { } catch (SQLException e) {
tryToClose(rs); tryToClose(rs);
tryToClose(ps); tryToClose(ps);
@@ -1952,7 +1952,7 @@ abstract class JdbcDatabase implements Database<Connection> {
} }
rs.close(); rs.close();
ps.close(); ps.close();
return Collections.unmodifiableMap(keys); return keys;
} catch (SQLException e) { } catch (SQLException e) {
tryToClose(rs); tryToClose(rs);
tryToClose(ps); tryToClose(ps);