loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Swagger codegen: Changing package name from com.wordnik to com.wordnik.swagger

Browse Source
This commit is contained in:
Deepak Michael 2011-08-01 22:20:50 +05:30
parent 47a35cdd74
commit 7a29714a37
37 changed files with 132 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code-gen/build.xml
View File

@ -39,7 +39,7 @@
<delete> <delete>
<fileset dir="${outputPath}" includes="*.java"/> <fileset dir="${outputPath}" includes="*.java"/>
</delete> </delete>
<java classname="com.wordnik.codegen.config.java.JavaLibCodeGen"> <java classname="com.wordnik.swagger.codegen.config.java.JavaLibCodeGen">
<classpath> <classpath>
<pathelement location="build/main/java" /> <pathelement location="build/main/java" />
<fileset dir="lib"> <fileset dir="lib">

2
code-gen/conf/java/structure/src/main/java/com/wordnik/annotations/AllowableValues.java → code-gen/conf/java/structure/src/main/java/com/wordnik/swagger/annotations/AllowableValues.java
View File

@ -1,4 +1,4 @@
package com.wordnik.annotations; package com.wordnik.swagger.annotations;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

2
code-gen/conf/java/structure/src/main/java/com/wordnik/annotations/MethodArgumentNames.java → code-gen/conf/java/structure/src/main/java/com/wordnik/swagger/annotations/MethodArgumentNames.java
View File

@ -1,4 +1,4 @@
package com.wordnik.annotations; package com.wordnik.swagger.annotations;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

2
code-gen/conf/java/structure/src/main/java/com/wordnik/annotations/Required.java → code-gen/conf/java/structure/src/main/java/com/wordnik/swagger/annotations/Required.java
View File

@ -1,4 +1,4 @@
package com.wordnik.annotations; package com.wordnik.swagger.annotations;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

2
code-gen/conf/java/structure/src/main/java/com/wordnik/common/StringValue.java → code-gen/conf/java/structure/src/main/java/com/wordnik/swagger/common/StringValue.java
View File

@ -1,4 +1,4 @@
package com.wordnik.common; package com.wordnik.swagger.common;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

6
code-gen/conf/java/structure/src/main/java/com/wordnik/common/WordnikAPI.java → code-gen/conf/java/structure/src/main/java/com/wordnik/swagger/common/WordnikAPI.java
View File

@ -1,4 +1,4 @@
package com.wordnik.common; package com.wordnik.swagger.common;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;
@ -6,8 +6,8 @@ import java.util.logging.Logger;
import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.MultivaluedMap;
import com.wordnik.exception.APIException; import com.wordnik.swagger.exception.APIException;
import com.wordnik.exception.APIExceptionCodes; import com.wordnik.swagger.exception.APIExceptionCodes;
import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.DeserializationConfig.Feature; import org.codehaus.jackson.map.DeserializationConfig.Feature;
import org.codehaus.jackson.map.SerializationConfig; import org.codehaus.jackson.map.SerializationConfig;

2
code-gen/conf/java/structure/src/main/java/com/wordnik/exception/APIException.java → code-gen/conf/java/structure/src/main/java/com/wordnik/swagger/exception/APIException.java
View File

@ -1,4 +1,4 @@
package com.wordnik.exception; package com.wordnik.swagger.exception;
import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse;
import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonAutoDetect;

2
code-gen/conf/java/structure/src/main/java/com/wordnik/exception/APIExceptionCodes.java → code-gen/conf/java/structure/src/main/java/com/wordnik/swagger/exception/APIExceptionCodes.java
View File

@ -1,4 +1,4 @@
package com.wordnik.exception; package com.wordnik.swagger.exception;
/** /**
* Lists all the possible exception codes * Lists all the possible exception codes

2
code-gen/conf/java/structure/src/main/java/com/wordnik/exception/CodeGenerationException.java → code-gen/conf/java/structure/src/main/java/com/wordnik/swagger/exception/CodeGenerationException.java
View File

@ -1,4 +1,4 @@
package com.wordnik.exception; package com.wordnik.swagger.exception;
/** /**
* Exception raised while generating code for java driver. * Exception raised while generating code for java driver.

13
code-gen/src/main/java/com/wordnik/codegen/DriverCodeGenerator.java → code-gen/src/main/java/com/wordnik/swagger/codegen/DriverCodeGenerator.java
View File

@ -1,10 +1,11 @@
package com.wordnik.codegen; package com.wordnik.swagger.codegen;
import com.wordnik.codegen.api.SwaggerApi; import com.wordnik.swagger.codegen.api.SwaggerApi;
import com.wordnik.codegen.config.*; import com.wordnik.swagger.codegen.config.*;
import com.wordnik.codegen.config.ApiConfiguration; import com.wordnik.swagger.codegen.api.SwaggerApi;
import com.wordnik.codegen.resource.*; import com.wordnik.swagger.codegen.config.ApiConfiguration;
import com.wordnik.exception.CodeGenerationException; import com.wordnik.swagger.codegen.resource.*;
import com.wordnik.swagger.exception.CodeGenerationException;
import org.antlr.stringtemplate.StringTemplate; import org.antlr.stringtemplate.StringTemplate;
import org.antlr.stringtemplate.StringTemplateGroup; import org.antlr.stringtemplate.StringTemplateGroup;

2
code-gen/src/main/java/com/wordnik/codegen/FieldDefinition.java → code-gen/src/main/java/com/wordnik/swagger/codegen/FieldDefinition.java
View File

@ -1,4 +1,4 @@
package com.wordnik.codegen; package com.wordnik.swagger.codegen;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

5
code-gen/src/main/java/com/wordnik/codegen/MethodArgument.java → code-gen/src/main/java/com/wordnik/swagger/codegen/MethodArgument.java
View File

@ -1,6 +1,7 @@
package com.wordnik.codegen; package com.wordnik.swagger.codegen;
import com.wordnik.codegen.config.NamingPolicyProvider; import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
public class MethodArgument { public class MethodArgument {

5
code-gen/src/main/java/com/wordnik/codegen/ResourceMethod.java → code-gen/src/main/java/com/wordnik/swagger/codegen/ResourceMethod.java
View File

@ -1,6 +1,7 @@
package com.wordnik.codegen; package com.wordnik.swagger.codegen;
import com.wordnik.codegen.resource.Model; import com.wordnik.swagger.codegen.resource.Model;
import com.wordnik.swagger.codegen.resource.Model;
import java.util.List; import java.util.List;

17
code-gen/src/main/java/com/wordnik/codegen/api/SwaggerApi.java → code-gen/src/main/java/com/wordnik/swagger/codegen/api/SwaggerApi.java
View File

@ -1,14 +1,17 @@
package com.wordnik.codegen.api; package com.wordnik.swagger.codegen.api;
import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.api.client.ClientResponse;
import com.sun.jersey.api.client.WebResource; import com.sun.jersey.api.client.WebResource;
import com.wordnik.codegen.config.ApiConfiguration; import com.wordnik.swagger.codegen.config.*;
import com.wordnik.codegen.config.DataTypeMappingProvider; import com.wordnik.swagger.codegen.config.DataTypeMappingProvider;
import com.wordnik.codegen.config.NamingPolicyProvider; import com.wordnik.swagger.codegen.resource.Endpoint;
import com.wordnik.codegen.resource.Endpoint; import com.wordnik.swagger.codegen.resource.Endpoint;
import com.wordnik.codegen.resource.Resource; import com.wordnik.swagger.codegen.resource.Resource;
import com.wordnik.exception.CodeGenerationException; import com.wordnik.swagger.codegen.config.ApiConfiguration;
import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
import com.wordnik.swagger.codegen.resource.Resource;
import com.wordnik.swagger.exception.CodeGenerationException;
import org.codehaus.jackson.map.DeserializationConfig; import org.codehaus.jackson.map.DeserializationConfig;
import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.ObjectMapper;

4
code-gen/src/main/java/com/wordnik/codegen/config/ApiConfiguration.java → code-gen/src/main/java/com/wordnik/swagger/codegen/config/ApiConfiguration.java
View File

@ -1,6 +1,6 @@
package com.wordnik.codegen.config; package com.wordnik.swagger.codegen.config;
import com.wordnik.exception.CodeGenerationException; import com.wordnik.swagger.exception.CodeGenerationException;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

2
code-gen/src/main/java/com/wordnik/codegen/config/DataTypeMappingProvider.java → code-gen/src/main/java/com/wordnik/swagger/codegen/config/DataTypeMappingProvider.java
View File

@ -1,4 +1,4 @@
package com.wordnik.codegen.config; package com.wordnik.swagger.codegen.config;
import java.util.List; import java.util.List;

4
code-gen/src/main/java/com/wordnik/codegen/config/LanguageConfiguration.java → code-gen/src/main/java/com/wordnik/swagger/codegen/config/LanguageConfiguration.java
View File

@ -1,6 +1,6 @@
package com.wordnik.codegen.config; package com.wordnik.swagger.codegen.config;
import com.wordnik.exception.CodeGenerationException; import com.wordnik.swagger.exception.CodeGenerationException;
/** /**
* User: deepakmichael * User: deepakmichael

2
code-gen/src/main/java/com/wordnik/codegen/config/NamingPolicyProvider.java → code-gen/src/main/java/com/wordnik/swagger/codegen/config/NamingPolicyProvider.java
View File

@ -1,4 +1,4 @@
package com.wordnik.codegen.config; package com.wordnik.swagger.codegen.config;
/** /**
* Implementor of this class is responsible for generating the names for service classes and methods in * Implementor of this class is responsible for generating the names for service classes and methods in

2
code-gen/src/main/java/com/wordnik/codegen/config/RulesProvider.java → code-gen/src/main/java/com/wordnik/swagger/codegen/config/RulesProvider.java
View File

@ -1,4 +1,4 @@
package com.wordnik.codegen.config; package com.wordnik.swagger.codegen.config;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

10
code-gen/src/main/java/com/wordnik/codegen/config/common/CamelCaseNamingPolicyProvider.java → code-gen/src/main/java/com/wordnik/swagger/codegen/config/common/CamelCaseNamingPolicyProvider.java
View File

@ -1,8 +1,10 @@
package com.wordnik.codegen.config.common; package com.wordnik.swagger.codegen.config.common;
import com.wordnik.codegen.resource.Model; import com.wordnik.swagger.codegen.resource.Model;
import com.wordnik.codegen.config.NamingPolicyProvider; import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
import com.wordnik.exception.CodeGenerationException; import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
import com.wordnik.swagger.codegen.resource.Model;
import com.wordnik.swagger.exception.CodeGenerationException;
/** /**
* User: ramesh * User: ramesh

5
code-gen/src/main/java/com/wordnik/codegen/config/java/JavaCodeGenRulesProvider.java → code-gen/src/main/java/com/wordnik/swagger/codegen/config/java/JavaCodeGenRulesProvider.java
View File

@ -1,6 +1,7 @@
package com.wordnik.codegen.config.java; package com.wordnik.swagger.codegen.config.java;
import com.wordnik.codegen.config.RulesProvider; import com.wordnik.swagger.codegen.config.RulesProvider;
import com.wordnik.swagger.codegen.config.RulesProvider;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

11
code-gen/src/main/java/com/wordnik/codegen/config/java/JavaDataTypeMappingProvider.java → code-gen/src/main/java/com/wordnik/swagger/codegen/config/java/JavaDataTypeMappingProvider.java
View File

@ -1,8 +1,11 @@
package com.wordnik.codegen.config.java; package com.wordnik.swagger.codegen.config.java;
import com.wordnik.codegen.config.DataTypeMappingProvider; import com.wordnik.swagger.codegen.config.DataTypeMappingProvider;
import com.wordnik.codegen.config.NamingPolicyProvider; import com.wordnik.swagger.codegen.config.DataTypeMappingProvider;
import com.wordnik.codegen.config.common.CamelCaseNamingPolicyProvider; import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
import com.wordnik.swagger.codegen.config.common.CamelCaseNamingPolicyProvider;
import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
import com.wordnik.swagger.codegen.config.common.CamelCaseNamingPolicyProvider;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

34
code-gen/src/main/java/com/wordnik/codegen/config/java/JavaLibCodeGen.java → code-gen/src/main/java/com/wordnik/swagger/codegen/config/java/JavaLibCodeGen.java
View File

@ -1,10 +1,10 @@
package com.wordnik.codegen.config.java; package com.wordnik.swagger.codegen.config.java;
import com.wordnik.codegen.DriverCodeGenerator; import com.wordnik.swagger.codegen.DriverCodeGenerator;
import com.wordnik.codegen.config.ApiConfiguration; import com.wordnik.swagger.codegen.config.ApiConfiguration;
import com.wordnik.codegen.config.LanguageConfiguration; import com.wordnik.swagger.codegen.config.LanguageConfiguration;
import com.wordnik.codegen.config.common.CamelCaseNamingPolicyProvider; import com.wordnik.swagger.codegen.config.common.CamelCaseNamingPolicyProvider;
import com.wordnik.exception.CodeGenerationException; import com.wordnik.swagger.exception.CodeGenerationException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -44,21 +44,21 @@ public class JavaLibCodeGen extends DriverCodeGenerator {
apiConfiguration.setModelBaseClass("WordnikObject"); apiConfiguration.setModelBaseClass("WordnikObject");
List<String> defaultModelImports = new ArrayList<String>(); List<String> defaultModelImports = new ArrayList<String>();
defaultModelImports.add("com.wordnik.common.WordListType"); defaultModelImports.add("com.wordnik.swagger.common.WordListType");
defaultModelImports.add("com.wordnik.common.StringValue"); defaultModelImports.add("com.wordnik.swagger.common.StringValue");
defaultModelImports.add("com.wordnik.common.Size"); defaultModelImports.add("com.wordnik.swagger.common.Size");
defaultModelImports.add("com.wordnik.common.WordnikObject"); defaultModelImports.add("com.wordnik.swagger.common.WordnikObject");
List<String> defaultServiceImports = new ArrayList<String>(); List<String> defaultServiceImports = new ArrayList<String>();
defaultServiceImports.add("com.wordnik.model.Long"); defaultServiceImports.add("com.wordnik.swagger.model.Long");
defaultServiceImports.add("com.wordnik.common.*"); defaultServiceImports.add("com.wordnik.swagger.common.*");
defaultServiceImports.add("com.wordnik.common.ext.*"); defaultServiceImports.add("com.wordnik.swagger.common.ext.*");
apiConfiguration.setDefaultModelImports(defaultModelImports); apiConfiguration.setDefaultModelImports(defaultModelImports);
apiConfiguration.setDefaultServiceImports(defaultServiceImports); apiConfiguration.setDefaultServiceImports(defaultServiceImports);
apiConfiguration.setModelPackageName("com.wordnik.model"); apiConfiguration.setModelPackageName("com.wordnik.swagger.model");
apiConfiguration.setApiPackageName("com.wordnik.api"); apiConfiguration.setApiPackageName("com.wordnik.swagger.api");
apiConfiguration.setApiKey("myKey"); apiConfiguration.setApiKey("myKey");
apiConfiguration.setApiUrl("http://swagr.api.wordnik.com/v4/"); apiConfiguration.setApiUrl("http://swagr.api.wordnik.com/v4/");
@ -72,8 +72,8 @@ public class JavaLibCodeGen extends DriverCodeGenerator {
javaConfiguration.setClassFileExtension(".java"); javaConfiguration.setClassFileExtension(".java");
javaConfiguration.setOutputDirectory(outputPath); javaConfiguration.setOutputDirectory(outputPath);
javaConfiguration.setTemplateLocation("conf/java/templates"); javaConfiguration.setTemplateLocation("conf/java/templates");
javaConfiguration.setExceptionPackageName("com.wordnik.exception"); javaConfiguration.setExceptionPackageName("com.wordnik.swagger.exception");
javaConfiguration.setAnnotationPackageName("com.wordnik.annotations"); javaConfiguration.setAnnotationPackageName("com.wordnik.swagger.annotations");
return javaConfiguration; return javaConfiguration;
} }

5
code-gen/src/main/java/com/wordnik/codegen/resource/ApiModelDefn.java → code-gen/src/main/java/com/wordnik/swagger/codegen/resource/ApiModelDefn.java
View File

@ -1,6 +1,7 @@
package com.wordnik.codegen.resource; package com.wordnik.swagger.codegen.resource;
import com.wordnik.codegen.config.NamingPolicyProvider; import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.annotate.JsonProperty;
/** /**

2
code-gen/src/main/java/com/wordnik/codegen/resource/ApiModelListWrapper.java → code-gen/src/main/java/com/wordnik/swagger/codegen/resource/ApiModelListWrapper.java
View File

@ -1,4 +1,4 @@
package com.wordnik.codegen.resource; package com.wordnik.swagger.codegen.resource;
import org.codehaus.jackson.annotate.JsonAnyGetter; import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter; import org.codehaus.jackson.annotate.JsonAnySetter;

2
code-gen/src/main/java/com/wordnik/codegen/resource/ApiPropertyDefn.java → code-gen/src/main/java/com/wordnik/swagger/codegen/resource/ApiPropertyDefn.java
View File

@ -1,4 +1,4 @@
package com.wordnik.codegen.resource; package com.wordnik.swagger.codegen.resource;
import org.codehaus.jackson.annotate.JsonAnyGetter; import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter; import org.codehaus.jackson.annotate.JsonAnySetter;

5
code-gen/src/main/java/com/wordnik/codegen/resource/ApiPropertyListWrapper.java → code-gen/src/main/java/com/wordnik/swagger/codegen/resource/ApiPropertyListWrapper.java
View File

@ -1,6 +1,7 @@
package com.wordnik.codegen.resource; package com.wordnik.swagger.codegen.resource;
import com.wordnik.codegen.config.NamingPolicyProvider; import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
import org.codehaus.jackson.annotate.JsonAnyGetter; import org.codehaus.jackson.annotate.JsonAnyGetter;
import org.codehaus.jackson.annotate.JsonAnySetter; import org.codehaus.jackson.annotate.JsonAnySetter;
import org.codehaus.jackson.map.annotate.JsonSerialize; import org.codehaus.jackson.map.annotate.JsonSerialize;

11
code-gen/src/main/java/com/wordnik/codegen/resource/Endpoint.java → code-gen/src/main/java/com/wordnik/swagger/codegen/resource/Endpoint.java
View File

@ -1,8 +1,11 @@
package com.wordnik.codegen.resource; package com.wordnik.swagger.codegen.resource;
import com.wordnik.codegen.ResourceMethod; import com.wordnik.swagger.codegen.ResourceMethod;
import com.wordnik.codegen.config.DataTypeMappingProvider; import com.wordnik.swagger.codegen.config.DataTypeMappingProvider;
import com.wordnik.codegen.config.NamingPolicyProvider; import com.wordnik.swagger.codegen.config.DataTypeMappingProvider;
import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
import com.wordnik.swagger.codegen.ResourceMethod;
import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

14
code-gen/src/main/java/com/wordnik/codegen/resource/EndpointOperation.java → code-gen/src/main/java/com/wordnik/swagger/codegen/resource/EndpointOperation.java
View File

@ -1,9 +1,13 @@
package com.wordnik.codegen.resource; package com.wordnik.swagger.codegen.resource;
import com.wordnik.codegen.MethodArgument; import com.wordnik.swagger.codegen.MethodArgument;
import com.wordnik.codegen.ResourceMethod; import com.wordnik.swagger.codegen.ResourceMethod;
import com.wordnik.codegen.config.DataTypeMappingProvider; import com.wordnik.swagger.codegen.config.DataTypeMappingProvider;
import com.wordnik.codegen.config.NamingPolicyProvider; import com.wordnik.swagger.codegen.MethodArgument;
import com.wordnik.swagger.codegen.ResourceMethod;
import com.wordnik.swagger.codegen.config.DataTypeMappingProvider;
import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

2
code-gen/src/main/java/com/wordnik/codegen/resource/ErrorResponse.java → code-gen/src/main/java/com/wordnik/swagger/codegen/resource/ErrorResponse.java
View File

@ -1,4 +1,4 @@
package com.wordnik.codegen.resource; package com.wordnik.swagger.codegen.resource;
/** /**
* Created by IntelliJ IDEA. * Created by IntelliJ IDEA.

2
code-gen/src/main/java/com/wordnik/codegen/resource/Model.java → code-gen/src/main/java/com/wordnik/swagger/codegen/resource/Model.java
View File

@ -1,4 +1,4 @@
package com.wordnik.codegen.resource; package com.wordnik.swagger.codegen.resource;
import java.util.List; import java.util.List;

8
code-gen/src/main/java/com/wordnik/codegen/resource/ModelField.java → code-gen/src/main/java/com/wordnik/swagger/codegen/resource/ModelField.java
View File

@ -1,7 +1,9 @@
package com.wordnik.codegen.resource; package com.wordnik.swagger.codegen.resource;
import com.wordnik.codegen.FieldDefinition; import com.wordnik.swagger.codegen.FieldDefinition;
import com.wordnik.codegen.config.DataTypeMappingProvider; import com.wordnik.swagger.codegen.config.DataTypeMappingProvider;
import com.wordnik.swagger.codegen.FieldDefinition;
import com.wordnik.swagger.codegen.config.DataTypeMappingProvider;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

15
code-gen/src/main/java/com/wordnik/codegen/resource/Resource.java → code-gen/src/main/java/com/wordnik/swagger/codegen/resource/Resource.java
View File

@ -1,8 +1,11 @@
package com.wordnik.codegen.resource; package com.wordnik.swagger.codegen.resource;
import com.wordnik.codegen.ResourceMethod; import com.wordnik.swagger.codegen.ResourceMethod;
import com.wordnik.codegen.config.DataTypeMappingProvider; import com.wordnik.swagger.codegen.config.DataTypeMappingProvider;
import com.wordnik.codegen.config.NamingPolicyProvider; import com.wordnik.swagger.codegen.ResourceMethod;
import com.wordnik.swagger.codegen.config.DataTypeMappingProvider;
import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
import org.codehaus.jackson.annotate.JsonCreator; import org.codehaus.jackson.annotate.JsonCreator;
import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.annotate.JsonProperty;
@ -20,7 +23,7 @@ public class Resource {
private String apiVersion; private String apiVersion;
//TODO rename the JSON property too after the sandbox var has been renamed //TODO rename the JSON property too after the sandbox var has been renamed
@JsonProperty("swagrVersion") @JsonProperty("swaggerVersion")
private String swaggerVersion; private String swaggerVersion;
@JsonProperty("apis") @JsonProperty("apis")
@ -50,7 +53,7 @@ public class Resource {
} }
//TODO rename the JSON property too after the sandbox var has been renamed //TODO rename the JSON property too after the sandbox var has been renamed
@JsonProperty("swagrVersion") @JsonProperty("swaggerVersion")
public String getSwaggerVersion() { public String getSwaggerVersion() {
return swaggerVersion; return swaggerVersion;
} }

2
code-gen/src/main/java/com/wordnik/codegen/resource/Response.java → code-gen/src/main/java/com/wordnik/swagger/codegen/resource/Response.java
View File

@ -1,4 +1,4 @@
package com.wordnik.codegen.resource; package com.wordnik.swagger.codegen.resource;
import java.util.List; import java.util.List;

2
code-gen/src/main/java/com/wordnik/exception/CodeGenerationException.java → code-gen/src/main/java/com/wordnik/swagger/exception/CodeGenerationException.java
View File

@ -1,4 +1,4 @@
package com.wordnik.exception; package com.wordnik.swagger.exception;
/** /**
* Exception raised while generating code for java driver. * Exception raised while generating code for java driver.

8
java/src/test/java/com/wordnik/test/APITestRunner.java
View File

@ -11,11 +11,13 @@ import java.io.BufferedReader;
import java.io.FileReader; import java.io.FileReader;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import com.wordnik.codegen.config.ApiConfiguration; import com.wordnik.swagger.codegen.config.ApiConfiguration;
import com.wordnik.codegen.config.NamingPolicyProvider; import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
import com.wordnik.codegen.config.common.CamelCaseNamingPolicyProvider; import com.wordnik.swagger.codegen.config.common.CamelCaseNamingPolicyProvider;
import com.wordnik.common.*; import com.wordnik.common.*;
import com.wordnik.exception.APIException; import com.wordnik.exception.APIException;
import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
import com.wordnik.swagger.codegen.config.common.CamelCaseNamingPolicyProvider;
import org.apache.commons.beanutils.MethodUtils; import org.apache.commons.beanutils.MethodUtils;
import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.beanutils.PropertyUtils;
import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.ObjectMapper;

16
java/src/test/java/com/wordnik/test/TestCaseExecutor.java
View File

@ -2,13 +2,17 @@ package com.wordnik.test;
import com.wordnik.annotations.MethodArgumentNames; import com.wordnik.annotations.MethodArgumentNames;
import com.wordnik.api.WordAPI; import com.wordnik.api.WordAPI;
import com.wordnik.codegen.config.ApiConfiguration; import com.wordnik.swagger.codegen.config.ApiConfiguration;
import com.wordnik.codegen.config.RulesProvider; import com.wordnik.swagger.codegen.config.*;
import com.wordnik.codegen.config.java.JavaCodeGenRulesProvider; import com.wordnik.swagger.codegen.config.common.CamelCaseNamingPolicyProvider;
import com.wordnik.codegen.config.NamingPolicyProvider; import com.wordnik.swagger.codegen.config.java.JavaCodeGenRulesProvider;
import com.wordnik.codegen.config.common.CamelCaseNamingPolicyProvider; import com.wordnik.swagger.codegen.config.common.CamelCaseNamingPolicyProvider;
import com.wordnik.exception.APIException; import com.wordnik.exception.APIException;
import com.wordnik.exception.APIExceptionCodes; import com.wordnik.exception.APIExceptionCodes;
import com.wordnik.swagger.codegen.config.ApiConfiguration;
import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
import com.wordnik.swagger.codegen.config.RulesProvider;
import com.wordnik.swagger.codegen.config.java.JavaCodeGenRulesProvider;
import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.BeanUtils;
import org.codehaus.jettison.json.JSONObject; import org.codehaus.jettison.json.JSONObject;
@ -26,7 +30,7 @@ import java.util.Map;
*/ */
public class TestCaseExecutor { public class TestCaseExecutor {
public ApiConfiguration config = new ApiConfiguration(); public ApiConfiguration config = new com.wordnik.swagger.codegen.config.ApiConfiguration();
private NamingPolicyProvider namingPolicyProvider = new CamelCaseNamingPolicyProvider(); private NamingPolicyProvider namingPolicyProvider = new CamelCaseNamingPolicyProvider();
private RulesProvider rulesProvider = new JavaCodeGenRulesProvider(); private RulesProvider rulesProvider = new JavaCodeGenRulesProvider();