diff --git a/src/dorkbox/kloudflare/Kloudflare.kt b/src/dorkbox/kloudflareApi/Kloudflare.kt similarity index 84% rename from src/dorkbox/kloudflare/Kloudflare.kt rename to src/dorkbox/kloudflareApi/Kloudflare.kt index 3d9a14a..3e963ab 100644 --- a/src/dorkbox/kloudflare/Kloudflare.kt +++ b/src/dorkbox/kloudflareApi/Kloudflare.kt @@ -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/" diff --git a/src/dorkbox/kloudflare/api/CloudflareActions.kt b/src/dorkbox/kloudflareApi/api/CloudflareActions.kt similarity index 90% rename from src/dorkbox/kloudflare/api/CloudflareActions.kt rename to src/dorkbox/kloudflareApi/api/CloudflareActions.kt index 7865040..d06471e 100644 --- a/src/dorkbox/kloudflare/api/CloudflareActions.kt +++ b/src/dorkbox/kloudflareApi/api/CloudflareActions.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/core/CfErrorResponse.kt b/src/dorkbox/kloudflareApi/api/core/CfErrorResponse.kt similarity index 97% rename from src/dorkbox/kloudflare/api/core/CfErrorResponse.kt rename to src/dorkbox/kloudflareApi/api/core/CfErrorResponse.kt index 7f11f32..3c17588 100644 --- a/src/dorkbox/kloudflare/api/core/CfErrorResponse.kt +++ b/src/dorkbox/kloudflareApi/api/core/CfErrorResponse.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/core/CfResponse.kt b/src/dorkbox/kloudflareApi/api/core/CfResponse.kt similarity index 97% rename from src/dorkbox/kloudflare/api/core/CfResponse.kt rename to src/dorkbox/kloudflareApi/api/core/CfResponse.kt index 51d9633..0850944 100644 --- a/src/dorkbox/kloudflare/api/core/CfResponse.kt +++ b/src/dorkbox/kloudflareApi/api/core/CfResponse.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/core/DnsRecordTypeAdapter.kt b/src/dorkbox/kloudflareApi/api/core/DnsRecordTypeAdapter.kt similarity index 91% rename from src/dorkbox/kloudflare/api/core/DnsRecordTypeAdapter.kt rename to src/dorkbox/kloudflareApi/api/core/DnsRecordTypeAdapter.kt index 022a436..0f1dcf4 100644 --- a/src/dorkbox/kloudflare/api/core/DnsRecordTypeAdapter.kt +++ b/src/dorkbox/kloudflareApi/api/core/DnsRecordTypeAdapter.kt @@ -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 { diff --git a/src/dorkbox/kloudflare/api/core/Error.kt b/src/dorkbox/kloudflareApi/api/core/Error.kt similarity index 95% rename from src/dorkbox/kloudflare/api/core/Error.kt rename to src/dorkbox/kloudflareApi/api/core/Error.kt index 83d214f..899b598 100644 --- a/src/dorkbox/kloudflare/api/core/Error.kt +++ b/src/dorkbox/kloudflareApi/api/core/Error.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/core/ISO8601Adapter.kt b/src/dorkbox/kloudflareApi/api/core/ISO8601Adapter.kt similarity index 97% rename from src/dorkbox/kloudflare/api/core/ISO8601Adapter.kt rename to src/dorkbox/kloudflareApi/api/core/ISO8601Adapter.kt index 1bf4028..a2ed44e 100644 --- a/src/dorkbox/kloudflare/api/core/ISO8601Adapter.kt +++ b/src/dorkbox/kloudflareApi/api/core/ISO8601Adapter.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/core/Pagination.kt b/src/dorkbox/kloudflareApi/api/core/Pagination.kt similarity index 97% rename from src/dorkbox/kloudflare/api/core/Pagination.kt rename to src/dorkbox/kloudflareApi/api/core/Pagination.kt index 58c3555..8e1badc 100644 --- a/src/dorkbox/kloudflare/api/core/Pagination.kt +++ b/src/dorkbox/kloudflareApi/api/core/Pagination.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/core/ResultInfo.kt b/src/dorkbox/kloudflareApi/api/core/ResultInfo.kt similarity index 96% rename from src/dorkbox/kloudflare/api/core/ResultInfo.kt rename to src/dorkbox/kloudflareApi/api/core/ResultInfo.kt index 25af772..a01615b 100644 --- a/src/dorkbox/kloudflare/api/core/ResultInfo.kt +++ b/src/dorkbox/kloudflareApi/api/core/ResultInfo.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/dns/CreateDnsRecord.kt b/src/dorkbox/kloudflareApi/api/dns/CreateDnsRecord.kt similarity index 95% rename from src/dorkbox/kloudflare/api/dns/CreateDnsRecord.kt rename to src/dorkbox/kloudflareApi/api/dns/CreateDnsRecord.kt index 5f749c7..5b11428 100644 --- a/src/dorkbox/kloudflare/api/dns/CreateDnsRecord.kt +++ b/src/dorkbox/kloudflareApi/api/dns/CreateDnsRecord.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/dns/Data.kt b/src/dorkbox/kloudflareApi/api/dns/Data.kt similarity index 94% rename from src/dorkbox/kloudflare/api/dns/Data.kt rename to src/dorkbox/kloudflareApi/api/dns/Data.kt index 4668baf..7a237ad 100644 --- a/src/dorkbox/kloudflare/api/dns/Data.kt +++ b/src/dorkbox/kloudflareApi/api/dns/Data.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/dns/DeleteDnsRecord.kt b/src/dorkbox/kloudflareApi/api/dns/DeleteDnsRecord.kt similarity index 95% rename from src/dorkbox/kloudflare/api/dns/DeleteDnsRecord.kt rename to src/dorkbox/kloudflareApi/api/dns/DeleteDnsRecord.kt index f9698e6..ad27df5 100644 --- a/src/dorkbox/kloudflare/api/dns/DeleteDnsRecord.kt +++ b/src/dorkbox/kloudflareApi/api/dns/DeleteDnsRecord.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/dns/DnsRecord.kt b/src/dorkbox/kloudflareApi/api/dns/DnsRecord.kt similarity index 95% rename from src/dorkbox/kloudflare/api/dns/DnsRecord.kt rename to src/dorkbox/kloudflareApi/api/dns/DnsRecord.kt index 2f5344e..edc1f15 100644 --- a/src/dorkbox/kloudflare/api/dns/DnsRecord.kt +++ b/src/dorkbox/kloudflareApi/api/dns/DnsRecord.kt @@ -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 /** diff --git a/src/dorkbox/kloudflare/api/dns/Meta.kt b/src/dorkbox/kloudflareApi/api/dns/Meta.kt similarity index 96% rename from src/dorkbox/kloudflare/api/dns/Meta.kt rename to src/dorkbox/kloudflareApi/api/dns/Meta.kt index fa889b3..f45a24d 100644 --- a/src/dorkbox/kloudflare/api/dns/Meta.kt +++ b/src/dorkbox/kloudflareApi/api/dns/Meta.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/dns/RecordType.kt b/src/dorkbox/kloudflareApi/api/dns/RecordType.kt similarity index 94% rename from src/dorkbox/kloudflare/api/dns/RecordType.kt rename to src/dorkbox/kloudflareApi/api/dns/RecordType.kt index 3026767..4d26d46 100644 --- a/src/dorkbox/kloudflare/api/dns/RecordType.kt +++ b/src/dorkbox/kloudflareApi/api/dns/RecordType.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/dns/UpdateDnsRecord.kt b/src/dorkbox/kloudflareApi/api/dns/UpdateDnsRecord.kt similarity index 92% rename from src/dorkbox/kloudflare/api/dns/UpdateDnsRecord.kt rename to src/dorkbox/kloudflareApi/api/dns/UpdateDnsRecord.kt index a9c6400..2dec330 100644 --- a/src/dorkbox/kloudflare/api/dns/UpdateDnsRecord.kt +++ b/src/dorkbox/kloudflareApi/api/dns/UpdateDnsRecord.kt @@ -1,4 +1,4 @@ -package dorkbox.kloudflare.api.dns +package dorkbox.kloudflareApi.api.dns import com.squareup.moshi.Json diff --git a/src/dorkbox/kloudflare/api/firewall/AccessRule.kt b/src/dorkbox/kloudflareApi/api/firewall/AccessRule.kt similarity index 97% rename from src/dorkbox/kloudflare/api/firewall/AccessRule.kt rename to src/dorkbox/kloudflareApi/api/firewall/AccessRule.kt index 2540c9f..8d59163 100644 --- a/src/dorkbox/kloudflare/api/firewall/AccessRule.kt +++ b/src/dorkbox/kloudflareApi/api/firewall/AccessRule.kt @@ -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 /** diff --git a/src/dorkbox/kloudflare/api/firewall/Configuration.kt b/src/dorkbox/kloudflareApi/api/firewall/Configuration.kt similarity index 97% rename from src/dorkbox/kloudflare/api/firewall/Configuration.kt rename to src/dorkbox/kloudflareApi/api/firewall/Configuration.kt index 0a5af84..dd72d50 100644 --- a/src/dorkbox/kloudflare/api/firewall/Configuration.kt +++ b/src/dorkbox/kloudflareApi/api/firewall/Configuration.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/firewall/Scope.kt b/src/dorkbox/kloudflareApi/api/firewall/Scope.kt similarity index 97% rename from src/dorkbox/kloudflare/api/firewall/Scope.kt rename to src/dorkbox/kloudflareApi/api/firewall/Scope.kt index e8e9752..e1fbada 100644 --- a/src/dorkbox/kloudflare/api/firewall/Scope.kt +++ b/src/dorkbox/kloudflareApi/api/firewall/Scope.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/user/BillingHistory.kt b/src/dorkbox/kloudflareApi/api/user/BillingHistory.kt similarity index 93% rename from src/dorkbox/kloudflare/api/user/BillingHistory.kt rename to src/dorkbox/kloudflareApi/api/user/BillingHistory.kt index f26db70..ca83e5a 100644 --- a/src/dorkbox/kloudflare/api/user/BillingHistory.kt +++ b/src/dorkbox/kloudflareApi/api/user/BillingHistory.kt @@ -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 /** diff --git a/src/dorkbox/kloudflare/api/user/BillingProfile.kt b/src/dorkbox/kloudflareApi/api/user/BillingProfile.kt similarity index 97% rename from src/dorkbox/kloudflare/api/user/BillingProfile.kt rename to src/dorkbox/kloudflareApi/api/user/BillingProfile.kt index 36f3a58..5e7d139 100644 --- a/src/dorkbox/kloudflare/api/user/BillingProfile.kt +++ b/src/dorkbox/kloudflareApi/api/user/BillingProfile.kt @@ -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 /** diff --git a/src/dorkbox/kloudflare/api/user/User.kt b/src/dorkbox/kloudflareApi/api/user/User.kt similarity index 97% rename from src/dorkbox/kloudflare/api/user/User.kt rename to src/dorkbox/kloudflareApi/api/user/User.kt index d41264c..52bc982 100644 --- a/src/dorkbox/kloudflare/api/user/User.kt +++ b/src/dorkbox/kloudflareApi/api/user/User.kt @@ -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 /** diff --git a/src/dorkbox/kloudflare/api/user/UserOrganization.kt b/src/dorkbox/kloudflareApi/api/user/UserOrganization.kt similarity index 97% rename from src/dorkbox/kloudflare/api/user/UserOrganization.kt rename to src/dorkbox/kloudflareApi/api/user/UserOrganization.kt index ef148a4..913b050 100644 --- a/src/dorkbox/kloudflare/api/user/UserOrganization.kt +++ b/src/dorkbox/kloudflareApi/api/user/UserOrganization.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/user/invite/Invite.kt b/src/dorkbox/kloudflareApi/api/user/invite/Invite.kt similarity index 96% rename from src/dorkbox/kloudflare/api/user/invite/Invite.kt rename to src/dorkbox/kloudflareApi/api/user/invite/Invite.kt index 5201ad3..8ad23a3 100644 --- a/src/dorkbox/kloudflare/api/user/invite/Invite.kt +++ b/src/dorkbox/kloudflareApi/api/user/invite/Invite.kt @@ -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 /** diff --git a/src/dorkbox/kloudflare/api/user/invite/Role.kt b/src/dorkbox/kloudflareApi/api/user/invite/Role.kt similarity index 96% rename from src/dorkbox/kloudflare/api/user/invite/Role.kt rename to src/dorkbox/kloudflareApi/api/user/invite/Role.kt index 49f21fa..6227db4 100644 --- a/src/dorkbox/kloudflare/api/user/invite/Role.kt +++ b/src/dorkbox/kloudflareApi/api/user/invite/Role.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/user/subscription/App.kt b/src/dorkbox/kloudflareApi/api/user/subscription/App.kt similarity index 93% rename from src/dorkbox/kloudflare/api/user/subscription/App.kt rename to src/dorkbox/kloudflareApi/api/user/subscription/App.kt index a0f584d..dccd996 100644 --- a/src/dorkbox/kloudflare/api/user/subscription/App.kt +++ b/src/dorkbox/kloudflareApi/api/user/subscription/App.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/user/subscription/ComponentValue.kt b/src/dorkbox/kloudflareApi/api/user/subscription/ComponentValue.kt similarity index 95% rename from src/dorkbox/kloudflare/api/user/subscription/ComponentValue.kt rename to src/dorkbox/kloudflareApi/api/user/subscription/ComponentValue.kt index 947cbb0..b2e224c 100644 --- a/src/dorkbox/kloudflare/api/user/subscription/ComponentValue.kt +++ b/src/dorkbox/kloudflareApi/api/user/subscription/ComponentValue.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/user/subscription/RatePlan.kt b/src/dorkbox/kloudflareApi/api/user/subscription/RatePlan.kt similarity index 97% rename from src/dorkbox/kloudflare/api/user/subscription/RatePlan.kt rename to src/dorkbox/kloudflareApi/api/user/subscription/RatePlan.kt index f4399b3..039840e 100644 --- a/src/dorkbox/kloudflare/api/user/subscription/RatePlan.kt +++ b/src/dorkbox/kloudflareApi/api/user/subscription/RatePlan.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/user/subscription/Subscription.kt b/src/dorkbox/kloudflareApi/api/user/subscription/Subscription.kt similarity index 95% rename from src/dorkbox/kloudflare/api/user/subscription/Subscription.kt rename to src/dorkbox/kloudflareApi/api/user/subscription/Subscription.kt index 68c72ba..8c9e31e 100644 --- a/src/dorkbox/kloudflare/api/user/subscription/Subscription.kt +++ b/src/dorkbox/kloudflareApi/api/user/subscription/Subscription.kt @@ -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 /** diff --git a/src/dorkbox/kloudflare/api/zone/Account.kt b/src/dorkbox/kloudflareApi/api/zone/Account.kt similarity index 96% rename from src/dorkbox/kloudflare/api/zone/Account.kt rename to src/dorkbox/kloudflareApi/api/zone/Account.kt index 6e9bcc3..c099904 100644 --- a/src/dorkbox/kloudflare/api/zone/Account.kt +++ b/src/dorkbox/kloudflareApi/api/zone/Account.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/zone/Component.kt b/src/dorkbox/kloudflareApi/api/zone/Component.kt similarity index 96% rename from src/dorkbox/kloudflare/api/zone/Component.kt rename to src/dorkbox/kloudflareApi/api/zone/Component.kt index d179470..f881b43 100644 --- a/src/dorkbox/kloudflare/api/zone/Component.kt +++ b/src/dorkbox/kloudflareApi/api/zone/Component.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/zone/Owner.kt b/src/dorkbox/kloudflareApi/api/zone/Owner.kt similarity index 96% rename from src/dorkbox/kloudflare/api/zone/Owner.kt rename to src/dorkbox/kloudflareApi/api/zone/Owner.kt index 8ac77eb..0d312bb 100644 --- a/src/dorkbox/kloudflare/api/zone/Owner.kt +++ b/src/dorkbox/kloudflareApi/api/zone/Owner.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/zone/Plan.kt b/src/dorkbox/kloudflareApi/api/zone/Plan.kt similarity index 98% rename from src/dorkbox/kloudflare/api/zone/Plan.kt rename to src/dorkbox/kloudflareApi/api/zone/Plan.kt index 6091b42..fce73d5 100644 --- a/src/dorkbox/kloudflare/api/zone/Plan.kt +++ b/src/dorkbox/kloudflareApi/api/zone/Plan.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/zone/PlanPending.kt b/src/dorkbox/kloudflareApi/api/zone/PlanPending.kt similarity index 98% rename from src/dorkbox/kloudflare/api/zone/PlanPending.kt rename to src/dorkbox/kloudflareApi/api/zone/PlanPending.kt index b0e502e..a77a97c 100644 --- a/src/dorkbox/kloudflare/api/zone/PlanPending.kt +++ b/src/dorkbox/kloudflareApi/api/zone/PlanPending.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/zone/RatePlan.kt b/src/dorkbox/kloudflareApi/api/zone/RatePlan.kt similarity index 97% rename from src/dorkbox/kloudflare/api/zone/RatePlan.kt rename to src/dorkbox/kloudflareApi/api/zone/RatePlan.kt index 80f8709..60e411b 100644 --- a/src/dorkbox/kloudflare/api/zone/RatePlan.kt +++ b/src/dorkbox/kloudflareApi/api/zone/RatePlan.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/zone/Zone.kt b/src/dorkbox/kloudflareApi/api/zone/Zone.kt similarity index 96% rename from src/dorkbox/kloudflare/api/zone/Zone.kt rename to src/dorkbox/kloudflareApi/api/zone/Zone.kt index 60aee81..fe65882 100644 --- a/src/dorkbox/kloudflare/api/zone/Zone.kt +++ b/src/dorkbox/kloudflareApi/api/zone/Zone.kt @@ -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 /** diff --git a/src/dorkbox/kloudflare/api/zone/settings/MinifyAssetsSetting.kt b/src/dorkbox/kloudflareApi/api/zone/settings/MinifyAssetsSetting.kt similarity index 95% rename from src/dorkbox/kloudflare/api/zone/settings/MinifyAssetsSetting.kt rename to src/dorkbox/kloudflareApi/api/zone/settings/MinifyAssetsSetting.kt index 869f4f4..f8b0d8f 100644 --- a/src/dorkbox/kloudflare/api/zone/settings/MinifyAssetsSetting.kt +++ b/src/dorkbox/kloudflareApi/api/zone/settings/MinifyAssetsSetting.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/zone/settings/MobileRedirectSetting.kt b/src/dorkbox/kloudflareApi/api/zone/settings/MobileRedirectSetting.kt similarity index 96% rename from src/dorkbox/kloudflare/api/zone/settings/MobileRedirectSetting.kt rename to src/dorkbox/kloudflareApi/api/zone/settings/MobileRedirectSetting.kt index deefe16..58bbe9e 100644 --- a/src/dorkbox/kloudflare/api/zone/settings/MobileRedirectSetting.kt +++ b/src/dorkbox/kloudflareApi/api/zone/settings/MobileRedirectSetting.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/zone/settings/SecurityHeadingSetting.kt b/src/dorkbox/kloudflareApi/api/zone/settings/SecurityHeadingSetting.kt similarity index 96% rename from src/dorkbox/kloudflare/api/zone/settings/SecurityHeadingSetting.kt rename to src/dorkbox/kloudflareApi/api/zone/settings/SecurityHeadingSetting.kt index bd71e51..2c8478c 100644 --- a/src/dorkbox/kloudflare/api/zone/settings/SecurityHeadingSetting.kt +++ b/src/dorkbox/kloudflareApi/api/zone/settings/SecurityHeadingSetting.kt @@ -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 diff --git a/src/dorkbox/kloudflare/api/zone/settings/ZoneSetting.kt b/src/dorkbox/kloudflareApi/api/zone/settings/ZoneSetting.kt similarity index 99% rename from src/dorkbox/kloudflare/api/zone/settings/ZoneSetting.kt rename to src/dorkbox/kloudflareApi/api/zone/settings/ZoneSetting.kt index 0d46be6..369c6dd 100644 --- a/src/dorkbox/kloudflare/api/zone/settings/ZoneSetting.kt +++ b/src/dorkbox/kloudflareApi/api/zone/settings/ZoneSetting.kt @@ -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 /** diff --git a/test/dorkbox/kloudflare/KloudflareTest.kt b/test/dorkbox/kloudflareApi/KloudflareTest.kt similarity index 81% rename from test/dorkbox/kloudflare/KloudflareTest.kt rename to test/dorkbox/kloudflareApi/KloudflareTest.kt index 1aa89e2..3b72d64 100644 --- a/test/dorkbox/kloudflare/KloudflareTest.kt +++ b/test/dorkbox/kloudflareApi/KloudflareTest.kt @@ -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"