Merge pull request #19 from yamlin/yam

Move the client implementation to target/generated_sources
yahoo · Feb 7, 2017 · 430149b · 430149b
2 parents d0e3bc5 + 63f882f
commit 430149b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/cmd/rdl-gen-parsec-java-client/main.go b/cmd/rdl-gen-parsec-java-client/main.go
@@ -53,7 +53,7 @@ func GenerateJavaClient(banner string, schema *rdl.Schema, outdir string, ns str
 
 	reg := rdl.NewTypeRegistry(schema)
 
-	packageSrcDir, err := utils.JavaGenerationSourceDir(schema, ns)
+	packageSrcDir, err := utils.JavaGenerationDir(outdir, schema, ns)
 	if err != nil {
 		return err
 	}
@@ -208,7 +208,7 @@ func (gen *javaClientGenerator) needBody(r *rdl.Resource) bool {
 }
 
 const javaClientInterfaceTemplate = `{{origHeader}}
-package {{origPackage}};
+package {{origPackage}}.parsec_generated;
 
 import java.util.concurrent.CompletableFuture;
 import {{package}}.ResourceException;
@@ -221,7 +221,7 @@ public interface {{cName}}Client {
 }
 `
 const javaClientTemplate = `{{origHeader}}
-package {{origPackage}};
+package {{origPackage}}.parsec_generated;
 
 import {{package}}.ResourceException;
 {{range .Types}}{{if .StructTypeDef}}{{if .StructTypeDef.Name}}import {{package}}.{{.StructTypeDef.Name}};

diff --git a/testdata/Sample2ClientImpl.txt b/testdata/Sample2ClientImpl.txt
@@ -2,7 +2,7 @@
 // This file is generated by test
 // WILL NOT be auto-generated if file has already existed.
 //
-package com.example;
+package com.example.parsec_generated;
 
 import com.example.parsec_generated.ResourceException;
 import com.example.parsec_generated.User;

diff --git a/testdata/SampleClient.txt b/testdata/SampleClient.txt
@@ -2,7 +2,7 @@
 // This file is generated by test
 // WILL NOT be auto-generated if file has already existed.
 //
-package com.example;
+package com.example.parsec_generated;
 
 import java.util.concurrent.CompletableFuture;
 import com.example.parsec_generated.ResourceException;

diff --git a/testdata/SampleClientImpl.txt b/testdata/SampleClientImpl.txt
@@ -2,7 +2,7 @@
 // This file is generated by test
 // WILL NOT be auto-generated if file has already existed.
 //
-package com.example;
+package com.example.parsec_generated;
 
 import com.example.parsec_generated.ResourceException;
 import com.example.parsec_generated.User;