erik/jokeapi
erik/jokeapi
1
1
Fork 0
Code Issues Releases Activity

Compare commits

base: erik:2a05564ec3269b5f42b378a54f3576eb7ba84970
Branches Tags
erik:master
erik:1.0.0
erik:0.9.1
erik:0.9.0
..
compare: erik:6bd1aed18fdab17ee5cbfca2722641e08ce1d033
Branches Tags
erik:master
erik:1.0.0
erik:0.9.1
erik:0.9.0

No commits in common. "2a05564ec3269b5f42b378a54f3576eb7ba84970" and "6bd1aed18fdab17ee5cbfca2722641e08ce1d033" have entirely different histories.
2a05564ec3 ... 6bd1aed18f

26 changed files with 46 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/bld.yml vendored
View file

@ -13,8 +13,8 @@ jobs:
strategy:
matrix:
java-version: [17, 21, 23]
kotlin-version: [1.9.24, 2.1.0]
java-version: [17, 21, 22]
kotlin-version: [1.9.24, 2.0.20]
steps:
- name: Checkout source repository

2
README.md
View file

@ -1,5 +1,5 @@
[![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](https://opensource.org/licenses/BSD-3-Clause)
[![Kotlin](https://img.shields.io/badge/kotlin-2.1.0-7f52ff)](https://kotlinlang.org/)
[![Kotlin](https://img.shields.io/badge/kotlin-2.0.20-7f52ff)](https://kotlinlang.org/)
[![bld](https://img.shields.io/badge/2.1.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
[![Release](https://img.shields.io/github/release/ethauvin/jokeapi.svg)](https://github.com/ethauvin/jokeapi/releases/latest)
[![Maven Central](https://img.shields.io/maven-central/v/net.thauvin.erik/jokeapi?color=blue)](https://central.sonatype.com/artifact/net.thauvin.erik/jokeapi)

4
lib/bld/bld-wrapper.properties
View file

@ -2,9 +2,9 @@ bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true
bld.downloadLocation=
bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.7
bld.extension-dokka=com.uwyn.rife2:bld-dokka:1.0.2
bld.extension-dokka=com.uwyn.rife2:bld-dokka:1.0.1
bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.8
bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.3
bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.2
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
bld.sourceDirectories=
bld.version=2.1.0

4
pom.xml
View file

@ -18,7 +18,7 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>2.1.0</version>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -30,7 +30,7 @@
<dependency>
<groupId>net.thauvin.erik.urlencoder</groupId>
<artifactId>urlencoder-lib-jvm</artifactId>
<version>1.6.0</version>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
</dependencies>

10
src/bld/java/net/thauvin/erik/JokeApiBuild.java
View file

@ -1,7 +1,7 @@
/*
* JokeApiBuild.java
*
* Copyright 2022-2024 Erik C. Thauvin (erik@thauvin.net)
* Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@ -67,15 +67,15 @@ public class JokeApiBuild extends Project {
autoDownloadPurge = true;
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL);
final var kotlin = version(2, 1, 0);
final var kotlin = version(2, 0, 20);
scope(compile)
.include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin))
.include(dependency("org.json", "json", "20240303"))
.include(dependency("net.thauvin.erik.urlencoder", "urlencoder-lib-jvm", version(1, 6, 0)));
.include(dependency("net.thauvin.erik.urlencoder", "urlencoder-lib-jvm", version(1, 5, 0)));
scope(test)
.include(dependency("org.jetbrains.kotlin", "kotlin-test-junit5", kotlin))
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 4)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 4)))
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 0)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 0)))
.include(dependency("com.willowtreeapps.assertk", "assertk-jvm", version(0, 28, 1)));
publishOperation()

2
src/main/kotlin/net/thauvin/erik/jokeapi/JokeApi.kt
View file

@ -1,7 +1,7 @@
/*
* JokeApi.kt
*
* Copyright 2022-2024 Erik C. Thauvin (erik@thauvin.net)
* Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:

2
src/main/kotlin/net/thauvin/erik/jokeapi/JokeConfig.kt
View file

@ -1,7 +1,7 @@
/*
* JokeConfig.kt
*
* Copyright 2022-2024 Erik C. Thauvin (erik@thauvin.net)
* Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:

32
src/main/kotlin/net/thauvin/erik/jokeapi/JokeUtil.kt
View file

@ -1,7 +1,7 @@
/*
* JokeUtil.kt
*
* Copyright 2022-2024 Erik C. Thauvin (erik@thauvin.net)
* Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@ -51,25 +51,21 @@ internal fun fetchUrl(url: String, auth: String = ""): String {
}
val connection = URL(url).openConnection() as HttpURLConnection
try {
connection.setRequestProperty(
"User-Agent", "Mozilla/5.0 (X11; Linux x86_64; rv:130.0) Gecko/20100101 Firefox/130.0"
)
if (auth.isNotEmpty()) {
connection.setRequestProperty("Authentication", auth)
}
connection.setRequestProperty(
"User-Agent", "Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/109.0"
)
if (auth.isNotEmpty()) {
connection.setRequestProperty("Authentication", auth)
}
if (connection.responseCode in 200..399) {
val body = connection.inputStream.bufferedReader().use { it.readText() }
if (JokeApi.logger.isLoggable(Level.FINE)) {
JokeApi.logger.fine(body)
}
return body
} else {
throw httpError(connection.responseCode)
if (connection.responseCode in 200..399) {
val body = connection.inputStream.bufferedReader().use { it.readText() }
if (JokeApi.logger.isLoggable(Level.FINE)) {
JokeApi.logger.fine(body)
}
} finally {
connection.disconnect()
return body
} else {
throw httpError(connection.responseCode)
}
}

2
src/main/kotlin/net/thauvin/erik/jokeapi/exceptions/HttpErrorException.kt
View file

@ -1,7 +1,7 @@
/*
* HttpErrorException.kt
*
* Copyright 2022-2024 Erik C. Thauvin (erik@thauvin.net)
* Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:

2
src/main/kotlin/net/thauvin/erik/jokeapi/exceptions/JokeException.kt
View file

@ -1,7 +1,7 @@
/*
* JokeException.kt
*
* Copyright 2022-2024 Erik C. Thauvin (erik@thauvin.net)
* Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:

2
src/main/kotlin/net/thauvin/erik/jokeapi/models/Category.kt
View file

@ -1,7 +1,7 @@
/*
* Category.kt
*
* Copyright 2022-2024 Erik C. Thauvin (erik@thauvin.net)
* Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:

2
src/main/kotlin/net/thauvin/erik/jokeapi/models/Flag.kt
View file

@ -1,7 +1,7 @@
/*
* Flag.kt
*
* Copyright 2022-2024 Erik C. Thauvin (erik@thauvin.net)
* Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:

2
src/main/kotlin/net/thauvin/erik/jokeapi/models/Format.kt
View file

@ -1,7 +1,7 @@
/*
* Format.kt
*
* Copyright 2022-2024 Erik C. Thauvin (erik@thauvin.net)
* Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:

2
src/main/kotlin/net/thauvin/erik/jokeapi/models/IdRange.kt
View file

@ -1,7 +1,7 @@
/*
* IdRange.kt
*
* Copyright 2022-2024 Erik C. Thauvin (erik@thauvin.net)
* Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:

2
src/main/kotlin/net/thauvin/erik/jokeapi/models/Joke.kt
View file

@ -1,7 +1,7 @@
/*
* Joke.kt
*
* Copyright 2022-2024 Erik C. Thauvin (erik@thauvin.net)
* Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:

2
src/main/kotlin/net/thauvin/erik/jokeapi/models/Language.kt
View file

@ -1,7 +1,7 @@
/*
* Language.kt
*
* Copyright 2022-2024 Erik C. Thauvin (erik@thauvin.net)
* Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:

2
src/main/kotlin/net/thauvin/erik/jokeapi/models/Parameter.kt
View file

@ -1,7 +1,7 @@
/*
* Parameter.kt
*
* Copyright 2022-2024 Erik C. Thauvin (erik@thauvin.net)
* Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:

2
src/main/kotlin/net/thauvin/erik/jokeapi/models/Type.kt
View file

@ -1,7 +1,7 @@
/*
* Type.kt
*
* Copyright 2022-2024 Erik C. Thauvin (erik@thauvin.net)
* Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:

2
src/test/kotlin/net/thauvin/erik/jokeapi/ApiCallTest.kt
View file

@ -1,7 +1,7 @@
/*
* ApiCallTest.kt
*
* Copyright 2022-2024 Erik C. Thauvin (erik@thauvin.net)
* Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:

2
src/test/kotlin/net/thauvin/erik/jokeapi/BeforeAllTests.kt
View file

@ -1,7 +1,7 @@
/*
* BeforeAllTests.kt
*
* Copyright 2022-2024 Erik C. Thauvin (erik@thauvin.net)
* Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:

2
src/test/kotlin/net/thauvin/erik/jokeapi/ExceptionsTest.kt
View file

@ -1,7 +1,7 @@
/*
* ExceptionsTest.kt
*
* Copyright 2022-2024 Erik C. Thauvin (erik@thauvin.net)
* Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:

2
src/test/kotlin/net/thauvin/erik/jokeapi/GetJokeTest.kt
View file

@ -1,7 +1,7 @@
/*
* GetJokeTest.kt
*
* Copyright 2022-2024 Erik C. Thauvin (erik@thauvin.net)
* Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:

2
src/test/kotlin/net/thauvin/erik/jokeapi/GetJokesTest.kt
View file

@ -1,7 +1,7 @@
/*
* GetJokesTest.kt
*
* Copyright 2022-2024 Erik C. Thauvin (erik@thauvin.net)
* Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:

2
src/test/kotlin/net/thauvin/erik/jokeapi/GetRawJokesTest.kt
View file

@ -1,7 +1,7 @@
/*
* GetRawJokesTest.kt
*
* Copyright 2022-2024 Erik C. Thauvin (erik@thauvin.net)
* Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:

2
src/test/kotlin/net/thauvin/erik/jokeapi/JokeConfigTest.kt
View file

@ -1,7 +1,7 @@
/*
* JokeConfigTest.kt
*
* Copyright 2022-2024 Erik C. Thauvin (erik@thauvin.net)
* Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:

2
src/test/kotlin/net/thauvin/erik/jokeapi/JokeUtilTest.kt
View file

@ -1,7 +1,7 @@
/*
* JokeUtilTest.kt
*
* Copyright 2022-2024 Erik C. Thauvin (erik@thauvin.net)
* Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: