Skip to content

Commit

Permalink
Minor update
Browse files Browse the repository at this point in the history
  • Loading branch information
NamSor SAS committed Nov 1, 2020
1 parent c3b5736 commit 4e714bb
Show file tree
Hide file tree
Showing 556 changed files with 6,110 additions and 5,338 deletions.
208 changes: 82 additions & 126 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'idea'
apply plugin: 'eclipse'

group = 'com.namsor'
version = '2.0.10'
version = '2.0.11'

buildscript {
repositories {
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
settings(
organization := "com.namsor",
name := "namsor-sdk2",
version := "2.0.10",
version := "2.0.11",
scalaVersion := "2.11.4",
scalacOptions ++= Seq("-feature"),
javacOptions in compile ++= Seq("-Xlint:deprecation"),
Expand Down
52 changes: 26 additions & 26 deletions docs/AdminApi.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Method | HTTP request | Description
[**apiUsage**](AdminApi.md#apiUsage) | **GET** /api2/json/apiUsage | Print current API usage.
[**apiUsageHistory**](AdminApi.md#apiUsageHistory) | **GET** /api2/json/apiUsageHistory | Print historical API usage.
[**apiUsageHistoryAggregate**](AdminApi.md#apiUsageHistoryAggregate) | **GET** /api2/json/apiUsageHistoryAggregate | Print historical API usage (in an aggregated view, by service, by day/hour/min).
[**availablePlans**](AdminApi.md#availablePlans) | **GET** /api2/json/availablePlans | List all available plans in the default currency (usd).
[**availablePlans1**](AdminApi.md#availablePlans1) | **GET** /api2/json/availablePlans/{token} | List all available plans in the user's preferred currency.
[**availablePlans**](AdminApi.md#availablePlans) | **GET** /api2/json/availablePlans/{token} | List all available plans in the user's preferred currency.
[**availablePlans1**](AdminApi.md#availablePlans1) | **GET** /api2/json/availablePlans | List all available plans in the default currency (usd).
[**availableServices**](AdminApi.md#availableServices) | **GET** /api2/json/apiServices | List of API services and usage cost in Units (default is 1=ONE Unit).
[**billingCurrencies**](AdminApi.md#billingCurrencies) | **GET** /api2/json/billingCurrencies | List possible currency options for billing (USD, EUR, GBP, ...)
[**billingHistory**](AdminApi.md#billingHistory) | **GET** /api2/json/billingHistory/{token} | Read the history billing information (invoices paid via Stripe or manually).
Expand All @@ -25,8 +25,8 @@ Method | HTTP request | Description
[**namsorCounter**](AdminApi.md#namsorCounter) | **GET** /api2/json/namsorCounter | Get the overall API counter
[**paymentInfo**](AdminApi.md#paymentInfo) | **GET** /api2/json/paymentInfo/{token} | Get the Stripe payment information associated with the current google auth session token.
[**procureKey**](AdminApi.md#procureKey) | **GET** /api2/json/procureKey/{token} | Procure an API Key (sent via Email), based on an auth token. Keep your API Key secret.
[**redeployUI**](AdminApi.md#redeployUI) | **GET** /api2/json/redeployUI | Redeploy UI from current dev branch.
[**redeployUI1**](AdminApi.md#redeployUI1) | **GET** /api2/json/redeployUI/{live} | Redeploy UI from current dev branch.
[**redeployUI**](AdminApi.md#redeployUI) | **GET** /api2/json/redeployUI/{live} | Redeploy UI from current dev branch.
[**redeployUI1**](AdminApi.md#redeployUI1) | **GET** /api2/json/redeployUI | Redeploy UI from current dev branch.
[**removeUserAccount**](AdminApi.md#removeUserAccount) | **GET** /api2/json/removeUserAccount/{token} | Remove the user account.
[**removeUserAccountOnBehalf**](AdminApi.md#removeUserAccountOnBehalf) | **GET** /api2/json/removeUserAccountOnBehalf/{apiKey} | Remove (on behalf) a user account.
[**shutdown**](AdminApi.md#shutdown) | **GET** /api2/json/shutdown | Stop learning and shutdown system.
Expand Down Expand Up @@ -355,9 +355,9 @@ This endpoint does not need any parameter.

<a name="availablePlans"></a>
# **availablePlans**
> APIPlansOut availablePlans()
> APIPlansOut availablePlans(token)
List all available plans in the default currency (usd).
List all available plans in the user&#39;s preferred currency.

### Example
```java
Expand All @@ -377,8 +377,9 @@ api_key.setApiKey("YOUR API KEY");
//api_key.setApiKeyPrefix("Token");

AdminApi apiInstance = new AdminApi();
String token = "token_example"; // String |
try {
APIPlansOut result = apiInstance.availablePlans();
APIPlansOut result = apiInstance.availablePlans(token);
System.out.println(result);
} catch (ApiException e) {
System.err.println("Exception when calling AdminApi#availablePlans");
Expand All @@ -387,7 +388,10 @@ try {
```

### Parameters
This endpoint does not need any parameter.

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
**token** | **String**| |

### Return type

Expand All @@ -404,9 +408,9 @@ This endpoint does not need any parameter.

<a name="availablePlans1"></a>
# **availablePlans1**
> APIPlansOut availablePlans1(token)
> APIPlansOut availablePlans1()
List all available plans in the user&#39;s preferred currency.
List all available plans in the default currency (usd).

### Example
```java
Expand All @@ -426,9 +430,8 @@ api_key.setApiKey("YOUR API KEY");
//api_key.setApiKeyPrefix("Token");

AdminApi apiInstance = new AdminApi();
String token = "token_example"; // String |
try {
APIPlansOut result = apiInstance.availablePlans1(token);
APIPlansOut result = apiInstance.availablePlans1();
System.out.println(result);
} catch (ApiException e) {
System.err.println("Exception when calling AdminApi#availablePlans1");
Expand All @@ -437,10 +440,7 @@ try {
```

### Parameters

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
**token** | **String**| |
This endpoint does not need any parameter.

### Return type

Expand Down Expand Up @@ -1127,7 +1127,7 @@ Name | Type | Description | Notes

<a name="redeployUI"></a>
# **redeployUI**
> redeployUI()
> redeployUI(live)
Redeploy UI from current dev branch.

Expand All @@ -1149,16 +1149,20 @@ api_key.setApiKey("YOUR API KEY");
//api_key.setApiKeyPrefix("Token");

AdminApi apiInstance = new AdminApi();
Boolean live = true; // Boolean |
try {
apiInstance.redeployUI();
apiInstance.redeployUI(live);
} catch (ApiException e) {
System.err.println("Exception when calling AdminApi#redeployUI");
e.printStackTrace();
}
```

### Parameters
This endpoint does not need any parameter.

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
**live** | **Boolean**| |

### Return type

Expand All @@ -1175,7 +1179,7 @@ null (empty response body)

<a name="redeployUI1"></a>
# **redeployUI1**
> redeployUI1(live)
> redeployUI1()
Redeploy UI from current dev branch.

Expand All @@ -1197,20 +1201,16 @@ api_key.setApiKey("YOUR API KEY");
//api_key.setApiKeyPrefix("Token");

AdminApi apiInstance = new AdminApi();
Boolean live = true; // Boolean |
try {
apiInstance.redeployUI1(live);
apiInstance.redeployUI1();
} catch (ApiException e) {
System.err.println("Exception when calling AdminApi#redeployUI1");
e.printStackTrace();
}
```

### Parameters

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
**live** | **Boolean**| |
This endpoint does not need any parameter.

### Return type

Expand Down
118 changes: 118 additions & 0 deletions docs/GeneralApi.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
# GeneralApi

All URIs are relative to *https://v2.namsor.com/NamSorAPIv2*

Method | HTTP request | Description
------------- | ------------- | -------------
[**nameType**](GeneralApi.md#nameType) | **GET** /api2/json/nameType/{properNoun} | Infer the likely type of a proper noun (personal name, brand name, place name etc.)
[**nameType1**](GeneralApi.md#nameType1) | **GET** /api2/json/nameType/{properNoun}/{countryIso2} | Infer the likely type of a proper noun (personal name, brand name, place name etc.)


<a name="nameType"></a>
# **nameType**
> ProperNounCategorizedOut nameType(properNoun)
Infer the likely type of a proper noun (personal name, brand name, place name etc.)

### Example
```java
// Import classes:
//import com.namsor.sdk2.invoke.ApiClient;
//import com.namsor.sdk2.invoke.ApiException;
//import com.namsor.sdk2.invoke.Configuration;
//import com.namsor.sdk2.invoke.auth.*;
//import com.namsor.sdk2.api.GeneralApi;

ApiClient defaultClient = Configuration.getDefaultApiClient();

// Configure API key authorization: api_key
ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key");
api_key.setApiKey("YOUR API KEY");
// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
//api_key.setApiKeyPrefix("Token");

GeneralApi apiInstance = new GeneralApi();
String properNoun = "properNoun_example"; // String |
try {
ProperNounCategorizedOut result = apiInstance.nameType(properNoun);
System.out.println(result);
} catch (ApiException e) {
System.err.println("Exception when calling GeneralApi#nameType");
e.printStackTrace();
}
```

### Parameters

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
**properNoun** | **String**| |

### Return type

[**ProperNounCategorizedOut**](ProperNounCategorizedOut.md)

### Authorization

[api_key](../README.md#api_key)

### HTTP request headers

- **Content-Type**: Not defined
- **Accept**: application/json

<a name="nameType1"></a>
# **nameType1**
> ProperNounCategorizedOut nameType1(properNoun, countryIso2)
Infer the likely type of a proper noun (personal name, brand name, place name etc.)

### Example
```java
// Import classes:
//import com.namsor.sdk2.invoke.ApiClient;
//import com.namsor.sdk2.invoke.ApiException;
//import com.namsor.sdk2.invoke.Configuration;
//import com.namsor.sdk2.invoke.auth.*;
//import com.namsor.sdk2.api.GeneralApi;

ApiClient defaultClient = Configuration.getDefaultApiClient();

// Configure API key authorization: api_key
ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key");
api_key.setApiKey("YOUR API KEY");
// Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
//api_key.setApiKeyPrefix("Token");

GeneralApi apiInstance = new GeneralApi();
String properNoun = "properNoun_example"; // String |
String countryIso2 = "countryIso2_example"; // String |
try {
ProperNounCategorizedOut result = apiInstance.nameType1(properNoun, countryIso2);
System.out.println(result);
} catch (ApiException e) {
System.err.println("Exception when calling GeneralApi#nameType1");
e.printStackTrace();
}
```

### Parameters

Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
**properNoun** | **String**| |
**countryIso2** | **String**| |

### Return type

[**ProperNounCategorizedOut**](ProperNounCategorizedOut.md)

### Authorization

[api_key](../README.md#api_key)

### HTTP request headers

- **Content-Type**: Not defined
- **Accept**: application/json

14 changes: 14 additions & 0 deletions docs/ProperNounCategorizedOut.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@

# ProperNounCategorizedOut

## Properties
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**id** | **String** | | [optional]
**name** | **String** | | [optional]
**commonType** | **String** | | [optional]
**commonTypeAlt** | **String** | | [optional]
**score** | **Double** | | [optional]



2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<artifactId>namsor-sdk2</artifactId>
<packaging>jar</packaging>
<name>namsor-sdk2</name>
<version>2.0.10</version>
<version>2.0.11</version>
<url>https://github.com/openapitools/openapi-generator</url>
<description>OpenAPI Java</description>
<scm>
Expand Down
2 changes: 1 addition & 1 deletion run-java.bash
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ echo update openapi-generator
./bin/utils/openapi-generator-cli.sh
rm -Rf ./namsor/client/java/
echo run openapi-generator
java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate --git-repo-id namsor-java-sdk2 --git-user-id namsor --artifact-version 2.0.10 --group-id com.namsor --artifact-id namsor-sdk2 --invoker-package com.namsor.sdk2.invoke --model-package com.namsor.sdk2.model --api-package com.namsor.sdk2.api -i https://v2.namsor.com/NamSorAPIv2/api2/openapi.json -g java -o namsor/client/java
java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate --git-repo-id namsor-java-sdk2 --git-user-id namsor --artifact-version 2.0.11 --group-id com.namsor --artifact-id namsor-sdk2 --invoker-package com.namsor.sdk2.invoke --model-package com.namsor.sdk2.model --api-package com.namsor.sdk2.api -i https://v2.namsor.com/NamSorAPIv2/api2/openapi.json -g java -o namsor/client/java
cd ./namsor/client/java/
mvn clean package
cd target
Expand Down
Loading

0 comments on commit 4e714bb

Please sign in to comment.