Remove redundant env variable (#23)

mateuszpajak · Mateusz Pająk · web-flow · commit ca3d8011b3ce · 2024-11-20T15:44:59.000Z
Co-authored-by: Mateusz Pająk &lt;mateusz.pajak@shift4.com&gt;
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,7 +21,6 @@ jobs:
       - name: Execute Gradle build
         env:
           SECRET_KEY: ${{ secrets.SECRET_KEY }}
-          EXPLICIT_MERCHANT_SECRET_KEY: ${{ secrets.EXPLICIT_MERCHANT_SECRET_KEY }}
           EXPLICIT_MERCHANT: ${{ secrets.EXPLICIT_MERCHANT }}
         run: ./gradlew build
 
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ To do this you will need to add this configuration to your `pom.xml`:
 <dependency>
     <groupId>com.shift4</groupId>
     <artifactId>shift4-java</artifactId>
-    <version>2.8.0</version>
+    <version>2.9.0</version>
 </dependency>
 ```
 
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "com.shift4"
-version = "2.8.0"
+version = "2.9.0"
 archivesBaseName = "shift4-java"
 
 repositories {
diff --git a/src/test/java/com/shift4/AbstractShift4GatewayTest.java b/src/test/java/com/shift4/AbstractShift4GatewayTest.java
@@ -17,7 +17,7 @@ public AbstractShift4GatewayTest() {
     }
 
     public Shift4Gateway createExplicitMerchantGateway() {
-        return createGateway("EXPLICIT_MERCHANT_SECRET_KEY", true);
+        return createGateway("SECRET_KEY", true);
     }
 
     private Shift4Gateway createGateway(String secretKeyParamName, boolean withExplicitMerchant) {
diff --git a/src/test/java/com/shift4/ChargesTest.java b/src/test/java/com/shift4/ChargesTest.java
@@ -130,7 +130,7 @@ void shouldCreateChargeUsingExplicitMerchant() {
 
         // when
         Charge createdCharge = gatewayWithExplicitMerchant.createCharge(request);
-        Charge retrievedCharge = gateway.retrieveCharge(createdCharge.getId());
+        Charge retrievedCharge = gatewayWithExplicitMerchant.retrieveCharge(createdCharge.getId());
 
         // then
         assertThat(retrievedCharge.getStatus()).isEqualTo(ChargeStatus.SUCCESSFUL);
diff --git a/src/test/java/com/shift4/UploadsTest.java b/src/test/java/com/shift4/UploadsTest.java
@@ -34,7 +34,7 @@ void shouldUploadUsingExplicitMerchant(@TempDir File tempDir) throws IOException
         File tempFile = createTestFile(tempDir);
         // when
         FileUpload createdFileUpload = gatewayWithExplicitMerchant.createFileUpload(tempFile, DISPUTE_EVIDENCE);
-        FileUpload retirevedFileUpload = gateway.retrieveFileUpload(createdFileUpload.getId());
+        FileUpload retirevedFileUpload = gatewayWithExplicitMerchant.retrieveFileUpload(createdFileUpload.getId());
         // then
         assertThat(retirevedFileUpload.getId()).isNotBlank();
     }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`group = "com.shift4"`
`8`		`-version = "2.8.0"`
	`8`	`+version = "2.9.0"`
`9`	`9`	`archivesBaseName = "shift4-java"`
`10`	`10`
`11`	`11`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public AbstractShift4GatewayTest() {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public Shift4Gateway createExplicitMerchantGateway() {`
`20`		`- return createGateway("EXPLICIT_MERCHANT_SECRET_KEY", true);`
	`20`	`+ return createGateway("SECRET_KEY", true);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`private Shift4Gateway createGateway(String secretKeyParamName, boolean withExplicitMerchant) {`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ void shouldUploadUsingExplicitMerchant(@TempDir File tempDir) throws IOException`
`34`	`34`	`File tempFile = createTestFile(tempDir);`
`35`	`35`	`// when`
`36`	`36`	`FileUpload createdFileUpload = gatewayWithExplicitMerchant.createFileUpload(tempFile, DISPUTE_EVIDENCE);`
`37`		`- FileUpload retirevedFileUpload = gateway.retrieveFileUpload(createdFileUpload.getId());`
	`37`	`+ FileUpload retirevedFileUpload = gatewayWithExplicitMerchant.retrieveFileUpload(createdFileUpload.getId());`
`38`	`38`	`// then`
`39`	`39`	`assertThat(retirevedFileUpload.getId()).isNotBlank();`
`40`	`40`	`}`