From 5e76eb41344be0ddba21fc56a70d1cc870fd06ed Mon Sep 17 00:00:00 2001 From: Shinokuni Date: Fri, 23 Oct 2020 21:30:34 +0200 Subject: [PATCH] Reorganize api utils package --- api/src/androidTest/java/com/readrops/api/OPMLParserTest.kt | 2 +- .../com/readrops/api/localfeed/LocalRSSDataSourceTest.kt | 4 ++-- .../com/readrops/api/localfeed/atom/ATOMItemsAdapterTest.kt | 2 +- .../com/readrops/api/localfeed/json/JSONItemsAdapterTest.kt | 2 +- .../com/readrops/api/localfeed/rss1/RSS1ItemsAdapterTest.kt | 2 +- .../com/readrops/api/localfeed/rss2/RSS2FeedAdapterTest.kt | 2 +- .../com/readrops/api/localfeed/rss2/RSS2ItemsAdapterTest.kt | 2 +- .../java/com/readrops/api/localfeed/LocalRSSDataSource.kt | 4 ++-- .../java/com/readrops/api/localfeed/atom/ATOMFeedAdapter.kt | 6 +++--- .../com/readrops/api/localfeed/atom/ATOMItemsAdapter.kt | 4 ++++ .../java/com/readrops/api/localfeed/json/JSONFeedAdapter.kt | 6 +++--- .../com/readrops/api/localfeed/json/JSONItemsAdapter.kt | 6 +++--- .../java/com/readrops/api/localfeed/rss1/RSS1FeedAdapter.kt | 6 +++--- .../com/readrops/api/localfeed/rss1/RSS1ItemsAdapter.kt | 4 ++++ .../java/com/readrops/api/localfeed/rss2/RSS2FeedAdapter.kt | 6 +++--- .../com/readrops/api/localfeed/rss2/RSS2ItemsAdapter.kt | 4 ++++ api/src/main/java/com/readrops/api/opml/OPMLParser.kt | 3 +-- .../api/services/nextcloudnews/NextNewsDataSource.java | 4 ++-- .../services/nextcloudnews/adapters/NextNewsFeedsAdapter.kt | 2 +- .../services/nextcloudnews/adapters/NextNewsItemsAdapter.kt | 2 +- .../api/utils/{ => exceptions}/ConflictException.java | 2 +- .../readrops/api/utils/{ => exceptions}/ParseException.java | 2 +- .../api/utils/{ => exceptions}/UnknownFormatException.java | 2 +- .../api/utils/{ => extensions}/JsonReaderExtensions.kt | 3 ++- .../api/utils/{ => extensions}/KonsumerExtensions.kt | 3 ++- .../java/com/readrops/api/utils/JsonReaderExtensionsTest.kt | 3 +++ .../java/com/readrops/api/utils/KonsumerExtensionsTest.kt | 3 +++ .../readrops/app/activities/ManageFeedsFoldersActivity.java | 4 ++-- .../java/com/readrops/app/fragments/FoldersFragment.java | 4 ++-- .../com/readrops/app/repositories/LocalFeedRepository.java | 4 ++-- .../com/readrops/app/repositories/NextNewsRepository.java | 2 +- 31 files changed, 62 insertions(+), 43 deletions(-) rename api/src/main/java/com/readrops/api/utils/{ => exceptions}/ConflictException.java (80%) rename api/src/main/java/com/readrops/api/utils/{ => exceptions}/ParseException.java (80%) rename api/src/main/java/com/readrops/api/utils/{ => exceptions}/UnknownFormatException.java (81%) rename api/src/main/java/com/readrops/api/utils/{ => extensions}/JsonReaderExtensions.kt (78%) rename api/src/main/java/com/readrops/api/utils/{ => extensions}/KonsumerExtensions.kt (86%) diff --git a/api/src/androidTest/java/com/readrops/api/OPMLParserTest.kt b/api/src/androidTest/java/com/readrops/api/OPMLParserTest.kt index 33da88f0..2fd10595 100644 --- a/api/src/androidTest/java/com/readrops/api/OPMLParserTest.kt +++ b/api/src/androidTest/java/com/readrops/api/OPMLParserTest.kt @@ -7,7 +7,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry import androidx.test.rule.GrantPermissionRule import com.readrops.api.opml.OPMLParser -import com.readrops.api.utils.ParseException +import com.readrops.api.utils.exceptions.ParseException import com.readrops.db.entities.Feed import com.readrops.db.entities.Folder import io.reactivex.schedulers.Schedulers diff --git a/api/src/androidTest/java/com/readrops/api/localfeed/LocalRSSDataSourceTest.kt b/api/src/androidTest/java/com/readrops/api/localfeed/LocalRSSDataSourceTest.kt index 22b87e68..5259109a 100644 --- a/api/src/androidTest/java/com/readrops/api/localfeed/LocalRSSDataSourceTest.kt +++ b/api/src/androidTest/java/com/readrops/api/localfeed/LocalRSSDataSourceTest.kt @@ -5,8 +5,8 @@ import android.content.Context import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry import com.readrops.api.utils.LibUtils -import com.readrops.api.utils.ParseException -import com.readrops.api.utils.UnknownFormatException +import com.readrops.api.utils.exceptions.ParseException +import com.readrops.api.utils.exceptions.UnknownFormatException import junit.framework.TestCase.* import okhttp3.Headers import okhttp3.HttpUrl diff --git a/api/src/androidTest/java/com/readrops/api/localfeed/atom/ATOMItemsAdapterTest.kt b/api/src/androidTest/java/com/readrops/api/localfeed/atom/ATOMItemsAdapterTest.kt index 3d8b850f..b737272a 100644 --- a/api/src/androidTest/java/com/readrops/api/localfeed/atom/ATOMItemsAdapterTest.kt +++ b/api/src/androidTest/java/com/readrops/api/localfeed/atom/ATOMItemsAdapterTest.kt @@ -4,7 +4,7 @@ import android.content.Context import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry import com.readrops.api.utils.DateUtils -import com.readrops.api.utils.ParseException +import com.readrops.api.utils.exceptions.ParseException import junit.framework.TestCase.* import org.junit.Assert import org.junit.Test diff --git a/api/src/androidTest/java/com/readrops/api/localfeed/json/JSONItemsAdapterTest.kt b/api/src/androidTest/java/com/readrops/api/localfeed/json/JSONItemsAdapterTest.kt index 3d62a836..4b95a665 100644 --- a/api/src/androidTest/java/com/readrops/api/localfeed/json/JSONItemsAdapterTest.kt +++ b/api/src/androidTest/java/com/readrops/api/localfeed/json/JSONItemsAdapterTest.kt @@ -4,7 +4,7 @@ import android.content.Context import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry import com.readrops.api.utils.DateUtils -import com.readrops.api.utils.ParseException +import com.readrops.api.utils.exceptions.ParseException import com.readrops.db.entities.Item import com.squareup.moshi.Moshi import com.squareup.moshi.Types diff --git a/api/src/androidTest/java/com/readrops/api/localfeed/rss1/RSS1ItemsAdapterTest.kt b/api/src/androidTest/java/com/readrops/api/localfeed/rss1/RSS1ItemsAdapterTest.kt index 40939c27..99ce97f4 100644 --- a/api/src/androidTest/java/com/readrops/api/localfeed/rss1/RSS1ItemsAdapterTest.kt +++ b/api/src/androidTest/java/com/readrops/api/localfeed/rss1/RSS1ItemsAdapterTest.kt @@ -4,7 +4,7 @@ import android.content.Context import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry import com.readrops.api.utils.DateUtils -import com.readrops.api.utils.ParseException +import com.readrops.api.utils.exceptions.ParseException import junit.framework.TestCase.* import org.junit.Assert import org.junit.Test diff --git a/api/src/androidTest/java/com/readrops/api/localfeed/rss2/RSS2FeedAdapterTest.kt b/api/src/androidTest/java/com/readrops/api/localfeed/rss2/RSS2FeedAdapterTest.kt index 4ac3c43d..3368c0e6 100644 --- a/api/src/androidTest/java/com/readrops/api/localfeed/rss2/RSS2FeedAdapterTest.kt +++ b/api/src/androidTest/java/com/readrops/api/localfeed/rss2/RSS2FeedAdapterTest.kt @@ -3,7 +3,7 @@ package com.readrops.api.localfeed.rss2 import android.content.Context import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry -import com.readrops.api.utils.ParseException +import com.readrops.api.utils.exceptions.ParseException import junit.framework.TestCase.assertEquals import org.junit.Test import org.junit.runner.RunWith diff --git a/api/src/androidTest/java/com/readrops/api/localfeed/rss2/RSS2ItemsAdapterTest.kt b/api/src/androidTest/java/com/readrops/api/localfeed/rss2/RSS2ItemsAdapterTest.kt index 1d3aa690..4154f924 100644 --- a/api/src/androidTest/java/com/readrops/api/localfeed/rss2/RSS2ItemsAdapterTest.kt +++ b/api/src/androidTest/java/com/readrops/api/localfeed/rss2/RSS2ItemsAdapterTest.kt @@ -4,7 +4,7 @@ import android.content.Context import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry import com.readrops.api.utils.DateUtils -import com.readrops.api.utils.ParseException +import com.readrops.api.utils.exceptions.ParseException import junit.framework.TestCase.* import org.junit.Assert import org.junit.Test diff --git a/api/src/main/java/com/readrops/api/localfeed/LocalRSSDataSource.kt b/api/src/main/java/com/readrops/api/localfeed/LocalRSSDataSource.kt index 6069b2b0..f682e808 100644 --- a/api/src/main/java/com/readrops/api/localfeed/LocalRSSDataSource.kt +++ b/api/src/main/java/com/readrops/api/localfeed/LocalRSSDataSource.kt @@ -5,8 +5,8 @@ import androidx.annotation.WorkerThread import com.readrops.api.localfeed.json.JSONFeedAdapter import com.readrops.api.localfeed.json.JSONItemsAdapter import com.readrops.api.utils.LibUtils -import com.readrops.api.utils.ParseException -import com.readrops.api.utils.UnknownFormatException +import com.readrops.api.utils.exceptions.ParseException +import com.readrops.api.utils.exceptions.UnknownFormatException import com.readrops.db.entities.Feed import com.readrops.db.entities.Item import com.squareup.moshi.Moshi diff --git a/api/src/main/java/com/readrops/api/localfeed/atom/ATOMFeedAdapter.kt b/api/src/main/java/com/readrops/api/localfeed/atom/ATOMFeedAdapter.kt index 43446073..4e88f5c8 100644 --- a/api/src/main/java/com/readrops/api/localfeed/atom/ATOMFeedAdapter.kt +++ b/api/src/main/java/com/readrops/api/localfeed/atom/ATOMFeedAdapter.kt @@ -5,9 +5,9 @@ import com.gitlab.mvysny.konsumexml.Names import com.gitlab.mvysny.konsumexml.allChildrenAutoIgnore import com.gitlab.mvysny.konsumexml.konsumeXml import com.readrops.api.localfeed.XmlAdapter -import com.readrops.api.utils.ParseException -import com.readrops.api.utils.nonNullText -import com.readrops.api.utils.nullableText +import com.readrops.api.utils.exceptions.ParseException +import com.readrops.api.utils.extensions.nonNullText +import com.readrops.api.utils.extensions.nullableText import com.readrops.db.entities.Feed import java.io.InputStream diff --git a/api/src/main/java/com/readrops/api/localfeed/atom/ATOMItemsAdapter.kt b/api/src/main/java/com/readrops/api/localfeed/atom/ATOMItemsAdapter.kt index be61a987..151bf382 100644 --- a/api/src/main/java/com/readrops/api/localfeed/atom/ATOMItemsAdapter.kt +++ b/api/src/main/java/com/readrops/api/localfeed/atom/ATOMItemsAdapter.kt @@ -6,6 +6,10 @@ import com.gitlab.mvysny.konsumexml.allChildrenAutoIgnore import com.gitlab.mvysny.konsumexml.konsumeXml import com.readrops.api.localfeed.XmlAdapter import com.readrops.api.utils.* +import com.readrops.api.utils.exceptions.ParseException +import com.readrops.api.utils.extensions.nonNullText +import com.readrops.api.utils.extensions.nullableText +import com.readrops.api.utils.extensions.nullableTextRecursively import com.readrops.db.entities.Item import org.joda.time.LocalDateTime import java.io.InputStream diff --git a/api/src/main/java/com/readrops/api/localfeed/json/JSONFeedAdapter.kt b/api/src/main/java/com/readrops/api/localfeed/json/JSONFeedAdapter.kt index 81ff0828..80086873 100644 --- a/api/src/main/java/com/readrops/api/localfeed/json/JSONFeedAdapter.kt +++ b/api/src/main/java/com/readrops/api/localfeed/json/JSONFeedAdapter.kt @@ -1,8 +1,8 @@ package com.readrops.api.localfeed.json -import com.readrops.api.utils.ParseException -import com.readrops.api.utils.nextNonEmptyString -import com.readrops.api.utils.nextNullableString +import com.readrops.api.utils.exceptions.ParseException +import com.readrops.api.utils.extensions.nextNonEmptyString +import com.readrops.api.utils.extensions.nextNullableString import com.readrops.db.entities.Feed import com.squareup.moshi.FromJson import com.squareup.moshi.JsonReader diff --git a/api/src/main/java/com/readrops/api/localfeed/json/JSONItemsAdapter.kt b/api/src/main/java/com/readrops/api/localfeed/json/JSONItemsAdapter.kt index e209ff3f..71e26506 100644 --- a/api/src/main/java/com/readrops/api/localfeed/json/JSONItemsAdapter.kt +++ b/api/src/main/java/com/readrops/api/localfeed/json/JSONItemsAdapter.kt @@ -2,9 +2,9 @@ package com.readrops.api.localfeed.json import com.readrops.api.localfeed.XmlAdapter.Companion.AUTHORS_MAX import com.readrops.api.utils.DateUtils -import com.readrops.api.utils.ParseException -import com.readrops.api.utils.nextNonEmptyString -import com.readrops.api.utils.nextNullableString +import com.readrops.api.utils.exceptions.ParseException +import com.readrops.api.utils.extensions.nextNonEmptyString +import com.readrops.api.utils.extensions.nextNullableString import com.readrops.db.entities.Item import com.squareup.moshi.JsonAdapter import com.squareup.moshi.JsonReader diff --git a/api/src/main/java/com/readrops/api/localfeed/rss1/RSS1FeedAdapter.kt b/api/src/main/java/com/readrops/api/localfeed/rss1/RSS1FeedAdapter.kt index 0b7e9cb0..cbbdbe2a 100644 --- a/api/src/main/java/com/readrops/api/localfeed/rss1/RSS1FeedAdapter.kt +++ b/api/src/main/java/com/readrops/api/localfeed/rss1/RSS1FeedAdapter.kt @@ -4,9 +4,9 @@ import com.gitlab.mvysny.konsumexml.Names import com.gitlab.mvysny.konsumexml.allChildrenAutoIgnore import com.gitlab.mvysny.konsumexml.konsumeXml import com.readrops.api.localfeed.XmlAdapter -import com.readrops.api.utils.ParseException -import com.readrops.api.utils.nonNullText -import com.readrops.api.utils.nullableText +import com.readrops.api.utils.exceptions.ParseException +import com.readrops.api.utils.extensions.nonNullText +import com.readrops.api.utils.extensions.nullableText import com.readrops.db.entities.Feed import java.io.InputStream diff --git a/api/src/main/java/com/readrops/api/localfeed/rss1/RSS1ItemsAdapter.kt b/api/src/main/java/com/readrops/api/localfeed/rss1/RSS1ItemsAdapter.kt index 0796fed9..416de501 100644 --- a/api/src/main/java/com/readrops/api/localfeed/rss1/RSS1ItemsAdapter.kt +++ b/api/src/main/java/com/readrops/api/localfeed/rss1/RSS1ItemsAdapter.kt @@ -6,6 +6,10 @@ import com.gitlab.mvysny.konsumexml.konsumeXml import com.readrops.api.localfeed.XmlAdapter import com.readrops.api.localfeed.XmlAdapter.Companion.AUTHORS_MAX import com.readrops.api.utils.* +import com.readrops.api.utils.exceptions.ParseException +import com.readrops.api.utils.extensions.nonNullText +import com.readrops.api.utils.extensions.nullableText +import com.readrops.api.utils.extensions.nullableTextRecursively import com.readrops.db.entities.Item import org.joda.time.LocalDateTime import java.io.InputStream diff --git a/api/src/main/java/com/readrops/api/localfeed/rss2/RSS2FeedAdapter.kt b/api/src/main/java/com/readrops/api/localfeed/rss2/RSS2FeedAdapter.kt index 2751a428..e28c1478 100644 --- a/api/src/main/java/com/readrops/api/localfeed/rss2/RSS2FeedAdapter.kt +++ b/api/src/main/java/com/readrops/api/localfeed/rss2/RSS2FeedAdapter.kt @@ -4,9 +4,9 @@ import com.gitlab.mvysny.konsumexml.Names import com.gitlab.mvysny.konsumexml.allChildrenAutoIgnore import com.gitlab.mvysny.konsumexml.konsumeXml import com.readrops.api.localfeed.XmlAdapter -import com.readrops.api.utils.ParseException -import com.readrops.api.utils.nonNullText -import com.readrops.api.utils.nullableText +import com.readrops.api.utils.exceptions.ParseException +import com.readrops.api.utils.extensions.nonNullText +import com.readrops.api.utils.extensions.nullableText import com.readrops.db.entities.Feed import org.jsoup.Jsoup import java.io.InputStream diff --git a/api/src/main/java/com/readrops/api/localfeed/rss2/RSS2ItemsAdapter.kt b/api/src/main/java/com/readrops/api/localfeed/rss2/RSS2ItemsAdapter.kt index ef2dfcc2..2a367efa 100644 --- a/api/src/main/java/com/readrops/api/localfeed/rss2/RSS2ItemsAdapter.kt +++ b/api/src/main/java/com/readrops/api/localfeed/rss2/RSS2ItemsAdapter.kt @@ -4,6 +4,10 @@ import com.gitlab.mvysny.konsumexml.* import com.readrops.api.localfeed.XmlAdapter import com.readrops.api.localfeed.XmlAdapter.Companion.AUTHORS_MAX import com.readrops.api.utils.* +import com.readrops.api.utils.exceptions.ParseException +import com.readrops.api.utils.extensions.nonNullText +import com.readrops.api.utils.extensions.nullableText +import com.readrops.api.utils.extensions.nullableTextRecursively import com.readrops.db.entities.Item import org.joda.time.LocalDateTime import java.io.InputStream diff --git a/api/src/main/java/com/readrops/api/opml/OPMLParser.kt b/api/src/main/java/com/readrops/api/opml/OPMLParser.kt index ce9dba51..8b55bba0 100644 --- a/api/src/main/java/com/readrops/api/opml/OPMLParser.kt +++ b/api/src/main/java/com/readrops/api/opml/OPMLParser.kt @@ -7,8 +7,7 @@ import com.readrops.api.opml.model.Body import com.readrops.api.opml.model.Head import com.readrops.api.opml.model.OPML import com.readrops.api.opml.model.Outline -import com.readrops.api.utils.LibUtils -import com.readrops.api.utils.ParseException +import com.readrops.api.utils.exceptions.ParseException import com.readrops.db.entities.Feed import com.readrops.db.entities.Folder import io.reactivex.Completable diff --git a/api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsDataSource.java b/api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsDataSource.java index ed06044d..bfe3ae96 100644 --- a/api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsDataSource.java +++ b/api/src/main/java/com/readrops/api/services/nextcloudnews/NextNewsDataSource.java @@ -8,9 +8,9 @@ import androidx.annotation.Nullable; import com.readrops.api.services.SyncResult; import com.readrops.api.services.SyncType; import com.readrops.api.services.nextcloudnews.json.NextNewsUser; -import com.readrops.api.utils.ConflictException; +import com.readrops.api.utils.exceptions.ConflictException; import com.readrops.api.utils.LibUtils; -import com.readrops.api.utils.UnknownFormatException; +import com.readrops.api.utils.exceptions.UnknownFormatException; import com.readrops.db.entities.Feed; import com.readrops.db.entities.Folder; import com.readrops.db.entities.Item; diff --git a/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFeedsAdapter.kt b/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFeedsAdapter.kt index 4bfc3832..ba1c34e0 100644 --- a/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFeedsAdapter.kt +++ b/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsFeedsAdapter.kt @@ -2,7 +2,7 @@ package com.readrops.api.services.nextcloudnews.adapters import android.annotation.SuppressLint import com.readrops.db.entities.Feed -import com.readrops.api.utils.nextNullableString +import com.readrops.api.utils.extensions.nextNullableString import com.squareup.moshi.FromJson import com.squareup.moshi.JsonReader import com.squareup.moshi.ToJson diff --git a/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsItemsAdapter.kt b/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsItemsAdapter.kt index 992a1e44..1d4f145a 100644 --- a/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsItemsAdapter.kt +++ b/api/src/main/java/com/readrops/api/services/nextcloudnews/adapters/NextNewsItemsAdapter.kt @@ -3,7 +3,7 @@ package com.readrops.api.services.nextcloudnews.adapters import android.annotation.SuppressLint import com.readrops.db.entities.Item import com.readrops.api.utils.LibUtils -import com.readrops.api.utils.nextNullableString +import com.readrops.api.utils.extensions.nextNullableString import com.squareup.moshi.JsonAdapter import com.squareup.moshi.JsonReader import com.squareup.moshi.JsonWriter diff --git a/api/src/main/java/com/readrops/api/utils/ConflictException.java b/api/src/main/java/com/readrops/api/utils/exceptions/ConflictException.java similarity index 80% rename from api/src/main/java/com/readrops/api/utils/ConflictException.java rename to api/src/main/java/com/readrops/api/utils/exceptions/ConflictException.java index 83467a44..eda1d4d6 100644 --- a/api/src/main/java/com/readrops/api/utils/ConflictException.java +++ b/api/src/main/java/com/readrops/api/utils/exceptions/ConflictException.java @@ -1,4 +1,4 @@ -package com.readrops.api.utils; +package com.readrops.api.utils.exceptions; public class ConflictException extends Exception { diff --git a/api/src/main/java/com/readrops/api/utils/ParseException.java b/api/src/main/java/com/readrops/api/utils/exceptions/ParseException.java similarity index 80% rename from api/src/main/java/com/readrops/api/utils/ParseException.java rename to api/src/main/java/com/readrops/api/utils/exceptions/ParseException.java index 46065da3..9ff5e50d 100644 --- a/api/src/main/java/com/readrops/api/utils/ParseException.java +++ b/api/src/main/java/com/readrops/api/utils/exceptions/ParseException.java @@ -1,4 +1,4 @@ -package com.readrops.api.utils; +package com.readrops.api.utils.exceptions; public class ParseException extends Exception { diff --git a/api/src/main/java/com/readrops/api/utils/UnknownFormatException.java b/api/src/main/java/com/readrops/api/utils/exceptions/UnknownFormatException.java similarity index 81% rename from api/src/main/java/com/readrops/api/utils/UnknownFormatException.java rename to api/src/main/java/com/readrops/api/utils/exceptions/UnknownFormatException.java index 3e76fe56..8e6da51b 100644 --- a/api/src/main/java/com/readrops/api/utils/UnknownFormatException.java +++ b/api/src/main/java/com/readrops/api/utils/exceptions/UnknownFormatException.java @@ -1,4 +1,4 @@ -package com.readrops.api.utils; +package com.readrops.api.utils.exceptions; public class UnknownFormatException extends Exception { diff --git a/api/src/main/java/com/readrops/api/utils/JsonReaderExtensions.kt b/api/src/main/java/com/readrops/api/utils/extensions/JsonReaderExtensions.kt similarity index 78% rename from api/src/main/java/com/readrops/api/utils/JsonReaderExtensions.kt rename to api/src/main/java/com/readrops/api/utils/extensions/JsonReaderExtensions.kt index 09ecf36a..d06ca5dd 100644 --- a/api/src/main/java/com/readrops/api/utils/JsonReaderExtensions.kt +++ b/api/src/main/java/com/readrops/api/utils/extensions/JsonReaderExtensions.kt @@ -1,5 +1,6 @@ -package com.readrops.api.utils +package com.readrops.api.utils.extensions +import com.readrops.api.utils.exceptions.ParseException import com.squareup.moshi.JsonReader fun JsonReader.nextNullableString(): String? = diff --git a/api/src/main/java/com/readrops/api/utils/KonsumerExtensions.kt b/api/src/main/java/com/readrops/api/utils/extensions/KonsumerExtensions.kt similarity index 86% rename from api/src/main/java/com/readrops/api/utils/KonsumerExtensions.kt rename to api/src/main/java/com/readrops/api/utils/extensions/KonsumerExtensions.kt index 46de8a39..25a8ba81 100644 --- a/api/src/main/java/com/readrops/api/utils/KonsumerExtensions.kt +++ b/api/src/main/java/com/readrops/api/utils/extensions/KonsumerExtensions.kt @@ -1,8 +1,9 @@ -package com.readrops.api.utils +package com.readrops.api.utils.extensions import com.gitlab.mvysny.konsumexml.Konsumer import com.gitlab.mvysny.konsumexml.Whitespace import com.gitlab.mvysny.konsumexml.textRecursively +import com.readrops.api.utils.exceptions.ParseException fun Konsumer.nonNullText(): String { val text = text(whitespace = Whitespace.preserve) diff --git a/api/src/test/java/com/readrops/api/utils/JsonReaderExtensionsTest.kt b/api/src/test/java/com/readrops/api/utils/JsonReaderExtensionsTest.kt index 0bba568b..fb27e07a 100644 --- a/api/src/test/java/com/readrops/api/utils/JsonReaderExtensionsTest.kt +++ b/api/src/test/java/com/readrops/api/utils/JsonReaderExtensionsTest.kt @@ -1,5 +1,8 @@ package com.readrops.api.utils +import com.readrops.api.utils.exceptions.ParseException +import com.readrops.api.utils.extensions.nextNonEmptyString +import com.readrops.api.utils.extensions.nextNullableString import com.squareup.moshi.JsonReader import junit.framework.TestCase.assertEquals import junit.framework.TestCase.assertNull diff --git a/api/src/test/java/com/readrops/api/utils/KonsumerExtensionsTest.kt b/api/src/test/java/com/readrops/api/utils/KonsumerExtensionsTest.kt index 7698dfb2..40699959 100644 --- a/api/src/test/java/com/readrops/api/utils/KonsumerExtensionsTest.kt +++ b/api/src/test/java/com/readrops/api/utils/KonsumerExtensionsTest.kt @@ -2,6 +2,9 @@ package com.readrops.api.utils import com.gitlab.mvysny.konsumexml.KonsumerException import com.gitlab.mvysny.konsumexml.konsumeXml +import com.readrops.api.utils.extensions.nonNullText +import com.readrops.api.utils.extensions.nullableText +import com.readrops.api.utils.extensions.nullableTextRecursively import junit.framework.TestCase.assertEquals import junit.framework.TestCase.assertNull import org.junit.Test diff --git a/app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java b/app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java index 9404647a..888534c4 100644 --- a/app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java +++ b/app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java @@ -11,8 +11,8 @@ import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentPagerAdapter; import com.afollestad.materialdialogs.MaterialDialog; -import com.readrops.api.utils.ConflictException; -import com.readrops.api.utils.UnknownFormatException; +import com.readrops.api.utils.exceptions.ConflictException; +import com.readrops.api.utils.exceptions.UnknownFormatException; import com.readrops.app.R; import com.readrops.app.databinding.ActivityManageFeedsFoldersBinding; import com.readrops.app.fragments.FeedsFragment; diff --git a/app/src/main/java/com/readrops/app/fragments/FoldersFragment.java b/app/src/main/java/com/readrops/app/fragments/FoldersFragment.java index 587660ee..444c0d0a 100644 --- a/app/src/main/java/com/readrops/app/fragments/FoldersFragment.java +++ b/app/src/main/java/com/readrops/app/fragments/FoldersFragment.java @@ -13,8 +13,8 @@ import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.LinearLayoutManager; import com.afollestad.materialdialogs.MaterialDialog; -import com.readrops.api.utils.ConflictException; -import com.readrops.api.utils.UnknownFormatException; +import com.readrops.api.utils.exceptions.ConflictException; +import com.readrops.api.utils.exceptions.UnknownFormatException; import com.readrops.app.R; import com.readrops.app.adapters.FoldersAdapter; import com.readrops.app.databinding.FragmentFoldersBinding; diff --git a/app/src/main/java/com/readrops/app/repositories/LocalFeedRepository.java b/app/src/main/java/com/readrops/app/repositories/LocalFeedRepository.java index f1d27653..98cced76 100644 --- a/app/src/main/java/com/readrops/app/repositories/LocalFeedRepository.java +++ b/app/src/main/java/com/readrops/app/repositories/LocalFeedRepository.java @@ -10,8 +10,8 @@ import androidx.annotation.Nullable; import com.readrops.api.localfeed.LocalRSSDataSource; import com.readrops.api.services.SyncResult; import com.readrops.api.utils.LibUtils; -import com.readrops.api.utils.ParseException; -import com.readrops.api.utils.UnknownFormatException; +import com.readrops.api.utils.exceptions.ParseException; +import com.readrops.api.utils.exceptions.UnknownFormatException; import com.readrops.app.utils.FeedInsertionResult; import com.readrops.app.utils.ParsingResult; import com.readrops.app.utils.SharedPreferencesManager; diff --git a/app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java b/app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java index 1d10f93b..18adc41a 100644 --- a/app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java +++ b/app/src/main/java/com/readrops/app/repositories/NextNewsRepository.java @@ -12,7 +12,7 @@ import com.readrops.api.services.SyncType; import com.readrops.api.services.nextcloudnews.NextNewsDataSource; import com.readrops.api.services.nextcloudnews.NextNewsSyncData; import com.readrops.api.services.nextcloudnews.json.NextNewsUser; -import com.readrops.api.utils.UnknownFormatException; +import com.readrops.api.utils.exceptions.UnknownFormatException; import com.readrops.app.utils.FeedInsertionResult; import com.readrops.app.utils.ParsingResult; import com.readrops.app.utils.Utils;