Updated packages to reflect project name.
This commit is contained in:
parent
48403e5304
commit
51cef6cef6
@ -13,30 +13,29 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare
|
||||
package dorkbox.kloudflareApi
|
||||
|
||||
import com.squareup.moshi.Moshi
|
||||
import dorkbox.kloudflare.api.CloudflareActions
|
||||
import dorkbox.kloudflare.api.core.CfErrorResponse
|
||||
import dorkbox.kloudflare.api.core.CfResponse
|
||||
import dorkbox.kloudflare.api.core.DnsRecordTypeAdapter
|
||||
import dorkbox.kloudflare.api.core.Error
|
||||
import dorkbox.kloudflare.api.core.ISO8601Adapter
|
||||
import dorkbox.kloudflare.api.dns.CreateDnsRecord
|
||||
import dorkbox.kloudflare.api.dns.DeleteDnsRecord
|
||||
import dorkbox.kloudflare.api.dns.DnsRecord
|
||||
import dorkbox.kloudflare.api.dns.UpdateDnsRecord
|
||||
import dorkbox.kloudflare.api.firewall.AccessRule
|
||||
import dorkbox.kloudflare.api.user.BillingHistory
|
||||
import dorkbox.kloudflare.api.user.BillingProfile
|
||||
import dorkbox.kloudflare.api.user.User
|
||||
import dorkbox.kloudflare.api.zone.RatePlan
|
||||
import dorkbox.kloudflare.api.zone.Zone
|
||||
import dorkbox.kloudflare.api.zone.settings.ZoneSetting
|
||||
import dorkbox.kloudflareApi.api.CloudflareActions
|
||||
import dorkbox.kloudflareApi.api.core.CfErrorResponse
|
||||
import dorkbox.kloudflareApi.api.core.CfResponse
|
||||
import dorkbox.kloudflareApi.api.core.DnsRecordTypeAdapter
|
||||
import dorkbox.kloudflareApi.api.core.Error
|
||||
import dorkbox.kloudflareApi.api.core.ISO8601Adapter
|
||||
import dorkbox.kloudflareApi.api.dns.CreateDnsRecord
|
||||
import dorkbox.kloudflareApi.api.dns.DeleteDnsRecord
|
||||
import dorkbox.kloudflareApi.api.dns.DnsRecord
|
||||
import dorkbox.kloudflareApi.api.dns.UpdateDnsRecord
|
||||
import dorkbox.kloudflareApi.api.firewall.AccessRule
|
||||
import dorkbox.kloudflareApi.api.user.BillingHistory
|
||||
import dorkbox.kloudflareApi.api.user.BillingProfile
|
||||
import dorkbox.kloudflareApi.api.user.User
|
||||
import dorkbox.kloudflareApi.api.zone.RatePlan
|
||||
import dorkbox.kloudflareApi.api.zone.Zone
|
||||
import dorkbox.kloudflareApi.api.zone.settings.ZoneSetting
|
||||
import okhttp3.OkHttpClient
|
||||
import okhttp3.ResponseBody
|
||||
import okhttp3.logging.HttpLoggingInterceptor
|
||||
import org.slf4j.LoggerFactory
|
||||
import retrofit2.Call
|
||||
import retrofit2.Converter
|
||||
import retrofit2.Retrofit
|
||||
@ -45,9 +44,6 @@ import java.io.IOException
|
||||
|
||||
|
||||
class Kloudflare(private val xAuthEmail: String, private val xAuthKey: String) {
|
||||
private val logger = LoggerFactory.getLogger(Kloudflare::class.java)
|
||||
|
||||
|
||||
companion object {
|
||||
private const val API_BASE_URL = "https://api.cloudflare.com/client/v4/"
|
||||
|
@ -13,20 +13,20 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api
|
||||
package dorkbox.kloudflareApi.api
|
||||
|
||||
import dorkbox.kloudflare.api.core.CfResponse
|
||||
import dorkbox.kloudflare.api.dns.CreateDnsRecord
|
||||
import dorkbox.kloudflare.api.dns.DeleteDnsRecord
|
||||
import dorkbox.kloudflare.api.dns.DnsRecord
|
||||
import dorkbox.kloudflare.api.dns.UpdateDnsRecord
|
||||
import dorkbox.kloudflare.api.firewall.AccessRule
|
||||
import dorkbox.kloudflare.api.user.BillingHistory
|
||||
import dorkbox.kloudflare.api.user.BillingProfile
|
||||
import dorkbox.kloudflare.api.user.User
|
||||
import dorkbox.kloudflare.api.zone.RatePlan
|
||||
import dorkbox.kloudflare.api.zone.Zone
|
||||
import dorkbox.kloudflare.api.zone.settings.ZoneSetting
|
||||
import dorkbox.kloudflareApi.api.core.CfResponse
|
||||
import dorkbox.kloudflareApi.api.dns.CreateDnsRecord
|
||||
import dorkbox.kloudflareApi.api.dns.DeleteDnsRecord
|
||||
import dorkbox.kloudflareApi.api.dns.DnsRecord
|
||||
import dorkbox.kloudflareApi.api.dns.UpdateDnsRecord
|
||||
import dorkbox.kloudflareApi.api.firewall.AccessRule
|
||||
import dorkbox.kloudflareApi.api.user.BillingHistory
|
||||
import dorkbox.kloudflareApi.api.user.BillingProfile
|
||||
import dorkbox.kloudflareApi.api.user.User
|
||||
import dorkbox.kloudflareApi.api.zone.RatePlan
|
||||
import dorkbox.kloudflareApi.api.zone.Zone
|
||||
import dorkbox.kloudflareApi.api.zone.settings.ZoneSetting
|
||||
import retrofit2.Call
|
||||
import retrofit2.http.Body
|
||||
import retrofit2.http.DELETE
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.core
|
||||
package dorkbox.kloudflareApi.api.core
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.core
|
||||
package dorkbox.kloudflareApi.api.core
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,11 +13,11 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.core
|
||||
package dorkbox.kloudflareApi.api.core
|
||||
|
||||
import com.squareup.moshi.FromJson
|
||||
import com.squareup.moshi.ToJson
|
||||
import dorkbox.kloudflare.api.dns.RecordType
|
||||
import dorkbox.kloudflareApi.api.dns.RecordType
|
||||
|
||||
/** Converts byte arrays to base64 (so it looks better as a string...) */
|
||||
internal class DnsRecordTypeAdapter {
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.core
|
||||
package dorkbox.kloudflareApi.api.core
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.core
|
||||
package dorkbox.kloudflareApi.api.core
|
||||
|
||||
import com.squareup.moshi.FromJson
|
||||
import com.squareup.moshi.JsonQualifier
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.core
|
||||
package dorkbox.kloudflareApi.api.core
|
||||
|
||||
/**
|
||||
* https://api.cloudflare.com/#getting-started-requests
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.core
|
||||
package dorkbox.kloudflareApi.api.core
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,10 +13,10 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.dns
|
||||
package dorkbox.kloudflareApi.api.dns
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
import dorkbox.kloudflare.api.zone.Zone
|
||||
import dorkbox.kloudflareApi.api.zone.Zone
|
||||
|
||||
/**
|
||||
* https://api.cloudflare.com/#dns-records-for-a-zone-create-dns-record
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.dns
|
||||
package dorkbox.kloudflareApi.api.dns
|
||||
|
||||
/**
|
||||
* https://api.cloudflare.com/#dns-records-for-a-zone-properties
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.dns
|
||||
package dorkbox.kloudflareApi.api.dns
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,11 +13,11 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.dns
|
||||
package dorkbox.kloudflareApi.api.dns
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
import dorkbox.kloudflare.api.core.ISO8601
|
||||
import dorkbox.kloudflare.api.zone.Zone
|
||||
import dorkbox.kloudflareApi.api.core.ISO8601
|
||||
import dorkbox.kloudflareApi.api.zone.Zone
|
||||
import java.time.LocalDateTime
|
||||
|
||||
/**
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.dns
|
||||
package dorkbox.kloudflareApi.api.dns
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.dns
|
||||
package dorkbox.kloudflareApi.api.dns
|
||||
|
||||
enum class RecordType {
|
||||
A, AAAA, CNAME, TXT, SRV, LOC, MX, NS, SPF, CERT, DNSKEY, DS, NAPTR, SMIMEA, SSHFP, TLSA, URI
|
@ -1,4 +1,4 @@
|
||||
package dorkbox.kloudflare.api.dns
|
||||
package dorkbox.kloudflareApi.api.dns
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,10 +13,10 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.firewall
|
||||
package dorkbox.kloudflareApi.api.firewall
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
import dorkbox.kloudflare.api.core.ISO8601
|
||||
import dorkbox.kloudflareApi.api.core.ISO8601
|
||||
import java.time.LocalDateTime
|
||||
|
||||
/**
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.firewall
|
||||
package dorkbox.kloudflareApi.api.firewall
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.firewall
|
||||
package dorkbox.kloudflareApi.api.firewall
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,11 +13,11 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.user
|
||||
package dorkbox.kloudflareApi.api.user
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
import dorkbox.kloudflare.api.core.ISO8601
|
||||
import dorkbox.kloudflare.api.zone.Zone
|
||||
import dorkbox.kloudflareApi.api.core.ISO8601
|
||||
import dorkbox.kloudflareApi.api.zone.Zone
|
||||
import java.time.LocalDateTime
|
||||
|
||||
/**
|
@ -13,10 +13,10 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.user
|
||||
package dorkbox.kloudflareApi.api.user
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
import dorkbox.kloudflare.api.core.ISO8601
|
||||
import dorkbox.kloudflareApi.api.core.ISO8601
|
||||
import java.time.LocalDateTime
|
||||
|
||||
/**
|
@ -13,10 +13,10 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.user
|
||||
package dorkbox.kloudflareApi.api.user
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
import dorkbox.kloudflare.api.core.ISO8601
|
||||
import dorkbox.kloudflareApi.api.core.ISO8601
|
||||
import java.time.LocalDateTime
|
||||
|
||||
/**
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.user
|
||||
package dorkbox.kloudflareApi.api.user
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,10 +13,10 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.user.invite
|
||||
package dorkbox.kloudflareApi.api.user.invite
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
import dorkbox.kloudflare.api.core.ISO8601
|
||||
import dorkbox.kloudflareApi.api.core.ISO8601
|
||||
import java.time.LocalDateTime
|
||||
|
||||
/**
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.user.invite
|
||||
package dorkbox.kloudflareApi.api.user.invite
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.user.subscription
|
||||
package dorkbox.kloudflareApi.api.user.subscription
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.user.subscription
|
||||
package dorkbox.kloudflareApi.api.user.subscription
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.user.subscription
|
||||
package dorkbox.kloudflareApi.api.user.subscription
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,11 +13,11 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.user.subscription
|
||||
package dorkbox.kloudflareApi.api.user.subscription
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
import dorkbox.kloudflare.api.core.ISO8601
|
||||
import dorkbox.kloudflare.api.zone.Zone
|
||||
import dorkbox.kloudflareApi.api.core.ISO8601
|
||||
import dorkbox.kloudflareApi.api.zone.Zone
|
||||
import java.time.LocalDateTime
|
||||
|
||||
/**
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.zone
|
||||
package dorkbox.kloudflareApi.api.zone
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.zone
|
||||
package dorkbox.kloudflareApi.api.zone
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.zone
|
||||
package dorkbox.kloudflareApi.api.zone
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.zone
|
||||
package dorkbox.kloudflareApi.api.zone
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.zone
|
||||
package dorkbox.kloudflareApi.api.zone
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.zone
|
||||
package dorkbox.kloudflareApi.api.zone
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,12 +13,12 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.zone
|
||||
package dorkbox.kloudflareApi.api.zone
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
import dorkbox.kloudflare.Kloudflare
|
||||
import dorkbox.kloudflare.api.core.ISO8601
|
||||
import dorkbox.kloudflare.api.dns.DnsRecord
|
||||
import dorkbox.kloudflareApi.Kloudflare
|
||||
import dorkbox.kloudflareApi.api.core.ISO8601
|
||||
import dorkbox.kloudflareApi.api.dns.DnsRecord
|
||||
import java.time.LocalDateTime
|
||||
|
||||
/**
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.zone.settings
|
||||
package dorkbox.kloudflareApi.api.zone.settings
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.zone.settings
|
||||
package dorkbox.kloudflareApi.api.zone.settings
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,7 +13,7 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.zone.settings
|
||||
package dorkbox.kloudflareApi.api.zone.settings
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
|
@ -13,10 +13,10 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package dorkbox.kloudflare.api.zone.settings
|
||||
package dorkbox.kloudflareApi.api.zone.settings
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
import dorkbox.kloudflare.api.core.ISO8601
|
||||
import dorkbox.kloudflareApi.api.core.ISO8601
|
||||
import java.time.LocalDateTime
|
||||
|
||||
/**
|
@ -1,7 +1,5 @@
|
||||
package dorkbox.kloudflare
|
||||
package dorkbox.kloudflareApi
|
||||
|
||||
import org.slf4j.Logger
|
||||
import org.slf4j.LoggerFactory
|
||||
import java.time.Instant
|
||||
import java.util.*
|
||||
|
||||
@ -9,8 +7,6 @@ import java.util.*
|
||||
*
|
||||
*/
|
||||
object KloudflareTest {
|
||||
private val logger: Logger
|
||||
|
||||
init {
|
||||
// fix logging context
|
||||
val property = System.getProperty("logging.context")
|
||||
@ -19,8 +15,12 @@ object KloudflareTest {
|
||||
System.setProperty("logging.context", "kloudflareAPI")
|
||||
}
|
||||
|
||||
logger = LoggerFactory.getLogger(Kloudflare::class.java)
|
||||
Thread.setDefaultUncaughtExceptionHandler { t, e -> logger.error("Uncaught exception in thread: '{}'", t.name, e) }
|
||||
Thread.setDefaultUncaughtExceptionHandler { t, e ->
|
||||
run {
|
||||
println("Uncaught exception in thread: '${t.name}'")
|
||||
e.printStackTrace()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
@ -31,14 +31,14 @@ object KloudflareTest {
|
||||
arguments[index] = lowerCase
|
||||
}
|
||||
|
||||
logger.info("Starting : {} ", Instant.now().toString())
|
||||
println("Starting : ${Instant.now()}")
|
||||
|
||||
// start up the application!
|
||||
val jvmName = System.getProperty("java.vm.name")
|
||||
val jvmVersion = System.getProperty("java.version")
|
||||
val jvmVendor = System.getProperty("java.vm.specification.vendor")
|
||||
logger.info("Execution JVM: $jvmVendor $jvmName $jvmVersion")
|
||||
logger.info("Execution arguments: ${arguments.joinToString()}")
|
||||
println("Execution JVM: $jvmVendor $jvmName $jvmVersion")
|
||||
println("Execution arguments: ${arguments.joinToString()}")
|
||||
|
||||
|
||||
val email = "user@example.com"
|
Loading…
Reference in New Issue
Block a user