Compare commits
9 commits
Author | SHA1 | Date | |
---|---|---|---|
Mark Nellemann | 91e04b06f7 | ||
Mark Nellemann | f45b299444 | ||
Mark Nellemann | a0f8deb157 | ||
Mark Nellemann | d86d3fdd61 | ||
Mark Nellemann | 75f158a164 | ||
Mark Nellemann | b6fdd7a5f6 | ||
Mark Nellemann | f12de26a20 | ||
Mark Nellemann | 063f0d9e60 | ||
Mark Nellemann | 054322385b |
20
.drone.yml
Normal file
20
.drone.yml
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
---
|
||||||
|
kind: pipeline
|
||||||
|
name: default
|
||||||
|
type: docker
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: test
|
||||||
|
image: eclipse-temurin:8-jdk
|
||||||
|
commands:
|
||||||
|
- ./gradlew test
|
||||||
|
- name: build
|
||||||
|
image: eclipse-temurin:8-jdk
|
||||||
|
environment:
|
||||||
|
AUTH_TOKEN: # Gitea access token ENV variable
|
||||||
|
from_secret: auth # Name of DroneCI secret exposed above
|
||||||
|
commands:
|
||||||
|
- ./gradlew build publishAllPublicationsToGiteaRepository
|
||||||
|
when:
|
||||||
|
event:
|
||||||
|
- tag
|
36
README.md
36
README.md
|
@ -4,14 +4,44 @@
|
||||||
|
|
||||||
A Java library to query <https://www.cvrapi.dk> (a Danish VAT API service).
|
A Java library to query <https://www.cvrapi.dk> (a Danish VAT API service).
|
||||||
|
|
||||||
|
[![Build Status](https://drone.data.coop/api/badges/nellemann/libcvrapi/status.svg)](https://drone.data.coop/nellemann/libcvrapi)
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
CvrApi api = new CvrApi("My user agent", "mySecretToken");
|
### Paid API
|
||||||
Company company = api.getCompanyByVatNumber("57020415");
|
|
||||||
System.out.println(company.life.name);
|
Lookup company by CVR number:
|
||||||
|
|
||||||
|
```java
|
||||||
|
CvrApi api = new CvrApi("My user agent", "mySecretToken");
|
||||||
|
Company company = api.getCompanyByVatNumber("57020415");
|
||||||
|
System.out.println(company.life.name);
|
||||||
|
```
|
||||||
|
|
||||||
The *Company* represents most of the same properties as seen in the example JSON in the [api documentation](http://docs.rest.cvrapi.dk/).
|
The *Company* represents most of the same properties as seen in the example JSON in the [api documentation](http://docs.rest.cvrapi.dk/).
|
||||||
|
|
||||||
|
|
||||||
|
### Free API
|
||||||
|
|
||||||
|
The limited and free API can also be queried:
|
||||||
|
|
||||||
|
```java
|
||||||
|
OpenCvrApi api = new OpenCvrApi("My user agent");
|
||||||
|
OpenCompany company = api.getCompanyByVatNumber("57020415");
|
||||||
|
System.out.println(company.name);
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
|
### Gradle
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
maven { url 'https://git.data.coop/api/packages/nellemann/maven' }
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
compile 'biz.nellemann.libs:libcvrapi:1.+'
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
## Development
|
## Development
|
||||||
|
|
||||||
To build and test the code:
|
To build and test the code:
|
||||||
|
|
36
build.gradle
36
build.gradle
|
@ -3,9 +3,6 @@ apply plugin: "groovy"
|
||||||
apply plugin: 'jacoco'
|
apply plugin: 'jacoco'
|
||||||
apply plugin: 'maven-publish'
|
apply plugin: 'maven-publish'
|
||||||
|
|
||||||
sourceCompatibility = 1.8
|
|
||||||
targetCompatibility = 1.8
|
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
|
@ -13,16 +10,16 @@ repositories {
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
||||||
implementation("org.slf4j:slf4j-api:${slf4jVersion}")
|
implementation("org.slf4j:slf4j-api:${slf4jVersion}")
|
||||||
api('com.google.code.gson:gson:2.8.9')
|
implementation("com.google.code.gson:gson:2.10")
|
||||||
api('com.squareup.okhttp3:okhttp:4.9.3')
|
implementation("com.squareup.okhttp3:okhttp:4.10.0")
|
||||||
|
|
||||||
testImplementation("org.slf4j:slf4j-simple:${slf4jVersion}")
|
testImplementation("org.slf4j:slf4j-simple:${slf4jVersion}")
|
||||||
testImplementation('com.squareup.okhttp3:mockwebserver:4.9.3')
|
testImplementation("com.squareup.okhttp3:mockwebserver:4.10.0")
|
||||||
testImplementation("org.codehaus.groovy:groovy-all:${groovyVersion}")
|
testImplementation("org.codehaus.groovy:groovy-all:${groovyVersion}")
|
||||||
testImplementation("org.spockframework:spock-core:${spockVersion}") {
|
testImplementation("org.spockframework:spock-core:${spockVersion}") {
|
||||||
exclude group: "org.codehaus.groovy"
|
exclude group: "org.codehaus.groovy"
|
||||||
}
|
}
|
||||||
testImplementation('com.athaydes:spock-reports:2.1.1-groovy-3.0') {
|
testImplementation("com.athaydes:spock-reports:2.3.2-groovy-3.0") {
|
||||||
transitive = false // this avoids affecting your version of Groovy/Spock
|
transitive = false // this avoids affecting your version of Groovy/Spock
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -30,22 +27,37 @@ dependencies {
|
||||||
|
|
||||||
publishing {
|
publishing {
|
||||||
publications {
|
publications {
|
||||||
mavenJava(MavenPublication) {
|
maven(MavenPublication) {
|
||||||
|
groupId = 'biz.nellemann.libs'
|
||||||
|
artifactId = 'libcvrapi'
|
||||||
|
|
||||||
from components.java
|
from components.java
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
repositories {
|
repositories {
|
||||||
mavenLocal()
|
maven {
|
||||||
}
|
name = "gitea"
|
||||||
|
url = uri("https://git.data.coop/api/packages/$System.env.DRONE_REPO_OWNER/maven")
|
||||||
|
credentials {
|
||||||
|
username = "$System.env.DRONE_REPO_OWNER"
|
||||||
|
password = "$System.env.AUTH_TOKEN"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
mavenLocal()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
java {
|
||||||
|
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||||
|
targetCompatibility = JavaVersion.VERSION_1_8
|
||||||
|
}
|
||||||
|
|
||||||
test {
|
test {
|
||||||
useJUnitPlatform()
|
useJUnitPlatform()
|
||||||
}
|
}
|
||||||
|
|
||||||
jacoco {
|
jacoco {
|
||||||
toolVersion = "0.8.7"
|
toolVersion = "0.8.8"
|
||||||
}
|
}
|
||||||
|
|
||||||
jacocoTestReport {
|
jacocoTestReport {
|
||||||
|
@ -70,7 +82,7 @@ jacocoTestCoverageVerification {
|
||||||
limit {
|
limit {
|
||||||
counter = 'LINE'
|
counter = 'LINE'
|
||||||
value = 'COVEREDRATIO'
|
value = 'COVEREDRATIO'
|
||||||
minimum = 0.7
|
minimum = 0.3
|
||||||
}
|
}
|
||||||
excludes = [
|
excludes = [
|
||||||
'biz.nellemann.libcvrapi.pojo.*'
|
'biz.nellemann.libcvrapi.pojo.*'
|
||||||
|
|
|
@ -1,9 +1,4 @@
|
||||||
id = libcvrapi
|
version = 1.0.14
|
||||||
group = biz.nellemann.libs
|
groovyVersion = 3.0.14
|
||||||
version = 1.0.10
|
slf4jVersion = 2.0.6
|
||||||
licenses = ['APACHE-2.0'] // or something else
|
spockVersion = 2.3-groovy-3.0
|
||||||
groovyVersion = 3.0.12
|
|
||||||
slf4jVersion = 1.7.36
|
|
||||||
spockVersion = 2.0-groovy-3.0
|
|
||||||
siteUrl = https://bitbucket.org/mnellemann/libcvrapi
|
|
||||||
gitUrl = https://bitbucket.org/mnellemann/libcvrapi.git
|
|
||||||
|
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,5 +1,5 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
270
gradlew
vendored
270
gradlew
vendored
|
@ -1,7 +1,7 @@
|
||||||
#!/usr/bin/env sh
|
#!/bin/sh
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copyright 2015 the original author or authors.
|
# Copyright © 2015-2021 the original authors.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
|
@ -17,78 +17,113 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
##
|
#
|
||||||
## Gradle start up script for UN*X
|
# Gradle start up script for POSIX generated by Gradle.
|
||||||
##
|
#
|
||||||
|
# Important for running:
|
||||||
|
#
|
||||||
|
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||||
|
# noncompliant, but you have some other compliant shell such as ksh or
|
||||||
|
# bash, then to run this script, type that shell name before the whole
|
||||||
|
# command line, like:
|
||||||
|
#
|
||||||
|
# ksh Gradle
|
||||||
|
#
|
||||||
|
# Busybox and similar reduced shells will NOT work, because this script
|
||||||
|
# requires all of these POSIX shell features:
|
||||||
|
# * functions;
|
||||||
|
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||||
|
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||||
|
# * compound commands having a testable exit status, especially «case»;
|
||||||
|
# * various built-in commands including «command», «set», and «ulimit».
|
||||||
|
#
|
||||||
|
# Important for patching:
|
||||||
|
#
|
||||||
|
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||||
|
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||||
|
#
|
||||||
|
# The "traditional" practice of packing multiple parameters into a
|
||||||
|
# space-separated string is a well documented source of bugs and security
|
||||||
|
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||||
|
# options in "$@", and eventually passing that to Java.
|
||||||
|
#
|
||||||
|
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||||
|
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||||
|
# see the in-line comments for details.
|
||||||
|
#
|
||||||
|
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||||
|
# Darwin, MinGW, and NonStop.
|
||||||
|
#
|
||||||
|
# (3) This script is generated from the Groovy template
|
||||||
|
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
|
# within the Gradle project.
|
||||||
|
#
|
||||||
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
# Attempt to set APP_HOME
|
# Attempt to set APP_HOME
|
||||||
|
|
||||||
# Resolve links: $0 may be a link
|
# Resolve links: $0 may be a link
|
||||||
PRG="$0"
|
app_path=$0
|
||||||
# Need this for relative symlinks.
|
|
||||||
while [ -h "$PRG" ] ; do
|
# Need this for daisy-chained symlinks.
|
||||||
ls=`ls -ld "$PRG"`
|
while
|
||||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||||
if expr "$link" : '/.*' > /dev/null; then
|
[ -h "$app_path" ]
|
||||||
PRG="$link"
|
do
|
||||||
else
|
ls=$( ls -ld "$app_path" )
|
||||||
PRG=`dirname "$PRG"`"/$link"
|
link=${ls#*' -> '}
|
||||||
fi
|
case $link in #(
|
||||||
|
/*) app_path=$link ;; #(
|
||||||
|
*) app_path=$APP_HOME$link ;;
|
||||||
|
esac
|
||||||
done
|
done
|
||||||
SAVED="`pwd`"
|
|
||||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||||
APP_HOME="`pwd -P`"
|
|
||||||
cd "$SAVED" >/dev/null
|
|
||||||
|
|
||||||
APP_NAME="Gradle"
|
APP_NAME="Gradle"
|
||||||
APP_BASE_NAME=`basename "$0"`
|
APP_BASE_NAME=${0##*/}
|
||||||
|
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD="maximum"
|
MAX_FD=maximum
|
||||||
|
|
||||||
warn () {
|
warn () {
|
||||||
echo "$*"
|
echo "$*"
|
||||||
}
|
} >&2
|
||||||
|
|
||||||
die () {
|
die () {
|
||||||
echo
|
echo
|
||||||
echo "$*"
|
echo "$*"
|
||||||
echo
|
echo
|
||||||
exit 1
|
exit 1
|
||||||
}
|
} >&2
|
||||||
|
|
||||||
# OS specific support (must be 'true' or 'false').
|
# OS specific support (must be 'true' or 'false').
|
||||||
cygwin=false
|
cygwin=false
|
||||||
msys=false
|
msys=false
|
||||||
darwin=false
|
darwin=false
|
||||||
nonstop=false
|
nonstop=false
|
||||||
case "`uname`" in
|
case "$( uname )" in #(
|
||||||
CYGWIN* )
|
CYGWIN* ) cygwin=true ;; #(
|
||||||
cygwin=true
|
Darwin* ) darwin=true ;; #(
|
||||||
;;
|
MSYS* | MINGW* ) msys=true ;; #(
|
||||||
Darwin* )
|
NONSTOP* ) nonstop=true ;;
|
||||||
darwin=true
|
|
||||||
;;
|
|
||||||
MINGW* )
|
|
||||||
msys=true
|
|
||||||
;;
|
|
||||||
NONSTOP* )
|
|
||||||
nonstop=true
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
# Determine the Java command to use to start the JVM.
|
||||||
if [ -n "$JAVA_HOME" ] ; then
|
if [ -n "$JAVA_HOME" ] ; then
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
# IBM's JDK on AIX uses strange locations for the executables
|
||||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||||
else
|
else
|
||||||
JAVACMD="$JAVA_HOME/bin/java"
|
JAVACMD=$JAVA_HOME/bin/java
|
||||||
fi
|
fi
|
||||||
if [ ! -x "$JAVACMD" ] ; then
|
if [ ! -x "$JAVACMD" ] ; then
|
||||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||||
|
@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
|
||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
JAVACMD="java"
|
JAVACMD=java
|
||||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
|
@ -105,84 +140,95 @@ location of your Java installation."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||||
MAX_FD_LIMIT=`ulimit -H -n`
|
case $MAX_FD in #(
|
||||||
if [ $? -eq 0 ] ; then
|
max*)
|
||||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
MAX_FD="$MAX_FD_LIMIT"
|
warn "Could not query maximum file descriptor limit"
|
||||||
fi
|
esac
|
||||||
ulimit -n $MAX_FD
|
case $MAX_FD in #(
|
||||||
if [ $? -ne 0 ] ; then
|
'' | soft) :;; #(
|
||||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
*)
|
||||||
fi
|
ulimit -n "$MAX_FD" ||
|
||||||
else
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# For Darwin, add options to specify how the application appears in the dock
|
|
||||||
if $darwin; then
|
|
||||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
|
||||||
fi
|
|
||||||
|
|
||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
|
||||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
|
||||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
|
||||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
|
||||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
|
||||||
|
|
||||||
# We build the pattern for arguments to be converted via cygpath
|
|
||||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
|
||||||
SEP=""
|
|
||||||
for dir in $ROOTDIRSRAW ; do
|
|
||||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
|
||||||
SEP="|"
|
|
||||||
done
|
|
||||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
|
||||||
# Add a user-defined pattern to the cygpath arguments
|
|
||||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
|
||||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
|
||||||
fi
|
|
||||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
|
||||||
i=0
|
|
||||||
for arg in "$@" ; do
|
|
||||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
|
||||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
|
||||||
|
|
||||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
|
||||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
|
||||||
else
|
|
||||||
eval `echo args$i`="\"$arg\""
|
|
||||||
fi
|
|
||||||
i=$((i+1))
|
|
||||||
done
|
|
||||||
case $i in
|
|
||||||
(0) set -- ;;
|
|
||||||
(1) set -- "$args0" ;;
|
|
||||||
(2) set -- "$args0" "$args1" ;;
|
|
||||||
(3) set -- "$args0" "$args1" "$args2" ;;
|
|
||||||
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
|
||||||
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
|
||||||
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
|
||||||
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
|
||||||
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
|
||||||
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Escape application args
|
# Collect all arguments for the java command, stacking in reverse order:
|
||||||
save () {
|
# * args from the command line
|
||||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
# * the main class name
|
||||||
echo " "
|
# * -classpath
|
||||||
}
|
# * -D...appname settings
|
||||||
APP_ARGS=$(save "$@")
|
# * --module-path (only if needed)
|
||||||
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||||
|
|
||||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
if "$cygwin" || "$msys" ; then
|
||||||
|
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||||
|
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||||
|
|
||||||
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
|
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||||
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
|
|
||||||
cd "$(dirname "$0")"
|
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||||
|
for arg do
|
||||||
|
if
|
||||||
|
case $arg in #(
|
||||||
|
-*) false ;; # don't mess with options #(
|
||||||
|
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||||
|
[ -e "$t" ] ;; #(
|
||||||
|
*) false ;;
|
||||||
|
esac
|
||||||
|
then
|
||||||
|
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||||
|
fi
|
||||||
|
# Roll the args list around exactly as many times as the number of
|
||||||
|
# args, so each arg winds up back in the position where it started, but
|
||||||
|
# possibly modified.
|
||||||
|
#
|
||||||
|
# NB: a `for` loop captures its iteration list before it begins, so
|
||||||
|
# changing the positional parameters here affects neither the number of
|
||||||
|
# iterations, nor the values presented in `arg`.
|
||||||
|
shift # remove old arg
|
||||||
|
set -- "$@" "$arg" # push replacement arg
|
||||||
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Collect all arguments for the java command;
|
||||||
|
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||||
|
# shell script including quotes and variable substitutions, so put them in
|
||||||
|
# double quotes to make sure that they get re-expanded; and
|
||||||
|
# * put everything else in single quotes, so that it's not re-expanded.
|
||||||
|
|
||||||
|
set -- \
|
||||||
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
|
-classpath "$CLASSPATH" \
|
||||||
|
org.gradle.wrapper.GradleWrapperMain \
|
||||||
|
"$@"
|
||||||
|
|
||||||
|
# Use "xargs" to parse quoted args.
|
||||||
|
#
|
||||||
|
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||||
|
#
|
||||||
|
# In Bash we could simply go:
|
||||||
|
#
|
||||||
|
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||||
|
# set -- "${ARGS[@]}" "$@"
|
||||||
|
#
|
||||||
|
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||||
|
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||||
|
# character that might be a shell metacharacter, then use eval to reverse
|
||||||
|
# that process (while maintaining the separation between arguments), and wrap
|
||||||
|
# the whole thing up as a single "set" statement.
|
||||||
|
#
|
||||||
|
# This will of course break if any of these variables contains a newline or
|
||||||
|
# an unmatched quote.
|
||||||
|
#
|
||||||
|
|
||||||
|
eval "set -- $(
|
||||||
|
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||||
|
xargs -n1 |
|
||||||
|
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||||
|
tr '\n' ' '
|
||||||
|
)" '"$@"'
|
||||||
|
|
||||||
exec "$JAVACMD" "$@"
|
exec "$JAVACMD" "$@"
|
||||||
|
|
25
gradlew.bat
vendored
25
gradlew.bat
vendored
|
@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
|
||||||
set APP_BASE_NAME=%~n0
|
set APP_BASE_NAME=%~n0
|
||||||
set APP_HOME=%DIRNAME%
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
|
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||||
|
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||||
|
|
||||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||||
|
|
||||||
|
@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
|
||||||
|
|
||||||
set JAVA_EXE=java.exe
|
set JAVA_EXE=java.exe
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if "%ERRORLEVEL%" == "0" goto init
|
if "%ERRORLEVEL%" == "0" goto execute
|
||||||
|
|
||||||
echo.
|
echo.
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
@ -51,7 +54,7 @@ goto fail
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto init
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
echo.
|
echo.
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||||
|
@ -61,28 +64,14 @@ echo location of your Java installation.
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
:init
|
|
||||||
@rem Get command-line arguments, handling Windows variants
|
|
||||||
|
|
||||||
if not "%OS%" == "Windows_NT" goto win9xME_args
|
|
||||||
|
|
||||||
:win9xME_args
|
|
||||||
@rem Slurp the command line arguments.
|
|
||||||
set CMD_LINE_ARGS=
|
|
||||||
set _SKIP=2
|
|
||||||
|
|
||||||
:win9xME_args_slurp
|
|
||||||
if "x%~1" == "x" goto execute
|
|
||||||
|
|
||||||
set CMD_LINE_ARGS=%*
|
|
||||||
|
|
||||||
:execute
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
@rem Execute Gradle
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||||
|
|
||||||
:end
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
|
|
@ -70,18 +70,19 @@ public class CvrApi {
|
||||||
.addHeader("Accept", "application/json;")
|
.addHeader("Accept", "application/json;")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
Response response = client.newCall(request).execute();
|
try (Response response = client.newCall(request).execute()) {
|
||||||
switch (response.code()) {
|
switch (response.code()) {
|
||||||
case 200:
|
case 200:
|
||||||
return Objects.requireNonNull(response.body()).string();
|
return Objects.requireNonNull(response.body()).string();
|
||||||
case 401:
|
case 401:
|
||||||
log.warn("get() - 401 - Access Denied");
|
log.warn("get() - 401 - Access Denied");
|
||||||
throw new Exception("Access Denied");
|
throw new Exception("Access Denied");
|
||||||
case 404:
|
case 404:
|
||||||
log.warn("get() - 404 - Not Found");
|
log.warn("get() - 404 - Not Found");
|
||||||
throw new Exception("Not Found");
|
throw new Exception("Not Found");
|
||||||
default:
|
default:
|
||||||
throw new Exception("get() - Unknown Error - status code: " + response.code());
|
throw new Exception("get() - Unknown Error - status code: " + response.code());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
116
src/main/java/biz/nellemann/libcvrapi/OpenCvrApi.java
Normal file
116
src/main/java/biz/nellemann/libcvrapi/OpenCvrApi.java
Normal file
|
@ -0,0 +1,116 @@
|
||||||
|
package biz.nellemann.libcvrapi;
|
||||||
|
|
||||||
|
import biz.nellemann.libcvrapi.pojo.Company;
|
||||||
|
import biz.nellemann.libcvrapi.pojo.OpenCompany;
|
||||||
|
import com.google.gson.Gson;
|
||||||
|
import com.google.gson.JsonSyntaxException;
|
||||||
|
import okhttp3.Credentials;
|
||||||
|
import okhttp3.OkHttpClient;
|
||||||
|
import okhttp3.Request;
|
||||||
|
import okhttp3.Response;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
// http://cvrapi.dk/api?search=' . $vat . '&country=' . $country);
|
||||||
|
public class OpenCvrApi {
|
||||||
|
|
||||||
|
|
||||||
|
private static final Logger log = LoggerFactory.getLogger(OpenCvrApi.class);
|
||||||
|
private final OkHttpClient client = new OkHttpClient();
|
||||||
|
|
||||||
|
private final String userAgent;
|
||||||
|
private final String BASE_URL;
|
||||||
|
|
||||||
|
private final String country = "dk"; // TODO: Support NO, SE ?
|
||||||
|
|
||||||
|
public OpenCvrApi(String userAgent) {
|
||||||
|
this(userAgent, "http://cvrapi.dk/api");
|
||||||
|
}
|
||||||
|
|
||||||
|
public OpenCvrApi(String userAgent, String baseUrl) {
|
||||||
|
this.userAgent = userAgent;
|
||||||
|
if(baseUrl == null) {
|
||||||
|
this.BASE_URL = "http://cvrapi.dk/api";
|
||||||
|
} else {
|
||||||
|
this.BASE_URL = baseUrl;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
protected String get(String url) throws Exception {
|
||||||
|
|
||||||
|
Request request = new Request.Builder()
|
||||||
|
.url(url)
|
||||||
|
.addHeader("User-Agent", userAgent)
|
||||||
|
.addHeader("Accept", "application/json;")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
try (Response response = client.newCall(request).execute()) {
|
||||||
|
switch (response.code()) {
|
||||||
|
case 200:
|
||||||
|
return Objects.requireNonNull(response.body()).string();
|
||||||
|
case 401:
|
||||||
|
log.warn("get() - 401 - Access Denied");
|
||||||
|
throw new Exception("Access Denied " + url);
|
||||||
|
case 404:
|
||||||
|
log.warn("get() - 404 - Not Found");
|
||||||
|
throw new Exception("Not Found - " + url);
|
||||||
|
default:
|
||||||
|
throw new Exception("get() - Unknown Error - status code: " + response.code());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Query the API: http://cvrapi.dk/api?search=' . $vat . '&country=' . $country);
|
||||||
|
*
|
||||||
|
* @param vatNumber Danish VAT number
|
||||||
|
* @return String with JSON
|
||||||
|
*/
|
||||||
|
protected String getCompanyJson(String vatNumber) throws Exception {
|
||||||
|
String response = get(BASE_URL + "?search=" + vatNumber + "&country=" + country);
|
||||||
|
log.info("getCompanyJson() response: {}", response);
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Use GSON to deserialize JSON into POJO's.
|
||||||
|
*
|
||||||
|
* @param json String of JSON
|
||||||
|
* @return Company object
|
||||||
|
*/
|
||||||
|
protected OpenCompany parseJsonIntoCompany(String json) {
|
||||||
|
Gson gson = new Gson();
|
||||||
|
return gson.fromJson(json, OpenCompany.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Lookup company by VAT number
|
||||||
|
*
|
||||||
|
* @param vatNumber Danish VAT number as String
|
||||||
|
* @return Company object
|
||||||
|
*/
|
||||||
|
public OpenCompany getCompanyByVatNumber(String vatNumber) {
|
||||||
|
|
||||||
|
try {
|
||||||
|
String json = getCompanyJson(vatNumber);
|
||||||
|
return parseJsonIntoCompany(json);
|
||||||
|
} catch (JsonSyntaxException e) {
|
||||||
|
log.error("Error parsing JSON", e);
|
||||||
|
return null;
|
||||||
|
} catch (IOException e) {
|
||||||
|
log.error("IO Error", e);
|
||||||
|
return null;
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("Unknown Error", e);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
31
src/main/java/biz/nellemann/libcvrapi/pojo/OpenCompany.java
Normal file
31
src/main/java/biz/nellemann/libcvrapi/pojo/OpenCompany.java
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
package biz.nellemann.libcvrapi.pojo;
|
||||||
|
|
||||||
|
import com.google.gson.annotations.SerializedName;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
|
public class OpenCompany {
|
||||||
|
public BigDecimal vat;
|
||||||
|
public String name;
|
||||||
|
public String address;
|
||||||
|
public String zipcode;
|
||||||
|
public String city;
|
||||||
|
|
||||||
|
@SerializedName("protected")
|
||||||
|
public Boolean isProtected;
|
||||||
|
|
||||||
|
public String phone;
|
||||||
|
public String email;
|
||||||
|
|
||||||
|
public String fax;
|
||||||
|
public String startdate;
|
||||||
|
public String enddate;
|
||||||
|
|
||||||
|
public Integer industricode;
|
||||||
|
public String industrydesc;
|
||||||
|
|
||||||
|
public Integer companycode;
|
||||||
|
public String companydesc;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,80 @@
|
||||||
|
package biz.nellemann.libcvrapi
|
||||||
|
|
||||||
|
import okhttp3.HttpUrl
|
||||||
|
import okhttp3.mockwebserver.MockResponse
|
||||||
|
import okhttp3.mockwebserver.MockWebServer
|
||||||
|
import com.google.gson.JsonSyntaxException;
|
||||||
|
import spock.lang.Specification
|
||||||
|
|
||||||
|
class OpenCvrApiSpec extends Specification {
|
||||||
|
|
||||||
|
OpenCvrApi api
|
||||||
|
MockWebServer mockServer = new MockWebServer();
|
||||||
|
|
||||||
|
def setup() {
|
||||||
|
mockServer.start()
|
||||||
|
}
|
||||||
|
|
||||||
|
def cleanup() {
|
||||||
|
mockServer.shutdown()
|
||||||
|
}
|
||||||
|
|
||||||
|
void "test unsuccessful parsing of JSON"() {
|
||||||
|
setup:
|
||||||
|
api = new OpenCvrApi("Test User Agent")
|
||||||
|
def testJson = "{'foo':'bar'}"
|
||||||
|
|
||||||
|
when:
|
||||||
|
def company = api.parseJsonIntoCompany(testJson)
|
||||||
|
|
||||||
|
then:
|
||||||
|
company.vat == null
|
||||||
|
}
|
||||||
|
|
||||||
|
void "test unsuccessful parsing of JSON w. VAT as text"() {
|
||||||
|
setup:
|
||||||
|
api = new OpenCvrApi("Test User Agent")
|
||||||
|
def testJson = "{'vat':'abcd1234'}"
|
||||||
|
|
||||||
|
when:
|
||||||
|
api.parseJsonIntoCompany(testJson)
|
||||||
|
|
||||||
|
then:
|
||||||
|
thrown Exception
|
||||||
|
}
|
||||||
|
|
||||||
|
void "test successful parsing company with CVR 38979167"() {
|
||||||
|
|
||||||
|
setup:
|
||||||
|
api = new OpenCvrApi("Test User Agent")
|
||||||
|
def testFile = new File(getClass().getResource('/open-38979167.json').toURI())
|
||||||
|
def testJson = testFile.getText('UTF-8')
|
||||||
|
|
||||||
|
when:
|
||||||
|
def company = api.parseJsonIntoCompany(testJson)
|
||||||
|
|
||||||
|
then:
|
||||||
|
company != null
|
||||||
|
company.vat == 38979167
|
||||||
|
company.name == 'Mintr ApS'
|
||||||
|
}
|
||||||
|
|
||||||
|
void "test we can HTTP GET company with CVR 25063864 deserialized into Company"() {
|
||||||
|
|
||||||
|
setup:
|
||||||
|
def testFile = new File(getClass().getResource('/open-38979167.json').toURI())
|
||||||
|
def testJson = testFile.getText('UTF-8')
|
||||||
|
mockServer.enqueue(new MockResponse().setBody(testJson));
|
||||||
|
HttpUrl baseUrl = mockServer.url("/api");
|
||||||
|
api = new OpenCvrApi("Test User Agent", baseUrl.toString())
|
||||||
|
|
||||||
|
when:
|
||||||
|
def company = api.getCompanyByVatNumber("25063864")
|
||||||
|
|
||||||
|
then:
|
||||||
|
company != null
|
||||||
|
company.vat == 38979167
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
47
src/test/resources/open-38979167.json
Normal file
47
src/test/resources/open-38979167.json
Normal file
|
@ -0,0 +1,47 @@
|
||||||
|
{
|
||||||
|
"vat": 38979167,
|
||||||
|
"name": "Mintr ApS",
|
||||||
|
"address": "Vesterbrogade 90",
|
||||||
|
"zipcode": "1620",
|
||||||
|
"city": "K\u00f8benhavn V",
|
||||||
|
"cityname": null,
|
||||||
|
"protected": true,
|
||||||
|
"phone": "20930095",
|
||||||
|
"email": "sebastian@purchasepartner.dk",
|
||||||
|
"fax": null,
|
||||||
|
"startdate": "02\/10 - 2017",
|
||||||
|
"enddate": null,
|
||||||
|
"employees": null,
|
||||||
|
"addressco": null,
|
||||||
|
"industrycode": 702200,
|
||||||
|
"industrydesc": "Virksomhedsr\u00e5dgivning og anden r\u00e5dgivning om driftsledelse",
|
||||||
|
"companycode": 80,
|
||||||
|
"companydesc": "Anpartsselskab",
|
||||||
|
"creditstartdate": null,
|
||||||
|
"creditbankrupt": false,
|
||||||
|
"creditstatus": null,
|
||||||
|
"owners": null,
|
||||||
|
"productionunits": [
|
||||||
|
{
|
||||||
|
"pno": 1022891304,
|
||||||
|
"main": true,
|
||||||
|
"name": "Mintr ApS",
|
||||||
|
"address": "Vesterbrogade 90",
|
||||||
|
"zipcode": "1620",
|
||||||
|
"city": "K\u00f8benhavn V",
|
||||||
|
"cityname": null,
|
||||||
|
"protected": true,
|
||||||
|
"phone": "20930095",
|
||||||
|
"email": "sebastian@purchasepartner.dk",
|
||||||
|
"fax": null,
|
||||||
|
"startdate": "02\/10 - 2017",
|
||||||
|
"enddate": null,
|
||||||
|
"employees": null,
|
||||||
|
"addressco": null,
|
||||||
|
"industrycode": 702200,
|
||||||
|
"industrydesc": "Virksomhedsr\u00e5dgivning og anden r\u00e5dgivning om driftsledelse"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"t": 100,
|
||||||
|
"version": 6
|
||||||
|
}
|
Loading…
Reference in a new issue