From b0ef61769ead4614c58cdbb7c875bce9e8c10fe3 Mon Sep 17 00:00:00 2001 From: Jake Date: Fri, 24 Mar 2023 19:00:19 +0100 Subject: [PATCH 1/4] Update HTTPRequest.java --- src/main/java/org/javawebstack/httpclient/HTTPRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/javawebstack/httpclient/HTTPRequest.java b/src/main/java/org/javawebstack/httpclient/HTTPRequest.java index 5534399..4352c66 100644 --- a/src/main/java/org/javawebstack/httpclient/HTTPRequest.java +++ b/src/main/java/org/javawebstack/httpclient/HTTPRequest.java @@ -22,7 +22,7 @@ public class HTTPRequest { private Map responseHeaders = new HashMap<>(); private final List requestCookies = new ArrayList<>(); private final List responseCookies = new ArrayList<>(); - private byte[] responseBody; + private byte[] responseBody = new byte[0]; private int status; private String statusMessage; private boolean executed; From 14491177498d8f93b41bd5e479ac4af02a3150bb Mon Sep 17 00:00:00 2001 From: Jake Esser Date: Wed, 6 Sep 2023 13:25:46 +0200 Subject: [PATCH 2/4] Updated http client to reflect abstract data changes --- pom.xml | 11 +++++++++-- .../org/javawebstack/httpclient/HTTPClient.java | 16 ++++++++-------- .../org/javawebstack/httpclient/HTTPRequest.java | 6 +++--- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 1b983e5..2699804 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 8 8 - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT org.javawebstack @@ -46,11 +46,18 @@ https://github.com/JavaWebStack/http-client/tree/master + + + ossrh-snapshots + https://s01.oss.sonatype.org/content/repositories/snapshots/ + + + org.javawebstack abstract-data - 1.0.4 + 1.0.7-SNAPSHOT org.junit.jupiter diff --git a/src/main/java/org/javawebstack/httpclient/HTTPClient.java b/src/main/java/org/javawebstack/httpclient/HTTPClient.java index 217139a..eaa360a 100644 --- a/src/main/java/org/javawebstack/httpclient/HTTPClient.java +++ b/src/main/java/org/javawebstack/httpclient/HTTPClient.java @@ -1,7 +1,7 @@ package org.javawebstack.httpclient; -import org.javawebstack.abstractdata.AbstractMapper; -import org.javawebstack.abstractdata.NamingPolicy; +import org.javawebstack.abstractdata.mapper.Mapper; +import org.javawebstack.abstractdata.mapper.naming.NamingPolicy; import org.javawebstack.httpclient.implementation.IHTTPRequestImplementation; import org.javawebstack.httpclient.implementation.JavaNetHTTPRequestImplementation; import org.javawebstack.httpclient.interceptor.RequestInterceptor; @@ -16,8 +16,8 @@ public class HTTPClient { - private AbstractMapper abstractMapper = new AbstractMapper() - .setNamingPolicy(NamingPolicy.SNAKE_CASE); + private Mapper mapper = new Mapper() + .namingPolicy(NamingPolicy.SNAKE_CASE); private int timeout = 5000; private String baseUrl; private Map defaultHeaders = new HashMap<>(); @@ -79,13 +79,13 @@ public boolean isSSLVerification() { return this.sslVerification; } - public HTTPClient abstractMapper(AbstractMapper mapper) { - this.abstractMapper = mapper; + public HTTPClient mapper(Mapper mapper) { + this.mapper = mapper; return this; } - public AbstractMapper getAbstractMapper() { - return abstractMapper; + public Mapper getMapper() { + return mapper; } public HTTPClient timeout(int timeout) { diff --git a/src/main/java/org/javawebstack/httpclient/HTTPRequest.java b/src/main/java/org/javawebstack/httpclient/HTTPRequest.java index 5534399..7895432 100644 --- a/src/main/java/org/javawebstack/httpclient/HTTPRequest.java +++ b/src/main/java/org/javawebstack/httpclient/HTTPRequest.java @@ -111,7 +111,7 @@ public HTTPRequest formBody(Object object) { return formBodyString((QueryString) object); if(object instanceof AbstractElement) return formBodyElement((AbstractElement) object); - return formBodyElement(client.getAbstractMapper().toAbstract(object)); + return formBodyElement(client.getMapper().map(object)); } public HTTPRequest formBodyElement(AbstractElement element) { @@ -129,7 +129,7 @@ public HTTPRequest tokenAuth(String token) { public HTTPRequest jsonBody(Object object) { if(object instanceof AbstractElement) return jsonBodyElement((AbstractElement) object); - return jsonBodyElement(client.getAbstractMapper().toAbstract(object)); + return jsonBodyElement(client.getMapper().map(object)); } public Map headers() { @@ -170,7 +170,7 @@ public T object(Class type) { return (T) responseBody; if(type.equals(String.class)) return (T) string(); - return client.getAbstractMapper().fromAbstract(data(), type); + return client.getMapper().map(data(), type); } public AbstractElement data() { From 2312b3307faa11de373c0cf8971b84d6870881ef Mon Sep 17 00:00:00 2001 From: JanHolger Date: Wed, 4 Feb 2026 15:30:16 +0100 Subject: [PATCH 3/4] Switched from OSSRH to new central --- .github/workflows/maven-deploy-release.yml | 5 ++-- .github/workflows/maven-deploy.yml | 5 ++-- build/settings.xml | 16 +++---------- pom.xml | 28 ++++++++-------------- 4 files changed, 17 insertions(+), 37 deletions(-) diff --git a/.github/workflows/maven-deploy-release.yml b/.github/workflows/maven-deploy-release.yml index 0c3c94b..8ad24f1 100644 --- a/.github/workflows/maven-deploy-release.yml +++ b/.github/workflows/maven-deploy-release.yml @@ -20,7 +20,6 @@ jobs: - name: Deploy to JavaWebStack Repository run: mvn deploy -DbuildVersion=${{ github.event.release.tag_name }} -s build/settings.xml env: - DEPLOYMENT_USERNAME: ${{ secrets.DEPLOYMENT_USERNAME }} - DEPLOYMENT_PASSWORD: ${{ secrets.DEPLOYMENT_PASSWORD }} + CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }} + CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml index c6ac3fb..e08cc36 100644 --- a/.github/workflows/maven-deploy.yml +++ b/.github/workflows/maven-deploy.yml @@ -21,7 +21,6 @@ jobs: - name: Deploy to JavaWebStack Repository run: mvn deploy -s build/settings.xml env: - DEPLOYMENT_USERNAME: ${{ secrets.DEPLOYMENT_USERNAME }} - DEPLOYMENT_PASSWORD: ${{ secrets.DEPLOYMENT_PASSWORD }} + CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }} + CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} diff --git a/build/settings.xml b/build/settings.xml index 07e7726..88571fa 100644 --- a/build/settings.xml +++ b/build/settings.xml @@ -5,19 +5,9 @@ > - javawebstack-snapshots - ${env.DEPLOYMENT_USERNAME} - ${env.DEPLOYMENT_PASSWORD} - - - javawebstack-releases - ${env.DEPLOYMENT_USERNAME} - ${env.DEPLOYMENT_PASSWORD} - - - ossrh - JavaWebStack - ${env.OSSRH_PASSWORD} + central + ${env.CENTRAL_USERNAME} + ${env.CENTRAL_PASSWORD} gpg diff --git a/pom.xml b/pom.xml index 2699804..25f8f8b 100644 --- a/pom.xml +++ b/pom.xml @@ -76,17 +76,13 @@ - maven-deploy-plugin - 3.0.0-M1 - - - default-deploy - deploy - - deploy - - - + org.sonatype.central + central-publishing-maven-plugin + 0.9.0 + true + + central + org.apache.maven.plugins @@ -131,7 +127,7 @@ sign - A313520526A8DFE1C2A30399C35A3D43C557B112 + EC9CCFF8901F0AA22191DCEDD619376246C066D0 gpg --no-tty @@ -147,13 +143,9 @@ - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots + central + https://central.sonatype.com/repository/maven-snapshots/ - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - From fd1b7b22a42449172f6156e546825a913e4e8439 Mon Sep 17 00:00:00 2001 From: JanHolger Date: Wed, 4 Feb 2026 15:31:56 +0100 Subject: [PATCH 4/4] Switched from OSSRH to new central --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 25f8f8b..5c6fe70 100644 --- a/pom.xml +++ b/pom.xml @@ -48,8 +48,8 @@ - ossrh-snapshots - https://s01.oss.sonatype.org/content/repositories/snapshots/ + central-snapshots + https://central.sonatype.com/repository/maven-snapshots/