Skip to content

Commit 43cfc7d

Browse files
committed
Setup authentications in test cases
1 parent 16ba2a5 commit 43cfc7d

File tree

8 files changed

+51
-2
lines changed

8 files changed

+51
-2
lines changed

modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public JavaClientCodegen() {
6161
supportingFiles.add(new SupportingFile("auth/Authentication.mustache", authFolder, "Authentication.java"));
6262
supportingFiles.add(new SupportingFile("auth/HttpBasicAuth.mustache", authFolder, "HttpBasicAuth.java"));
6363
supportingFiles.add(new SupportingFile("auth/ApiKeyAuth.mustache", authFolder, "ApiKeyAuth.java"));
64+
supportingFiles.add(new SupportingFile("auth/OAuth.mustache", authFolder, "OAuth.java"));
6465

6566
languageSpecificPrimitives = new HashSet<String>(
6667
Arrays.asList(
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package {{invokerPackage}}.auth;
2+
3+
import java.util.Map;
4+
5+
public class OAuth implements Authentication {
6+
@Override
7+
public void processParams(Map<String, String> queryParams, Map<String, String> headerParams) {
8+
// TODO: support oauth
9+
}
10+
}

modules/swagger-codegen/src/main/resources/Java/configuration.mustache

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,18 @@ import java.util.HashMap;
66
import {{invokerPackage}}.auth.Authentication;
77
import {{invokerPackage}}.auth.HttpBasicAuth;
88
import {{invokerPackage}}.auth.ApiKeyAuth;
9+
import {{invokerPackage}}.auth.OAuth;
910

1011
public class Configuration {
1112
private static final Map<String, Authentication> AUTH;
1213
1314
static {
15+
// setup authentications
1416
AUTH = new HashMap<String, Authentication>();
1517
{{#authMethods}}
1618
{{#isBasic}}AUTH.put("{{name}}", new HttpBasicAuth());{{/isBasic}}
1719
{{#isApiKey}}AUTH.put("{{name}}", new ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}"));{{/isApiKey}}
18-
{{#isOAuth}}// TODO: support oauth{{/isOAuth}}
20+
{{#isOAuth}}AUTH.put("{{name}}", new OAuth());{{/isOAuth}}
1921
{{/authMethods}}
2022
}
2123

samples/client/petstore/java/src/main/java/io/swagger/client/Configuration.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66
import io.swagger.client.auth.Authentication;
77
import io.swagger.client.auth.HttpBasicAuth;
88
import io.swagger.client.auth.ApiKeyAuth;
9+
import io.swagger.client.auth.OAuth;
910

1011
public class Configuration {
1112
private static final Map<String, Authentication> AUTH;
1213

1314
static {
15+
// setup authentications
1416
AUTH = new HashMap<String, Authentication>();
1517

1618

@@ -19,7 +21,7 @@ public class Configuration {
1921

2022

2123

22-
// TODO: support oauth
24+
AUTH.put("petstore_auth", new OAuth());
2325

2426
}
2527

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package io.swagger.client.auth;
2+
3+
import java.util.Map;
4+
5+
public class OAuth implements Authentication {
6+
@Override
7+
public void processParams(Map<String, String> queryParams, Map<String, String> headerParams) {
8+
// TODO: support oauth
9+
}
10+
}

samples/client/petstore/java/src/test/java/io/swagger/petstore/test/PetApiTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package io.swagger.petstore.test;
22

33
import io.swagger.client.ApiException;
4+
import io.swagger.client.Configuration;
45
import io.swagger.client.api.*;
56
import io.swagger.client.model.*;
7+
import io.swagger.client.auth.*;
68

79
import java.util.*;
810
import java.io.*;
@@ -13,6 +15,12 @@
1315
public class PetApiTest {
1416
PetApi api = null;
1517

18+
@BeforeClass
19+
public static void initAuth() {
20+
ApiKeyAuth apiKeyAuth = (ApiKeyAuth) Configuration.getAuthentication("api_key");
21+
apiKeyAuth.setApiKey("special-key");
22+
}
23+
1624
@Before
1725
public void setup() {
1826
api = new PetApi();

samples/client/petstore/java/src/test/java/io/swagger/petstore/test/StoreApiTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package io.swagger.petstore.test;
22

33
import io.swagger.client.ApiException;
4+
import io.swagger.client.Configuration;
45
import io.swagger.client.api.*;
56
import io.swagger.client.model.*;
7+
import io.swagger.client.auth.*;
68

79
import java.util.*;
810
import java.io.*;
@@ -13,6 +15,12 @@
1315
public class StoreApiTest {
1416
StoreApi api = null;
1517

18+
@BeforeClass
19+
public static void initAuth() {
20+
ApiKeyAuth apiKeyAuth = (ApiKeyAuth) Configuration.getAuthentication("api_key");
21+
apiKeyAuth.setApiKey("special-key");
22+
}
23+
1624
@Before
1725
public void setup() {
1826
api = new StoreApi();

samples/client/petstore/java/src/test/java/io/swagger/petstore/test/UserApiTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package io.swagger.petstore.test;
22

33
import io.swagger.client.ApiException;
4+
import io.swagger.client.Configuration;
45
import io.swagger.client.api.*;
56
import io.swagger.client.model.*;
7+
import io.swagger.client.auth.*;
68

79
import java.util.*;
810
import java.io.*;
@@ -13,6 +15,12 @@
1315
public class UserApiTest {
1416
UserApi api = null;
1517

18+
@BeforeClass
19+
public static void initAuth() {
20+
ApiKeyAuth apiKeyAuth = (ApiKeyAuth) Configuration.getAuthentication("api_key");
21+
apiKeyAuth.setApiKey("special-key");
22+
}
23+
1624
@Before
1725
public void setup() {
1826
api = new UserApi();

0 commit comments

Comments
 (0)