Skip to content

Commit 3a20f6a

Browse files
committed
minor refactoring
1 parent 4539c44 commit 3a20f6a

5 files changed

Lines changed: 37 additions & 50 deletions

File tree

java/src/main/java/com/cybersource/ws/client/PCI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class PCI {
4646

4747
safeTable.put("item", "unitPrice quantity productCode productName productSKU productRisk taxAmount cityOverrideAmount cityOverrideRate countyOverrideAmount countyOverrideRate districtOverrideAmount districtOverrideRate stateOverrideAmount stateOverrideRate countryOverrideAmount countryOverrideRate orderAcceptanceCity orderAcceptanceCounty orderAcceptanceCountry orderAcceptanceState orderAcceptancePostalCode orderOriginCity orderOriginCounty orderOeriginCountry orderOriginState orderOriginPostalCode shipFromCity shipFromCounty shipFromCountry shipFromState shipFromPostalCode export noExport nationalTax vatRate sellerRegistration buyerRegistration middlemanRegistration pointOfTitleTransfer giftCategory timeCategory hostHedge timeHedge velocityHedge unitOfMeasure taxRate totalAmount discountAmount discountRate commodityCode grossNetIndicator taxTypeApplied discountIndicator alternateTaxID");
4848

49-
safeTable.put("ccAuthService", "run cavv commerceIndicator eciRaw xid reconcilationID avsLevel fxQuoteID returnAuthRecord authType verbalAuthCode billPayment");
49+
safeTable.put("ccAuthService", "run cavv commerceIndicator eciRaw xid reconciliationID avsLevel fxQuoteID returnAuthRecord authType verbalAuthCode billPayment");
5050

5151
safeTable.put("ccCaptureService", "run authType verbalAuthCode authRequestID transactionToken reconciliationID partialPaymentID purchasingLevel industryDataType");
5252

java/src/main/resources/cybs.properties

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ sendToAkamai=false
1919
#useHttpClient=false
2020

2121
#To enable poolingHttpClientConnection
22-
#useHttpClientWithConnectionPool=false
22+
useHttpClientWithConnectionPool=false
2323
# Following configure parameters will only work with useHttpClientWithConnectionPool=true
2424
# Both useHttpClient and useHttpClientWithConnectionPool cannot be true at same time.
25-
#maxConnections=1000
26-
#defaultMaxConnectionsPerRoute=1000
27-
#maxConnectionsPerRoute=1000
28-
#connectionRequestTimeoutMs=1000
29-
#connectionTimeoutMs=5000
30-
#socketTimeoutMs=13000
31-
#evictThreadSleepTimeMs=3000
32-
#maxKeepAliveTimeMs=30000
25+
maxConnections=1000
26+
defaultMaxConnectionsPerRoute=1000
27+
maxConnectionsPerRoute=1000
28+
connectionRequestTimeoutMs=1000
29+
connectionTimeoutMs=5000
30+
socketTimeoutMs=13000
31+
evictThreadSleepTimeMs=3000
32+
maxKeepAliveTimeMs=30000
3333

3434
# Following retry parameters are required only in case of useHttpClient=true or usePoolingHttpClient=true
3535
# "allow retry" property toggle value "true/false" to turn on /off the auto request retry.
@@ -73,9 +73,6 @@ logMaximumSize=10
7373
# every time a transaction is made
7474
certificateCacheEnabled=true
7575

76-
#If this property is set to true we will cache the merchantConfig object based on keyAlias/merchantID
77-
merchantConfigCacheEnabled=false
78-
7976
# Optional proxy server settings
8077
#proxyHost=<-- Set the Proxy Host-->
8178
#proxyPort=< -- Set the Proxy port-->

java/src/test/resources/test_cybs.properties

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ sendToAkamai=false
1717
#useHttpClient=false
1818

1919
#To enable poolingHttpClientConnection
20-
#useHttpClientWithConnectionPool=false
20+
useHttpClientWithConnectionPool=false
2121
# Following configure parameters will only work with useHttpClientWithConnectionPool=true
2222
# Optional parameters, default values configured in application
23-
#maxConnections=1000
24-
#defaultMaxConnectionsPerRoute=1000
25-
#maxConnectionsPerRoute=1000
26-
#connectionRequestTimeoutMs=1000
27-
#connectionTimeoutMs=5000
28-
#socketTimeoutMs=13000
29-
#evictThreadSleepTimeMs=3000
30-
#maxKeepAliveTimeMs=30000
23+
maxConnections=1000
24+
defaultMaxConnectionsPerRoute=1000
25+
maxConnectionsPerRoute=1000
26+
connectionRequestTimeoutMs=1000
27+
connectionTimeoutMs=5000
28+
socketTimeoutMs=13000
29+
evictThreadSleepTimeMs=3000
30+
maxKeepAliveTimeMs=30000
3131

3232
# Following configure parameters will only work with useHttpClient=true or usePoolingHttpClient=true
3333
# "allow retry" property toggle value "true/false" to turn on /off the auto request retry.
@@ -69,12 +69,8 @@ logMaximumSize=10
6969

7070
# If this property is set to false then the p12 certificate of a merchant will be reloaded
7171
# every time a transaction is made
72-
7372
certificateCacheEnabled=true
7473

75-
#If this property is set to true we will cache the merchantConfig object based on keyAlias/merchantID
76-
merchantConfigCacheEnabled=false
77-
7874
# Optional proxy server settings
7975
#proxyHost=<-- Set the Proxy Host-->
8076
#proxyPort=< -- Set the Proxy port-->

samples/nvp/cybs.properties

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ sendToAkamai=false
1919
#useHttpClient=false
2020

2121
#To enable poolingHttpClientConnection
22-
#useHttpClientWithConnectionPool=false
22+
useHttpClientWithConnectionPool=false
2323
# Following configure parameters will only work with useHttpClientWithConnectionPool=true
2424
# Both useHttpClient and useHttpClientWithConnectionPool cannot be true at same time.
25-
#maxConnections=1000
26-
#defaultMaxConnectionsPerRoute=1000
27-
#maxConnectionsPerRoute=1000
28-
#connectionRequestTimeoutMs=1000
29-
#connectionTimeoutMs=5000
30-
#socketTimeoutMs=13000
31-
#evictThreadSleepTimeMs=3000
32-
#maxKeepAliveTimeMs=30000
25+
maxConnections=1000
26+
defaultMaxConnectionsPerRoute=1000
27+
maxConnectionsPerRoute=1000
28+
connectionRequestTimeoutMs=1000
29+
connectionTimeoutMs=5000
30+
socketTimeoutMs=13000
31+
evictThreadSleepTimeMs=3000
32+
maxKeepAliveTimeMs=30000
3333

3434
# Following retry parameters are required only in case of useHttpClient=true or usePoolingHttpClient=true
3535
# "allow retry" property toggle value "true/false" to turn on /off the auto request retry.
@@ -73,9 +73,6 @@ logMaximumSize=10
7373
# every time a transaction is made
7474
certificateCacheEnabled=true
7575

76-
#If this property is set to true we will cache the merchantConfig object based on keyAlias/merchantID
77-
merchantConfigCacheEnabled=false
78-
7976
# Optional proxy server settings
8077
#proxyHost=<-- Set the Proxy Host-->
8178
#proxyPort=< -- Set the Proxy port-->

samples/xml/cybs.properties

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ sendToAkamai=false
1919
#useHttpClient=false
2020

2121
#To enable poolingHttpClientConnection
22-
#useHttpClientWithConnectionPool=false
22+
useHttpClientWithConnectionPool=false
2323
# Following configure parameters will only work with useHttpClientWithConnectionPool=true
2424
# Both useHttpClient and useHttpClientWithConnectionPool cannot be true at same time.
25-
#maxConnections=1000
26-
#defaultMaxConnectionsPerRoute=1000
27-
#maxConnectionsPerRoute=1000
28-
#connectionRequestTimeoutMs=1000
29-
#connectionTimeoutMs=5000
30-
#socketTimeoutMs=13000
31-
#evictThreadSleepTimeMs=3000
32-
#maxKeepAliveTimeMs=30000
25+
maxConnections=1000
26+
defaultMaxConnectionsPerRoute=1000
27+
maxConnectionsPerRoute=1000
28+
connectionRequestTimeoutMs=1000
29+
connectionTimeoutMs=5000
30+
socketTimeoutMs=13000
31+
evictThreadSleepTimeMs=3000
32+
maxKeepAliveTimeMs=30000
3333

3434
# Following retry parameters are required only in case of useHttpClient=true or usePoolingHttpClient=true
3535
# "allow retry" property toggle value "true/false" to turn on /off the auto request retry.
@@ -73,9 +73,6 @@ logMaximumSize=10
7373
# every time a transaction is made
7474
certificateCacheEnabled=true
7575

76-
#If this property is set to true we will cache the merchantConfig object based on keyAlias/merchantID
77-
merchantConfigCacheEnabled=false
78-
7976
# Optional proxy server settings
8077
#proxyHost=<-- Set the Proxy Host-->
8178
#proxyPort=< -- Set the Proxy port-->

0 commit comments

Comments
 (0)