Skip to content

Commit 267404f

Browse files
jonathan-kosgeijonathan-kosgei
authored
Merge pull request #14 from ipdata/claude/verify-all-tests-G2MNU
Claude/verify all tests g2 mnu
2 parents 83d5a3f + f967598 commit 267404f

29 files changed

+399
-213
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches: [ master, main ]
6+
pull_request:
7+
branches: [ master, main ]
8+
9+
jobs:
10+
test:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
15+
- name: Set up JDK 11
16+
uses: actions/setup-java@v4
17+
with:
18+
java-version: '11'
19+
distribution: 'temurin'
20+
21+
- name: Cache Maven packages
22+
uses: actions/cache@v4
23+
with:
24+
path: ~/.m2/repository
25+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
26+
restore-keys: |
27+
${{ runner.os }}-maven-
28+
29+
- name: Build and Test
30+
run: mvn clean test post-integration-test

‎.github/workflows/release.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Release
2+
3+
on:
4+
push:
5+
tags: [ 'v*' ]
6+
7+
jobs:
8+
release:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v4
12+
13+
- name: Set up JDK 11
14+
uses: actions/setup-java@v4
15+
with:
16+
java-version: '11'
17+
distribution: 'temurin'
18+
server-id: maven-central-staging
19+
server-username: MAVEN_USERNAME
20+
server-password: MAVEN_PASSWORD
21+
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
22+
gpg-passphrase: MAVEN_GPG_PASSPHRASE
23+
24+
- name: Cache Maven packages
25+
uses: actions/cache@v4
26+
with:
27+
path: ~/.m2/repository
28+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
29+
restore-keys: |
30+
${{ runner.os }}-maven-
31+
32+
- name: Deploy to Maven Central
33+
env:
34+
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
35+
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
36+
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
37+
run: mvn deploy -DskipTests=true

‎.travis.yml‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎.travis/ipdata-java.crypted.gpg.key‎

Lines changed: 0 additions & 104 deletions
This file was deleted.

‎README.md‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
# ipdata-java-client
2-
![Build Status](https://www.travis-ci.org/yassine/ipdata-java-client.svg?branch=master)
3-
[![Coverage Status](https://sonarcloud.io/api/project_badges/measure?metric=coverage&project=yassine_ipdata-java-client)](https://sonarcloud.io/dashboard/index/yassine_ipdata-java-client)
4-
[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?metric=alert_status&project=yassine_ipdata-java-client)](https://sonarcloud.io/dashboard/index/yassine_ipdata-java-client)
5-
[![Maintainability](https://sonarcloud.io/api/project_badges/measure?metric=sqale_rating&project=yassine_ipdata-java-client)](https://sonarcloud.io/dashboard/index/yassine_ipdata-java-client)
6-
[![Reliability](https://sonarcloud.io/api/project_badges/measure?metric=reliability_rating&project=yassine_ipdata-java-client)](https://sonarcloud.io/dashboard/index/yassine_ipdata-java-client)
2+
![Build Status](https://github.com/ipdata/java/actions/workflows/ci.yml/badge.svg)
73

84

95
An 100% compliant [ipdata.co](https://ipdata.co) API java client.

‎pom.xml‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,7 @@
3939
<maven.compiler.source>11</maven.compiler.source>
4040
<maven.compiler.target>11</maven.compiler.target>
4141
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
42-
<sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/code-coverage/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
43-
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
44-
<sonar.links.homepage>https://github.com/ipdata/java</sonar.links.homepage>
45-
<sonar.links.issue>https://github.com/ipdata/java</sonar.links.issue>
46-
<sonar.links.scm>https://github.com/ipdata/java</sonar.links.scm>
47-
<sonar.organization>yassine-github</sonar.organization>
48-
<sonar.projectKey>yassine_ipdata-java-client</sonar.projectKey>
49-
<sonar.projectName>ipdata-java-client</sonar.projectName>
50-
<sonar.projectVersion>${project.version}</sonar.projectVersion>
5142
<version.build.jacoco>0.8.14</version.build.jacoco>
52-
<version.build.sonar>3.11.0.3922</version.build.sonar>
5343
<version.build.surefire>3.5.5</version.build.surefire>
5444
<version.client.feign>11.10</version.client.feign>
5545
</properties>
@@ -68,6 +58,7 @@
6858
<groupId>io.github.openfeign</groupId>
6959
<artifactId>feign-httpclient</artifactId>
7060
<version>${version.client.feign}</version>
61+
<scope>test</scope>
7162
</dependency>
7263
<dependency>
7364
<groupId>com.google.guava</groupId>
@@ -81,13 +72,15 @@
8172
</dependency>
8273
<dependency>
8374
<groupId>org.slf4j</groupId>
84-
<artifactId>slf4j-log4j12</artifactId>
75+
<artifactId>slf4j-simple</artifactId>
8576
<version>1.7.36</version>
77+
<scope>test</scope>
8678
</dependency>
8779
<dependency>
8880
<groupId>org.projectlombok</groupId>
8981
<artifactId>lombok</artifactId>
9082
<version>1.18.38</version>
83+
<scope>provided</scope>
9184
</dependency>
9285
<dependency>
9386
<groupId>org.hamcrest</groupId>
@@ -168,12 +161,7 @@
168161
<argLine>${surefireArgLine}</argLine>
169162
</configuration>
170163
</plugin>
171-
<plugin>
172-
<groupId>org.codehaus.mojo</groupId>
173-
<artifactId>sonar-maven-plugin</artifactId>
174-
<version>${version.build.sonar}</version>
175-
</plugin>
176-
<plugin>
164+
<plugin>
177165
<artifactId>maven-source-plugin</artifactId>
178166
<version>3.3.1</version>
179167
<executions>

‎src/main/java/io/ipdata/client/model/Blocklist.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package io.ipdata.client.model;
2+
3+
import lombok.Getter;
4+
import lombok.ToString;
5+
6+
@Getter @ToString
7+
public class Blocklist {
8+
private String name;
9+
private String site;
10+
private String type;
11+
}

‎src/main/java/io/ipdata/client/model/IpdataModel.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
package io.ipdata.client.model;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4-
import lombok.AccessLevel;
54
import lombok.Getter;
6-
import lombok.Setter;
75
import lombok.ToString;
86
import lombok.experimental.Accessors;
97

108
import java.util.List;
119

12-
@Setter(AccessLevel.PACKAGE)
1310
@ToString
1411
@Getter
1512
@Accessors(fluent = true)

‎src/main/java/io/ipdata/client/model/Scores.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package io.ipdata.client.model;
2+
3+
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import lombok.Getter;
5+
import lombok.ToString;
6+
7+
@Getter @ToString
8+
public class Scores {
9+
@JsonProperty("vpn_score")
10+
private int vpnScore;
11+
@JsonProperty("proxy_score")
12+
private int proxyScore;
13+
@JsonProperty("threat_score")
14+
private int threatScore;
15+
@JsonProperty("trust_score")
16+
private int trustScore;
17+
}

‎src/main/java/io/ipdata/client/model/ThreatModel.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
package io.ipdata.client.model;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import java.util.List;
45
import lombok.Getter;
56
import lombok.ToString;
67

78
@Getter @ToString
89
public class ThreatModel {
910
@JsonProperty("is_tor")
1011
private boolean tor;
12+
@JsonProperty("is_vpn")
13+
private boolean vpn;
1114
@JsonProperty("is_proxy")
1215
private boolean proxy;
1316
@JsonProperty("is_anonymous")
@@ -24,4 +27,6 @@ public class ThreatModel {
2427
private boolean icloudRelay;
2528
@JsonProperty("is_datacenter")
2629
private boolean datacenter;
30+
private List<Blocklist> blocklists;
31+
private Scores scores;
2732
}

0 commit comments

Comments
 (0)