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

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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 {

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;

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.ClientResponse;
import com.sun.jersey.api.client.WebResource;
import com.wordnik.codegen.config.ApiConfiguration;
import com.wordnik.codegen.config.DataTypeMappingProvider;
import com.wordnik.codegen.config.NamingPolicyProvider;
import com.wordnik.codegen.resource.Endpoint;
import com.wordnik.codegen.resource.Resource;
import com.wordnik.exception.CodeGenerationException;
import com.wordnik.swagger.codegen.config.*;
import com.wordnik.swagger.codegen.config.DataTypeMappingProvider;
import com.wordnik.swagger.codegen.resource.Endpoint;
import com.wordnik.swagger.codegen.resource.Endpoint;
import com.wordnik.swagger.codegen.resource.Resource;
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.ObjectMapper;

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.List;

View File

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

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

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

View File

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

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.codegen.config.NamingPolicyProvider;
import com.wordnik.exception.CodeGenerationException;
import com.wordnik.swagger.codegen.resource.Model;
import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
import com.wordnik.swagger.codegen.resource.Model;
import com.wordnik.swagger.exception.CodeGenerationException;
/**
* User: ramesh

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.List;

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.codegen.config.NamingPolicyProvider;
import com.wordnik.codegen.config.common.CamelCaseNamingPolicyProvider;
import com.wordnik.swagger.codegen.config.DataTypeMappingProvider;
import com.wordnik.swagger.codegen.config.DataTypeMappingProvider;
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.HashMap;

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

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;
/**

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.JsonAnySetter;

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.JsonAnySetter;

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.JsonAnySetter;
import org.codehaus.jackson.map.annotate.JsonSerialize;

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.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.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.List;

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.codegen.ResourceMethod;
import com.wordnik.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.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.List;

View File

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

View File

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

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.codegen.config.DataTypeMappingProvider;
import com.wordnik.swagger.codegen.FieldDefinition;
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.List;

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.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.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.JsonProperty;
@ -20,7 +23,7 @@ public class Resource {
private String apiVersion;
//TODO rename the JSON property too after the sandbox var has been renamed
@JsonProperty("swagrVersion")
@JsonProperty("swaggerVersion")
private String swaggerVersion;
@JsonProperty("apis")
@ -50,7 +53,7 @@ public class Resource {
}
//TODO rename the JSON property too after the sandbox var has been renamed
@JsonProperty("swagrVersion")
@JsonProperty("swaggerVersion")
public String getSwaggerVersion() {
return swaggerVersion;
}

View File

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

View File

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

View File

@ -11,11 +11,13 @@ import java.io.BufferedReader;
import java.io.FileReader;
import java.io.InputStreamReader;
import com.wordnik.codegen.config.ApiConfiguration;
import com.wordnik.codegen.config.NamingPolicyProvider;
import com.wordnik.codegen.config.common.CamelCaseNamingPolicyProvider;
import com.wordnik.swagger.codegen.config.ApiConfiguration;
import com.wordnik.swagger.codegen.config.NamingPolicyProvider;
import com.wordnik.swagger.codegen.config.common.CamelCaseNamingPolicyProvider;
import com.wordnik.common.*;
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.PropertyUtils;
import org.codehaus.jackson.map.ObjectMapper;

View File

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