Skip to content
This repository has been archived by the owner on Jun 19, 2024. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: apilayer/restcountries
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.0.1
Choose a base ref
...
head repository: apilayer/restcountries
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Mar 22, 2017

  1. Added flag of Kosovo

    Fayder Florez committed Mar 22, 2017
    Copy the full SHA
    62a1a66 View commit details
  2. Merge branch 'dev'

    Fayder Florez committed Mar 22, 2017
    Copy the full SHA
    895bf51 View commit details

Commits on Apr 14, 2017

  1. Update README

    Fayder Florez committed Apr 14, 2017
    Copy the full SHA
    29008ed View commit details
  2. Merge branch 'dev'

    Fayder Florez committed Apr 14, 2017
    Copy the full SHA
    b0217c2 View commit details
  3. Update README

    Fayder Florez committed Apr 14, 2017
    Copy the full SHA
    453912d View commit details
  4. Merge branch 'dev'

    Fayder Florez committed Apr 14, 2017
    Copy the full SHA
    bcf1694 View commit details

Commits on Apr 30, 2017

  1. Added data about EU members

    Fayder Florez committed Apr 30, 2017
    Copy the full SHA
    b5c2c19 View commit details
  2. Merge branch 'dev'

    Fayder Florez committed Apr 30, 2017
    Copy the full SHA
    239a82c View commit details
  3. Update README

    Fayder Florez committed Apr 30, 2017
    Copy the full SHA
    ce1bca8 View commit details
  4. Reversing EU changes

    Fayder Florez committed Apr 30, 2017
    Copy the full SHA
    a4b18f3 View commit details
  5. Merge branch 'dev'

    Fayder Florez committed Apr 30, 2017
    Copy the full SHA
    2a2ec32 View commit details
  6. Added 'regionalBlocs' field

    Fayder Florez committed Apr 30, 2017
    Copy the full SHA
    20d990b View commit details

Commits on May 2, 2017

  1. Update JSON

    Fayder Florez committed May 2, 2017
    Copy the full SHA
    4573793 View commit details
  2. Add feature 'search by regional bloc'

    Fayder Florez committed May 2, 2017
    Copy the full SHA
    fafda0a View commit details
  3. Add unit test for 'search by regional bloc'

    Fayder Florez committed May 2, 2017
    Copy the full SHA
    850fc23 View commit details
  4. Merge branch 'dev'

    Fayder Florez committed May 2, 2017
    Copy the full SHA
    e8ce014 View commit details
  5. Update README

    Fayder Florez committed May 2, 2017
    Copy the full SHA
    9034653 View commit details
  6. Merge branch 'dev'

    Fayder Florez committed May 2, 2017
    Copy the full SHA
    e68f8c3 View commit details
  7. Update README

    Fayder Florez committed May 2, 2017
    Copy the full SHA
    b0447b6 View commit details
  8. Merge branch 'dev'

    Fayder Florez committed May 2, 2017
    Copy the full SHA
    3d5dd5f View commit details
  9. Update flatdoc

    Fayder Florez committed May 2, 2017
    Copy the full SHA
    0711197 View commit details
  10. Merge branch 'dev'

    Fayder Florez committed May 2, 2017
    Copy the full SHA
    13b363d View commit details

Commits on May 10, 2017

  1. Copy the full SHA
    48e339a View commit details
  2. Merge branch 'dev'

    fayderflorez committed May 10, 2017
    Copy the full SHA
    cb3b254 View commit details
  3. Update README

    fayderflorez committed May 10, 2017
    Copy the full SHA
    b6fe4c7 View commit details
  4. Merge branch 'dev'

    fayderflorez committed May 10, 2017
    Copy the full SHA
    d5e3caa View commit details

Commits on May 11, 2017

  1. Update README

    fayderflorez committed May 11, 2017
    Copy the full SHA
    63a576a View commit details
  2. Merge branch 'dev'

    fayderflorez committed May 11, 2017
    Copy the full SHA
    4b5afc7 View commit details
  3. Update README

    fayderflorez committed May 11, 2017
    Copy the full SHA
    1c00062 View commit details
  4. Merge branch 'dev'

    fayderflorez committed May 11, 2017
    Copy the full SHA
    f571cef View commit details

Commits on May 14, 2017

  1. Copy the full SHA
    ae54419 View commit details
  2. Merge branch 'dev'

    fayderflorez committed May 14, 2017
    Copy the full SHA
    83a3774 View commit details

Commits on May 15, 2017

  1. Update README

    fayderflorez committed May 15, 2017
    Copy the full SHA
    dd01012 View commit details
  2. Merge branch 'dev'

    fayderflorez committed May 15, 2017
    Copy the full SHA
    4efeee2 View commit details

Commits on May 17, 2017

  1. Refactoring

    fayderflorez committed May 17, 2017
    Copy the full SHA
    6519f5a View commit details
  2. Merge branch 'dev'

    fayderflorez committed May 17, 2017
    Copy the full SHA
    0d30235 View commit details
  3. Copy the full SHA
    2a25b79 View commit details
  4. Merge branch 'dev'

    fayderflorez committed May 17, 2017
    Copy the full SHA
    44ba8b0 View commit details
  5. Update POM groupId

    fayderflorez committed May 17, 2017
    Copy the full SHA
    7e1a428 View commit details
  6. Merge branch 'dev'

    fayderflorez committed May 17, 2017
    Copy the full SHA
    8f692c2 View commit details

Commits on Aug 7, 2017

  1. Update info of Taiwan

    brownsugar authored Aug 7, 2017
    Copy the full SHA
    7cf832c View commit details

Commits on Aug 23, 2017

  1. Merge pull request #60 from brownsugar/master

    Update info of Taiwan
    fayderflorez authored Aug 23, 2017
    Copy the full SHA
    0e8a88e View commit details

Commits on Aug 28, 2017

  1. Copy the full SHA
    72f8a89 View commit details
  2. Copy the full SHA
    a43801a View commit details
  3. Copy the full SHA
    d6cdbd7 View commit details
  4. Copy the full SHA
    00260ca View commit details
  5. Refactors BaseCountry

    fayderflorez committed Aug 28, 2017
    Copy the full SHA
    875fc46 View commit details
  6. Refactoring

    fayderflorez committed Aug 28, 2017
    Copy the full SHA
    ccf3444 View commit details

Commits on Aug 29, 2017

  1. Copy the full SHA
    ed31657 View commit details
  2. Copy the full SHA
    b0ecc98 View commit details
Showing 308 changed files with 639 additions and 1,339 deletions.
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -5,9 +5,7 @@ target/
*.DS_Store
*.sh
*.css
*.pyc
backup/
.idea/
*.iml
google*.html
src/main/java/fayder/restcountries/v2/rest/StripeRest.java
google*.html
88 changes: 77 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -7,11 +7,29 @@ Get information about countries via a RESTful API https://restcountries.eu

Donate!
---------------
**570€ per year** aprox. is the cost to maintain and update REST Countries. Please help me cover these costs so I can keep improving this service.
The restcountries project has been acquired by apilayer, one of the leading providers of API microservices. We will keep supporting restcountries and providing it as a free solution for developers. We will finance this project fully and have turned off the donations feature.

[donate]
Users
---------------
RESTCountries has over 1200 users, including:

[TTÜ]

[Spotify International Pricing Index]

[Gorillaz]

[Wanderlust]

[Xero]

[FxPro]

[SKROSS]

[onefinestay]

### 2017 costs funded: 6.14%
[Much Better Adventures]

Stay up-to-date
---------------
@@ -151,6 +169,32 @@ https://restcountries.eu/rest/v2/region/{region}
https://restcountries.eu/rest/v2/region/europe
```

Regional Bloc
---------------

Search by regional bloc:

- EU (European Union)
- EFTA (European Free Trade Association)
- CARICOM (Caribbean Community)
- PA (Pacific Alliance)
- AU (African Union)
- USAN (Union of South American Nations)
- EEU (Eurasian Economic Union)
- AL (Arab League)
- ASEAN (Association of Southeast Asian Nations)
- CAIS (Central American Integration System)
- CEFTA (Central European Free Trade Agreement)
- NAFTA (North American Free Trade Agreement)
- SAARC (South Asian Association for Regional Cooperation)

``` javascript
https://restcountries.eu/rest/v2/regionalbloc/{regionalbloc}
```
``` html
https://restcountries.eu/rest/v2/regionalbloc/eu
```

Response Example
---------------

@@ -159,7 +203,7 @@ https://restcountries.eu/rest/v2/alpha/col
```

``` json
[{
[[{
"name": "Colombia",
"topLevelDomain": [".co"],
"alpha2Code": "CO",
@@ -168,6 +212,7 @@ https://restcountries.eu/rest/v2/alpha/col
"capital": "Bogotá",
"altSpellings": ["CO", "Republic of Colombia", "República de Colombia"],
"region": "Americas",
"subregion": "South America",
"population": 48759958,
"latlng": [4.0, -72.0],
"demonym": "Colombian",
@@ -197,8 +242,19 @@ https://restcountries.eu/rest/v2/alpha/col
"br": "Colômbia",
"pt": "Colômbia"
},
"flag": "https://restcountries.eu/data/col.svg"
}
"flag": "https://restcountries.eu/data/col.svg",
"regionalBlocs": [{
"acronym": "PA",
"name": "Pacific Alliance",
"otherAcronyms": [],
"otherNames": ["Alianza del Pacífico"]
}, {
"acronym": "USAN",
"name": "Union of South American Nations",
"otherAcronyms": ["UNASUR", "UNASUL", "UZAN"],
"otherNames": ["Unión de Naciones Suramericanas", "União de Nações Sul-Americanas", "Unie van Zuid-Amerikaanse Naties", "South American Union"]
}]
}]
```

Filter Response
@@ -223,32 +279,42 @@ Sources

Similar projects
=======
* [Countries of the word]
* [Countries of the world]
* [REST Countries Node.js]
* [REST Countries Ruby]
* [REST Countries Go]
* [REST Countries Python]
* [world-currencies]
* [REST Countries C#](https://github.com/egbakou/RESTCountries.NET)

License
=======
[Mozilla Public License] MPL
[Mozilla Public License] MPL 2.0

[dist]: https://github.com/fayder/restcountries/
[Twitter]: https://twitter.com/restcountries
[mailing list]: http://eepurl.com/cC-h2v
[donate]: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=V5AJAEMKE6A3E
[Donate]: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=V5AJAEMKE6A3E
[@mledoze]: https://github.com/mledoze/countries
[List of countries]: https://en.wikipedia.org/wiki/ISO_3166-1#Current_codes
[Languages]: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
[Currencies]: https://en.wikipedia.org/wiki/List_of_circulating_currencies
[Area]: https://en.wikipedia.org/wiki/List_of_countries_and_dependencies_by_area
[Population]: https://en.wikipedia.org/wiki/List_of_countries_by_population
[Gini coefficient]: http://en.wikipedia.org/wiki/List_of_countries_by_income_equality
[Mozilla Public License]: http://www.mozilla.org/MPL/
[Mozilla Public License]: https://www.mozilla.org/en-US/MPL/2.0/
[world-currencies]: https://github.com/wiredmax/world-currencies
[REST Countries Node.js]: https://github.com/aredo/restcountries
[REST Countries Ruby]: https://github.com/davidesantangelo/restcountry
[REST Countries Go]: https://github.com/alediaferia/gocountries
[REST Countries Python]: https://github.com/SteinRobert/python-restcountries
[Countries of the world]: http://countries.petethompson.net
[Countries of the world]: http://countries.petethompson.net
[TTÜ]: https://www.ttu.ee/studying/tut_admission/programmes-in-tut/ask-us/
[Spotify International Pricing Index]: http://mts.io/2014/05/07/spotify-pricing-index/
[Gorillaz]: http://www.gorillaz.com/
[Wanderlust]: https://wanderlust.com/
[Xero]: https://www.xero.com/
[FxPro]: http://www.fxpro.com/
[onefinestay]: https://www.onefinestay.com/
[Much Better Adventures]: https://www.muchbetteradventures.com
[SKROSS]: http://www.skross.com/en
77 changes: 22 additions & 55 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>vaeke</groupId>
<groupId>eu.fayder</groupId>
<artifactId>restcountries</artifactId>
<version>2.0.1</version>
<version>2.0.5</version>
<packaging>war</packaging>
<name>restcountries</name>
<description>REST interface to get data about countries</description>
@@ -18,67 +18,73 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<resteasy.version>3.1.4.Final</resteasy.version>
<gson.version>2.8.2</gson.version>
<stripe.version>3.5.0</stripe.version>
<slf4j.version>1.7.25</slf4j.version>
<servlet.version>4.0.0</servlet.version>
<junit.version>4.12</junit.version>
</properties>

<dependencies>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<version>3.0.6.Final</version>
<version>${resteasy.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-servlet-initializer</artifactId>
<version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson-provider</artifactId>
<version>3.0.6.Final</version>
<version>${resteasy.version}</version>
</dependency>

<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.7</version>
<version>${gson.version}</version>
</dependency>

<!-- stripe -->
<dependency>
<groupId>com.stripe</groupId>
<artifactId>stripe-java</artifactId>
<version>3.5.0</version>
<version>${stripe.version}</version>
</dependency>

<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.21</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.21</version>
<version>${slf4j.version}</version>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<version>${servlet.version}</version>
</dependency>

<!-- test -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.restfuse</groupId>
<artifactId>com.eclipsesource.restfuse</artifactId>
<version>1.2.0</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>

@@ -97,45 +103,6 @@
<useTestClasspath>true</useTestClasspath>
</configuration>
</plugin>
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<version>1.5.2</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<includes>
<include>src/main/webapp/**.html</include>
</includes>
<replacements>
<replacement>
<token>PROJECT_VERSION</token>
<value>${project.version}</value>
</replacement>
<replacement>
<token>http://localhost:8080</token>
<value>https://restcountries.eu</value>
</replacement>
</replacements>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
<configuration>
<excludes>
<exclude>**/*RestTest.java</exclude>
<exclude>**/*DataTest.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
23 changes: 0 additions & 23 deletions python/cleaner.py

This file was deleted.

1 change: 0 additions & 1 deletion python/countries-input.json

This file was deleted.

1 change: 0 additions & 1 deletion python/countries-output.json

This file was deleted.

Loading