Skip to content

Commit 0ff1ca1

Browse files
lancergrlancergr
authored
Merge pull request #57 from Adyen/develop
Release 1.2.0
2 parents 0d4a743 + e1014e6 commit 0ff1ca1

21 files changed

+335
-292
lines changed

Diff for: ‎.travis.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
language: java
22

33
jdk:
4-
- oraclejdk7
4+
- oraclejdk8
5+
- openjdk7
6+
7+
install: mvn install -Dgpg.skip=true
58

69
sudo: false
710

Diff for: ‎README.md

+27-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,37 @@
44

55

66
# Adyen Java API Library
7-
The Adyen API Library for Java enables you to work with Adyen APIs and Hosted Payment Page.
7+
8+
The Adyen API Library for Java enables you to work with Adyen APIs and Hosted Payment Pages.
89

910
## Requirements
1011

1112
* Java 7 or higher
1213

14+
## Installation
15+
16+
You can use Maven or simply download the release.
17+
18+
### Maven
19+
20+
Add this dependency to your project's POM:
21+
22+
```
23+
<dependency>
24+
<groupId>com.adyen</groupId>
25+
<artifactId>adyen-java-api-library</artifactId>
26+
<version>1.2.0</version>
27+
</dependency>
28+
```
29+
30+
## Usage
31+
32+
The code examples on using this library are located in the library section of the java-sample-code repository: https://github.com/adyen/adyen-java-sample-code
33+
34+
## Support
35+
36+
If you have any problems, questions or suggestions, create an issue here or send your inquiry to [email protected].
37+
1338
## Licence
1439

15-
MIT license see LICENSE
40+
MIT license. For more information, see the LICENSE file.

Diff for: ‎pom.xml

+57-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.adyen</groupId>
55
<artifactId>adyen-java-api-library</artifactId>
66
<packaging>jar</packaging>
7-
<version>1.1.0</version>
7+
<version>1.2.0</version>
88
<name>Adyen Java API Library</name>
99
<description>Adyen API Client Library for Java</description>
1010
<url>https://github.com/adyen/adyen-java-api-library</url>
@@ -26,6 +26,11 @@
2626
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2727
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2828
</properties>
29+
<scm>
30+
<connection>scm:git:[email protected]:Adyen/adyen-java-api-library.git</connection>
31+
<developerConnection>scm:git:[email protected]:Adyen/adyen-java-api-library.git</developerConnection>
32+
<url>[email protected]:Adyen/adyen-java-api-library.git</url>
33+
</scm>
2934
<build>
3035
<plugins>
3136
<plugin>
@@ -70,6 +75,57 @@
7075
</execution>
7176
</executions>
7277
</plugin>
78+
<plugin>
79+
<groupId>org.apache.maven.plugins</groupId>
80+
<artifactId>maven-source-plugin</artifactId>
81+
<version>2.2.1</version>
82+
<executions>
83+
<execution>
84+
<id>attach-sources</id>
85+
<goals>
86+
<goal>jar-no-fork</goal>
87+
</goals>
88+
</execution>
89+
</executions>
90+
</plugin>
91+
<plugin>
92+
<groupId>org.apache.maven.plugins</groupId>
93+
<artifactId>maven-javadoc-plugin</artifactId>
94+
<version>2.9.1</version>
95+
<executions>
96+
<execution>
97+
<id>attach-javadocs</id>
98+
<goals>
99+
<goal>jar</goal>
100+
</goals>
101+
</execution>
102+
</executions>
103+
</plugin>
104+
<plugin>
105+
<groupId>org.apache.maven.plugins</groupId>
106+
<artifactId>maven-gpg-plugin</artifactId>
107+
<version>1.5</version>
108+
<executions>
109+
<execution>
110+
<id>sign-artifacts</id>
111+
<phase>verify</phase>
112+
<goals>
113+
<goal>sign</goal>
114+
</goals>
115+
</execution>
116+
</executions>
117+
</plugin>
118+
<plugin>
119+
<groupId>org.sonatype.plugins</groupId>
120+
<artifactId>nexus-staging-maven-plugin</artifactId>
121+
<version>1.6.7</version>
122+
<extensions>true</extensions>
123+
<configuration>
124+
<serverId>ossrh</serverId>
125+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
126+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
127+
</configuration>
128+
</plugin>
73129
</plugins>
74130
</build>
75131
<dependencies>

Diff for: ‎src/main/java/com/adyen/Client.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class Client {
3535
public static final String HPP_LIVE = "https://live.adyen.com/hpp";
3636
public static final String API_VERSION = "v25";
3737
public static final String USER_AGENT_SUFFIX = "adyen-java-api-library/";
38-
public static final String LIB_VERSION = "1.1.0";
38+
public static final String LIB_VERSION = "1.2.0";
3939

4040
public Client() {
4141
this.config = new Config();

Diff for: ‎src/main/java/com/adyen/constants/ApiConstants.java

+2
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,15 @@ interface AdditionalData {
4242
String THREE_D_OFFERERED = "threeDOffered";
4343
String THREE_D_AUTHENTICATED = "threeDAuthenticated";
4444
String AVS_RESULT = "avsResult";
45+
String PAYMENT_TOKEN = "payment.token";
4546

4647
String BOLETO_BARCODE_REFERENCE = "boletobancario.barCodeReference";
4748
String BOLETO_DATA = "boletobancario.data";
4849
String BOLETO_DUE_DATE = "boletobancario.dueDate";
4950
String BOLETO_URL = "boletobancario.url";
5051
String BOLETO_EXPIRATION_DATE = "boletobancario.expirationDate";
5152

53+
5254
interface Card {
5355
interface Encrypted {
5456
String JSON = "card.encrypted.json";

Diff for: ‎src/main/java/com/adyen/constants/BrandCodes.java

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
/*
2+
* ######
3+
* ######
4+
* ############ ####( ###### #####. ###### ############ ############
5+
* ############# #####( ###### #####. ###### ############# #############
6+
* ###### #####( ###### #####. ###### ##### ###### ##### ######
7+
* ###### ###### #####( ###### #####. ###### ##### ##### ##### ######
8+
* ###### ###### #####( ###### #####. ###### ##### ##### ######
9+
* ############# ############# ############# ############# ##### ######
10+
* ############ ############ ############# ############ ##### ######
11+
* ######
12+
* #############
13+
* ############
14+
*
15+
* Adyen Java API Library
16+
*
17+
* Copyright (c) 2017 Adyen B.V.
18+
* This file is open source and available under the MIT license.
19+
* See the LICENSE file for more info.
20+
*/
21+
package com.adyen.constants;
22+
23+
public interface BrandCodes {
24+
String PAYPAL = "paypal";
25+
String PAYPAL_ECS = "paypal_ecs";
26+
String KLARNA = "klarna";
27+
String AFTERPAY = "afterpay_default";
28+
String SEPA_DIRECT_DEBIT = "sepadirectdebit";
29+
String IDEAL = "ideal";
30+
String CHINA_UNION_PAY = "cup";
31+
String CARTEBANCAIRE = "cartebancaire";
32+
String VISA = "visa";
33+
String MASTERCARD = "mc";
34+
String UATP = "uatp";
35+
String AMEX = "amex";
36+
String MAESTRO = "maestro";
37+
String MAESTRO_UK = "maestrouk";
38+
String DINERS = "diners";
39+
String DISCOVER = "discover";
40+
String VISA_DANKORT = "visadankort";
41+
String JCB = "jcb";
42+
String LASER = "laser";
43+
String VIAS = "vias";
44+
String SOLO = "solo";
45+
String BCMC = "bcmc";
46+
String BIJCARD = "bijcard";
47+
String DANKORT = "dankort";
48+
String HIPERCARD = "hipercard";
49+
String ELO = "elo";
50+
String VISA_ALPHABANK_BONUS = "visaalphabankbonus";
51+
String MC_ALPHABANK_BONUS = "mcalphabankbonus";
52+
String KARENMILLEN = "karenmillen";
53+
String OASIS = "oasis";
54+
String WAREHOUSE = "warehouse";
55+
}

Diff for: ‎src/main/java/com/adyen/httpclient/ClientInterface.java

-3
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,8 @@
2323
import java.io.IOException;
2424
import java.util.Map;
2525
import com.adyen.Config;
26-
import com.adyen.Service;
2726

2827
public interface ClientInterface {
29-
30-
Map<String, Object> requestJson(Service service, String requestUrl, Map<String, Object> params);
3128

3229
String request(String endpoint, String json, Config config) throws IOException, HTTPClientException;
3330

0 commit comments

Comments
 (0)