Skip to content

Commit

Permalink
move to jakarta (#70)
Browse files Browse the repository at this point in the history 
Co-authored-by: “ADandyGuyInSpace” <“[email protected]”>
  • Loading branch information
@ADandyGuyInSpace
ADandyGuyInSpace and “ADandyGuyInSpace” authored Feb 7, 2025
1 parent efb3dd9 commit f9f4d62
Show file tree
Hide file tree
Showing 2,094 changed files with 10,183 additions and 10,182 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Add this dependency to your project's POM:
<dependency>
<groupId>com.telnyx.sdk</groupId>
<artifactId>telnyx</artifactId>
<version>4.0.0</version>
<version>4.0.3</version>
<scope>compile</scope>
</dependency>
```
Expand All @@ -58,7 +58,7 @@ Add this dependency to your project's build file:
}
dependencies {
implementation "com.telnyx.sdk:telnyx:4.0.0"
implementation "com.telnyx.sdk:telnyx:4.0.3"
}
```

Expand All @@ -72,7 +72,7 @@ mvn clean package

Then manually install the following JARs:

- `target/telnyx-4.0.0.jar`
- `target/telnyx-4.0.3.jar`
- `target/lib/*.jar`

## Usage
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
settings(
organization := "com.telnyx.sdk",
name := "telnyx",
version := "4.0.0",
version := "4.0.3",
scalaVersion := "2.11.4",
scalacOptions ++= Seq("-feature"),
Compile / javacOptions ++= Seq("-Xlint:deprecation"),
Expand Down
2 changes: 1 addition & 1 deletion openapi-configuration/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply plugin: 'eclipse'
apply plugin: 'com.diffplug.spotless'

group = 'com.telnyx.sdk'
version = '4.0.0'
version = '4.0.3'

buildscript {
repositories {
Expand Down
2 changes: 1 addition & 1 deletion openapi-configuration/build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
settings(
organization := "com.telnyx.sdk",
name := "telnyx",
version := "4.0.0",
version := "4.0.3",
scalaVersion := "2.11.4",
scalacOptions ++= Seq("-feature"),
Compile / javacOptions ++= Seq("-Xlint:deprecation"),
Expand Down
2 changes: 1 addition & 1 deletion openapi-configuration/config.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"artifactVersion" : "4.0.0",
"artifactVersion" : "4.0.3",
"java8" : true,
"dateLibrary" : "java8",
"groupId" : "com.telnyx.sdk",
Expand Down
2 changes: 1 addition & 1 deletion openapi-configuration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<artifactId>telnyx</artifactId>
<packaging>jar</packaging>
<name>telnyx</name>
<version>4.0.0</version>
<version>4.0.3</version>
<url>https://github.com/team-telnyx/telnyx-java/</url>
<description>Telnyx Java SDK</description>
<scm>
Expand Down
2 changes: 1 addition & 1 deletion openapi-configuration/sdk_config.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"artifactVersion" : "4.0.0",
"artifactVersion" : "4.0.3",
"java8" : true,
"dateLibrary" : "java8",
"groupId" : "com.telnyx.sdk",
Expand Down
101 changes: 51 additions & 50 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,31 +327,12 @@
</profiles>

<dependencies>

<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${swagger-annotations-version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.9.2</version>
<scope>test</scope>
</dependency>
<!-- @Nullable annotation -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>

<!-- HTTP client: jersey-client -->
<!-- JAX-RS / Jersey dependencies updated to 3.x for jakarta.* -->
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey-version}</version>
</dependency>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
Expand All @@ -368,59 +349,79 @@
<version>${jersey-version}</version>
</dependency>

<!-- JSON processing: jackson -->
<!-- Jakarta Annotations instead of javax.annotation -->
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta-annotation-version}</version>
<scope>provided</scope>
</dependency>

<!-- Swagger Annotations (Check if a newer version uses jakarta.* if needed) -->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${swagger-annotations-version}</version>
</dependency>

<!-- Example test dependencies: JUnit Jupiter + vintage for older tests, or JUnit 4 -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.9.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit-version}</version>
<scope>test</scope>
</dependency>

<!-- Jackson dependencies (usually unaffected by javax->jakarta) -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-databind-version}</version>
</dependency>
<dependency>
</dependency>
<dependency>
<groupId>org.openapitools</groupId>
<artifactId>jackson-databind-nullable</artifactId>
<version>${jackson-databind-nullable-version}</version>
</dependency>
<dependency>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta-annotation-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-apache-connector</artifactId>
<version>${jersey-version}</version>
</dependency>
<!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit-version}</version>
<scope>test</scope>
</dependency>

<!-- etc. -->
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- Update to a Jersey 3.x release that uses jakarta.* packages -->
<jersey-version>3.1.1</jersey-version>

<!-- Update jakarta.annotation-api to 2.x or higher for Jakarta EE 9+ -->
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>

<!-- You can keep the same Jackson or JUnit versions if they don't rely on javax.* -->
<swagger-annotations-version>1.6.3</swagger-annotations-version>
<jersey-version>2.35</jersey-version>
<jackson-version>2.13.0</jackson-version>
<jackson-databind-version>2.18.2</jackson-databind-version>
<jackson-databind-nullable-version>0.2.2</jackson-databind-nullable-version>
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
<jakarta-annotation-version>2.1.1</jakarta-annotation-version>
<junit-version>4.13.2</junit-version>
<spotless.version>2.17.3</spotless.version>
</properties>
Expand Down
34 changes: 17 additions & 17 deletions src/main/java/com/telnyx/sdk/ApiClient.java
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.telnyx.sdk;

import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.Entity;
import javax.ws.rs.client.Invocation;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.Form;
import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import jakarta.ws.rs.client.Client;
import jakarta.ws.rs.client.ClientBuilder;
import jakarta.ws.rs.client.Entity;
import jakarta.ws.rs.client.Invocation;
import jakarta.ws.rs.client.WebTarget;
import jakarta.ws.rs.core.Form;
import jakarta.ws.rs.core.GenericType;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.Response.Status;

import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.client.ClientProperties;
Expand Down Expand Up @@ -66,7 +66,7 @@
/**
* <p>ApiClient class.</p>
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0")
@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0")
public class ApiClient extends JavaTimeFormatter {
protected Map<String, String> defaultHeaderMap = new HashMap<String, String>();
protected Map<String, String> defaultCookieMap = new HashMap<String, String>();
Expand Down Expand Up @@ -152,7 +152,7 @@ public JSON getJSON() {
/**
* <p>Getter for the field <code>httpClient</code>.</p>
*
* @return a {@link javax.ws.rs.client.Client} object.
* @return a {@link jakarta.ws.rs.client.Client} object.
*/
public Client getHttpClient() {
return httpClient;
Expand All @@ -161,7 +161,7 @@ public Client getHttpClient() {
/**
* <p>Setter for the field <code>httpClient</code>.</p>
*
* @param httpClient a {@link javax.ws.rs.client.Client} object.
* @param httpClient a {@link jakarta.ws.rs.client.Client} object.
* @return a {@link org.openapitools.client.ApiClient} object.
*/
public ApiClient setHttpClient(Client httpClient) {
Expand Down Expand Up @@ -886,7 +886,7 @@ public File downloadFileFromResponse(Response response) throws ApiException {
/**
* <p>Prepare the file for download from the response.</p>
*
* @param response a {@link javax.ws.rs.core.Response} object.
* @param response a {@link jakarta.ws.rs.core.Response} object.
* @return a {@link java.io.File} object.
* @throws java.io.IOException if any.
*/
Expand Down Expand Up @@ -1152,7 +1152,7 @@ public ClientConfig getDefaultClientConfig() {
* To completely disable certificate validation (at your own risk), you can
* override this method and invoke disableCertificateValidation(clientBuilder).
*
* @param clientBuilder a {@link javax.ws.rs.client.ClientBuilder} object.
* @param clientBuilder a {@link jakarta.ws.rs.client.ClientBuilder} object.
*/
protected void customizeClientBuilder(ClientBuilder clientBuilder) {
// No-op extension point
Expand All @@ -1164,7 +1164,7 @@ protected void customizeClientBuilder(ClientBuilder clientBuilder) {
* Please note that trusting all certificates is extremely risky.
* This may be useful in a development environment with self-signed certificates.
*
* @param clientBuilder a {@link javax.ws.rs.client.ClientBuilder} object.
* @param clientBuilder a {@link jakarta.ws.rs.client.ClientBuilder} object.
* @throws java.security.KeyManagementException if any.
* @throws java.security.NoSuchAlgorithmException if any.
*/
Expand All @@ -1191,7 +1191,7 @@ public void checkServerTrusted(X509Certificate[] certs, String authType) {
/**
* <p>Build the response headers.</p>
*
* @param response a {@link javax.ws.rs.core.Response} object.
* @param response a {@link jakarta.ws.rs.core.Response} object.
* @return a {@link java.util.Map} of response headers.
*/
protected Map<String, List<String>> buildResponseHeaders(Response response) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/telnyx/sdk/ApiException.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
/**
* API Exception
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0")
@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0")
public class ApiException extends Exception {
private int code = 0;
private Map<String, List<String>> responseHeaders = null;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/telnyx/sdk/Configuration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

package com.telnyx.sdk;

@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0")
@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0")
public class Configuration {
public static final String VERSION = "4.0.0";
public static final String VERSION = "4.0.3";

private static ApiClient defaultApiClient = new ApiClient();

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/telnyx/sdk/JSON.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import javax.ws.rs.core.GenericType;
import javax.ws.rs.ext.ContextResolver;
import jakarta.ws.rs.core.GenericType;
import jakarta.ws.rs.ext.ContextResolver;

@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0")
@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0")
public class JSON implements ContextResolver<ObjectMapper> {
private ObjectMapper mapper;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/telnyx/sdk/JavaTimeFormatter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* Class that add parsing/formatting support for Java 8+ {@code OffsetDateTime} class.
* It's generated for java clients when {@code AbstractJavaCodegen#dateLibrary} specified as {@code java8}.
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0")
@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0")
public class JavaTimeFormatter {

private DateTimeFormatter offsetDateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/telnyx/sdk/Pair.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

package com.telnyx.sdk;

@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0")
@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0")
public class Pair {
private String name = "";
private String value = "";
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/telnyx/sdk/RFC3339DateFormat.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.util.GregorianCalendar;
import java.util.TimeZone;

@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0")
@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0")
public class RFC3339DateFormat extends DateFormat {
private static final long serialVersionUID = 1L;
private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC");
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/telnyx/sdk/ServerConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/**
* Representing a Server configuration.
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0")
@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0")
public class ServerConfiguration {
public String URL;
public String description;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/telnyx/sdk/ServerVariable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
/**
* Representing a Server Variable for server URL template substitution.
*/
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0")
@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0")
public class ServerVariable {
public String description;
public String defaultValue;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/telnyx/sdk/StringUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import java.util.Collection;
import java.util.Iterator;

@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0")
@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.11.0")
public class StringUtil {
/**
* Check if the given array contains the given value (with case-insensitive comparison).
Expand Down
Loading

0 comments on commit f9f4d62

Please sign in to comment.