Skip to content

Commit faf7ff6

Browse files
magneticflux-magneticflux-
committed
Fixed indentations and formatting problems [ci skip-release]
1 parent a8ed93c commit faf7ff6

File tree

21 files changed

+283
-197
lines changed

21 files changed

+283
-197
lines changed

‎src/main/kotlin/com/github/magneticflux/rss/Persisters.kt‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,21 @@ fun createRssPersister(): Persister = Persister(createRssStrategy(), createRssMa
5151
*/
5252
fun createRssStrategy(): Strategy {
5353
return RegistryStrategy(
54-
Registry().apply {
55-
this.bind(Rss::class.java, RssConverter)
56-
this.bind(Channel::class.java, ChannelConverter)
57-
this.bind(Item::class.java, ItemConverter)
58-
this.bind(Category::class.java, CategoryConverter)
59-
this.bind(Image::class.java, ImageConverter)
60-
this.bind(Cloud::class.java, CloudConverter)
61-
this.bind(TextInput::class.java, TextInputConverter)
62-
this.bind(Enclosure::class.java, EnclosureConverter)
63-
this.bind(Guid::class.java, GuidConverter)
64-
this.bind(Source::class.java, SourceConverter)
65-
this.bind(ITunesTopLevelCategory::class.java, ITunesTopLevelCategoryConverter)
66-
this.bind(ITunesSubCategory::class.java, ITunesSubCategoryConverter)
67-
this.bind(ITunesImage::class.java, ITunesImageConverter)
68-
})
54+
Registry().apply {
55+
this.bind(Rss::class.java, RssConverter)
56+
this.bind(Channel::class.java, ChannelConverter)
57+
this.bind(Item::class.java, ItemConverter)
58+
this.bind(Category::class.java, CategoryConverter)
59+
this.bind(Image::class.java, ImageConverter)
60+
this.bind(Cloud::class.java, CloudConverter)
61+
this.bind(TextInput::class.java, TextInputConverter)
62+
this.bind(Enclosure::class.java, EnclosureConverter)
63+
this.bind(Guid::class.java, GuidConverter)
64+
this.bind(Source::class.java, SourceConverter)
65+
this.bind(ITunesTopLevelCategory::class.java, ITunesTopLevelCategoryConverter)
66+
this.bind(ITunesSubCategory::class.java, ITunesSubCategoryConverter)
67+
this.bind(ITunesImage::class.java, ITunesImageConverter)
68+
})
6969
}
7070

7171
/**

‎src/main/kotlin/com/github/magneticflux/rss/Transforms.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ object DayOfWeekTransform : Transform<DayOfWeek> {
3434
}
3535

3636
private val FORMATTER: DateTimeFormatter = DateTimeFormatterBuilder()
37-
.appendText(ChronoField.DAY_OF_WEEK, TextStyle.FULL)
38-
.toFormatter(Locale.US)
37+
.appendText(ChronoField.DAY_OF_WEEK, TextStyle.FULL)
38+
.toFormatter(Locale.US)
3939
}
4040

4141
/**

‎src/main/kotlin/com/github/magneticflux/rss/namespaces/itunes/converters/ITunesTopLevelCategoryConverter.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ object ITunesTopLevelCategoryConverter : Converter<ICommonITunesTopLevelCategory
2121

2222
node.children.forEach {
2323
when (it.fullName) {
24-
"itunes:category" -> subCategories += fallbackPersister.read(ITunesSubCategory::class.java, it)
24+
"itunes:category" -> subCategories += fallbackPersister.read(
25+
ITunesSubCategory::class.java,
26+
it
27+
)
2528
}
2629
}
2730

‎src/main/kotlin/com/github/magneticflux/rss/namespaces/itunes/elements/ITunesImage.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ interface IWritableITunesImage : ICommonITunesImage {
4545
@Root(name = "image")
4646
@Namespace(reference = ITUNES_REFERENCE)
4747
data class ITunesImage(
48-
override val href: URL
48+
override val href: URL
4949
) : IITunesImage, IWritableITunesImage

‎src/main/kotlin/com/github/magneticflux/rss/namespaces/itunes/elements/ITunesSubCategory.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ interface IWritableITunesSubCategory : ICommonITunesSubCategory {
4242
@Root(name = "category")
4343
@Namespace(reference = ITUNES_REFERENCE)
4444
data class ITunesSubCategory(
45-
override val text: String
45+
override val text: String
4646
) : IITunesSubCategory, IWritableITunesSubCategory

‎src/main/kotlin/com/github/magneticflux/rss/namespaces/itunes/elements/ITunesTopLevelCategory.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ import org.simpleframework.xml.Root
1212
*
1313
* @since 1.1.0
1414
*/
15-
interface ICommonITunesTopLevelCategory : HasReadWrite<IITunesTopLevelCategory, IWritableITunesTopLevelCategory> {
15+
interface ICommonITunesTopLevelCategory :
16+
HasReadWrite<IITunesTopLevelCategory, IWritableITunesTopLevelCategory> {
1617
val text: String
1718
val iTunesSubCategories: List<ICommonITunesSubCategory>
1819
}
@@ -49,6 +50,6 @@ interface IWritableITunesTopLevelCategory : ICommonITunesTopLevelCategory {
4950
@Root(name = "category")
5051
@Namespace(reference = ITUNES_REFERENCE)
5152
data class ITunesTopLevelCategory(
52-
override val text: String,
53-
override val iTunesSubCategories: List<ITunesSubCategory>
53+
override val text: String,
54+
override val iTunesSubCategories: List<ITunesSubCategory>
5455
) : IITunesTopLevelCategory, IWritableITunesTopLevelCategory

‎src/main/kotlin/com/github/magneticflux/rss/namespaces/standard/converters/ChannelConverter.kt‎

Lines changed: 41 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ object ChannelConverter : Converter<ICommonChannel> {
6363
node.children.forEach {
6464
when (it.fullName) {
6565
"title" -> title = it.value.orEmpty() // Element is there, but an empty String
66-
"description" -> description = it.value.orEmpty() // Element is there, but an empty String
66+
"description" -> description =
67+
it.value.orEmpty() // Element is there, but an empty String
6768
"link" -> link = fallbackPersister.read(URL::class.java, it)
6869
"category" -> categories += fallbackPersister.read(Category::class.java, it)
6970
"copyright" -> copyright = it.value
@@ -73,15 +74,19 @@ object ChannelConverter : Converter<ICommonChannel> {
7374
"managingEditor" -> managingEditor = it.value
7475
"generator" -> generator = it.value
7576
"image" -> image = fallbackPersister.read(Image::class.java, it)
76-
"lastBuildDate" -> lastBuildDate = fallbackPersister.read(ZonedDateTime::class.java, it)
77+
"lastBuildDate" -> lastBuildDate =
78+
fallbackPersister.read(ZonedDateTime::class.java, it)
7779
"pubDate" -> pubDate = fallbackPersister.read(ZonedDateTime::class.java, it)
7880
"ttl" -> ttl = it.value.toInt()
7981
"day" -> skipDays += fallbackPersister.read(DayOfWeek::class.java, it)
8082
"hour" -> skipHours += it.value.toInt()
8183
"cloud" -> cloud = fallbackPersister.read(Cloud::class.java, it)
8284
"textInput" -> textInput = fallbackPersister.read(TextInput::class.java, it)
8385
"item" -> items += fallbackPersister.read(Item::class.java, it)
84-
"itunes:category" -> iTunesCategories += fallbackPersister.read(ITunesTopLevelCategory::class.java, it)
86+
"itunes:category" -> iTunesCategories += fallbackPersister.read(
87+
ITunesTopLevelCategory::class.java,
88+
it
89+
)
8590
"itunes:explicit" -> iTunesExplicitRaw = it.value
8691
"itunes:subtitle" -> iTunesSubtitle = it.value
8792
"itunes:summary" -> iTunesSummary = it.value
@@ -93,33 +98,33 @@ object ChannelConverter : Converter<ICommonChannel> {
9398
}
9499

95100
return Channel(
96-
title,
97-
description,
98-
link,
99-
categories,
100-
copyright,
101-
docs,
102-
language,
103-
webMaster,
104-
managingEditor,
105-
generator,
106-
image,
107-
lastBuildDate,
108-
pubDate,
109-
ttl,
110-
skipDays,
111-
skipHours,
112-
cloud,
113-
textInput,
114-
items,
115-
iTunesCategories,
116-
iTunesExplicitRaw,
117-
iTunesSubtitle,
118-
iTunesSummary,
119-
iTunesAuthor,
120-
iTunesImage,
121-
iTunesBlockRaw,
122-
iTunesCompleteRaw
101+
title,
102+
description,
103+
link,
104+
categories,
105+
copyright,
106+
docs,
107+
language,
108+
webMaster,
109+
managingEditor,
110+
generator,
111+
image,
112+
lastBuildDate,
113+
pubDate,
114+
ttl,
115+
skipDays,
116+
skipHours,
117+
cloud,
118+
textInput,
119+
items,
120+
iTunesCategories,
121+
iTunesExplicitRaw,
122+
iTunesSubtitle,
123+
iTunesSummary,
124+
iTunesAuthor,
125+
iTunesImage,
126+
iTunesBlockRaw,
127+
iTunesCompleteRaw
123128
)
124129
}
125130

@@ -132,12 +137,16 @@ object ChannelConverter : Converter<ICommonChannel> {
132137
writable.categories.forEach { fallbackPersister.write(it, node) }
133138
writable.copyright?.let { node.getChild("copyright").value = it }
134139
writable.docs?.let { node.getChild("docs").value = URLTransform.write(it) }
135-
writable.language?.let { node.getChild("language").value = LocaleLanguageTransform.write(it) }
140+
writable.language?.let {
141+
node.getChild("language").value = LocaleLanguageTransform.write(it)
142+
}
136143
writable.webMaster?.let { node.getChild("webMaster").value = it }
137144
writable.managingEditor?.let { node.getChild("managingEditor").value = it }
138145
writable.generator?.let { node.getChild("generator").value = it }
139146
writable.image?.let { fallbackPersister.write(it, node) }
140-
writable.lastBuildDate?.let { node.getChild("lastBuildDate").value = ZonedDateTimeTransform.write(it) }
147+
writable.lastBuildDate?.let {
148+
node.getChild("lastBuildDate").value = ZonedDateTimeTransform.write(it)
149+
}
141150
writable.pubDate?.let { node.getChild("pubDate").value = ZonedDateTimeTransform.write(it) }
142151
writable.ttl?.let { node.getChild("ttl").value = it.toString() }
143152
if (writable.skipDays.isNotEmpty())

‎src/main/kotlin/com/github/magneticflux/rss/namespaces/standard/converters/ItemConverter.kt‎

Lines changed: 34 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@ object ItemConverter : Converter<ICommonItem> {
5858
"guid" -> guid = fallbackPersister.read(Guid::class.java, it)
5959
"enclosure" -> enclosure = fallbackPersister.read(Enclosure::class.java, it)
6060
"source" -> source = fallbackPersister.read(Source::class.java, it)
61-
"itunes:category" -> iTunesCategories += fallbackPersister.read(ITunesTopLevelCategory::class.java, it)
61+
"itunes:category" -> iTunesCategories += fallbackPersister.read(
62+
ITunesTopLevelCategory::class.java,
63+
it
64+
)
6265
"itunes:explicit" -> iTunesExplicitRaw = it.value
6366
"itunes:subtitle" -> iTunesSubtitle = it.value
6467
"itunes:summary" -> iTunesSummary = it.value
@@ -70,24 +73,24 @@ object ItemConverter : Converter<ICommonItem> {
7073
}
7174

7275
return Item(
73-
title,
74-
description,
75-
link,
76-
categories,
77-
comments,
78-
pubDate,
79-
author,
80-
guid,
81-
enclosure,
82-
source,
83-
iTunesCategories,
84-
iTunesExplicitRaw,
85-
iTunesSubtitle,
86-
iTunesSummary,
87-
iTunesAuthor,
88-
iTunesDurationRaw,
89-
iTunesImage,
90-
iTunesBlockRaw
76+
title,
77+
description,
78+
link,
79+
categories,
80+
comments,
81+
pubDate,
82+
author,
83+
guid,
84+
enclosure,
85+
source,
86+
iTunesCategories,
87+
iTunesExplicitRaw,
88+
iTunesSubtitle,
89+
iTunesSummary,
90+
iTunesAuthor,
91+
iTunesDurationRaw,
92+
iTunesImage,
93+
iTunesBlockRaw
9194
)
9295
}
9396

@@ -98,8 +101,18 @@ object ItemConverter : Converter<ICommonItem> {
98101
writable.description?.let { node.createChild(name = "description", value = it) }
99102
writable.link?.let { node.createChild(name = "link", value = URLTransform.write(it)) }
100103
writable.categories.forEach { fallbackPersister.write(it, node) }
101-
writable.comments?.let { node.createChild(name = "comments", value = URLTransform.write(it)) }
102-
writable.pubDate?.let { node.createChild(name = "pubDate", value = ZonedDateTimeTransform.write(it)) }
104+
writable.comments?.let {
105+
node.createChild(
106+
name = "comments",
107+
value = URLTransform.write(it)
108+
)
109+
}
110+
writable.pubDate?.let {
111+
node.createChild(
112+
name = "pubDate",
113+
value = ZonedDateTimeTransform.write(it)
114+
)
115+
}
103116
writable.author?.let { node.createChild(name = "author", value = it) }
104117
writable.guid?.let { fallbackPersister.write(it, node) }
105118
writable.enclosure?.let { fallbackPersister.write(it, node) }

‎src/main/kotlin/com/github/magneticflux/rss/namespaces/standard/converters/RssConverter.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ object RssConverter : Converter<ICommonRss> {
2929
}
3030

3131
return Rss(
32-
version,
33-
channel)
32+
version,
33+
channel
34+
)
3435
}
3536

3637
override fun write(node: OutputNode, value: ICommonRss) {

‎src/main/kotlin/com/github/magneticflux/rss/namespaces/standard/elements/Category.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ interface IWritableCategory : ICommonCategory {
4040
*/
4141
@Root(name = "category", strict = false)
4242
data class Category(
43-
override val domain: String? = null,
44-
override val text: String
43+
override val domain: String? = null,
44+
override val text: String
4545
) : ICategory, IWritableCategory

0 commit comments

Comments
 (0)