Skip to content

Commit

Permalink
Sync groupId and Java path
Browse files Browse the repository at this point in the history
  • Loading branch information
outscale-mdr committed Dec 9, 2022
1 parent 96cdddb commit 27a5caf
Show file tree
Hide file tree
Showing 1,163 changed files with 5,632 additions and 5,633 deletions.
26 changes: 13 additions & 13 deletions .osc-patches/2022-12-06-1-configfile-support.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
unchanged:
--- /dev/null
+++ b/src/main/java/com/outscale/osc_sdk_java/client/ConfigurationFile.java
+++ b/src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationFile.java
@@ -0,0 +1,238 @@
+package com.outscale.osc_sdk_java.client;
+package io.github.outscale.osc_sdk_java.client;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
Expand Down Expand Up @@ -59,10 +59,10 @@ unchanged:
+
+ GsonBuilder gsonBuilder = JSON.createGson();
+ gsonBuilder.registerTypeAdapterFactory(
+ new com.outscale.osc_sdk_java.client.Profile.CustomTypeAdapterFactory());
+ new io.github.outscale.osc_sdk_java.client.Profile.CustomTypeAdapterFactory());
+ gsonBuilder
+ .registerTypeAdapterFactory(
+ new com.outscale.osc_sdk_java.client.Endpoint.CustomTypeAdapterFactory());
+ new io.github.outscale.osc_sdk_java.client.Endpoint.CustomTypeAdapterFactory());
+ Gson gson = gsonBuilder.create();
+ ConfigurationFile configurationFile = new ConfigurationFile();
+ try (BufferedReader br = new BufferedReader(new FileReader(path))) {
Expand Down Expand Up @@ -242,9 +242,9 @@ unchanged:
+}
unchanged:
--- /dev/null
+++ b/src/main/java/com/outscale/osc_sdk_java/client/Endpoint.java
+++ b/src/main/java/io/github/outscale/osc_sdk_java/client/Endpoint.java
@@ -0,0 +1,72 @@
+package com.outscale.osc_sdk_java.client;
+package io.github.outscale.osc_sdk_java.client;
+
+import java.io.IOException;
+
Expand Down Expand Up @@ -318,9 +318,9 @@ unchanged:
+}
unchanged:
--- /dev/null
+++ b/src/main/java/com/outscale/osc_sdk_java/client/Profile.java
+++ b/src/main/java/io/github/outscale/osc_sdk_java/client/Profile.java
@@ -0,0 +1,158 @@
+package com.outscale.osc_sdk_java.client;
+package io.github.outscale.osc_sdk_java.client;
+
+import java.io.IOException;
+import java.util.HashSet;
Expand Down Expand Up @@ -480,10 +480,10 @@ unchanged:
+}
only in patch2:
unchanged:
--- a/src/main/java/com/outscale/osc_sdk_java/client/ConfigurationFile.java
+++ b/src/main/java/com/outscale/osc_sdk_java/client/ConfigurationFile.java
--- a/src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationFile.java
+++ b/src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationFile.java
@@ -1,38 +1,19 @@
package com.outscale.osc_sdk_java.client;
package io.github.outscale.osc_sdk_java.client;

import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
Expand Down Expand Up @@ -680,9 +680,9 @@ unchanged:
only in patch2:
unchanged:
--- /dev/null
+++ b/src/main/java/com/outscale/osc_sdk_java/client/ConfigurationInitializer.java
+++ b/src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationInitializer.java
@@ -0,0 +1,181 @@
+package com.outscale.osc_sdk_java.client;
+package io.github.outscale.osc_sdk_java.client;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
Expand Down
18 changes: 9 additions & 9 deletions .osc-patches/2022-12-06-2-configenv-support.patch
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
diff --git a/src/main/java/com/outscale/osc_sdk_java/client/ConfigurationEnv.java b/src/main/java/com/outscale/osc_sdk_java/client/ConfigurationEnv.java
diff --git a/src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationEnv.java b/src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationEnv.java
new file mode 100644
index 0000000..c1021d3
--- /dev/null
+++ b/src/main/java/com/outscale/osc_sdk_java/client/ConfigurationEnv.java
+++ b/src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationEnv.java
@@ -0,0 +1,39 @@
+package com.outscale.osc_sdk_java.client;
+package io.github.outscale.osc_sdk_java.client;
+
+public class ConfigurationEnv extends ConfigurationInitializer {
+ private Profile profile;
Expand Down Expand Up @@ -43,10 +43,10 @@ index 0000000..c1021d3
+ }
+
+}
diff --git a/src/main/java/com/outscale/osc_sdk_java/client/Endpoint.java b/src/main/java/com/outscale/osc_sdk_java/client/Endpoint.java
diff --git a/src/main/java/io/github/outscale/osc_sdk_java/client/Endpoint.java b/src/main/java/io/github/outscale/osc_sdk_java/client/Endpoint.java
index b635fcf..c5d6aca 100644
--- a/src/main/java/com/outscale/osc_sdk_java/client/Endpoint.java
+++ b/src/main/java/com/outscale/osc_sdk_java/client/Endpoint.java
--- a/src/main/java/io/github/outscale/osc_sdk_java/client/Endpoint.java
+++ b/src/main/java/io/github/outscale/osc_sdk_java/client/Endpoint.java
@@ -69,4 +69,8 @@ public class Endpoint {
public String getApi() {
return api;
Expand All @@ -56,10 +56,10 @@ index b635fcf..c5d6aca 100644
+ this.api = api;
+ }
}
diff --git a/src/main/java/com/outscale/osc_sdk_java/client/Profile.java b/src/main/java/com/outscale/osc_sdk_java/client/Profile.java
diff --git a/src/main/java/io/github/outscale/osc_sdk_java/client/Profile.java b/src/main/java/io/github/outscale/osc_sdk_java/client/Profile.java
index 9dc7fa7..bbc2f42 100644
--- a/src/main/java/com/outscale/osc_sdk_java/client/Profile.java
+++ b/src/main/java/com/outscale/osc_sdk_java/client/Profile.java
--- a/src/main/java/io/github/outscale/osc_sdk_java/client/Profile.java
+++ b/src/main/java/io/github/outscale/osc_sdk_java/client/Profile.java
@@ -155,4 +155,44 @@ public class Profile {
public String getX509ClientKeyB64() {
return x509ClientKeyB64;
Expand Down
10 changes: 5 additions & 5 deletions .osc-patches/2022-12-07-basic-auth.patch
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
diff --git a/src/main/java/com/outscale/osc_sdk_java/client/auth/HttpBasicAuth.java b/src/main/java/com/outscale/osc_sdk_java/client/auth/HttpBasicAuth.java
diff --git a/src/main/java/io/github/outscale/osc_sdk_java/client/auth/HttpBasicAuth.java b/src/main/java/io/github/outscale/osc_sdk_java/client/auth/HttpBasicAuth.java
index 8d0e8e5..a8f8ef8 100644
--- a/src/main/java/com/outscale/osc_sdk_java/client/auth/HttpBasicAuth.java
+++ b/src/main/java/com/outscale/osc_sdk_java/client/auth/HttpBasicAuth.java
--- a/src/main/java/io/github/outscale/osc_sdk_java/client/auth/HttpBasicAuth.java
+++ b/src/main/java/io/github/outscale/osc_sdk_java/client/auth/HttpBasicAuth.java
@@ -10,7 +10,6 @@
* Do not edit the class manually.
*/

-
package com.outscale.osc_sdk_java.client.auth;
package io.github.outscale.osc_sdk_java.client.auth;

import com.outscale.osc_sdk_java.client.Pair;
import io.github.outscale.osc_sdk_java.client.Pair;
@@ -22,11 +21,14 @@ import java.net.URI;
import java.util.Map;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ osc-generate: osc-api/outscale.yaml
rm -rf .sdk || true
mkdir .sdk
docker run -v $(PWD):/sdk --rm $(OPENAPI_IMG) generate -i /sdk/osc-api/outscale.yaml -g java -c /sdk/gen.yml -o /sdk/.sdk
docker run -v $(PWD):/sdk --rm $(OPENAPI_IMG) sed -i "s%setUserAgent(\".*\");%setUserAgent(\"osc-sdk-java/$(SDK_VERSION)\");%" /sdk/.sdk/src/main/java/com/outscale/osc_sdk_java/client/ApiClient.java
docker run -v $(PWD):/sdk --rm $(OPENAPI_IMG) sed -i "s%setUserAgent(\".*\");%setUserAgent(\"osc-sdk-java/$(SDK_VERSION)\");%" /sdk/.sdk/src/main/java/io/github/outscale/osc_sdk_java/client/ApiClient.java
docker run -v $(PWD):/sdk --rm $(OPENAPI_IMG) chown -R $(USER_ID).$(GROUP_ID) /sdk/.sdk
@echo SDK generated
mv .sdk/src ./
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@ Please follow the [installation](#installation) instruction and execute the foll
```java

// Import classes:
import com.outscale.osc_sdk_java.client.ApiClient;
import com.outscale.osc_sdk_java.client.ApiException;
import com.outscale.osc_sdk_java.client.Configuration;
import com.outscale.osc_sdk_java.client.auth.*;
import com.outscale.osc_sdk_java.client.models.*;
import com.outscale.osc_sdk_java.client.api.AccessKeyApi;
import io.github.outscale.osc_sdk_java.client.ApiClient;
import io.github.outscale.osc_sdk_java.client.ApiException;
import io.github.outscale.osc_sdk_java.client.Configuration;
import io.github.outscale.osc_sdk_java.client.auth.*;
import io.github.outscale.osc_sdk_java.client.models.*;
import io.github.outscale.osc_sdk_java.client.api.AccessKeyApi;

public class Example {
public static void main(String[] args) {
Expand Down
60 changes: 30 additions & 30 deletions docs/AccessKeyApi.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ All URIs are relative to *https://api.eu-west-2.outscale.com/api/v1*
### Example
```java
// Import classes:
import com.outscale.osc_sdk_java.client.ApiClient;
import com.outscale.osc_sdk_java.client.ApiException;
import com.outscale.osc_sdk_java.client.Configuration;
import com.outscale.osc_sdk_java.client.auth.*;
import com.outscale.osc_sdk_java.client.models.*;
import com.outscale.osc_sdk_java.client.api.AccessKeyApi;
import io.github.outscale.osc_sdk_java.client.ApiClient;
import io.github.outscale.osc_sdk_java.client.ApiException;
import io.github.outscale.osc_sdk_java.client.Configuration;
import io.github.outscale.osc_sdk_java.client.auth.*;
import io.github.outscale.osc_sdk_java.client.models.*;
import io.github.outscale.osc_sdk_java.client.api.AccessKeyApi;

public class Example {
public static void main(String[] args) {
Expand Down Expand Up @@ -92,12 +92,12 @@ public class Example {
### Example
```java
// Import classes:
import com.outscale.osc_sdk_java.client.ApiClient;
import com.outscale.osc_sdk_java.client.ApiException;
import com.outscale.osc_sdk_java.client.Configuration;
import com.outscale.osc_sdk_java.client.auth.*;
import com.outscale.osc_sdk_java.client.models.*;
import com.outscale.osc_sdk_java.client.api.AccessKeyApi;
import io.github.outscale.osc_sdk_java.client.ApiClient;
import io.github.outscale.osc_sdk_java.client.ApiException;
import io.github.outscale.osc_sdk_java.client.Configuration;
import io.github.outscale.osc_sdk_java.client.auth.*;
import io.github.outscale.osc_sdk_java.client.models.*;
import io.github.outscale.osc_sdk_java.client.api.AccessKeyApi;

public class Example {
public static void main(String[] args) {
Expand Down Expand Up @@ -164,12 +164,12 @@ public class Example {
### Example
```java
// Import classes:
import com.outscale.osc_sdk_java.client.ApiClient;
import com.outscale.osc_sdk_java.client.ApiException;
import com.outscale.osc_sdk_java.client.Configuration;
import com.outscale.osc_sdk_java.client.auth.*;
import com.outscale.osc_sdk_java.client.models.*;
import com.outscale.osc_sdk_java.client.api.AccessKeyApi;
import io.github.outscale.osc_sdk_java.client.ApiClient;
import io.github.outscale.osc_sdk_java.client.ApiException;
import io.github.outscale.osc_sdk_java.client.Configuration;
import io.github.outscale.osc_sdk_java.client.auth.*;
import io.github.outscale.osc_sdk_java.client.models.*;
import io.github.outscale.osc_sdk_java.client.api.AccessKeyApi;

public class Example {
public static void main(String[] args) {
Expand Down Expand Up @@ -236,12 +236,12 @@ public class Example {
### Example
```java
// Import classes:
import com.outscale.osc_sdk_java.client.ApiClient;
import com.outscale.osc_sdk_java.client.ApiException;
import com.outscale.osc_sdk_java.client.Configuration;
import com.outscale.osc_sdk_java.client.auth.*;
import com.outscale.osc_sdk_java.client.models.*;
import com.outscale.osc_sdk_java.client.api.AccessKeyApi;
import io.github.outscale.osc_sdk_java.client.ApiClient;
import io.github.outscale.osc_sdk_java.client.ApiException;
import io.github.outscale.osc_sdk_java.client.Configuration;
import io.github.outscale.osc_sdk_java.client.auth.*;
import io.github.outscale.osc_sdk_java.client.models.*;
import io.github.outscale.osc_sdk_java.client.api.AccessKeyApi;

public class Example {
public static void main(String[] args) {
Expand Down Expand Up @@ -308,12 +308,12 @@ public class Example {
### Example
```java
// Import classes:
import com.outscale.osc_sdk_java.client.ApiClient;
import com.outscale.osc_sdk_java.client.ApiException;
import com.outscale.osc_sdk_java.client.Configuration;
import com.outscale.osc_sdk_java.client.auth.*;
import com.outscale.osc_sdk_java.client.models.*;
import com.outscale.osc_sdk_java.client.api.AccessKeyApi;
import io.github.outscale.osc_sdk_java.client.ApiClient;
import io.github.outscale.osc_sdk_java.client.ApiException;
import io.github.outscale.osc_sdk_java.client.Configuration;
import io.github.outscale.osc_sdk_java.client.auth.*;
import io.github.outscale.osc_sdk_java.client.models.*;
import io.github.outscale.osc_sdk_java.client.api.AccessKeyApi;

public class Example {
public static void main(String[] args) {
Expand Down
80 changes: 40 additions & 40 deletions docs/AccountApi.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ All URIs are relative to *https://api.eu-west-2.outscale.com/api/v1*
### Example
```java
// Import classes:
import com.outscale.osc_sdk_java.client.ApiClient;
import com.outscale.osc_sdk_java.client.ApiException;
import com.outscale.osc_sdk_java.client.Configuration;
import com.outscale.osc_sdk_java.client.auth.*;
import com.outscale.osc_sdk_java.client.models.*;
import com.outscale.osc_sdk_java.client.api.AccountApi;
import io.github.outscale.osc_sdk_java.client.ApiClient;
import io.github.outscale.osc_sdk_java.client.ApiException;
import io.github.outscale.osc_sdk_java.client.Configuration;
import io.github.outscale.osc_sdk_java.client.auth.*;
import io.github.outscale.osc_sdk_java.client.models.*;
import io.github.outscale.osc_sdk_java.client.api.AccountApi;

public class Example {
public static void main(String[] args) {
Expand Down Expand Up @@ -89,12 +89,12 @@ public class Example {
### Example
```java
// Import classes:
import com.outscale.osc_sdk_java.client.ApiClient;
import com.outscale.osc_sdk_java.client.ApiException;
import com.outscale.osc_sdk_java.client.Configuration;
import com.outscale.osc_sdk_java.client.auth.*;
import com.outscale.osc_sdk_java.client.models.*;
import com.outscale.osc_sdk_java.client.api.AccountApi;
import io.github.outscale.osc_sdk_java.client.ApiClient;
import io.github.outscale.osc_sdk_java.client.ApiException;
import io.github.outscale.osc_sdk_java.client.Configuration;
import io.github.outscale.osc_sdk_java.client.auth.*;
import io.github.outscale.osc_sdk_java.client.models.*;
import io.github.outscale.osc_sdk_java.client.api.AccountApi;

public class Example {
public static void main(String[] args) {
Expand Down Expand Up @@ -156,12 +156,12 @@ public class Example {
### Example
```java
// Import classes:
import com.outscale.osc_sdk_java.client.ApiClient;
import com.outscale.osc_sdk_java.client.ApiException;
import com.outscale.osc_sdk_java.client.Configuration;
import com.outscale.osc_sdk_java.client.auth.*;
import com.outscale.osc_sdk_java.client.models.*;
import com.outscale.osc_sdk_java.client.api.AccountApi;
import io.github.outscale.osc_sdk_java.client.ApiClient;
import io.github.outscale.osc_sdk_java.client.ApiException;
import io.github.outscale.osc_sdk_java.client.Configuration;
import io.github.outscale.osc_sdk_java.client.auth.*;
import io.github.outscale.osc_sdk_java.client.models.*;
import io.github.outscale.osc_sdk_java.client.api.AccountApi;

public class Example {
public static void main(String[] args) {
Expand Down Expand Up @@ -223,12 +223,12 @@ public class Example {
### Example
```java
// Import classes:
import com.outscale.osc_sdk_java.client.ApiClient;
import com.outscale.osc_sdk_java.client.ApiException;
import com.outscale.osc_sdk_java.client.Configuration;
import com.outscale.osc_sdk_java.client.auth.*;
import com.outscale.osc_sdk_java.client.models.*;
import com.outscale.osc_sdk_java.client.api.AccountApi;
import io.github.outscale.osc_sdk_java.client.ApiClient;
import io.github.outscale.osc_sdk_java.client.ApiException;
import io.github.outscale.osc_sdk_java.client.Configuration;
import io.github.outscale.osc_sdk_java.client.auth.*;
import io.github.outscale.osc_sdk_java.client.models.*;
import io.github.outscale.osc_sdk_java.client.api.AccountApi;

public class Example {
public static void main(String[] args) {
Expand Down Expand Up @@ -290,11 +290,11 @@ public class Example {
### Example
```java
// Import classes:
import com.outscale.osc_sdk_java.client.ApiClient;
import com.outscale.osc_sdk_java.client.ApiException;
import com.outscale.osc_sdk_java.client.Configuration;
import com.outscale.osc_sdk_java.client.models.*;
import com.outscale.osc_sdk_java.client.api.AccountApi;
import io.github.outscale.osc_sdk_java.client.ApiClient;
import io.github.outscale.osc_sdk_java.client.ApiException;
import io.github.outscale.osc_sdk_java.client.Configuration;
import io.github.outscale.osc_sdk_java.client.models.*;
import io.github.outscale.osc_sdk_java.client.api.AccountApi;

public class Example {
public static void main(String[] args) {
Expand Down Expand Up @@ -350,11 +350,11 @@ No authorization required
### Example
```java
// Import classes:
import com.outscale.osc_sdk_java.client.ApiClient;
import com.outscale.osc_sdk_java.client.ApiException;
import com.outscale.osc_sdk_java.client.Configuration;
import com.outscale.osc_sdk_java.client.models.*;
import com.outscale.osc_sdk_java.client.api.AccountApi;
import io.github.outscale.osc_sdk_java.client.ApiClient;
import io.github.outscale.osc_sdk_java.client.ApiException;
import io.github.outscale.osc_sdk_java.client.Configuration;
import io.github.outscale.osc_sdk_java.client.models.*;
import io.github.outscale.osc_sdk_java.client.api.AccountApi;

public class Example {
public static void main(String[] args) {
Expand Down Expand Up @@ -410,12 +410,12 @@ No authorization required
### Example
```java
// Import classes:
import com.outscale.osc_sdk_java.client.ApiClient;
import com.outscale.osc_sdk_java.client.ApiException;
import com.outscale.osc_sdk_java.client.Configuration;
import com.outscale.osc_sdk_java.client.auth.*;
import com.outscale.osc_sdk_java.client.models.*;
import com.outscale.osc_sdk_java.client.api.AccountApi;
import io.github.outscale.osc_sdk_java.client.ApiClient;
import io.github.outscale.osc_sdk_java.client.ApiException;
import io.github.outscale.osc_sdk_java.client.Configuration;
import io.github.outscale.osc_sdk_java.client.auth.*;
import io.github.outscale.osc_sdk_java.client.models.*;
import io.github.outscale.osc_sdk_java.client.api.AccountApi;

public class Example {
public static void main(String[] args) {
Expand Down
Loading

0 comments on commit 27a5caf

Please sign in to comment.