From b43ec8fd32811ee6d498d5304fe262a9228f36ad Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Mon, 3 May 2021 20:11:35 +0200 Subject: Remove warnings, use lambdas, use try-with, ... --- .../database/model/CurrentRssItemViewDao.java | 18 +++++------------- .../owncloudnewsreader/database/model/FeedDao.java | 16 ++++++---------- .../owncloudnewsreader/database/model/FolderDao.java | 9 ++++----- .../owncloudnewsreader/database/model/RssItemDao.java | 16 ++++++---------- 4 files changed, 21 insertions(+), 38 deletions(-) (limited to 'News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model') diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/CurrentRssItemViewDao.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/CurrentRssItemViewDao.java index 44613799..399bfbc0 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/CurrentRssItemViewDao.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/CurrentRssItemViewDao.java @@ -48,7 +48,6 @@ public class CurrentRssItemViewDao extends AbstractDao db.execSQL(sql); } - /** @inheritdoc */ @Override protected void bindValues(SQLiteStatement stmt, CurrentRssItemView entity) { stmt.clearBindings(); @@ -56,37 +55,31 @@ public class CurrentRssItemViewDao extends AbstractDao stmt.bindLong(2, entity.getRssItemId()); } - /** @inheritdoc */ @Override public Long readKey(Cursor cursor, int offset) { - return cursor.getLong(offset + 0); + return cursor.getLong(offset); } - /** @inheritdoc */ @Override public CurrentRssItemView readEntity(Cursor cursor, int offset) { - CurrentRssItemView entity = new CurrentRssItemView( // - cursor.getLong(offset + 0), // id + return new CurrentRssItemView( // + cursor.getLong(offset), // id cursor.getLong(offset + 1) // rssItemId ); - return entity; } - /** @inheritdoc */ @Override public void readEntity(Cursor cursor, CurrentRssItemView entity, int offset) { - entity.setId(cursor.getLong(offset + 0)); + entity.setId(cursor.getLong(offset)); entity.setRssItemId(cursor.getLong(offset + 1)); } - /** @inheritdoc */ @Override protected Long updateKeyAfterInsert(CurrentRssItemView entity, long rowId) { entity.setId(rowId); return rowId; } - /** @inheritdoc */ @Override public Long getKey(CurrentRssItemView entity) { if(entity != null) { @@ -96,8 +89,7 @@ public class CurrentRssItemViewDao extends AbstractDao } } - /** @inheritdoc */ - @Override + @Override protected boolean isEntityUpdateable() { return true; } diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/FeedDao.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/FeedDao.java index be654579..18d62970 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/FeedDao.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/FeedDao.java @@ -106,27 +106,26 @@ public class FeedDao extends AbstractDao { /** @inheritdoc */ @Override public Long readKey(Cursor cursor, int offset) { - return cursor.getLong(offset + 0); + return cursor.getLong(offset); } /** @inheritdoc */ @Override public Feed readEntity(Cursor cursor, int offset) { - Feed entity = new Feed( // - cursor.getLong(offset + 0), // id + return new Feed( // + cursor.getLong(offset), // id cursor.isNull(offset + 1) ? null : cursor.getLong(offset + 1), // folderId cursor.getString(offset + 2), // feedTitle cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // faviconUrl cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // link cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5) // avgColour ); - return entity; } /** @inheritdoc */ @Override public void readEntity(Cursor cursor, Feed entity, int offset) { - entity.setId(cursor.getLong(offset + 0)); + entity.setId(cursor.getLong(offset)); entity.setFolderId(cursor.isNull(offset + 1) ? null : cursor.getLong(offset + 1)); entity.setFeedTitle(cursor.getString(offset + 2)); entity.setFaviconUrl(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); @@ -209,9 +208,8 @@ public class FeedDao extends AbstractDao { String sql = builder.toString(); String[] keyArray = new String[] { key.toString() }; - Cursor cursor = db.rawQuery(sql, keyArray); - - try { + + try (Cursor cursor = db.rawQuery(sql, keyArray)) { boolean available = cursor.moveToFirst(); if (!available) { return null; @@ -219,8 +217,6 @@ public class FeedDao extends AbstractDao { throw new IllegalStateException("Expected unique result, but count was " + cursor.getCount()); } return loadCurrentDeep(cursor, true); - } finally { - cursor.close(); } } diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/FolderDao.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/FolderDao.java index 30537be8..f43b942d 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/FolderDao.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/FolderDao.java @@ -68,23 +68,22 @@ public class FolderDao extends AbstractDao { /** @inheritdoc */ @Override public Long readKey(Cursor cursor, int offset) { - return cursor.getLong(offset + 0); + return cursor.getLong(offset); } /** @inheritdoc */ @Override public Folder readEntity(Cursor cursor, int offset) { - Folder entity = new Folder( // - cursor.getLong(offset + 0), // id + return new Folder( // + cursor.getLong(offset), // id cursor.getString(offset + 1) // label ); - return entity; } /** @inheritdoc */ @Override public void readEntity(Cursor cursor, Folder entity, int offset) { - entity.setId(cursor.getLong(offset + 0)); + entity.setId(cursor.getLong(offset)); entity.setLabel(cursor.getString(offset + 1)); } diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/RssItemDao.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/RssItemDao.java index ba4e1139..38f19bc8 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/RssItemDao.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/model/RssItemDao.java @@ -188,14 +188,14 @@ public class RssItemDao extends AbstractDao { /** @inheritdoc */ @Override public Long readKey(Cursor cursor, int offset) { - return cursor.getLong(offset + 0); + return cursor.getLong(offset); } /** @inheritdoc */ @Override public RssItem readEntity(Cursor cursor, int offset) { - RssItem entity = new RssItem( // - cursor.getLong(offset + 0), // id + return new RssItem( // + cursor.getLong(offset), // id cursor.getLong(offset + 1), // feedId cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // link cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // title @@ -216,13 +216,12 @@ public class RssItemDao extends AbstractDao { cursor.isNull(offset + 18) ? null : cursor.getString(offset + 18), // mediaDescription cursor.isNull(offset + 19) ? null : cursor.getShort(offset + 19) != 0 // rtl ); - return entity; } /** @inheritdoc */ @Override public void readEntity(Cursor cursor, RssItem entity, int offset) { - entity.setId(cursor.getLong(offset + 0)); + entity.setId(cursor.getLong(offset)); entity.setFeedId(cursor.getLong(offset + 1)); entity.setLink(cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2)); entity.setTitle(cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3)); @@ -321,9 +320,8 @@ public class RssItemDao extends AbstractDao { String sql = builder.toString(); String[] keyArray = new String[] { key.toString() }; - Cursor cursor = db.rawQuery(sql, keyArray); - - try { + + try (Cursor cursor = db.rawQuery(sql, keyArray)) { boolean available = cursor.moveToFirst(); if (!available) { return null; @@ -331,8 +329,6 @@ public class RssItemDao extends AbstractDao { throw new IllegalStateException("Expected unique result, but count was " + cursor.getCount()); } return loadCurrentDeep(cursor, true); - } finally { - cursor.close(); } } -- cgit v1.2.3