diff --git a/build.gradle b/build.gradle index 5c21fcde..37e49928 100755 --- a/build.gradle +++ b/build.gradle @@ -7,30 +7,45 @@ apply plugin : 'maven-publish' group = 'io.github.vantiv' version = JAR_VERSION +ext.xjcGeneratedDir = "$buildDir/generated/sources/xjc/main/java" + +// ---- Java toolchain + Java 17 baseline bytecode (runs on 17 through 21) ---- +allprojects { + plugins.withId('java') { + java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + // Use the Java 17 API surface to keep artifacts compatible with Java 17+ runtimes. + tasks.withType(JavaCompile).configureEach { + options.release = 17 + } + } +} + + repositories { maven { - url "http://repo1.maven.org/maven2" + url = "http://repo1.maven.org/maven2" } } configurations { - all{ + all { resolutionStrategy { } } - functionalTestImplementation.extendsFrom testImplementation - functionalTestRuntimeOnly.extendsFrom runtimeOnly - - certificationTestImplementation.extendsFrom functionalTestImplementation - certificationTestRuntimeOnly.extendsFrom functionalTestRuntimeOnly - generateJAXB.extendsFrom mainRuntime } sourceSets { main{ java{ - srcDirs += "$buildDir/generated" + srcDirs += xjcGeneratedDir } } functionalTest { @@ -47,25 +62,48 @@ sourceSets { } } -dependencies{ - implementation group: 'com.jcraft', name: 'jsch', version: '0.1.55' - implementation group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.3.0' - implementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.4' - implementation group: 'commons-io', name: 'commons-io', version: '2.18.0' - implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1' - implementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.2.1' - implementation group: 'org.bouncycastle', name: 'bcpg-jdk18on', version: '1.78.1' - implementation group: 'org.bouncycastle', name: 'bcprov-ext-jdk15to18', version: '1.78' - - testImplementation group: 'junit', name: 'junit', version: '4.13.2' - testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.11.0' - testImplementation 'org.slf4j:slf4j-nop:1.7.36' - - generateJAXB group: 'com.sun.xml.bind', name: 'jaxb-xjc', version: '2.3.5' + +configurations.named('functionalTestImplementation') { + extendsFrom(configurations.testImplementation) +} + +configurations.named('functionalTestRuntimeOnly') { + extendsFrom(configurations.runtimeOnly) } -////////// PLUGIN CONFIGURATION ////////// -//sourceCompatibility=1.7 +configurations.named('certificationTestImplementation') { + extendsFrom(configurations.functionalTestImplementation) +} + +configurations.named('certificationTestRuntimeOnly') { + extendsFrom(configurations.functionalTestRuntimeOnly) +} + + +dependencies { + + implementation "com.jcraft:jsch:0.1.55" + implementation "commons-io:commons-io:2.18.0" + implementation "org.apache.httpcomponents.client5:httpclient5:5.4.3" + implementation "org.bouncycastle:bcpg-jdk18on:1.84" + implementation "org.bouncycastle:bcprov-jdk18on:1.84" + implementation 'org.bouncycastle:bcutil-jdk18on:1.84' + implementation "jakarta.xml.bind:jakarta.xml.bind-api:4.0.5" + implementation "org.glassfish.jaxb:jaxb-runtime:4.0.6" + implementation "org.slf4j:slf4j-simple:2.0.17" + + testImplementation "org.slf4j:slf4j-nop:2.0.17" + testImplementation "junit:junit:4.13.2" + testImplementation "org.mockito:mockito-core:5.17.0" + + // JAXB XJC code generator (Jakarta JAXB 4.x) + generateJAXB "org.glassfish.jaxb:jaxb-xjc:4.0.5" + generateJAXB "jakarta.xml.bind:jakarta.xml.bind-api:4.0.5" + generateJAXB "org.glassfish.jaxb:jaxb-runtime:4.0.6" + +} + +////////// PLUGIN CONFIGURATION ////////// clean { // temporary, we need to change the tests to generate output inside build folder @@ -80,20 +118,29 @@ jar{ manifest { attributes("Implementation-Title":"Cnp SDK For Java 1.5 and greater", "Implementation-Version":"${JAR_VERSION}","Implementation-Vendor":"Cnp&Co","Main-Class":"io.github.vantiv.sdk.Setup") } - getDestinationDirectory().set(file("${DIST_DIR_15}/lib")) + // Produce a self-contained distributable jar for file-based consumers. + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + from { + configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } + } + exclude 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA' + + getDestinationDirectory().set(file("${DIST_DIR_21}/lib")) getArchiveFileName().set("cnp-sdk-for-java-${JAR_VERSION}.jar") } task javadocJar(type:Jar){ dependsOn javadoc getArchiveClassifier().set('javadoc') - getDestinationDirectory().set(file("$buildDir/kit/java15/doc")) + getDestinationDirectory().set(file("$buildDir/kit/java21/doc")) from tasks.javadoc } test { - reports.junitXml.destination(file("$buildDir/test-results/unit")) - reports.html.destination(file("$buildDir/reports/tests/unit")) + reports { + junitXml.outputLocation = file("$buildDir/test-results/unit") + html.outputLocation = file("$buildDir/reports/tests/unit") + } } ////////// CUSTOM TASKS /////////// @@ -111,8 +158,8 @@ task processXsd (type: Copy) { } doLast { - ant.replaceregexp(file:"$xsdOutput/cnpTransaction_v${SCHEMA_VERSION}.xsd", match:"(attributeFormDefault=\"unqualified\")>", replace:"\\1 xmlns:jaxb=\"http://java.sun.com/xml/ns/jaxb\" jaxb:version=\"2.0\">", byline:true) - ant.replaceregexp(file:"$xsdOutput/cnpCommon_v${SCHEMA_VERSION}.xsd", match:"(elementFormDefault=\"qualified\")>", replace:"\\1 xmlns:jaxb=\"http://java.sun.com/xml/ns/jaxb\" jaxb:version=\"2.0\">", byline:true) + ant.replaceregexp(file:"$xsdOutput/cnpTransaction_v${SCHEMA_VERSION}.xsd", match:"(attributeFormDefault=\"unqualified\")>", replace:"\\1 xmlns:jaxb=\"https://jakarta.ee/xml/ns/jaxb\" jaxb:version=\"3.0\">", byline:true) + ant.replaceregexp(file:"$xsdOutput/cnpCommon_v${SCHEMA_VERSION}.xsd", match:"(elementFormDefault=\"qualified\")>", replace:"\\1 xmlns:jaxb=\"https://jakarta.ee/xml/ns/jaxb\" jaxb:version=\"3.0\">", byline:true) ant.replaceregexp(file:"$xsdOutput/cnpTransaction_v${SCHEMA_VERSION}.xsd", match:"", replace:" ", byline:true) ant.replaceregexp(file:"$xsdOutput/cnpTransaction_v${SCHEMA_VERSION}.xsd", match:"", replace:" ", byline:true) ant.replaceregexp(file:"$xsdOutput/cnpTransaction_v${SCHEMA_VERSION}.xsd", match:"", replace:" ", byline:true) @@ -179,7 +226,7 @@ task generateJaxbClasses(dependsOn: processXsd) { eclipseClasspath.dependsOn it ext.bindingsFile = "src/main/xsd/bindings.xml" - ext.generatedDir = "${buildDir}/generated" + ext.generatedDir = xjcGeneratedDir inputs.dir processXsd.xsdOutput inputs.file bindingsFile @@ -202,8 +249,10 @@ task testFunctional(type:Test, dependsOn: functionalTestClasses){ classpath = sourceSets.functionalTest.runtimeClasspath mustRunAfter test testClassesDirs = sourceSets.functionalTest.output.classesDirs - reports.junitXml.destination(file("$buildDir/test-results/functional")) - reports.html.destination(file("$buildDir/reports/tests/functional")) + reports { + junitXml.outputLocation = file("$buildDir/test-results/functional") + html.outputLocation = file("$buildDir/reports/tests/functional") + } } task testCertification(type:Test, dependsOn: certificationTestClasses){ @@ -211,34 +260,26 @@ task testCertification(type:Test, dependsOn: certificationTestClasses){ classpath = sourceSets.certificationTest.runtimeClasspath mustRunAfter testFunctional testClassesDirs = sourceSets.certificationTest.output.classesDirs - reports.junitXml.destination(file("$buildDir/test-results/certification")) - reports.html.destination(file("$buildDir/reports/tests/certification")) + reports { + junitXml.outputLocation = file("$buildDir/test-results/certification") + html.outputLocation = file("$buildDir/reports/tests/certification") + } } task copyJarToKit(type:Copy, dependsOn:[check,jar]){ - from "${DIST_DIR_15}/lib/cnp-sdk-for-java-${JAR_VERSION}.jar" + from "${DIST_DIR_21}/lib/cnp-sdk-for-java-${JAR_VERSION}.jar" from "LICENSE" into KIT_DIR } task copyLibsToKit(type:Copy, dependsOn:check){ - from configurations.runtimeClasspath.asFileTree.matching{ - include '**/activation*' - include '**/jaxb-api*' - include '**/jaxb-impl*' - include '**/jsr173*' - include '**/commons-logging-1.1.1*' - include '**/commons-codec*' - include '**/fluent-hc*' - include '**/httpclient*' - include '**/httpcore*' - include '**/httpmime*' - include '**/jsch*' - include '**/commons-io*' - include '**/bcpg-jdk18on*' - include '**/bcprov-ext-jdk15to18*' - } - + // Copy ALL resolved runtime jars (direct + transitive) so consumers using + // the kit never need to add dependencies manually. + // Covers: jsch, commons-io, httpclient5, httpcore5, httpcore5-h2, slf4j-api, + // bcpg-jdk18on, bcprov-jdk18on, jakarta.xml.bind-api, jaxb-runtime, + // jaxb-core, txw2, istack-commons-runtime, angus-activation, + // jakarta.activation-api — and any future transitive additions. + from configurations.runtimeClasspath into KIT_DEPENDENCIES_DIR } @@ -246,17 +287,17 @@ task tarKit(type:Tar, dependsOn:[copyJarToKit, copyLibsToKit]){ compression = Compression.GZIP getDestinationDirectory().set(file("$buildDir/kit")) getArchiveFileName().set("cnp-sdk-for-java-${JAR_VERSION}.tar.gz") - from "$buildDir/kit/java15" + from "$buildDir/kit/java21" } task zipKit(type:Zip, dependsOn:[copyJarToKit, copyLibsToKit]){ getDestinationDirectory().set(file("$buildDir/kit")) getArchiveFileName().set("cnp-sdk-for-java-${JAR_VERSION}.zip") - from "$buildDir/kit/java15" + from "$buildDir/kit/java21" } task kit(dependsOn:[tarKit, zipKit]){ -if (JavaVersion.current().isJava8Compatible()) { +if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_21)) { allprojects { tasks.withType(Javadoc) { options.addStringOption('Xdoclint:none', '-quiet') diff --git a/gradle.properties b/gradle.properties index 6bd38e94..d0b95c01 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ -DIST_DIR_15=build/dist/java15 +DIST_DIR_21=build/dist/java21 JAR_VERSION=12.49.0 -KIT_DIR=build/kit/java15 -KIT_DEPENDENCIES_DIR=build/kit/java15/dependencies +KIT_DIR=build/kit/java21 +KIT_DEPENDENCIES_DIR=build/kit/java21/dependencies OPENSFTP_DIR=lib/opensftp-0.3.0 SCHEMA_VERSION=12.49 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aa991fce..57e279a1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/samples/auth/build.gradle b/samples/auth/build.gradle index 3872a2f0..1076392e 100755 --- a/samples/auth/build.gradle +++ b/samples/auth/build.gradle @@ -2,7 +2,7 @@ apply plugin : 'java' apply plugin : 'eclipse' repositories { maven { - url "http://repo1.maven.org/maven2" + url = "http://repo1.maven.org/maven2" } } dependencies{ @@ -10,39 +10,39 @@ repositories { } task execAuthExample(type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.AuthExample' + mainClass = 'io.github.vantiv.sdk.samples.AuthExample' classpath = sourceSets.main.runtimeClasspath } task execAuthReversalExample(type:JavaExec) { check.dependsOn it - main='io.github.vantiv.sdk.samples.AuthReversalExample' + mainClass = 'io.github.vantiv.sdk.samples.AuthReversalExample' classpath = sourceSets.main.runtimeClasspath } task execAuthWithTokenExample(type:JavaExec) { check.dependsOn it - main='io.github.vantiv.sdk.samples.AuthWithTokenExample' + mainClass = 'io.github.vantiv.sdk.samples.AuthWithTokenExample' classpath = sourceSets.main.runtimeClasspath } task execFullLifeCycleExample(type:JavaExec) { check.dependsOn it - main='io.github.vantiv.sdk.samples.FullLifeCycleExample' + mainClass = 'io.github.vantiv.sdk.samples.FullLifeCycleExample' classpath = sourceSets.main.runtimeClasspath } task execSampleDetailTax(type:JavaExec) { check.dependsOn it - main='io.github.vantiv.sdk.samples.SampleDetailTax' + mainClass = 'io.github.vantiv.sdk.samples.SampleDetailTax' classpath = sourceSets.main.runtimeClasspath } task execAuthExampleInterac(type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.AuthExampleInterac' + mainClass = 'io.github.vantiv.sdk.samples.AuthExampleInterac' classpath = sourceSets.main.runtimeClasspath } task execAuthExampleInterac1(type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.AuthExampleInterac1' + mainClass = 'io.github.vantiv.sdk.samples.AuthExampleInterac1' classpath = sourceSets.main.runtimeClasspath } diff --git a/samples/batch/build.gradle b/samples/batch/build.gradle index 716d8492..e6385044 100755 --- a/samples/batch/build.gradle +++ b/samples/batch/build.gradle @@ -2,7 +2,7 @@ apply plugin : 'java' apply plugin : 'eclipse' repositories { maven { - url "http://repo1.maven.org/maven2" + url = "http://repo1.maven.org/maven2" } } dependencies{ @@ -10,7 +10,7 @@ repositories { } task execSamples(type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.MechaBatch' + mainClass = 'io.github.vantiv.sdk.samples.MechaBatch' classpath = sourceSets.main.runtimeClasspath diff --git a/samples/capture/build.gradle b/samples/capture/build.gradle index cc6d3581..42aa66e2 100755 --- a/samples/capture/build.gradle +++ b/samples/capture/build.gradle @@ -2,7 +2,7 @@ apply plugin : 'java' apply plugin : 'eclipse' repositories { maven { - url "http://repo1.maven.org/maven2" + url = "http://repo1.maven.org/maven2" } } dependencies{ @@ -10,23 +10,23 @@ repositories { } task execCaptureExample(type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.CaptureExample' + mainClass = 'io.github.vantiv.sdk.samples.CaptureExample' classpath = sourceSets.main.runtimeClasspath } task execCaptureGivenAuthExample(type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.CaptureGivenAuthExample' + mainClass = 'io.github.vantiv.sdk.samples.CaptureGivenAuthExample' classpath = sourceSets.main.runtimeClasspath } task execCapturePartialExample(type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.CapturePartialExample' + mainClass = 'io.github.vantiv.sdk.samples.CapturePartialExample' classpath = sourceSets.main.runtimeClasspath } task execForceCaptureExample(type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.ForceCaptureExample' + mainClass = 'io.github.vantiv.sdk.samples.ForceCaptureExample' classpath = sourceSets.main.runtimeClasspath } diff --git a/samples/credit/build.gradle b/samples/credit/build.gradle index 2556d8cd..f200de79 100755 --- a/samples/credit/build.gradle +++ b/samples/credit/build.gradle @@ -2,7 +2,7 @@ apply plugin : 'java' apply plugin : 'eclipse' repositories { maven { - url "http://repo1.maven.org/maven2" + url = "http://repo1.maven.org/maven2" } } dependencies{ @@ -10,7 +10,7 @@ repositories { } task execCreditExample(type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.CreditExample' + mainClass = 'io.github.vantiv.sdk.samples.CreditExample' classpath = sourceSets.main.runtimeClasspath } diff --git a/samples/echeck/build.gradle b/samples/echeck/build.gradle index 7aca1a51..34c7f4bb 100755 --- a/samples/echeck/build.gradle +++ b/samples/echeck/build.gradle @@ -2,7 +2,7 @@ apply plugin : 'java' apply plugin : 'eclipse' repositories { maven { - url "http://repo1.maven.org/maven2" + url = "http://repo1.maven.org/maven2" } } dependencies{ @@ -10,23 +10,23 @@ repositories { } task execEcheckCreditExample(type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.EcheckCreditExample' + mainClass = 'io.github.vantiv.sdk.samples.EcheckCreditExample' classpath = sourceSets.main.runtimeClasspath } task execEcheckRedepositExample(type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.EcheckRedepositExample' + mainClass = 'io.github.vantiv.sdk.samples.EcheckRedepositExample' classpath = sourceSets.main.runtimeClasspath } task execEcheckSaleExample(type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.EcheckSaleExample' + mainClass = 'io.github.vantiv.sdk.samples.EcheckSaleExample' classpath = sourceSets.main.runtimeClasspath } task execEcheckVerificationExample(type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.EcheckVerificationExample' + mainClass = 'io.github.vantiv.sdk.samples.EcheckVerificationExample' classpath = sourceSets.main.runtimeClasspath } diff --git a/samples/other/build.gradle b/samples/other/build.gradle index 7e961b12..81fba7df 100755 --- a/samples/other/build.gradle +++ b/samples/other/build.gradle @@ -2,7 +2,7 @@ apply plugin : 'java' apply plugin : 'eclipse' repositories { maven { - url "http://repo1.maven.org/maven2" + url = "http://repo1.maven.org/maven2" } } dependencies{ @@ -10,38 +10,38 @@ repositories { } task execMultiCurrencyExample2(type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.MultiCurrencyExample2' + mainClass = 'io.github.vantiv.sdk.samples.MultiCurrencyExample2' classpath = sourceSets.main.runtimeClasspath } task execAvsOnlyExample(type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.AvsOnlyExample' + mainClass = 'io.github.vantiv.sdk.samples.AvsOnlyExample' classpath = sourceSets.main.runtimeClasspath } task execMultiCurrencyExample(type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.MultiCurrencyExample' + mainClass = 'io.github.vantiv.sdk.samples.MultiCurrencyExample' classpath = sourceSets.main.runtimeClasspath } task execMultiCurrencyMultiReportGroupSale(type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.MultiCurrencyMultiReportGroupSale' + mainClass = 'io.github.vantiv.sdk.samples.MultiCurrencyMultiReportGroupSale' classpath = sourceSets.main.runtimeClasspath } task execOrphanedRefundExample(type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.OrphanedRefundExample' + mainClass = 'io.github.vantiv.sdk.samples.OrphanedRefundExample' classpath = sourceSets.main.runtimeClasspath } task execVoidExample(type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.VoidExample' + mainClass = 'io.github.vantiv.sdk.samples.VoidExample' classpath = sourceSets.main.runtimeClasspath } task execRfrExample(type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.RfrCnpExample' + mainClass = 'io.github.vantiv.sdk.samples.RfrCnpExample' classpath = sourceSets.main.runtimeClasspath } diff --git a/samples/paypage/build.gradle b/samples/paypage/build.gradle index c029d642..495d6a91 100755 --- a/samples/paypage/build.gradle +++ b/samples/paypage/build.gradle @@ -2,7 +2,7 @@ apply plugin : 'java' apply plugin : 'eclipse' repositories { maven { - url "http://repo1.maven.org/maven2" + url = "http://repo1.maven.org/maven2" } } dependencies{ @@ -10,7 +10,7 @@ repositories { } task execPaypageRegistrationIdToTokenExample (type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.PaypageRegistrationIdToTokenExample' + mainClass = 'io.github.vantiv.sdk.samples.PaypageRegistrationIdToTokenExample' classpath = sourceSets.main.runtimeClasspath } diff --git a/samples/sale/build.gradle b/samples/sale/build.gradle index 8c3ece6b..34f4b417 100755 --- a/samples/sale/build.gradle +++ b/samples/sale/build.gradle @@ -2,7 +2,7 @@ apply plugin : 'java' apply plugin : 'eclipse' repositories { maven { - url "http://repo1.maven.org/maven2" + url = "http://repo1.maven.org/maven2" } } dependencies{ @@ -10,7 +10,7 @@ repositories { } task execSaleExample(type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.SaleExample' + mainClass = 'io.github.vantiv.sdk.samples.SaleExample' classpath = sourceSets.main.runtimeClasspath diff --git a/samples/token/build.gradle b/samples/token/build.gradle index 919db730..a35a16d1 100755 --- a/samples/token/build.gradle +++ b/samples/token/build.gradle @@ -2,7 +2,7 @@ apply plugin : 'java' apply plugin : 'eclipse' repositories { maven { - url "http://repo1.maven.org/maven2" + url = "http://repo1.maven.org/maven2" } } dependencies{ @@ -10,12 +10,12 @@ repositories { } task execRegisterTokenExample (type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.RegisterTokenExample' + mainClass = 'io.github.vantiv.sdk.samples.RegisterTokenExample' classpath = sourceSets.main.runtimeClasspath } task execSaleWithTokenExample (type:JavaExec){ check.dependsOn it - main='io.github.vantiv.sdk.samples.SaleWithTokenExample' + mainClass = 'io.github.vantiv.sdk.samples.SaleWithTokenExample' classpath = sourceSets.main.runtimeClasspath } diff --git a/src/functionalTest/java/io/github/vantiv/sdk/TestAuth.java b/src/functionalTest/java/io/github/vantiv/sdk/TestAuth.java index 9dbd2748..a2641db4 100644 --- a/src/functionalTest/java/io/github/vantiv/sdk/TestAuth.java +++ b/src/functionalTest/java/io/github/vantiv/sdk/TestAuth.java @@ -232,7 +232,7 @@ public void simpleAuthWithApplepayAndSecondaryAmount() throws Exception { authorization.setApplepay(applepayType); AuthorizationResponse response = cnp.authorize(authorization); - assertEquals(new Long(110),response.getApplepayResponse().getTransactionAmount()); + assertEquals(Long.valueOf(110),response.getApplepayResponse().getTransactionAmount()); assertEquals("sandbox", response.getLocation()); } @@ -705,8 +705,8 @@ private PassengerTransportData passengerTransportData(){ passengerTransportData.setCreditReasonIndicator(CreditReasonIndicatorEnum.C); passengerTransportData.setTicketChangeIndicator(TicketChangeIndicatorEnum.C); passengerTransportData.setTicketIssuerAddress("IssuerAddress"); - passengerTransportData.setExchangeAmount(new Long(110)); - passengerTransportData.setExchangeFeeAmount(new Long(112)); + passengerTransportData.setExchangeAmount(Long.valueOf(110)); + passengerTransportData.setExchangeFeeAmount(Long.valueOf(112)); passengerTransportData.setExchangeTicketNumber("ExchangeNumber"); passengerTransportData.getTripLegDatas().add(addTripLegData()); return passengerTransportData; diff --git a/src/functionalTest/java/io/github/vantiv/sdk/TestBatchFile.java b/src/functionalTest/java/io/github/vantiv/sdk/TestBatchFile.java index 27aa79f5..9b56223f 100644 --- a/src/functionalTest/java/io/github/vantiv/sdk/TestBatchFile.java +++ b/src/functionalTest/java/io/github/vantiv/sdk/TestBatchFile.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Properties; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; diff --git a/src/functionalTest/java/io/github/vantiv/sdk/TestCapture.java b/src/functionalTest/java/io/github/vantiv/sdk/TestCapture.java index 8364236c..e8d4f9f5 100644 --- a/src/functionalTest/java/io/github/vantiv/sdk/TestCapture.java +++ b/src/functionalTest/java/io/github/vantiv/sdk/TestCapture.java @@ -127,8 +127,8 @@ private PassengerTransportData passengerTransportData(){ passengerTransportData.setCreditReasonIndicator(CreditReasonIndicatorEnum.C); passengerTransportData.setTicketChangeIndicator(TicketChangeIndicatorEnum.C); passengerTransportData.setTicketIssuerAddress("IssuerAddress"); - passengerTransportData.setExchangeAmount(new Long(110)); - passengerTransportData.setExchangeFeeAmount(new Long(112)); + passengerTransportData.setExchangeAmount(Long.valueOf(110)); + passengerTransportData.setExchangeFeeAmount(Long.valueOf(112)); passengerTransportData.setExchangeTicketNumber("ExchangeNumber"); passengerTransportData.getTripLegDatas().add(addTripLegData()); return passengerTransportData; diff --git a/src/functionalTest/java/io/github/vantiv/sdk/TestCaptureGivenAuth.java b/src/functionalTest/java/io/github/vantiv/sdk/TestCaptureGivenAuth.java index 67bf0cda..3e805d63 100644 --- a/src/functionalTest/java/io/github/vantiv/sdk/TestCaptureGivenAuth.java +++ b/src/functionalTest/java/io/github/vantiv/sdk/TestCaptureGivenAuth.java @@ -429,8 +429,8 @@ private PassengerTransportData passengerTransportData(){ passengerTransportData.setCreditReasonIndicator(CreditReasonIndicatorEnum.C); passengerTransportData.setTicketChangeIndicator(TicketChangeIndicatorEnum.C); passengerTransportData.setTicketIssuerAddress("IssuerAddress"); - passengerTransportData.setExchangeAmount(new Long(110)); - passengerTransportData.setExchangeFeeAmount(new Long(112)); + passengerTransportData.setExchangeAmount(Long.valueOf(110)); + passengerTransportData.setExchangeFeeAmount(Long.valueOf(112)); passengerTransportData.setExchangeTicketNumber("ExchangeNumber"); passengerTransportData.getTripLegDatas().add(addTripLegData()); return passengerTransportData; diff --git a/src/functionalTest/java/io/github/vantiv/sdk/TestCredit.java b/src/functionalTest/java/io/github/vantiv/sdk/TestCredit.java index c932f410..b3a0bfdb 100644 --- a/src/functionalTest/java/io/github/vantiv/sdk/TestCredit.java +++ b/src/functionalTest/java/io/github/vantiv/sdk/TestCredit.java @@ -269,8 +269,8 @@ private PassengerTransportData passengerTransportData(){ passengerTransportData.setCreditReasonIndicator(CreditReasonIndicatorEnum.C); passengerTransportData.setTicketChangeIndicator(TicketChangeIndicatorEnum.C); passengerTransportData.setTicketIssuerAddress("IssuerAddress"); - passengerTransportData.setExchangeAmount(new Long(110)); - passengerTransportData.setExchangeFeeAmount(new Long(112)); + passengerTransportData.setExchangeAmount(Long.valueOf(110)); + passengerTransportData.setExchangeFeeAmount(Long.valueOf(112)); passengerTransportData.setExchangeTicketNumber("ExchangeNumber"); passengerTransportData.getTripLegDatas().add(addTripLegData()); return passengerTransportData; diff --git a/src/functionalTest/java/io/github/vantiv/sdk/TestDepositTransactionReversal.java b/src/functionalTest/java/io/github/vantiv/sdk/TestDepositTransactionReversal.java index 9fa739f5..d32c8a5d 100644 --- a/src/functionalTest/java/io/github/vantiv/sdk/TestDepositTransactionReversal.java +++ b/src/functionalTest/java/io/github/vantiv/sdk/TestDepositTransactionReversal.java @@ -97,8 +97,8 @@ private PassengerTransportData passengerTransportData(){ passengerTransportData.setCreditReasonIndicator(CreditReasonIndicatorEnum.C); passengerTransportData.setTicketChangeIndicator(TicketChangeIndicatorEnum.C); passengerTransportData.setTicketIssuerAddress("IssuerAddress"); - passengerTransportData.setExchangeAmount(new Long(110)); - passengerTransportData.setExchangeFeeAmount(new Long(112)); + passengerTransportData.setExchangeAmount(Long.valueOf(110)); + passengerTransportData.setExchangeFeeAmount(Long.valueOf(112)); passengerTransportData.setExchangeTicketNumber("ExchangeNumber"); passengerTransportData.getTripLegDatas().add(addTripLegData()); return passengerTransportData; diff --git a/src/functionalTest/java/io/github/vantiv/sdk/TestForceCapture.java b/src/functionalTest/java/io/github/vantiv/sdk/TestForceCapture.java index 4e03686c..55c76fbe 100644 --- a/src/functionalTest/java/io/github/vantiv/sdk/TestForceCapture.java +++ b/src/functionalTest/java/io/github/vantiv/sdk/TestForceCapture.java @@ -143,8 +143,8 @@ private PassengerTransportData passengerTransportData(){ passengerTransportData.setCreditReasonIndicator(CreditReasonIndicatorEnum.C); passengerTransportData.setTicketChangeIndicator(TicketChangeIndicatorEnum.C); passengerTransportData.setTicketIssuerAddress("IssuerAddress"); - passengerTransportData.setExchangeAmount(new Long(110)); - passengerTransportData.setExchangeFeeAmount(new Long(112)); + passengerTransportData.setExchangeAmount(Long.valueOf(110)); + passengerTransportData.setExchangeFeeAmount(Long.valueOf(112)); passengerTransportData.setExchangeTicketNumber("ExchangeNumber"); passengerTransportData.getTripLegDatas().add(addTripLegData()); return passengerTransportData; diff --git a/src/functionalTest/java/io/github/vantiv/sdk/TestFraudCheck.java b/src/functionalTest/java/io/github/vantiv/sdk/TestFraudCheck.java index 987ce912..db2a9bd9 100644 --- a/src/functionalTest/java/io/github/vantiv/sdk/TestFraudCheck.java +++ b/src/functionalTest/java/io/github/vantiv/sdk/TestFraudCheck.java @@ -46,7 +46,7 @@ public void testFraudCheck() throws Exception { AdvancedFraudResultsType advancedFraudResultsType = fraudCheckResponse.getAdvancedFraudResults(); assertEquals("pass", advancedFraudResultsType.getDeviceReviewStatus()); - assertEquals(new Integer(42), advancedFraudResultsType.getDeviceReputationScore()); + assertEquals(Integer.valueOf(42), advancedFraudResultsType.getDeviceReputationScore()); assertEquals(5, advancedFraudResultsType.getTriggeredRules().size()); } } diff --git a/src/functionalTest/java/io/github/vantiv/sdk/TestQueryTransaction.java b/src/functionalTest/java/io/github/vantiv/sdk/TestQueryTransaction.java index 11e7696f..a2ab195a 100644 --- a/src/functionalTest/java/io/github/vantiv/sdk/TestQueryTransaction.java +++ b/src/functionalTest/java/io/github/vantiv/sdk/TestQueryTransaction.java @@ -185,7 +185,8 @@ Properties getCnpProperty(String url1, String url2) { cnpProperty.setProperty("multiSiteUrl2", url2); cnpProperty.setProperty("oltpEncryptionPayload", "true"); cnpProperty.setProperty("oltpEncryptionKeySequence", "10000"); - cnpProperty.setProperty("oltpEncryptionKeyPath", "/home/buildvwr/pgpKeyOltp/cnpOltpEncryptionKey.asc"); + cnpProperty.setProperty("oltpEncryptionKeyPath", System.getProperty("user.dir") + "/src/functionalTest/resources/testCnpOltpEncryptionKey.asc"); return cnpProperty; } + } \ No newline at end of file diff --git a/src/functionalTest/java/io/github/vantiv/sdk/TestRefundTransactionReversal.java b/src/functionalTest/java/io/github/vantiv/sdk/TestRefundTransactionReversal.java index 012dcc46..0d3aee08 100644 --- a/src/functionalTest/java/io/github/vantiv/sdk/TestRefundTransactionReversal.java +++ b/src/functionalTest/java/io/github/vantiv/sdk/TestRefundTransactionReversal.java @@ -97,8 +97,8 @@ private PassengerTransportData passengerTransportData(){ passengerTransportData.setCreditReasonIndicator(CreditReasonIndicatorEnum.C); passengerTransportData.setTicketChangeIndicator(TicketChangeIndicatorEnum.C); passengerTransportData.setTicketIssuerAddress("IssuerAddress"); - passengerTransportData.setExchangeAmount(new Long(110)); - passengerTransportData.setExchangeFeeAmount(new Long(112)); + passengerTransportData.setExchangeAmount(Long.valueOf(110)); + passengerTransportData.setExchangeFeeAmount(Long.valueOf(112)); passengerTransportData.setExchangeTicketNumber("ExchangeNumber"); passengerTransportData.getTripLegDatas().add(addTripLegData()); return passengerTransportData; diff --git a/src/functionalTest/java/io/github/vantiv/sdk/TestSale.java b/src/functionalTest/java/io/github/vantiv/sdk/TestSale.java index 7307f643..6e5e1bd3 100644 --- a/src/functionalTest/java/io/github/vantiv/sdk/TestSale.java +++ b/src/functionalTest/java/io/github/vantiv/sdk/TestSale.java @@ -134,7 +134,7 @@ public void simpleSaleWithApplepayAndSecondaryAmount() throws Exception{ sale.setId("id"); SaleResponse response = cnp.sale(sale); assertEquals("Insufficient Funds", response.getMessage()); - assertEquals(new Long(110),response.getApplepayResponse().getTransactionAmount()); + assertEquals(Long.valueOf(110),response.getApplepayResponse().getTransactionAmount()); assertEquals("sandbox", response.getLocation()); } @@ -574,8 +574,8 @@ private PassengerTransportData passengerTransportData(){ passengerTransportData.setCreditReasonIndicator(CreditReasonIndicatorEnum.C); passengerTransportData.setTicketChangeIndicator(TicketChangeIndicatorEnum.C); passengerTransportData.setTicketIssuerAddress("IssuerAddress"); - passengerTransportData.setExchangeAmount(new Long(110)); - passengerTransportData.setExchangeFeeAmount(new Long(112)); + passengerTransportData.setExchangeAmount(Long.valueOf(110)); + passengerTransportData.setExchangeFeeAmount(Long.valueOf(112)); passengerTransportData.setExchangeTicketNumber("ExchangeNumber"); passengerTransportData.getTripLegDatas().add(addTripLegData()); return passengerTransportData; diff --git a/src/functionalTest/java/io/github/vantiv/sdk/TestToken.java b/src/functionalTest/java/io/github/vantiv/sdk/TestToken.java index 188438e8..cdaece47 100755 --- a/src/functionalTest/java/io/github/vantiv/sdk/TestToken.java +++ b/src/functionalTest/java/io/github/vantiv/sdk/TestToken.java @@ -91,7 +91,7 @@ public void simpleTokenWithApplepay() throws Exception{ token.setId("id"); RegisterTokenResponse response = cnp.registerToken(token); assertEquals("Account number was successfully registered", response.getMessage()); - assertEquals(new Long(0),response.getApplepayResponse().getTransactionAmount()); + assertEquals(Long.valueOf(0),response.getApplepayResponse().getTransactionAmount()); assertEquals("sandbox", response.getLocation()); } diff --git a/src/functionalTest/java/io/github/vantiv/sdk/TestTxnForEncryption.java b/src/functionalTest/java/io/github/vantiv/sdk/TestTxnForEncryption.java index 3fadddc0..0a8dbbd7 100644 --- a/src/functionalTest/java/io/github/vantiv/sdk/TestTxnForEncryption.java +++ b/src/functionalTest/java/io/github/vantiv/sdk/TestTxnForEncryption.java @@ -16,7 +16,7 @@ public void beforeClass() throws IOException { config.load(new FileInputStream(new Configuration().location())); config.setProperty("oltpEncryptionPayload", "true"); config.setProperty("oltpEncryptionKeySequence", "10000"); - config.setProperty("oltpEncryptionKeyPath","/home/buildvwr/pgpKeyOltp/cnpOltpEncryptionKey.asc"); + config.setProperty("oltpEncryptionKeyPath",System.getProperty("user.dir") + "/src/functionalTest/resources/testCnpOltpEncryptionKey.asc"); cnp = new CnpOnline(config); } diff --git a/src/functionalTest/resources/testCnpOltpEncryptionKey.asc b/src/functionalTest/resources/testCnpOltpEncryptionKey.asc new file mode 100755 index 00000000..181c9687 --- /dev/null +++ b/src/functionalTest/resources/testCnpOltpEncryptionKey.asc @@ -0,0 +1,31 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBGbVW3EBCADhseJVZh+DhiAqhyDZXX4MwE9aXcDVUdNZoD3xgKn+caUvHQHT +jCSBWpHFTGPyrya5gfHpcH6Z9lN1rlxqr0hs1cY/Yhkxlrfo+6w7Y2kRbwj2ilLc +Vk9iPV4DdjrFUFdWp3MdaJ7YhAHOUI60fBvf3GrnHCy6HtCgjROEYSAID4L5gCXc +FUqHWUCzMsKM1+GlSfmsAHrwxAKxYwC4wuu/aAuaOgofrzN3Ud8p1WvWkdB60SKM +TdY2qQGj6WY3U5whULgmjmoyrRiUq89yNZMve43jjqyYBtZqLcNi2bS6sXmZyjT5 +McmRb2+KzmqCftvoqTDo2VEet+Hp4MSRwHw5ABEBAAG0OFNhbmRib3hOb25FeHBp +cmluZ0tleSA8c3VzaGFtYS5hbmlsZ2hhZGFnZUB3b3JsZHBheS5jb20+iQFOBBMB +CAA4FiEEPmqIQhTLLyZAkBizzinUXUtH4IQFAmbVW3ECGwMFCwkIBwIGFQoJCAsC +BBYCAwECHgECF4AACgkQzinUXUtH4ITiVggAvIxV8aDS9dvqrNzuj5mFNCBB00aN +ObkB9mQFuEEGPP+TYpsX6hYFOH5M5jDuGe0il+QskEynbqJfvyx1k55cpSUR9XFj +u8Q7QLMsUJqbExyJ/Ymu3dc0YuX4RO9RkcB7gg1/SCDi5KCgtaUW9eciNLeAyYnk +CN5DwgoHaI8yEGXowLSidxJUUjfDqI+CiNXxZb7O9PNDTlKmyASO1mrbXkNiZzMr +Z2o53IXR/HCr98yqTpwsE2ERX5aFPf5aeyjom+znWUOU3S9UhgmoXXgvKM4mHWzj +4EQ0Y3IJlV7WyOR14AfDj7zIoX9mC5jEHvrElFRsxCQdWrme95itR9fL/LkBDQRm +1VtxAQgAsUkEwyZvyy4Vxg071s8VHGaxWm9hvQC1C/9v1nxn/ozCBEoUyVcrEBVj +rKbC9ESu0CxeayBtl7VVAd7bxwSsiyWgLtn1KgXPyn9nYRNF5luUJEZpXiVCsk+c +7FeZQe1pJNFo3RI1WRO2vhNHthLNNn46RV4xMZm6acoFxLipMuMmpkW9BsU6vP/5 +rR4zSQH9Enz4m1fZOJCAx4Ngq4Zzqpi/bgni0MS5GMIiZyWNgK+C+QB4sw8/ehdX +vjBPhSmYilZ/xbsuzfVFUHhbrewSZsAKRiqc4LPMRTUiHsnPTtjJbqjyZUEI9cwU +1SDVB6Z/pCQKfrOz1Dxw6Re4l/rFKwARAQABiQE2BBgBCAAgFiEEPmqIQhTLLyZA +kBizzinUXUtH4IQFAmbVW3ECGwwACgkQzinUXUtH4ITIeAgAj8oJ4t8ngpm2+8ZB +NZGDhOyGvbY7qQuCv40mppx1kwoNa7btUSapBk5V7S4nxGlvrGRp2eSY/0XymvDs +WwByOk0PYjwCXYyZwdmjTXn2WWVBjkCFq5aVVJlNeGA6h+dO4rEX4YnZhPpSafcd +bNLJ595fhIF/QX825bZGhanYJyWdFzy7cwjpRF+mGrqf/LydNcyWZs6DvNqd+p5J +hciFXa1yrxFXRwnMtcWF7MOaXHYnCISGOpJR7ZYDXZCviqsgzBhm7xDr0GTyoElO +FNI7UTXAfcoNpsh5+GtKAUkoNe7bCtqsH3NgFHJOamiPak+NDa5T4Vci7742Kvf9 +dNlljg== +=VwD5 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/src/main/java/io/github/vantiv/sdk/CnpBatchFileRequest.java b/src/main/java/io/github/vantiv/sdk/CnpBatchFileRequest.java index 3d02fed0..7f641b50 100755 --- a/src/main/java/io/github/vantiv/sdk/CnpBatchFileRequest.java +++ b/src/main/java/io/github/vantiv/sdk/CnpBatchFileRequest.java @@ -6,9 +6,9 @@ import java.util.List; import java.util.Properties; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import io.github.vantiv.sdk.generate.Authentication; import io.github.vantiv.sdk.generate.CnpRequest; diff --git a/src/main/java/io/github/vantiv/sdk/CnpBatchFileResponse.java b/src/main/java/io/github/vantiv/sdk/CnpBatchFileResponse.java index f2d2a50e..642dd971 100644 --- a/src/main/java/io/github/vantiv/sdk/CnpBatchFileResponse.java +++ b/src/main/java/io/github/vantiv/sdk/CnpBatchFileResponse.java @@ -2,7 +2,7 @@ import java.io.File; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; public class CnpBatchFileResponse extends CnpFileResponse{ diff --git a/src/main/java/io/github/vantiv/sdk/CnpBatchRequest.java b/src/main/java/io/github/vantiv/sdk/CnpBatchRequest.java index c550baca..d7a78019 100644 --- a/src/main/java/io/github/vantiv/sdk/CnpBatchRequest.java +++ b/src/main/java/io/github/vantiv/sdk/CnpBatchRequest.java @@ -7,10 +7,10 @@ import java.text.SimpleDateFormat; import java.util.Properties; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import io.github.vantiv.sdk.generate.*; import org.bouncycastle.openpgp.PGPException; diff --git a/src/main/java/io/github/vantiv/sdk/CnpBatchResponse.java b/src/main/java/io/github/vantiv/sdk/CnpBatchResponse.java index 58da07ea..91a66fd3 100644 --- a/src/main/java/io/github/vantiv/sdk/CnpBatchResponse.java +++ b/src/main/java/io/github/vantiv/sdk/CnpBatchResponse.java @@ -4,10 +4,10 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import io.github.vantiv.sdk.generate.BatchResponse; import io.github.vantiv.sdk.generate.CnpTransactionInterface; diff --git a/src/main/java/io/github/vantiv/sdk/CnpContext.java b/src/main/java/io/github/vantiv/sdk/CnpContext.java index 75f7855c..b3c384f1 100644 --- a/src/main/java/io/github/vantiv/sdk/CnpContext.java +++ b/src/main/java/io/github/vantiv/sdk/CnpContext.java @@ -1,7 +1,7 @@ package io.github.vantiv.sdk; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import io.github.vantiv.sdk.generate.ObjectFactory; diff --git a/src/main/java/io/github/vantiv/sdk/CnpFileResponse.java b/src/main/java/io/github/vantiv/sdk/CnpFileResponse.java index 6d231634..26d1d425 100644 --- a/src/main/java/io/github/vantiv/sdk/CnpFileResponse.java +++ b/src/main/java/io/github/vantiv/sdk/CnpFileResponse.java @@ -4,9 +4,9 @@ import java.io.IOException; import java.io.StringReader; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import io.github.vantiv.sdk.generate.CnpResponse; diff --git a/src/main/java/io/github/vantiv/sdk/CnpOnline.java b/src/main/java/io/github/vantiv/sdk/CnpOnline.java index 597bbe87..96d25a38 100755 --- a/src/main/java/io/github/vantiv/sdk/CnpOnline.java +++ b/src/main/java/io/github/vantiv/sdk/CnpOnline.java @@ -10,11 +10,12 @@ import java.nio.file.Paths; import java.util.Properties; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import javax.xml.XMLConstants; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/src/main/java/io/github/vantiv/sdk/CnpRFRFileRequest.java b/src/main/java/io/github/vantiv/sdk/CnpRFRFileRequest.java index 3ab8d577..a874f218 100644 --- a/src/main/java/io/github/vantiv/sdk/CnpRFRFileRequest.java +++ b/src/main/java/io/github/vantiv/sdk/CnpRFRFileRequest.java @@ -10,9 +10,9 @@ import java.math.BigInteger; import java.util.Properties; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import io.github.vantiv.sdk.generate.Authentication; import io.github.vantiv.sdk.generate.CnpRequest; diff --git a/src/main/java/io/github/vantiv/sdk/CnpRFRFileResponse.java b/src/main/java/io/github/vantiv/sdk/CnpRFRFileResponse.java index 8279bc16..1b039264 100644 --- a/src/main/java/io/github/vantiv/sdk/CnpRFRFileResponse.java +++ b/src/main/java/io/github/vantiv/sdk/CnpRFRFileResponse.java @@ -2,7 +2,7 @@ import java.io.File; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; /** * Container class holding the RFR response diff --git a/src/main/java/io/github/vantiv/sdk/CnpRFRResponse.java b/src/main/java/io/github/vantiv/sdk/CnpRFRResponse.java index c2c8acd6..7100da95 100644 --- a/src/main/java/io/github/vantiv/sdk/CnpRFRResponse.java +++ b/src/main/java/io/github/vantiv/sdk/CnpRFRResponse.java @@ -2,9 +2,9 @@ import java.io.StringReader; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import io.github.vantiv.sdk.generate.RFRResponse; diff --git a/src/main/java/io/github/vantiv/sdk/JAXBConverters.java b/src/main/java/io/github/vantiv/sdk/JAXBConverters.java index e7970054..1da8952a 100644 --- a/src/main/java/io/github/vantiv/sdk/JAXBConverters.java +++ b/src/main/java/io/github/vantiv/sdk/JAXBConverters.java @@ -8,7 +8,7 @@ public static Calendar parseDate(String value){ if(value == null){ return null; } - return (javax.xml.bind.DatatypeConverter.parseDate(value)); + return (jakarta.xml.bind.DatatypeConverter.parseDate(value)); } public static String printDate(Calendar value){ diff --git a/src/main/java/io/github/vantiv/sdk/TlidValidationActionIndicatorType.java b/src/main/java/io/github/vantiv/sdk/TlidValidationActionIndicatorType.java index 8cdf7b34..88e0f4fa 100644 --- a/src/main/java/io/github/vantiv/sdk/TlidValidationActionIndicatorType.java +++ b/src/main/java/io/github/vantiv/sdk/TlidValidationActionIndicatorType.java @@ -1,8 +1,8 @@ package io.github.vantiv.sdk; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; @XmlType(name = "tlidValidationActionIndicatorType") @XmlEnum(Integer.class) diff --git a/src/main/java/io/github/vantiv/sdk/TypeOfDigitalCurrencyEnum.java b/src/main/java/io/github/vantiv/sdk/TypeOfDigitalCurrencyEnum.java index 5ac7cb6e..263345ef 100644 --- a/src/main/java/io/github/vantiv/sdk/TypeOfDigitalCurrencyEnum.java +++ b/src/main/java/io/github/vantiv/sdk/TypeOfDigitalCurrencyEnum.java @@ -1,8 +1,8 @@ package io.github.vantiv.sdk; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; // This class is deprecated we are going to delete this class in upcoming version. @XmlType(name = "typeOfDigitalCurrencyEnum") @XmlEnum diff --git a/src/main/xsd/bindings.xml b/src/main/xsd/bindings.xml index 59cbfae7..01732797 100755 --- a/src/main/xsd/bindings.xml +++ b/src/main/xsd/bindings.xml @@ -1,6 +1,6 @@ - diff --git a/src/test/java/io/github/vantiv/sdk/TestCnpBatchFileRequest.java b/src/test/java/io/github/vantiv/sdk/TestCnpBatchFileRequest.java index f31e9396..3d124162 100644 --- a/src/test/java/io/github/vantiv/sdk/TestCnpBatchFileRequest.java +++ b/src/test/java/io/github/vantiv/sdk/TestCnpBatchFileRequest.java @@ -7,8 +7,8 @@ import java.io.FileNotFoundException; import java.util.Properties; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/io/github/vantiv/sdk/TestCnpBatchRequest.java b/src/test/java/io/github/vantiv/sdk/TestCnpBatchRequest.java index 38b26ced..2b0eb8ec 100644 --- a/src/test/java/io/github/vantiv/sdk/TestCnpBatchRequest.java +++ b/src/test/java/io/github/vantiv/sdk/TestCnpBatchRequest.java @@ -7,8 +7,8 @@ import java.math.BigInteger; import java.util.Properties; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import io.github.vantiv.sdk.generate.*; import org.junit.Before; diff --git a/src/test/java/io/github/vantiv/sdk/TestCnpContext.java b/src/test/java/io/github/vantiv/sdk/TestCnpContext.java index e4ef203a..595231f9 100644 --- a/src/test/java/io/github/vantiv/sdk/TestCnpContext.java +++ b/src/test/java/io/github/vantiv/sdk/TestCnpContext.java @@ -2,7 +2,7 @@ import static org.junit.Assert.assertSame; -import javax.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBContext; import io.github.vantiv.sdk.generate.ObjectFactory; import org.junit.Test; diff --git a/src/test/java/io/github/vantiv/sdk/TestCnpOnline.java b/src/test/java/io/github/vantiv/sdk/TestCnpOnline.java index d94f23d8..bd64d6ec 100755 --- a/src/test/java/io/github/vantiv/sdk/TestCnpOnline.java +++ b/src/test/java/io/github/vantiv/sdk/TestCnpOnline.java @@ -6,7 +6,7 @@ import org.junit.Test; import org.mockito.Mock; -import javax.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBElement; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; @@ -104,7 +104,7 @@ public void testAuthWithApplepayAndSecondaryAmountAndWallet() throws Exception { AuthorizationResponse authorize = cnp.authorize(authorization); assertEquals(123L, authorize.getCnpTxnId()); assertEquals("123455", authorize.getApplepayResponse().getApplicationPrimaryAccountNumber()); - assertEquals(new Long(106), authorize.getApplepayResponse().getTransactionAmount()); + assertEquals(Long.valueOf(106), authorize.getApplepayResponse().getTransactionAmount()); assertEquals("sandbox", authorize.getLocation()); } @@ -2764,7 +2764,7 @@ public void testFraudCheck() throws Exception { FraudCheckResponse fraudCheckResponse = cnp.fraudCheck(fraudCheck); AdvancedFraudResultsType advancedFraudResultsType = fraudCheckResponse.getAdvancedFraudResults(); assertEquals("pass", advancedFraudResultsType.getDeviceReviewStatus()); - assertEquals(new Integer(42), advancedFraudResultsType.getDeviceReputationScore()); + assertEquals(Integer.valueOf(42), advancedFraudResultsType.getDeviceReputationScore()); assertEquals(5, advancedFraudResultsType.getTriggeredRules().size()); assertEquals("sandbox", fraudCheckResponse.getLocation()); } diff --git a/src/test/java/io/github/vantiv/sdk/TestEnumerations.java b/src/test/java/io/github/vantiv/sdk/TestEnumerations.java index d91caae1..b8762c07 100644 --- a/src/test/java/io/github/vantiv/sdk/TestEnumerations.java +++ b/src/test/java/io/github/vantiv/sdk/TestEnumerations.java @@ -4,8 +4,10 @@ import java.io.StringWriter; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import io.github.vantiv.sdk.generate.*; import org.junit.Test;