홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
VinodKumarS-Huawei
Committed by Ray Milkey
cb3a1f52 1 parent c2a542bc

[ONOS-4303, ONOS-4508, ONOS-4509, ONOS-4510, ONOS-4351]notification,rpc,union,sub-module,augment 

Change-Id: Ibeed9ff965c13fd66743c1080cb1350d93a3a435
Expand all
Inline Side-by-side
Showing 43 changed files with 1343 additions and 280 deletions
...@@ -54,7 +54,7 @@ import org.onosproject.yangutils.utils.YangConstructType; ...@@ -54,7 +54,7 @@ import org.onosproject.yangutils.utils.YangConstructType;
54 /** 54 /**
55 * Represents data model node to maintain information defined in YANG typedef. 55 * Represents data model node to maintain information defined in YANG typedef.
56 */ 56 */
57 -public class YangTypeDef extends YangNode implements YangCommonInfo, Parsable, YangTypeContainer { 57 +public class YangTypeDef extends YangNode implements YangCommonInfo, Parsable, YangTypeHolder {
58 58
59 /** 59 /**
60 * Default value in string, needs to be converted to the target object, 60 * Default value in string, needs to be converted to the target object,
......
...@@ -21,7 +21,7 @@ import java.util.List; ...@@ -21,7 +21,7 @@ import java.util.List;
21 /** 21 /**
22 * Represents the holder with type(s). 22 * Represents the holder with type(s).
23 */ 23 */
24 -public interface YangTypeContainer { 24 +public interface YangTypeHolder {
25 25
26 /** 26 /**
27 * Returns type list. 27 * Returns type list.
......
...@@ -47,7 +47,7 @@ import org.onosproject.yangutils.utils.YangConstructType; ...@@ -47,7 +47,7 @@ import org.onosproject.yangutils.utils.YangConstructType;
47 /** 47 /**
48 * Represents data model node to maintain information defined in YANG union. 48 * Represents data model node to maintain information defined in YANG union.
49 */ 49 */
50 -public class YangUnion extends YangNode implements Parsable, YangTypeContainer { 50 +public class YangUnion extends YangNode implements Parsable, YangTypeHolder {
51 51
52 // List of YANG type. 52 // List of YANG type.
53 private List<YangType<?>> typeList; 53 private List<YangType<?>> typeList;
......
...@@ -19,13 +19,14 @@ package org.onosproject.yangutils.datamodel.utils; ...@@ -19,13 +19,14 @@ package org.onosproject.yangutils.datamodel.utils;
19 import java.util.List; 19 import java.util.List;
20 20
21 import org.onosproject.yangutils.datamodel.CollisionDetector; 21 import org.onosproject.yangutils.datamodel.CollisionDetector;
22 -import org.onosproject.yangutils.datamodel.YangReferenceResolver;
23 import org.onosproject.yangutils.datamodel.YangImport; 22 import org.onosproject.yangutils.datamodel.YangImport;
24 import org.onosproject.yangutils.datamodel.YangLeaf; 23 import org.onosproject.yangutils.datamodel.YangLeaf;
25 import org.onosproject.yangutils.datamodel.YangLeafList; 24 import org.onosproject.yangutils.datamodel.YangLeafList;
26 import org.onosproject.yangutils.datamodel.YangLeavesHolder; 25 import org.onosproject.yangutils.datamodel.YangLeavesHolder;
27 import org.onosproject.yangutils.datamodel.YangNode; 26 import org.onosproject.yangutils.datamodel.YangNode;
27 +import org.onosproject.yangutils.datamodel.YangReferenceResolver;
28 import org.onosproject.yangutils.datamodel.YangResolutionInfo; 28 import org.onosproject.yangutils.datamodel.YangResolutionInfo;
29 +import org.onosproject.yangutils.datamodel.YangRpc;
29 import org.onosproject.yangutils.datamodel.exceptions.DataModelException; 30 import org.onosproject.yangutils.datamodel.exceptions.DataModelException;
30 import org.onosproject.yangutils.parser.Parsable; 31 import org.onosproject.yangutils.parser.Parsable;
31 import org.onosproject.yangutils.utils.YangConstructType; 32 import org.onosproject.yangutils.utils.YangConstructType;
...@@ -222,4 +223,21 @@ public final class DataModelUtils { ...@@ -222,4 +223,21 @@ public final class DataModelUtils {
222 resolutionInfo.resolveLinkingForResolutionInfo(dataModelRootNode.getPrefix()); 223 resolutionInfo.resolveLinkingForResolutionInfo(dataModelRootNode.getPrefix());
223 } 224 }
224 } 225 }
226 +
227 + /**
228 + * Checks if there is any rpc defined in the module or sub-module.
229 + *
230 + * @param rootNode root node of the data model
231 + * @return status of rpc's existence
232 + */
233 + public static boolean isRpcChildNodePresent(YangNode rootNode) {
234 + YangNode childNode = rootNode.getChild();
235 + while (childNode != null) {
236 + if (childNode instanceof YangRpc) {
237 + return true;
238 + }
239 + childNode = childNode.getNextSibling();
240 + }
241 + return false;
242 + }
225 } 243 }
......
...@@ -46,7 +46,7 @@ import static org.onosproject.yangutils.utils.UtilConstants.DEFAULT_BASE_PKG; ...@@ -46,7 +46,7 @@ import static org.onosproject.yangutils.utils.UtilConstants.DEFAULT_BASE_PKG;
46 import static org.onosproject.yangutils.utils.UtilConstants.NEW_LINE; 46 import static org.onosproject.yangutils.utils.UtilConstants.NEW_LINE;
47 import static org.onosproject.yangutils.utils.UtilConstants.SLASH; 47 import static org.onosproject.yangutils.utils.UtilConstants.SLASH;
48 import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.addToSource; 48 import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.addToSource;
49 -import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.clean; 49 +import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.deleteDirectory;
50 import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.copyYangFilesToTarget; 50 import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.copyYangFilesToTarget;
51 import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.getDirectory; 51 import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.getDirectory;
52 52
...@@ -127,8 +127,8 @@ public class YangUtilManager extends AbstractMojo { ...@@ -127,8 +127,8 @@ public class YangUtilManager extends AbstractMojo {
127 /** 127 /**
128 * For deleting the generated code in previous build. 128 * For deleting the generated code in previous build.
129 */ 129 */
130 - clean(getDirectory(baseDir, genFilesDir) + DEFAULT_PKG); 130 + deleteDirectory(getDirectory(baseDir, genFilesDir) + DEFAULT_PKG);
131 - clean(getDirectory(baseDir, outputDirectory)); 131 + deleteDirectory(getDirectory(baseDir, outputDirectory));
132 132
133 String searchDir = getDirectory(baseDir, yangFilesDir); 133 String searchDir = getDirectory(baseDir, yangFilesDir);
134 String codeGenDir = getDirectory(baseDir, genFilesDir) + SLASH; 134 String codeGenDir = getDirectory(baseDir, genFilesDir) + SLASH;
...@@ -166,7 +166,7 @@ public class YangUtilManager extends AbstractMojo { ...@@ -166,7 +166,7 @@ public class YangUtilManager extends AbstractMojo {
166 } catch (Exception e) { 166 } catch (Exception e) {
167 try { 167 try {
168 translatorErrorHandler(getRootNode()); 168 translatorErrorHandler(getRootNode());
169 - clean(getDirectory(baseDir, genFilesDir) + DEFAULT_PKG); 169 + deleteDirectory(getDirectory(baseDir, genFilesDir) + DEFAULT_PKG);
170 } catch (IOException | DataModelException ex) { 170 } catch (IOException | DataModelException ex) {
171 throw new MojoExecutionException("Error handler failed to delete files for data model node."); 171 throw new MojoExecutionException("Error handler failed to delete files for data model node.");
172 } 172 }
......
...@@ -50,15 +50,7 @@ public final class GeneratedJavaFileType { ...@@ -50,15 +50,7 @@ public final class GeneratedJavaFileType {
50 /** 50 /**
51 * Java interface corresponding to rpc. 51 * Java interface corresponding to rpc.
52 */ 52 */
53 - public static final int GENERATE_RPC_INTERFACE = 16; 53 + public static final int GENERATE_SERVICE_AND_MANAGER = 16;
54 -
55 - /**
56 - * Interface, class file and rpc.
57 - */
58 - public static final int GENERATE_MANAGER_WITH_RPC = GENERATE_INTERFACE_WITH_BUILDER
59 - | GENERATE_RPC_INTERFACE;
60 -
61 - // TODO RPC implementation to be integrated with notification.
62 54
63 /** 55 /**
64 * Java class corresponding to YANG enumeration. 56 * Java class corresponding to YANG enumeration.
...@@ -82,6 +74,16 @@ public final class GeneratedJavaFileType { ...@@ -82,6 +74,16 @@ public final class GeneratedJavaFileType {
82 | GENERATE_UNION_CLASS; 74 | GENERATE_UNION_CLASS;
83 75
84 /** 76 /**
77 + * Event class.
78 + */
79 + public static final int GENERATE_EVENT_CLASS = 256;
80 +
81 + /**
82 + * Event listener class.
83 + */
84 + public static final int GENERATE_EVENT_LISTENER_INTERFACE = 512;
85 +
86 + /**
85 * Creates an instance of generate java file type. 87 * Creates an instance of generate java file type.
86 */ 88 */
87 private GeneratedJavaFileType() { 89 private GeneratedJavaFileType() {
......
...@@ -87,9 +87,14 @@ public final class GeneratedTempFileType { ...@@ -87,9 +87,14 @@ public final class GeneratedTempFileType {
87 public static final int ENUM_IMPL_MASK = 4096; 87 public static final int ENUM_IMPL_MASK = 4096;
88 88
89 /** 89 /**
90 - * Rpc implementation of class. 90 + * Rpc interface of module / sub module.
91 */ 91 */
92 - public static final int RPC_IMPL_MASK = 8192; 92 + public static final int RPC_INTERFACE_MASK = 8192;
93 +
94 + /**
95 + * Rpc implementation of module / sub module.
96 + */
97 + public static final int RPC_IMPL_MASK = 16384;
93 98
94 /** 99 /**
95 * Creates an instance of generated temp file type. 100 * Creates an instance of generated temp file type.
......
...@@ -31,13 +31,14 @@ public interface JavaCodeGenerator { ...@@ -31,13 +31,14 @@ public interface JavaCodeGenerator {
31 * @param yangPlugin YANG plugin config 31 * @param yangPlugin YANG plugin config
32 * @throws IOException when fails to translate the data model tree 32 * @throws IOException when fails to translate the data model tree
33 */ 33 */
34 - void generateCodeEntry(YangPluginConfig yangPlugin) throws IOException; 34 + void generateCodeEntry(YangPluginConfig yangPlugin)
35 + throws IOException;
35 36
36 /** 37 /**
37 * Traverse the schema of application and generate corresponding code. 38 * Traverse the schema of application and generate corresponding code.
38 * 39 *
39 * @throws IOException when fails to generate java code 40 * @throws IOException when fails to generate java code
40 */ 41 */
41 - void generateCodeExit() throws IOException; 42 + void generateCodeExit()
42 - 43 + throws IOException;
43 } 44 }
......
...@@ -78,8 +78,23 @@ public final class JavaCodeGeneratorUtil { ...@@ -78,8 +78,23 @@ public final class JavaCodeGeneratorUtil {
78 78
79 while (codeGenNode != null) { 79 while (codeGenNode != null) {
80 if (curTraversal != PARENT) { 80 if (curTraversal != PARENT) {
81 - setCurNode(codeGenNode); 81 + if (codeGenNode instanceof JavaCodeGenerator) {
82 - generateCodeEntry(codeGenNode, yangPlugin); 82 + setCurNode(codeGenNode);
83 + generateCodeEntry(codeGenNode, yangPlugin);
84 + } else {
85 + /*
86 + * For grouping and uses, there is no code generation, skip the generation for the child.
87 + */
88 + if (codeGenNode.getNextSibling() != null) {
89 + curTraversal = SIBILING;
90 + codeGenNode = codeGenNode.getNextSibling();
91 + } else {
92 + curTraversal = PARENT;
93 + codeGenNode = codeGenNode.getParent();
94 + }
95 + continue;
96 + }
97 +
83 } 98 }
84 if (curTraversal != PARENT && codeGenNode.getChild() != null) { 99 if (curTraversal != PARENT && codeGenNode.getChild() != null) {
85 curTraversal = CHILD; 100 curTraversal = CHILD;
...@@ -238,7 +253,7 @@ public final class JavaCodeGeneratorUtil { ...@@ -238,7 +253,7 @@ public final class JavaCodeGeneratorUtil {
238 throws IOException { 253 throws IOException {
239 254
240 if (((TempJavaCodeFragmentFilesContainer) node).getTempJavaCodeFragmentFiles() != null) { 255 if (((TempJavaCodeFragmentFilesContainer) node).getTempJavaCodeFragmentFiles() != null) {
241 - ((TempJavaCodeFragmentFilesContainer) node).getTempJavaCodeFragmentFiles().close(true); 256 + ((TempJavaCodeFragmentFilesContainer) node).getTempJavaCodeFragmentFiles().freeTemporaryResources(true);
242 } 257 }
243 } 258 }
244 } 259 }
......
...@@ -53,7 +53,7 @@ public class JavaFileInfo { ...@@ -53,7 +53,7 @@ public class JavaFileInfo {
53 * definition. 53 * definition.
54 * 54 *
55 * @return the types of files being generated corresponding to the YANG 55 * @return the types of files being generated corresponding to the YANG
56 - * definition 56 + * definition
57 */ 57 */
58 public int getGeneratedFileTypes() { 58 public int getGeneratedFileTypes() {
59 return genFileTypes; 59 return genFileTypes;
...@@ -64,13 +64,24 @@ public class JavaFileInfo { ...@@ -64,13 +64,24 @@ public class JavaFileInfo {
64 * definition. 64 * definition.
65 * 65 *
66 * @param fileTypes the types of files being generated corresponding to the 66 * @param fileTypes the types of files being generated corresponding to the
67 - * YANG definition 67 + * YANG definition
68 */ 68 */
69 public void setGeneratedFileTypes(int fileTypes) { 69 public void setGeneratedFileTypes(int fileTypes) {
70 genFileTypes = fileTypes; 70 genFileTypes = fileTypes;
71 } 71 }
72 72
73 /** 73 /**
74 + * Adds the types of files being generated corresponding to the YANG
75 + * definition.
76 + *
77 + * @param fileTypes the types of files being generated corresponding to the
78 + * YANG definition
79 + */
80 + public void addGeneratedFileTypes(int fileTypes) {
81 + genFileTypes |= fileTypes;
82 + }
83 +
84 + /**
74 * Returns the java name of the node. 85 * Returns the java name of the node.
75 * 86 *
76 * @return the java name of node 87 * @return the java name of node
......
...@@ -16,15 +16,31 @@ ...@@ -16,15 +16,31 @@
16 16
17 package org.onosproject.yangutils.translator.tojava; 17 package org.onosproject.yangutils.translator.tojava;
18 18
19 +import java.io.File;
19 import java.io.IOException; 20 import java.io.IOException;
20 21
22 +import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.CONSTRUCTOR_IMPL_MASK;
23 +import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getConstructor;
24 +import static org.onosproject.yangutils.translator.tojava.utils.TempJavaCodeFragmentFilesUtils.closeFile;
25 +
21 /** 26 /**
22 * Represents implementation of java bean code fragments temporary implementations. 27 * Represents implementation of java bean code fragments temporary implementations.
28 + * Maintains the temp files required specific for bean java snippet generation.
23 */ 29 */
24 public class TempJavaBeanFragmentFiles 30 public class TempJavaBeanFragmentFiles
25 extends TempJavaFragmentFiles { 31 extends TempJavaFragmentFiles {
26 32
27 /** 33 /**
34 + * File name for constructor.
35 + */
36 + private static final String CONSTRUCTOR_FILE_NAME = "Constructor";
37 +
38 + /**
39 + * Temporary file handle for constructor of class.
40 + */
41 + private File constructorImplTempFileHandle;
42 +
43 + /**
28 * Creates an instance of temporary java code fragment. 44 * Creates an instance of temporary java code fragment.
29 * 45 *
30 * @param javaFileInfo generated java file info 46 * @param javaFileInfo generated java file info
...@@ -32,6 +48,81 @@ public class TempJavaBeanFragmentFiles ...@@ -32,6 +48,81 @@ public class TempJavaBeanFragmentFiles
32 */ 48 */
33 public TempJavaBeanFragmentFiles(JavaFileInfo javaFileInfo) 49 public TempJavaBeanFragmentFiles(JavaFileInfo javaFileInfo)
34 throws IOException { 50 throws IOException {
51 +
35 super(javaFileInfo); 52 super(javaFileInfo);
53 +
54 +
55 + /*
56 + * Initialize getterImpl, attributes, constructor, hash code, equals and
57 + * to strings when generation file type matches to impl class mask.
58 + */
59 + addGeneratedTempFile(CONSTRUCTOR_IMPL_MASK);
60 +
61 + setConstructorImplTempFileHandle(getTemporaryFileHandle(CONSTRUCTOR_FILE_NAME));
36 } 62 }
63 +
64 + /**
65 + * Returns constructor's temporary file handle.
66 + *
67 + * @return temporary file handle
68 + */
69 + public File getConstructorImplTempFileHandle() {
70 + return constructorImplTempFileHandle;
71 + }
72 +
73 + /**
74 + * Sets to constructor's temporary file handle.
75 + *
76 + * @param constructor file handle for to constructor
77 + */
78 + private void setConstructorImplTempFileHandle(File constructor) {
79 + constructorImplTempFileHandle = constructor;
80 + }
81 +
82 + /**
83 + * Adds constructor for class.
84 + *
85 + * @param attr attribute info
86 + * @throws IOException when fails to append to temporary file
87 + */
88 + private void addConstructor(JavaAttributeInfo attr)
89 + throws IOException {
90 + appendToFile(getConstructorImplTempFileHandle(), getConstructor(getGeneratedJavaClassName(), attr,
91 + getGeneratedJavaFiles()));
92 + }
93 +
94 + /**
95 + * Adds the new attribute info to the target generated temporary files.
96 + *
97 + * @param newAttrInfo the attribute info that needs to be added to temporary
98 + * files
99 + * @throws IOException IO operation fail
100 + */
101 + void addJavaSnippetInfoToApplicableTempFiles(JavaAttributeInfo newAttrInfo)
102 + throws IOException {
103 + super.addJavaSnippetInfoToApplicableTempFiles(newAttrInfo);
104 + addConstructor(newAttrInfo);
105 + }
106 +
107 + /**
108 + * Removes all temporary file handles.
109 + *
110 + * @param isErrorOccurred when translator fails to generate java files we
111 + * need to close all open file handles include temporary files
112 + * and java files.
113 + * @throws IOException when failed to delete the temporary files
114 + */
115 + @Override
116 + public void freeTemporaryResources(boolean isErrorOccurred)
117 + throws IOException {
118 +
119 + /*
120 + * Close constructor temporary file handle and delete the file.
121 + */
122 + closeFile(getConstructorImplTempFileHandle(), true);
123 +
124 + super.freeTemporaryResources(isErrorOccurred);
125 + }
126 +
127 +
37 } 128 }
......
...@@ -18,18 +18,22 @@ package org.onosproject.yangutils.translator.tojava; ...@@ -18,18 +18,22 @@ package org.onosproject.yangutils.translator.tojava;
18 18
19 import java.io.IOException; 19 import java.io.IOException;
20 20
21 -import org.onosproject.yangutils.datamodel.YangTypeContainer;
22 import org.onosproject.yangutils.datamodel.YangNode; 21 import org.onosproject.yangutils.datamodel.YangNode;
22 +import org.onosproject.yangutils.datamodel.YangTypeHolder;
23 import org.onosproject.yangutils.translator.exception.TranslatorException; 23 import org.onosproject.yangutils.translator.exception.TranslatorException;
24 24
25 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_ENUM_CLASS; 25 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_ENUM_CLASS;
26 +import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_EVENT_CLASS;
27 +import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_EVENT_LISTENER_INTERFACE;
26 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_INTERFACE_WITH_BUILDER; 28 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_INTERFACE_WITH_BUILDER;
27 -import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_RPC_INTERFACE; 29 +import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_SERVICE_AND_MANAGER;
28 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_TYPE_CLASS; 30 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_TYPE_CLASS;
29 import static org.onosproject.yangutils.translator.tojava.utils.JavaFileGenerator.getExtendsList; 31 import static org.onosproject.yangutils.translator.tojava.utils.JavaFileGenerator.getExtendsList;
30 32
31 /** 33 /**
32 * Represents implementation of java code fragments temporary implementations. 34 * Represents implementation of java code fragments temporary implementations.
35 + * Contains fragment file object of different types of java file.
36 + * Uses required object(s) to generate the target java file(s).
33 */ 37 */
34 public class TempJavaCodeFragmentFiles { 38 public class TempJavaCodeFragmentFiles {
35 39
...@@ -54,6 +58,17 @@ public class TempJavaCodeFragmentFiles { ...@@ -54,6 +58,17 @@ public class TempJavaCodeFragmentFiles {
54 private TempJavaEnumerationFragmentFiles enumerationTempFiles; 58 private TempJavaEnumerationFragmentFiles enumerationTempFiles;
55 59
56 /** 60 /**
61 + * Has the temporary files required for generated event classes.
62 + */
63 + private TempJavaEventFragmentFiles eventTempFiles;
64 +
65 + /**
66 + * Has the temporary files required for generated event listenerclasses.
67 + */
68 + private TempJavaEventListenerFragmentFiles eventListenerTempFiles;
69 +
70 +
71 + /**
57 * Creates an instance of temporary java code fragment. 72 * Creates an instance of temporary java code fragment.
58 * 73 *
59 * @param javaFileInfo generated java file info 74 * @param javaFileInfo generated java file info
...@@ -80,9 +95,17 @@ public class TempJavaCodeFragmentFiles { ...@@ -80,9 +95,17 @@ public class TempJavaCodeFragmentFiles {
80 setEnumerationTempFiles(new TempJavaEnumerationFragmentFiles(javaFileInfo)); 95 setEnumerationTempFiles(new TempJavaEnumerationFragmentFiles(javaFileInfo));
81 } 96 }
82 97
83 - if ((javaFileInfo.getGeneratedFileTypes() & GENERATE_RPC_INTERFACE) != 0) { 98 + if ((javaFileInfo.getGeneratedFileTypes() & GENERATE_SERVICE_AND_MANAGER) != 0) {
84 setServiceTempFiles(new TempJavaServiceFragmentFiles(javaFileInfo)); 99 setServiceTempFiles(new TempJavaServiceFragmentFiles(javaFileInfo));
85 } 100 }
101 +
102 + if ((javaFileInfo.getGeneratedFileTypes() & GENERATE_EVENT_CLASS) != 0) {
103 + setEventTempFiles(new TempJavaEventFragmentFiles(javaFileInfo));
104 + }
105 +
106 + if ((javaFileInfo.getGeneratedFileTypes() & GENERATE_EVENT_LISTENER_INTERFACE) != 0) {
107 + setEventListenerTempFiles(new TempJavaEventListenerFragmentFiles(javaFileInfo));
108 + }
86 } 109 }
87 110
88 /** 111 /**
...@@ -161,6 +184,43 @@ public class TempJavaCodeFragmentFiles { ...@@ -161,6 +184,43 @@ public class TempJavaCodeFragmentFiles {
161 } 184 }
162 185
163 /** 186 /**
187 + * Retrieves the temp file handle for event file generation.
188 + *
189 + * @return temp file handle for event file generation
190 + */
191 + public TempJavaEventFragmentFiles getEventTempFiles() {
192 + return eventTempFiles;
193 + }
194 +
195 + /**
196 + * Sets temp file handle for event file generation.
197 + *
198 + * @param eventTempFiles temp file handle for event file generation
199 + */
200 + public void setEventTempFiles(TempJavaEventFragmentFiles eventTempFiles) {
201 + this.eventTempFiles = eventTempFiles;
202 + }
203 +
204 + /**
205 + * Retrieves the temp file handle for event listener file generation.
206 + *
207 + * @return temp file handle for event listener file generation
208 + */
209 + public TempJavaEventListenerFragmentFiles getEventListenerTempFiles() {
210 + return eventListenerTempFiles;
211 + }
212 +
213 + /**
214 + * Sets temp file handle for event listener file generation.
215 + *
216 + * @param eventListenerTempFiles temp file handle for event listener file generation
217 + */
218 + public void setEventListenerTempFiles(
219 + TempJavaEventListenerFragmentFiles eventListenerTempFiles) {
220 + this.eventListenerTempFiles = eventListenerTempFiles;
221 + }
222 +
223 + /**
164 * Constructs java code exit. 224 * Constructs java code exit.
165 * 225 *
166 * @param fileType generated file type 226 * @param fileType generated file type
...@@ -170,17 +230,42 @@ public class TempJavaCodeFragmentFiles { ...@@ -170,17 +230,42 @@ public class TempJavaCodeFragmentFiles {
170 public void generateJavaFile(int fileType, YangNode curNode) 230 public void generateJavaFile(int fileType, YangNode curNode)
171 throws IOException { 231 throws IOException {
172 232
173 - if (getBeanTempFiles() != null) { 233 + if ((fileType & GENERATE_INTERFACE_WITH_BUILDER) != 0) {
174 getBeanTempFiles().generateJavaFile(fileType, curNode); 234 getBeanTempFiles().generateJavaFile(fileType, curNode);
175 } 235 }
176 236
177 /** 237 /**
178 * Creates user defined data type class file. 238 * Creates user defined data type class file.
179 */ 239 */
180 - if (getTypeTempFiles() != null) { 240 + if ((fileType & GENERATE_TYPE_CLASS) != 0) {
181 getTypeTempFiles().generateJavaFile(fileType, curNode); 241 getTypeTempFiles().generateJavaFile(fileType, curNode);
182 } 242 }
183 243
244 +
245 + if (fileType == GENERATE_SERVICE_AND_MANAGER) {
246 +
247 + getServiceTempFiles().generateJavaFile(GENERATE_SERVICE_AND_MANAGER, curNode);
248 +
249 +
250 + }
251 +
252 + if ((fileType & GENERATE_EVENT_CLASS) != 0) {
253 + /**
254 + * Creates event class file.
255 + */
256 + if (getEventTempFiles() != null) {
257 + getEventTempFiles().generateJavaFile(fileType, curNode);
258 + }
259 + }
260 +
261 + if ((fileType & GENERATE_EVENT_LISTENER_INTERFACE) != 0) {
262 + /**
263 + * Creates event listener class file.
264 + */
265 + getEventListenerTempFiles().generateJavaFile(fileType, curNode);
266 + }
267 +
268 + freeTemporaryResources(false);
184 } 269 }
185 270
186 /** 271 /**
...@@ -208,35 +293,16 @@ public class TempJavaCodeFragmentFiles { ...@@ -208,35 +293,16 @@ public class TempJavaCodeFragmentFiles {
208 } 293 }
209 294
210 /** 295 /**
211 - * Adds all the leaves in the current data model node as part of the
212 - * generated temporary file.
213 - *
214 - * @param curNode java file info of the generated file
215 - * @throws IOException IO operation fail
216 - */
217 - public void addCurNodeLeavesInfoToTempFiles(YangNode curNode)
218 - throws IOException {
219 -
220 - if (getBeanTempFiles() != null) {
221 - getBeanTempFiles().addCurNodeLeavesInfoToTempFiles(curNode);
222 - }
223 -
224 - }
225 -
226 - /**
227 * Add all the type in the current data model node as part of the 296 * Add all the type in the current data model node as part of the
228 * generated temporary file. 297 * generated temporary file.
229 * 298 *
230 - * @param yangTypeContainer YANG java data model node which has type info, eg union / typedef 299 + * @param yangTypeHolder YANG java data model node which has type info, eg union / typedef
231 * @throws IOException IO operation fail 300 * @throws IOException IO operation fail
232 */ 301 */
233 - public void addTypeInfoToTempFiles(YangTypeContainer yangTypeContainer) 302 + public void addTypeInfoToTempFiles(YangTypeHolder yangTypeHolder)
234 throws IOException { 303 throws IOException {
235 - 304 + getTypeTempFiles()
236 - if (getTypeTempFiles() != null) { 305 + .addTypeInfoToTempFiles(yangTypeHolder);
237 - getTypeTempFiles()
238 - .addTypeInfoToTempFiles(yangTypeContainer);
239 - }
240 } 306 }
241 307
242 /** 308 /**
...@@ -307,19 +373,27 @@ public class TempJavaCodeFragmentFiles { ...@@ -307,19 +373,27 @@ public class TempJavaCodeFragmentFiles {
307 * all open file handles include temporary files and java files. 373 * all open file handles include temporary files and java files.
308 * @throws IOException when failed to delete the temporary files 374 * @throws IOException when failed to delete the temporary files
309 */ 375 */
310 - public void close(boolean isErrorOccurred) 376 + public void freeTemporaryResources(boolean isErrorOccurred)
311 throws IOException { 377 throws IOException {
312 378
313 if (getBeanTempFiles() != null) { 379 if (getBeanTempFiles() != null) {
314 - getBeanTempFiles().close(isErrorOccurred); 380 + getBeanTempFiles().freeTemporaryResources(isErrorOccurred);
315 } 381 }
316 382
317 if (getTypeTempFiles() != null) { 383 if (getTypeTempFiles() != null) {
318 - getTypeTempFiles().close(isErrorOccurred); 384 + getTypeTempFiles().freeTemporaryResources(isErrorOccurred);
319 } 385 }
320 386
321 if (getEnumerationTempFiles() != null) { 387 if (getEnumerationTempFiles() != null) {
322 - getEnumerationTempFiles().close(isErrorOccurred); 388 + getEnumerationTempFiles().freeTemporaryResources(isErrorOccurred);
389 + }
390 +
391 + if (getEventTempFiles() != null) {
392 + getEventTempFiles().freeTemporaryResources(isErrorOccurred);
393 + }
394 +
395 + if (getEventListenerTempFiles() != null) {
396 + getEventListenerTempFiles().freeTemporaryResources(isErrorOccurred);
323 } 397 }
324 } 398 }
325 399
......
...@@ -19,6 +19,7 @@ import java.io.IOException; ...@@ -19,6 +19,7 @@ import java.io.IOException;
19 19
20 /** 20 /**
21 * Represents implementation of java code fragments temporary implementations. 21 * Represents implementation of java code fragments temporary implementations.
22 + * Maintains the temp files required specific for enumeration java snippet generation.
22 */ 23 */
23 public class TempJavaEnumerationFragmentFiles 24 public class TempJavaEnumerationFragmentFiles
24 extends TempJavaFragmentFiles { 25 extends TempJavaFragmentFiles {
......
1 +/*
2 + * Copyright 2016-present Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +package org.onosproject.yangutils.translator.tojava;
18 +
19 +import java.io.File;
20 +import java.io.IOException;
21 +import java.util.ArrayList;
22 +
23 +import org.onosproject.yangutils.datamodel.YangNode;
24 +
25 +import static org.onosproject.yangutils.translator.tojava.utils.JavaFileGenerator.generateEventFile;
26 +import static org.onosproject.yangutils.translator.tojava.utils.TempJavaCodeFragmentFilesUtils.closeFile;
27 +import static org.onosproject.yangutils.utils.io.impl.FileSystemUtil.createPackage;
28 +import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.getAbsolutePackagePath;
29 +
30 +/**
31 + * Represents implementation of java bean code fragments temporary implementations.
32 + * Maintains the temp files required specific for event java snippet generation.
33 + */
34 +public class TempJavaEventFragmentFiles
35 + extends TempJavaFragmentFiles {
36 +
37 + /**
38 + * File name for generated class file for special type like union, typedef
39 + * suffix.
40 + */
41 + private static final String EVENT_FILE_NAME_SUFFIX = "Event";
42 +
43 + /**
44 + * Java file handle for event file.
45 + */
46 + private File eventJavaFileHandle;
47 +
48 + /**
49 + * Creates an instance of temporary java code fragment.
50 + *
51 + * @param javaFileInfo generated java file info
52 + * @throws IOException when fails to create new file handle
53 + */
54 + public TempJavaEventFragmentFiles(JavaFileInfo javaFileInfo)
55 + throws IOException {
56 + setExtendsList(new ArrayList<>());
57 + setJavaImportData(new JavaImportData());
58 + setJavaFileInfo(javaFileInfo);
59 + clearGeneratedTempFileMask();
60 + setAbsoluteDirPath(getAbsolutePackagePath(getJavaFileInfo().getBaseCodeGenPath(),
61 + getJavaFileInfo().getPackageFilePath()));
62 +
63 + }
64 +
65 + /**
66 + * Returns event's java file handle.
67 + *
68 + * @return java file handle
69 + */
70 + private File getEventJavaFileHandle() {
71 + return eventJavaFileHandle;
72 + }
73 +
74 + /**
75 + * Sets event's java file handle.
76 + *
77 + * @param eventJavaFileHandle file handle for event
78 + */
79 + private void setEventJavaFileHandle(File eventJavaFileHandle) {
80 + this.eventJavaFileHandle = eventJavaFileHandle;
81 + }
82 +
83 +
84 + /**
85 + * Constructs java code exit.
86 + *
87 + * @param fileType generated file type
88 + * @param curNode current YANG node
89 + * @throws IOException when fails to generate java files
90 + */
91 + public void generateJavaFile(int fileType, YangNode curNode)
92 + throws IOException {
93 +
94 + createPackage(curNode);
95 +
96 + /**
97 + * Creates event interface file.
98 + */
99 + setEventJavaFileHandle(getJavaFileHandle(getJavaClassName(EVENT_FILE_NAME_SUFFIX)));
100 + generateEventFile(getEventJavaFileHandle(), curNode, null);
101 +
102 + /**
103 + * Close all the file handles.
104 + */
105 + freeTemporaryResources(false);
106 + }
107 +
108 + /**
109 + * Removes all temporary file handles.
110 + *
111 + * @param isErrorOccurred when translator fails to generate java files we
112 + * need to close all open file handles include temporary files
113 + * and java files.
114 + * @throws IOException when failed to delete the temporary files
115 + */
116 + public void freeTemporaryResources(boolean isErrorOccurred)
117 + throws IOException {
118 + boolean isError = isErrorOccurred;
119 + /**
120 + * Close all java file handles and when error occurs delete the files.
121 + */
122 + closeFile(getEventJavaFileHandle(), isError);
123 +
124 + super.freeTemporaryResources(isErrorOccurred);
125 + }
126 +}
1 +/*
2 + * Copyright 2016-present Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +package org.onosproject.yangutils.translator.tojava;
18 +
19 +import java.io.File;
20 +import java.io.IOException;
21 +import java.util.ArrayList;
22 +
23 +import org.onosproject.yangutils.datamodel.YangNode;
24 +
25 +import static org.onosproject.yangutils.translator.tojava.utils.JavaFileGenerator.generateEventListenerFile;
26 +import static org.onosproject.yangutils.translator.tojava.utils.TempJavaCodeFragmentFilesUtils.closeFile;
27 +import static org.onosproject.yangutils.utils.io.impl.FileSystemUtil.createPackage;
28 +import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.getAbsolutePackagePath;
29 +
30 +/**
31 + * Represents implementation of java bean code fragments temporary implementations.
32 + * Maintains the temp files required specific for event listener java snippet generation.
33 + */
34 +public class TempJavaEventListenerFragmentFiles
35 + extends TempJavaFragmentFiles {
36 +
37 + /**
38 + * File name for generated class file for special type like union, typedef
39 + * suffix.
40 + */
41 + private static final String EVENT_LISTENER_FILE_NAME_SUFFIX = "Listener";
42 +
43 + /**
44 + * Java file handle for event listener file.
45 + */
46 + private File eventListenerJavaFileHandle;
47 +
48 + /**
49 + * Creates an instance of temporary java code fragment.
50 + *
51 + * @param javaFileInfo generated java file info
52 + * @throws IOException when fails to create new file handle
53 + */
54 + public TempJavaEventListenerFragmentFiles(JavaFileInfo javaFileInfo)
55 + throws IOException {
56 + setExtendsList(new ArrayList<>());
57 + setJavaImportData(new JavaImportData());
58 + setJavaFileInfo(javaFileInfo);
59 + clearGeneratedTempFileMask();
60 + setAbsoluteDirPath(getAbsolutePackagePath(getJavaFileInfo().getBaseCodeGenPath(),
61 + getJavaFileInfo().getPackageFilePath()));
62 + }
63 +
64 + /**
65 + * Returns event listeners's java file handle.
66 + *
67 + * @return java file handle
68 + */
69 + private File getEventListenerJavaFileHandle() {
70 + return eventListenerJavaFileHandle;
71 + }
72 +
73 + /**
74 + * Sets event's java file handle.
75 + *
76 + * @param eventListenerJavaFileHandle file handle for event
77 + */
78 + private void setEventListenerJavaFileHandle(File eventListenerJavaFileHandle) {
79 + this.eventListenerJavaFileHandle = eventListenerJavaFileHandle;
80 + }
81 +
82 +
83 + /**
84 + * Constructs java code exit.
85 + *
86 + * @param fileType generated file type
87 + * @param curNode current YANG node
88 + * @throws IOException when fails to generate java files
89 + */
90 + public void generateJavaFile(int fileType, YangNode curNode)
91 + throws IOException {
92 +
93 + createPackage(curNode);
94 +
95 + /**
96 + * Creates event listener interface file.
97 + */
98 + setEventListenerJavaFileHandle(getJavaFileHandle(getJavaClassName(EVENT_LISTENER_FILE_NAME_SUFFIX)));
99 + generateEventListenerFile(getEventListenerJavaFileHandle(), curNode, null);
100 +
101 + /**
102 + * Close all the file handles.
103 + */
104 + freeTemporaryResources(false);
105 + }
106 +
107 + /**
108 + * Removes all temporary file handles.
109 + *
110 + * @param isErrorOccurred when translator fails to generate java files we
111 + * need to close all open file handles include temporary files
112 + * and java files.
113 + * @throws IOException when failed to delete the temporary files
114 + */
115 + public void freeTemporaryResources(boolean isErrorOccurred)
116 + throws IOException {
117 + boolean isError = isErrorOccurred;
118 + /**
119 + * Close all java file handles and when error occurs delete the files.
120 + */
121 + closeFile(getEventListenerJavaFileHandle(), isError);
122 +
123 + super.freeTemporaryResources(isErrorOccurred);
124 + }
125 +
126 +}
...@@ -16,15 +16,152 @@ ...@@ -16,15 +16,152 @@
16 16
17 package org.onosproject.yangutils.translator.tojava; 17 package org.onosproject.yangutils.translator.tojava;
18 18
19 +import java.io.File;
19 import java.io.IOException; 20 import java.io.IOException;
21 +import java.util.ArrayList;
22 +import java.util.List;
23 +
24 +import org.onosproject.yangutils.datamodel.YangNode;
25 +
26 +import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.RPC_IMPL_MASK;
27 +import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.RPC_INTERFACE_MASK;
28 +import static org.onosproject.yangutils.translator.tojava.utils.JavaCodeSnippetGen.getJavaClassDefClose;
29 +import static org.onosproject.yangutils.translator.tojava.utils.JavaFileGenerator.generateManagerClassFile;
30 +import static org.onosproject.yangutils.translator.tojava.utils.JavaFileGenerator.generateServiceInterfaceFile;
31 +import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getRpcManagerMethod;
32 +import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getRpcServiceMethod;
33 +import static org.onosproject.yangutils.translator.tojava.utils.TempJavaCodeFragmentFilesUtils.addArrayListImport;
34 +import static org.onosproject.yangutils.translator.tojava.utils.TempJavaCodeFragmentFilesUtils.addAugmentedInfoImport;
35 +import static org.onosproject.yangutils.translator.tojava.utils.TempJavaCodeFragmentFilesUtils.closeFile;
36 +import static org.onosproject.yangutils.translator.tojava.utils.TempJavaCodeFragmentFilesUtils
37 + .isHasAugmentationExtended;
38 +import static org.onosproject.yangutils.utils.UtilConstants.NEW_LINE;
39 +import static org.onosproject.yangutils.utils.io.impl.FileSystemUtil.createPackage;
40 +import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.generateJavaDocForRpc;
41 +import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.insertDataIntoJavaFile;
20 42
21 /** 43 /**
22 * Represents implementation of java service code fragments temporary implementations. 44 * Represents implementation of java service code fragments temporary implementations.
45 + * Maintains the temp files required specific for service and manager java snippet generation.
23 */ 46 */
24 public class TempJavaServiceFragmentFiles 47 public class TempJavaServiceFragmentFiles
25 extends TempJavaFragmentFiles { 48 extends TempJavaFragmentFiles {
26 49
27 /** 50 /**
51 + * File name for rpc method.
52 + */
53 + private static final String RPC_INTERFACE_FILE_NAME = "Rpc";
54 +
55 + /**
56 + * File name for rpc implementation method.
57 + */
58 + private static final String RPC_IMPL_FILE_NAME = "RpcImpl";
59 +
60 + /**
61 + * File name for generated class file for service
62 + * suffix.
63 + */
64 + private static final String SERVICE_FILE_NAME_SUFFIX = "Service";
65 +
66 + /**
67 + * File name for generated class file for manager
68 + * suffix.
69 + */
70 + private static final String MANAGER_FILE_NAME_SUFFIX = "Manager";
71 +
72 + /**
73 + * Temporary file handle for rpc interface.
74 + */
75 + private File rpcInterfaceTempFileHandle;
76 +
77 + /**
78 + * Temporary file handle for rpc manager impl.
79 + */
80 + private File rpcImplTempFileHandle;
81 +
82 + /**
83 + * Java file handle for rpc interface file.
84 + */
85 + private File serviceInterfaceJavaFileHandle;
86 +
87 + /**
88 + * Java file handle for manager impl file.
89 + */
90 + private File managerJavaFileHandle;
91 +
92 + /**
93 + * Returns rpc method's java file handle.
94 + *
95 + * @return java file handle
96 + */
97 + private File getServiceInterfaceJavaFileHandle() {
98 + return serviceInterfaceJavaFileHandle;
99 + }
100 +
101 + /**
102 + * Sets rpc method's java file handle.
103 + *
104 + * @param serviceInterfaceJavaFileHandle file handle for to rpc method
105 + */
106 + private void setServiceInterfaceJavaFileHandle(File serviceInterfaceJavaFileHandle) {
107 + this.serviceInterfaceJavaFileHandle = serviceInterfaceJavaFileHandle;
108 + }
109 +
110 + /**
111 + * Returns managers java file handle.
112 + *
113 + * @return java file handle
114 + */
115 + public File getManagerJavaFileHandle() {
116 + return managerJavaFileHandle;
117 + }
118 +
119 + /**
120 + * Sets manager java file handle.
121 + *
122 + * @param managerJavaFileHandle file handle for to manager
123 + */
124 + public void setManagerJavaFileHandle(File managerJavaFileHandle) {
125 + this.managerJavaFileHandle = managerJavaFileHandle;
126 + }
127 +
128 + /**
129 + * Returns rpc method's temporary file handle.
130 + *
131 + * @return temporary file handle
132 + */
133 + public File getRpcInterfaceTempFileHandle() {
134 + return rpcInterfaceTempFileHandle;
135 + }
136 +
137 + /**
138 + * Sets rpc method's temporary file handle.
139 + *
140 + * @param rpcInterfaceTempFileHandle file handle for to rpc method
141 + */
142 + private void setRpcInterfaceTempFileHandle(File rpcInterfaceTempFileHandle) {
143 + this.rpcInterfaceTempFileHandle = rpcInterfaceTempFileHandle;
144 + }
145 +
146 + /**
147 + * Retrieves the manager impl temp file.
148 + *
149 + * @return the manager impl temp file
150 + */
151 + public File getRpcImplTempFileHandle() {
152 + return rpcImplTempFileHandle;
153 + }
154 +
155 + /**
156 + * Sets the manager impl temp file.
157 + *
158 + * @param rpcImplTempFileHandle the manager impl temp file
159 + */
160 + public void setRpcImplTempFileHandle(File rpcImplTempFileHandle) {
161 + this.rpcImplTempFileHandle = rpcImplTempFileHandle;
162 + }
163 +
164 + /**
28 * Creates an instance of temporary java code fragment. 165 * Creates an instance of temporary java code fragment.
29 * 166 *
30 * @param javaFileInfo generated file information 167 * @param javaFileInfo generated file information
...@@ -33,5 +170,113 @@ public class TempJavaServiceFragmentFiles ...@@ -33,5 +170,113 @@ public class TempJavaServiceFragmentFiles
33 public TempJavaServiceFragmentFiles(JavaFileInfo javaFileInfo) 170 public TempJavaServiceFragmentFiles(JavaFileInfo javaFileInfo)
34 throws IOException { 171 throws IOException {
35 super(javaFileInfo); 172 super(javaFileInfo);
173 +
174 + addGeneratedTempFile(RPC_INTERFACE_MASK);
175 +
176 + addGeneratedTempFile(RPC_IMPL_MASK);
177 +
178 + setRpcInterfaceTempFileHandle(getTemporaryFileHandle(RPC_INTERFACE_FILE_NAME));
179 + setRpcImplTempFileHandle(getTemporaryFileHandle(RPC_IMPL_FILE_NAME));
180 + }
181 +
182 + /**
183 + * Constructs java code exit.
184 + *
185 + * @param fileType generated file type
186 + * @param curNode current YANG node
187 + * @throws IOException when fails to generate java files
188 + */
189 + public void generateJavaFile(int fileType, YangNode curNode)
190 + throws IOException {
191 + List<String> imports = new ArrayList<>();
192 + imports = getJavaImportData().getImports();
193 +
194 + createPackage(curNode);
195 +
196 + /**
197 + * Creates rpc interface file.
198 + */
199 + setServiceInterfaceJavaFileHandle(getJavaFileHandle(getJavaClassName(SERVICE_FILE_NAME_SUFFIX)));
200 + generateServiceInterfaceFile(getServiceInterfaceJavaFileHandle(), curNode, imports, isAttributePresent());
201 +
202 + if (isAttributePresent()) {
203 + addImportsToStringAndHasCodeMethods(curNode, imports);
204 + }
205 + if (isHasAugmentationExtended(getExtendsList())) {
206 + addAugmentedInfoImport(curNode, imports, true);
207 + addArrayListImport(curNode, imports, true);
208 + }
209 +
210 + /**
211 + * Create builder class file.
212 + */
213 + setManagerJavaFileHandle(getJavaFileHandle(getJavaClassName(MANAGER_FILE_NAME_SUFFIX)));
214 + generateManagerClassFile(getManagerJavaFileHandle(), imports, curNode, isAttributePresent());
215 +
216 + insertDataIntoJavaFile(getManagerJavaFileHandle(), getJavaClassDefClose());
217 +
218 + /**
219 + * Close all the file handles.
220 + */
221 + freeTemporaryResources(false);
222 + }
223 +
224 + /**
225 + * Adds rpc string information to applicable temp file.
226 + *
227 + * @param javaAttributeInfoOfInput rpc's input node attribute info
228 + * @param javaAttributeInfoOfOutput rpc's output node attribute info
229 + * @param rpcName name of the rpc function
230 + * @throws IOException IO operation fail
231 + */
232 + private void addRpcString(JavaAttributeInfo javaAttributeInfoOfInput, JavaAttributeInfo javaAttributeInfoOfOutput,
233 + String rpcName)
234 + throws IOException {
235 + String rpcInput = "";
236 + String rpcOutput = "void";
237 + if (javaAttributeInfoOfInput != null) {
238 + rpcInput = javaAttributeInfoOfInput.getAttributeName();
239 + }
240 + if (javaAttributeInfoOfOutput != null) {
241 + rpcOutput = javaAttributeInfoOfOutput.getAttributeName();
242 + }
243 + appendToFile(getRpcInterfaceTempFileHandle(), generateJavaDocForRpc(rpcName, rpcInput, rpcOutput) +
244 + getRpcServiceMethod(rpcName, rpcInput, rpcOutput) + NEW_LINE);
245 + appendToFile(getRpcImplTempFileHandle(),
246 + getRpcManagerMethod(rpcName, rpcInput, rpcOutput) + NEW_LINE);
247 + }
248 +
249 + /**
250 + * Adds the JAVA rpc snippet information.
251 + *
252 + * @param javaAttributeInfoOfInput rpc's input node attribute info
253 + * @param javaAttributeInfoOfOutput rpc's output node attribute info
254 + * @param rpcName name of the rpc function
255 + * @throws IOException IO operation fail
256 + */
257 + public void addJavaSnippetInfoToApplicableTempFiles(JavaAttributeInfo javaAttributeInfoOfInput,
258 + JavaAttributeInfo javaAttributeInfoOfOutput,
259 + String rpcName)
260 + throws IOException {
261 + addRpcString(javaAttributeInfoOfInput, javaAttributeInfoOfOutput, rpcName);
262 + }
263 +
264 + /**
265 + * Removes all temporary file handles.
266 + *
267 + * @param isErrorOccurred when translator fails to generate java files we
268 + * need to close all open file handles include temporary files
269 + * and java files.
270 + * @throws IOException when failed to delete the temporary files
271 + */
272 + public void freeTemporaryResources(boolean isErrorOccurred)
273 + throws IOException {
274 + boolean isError = isErrorOccurred;
275 +
276 + closeFile(getServiceInterfaceJavaFileHandle(), isError);
277 + closeFile(getRpcInterfaceTempFileHandle(), true);
278 +
279 + super.freeTemporaryResources(isErrorOccurred);
280 +
36 } 281 }
37 } 282 }
......
...@@ -15,20 +15,13 @@ ...@@ -15,20 +15,13 @@
15 */ 15 */
16 package org.onosproject.yangutils.translator.tojava.javamodel; 16 package org.onosproject.yangutils.translator.tojava.javamodel;
17 17
18 -import java.io.IOException;
19 -
20 import org.onosproject.yangutils.datamodel.YangGrouping; 18 import org.onosproject.yangutils.datamodel.YangGrouping;
21 -import org.onosproject.yangutils.translator.tojava.JavaCodeGenerator;
22 -import org.onosproject.yangutils.translator.tojava.JavaFileInfo;
23 -import org.onosproject.yangutils.translator.tojava.TempJavaCodeFragmentFiles;
24 -import org.onosproject.yangutils.translator.tojava.utils.YangPluginConfig;
25 19
26 /** 20 /**
27 * Represents grouping information extended to support java code generation. 21 * Represents grouping information extended to support java code generation.
28 */ 22 */
29 public class YangJavaGrouping 23 public class YangJavaGrouping
30 - extends YangGrouping 24 + extends YangGrouping {
31 - implements JavaCodeGeneratorInfo, JavaCodeGenerator {
32 25
33 /** 26 /**
34 * Creates YANG Java grouping object. 27 * Creates YANG Java grouping object.
...@@ -36,38 +29,4 @@ public class YangJavaGrouping ...@@ -36,38 +29,4 @@ public class YangJavaGrouping
36 public YangJavaGrouping() { 29 public YangJavaGrouping() {
37 super(); 30 super();
38 } 31 }
39 -
40 - @Override
41 - public void generateCodeEntry(YangPluginConfig yangPlugin)
42 - throws IOException {
43 - /*Do nothing, the uses will copy the contents to the used location*/
44 - }
45 -
46 - @Override
47 - public void generateCodeExit()
48 - throws IOException {
49 - /*Do nothing, the uses will copy the contents to the used location*/
50 - }
51 -
52 - @Override
53 - public JavaFileInfo getJavaFileInfo() {
54 - /*Do nothing, the uses will copy the contents to the used location*/
55 - return null;
56 - }
57 -
58 - @Override
59 - public void setJavaFileInfo(JavaFileInfo javaInfo) {
60 - /*Do nothing, the uses will copy the contents to the used location*/
61 - }
62 -
63 - @Override
64 - public TempJavaCodeFragmentFiles getTempJavaCodeFragmentFiles() {
65 - /*Do nothing, the uses will copy the contents to the used location*/
66 - return null;
67 - }
68 -
69 - @Override
70 - public void setTempJavaCodeFragmentFiles(TempJavaCodeFragmentFiles fileHandle) {
71 - /*Do nothing, the uses will copy the contents to the used location*/
72 - }
73 } 32 }
......
...@@ -25,8 +25,7 @@ import org.onosproject.yangutils.translator.tojava.TempJavaCodeFragmentFiles; ...@@ -25,8 +25,7 @@ import org.onosproject.yangutils.translator.tojava.TempJavaCodeFragmentFiles;
25 import org.onosproject.yangutils.translator.tojava.utils.YangJavaModelUtils; 25 import org.onosproject.yangutils.translator.tojava.utils.YangJavaModelUtils;
26 import org.onosproject.yangutils.translator.tojava.utils.YangPluginConfig; 26 import org.onosproject.yangutils.translator.tojava.utils.YangPluginConfig;
27 27
28 -import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_INTERFACE_WITH_BUILDER; 28 +import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_SERVICE_AND_MANAGER;
29 -import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_MANAGER_WITH_RPC;
30 import static org.onosproject.yangutils.translator.tojava.utils.JavaIdentifierSyntax.getRootPackage; 29 import static org.onosproject.yangutils.translator.tojava.utils.JavaIdentifierSyntax.getRootPackage;
31 30
32 /** 31 /**
...@@ -53,7 +52,7 @@ public class YangJavaModule ...@@ -53,7 +52,7 @@ public class YangJavaModule
53 public YangJavaModule() { 52 public YangJavaModule() {
54 super(); 53 super();
55 setJavaFileInfo(new JavaFileInfo()); 54 setJavaFileInfo(new JavaFileInfo());
56 - getJavaFileInfo().setGeneratedFileTypes(GENERATE_MANAGER_WITH_RPC); 55 + getJavaFileInfo().setGeneratedFileTypes(GENERATE_SERVICE_AND_MANAGER);
57 } 56 }
58 57
59 /** 58 /**
...@@ -118,6 +117,6 @@ public class YangJavaModule ...@@ -118,6 +117,6 @@ public class YangJavaModule
118 @Override 117 @Override
119 public void generateCodeExit() 118 public void generateCodeExit()
120 throws IOException { 119 throws IOException {
121 - getTempJavaCodeFragmentFiles().generateJavaFile(GENERATE_INTERFACE_WITH_BUILDER, this); 120 + getTempJavaCodeFragmentFiles().generateJavaFile(GENERATE_SERVICE_AND_MANAGER, this);
122 } 121 }
123 } 122 }
......
...@@ -25,7 +25,10 @@ import org.onosproject.yangutils.translator.tojava.JavaFileInfo; ...@@ -25,7 +25,10 @@ import org.onosproject.yangutils.translator.tojava.JavaFileInfo;
25 import org.onosproject.yangutils.translator.tojava.TempJavaCodeFragmentFiles; 25 import org.onosproject.yangutils.translator.tojava.TempJavaCodeFragmentFiles;
26 import org.onosproject.yangutils.translator.tojava.utils.YangPluginConfig; 26 import org.onosproject.yangutils.translator.tojava.utils.YangPluginConfig;
27 27
28 +import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_EVENT_CLASS;
29 +import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_EVENT_LISTENER_INTERFACE;
28 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_INTERFACE_WITH_BUILDER; 30 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_INTERFACE_WITH_BUILDER;
31 +import static org.onosproject.yangutils.translator.tojava.utils.YangJavaModelUtils.generateCodeOfNode;
29 32
30 /** 33 /**
31 * Represents notification information extended to support java code generation. 34 * Represents notification information extended to support java code generation.
...@@ -51,7 +54,8 @@ public class YangJavaNotification ...@@ -51,7 +54,8 @@ public class YangJavaNotification
51 public YangJavaNotification() { 54 public YangJavaNotification() {
52 super(); 55 super();
53 setJavaFileInfo(new JavaFileInfo()); 56 setJavaFileInfo(new JavaFileInfo());
54 - getJavaFileInfo().setGeneratedFileTypes(GENERATE_INTERFACE_WITH_BUILDER); 57 + getJavaFileInfo().setGeneratedFileTypes(GENERATE_INTERFACE_WITH_BUILDER
58 + | GENERATE_EVENT_CLASS | GENERATE_EVENT_LISTENER_INTERFACE);
55 } 59 }
56 60
57 /** 61 /**
...@@ -109,15 +113,36 @@ public class YangJavaNotification ...@@ -109,15 +113,36 @@ public class YangJavaNotification
109 public void generateCodeEntry(YangPluginConfig yangPlugin) 113 public void generateCodeEntry(YangPluginConfig yangPlugin)
110 throws IOException { 114 throws IOException {
111 115
112 - //TODO: implement the event listener for notifications. 116 + /**
117 + * As part of the notification support the following files needs to be generated.
118 + * 1) Subject of the notification(event), this is simple interface with builder class.
119 + * 2) Event class extending "AbstractEvent" and defining event type enum.
120 + * 3) Event listener interface extending "EventListener".
121 + *
122 + * The manager class needs to extend the ListenerRegistry.
123 + */
124 +
125 +
126 + // Generate subject of the notification(event), this is simple interface with builder class.
127 + generateCodeOfNode(this, yangPlugin);
113 } 128 }
114 129
115 /** 130 /**
116 * Creates a java file using the YANG notification info. 131 * Creates a java file using the YANG notification info.
117 */ 132 */
118 @Override 133 @Override
119 - public void generateCodeExit() { 134 + public void generateCodeExit()
120 - // TODO Auto-generated method stub 135 + throws IOException {
136 + /**
137 + * As part of the notification support the following files needs to be generated.
138 + * 1) Subject of the notification(event), this is simple interface with builder class.
139 + * 2) Event class extending "AbstractEvent" and defining event type enum.
140 + * 3) Event listener interface extending "EventListener".
141 + *
142 + * The manager class needs to extend the "ListenerRegistry".
143 + */
144 + getTempJavaCodeFragmentFiles().generateJavaFile(GENERATE_INTERFACE_WITH_BUILDER
145 + | GENERATE_EVENT_CLASS | GENERATE_EVENT_LISTENER_INTERFACE, this);
121 146
122 } 147 }
123 } 148 }
......
...@@ -24,15 +24,19 @@ import org.onosproject.yangutils.datamodel.YangNode; ...@@ -24,15 +24,19 @@ import org.onosproject.yangutils.datamodel.YangNode;
24 import org.onosproject.yangutils.datamodel.YangOutput; 24 import org.onosproject.yangutils.datamodel.YangOutput;
25 import org.onosproject.yangutils.datamodel.YangRpc; 25 import org.onosproject.yangutils.datamodel.YangRpc;
26 import org.onosproject.yangutils.translator.exception.TranslatorException; 26 import org.onosproject.yangutils.translator.exception.TranslatorException;
27 -import org.onosproject.yangutils.translator.tojava.TempJavaCodeFragmentFilesContainer;
28 import org.onosproject.yangutils.translator.tojava.JavaAttributeInfo; 27 import org.onosproject.yangutils.translator.tojava.JavaAttributeInfo;
29 import org.onosproject.yangutils.translator.tojava.JavaCodeGenerator; 28 import org.onosproject.yangutils.translator.tojava.JavaCodeGenerator;
30 import org.onosproject.yangutils.translator.tojava.JavaFileInfo; 29 import org.onosproject.yangutils.translator.tojava.JavaFileInfo;
30 +import org.onosproject.yangutils.translator.tojava.JavaFileInfoContainer;
31 +import org.onosproject.yangutils.translator.tojava.JavaImportData;
32 +import org.onosproject.yangutils.translator.tojava.JavaQualifiedTypeInfo;
31 import org.onosproject.yangutils.translator.tojava.TempJavaCodeFragmentFiles; 33 import org.onosproject.yangutils.translator.tojava.TempJavaCodeFragmentFiles;
34 +import org.onosproject.yangutils.translator.tojava.TempJavaCodeFragmentFilesContainer;
35 +import org.onosproject.yangutils.translator.tojava.TempJavaFragmentFiles;
32 import org.onosproject.yangutils.translator.tojava.utils.YangPluginConfig; 36 import org.onosproject.yangutils.translator.tojava.utils.YangPluginConfig;
33 37
34 -import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_RPC_INTERFACE; 38 +import static org.onosproject.yangutils.translator.tojava.JavaAttributeInfo.getAttributeInfoForTheData;
35 -import static org.onosproject.yangutils.translator.tojava.TempJavaFragmentFiles.getCurNodeAsAttributeInParent; 39 +import static org.onosproject.yangutils.translator.tojava.JavaQualifiedTypeInfo.getQualifiedTypeInfoOfCurNode;
36 import static org.onosproject.yangutils.translator.tojava.utils.JavaIdentifierSyntax.getParentNodeInGenCode; 40 import static org.onosproject.yangutils.translator.tojava.utils.JavaIdentifierSyntax.getParentNodeInGenCode;
37 import static org.onosproject.yangutils.translator.tojava.utils.YangJavaModelUtils.updatePackageInfo; 41 import static org.onosproject.yangutils.translator.tojava.utils.YangJavaModelUtils.updatePackageInfo;
38 42
...@@ -59,12 +63,6 @@ public class YangJavaRpc ...@@ -59,12 +63,6 @@ public class YangJavaRpc
59 public YangJavaRpc() { 63 public YangJavaRpc() {
60 super(); 64 super();
61 setJavaFileInfo(new JavaFileInfo()); 65 setJavaFileInfo(new JavaFileInfo());
62 - getJavaFileInfo().setGeneratedFileTypes(GENERATE_RPC_INTERFACE);
63 - try {
64 - setTempJavaCodeFragmentFiles(new TempJavaCodeFragmentFiles(getJavaFileInfo()));
65 - } catch (IOException e) {
66 - throw new RuntimeException("Failed to create temporary RPC file handle");
67 - }
68 } 66 }
69 67
70 /** 68 /**
...@@ -115,9 +113,9 @@ public class YangJavaRpc ...@@ -115,9 +113,9 @@ public class YangJavaRpc
115 YangNode yangNode = this.getChild(); 113 YangNode yangNode = this.getChild();
116 while (yangNode != null) { 114 while (yangNode != null) {
117 if (yangNode instanceof YangInput) { 115 if (yangNode instanceof YangInput) {
118 - javaAttributeInfoOfInput = getCurNodeAsAttributeInParent(yangNode, this, false); 116 + javaAttributeInfoOfInput = getChildNodeAsAttributeInParentService(yangNode, this);
119 } else if (yangNode instanceof YangOutput) { 117 } else if (yangNode instanceof YangOutput) {
120 - javaAttributeInfoOfOutput = getCurNodeAsAttributeInParent(yangNode, this, false); 118 + javaAttributeInfoOfOutput = getChildNodeAsAttributeInParentService(yangNode, this);
121 } else { 119 } else {
122 // TODO throw exception 120 // TODO throw exception
123 } 121 }
...@@ -139,6 +137,46 @@ public class YangJavaRpc ...@@ -139,6 +137,46 @@ public class YangJavaRpc
139 } 137 }
140 138
141 /** 139 /**
140 + * Creates an attribute info object corresponding to a data model node and
141 + * return it.
142 + *
143 + * @param childNode child data model node(input / output) for which the java code generation
144 + * is being handled
145 + * @param currentNode parent node (module / sub-module) in which the child node is an attribute
146 + * @return AttributeInfo attribute details required to add in temporary
147 + * files
148 + */
149 + public static JavaAttributeInfo getChildNodeAsAttributeInParentService(
150 + YangNode childNode, YangNode currentNode) {
151 +
152 + YangNode parentNode = getParentNodeInGenCode(currentNode);
153 +
154 + String childNodeName = ((JavaFileInfoContainer) childNode).getJavaFileInfo().getJavaName();
155 + /*
156 + * Get the import info corresponding to the attribute for import in
157 + * generated java files or qualified access
158 + */
159 + JavaQualifiedTypeInfo qualifiedTypeInfo = getQualifiedTypeInfoOfCurNode(currentNode,
160 + childNodeName);
161 + if (!(parentNode instanceof TempJavaCodeFragmentFilesContainer)) {
162 + throw new TranslatorException("Parent node does not have file info");
163 + }
164 +
165 + TempJavaFragmentFiles tempJavaFragmentFiles;
166 + tempJavaFragmentFiles = ((TempJavaCodeFragmentFilesContainer) parentNode)
167 + .getTempJavaCodeFragmentFiles()
168 + .getServiceTempFiles();
169 +
170 + if (tempJavaFragmentFiles == null) {
171 + throw new TranslatorException("Parent node does not have service file info");
172 + }
173 +
174 + JavaImportData parentImportData = tempJavaFragmentFiles.getJavaImportData();
175 + boolean isQualified = parentImportData.addImportInfo(qualifiedTypeInfo);
176 + return getAttributeInfoForTheData(qualifiedTypeInfo, childNodeName, null, isQualified, false);
177 + }
178 +
179 + /**
142 * Returns the generated java file information. 180 * Returns the generated java file information.
143 * 181 *
144 * @return generated java file information 182 * @return generated java file information
......
...@@ -26,7 +26,7 @@ import org.onosproject.yangutils.translator.tojava.TempJavaCodeFragmentFiles; ...@@ -26,7 +26,7 @@ import org.onosproject.yangutils.translator.tojava.TempJavaCodeFragmentFiles;
26 import org.onosproject.yangutils.translator.tojava.utils.YangJavaModelUtils; 26 import org.onosproject.yangutils.translator.tojava.utils.YangJavaModelUtils;
27 import org.onosproject.yangutils.translator.tojava.utils.YangPluginConfig; 27 import org.onosproject.yangutils.translator.tojava.utils.YangPluginConfig;
28 28
29 -import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_MANAGER_WITH_RPC; 29 +import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_SERVICE_AND_MANAGER;
30 import static org.onosproject.yangutils.translator.tojava.utils.JavaIdentifierSyntax.getRootPackage; 30 import static org.onosproject.yangutils.translator.tojava.utils.JavaIdentifierSyntax.getRootPackage;
31 31
32 /** 32 /**
...@@ -53,7 +53,7 @@ public class YangJavaSubModule ...@@ -53,7 +53,7 @@ public class YangJavaSubModule
53 public YangJavaSubModule() { 53 public YangJavaSubModule() {
54 super(); 54 super();
55 setJavaFileInfo(new JavaFileInfo()); 55 setJavaFileInfo(new JavaFileInfo());
56 - getJavaFileInfo().setGeneratedFileTypes(GENERATE_MANAGER_WITH_RPC); 56 + getJavaFileInfo().setGeneratedFileTypes(GENERATE_SERVICE_AND_MANAGER);
57 } 57 }
58 58
59 /** 59 /**
...@@ -130,7 +130,8 @@ public class YangJavaSubModule ...@@ -130,7 +130,8 @@ public class YangJavaSubModule
130 * Creates a java file using the YANG submodule info. 130 * Creates a java file using the YANG submodule info.
131 */ 131 */
132 @Override 132 @Override
133 - public void generateCodeExit() { 133 + public void generateCodeExit()
134 - // TODO Auto-generated method stub 134 + throws IOException {
135 + getTempJavaCodeFragmentFiles().generateJavaFile(GENERATE_SERVICE_AND_MANAGER, this);
135 } 136 }
136 } 137 }
......
...@@ -16,15 +16,12 @@ ...@@ -16,15 +16,12 @@
16 package org.onosproject.yangutils.translator.tojava.javamodel; 16 package org.onosproject.yangutils.translator.tojava.javamodel;
17 17
18 import org.onosproject.yangutils.datamodel.YangUses; 18 import org.onosproject.yangutils.datamodel.YangUses;
19 -import org.onosproject.yangutils.translator.tojava.JavaCodeGenerator;
20 -import org.onosproject.yangutils.translator.tojava.utils.YangPluginConfig;
21 19
22 /** 20 /**
23 * Represents uses information extended to support java code generation. 21 * Represents uses information extended to support java code generation.
24 */ 22 */
25 public class YangJavaUses 23 public class YangJavaUses
26 - extends YangUses 24 + extends YangUses {
27 - implements JavaCodeGenerator {
28 25
29 /** 26 /**
30 * Creates YANG java uses object. 27 * Creates YANG java uses object.
...@@ -32,23 +29,4 @@ public class YangJavaUses ...@@ -32,23 +29,4 @@ public class YangJavaUses
32 public YangJavaUses() { 29 public YangJavaUses() {
33 super(); 30 super();
34 } 31 }
35 -
36 - /**
37 - * Prepare the information for java code generation corresponding to YANG
38 - * uses info.
39 - *
40 - * @param yangPlugin YANG plugin config
41 - */
42 - @Override
43 - public void generateCodeEntry(YangPluginConfig yangPlugin) {
44 - /*Do nothing, the uses will copy the contents to the used location*/
45 - }
46 -
47 - /**
48 - * Create a java file using the YANG uses info.
49 - */
50 - @Override
51 - public void generateCodeExit() {
52 - /*Do nothing, the uses will copy the contents to the used location*/
53 - }
54 } 32 }
......
...@@ -19,7 +19,9 @@ package org.onosproject.yangutils.translator.tojava.utils; ...@@ -19,7 +19,9 @@ package org.onosproject.yangutils.translator.tojava.utils;
19 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.BUILDER_CLASS_MASK; 19 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.BUILDER_CLASS_MASK;
20 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.BUILDER_INTERFACE_MASK; 20 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.BUILDER_INTERFACE_MASK;
21 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_ENUM_CLASS; 21 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_ENUM_CLASS;
22 -import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_RPC_INTERFACE; 22 +import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_EVENT_CLASS;
23 +import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_EVENT_LISTENER_INTERFACE;
24 +import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_SERVICE_AND_MANAGER;
23 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_TYPEDEF_CLASS; 25 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_TYPEDEF_CLASS;
24 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_UNION_CLASS; 26 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_UNION_CLASS;
25 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.IMPL_CLASS_MASK; 27 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.IMPL_CLASS_MASK;
...@@ -35,10 +37,12 @@ import static org.onosproject.yangutils.utils.UtilConstants.FINAL; ...@@ -35,10 +37,12 @@ import static org.onosproject.yangutils.utils.UtilConstants.FINAL;
35 import static org.onosproject.yangutils.utils.UtilConstants.IMPL; 37 import static org.onosproject.yangutils.utils.UtilConstants.IMPL;
36 import static org.onosproject.yangutils.utils.UtilConstants.IMPLEMENTS; 38 import static org.onosproject.yangutils.utils.UtilConstants.IMPLEMENTS;
37 import static org.onosproject.yangutils.utils.UtilConstants.INTERFACE; 39 import static org.onosproject.yangutils.utils.UtilConstants.INTERFACE;
40 +import static org.onosproject.yangutils.utils.UtilConstants.MANAGER;
38 import static org.onosproject.yangutils.utils.UtilConstants.NEW_LINE; 41 import static org.onosproject.yangutils.utils.UtilConstants.NEW_LINE;
39 import static org.onosproject.yangutils.utils.UtilConstants.OPEN_CURLY_BRACKET; 42 import static org.onosproject.yangutils.utils.UtilConstants.OPEN_CURLY_BRACKET;
40 import static org.onosproject.yangutils.utils.UtilConstants.PERIOD; 43 import static org.onosproject.yangutils.utils.UtilConstants.PERIOD;
41 import static org.onosproject.yangutils.utils.UtilConstants.PUBLIC; 44 import static org.onosproject.yangutils.utils.UtilConstants.PUBLIC;
45 +import static org.onosproject.yangutils.utils.UtilConstants.SERVICE;
42 import static org.onosproject.yangutils.utils.UtilConstants.SPACE; 46 import static org.onosproject.yangutils.utils.UtilConstants.SPACE;
43 import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.trimAtLast; 47 import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.trimAtLast;
44 48
...@@ -58,7 +62,7 @@ public final class ClassDefinitionGenerator { ...@@ -58,7 +62,7 @@ public final class ClassDefinitionGenerator {
58 * / interface definition start. 62 * / interface definition start.
59 * 63 *
60 * @param genFileTypes generated file type 64 * @param genFileTypes generated file type
61 - * @param yangName class name 65 + * @param yangName class name
62 * @return class definition 66 * @return class definition
63 */ 67 */
64 public static String generateClassDefinition(int genFileTypes, String yangName) { 68 public static String generateClassDefinition(int genFileTypes, String yangName) {
...@@ -70,7 +74,7 @@ public final class ClassDefinitionGenerator { ...@@ -70,7 +74,7 @@ public final class ClassDefinitionGenerator {
70 if ((genFileTypes & INTERFACE_MASK) != 0) { 74 if ((genFileTypes & INTERFACE_MASK) != 0) {
71 return getInterfaceDefinition(yangName); 75 return getInterfaceDefinition(yangName);
72 } else if ((genFileTypes & BUILDER_CLASS_MASK) != 0) { 76 } else if ((genFileTypes & BUILDER_CLASS_MASK) != 0) {
73 - return getBuilderClassDefinition(yangName); 77 + return getBuilderClassDefinition(yangName, genFileTypes);
74 } else if ((genFileTypes & IMPL_CLASS_MASK) != 0) { 78 } else if ((genFileTypes & IMPL_CLASS_MASK) != 0) {
75 return getImplClassDefinition(yangName); 79 return getImplClassDefinition(yangName);
76 } else if ((genFileTypes & BUILDER_INTERFACE_MASK) != 0) { 80 } else if ((genFileTypes & BUILDER_INTERFACE_MASK) != 0) {
...@@ -81,8 +85,12 @@ public final class ClassDefinitionGenerator { ...@@ -81,8 +85,12 @@ public final class ClassDefinitionGenerator {
81 return getTypeClassDefinition(yangName); 85 return getTypeClassDefinition(yangName);
82 } else if ((genFileTypes & GENERATE_ENUM_CLASS) != 0) { 86 } else if ((genFileTypes & GENERATE_ENUM_CLASS) != 0) {
83 return getEnumClassDefinition(yangName); 87 return getEnumClassDefinition(yangName);
84 - } else if ((genFileTypes & GENERATE_RPC_INTERFACE) != 0) { 88 + } else if ((genFileTypes & GENERATE_SERVICE_AND_MANAGER) != 0) {
85 return getRpcInterfaceDefinition(yangName); 89 return getRpcInterfaceDefinition(yangName);
90 + } else if ((genFileTypes & GENERATE_EVENT_CLASS) != 0) {
91 + return getEventDefinition(yangName);
92 + } else if ((genFileTypes & GENERATE_EVENT_LISTENER_INTERFACE) != 0) {
93 + return getEventListenerDefinition(yangName);
86 } 94 }
87 return null; 95 return null;
88 } 96 }
...@@ -120,7 +128,7 @@ public final class ClassDefinitionGenerator { ...@@ -120,7 +128,7 @@ public final class ClassDefinitionGenerator {
120 * Returns builder interface file class definition. 128 * Returns builder interface file class definition.
121 * 129 *
122 * @param yangName java class name, corresponding to which the builder class 130 * @param yangName java class name, corresponding to which the builder class
123 - * is being generated 131 + * is being generated
124 * @return definition 132 * @return definition
125 */ 133 */
126 private static String getBuilderInterfaceDefinition(String yangName) { 134 private static String getBuilderInterfaceDefinition(String yangName) {
...@@ -131,11 +139,17 @@ public final class ClassDefinitionGenerator { ...@@ -131,11 +139,17 @@ public final class ClassDefinitionGenerator {
131 * Returns builder file class definition. 139 * Returns builder file class definition.
132 * 140 *
133 * @param yangName file name 141 * @param yangName file name
142 + * @param genFileTypes
134 * @return definition 143 * @return definition
135 */ 144 */
136 - private static String getBuilderClassDefinition(String yangName) { 145 + private static String getBuilderClassDefinition(String yangName, int genFileTypes) {
137 - return PUBLIC + SPACE + CLASS + SPACE + yangName + BUILDER + SPACE + IMPLEMENTS + SPACE + yangName + PERIOD 146 + if ((genFileTypes & GENERATE_SERVICE_AND_MANAGER) != 0) {
138 - + yangName + BUILDER + SPACE + OPEN_CURLY_BRACKET + NEW_LINE; 147 + return PUBLIC + SPACE + CLASS + SPACE + yangName + MANAGER + SPACE + IMPLEMENTS + SPACE + yangName +
148 + SERVICE + PERIOD + yangName + SPACE + OPEN_CURLY_BRACKET + NEW_LINE;
149 + } else {
150 + return PUBLIC + SPACE + CLASS + SPACE + yangName + BUILDER + SPACE + IMPLEMENTS + SPACE + yangName + PERIOD
151 + + yangName + BUILDER + SPACE + OPEN_CURLY_BRACKET + NEW_LINE;
152 + }
139 } 153 }
140 154
141 /** 155 /**
...@@ -168,4 +182,40 @@ public final class ClassDefinitionGenerator { ...@@ -168,4 +182,40 @@ public final class ClassDefinitionGenerator {
168 private static String getRpcInterfaceDefinition(String yangName) { 182 private static String getRpcInterfaceDefinition(String yangName) {
169 return INTERFACE + SPACE + yangName + SPACE + OPEN_CURLY_BRACKET + NEW_LINE; 183 return INTERFACE + SPACE + yangName + SPACE + OPEN_CURLY_BRACKET + NEW_LINE;
170 } 184 }
185 +
186 + /**
187 + * Returns event class definition.
188 + *
189 + * @param javaName file name
190 + * @return definition
191 + */
192 + private static String getEventDefinition(String javaName) {
193 + String classDef = PUBLIC + SPACE + CLASS + SPACE + javaName + SPACE + "extends AbstractEvent<"
194 + + javaName + ".Type, " + javaName;
195 + if (classDef.length() < 5) {
196 + throw new RuntimeException("Event class name is error");
197 + }
198 + classDef = classDef.substring(0, (classDef.length() - 5));
199 + classDef = classDef + ">" + SPACE + OPEN_CURLY_BRACKET + NEW_LINE;
200 +
201 + return classDef;
202 + }
203 +
204 + /**
205 + * Returns event listener interface definition.
206 + *
207 + * @param javaName file name
208 + * @return definition
209 + */
210 + private static String getEventListenerDefinition(String javaName) {
211 + String intfDef = PUBLIC + SPACE + INTERFACE + SPACE + javaName + SPACE + "extends EventListener<"
212 + + javaName;
213 + if (intfDef.length() < 8) {
214 + throw new RuntimeException("Event listener interface name is error");
215 + }
216 + intfDef = intfDef.substring(0, (intfDef.length() - 8));
217 + intfDef = intfDef + "Event>" + SPACE + OPEN_CURLY_BRACKET + NEW_LINE;
218 +
219 + return intfDef;
220 + }
171 } 221 }
......
...@@ -20,20 +20,25 @@ import java.io.File; ...@@ -20,20 +20,25 @@ import java.io.File;
20 import java.io.IOException; 20 import java.io.IOException;
21 import java.util.List; 21 import java.util.List;
22 22
23 +import org.onosproject.yangutils.translator.exception.TranslatorException;
23 import org.onosproject.yangutils.translator.tojava.JavaFileInfo; 24 import org.onosproject.yangutils.translator.tojava.JavaFileInfo;
25 +import org.onosproject.yangutils.translator.tojava.TempJavaBeanFragmentFiles;
24 import org.onosproject.yangutils.translator.tojava.TempJavaFragmentFiles; 26 import org.onosproject.yangutils.translator.tojava.TempJavaFragmentFiles;
27 +import org.onosproject.yangutils.translator.tojava.TempJavaServiceFragmentFiles;
28 +import org.onosproject.yangutils.translator.tojava.TempJavaTypeFragmentFiles;
25 import org.onosproject.yangutils.utils.io.impl.CopyrightHeader; 29 import org.onosproject.yangutils.utils.io.impl.CopyrightHeader;
26 import org.onosproject.yangutils.utils.io.impl.JavaDocGen.JavaDocType; 30 import org.onosproject.yangutils.utils.io.impl.JavaDocGen.JavaDocType;
27 31
28 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.BUILDER_CLASS_MASK; 32 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.BUILDER_CLASS_MASK;
29 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.BUILDER_INTERFACE_MASK; 33 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.BUILDER_INTERFACE_MASK;
30 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_ENUM_CLASS; 34 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_ENUM_CLASS;
31 -import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_RPC_INTERFACE; 35 +import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_EVENT_CLASS;
36 +import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_EVENT_LISTENER_INTERFACE;
37 +import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_SERVICE_AND_MANAGER;
32 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_TYPEDEF_CLASS; 38 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_TYPEDEF_CLASS;
33 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_UNION_CLASS; 39 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_UNION_CLASS;
34 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.IMPL_CLASS_MASK; 40 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.IMPL_CLASS_MASK;
35 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.INTERFACE_MASK; 41 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.INTERFACE_MASK;
36 -import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.ATTRIBUTES_MASK;
37 import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.CONSTRUCTOR_FOR_TYPE_MASK; 42 import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.CONSTRUCTOR_FOR_TYPE_MASK;
38 import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.CONSTRUCTOR_IMPL_MASK; 43 import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.CONSTRUCTOR_IMPL_MASK;
39 import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.ENUM_IMPL_MASK; 44 import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.ENUM_IMPL_MASK;
...@@ -44,6 +49,7 @@ import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType. ...@@ -44,6 +49,7 @@ import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.
44 import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.HASH_CODE_IMPL_MASK; 49 import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.HASH_CODE_IMPL_MASK;
45 import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.OF_STRING_IMPL_MASK; 50 import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.OF_STRING_IMPL_MASK;
46 import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.RPC_IMPL_MASK; 51 import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.RPC_IMPL_MASK;
52 +import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.RPC_INTERFACE_MASK;
47 import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.SETTER_FOR_CLASS_MASK; 53 import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.SETTER_FOR_CLASS_MASK;
48 import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.SETTER_FOR_INTERFACE_MASK; 54 import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.SETTER_FOR_INTERFACE_MASK;
49 import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.TO_STRING_IMPL_MASK; 55 import static org.onosproject.yangutils.translator.tojava.GeneratedTempFileType.TO_STRING_IMPL_MASK;
...@@ -62,6 +68,8 @@ import static org.onosproject.yangutils.utils.UtilConstants.SPACE; ...@@ -62,6 +68,8 @@ import static org.onosproject.yangutils.utils.UtilConstants.SPACE;
62 import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.JavaDocType.BUILDER_CLASS; 68 import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.JavaDocType.BUILDER_CLASS;
63 import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.JavaDocType.BUILDER_INTERFACE; 69 import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.JavaDocType.BUILDER_INTERFACE;
64 import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.JavaDocType.ENUM_CLASS; 70 import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.JavaDocType.ENUM_CLASS;
71 +import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.JavaDocType.EVENT;
72 +import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.JavaDocType.EVENT_LISTENER;
65 import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.JavaDocType.IMPL_CLASS; 73 import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.JavaDocType.IMPL_CLASS;
66 import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.JavaDocType.INTERFACE; 74 import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.JavaDocType.INTERFACE;
67 import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.JavaDocType.RPC_INTERFACE; 75 import static org.onosproject.yangutils.utils.io.impl.JavaDocGen.JavaDocType.RPC_INTERFACE;
...@@ -106,11 +114,25 @@ public final class JavaFileGeneratorUtils { ...@@ -106,11 +114,25 @@ public final class JavaFileGeneratorUtils {
106 TempJavaFragmentFiles tempJavaFragmentFiles) 114 TempJavaFragmentFiles tempJavaFragmentFiles)
107 throws IOException { 115 throws IOException {
108 116
117 + TempJavaTypeFragmentFiles typeFragmentFiles = null;
109 118
110 - if ((generatedTempFiles & ATTRIBUTES_MASK) != 0) { 119 + if (tempJavaFragmentFiles instanceof TempJavaTypeFragmentFiles) {
111 - return tempJavaFragmentFiles 120 + typeFragmentFiles = (TempJavaTypeFragmentFiles) tempJavaFragmentFiles;
112 - .getTemporaryDataFromFileHandle(tempJavaFragmentFiles.getAttributesTempFileHandle()); 121 + }
113 - } else if ((generatedTempFiles & GETTER_FOR_INTERFACE_MASK) != 0) { 122 +
123 + TempJavaBeanFragmentFiles beanFragmentFiles = null;
124 +
125 + if (tempJavaFragmentFiles instanceof TempJavaBeanFragmentFiles) {
126 + beanFragmentFiles = (TempJavaBeanFragmentFiles) tempJavaFragmentFiles;
127 + }
128 +
129 + TempJavaServiceFragmentFiles serviceFragmentFiles = null;
130 + if (tempJavaFragmentFiles instanceof TempJavaServiceFragmentFiles) {
131 + serviceFragmentFiles = (TempJavaServiceFragmentFiles) tempJavaFragmentFiles;
132 + }
133 +
134 +
135 + if ((generatedTempFiles & GETTER_FOR_INTERFACE_MASK) != 0) {
114 return tempJavaFragmentFiles 136 return tempJavaFragmentFiles
115 .getTemporaryDataFromFileHandle(tempJavaFragmentFiles.getGetterInterfaceTempFileHandle()); 137 .getTemporaryDataFromFileHandle(tempJavaFragmentFiles.getGetterInterfaceTempFileHandle());
116 } else if ((generatedTempFiles & SETTER_FOR_INTERFACE_MASK) != 0) { 138 } else if ((generatedTempFiles & SETTER_FOR_INTERFACE_MASK) != 0) {
...@@ -123,8 +145,11 @@ public final class JavaFileGeneratorUtils { ...@@ -123,8 +145,11 @@ public final class JavaFileGeneratorUtils {
123 return tempJavaFragmentFiles 145 return tempJavaFragmentFiles
124 .getTemporaryDataFromFileHandle(tempJavaFragmentFiles.getSetterImplTempFileHandle()); 146 .getTemporaryDataFromFileHandle(tempJavaFragmentFiles.getSetterImplTempFileHandle());
125 } else if ((generatedTempFiles & CONSTRUCTOR_IMPL_MASK) != 0) { 147 } else if ((generatedTempFiles & CONSTRUCTOR_IMPL_MASK) != 0) {
126 - return tempJavaFragmentFiles 148 + if (beanFragmentFiles == null) {
127 - .getTemporaryDataFromFileHandle(tempJavaFragmentFiles.getConstructorImplTempFileHandle()); 149 + throw new TranslatorException("Required constructor info is missing.");
150 + }
151 + return beanFragmentFiles
152 + .getTemporaryDataFromFileHandle(beanFragmentFiles.getConstructorImplTempFileHandle());
128 } else if ((generatedTempFiles & HASH_CODE_IMPL_MASK) != 0) { 153 } else if ((generatedTempFiles & HASH_CODE_IMPL_MASK) != 0) {
129 return tempJavaFragmentFiles 154 return tempJavaFragmentFiles
130 .getTemporaryDataFromFileHandle(tempJavaFragmentFiles.getHashCodeImplTempFileHandle()); 155 .getTemporaryDataFromFileHandle(tempJavaFragmentFiles.getHashCodeImplTempFileHandle());
...@@ -134,22 +159,39 @@ public final class JavaFileGeneratorUtils { ...@@ -134,22 +159,39 @@ public final class JavaFileGeneratorUtils {
134 } else if ((generatedTempFiles & TO_STRING_IMPL_MASK) != 0) { 159 } else if ((generatedTempFiles & TO_STRING_IMPL_MASK) != 0) {
135 return tempJavaFragmentFiles 160 return tempJavaFragmentFiles
136 .getTemporaryDataFromFileHandle(tempJavaFragmentFiles.getToStringImplTempFileHandle()); 161 .getTemporaryDataFromFileHandle(tempJavaFragmentFiles.getToStringImplTempFileHandle());
137 - } else if ((generatedTempFiles & CONSTRUCTOR_FOR_TYPE_MASK) != 0) {
138 - return tempJavaFragmentFiles
139 - .getTemporaryDataFromFileHandle(tempJavaFragmentFiles
140 - .getConstructorForTypeTempFileHandle());
141 } else if ((generatedTempFiles & OF_STRING_IMPL_MASK) != 0) { 162 } else if ((generatedTempFiles & OF_STRING_IMPL_MASK) != 0) {
142 - return tempJavaFragmentFiles 163 + if (typeFragmentFiles == null) {
143 - .getTemporaryDataFromFileHandle(tempJavaFragmentFiles.getOfStringImplTempFileHandle()); 164 + throw new TranslatorException("Required of string implementation info is missing.");
165 + }
166 + return typeFragmentFiles
167 + .getTemporaryDataFromFileHandle(typeFragmentFiles.getOfStringImplTempFileHandle());
168 + } else if ((generatedTempFiles & CONSTRUCTOR_FOR_TYPE_MASK) != 0) {
169 + if (typeFragmentFiles == null) {
170 + throw new TranslatorException("Required constructor implementation info is missing.");
171 + }
172 + return typeFragmentFiles
173 + .getTemporaryDataFromFileHandle(typeFragmentFiles.getConstructorForTypeTempFileHandle());
144 } else if ((generatedTempFiles & FROM_STRING_IMPL_MASK) != 0) { 174 } else if ((generatedTempFiles & FROM_STRING_IMPL_MASK) != 0) {
145 - return tempJavaFragmentFiles 175 + if (typeFragmentFiles == null) {
146 - .getTemporaryDataFromFileHandle(tempJavaFragmentFiles.getFromStringImplTempFileHandle()); 176 + throw new TranslatorException("Required from string info is missing.");
177 + }
178 + return typeFragmentFiles
179 + .getTemporaryDataFromFileHandle(typeFragmentFiles.getFromStringImplTempFileHandle());
147 } else if ((generatedTempFiles & ENUM_IMPL_MASK) != 0) { 180 } else if ((generatedTempFiles & ENUM_IMPL_MASK) != 0) {
148 return tempJavaFragmentFiles 181 return tempJavaFragmentFiles
149 .getTemporaryDataFromFileHandle(tempJavaFragmentFiles.getEnumClassTempFileHandle()); 182 .getTemporaryDataFromFileHandle(tempJavaFragmentFiles.getEnumClassTempFileHandle());
183 + } else if ((generatedTempFiles & RPC_INTERFACE_MASK) != 0) {
184 + if (serviceFragmentFiles == null) {
185 + throw new TranslatorException("Required rpc interface info is missing.");
186 + }
187 + return serviceFragmentFiles
188 + .getTemporaryDataFromFileHandle(serviceFragmentFiles.getRpcInterfaceTempFileHandle());
150 } else if ((generatedTempFiles & RPC_IMPL_MASK) != 0) { 189 } else if ((generatedTempFiles & RPC_IMPL_MASK) != 0) {
151 - return tempJavaFragmentFiles 190 + if (serviceFragmentFiles == null) {
152 - .getTemporaryDataFromFileHandle(tempJavaFragmentFiles.getRpcInterfaceImplTempFileHandle()); 191 + throw new TranslatorException("Required rpc implementation info is missing.");
192 + }
193 + return serviceFragmentFiles
194 + .getTemporaryDataFromFileHandle(serviceFragmentFiles.getRpcImplTempFileHandle());
153 } 195 }
154 return null; 196 return null;
155 } 197 }
...@@ -211,9 +253,15 @@ public final class JavaFileGeneratorUtils { ...@@ -211,9 +253,15 @@ public final class JavaFileGeneratorUtils {
211 } else if ((type & GENERATE_ENUM_CLASS) != 0) { 253 } else if ((type & GENERATE_ENUM_CLASS) != 0) {
212 appendHeaderContents(file, pkgString, importsList); 254 appendHeaderContents(file, pkgString, importsList);
213 write(file, fileName, type, ENUM_CLASS); 255 write(file, fileName, type, ENUM_CLASS);
214 - } else if ((type & GENERATE_RPC_INTERFACE) != 0) { 256 + } else if ((type & GENERATE_SERVICE_AND_MANAGER) != 0) {
215 appendHeaderContents(file, pkgString, importsList); 257 appendHeaderContents(file, pkgString, importsList);
216 write(file, fileName, type, RPC_INTERFACE); 258 write(file, fileName, type, RPC_INTERFACE);
259 + } else if ((type & GENERATE_EVENT_CLASS) != 0) {
260 + appendHeaderContents(file, pkgString, importsList);
261 + write(file, fileName, type, EVENT);
262 + } else if ((type & GENERATE_EVENT_LISTENER_INTERFACE) != 0) {
263 + appendHeaderContents(file, pkgString, importsList);
264 + write(file, fileName, type, EVENT_LISTENER);
217 } 265 }
218 } 266 }
219 267
......
...@@ -45,21 +45,6 @@ public final class TempJavaCodeFragmentFilesUtils { ...@@ -45,21 +45,6 @@ public final class TempJavaCodeFragmentFilesUtils {
45 } 45 }
46 46
47 /** 47 /**
48 - * Adds imports for ToString and HashCodeMethod.
49 - *
50 - * @param curNode current YANG node
51 - * @param imports import list
52 - * @return import list
53 - */
54 - public static List<String> addImportsToStringAndHasCodeMethods(YangNode curNode, List<String> imports) {
55 - if (curNode instanceof JavaImportDataContainer) {
56 - imports.add(((JavaImportDataContainer) curNode).getJavaImportData().getImportForHashAndEquals());
57 - imports.add(((JavaImportDataContainer) curNode).getJavaImportData().getImportForToString());
58 - }
59 - return imports;
60 - }
61 -
62 - /**
63 * Adds import for HasAugmentation class. 48 * Adds import for HasAugmentation class.
64 * 49 *
65 * @param curNode current YANG node 50 * @param curNode current YANG node
...@@ -177,7 +162,8 @@ public final class TempJavaCodeFragmentFilesUtils { ...@@ -177,7 +162,8 @@ public final class TempJavaCodeFragmentFilesUtils {
177 * @param toBeDeleted flag to indicate if file needs to be deleted 162 * @param toBeDeleted flag to indicate if file needs to be deleted
178 * @throws IOException when failed to close the file handle 163 * @throws IOException when failed to close the file handle
179 */ 164 */
180 - public static void closeFile(File file, boolean toBeDeleted) throws IOException { 165 + public static void closeFile(File file, boolean toBeDeleted)
166 + throws IOException {
181 167
182 if (file != null) { 168 if (file != null) {
183 updateFileHandle(file, null, true); 169 updateFileHandle(file, null, true);
......
...@@ -18,7 +18,7 @@ package org.onosproject.yangutils.translator.tojava.utils; ...@@ -18,7 +18,7 @@ package org.onosproject.yangutils.translator.tojava.utils;
18 18
19 import java.io.IOException; 19 import java.io.IOException;
20 20
21 -import org.onosproject.yangutils.datamodel.YangTypeContainer; 21 +import org.onosproject.yangutils.datamodel.RpcNotificationContainer;
22 import org.onosproject.yangutils.datamodel.YangAugment; 22 import org.onosproject.yangutils.datamodel.YangAugment;
23 import org.onosproject.yangutils.datamodel.YangCase; 23 import org.onosproject.yangutils.datamodel.YangCase;
24 import org.onosproject.yangutils.datamodel.YangChoice; 24 import org.onosproject.yangutils.datamodel.YangChoice;
...@@ -29,12 +29,15 @@ import org.onosproject.yangutils.datamodel.YangList; ...@@ -29,12 +29,15 @@ import org.onosproject.yangutils.datamodel.YangList;
29 import org.onosproject.yangutils.datamodel.YangNode; 29 import org.onosproject.yangutils.datamodel.YangNode;
30 import org.onosproject.yangutils.datamodel.YangNotification; 30 import org.onosproject.yangutils.datamodel.YangNotification;
31 import org.onosproject.yangutils.datamodel.YangOutput; 31 import org.onosproject.yangutils.datamodel.YangOutput;
32 +import org.onosproject.yangutils.datamodel.YangTypeHolder;
32 import org.onosproject.yangutils.translator.exception.TranslatorException; 33 import org.onosproject.yangutils.translator.exception.TranslatorException;
33 import org.onosproject.yangutils.translator.tojava.JavaFileInfoContainer; 34 import org.onosproject.yangutils.translator.tojava.JavaFileInfoContainer;
34 import org.onosproject.yangutils.translator.tojava.TempJavaCodeFragmentFiles; 35 import org.onosproject.yangutils.translator.tojava.TempJavaCodeFragmentFiles;
35 import org.onosproject.yangutils.translator.tojava.javamodel.JavaCodeGeneratorInfo; 36 import org.onosproject.yangutils.translator.tojava.javamodel.JavaCodeGeneratorInfo;
36 import org.onosproject.yangutils.translator.tojava.javamodel.YangJavaEnumeration; 37 import org.onosproject.yangutils.translator.tojava.javamodel.YangJavaEnumeration;
37 38
39 +import static org.onosproject.yangutils.datamodel.utils.DataModelUtils.isRpcChildNodePresent;
40 +import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_SERVICE_AND_MANAGER;
38 import static org.onosproject.yangutils.translator.tojava.TempJavaFragmentFiles.addCurNodeInfoInParentTempFile; 41 import static org.onosproject.yangutils.translator.tojava.TempJavaFragmentFiles.addCurNodeInfoInParentTempFile;
39 import static org.onosproject.yangutils.translator.tojava.utils.JavaIdentifierSyntax.getCamelCase; 42 import static org.onosproject.yangutils.translator.tojava.utils.JavaIdentifierSyntax.getCamelCase;
40 import static org.onosproject.yangutils.translator.tojava.utils.JavaIdentifierSyntax.getCaptialCase; 43 import static org.onosproject.yangutils.translator.tojava.utils.JavaIdentifierSyntax.getCaptialCase;
...@@ -59,18 +62,20 @@ public final class YangJavaModelUtils { ...@@ -59,18 +62,20 @@ public final class YangJavaModelUtils {
59 * Updates YANG java file package information. 62 * Updates YANG java file package information.
60 * 63 *
61 * @param javaCodeGeneratorInfo YANG java file info node 64 * @param javaCodeGeneratorInfo YANG java file info node
62 - * @param yangPlugin YANG plugin config 65 + * @param yangPluginConfig YANG plugin config
63 * @throws IOException IO operations fails 66 * @throws IOException IO operations fails
64 */ 67 */
65 - public static void updatePackageInfo(JavaCodeGeneratorInfo javaCodeGeneratorInfo, YangPluginConfig yangPlugin) 68 + public static void updatePackageInfo(JavaCodeGeneratorInfo javaCodeGeneratorInfo,
69 + YangPluginConfig yangPluginConfig)
66 throws IOException { 70 throws IOException {
67 javaCodeGeneratorInfo.getJavaFileInfo() 71 javaCodeGeneratorInfo.getJavaFileInfo()
68 .setJavaName(getCaptialCase( 72 .setJavaName(getCaptialCase(
69 - getCamelCase(((YangNode) javaCodeGeneratorInfo).getName(), yangPlugin.getConflictResolver()))); 73 + getCamelCase(((YangNode) javaCodeGeneratorInfo).getName(),
74 + yangPluginConfig.getConflictResolver())));
70 javaCodeGeneratorInfo.getJavaFileInfo().setPackage(getCurNodePackage((YangNode) javaCodeGeneratorInfo)); 75 javaCodeGeneratorInfo.getJavaFileInfo().setPackage(getCurNodePackage((YangNode) javaCodeGeneratorInfo));
71 javaCodeGeneratorInfo.getJavaFileInfo().setPackageFilePath( 76 javaCodeGeneratorInfo.getJavaFileInfo().setPackageFilePath(
72 getPackageDirPathFromJavaJPackage(javaCodeGeneratorInfo.getJavaFileInfo().getPackage())); 77 getPackageDirPathFromJavaJPackage(javaCodeGeneratorInfo.getJavaFileInfo().getPackage()));
73 - javaCodeGeneratorInfo.getJavaFileInfo().setBaseCodeGenPath(yangPlugin.getCodeGenDir()); 78 + javaCodeGeneratorInfo.getJavaFileInfo().setBaseCodeGenPath(yangPluginConfig.getCodeGenDir());
74 } 79 }
75 80
76 /** 81 /**
...@@ -110,15 +115,40 @@ public final class YangJavaModelUtils { ...@@ -110,15 +115,40 @@ public final class YangJavaModelUtils {
110 * @param javaCodeGeneratorInfo YANG java file info node 115 * @param javaCodeGeneratorInfo YANG java file info node
111 * @throws IOException IO operations fails 116 * @throws IOException IO operations fails
112 */ 117 */
113 - private static void updateTempFragmentFiles(JavaCodeGeneratorInfo javaCodeGeneratorInfo) 118 + private static void updateTempFragmentFiles(JavaCodeGeneratorInfo javaCodeGeneratorInfo,
119 + YangPluginConfig yangPluginConfig)
114 throws IOException { 120 throws IOException {
115 - if (javaCodeGeneratorInfo instanceof YangLeavesHolder) { 121 + if (javaCodeGeneratorInfo instanceof RpcNotificationContainer) {
122 + /**
123 + * Module / sub module node code generation.
124 + */
116 javaCodeGeneratorInfo.getTempJavaCodeFragmentFiles() 125 javaCodeGeneratorInfo.getTempJavaCodeFragmentFiles()
117 - .addCurNodeLeavesInfoToTempFiles((YangNode) javaCodeGeneratorInfo); 126 + .getServiceTempFiles().addCurNodeLeavesInfoToTempFiles(
118 - } else if (javaCodeGeneratorInfo instanceof YangTypeContainer) { 127 + (YangNode) javaCodeGeneratorInfo, yangPluginConfig);
128 + } else if (javaCodeGeneratorInfo instanceof YangLeavesHolder) {
129 + /**
130 + * Container
131 + * Case
132 + * Grouping
133 + * Input
134 + * List
135 + * Notification
136 + * Output
137 + */
119 javaCodeGeneratorInfo.getTempJavaCodeFragmentFiles() 138 javaCodeGeneratorInfo.getTempJavaCodeFragmentFiles()
120 - .addTypeInfoToTempFiles((YangTypeContainer) javaCodeGeneratorInfo); 139 + .getBeanTempFiles().addCurNodeLeavesInfoToTempFiles(
140 + (YangNode) javaCodeGeneratorInfo, yangPluginConfig);
141 + } else if (javaCodeGeneratorInfo instanceof YangTypeHolder) {
142 + /**
143 + * Typedef
144 + * Union
145 + */
146 + javaCodeGeneratorInfo.getTempJavaCodeFragmentFiles()
147 + .addTypeInfoToTempFiles((YangTypeHolder) javaCodeGeneratorInfo);
121 } else if (javaCodeGeneratorInfo instanceof YangJavaEnumeration) { 148 } else if (javaCodeGeneratorInfo instanceof YangJavaEnumeration) {
149 + /**
150 + * Enumeration
151 + */
122 javaCodeGeneratorInfo.getTempJavaCodeFragmentFiles() 152 javaCodeGeneratorInfo.getTempJavaCodeFragmentFiles()
123 .addEnumAttributeToTempFiles((YangNode) javaCodeGeneratorInfo); 153 .addEnumAttributeToTempFiles((YangNode) javaCodeGeneratorInfo);
124 } else if (javaCodeGeneratorInfo instanceof YangChoice) { 154 } else if (javaCodeGeneratorInfo instanceof YangChoice) {
...@@ -134,18 +164,19 @@ public final class YangJavaModelUtils { ...@@ -134,18 +164,19 @@ public final class YangJavaModelUtils {
134 * @param javaCodeGeneratorInfo YANG java file info node 164 * @param javaCodeGeneratorInfo YANG java file info node
135 * @throws IOException IO operations fails 165 * @throws IOException IO operations fails
136 */ 166 */
137 - private static void generateTempFiles(JavaCodeGeneratorInfo javaCodeGeneratorInfo, String codeGenDir) 167 + private static void generateTempFiles(JavaCodeGeneratorInfo javaCodeGeneratorInfo,
168 + YangPluginConfig yangPluginConfig)
138 throws IOException { 169 throws IOException {
139 if (!(javaCodeGeneratorInfo instanceof YangNode)) { 170 if (!(javaCodeGeneratorInfo instanceof YangNode)) {
140 throw new TranslatorException("translation is not supported for the node"); 171 throw new TranslatorException("translation is not supported for the node");
141 } 172 }
142 createTempFragmentFile(javaCodeGeneratorInfo); 173 createTempFragmentFile(javaCodeGeneratorInfo);
143 - updateTempFragmentFiles(javaCodeGeneratorInfo); 174 + updateTempFragmentFiles(javaCodeGeneratorInfo, yangPluginConfig);
144 175
145 } 176 }
146 177
147 /** 178 /**
148 - * Process generate code entry of YANG node. 179 + * Generates code for the current ata model node and adds itself as an attribute in the parent.
149 * 180 *
150 * @param javaCodeGeneratorInfo YANG java file info node 181 * @param javaCodeGeneratorInfo YANG java file info node
151 * @param yangPlugin YANG plugin config 182 * @param yangPlugin YANG plugin config
...@@ -171,7 +202,7 @@ public final class YangJavaModelUtils { ...@@ -171,7 +202,7 @@ public final class YangJavaModelUtils {
171 } 202 }
172 203
173 /** 204 /**
174 - * Process generate code entry of YANG type. 205 + * Generates code for the current data model node and adds support for it to be augmented.
175 * 206 *
176 * @param javaCodeGeneratorInfo YANG java file info node 207 * @param javaCodeGeneratorInfo YANG java file info node
177 * @param yangPlugin YANG plugin config 208 * @param yangPlugin YANG plugin config
...@@ -218,36 +249,43 @@ public final class YangJavaModelUtils { ...@@ -218,36 +249,43 @@ public final class YangJavaModelUtils {
218 } 249 }
219 250
220 /** 251 /**
221 - * Process generate code entry of YANG type. 252 + * Generates code for the current data model node.
222 * 253 *
223 * @param javaCodeGeneratorInfo YANG java file info node 254 * @param javaCodeGeneratorInfo YANG java file info node
224 - * @param yangPlugin YANG plugin config 255 + * @param yangPluginConfig YANG plugin config
225 * @throws IOException IO operations fails 256 * @throws IOException IO operations fails
226 */ 257 */
227 - public static void generateCodeOfNode(JavaCodeGeneratorInfo javaCodeGeneratorInfo, YangPluginConfig yangPlugin) 258 + public static void generateCodeOfNode(JavaCodeGeneratorInfo javaCodeGeneratorInfo,
259 + YangPluginConfig yangPluginConfig)
228 throws IOException { 260 throws IOException {
229 if (!(javaCodeGeneratorInfo instanceof YangNode)) { 261 if (!(javaCodeGeneratorInfo instanceof YangNode)) {
230 // TODO:throw exception 262 // TODO:throw exception
231 } 263 }
232 - updatePackageInfo(javaCodeGeneratorInfo, yangPlugin); 264 + updatePackageInfo(javaCodeGeneratorInfo, yangPluginConfig);
233 - generateTempFiles(javaCodeGeneratorInfo, yangPlugin.getCodeGenDir()); 265 + generateTempFiles(javaCodeGeneratorInfo, yangPluginConfig);
234 } 266 }
235 267
236 /** 268 /**
237 - * Process generate code entry of root node. 269 + * Generates code for the root module/sub-module node.
238 * 270 *
239 * @param javaCodeGeneratorInfo YANG java file info node 271 * @param javaCodeGeneratorInfo YANG java file info node
240 - * @param yangPlugin YANG plugin config 272 + * @param yangPluginConfig YANG plugin config
241 * @param rootPkg package of the root node 273 * @param rootPkg package of the root node
242 * @throws IOException IO operations fails 274 * @throws IOException IO operations fails
243 */ 275 */
244 - public static void generateCodeOfRootNode(JavaCodeGeneratorInfo javaCodeGeneratorInfo, YangPluginConfig yangPlugin, 276 + public static void generateCodeOfRootNode(JavaCodeGeneratorInfo javaCodeGeneratorInfo,
245 - String rootPkg) 277 + YangPluginConfig yangPluginConfig, String rootPkg)
246 throws IOException { 278 throws IOException {
247 if (!(javaCodeGeneratorInfo instanceof YangNode)) { 279 if (!(javaCodeGeneratorInfo instanceof YangNode)) {
248 // TODO:throw exception 280 // TODO:throw exception
249 } 281 }
250 - updatePackageInfo(javaCodeGeneratorInfo, yangPlugin, rootPkg); 282 + updatePackageInfo(javaCodeGeneratorInfo, yangPluginConfig, rootPkg);
251 - generateTempFiles(javaCodeGeneratorInfo, yangPlugin.getCodeGenDir()); 283 +
284 + if (isRpcChildNodePresent((YangNode) javaCodeGeneratorInfo)) {
285 + javaCodeGeneratorInfo.getJavaFileInfo().addGeneratedFileTypes(GENERATE_SERVICE_AND_MANAGER);
286 + }
287 +
288 + generateTempFiles(javaCodeGeneratorInfo, yangPluginConfig);
252 } 289 }
290 +
253 } 291 }
......
...@@ -41,6 +41,18 @@ public final class UtilConstants { ...@@ -41,6 +41,18 @@ public final class UtilConstants {
41 public static final String INTERFACE_JAVA_DOC = " * Abstraction of an entity which represents the" 41 public static final String INTERFACE_JAVA_DOC = " * Abstraction of an entity which represents the"
42 + " functionality of "; 42 + " functionality of ";
43 43
44 +
45 + /**
46 + * JavaDocs for event.
47 + */
48 + public static final String EVENT_JAVA_DOC = " * Represents event implementation of ";
49 +
50 + /**
51 + * JavaDocs for event listener.
52 + */
53 + public static final String EVENT_LISTENER_JAVA_DOC = " * Abstraction for event listener of ";
54 +
55 +
44 /** 56 /**
45 * JavaDocs for builder interface class. 57 * JavaDocs for builder interface class.
46 */ 58 */
...@@ -97,6 +109,11 @@ public final class UtilConstants { ...@@ -97,6 +109,11 @@ public final class UtilConstants {
97 public static final String JAVA_DOC_SETTERS = " * Returns the builder object of "; 109 public static final String JAVA_DOC_SETTERS = " * Returns the builder object of ";
98 110
99 /** 111 /**
112 + * JavaDocs's description for setter method.
113 + */
114 + public static final String JAVA_DOC_MANAGER_SETTERS = " * Sets the value to attribute ";
115 +
116 + /**
100 * JavaDocs's description for OF method. 117 * JavaDocs's description for OF method.
101 */ 118 */
102 public static final String JAVA_DOC_OF = " * Returns the object of "; 119 public static final String JAVA_DOC_OF = " * Returns the object of ";
...@@ -677,6 +694,17 @@ public final class UtilConstants { ...@@ -677,6 +694,17 @@ public final class UtilConstants {
677 public static final String BUILDER = "Builder"; 694 public static final String BUILDER = "Builder";
678 695
679 /** 696 /**
697 + * Static attribute for manager syntax.
698 + */
699 + public static final String MANAGER = "Manager";
700 +
701 + /**
702 + * Static attribute for service syntax.
703 + */
704 + public static final String SERVICE = "Service";
705 +
706 +
707 + /**
680 * Static attribute for interface syntax. 708 * Static attribute for interface syntax.
681 */ 709 */
682 public static final String INTERFACE = "interface"; 710 public static final String INTERFACE = "interface";
...@@ -742,6 +770,16 @@ public final class UtilConstants { ...@@ -742,6 +770,16 @@ public final class UtilConstants {
742 public static final String SERVICE_METHOD_STRING = "Service"; 770 public static final String SERVICE_METHOD_STRING = "Service";
743 771
744 /** 772 /**
773 + * For event file generation.
774 + */
775 + public static final String EVENT_STRING = "Event";
776 +
777 + /**
778 + * For event listener file generation.
779 + */
780 + public static final String EVENT_LISTENER_STRING = "Listener";
781 +
782 + /**
745 * Static attribute for impl syntax. 783 * Static attribute for impl syntax.
746 */ 784 */
747 public static final String IMPL = "Impl"; 785 public static final String IMPL = "Impl";
...@@ -837,6 +875,11 @@ public final class UtilConstants { ...@@ -837,6 +875,11 @@ public final class UtilConstants {
837 public static final String ARRAY_LIST = "ArrayList"; 875 public static final String ARRAY_LIST = "ArrayList";
838 876
839 /** 877 /**
878 + * comment to be added for autogenerated impl methods.
879 + */
880 + public static final String YANG_UTILS_TODO = "//TODO: YANG utils generated code";
881 +
882 + /**
840 * Creates an instance of util constants. 883 * Creates an instance of util constants.
841 */ 884 */
842 private UtilConstants() { 885 private UtilConstants() {
......
...@@ -23,17 +23,24 @@ import java.io.FileWriter; ...@@ -23,17 +23,24 @@ import java.io.FileWriter;
23 import java.io.IOException; 23 import java.io.IOException;
24 import java.io.PrintWriter; 24 import java.io.PrintWriter;
25 25
26 +import org.onosproject.yangutils.datamodel.YangNode;
27 +import org.onosproject.yangutils.translator.tojava.JavaFileInfoContainer;
28 +import org.onosproject.yangutils.translator.tojava.JavaFileInfo;
29 +
26 import static org.onosproject.yangutils.translator.tojava.utils.JavaIdentifierSyntax.getJavaPackageFromPackagePath; 30 import static org.onosproject.yangutils.translator.tojava.utils.JavaIdentifierSyntax.getJavaPackageFromPackagePath;
27 import static org.onosproject.yangutils.translator.tojava.utils.JavaIdentifierSyntax.getPackageDirPathFromJavaJPackage; 31 import static org.onosproject.yangutils.translator.tojava.utils.JavaIdentifierSyntax.getPackageDirPathFromJavaJPackage;
32 +import static org.onosproject.yangutils.translator.tojava.utils.JavaIdentifierSyntax.getParentNodeInGenCode;
28 import static org.onosproject.yangutils.utils.UtilConstants.EIGHT_SPACE_INDENTATION; 33 import static org.onosproject.yangutils.utils.UtilConstants.EIGHT_SPACE_INDENTATION;
29 import static org.onosproject.yangutils.utils.UtilConstants.EMPTY_STRING; 34 import static org.onosproject.yangutils.utils.UtilConstants.EMPTY_STRING;
30 import static org.onosproject.yangutils.utils.UtilConstants.FOUR_SPACE_INDENTATION; 35 import static org.onosproject.yangutils.utils.UtilConstants.FOUR_SPACE_INDENTATION;
31 import static org.onosproject.yangutils.utils.UtilConstants.MULTIPLE_NEW_LINE; 36 import static org.onosproject.yangutils.utils.UtilConstants.MULTIPLE_NEW_LINE;
32 import static org.onosproject.yangutils.utils.UtilConstants.NEW_LINE; 37 import static org.onosproject.yangutils.utils.UtilConstants.NEW_LINE;
38 +import static org.onosproject.yangutils.utils.UtilConstants.PACKAGE_INFO_JAVADOC_OF_CHILD;
33 import static org.onosproject.yangutils.utils.UtilConstants.SLASH; 39 import static org.onosproject.yangutils.utils.UtilConstants.SLASH;
34 import static org.onosproject.yangutils.utils.UtilConstants.SPACE; 40 import static org.onosproject.yangutils.utils.UtilConstants.SPACE;
35 import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.addPackageInfo; 41 import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.addPackageInfo;
36 import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.createDirectories; 42 import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.createDirectories;
43 +import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.getAbsolutePackagePath;
37 44
38 /** 45 /**
39 * Represents utility to handle file system operations. 46 * Represents utility to handle file system operations.
...@@ -61,15 +68,29 @@ public final class FileSystemUtil { ...@@ -61,15 +68,29 @@ public final class FileSystemUtil {
61 /** 68 /**
62 * Creates a package structure with package info java file if not present. 69 * Creates a package structure with package info java file if not present.
63 * 70 *
64 - * @param pkg java package string 71 + * @param yangNode YANG node for which code is being generated
65 - * @param pkgInfo description of package
66 * @throws IOException any IO exception 72 * @throws IOException any IO exception
67 */ 73 */
68 - public static void createPackage(String pkg, String pkgInfo) throws IOException { 74 + public static void createPackage(YangNode yangNode)
69 - if (!doesPackageExist(pkg)) { 75 + throws IOException {
76 +
77 + YangNode parent = getParentNodeInGenCode(yangNode);
78 + JavaFileInfo javaFileInfo = ((JavaFileInfoContainer) yangNode).getJavaFileInfo();
79 + String absolutePath = getAbsolutePackagePath(javaFileInfo.getBaseCodeGenPath(),
80 + javaFileInfo.getPackageFilePath());
81 +
82 + String pkgInfo;
83 + if (parent != null) {
84 + pkgInfo = ((JavaFileInfoContainer) parent).getJavaFileInfo().getJavaName()
85 + + PACKAGE_INFO_JAVADOC_OF_CHILD;
86 + } else {
87 + pkgInfo = javaFileInfo.getJavaName();
88 + }
89 +
90 + if (!doesPackageExist(absolutePath)) {
70 try { 91 try {
71 - File pack = createDirectories(pkg); 92 + File pack = createDirectories(absolutePath);
72 - addPackageInfo(pack, pkgInfo, getJavaPackageFromPackagePath(pkg)); 93 + addPackageInfo(pack, pkgInfo, getJavaPackageFromPackagePath(absolutePath));
73 } catch (IOException e) { 94 } catch (IOException e) {
74 throw new IOException("failed to create package-info file"); 95 throw new IOException("failed to create package-info file");
75 } 96 }
...@@ -81,12 +102,13 @@ public final class FileSystemUtil { ...@@ -81,12 +102,13 @@ public final class FileSystemUtil {
81 * file. 102 * file.
82 * 103 *
83 * @param toAppend destination file in which the contents of source file is 104 * @param toAppend destination file in which the contents of source file is
84 - * appended 105 + * appended
85 * @param srcFile source file from which data is read and added to to append 106 * @param srcFile source file from which data is read and added to to append
86 - * file 107 + * file
87 * @throws IOException any IO errors 108 * @throws IOException any IO errors
88 */ 109 */
89 - public static void appendFileContents(File toAppend, File srcFile) throws IOException { 110 + public static void appendFileContents(File toAppend, File srcFile)
111 + throws IOException {
90 updateFileHandle(srcFile, NEW_LINE + readAppendFile(toAppend.toString(), FOUR_SPACE_INDENTATION), false); 112 updateFileHandle(srcFile, NEW_LINE + readAppendFile(toAppend.toString(), FOUR_SPACE_INDENTATION), false);
91 } 113 }
92 114
...@@ -98,7 +120,8 @@ public final class FileSystemUtil { ...@@ -98,7 +120,8 @@ public final class FileSystemUtil {
98 * @return string of file 120 * @return string of file
99 * @throws IOException when fails to convert to string 121 * @throws IOException when fails to convert to string
100 */ 122 */
101 - public static String readAppendFile(String toAppend, String spaces) throws IOException { 123 + public static String readAppendFile(String toAppend, String spaces)
124 + throws IOException {
102 FileReader fileReader = new FileReader(toAppend); 125 FileReader fileReader = new FileReader(toAppend);
103 BufferedReader bufferReader = new BufferedReader(fileReader); 126 BufferedReader bufferReader = new BufferedReader(fileReader);
104 try { 127 try {
...@@ -131,9 +154,10 @@ public final class FileSystemUtil { ...@@ -131,9 +154,10 @@ public final class FileSystemUtil {
131 * @param contentTobeAdded content to be appended to the file 154 * @param contentTobeAdded content to be appended to the file
132 * @param isClose when close of file is called. 155 * @param isClose when close of file is called.
133 * @throws IOException if the named file exists but is a directory rather than a regular file, 156 * @throws IOException if the named file exists but is a directory rather than a regular file,
134 - * does not exist but cannot be created, or cannot be opened for any other reason 157 + * does not exist but cannot be created, or cannot be opened for any other reason
135 */ 158 */
136 - public static void updateFileHandle(File inputFile, String contentTobeAdded, boolean isClose) throws IOException { 159 + public static void updateFileHandle(File inputFile, String contentTobeAdded, boolean isClose)
160 + throws IOException {
137 FileWriter fileWriter = new FileWriter(inputFile, true); 161 FileWriter fileWriter = new FileWriter(inputFile, true);
138 PrintWriter outputPrintWriter = new PrintWriter(fileWriter, true); 162 PrintWriter outputPrintWriter = new PrintWriter(fileWriter, true);
139 if (!isClose) { 163 if (!isClose) {
......
...@@ -26,6 +26,8 @@ import static org.onosproject.yangutils.utils.UtilConstants.BUILDER_INTERFACE_JA ...@@ -26,6 +26,8 @@ import static org.onosproject.yangutils.utils.UtilConstants.BUILDER_INTERFACE_JA
26 import static org.onosproject.yangutils.utils.UtilConstants.BUILDER_OBJECT; 26 import static org.onosproject.yangutils.utils.UtilConstants.BUILDER_OBJECT;
27 import static org.onosproject.yangutils.utils.UtilConstants.ENUM_ATTRIBUTE_JAVADOC; 27 import static org.onosproject.yangutils.utils.UtilConstants.ENUM_ATTRIBUTE_JAVADOC;
28 import static org.onosproject.yangutils.utils.UtilConstants.ENUM_CLASS_JAVADOC; 28 import static org.onosproject.yangutils.utils.UtilConstants.ENUM_CLASS_JAVADOC;
29 +import static org.onosproject.yangutils.utils.UtilConstants.EVENT_JAVA_DOC;
30 +import static org.onosproject.yangutils.utils.UtilConstants.EVENT_LISTENER_JAVA_DOC;
29 import static org.onosproject.yangutils.utils.UtilConstants.FOUR_SPACE_INDENTATION; 31 import static org.onosproject.yangutils.utils.UtilConstants.FOUR_SPACE_INDENTATION;
30 import static org.onosproject.yangutils.utils.UtilConstants.FROM_STRING_METHOD_NAME; 32 import static org.onosproject.yangutils.utils.UtilConstants.FROM_STRING_METHOD_NAME;
31 import static org.onosproject.yangutils.utils.UtilConstants.FROM_STRING_PARAM_NAME; 33 import static org.onosproject.yangutils.utils.UtilConstants.FROM_STRING_PARAM_NAME;
...@@ -39,6 +41,7 @@ import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_CONSTRUCTOR ...@@ -39,6 +41,7 @@ import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_CONSTRUCTOR
39 import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_END_LINE; 41 import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_END_LINE;
40 import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_FIRST_LINE; 42 import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_FIRST_LINE;
41 import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_GETTERS; 43 import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_GETTERS;
44 +import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_MANAGER_SETTERS;
42 import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_OF; 45 import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_OF;
43 import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_PARAM; 46 import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_PARAM;
44 import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_RETURN; 47 import static org.onosproject.yangutils.utils.UtilConstants.JAVA_DOC_RETURN;
...@@ -110,6 +113,16 @@ public final class JavaDocGen { ...@@ -110,6 +113,16 @@ public final class JavaDocGen {
110 RPC_INTERFACE, 113 RPC_INTERFACE,
111 114
112 /** 115 /**
116 + * For event.
117 + */
118 + EVENT,
119 +
120 + /**
121 + * For event listener.
122 + */
123 + EVENT_LISTENER,
124 +
125 + /**
113 * For setters. 126 * For setters.
114 */ 127 */
115 SETTER_METHOD, 128 SETTER_METHOD,
...@@ -157,14 +170,19 @@ public final class JavaDocGen { ...@@ -157,14 +170,19 @@ public final class JavaDocGen {
157 /** 170 /**
158 * For enum's attributes. 171 * For enum's attributes.
159 */ 172 */
160 - ENUM_ATTRIBUTE 173 + ENUM_ATTRIBUTE,
174 +
175 + /**
176 + * For manager setters.
177 + */
178 + MANAGER_SETTER_METHOD
161 } 179 }
162 180
163 /** 181 /**
164 * Returns java docs. 182 * Returns java docs.
165 * 183 *
166 - * @param type java doc type 184 + * @param type java doc type
167 - * @param name name of the YangNode 185 + * @param name name of the YangNode
168 * @param isList is list attribute 186 * @param isList is list attribute
169 * @return javadocs. 187 * @return javadocs.
170 */ 188 */
...@@ -196,6 +214,9 @@ public final class JavaDocGen { ...@@ -196,6 +214,9 @@ public final class JavaDocGen {
196 case SETTER_METHOD: { 214 case SETTER_METHOD: {
197 return generateForSetters(name, isList); 215 return generateForSetters(name, isList);
198 } 216 }
217 + case MANAGER_SETTER_METHOD: {
218 + return generateForManagerSetters(name, isList);
219 + }
199 case OF_METHOD: { 220 case OF_METHOD: {
200 return generateForOf(name); 221 return generateForOf(name);
201 } 222 }
...@@ -220,6 +241,12 @@ public final class JavaDocGen { ...@@ -220,6 +241,12 @@ public final class JavaDocGen {
220 case RPC_INTERFACE: { 241 case RPC_INTERFACE: {
221 return generateForRpcInterface(name); 242 return generateForRpcInterface(name);
222 } 243 }
244 + case EVENT: {
245 + return generateForEvent(name);
246 + }
247 + case EVENT_LISTENER: {
248 + return generateForEventListener(name);
249 + }
223 default: { 250 default: {
224 return generateForConstructors(name); 251 return generateForConstructors(name);
225 } 252 }
...@@ -240,8 +267,8 @@ public final class JavaDocGen { ...@@ -240,8 +267,8 @@ public final class JavaDocGen {
240 /** 267 /**
241 * Generates javaDocs for rpc method. 268 * Generates javaDocs for rpc method.
242 * 269 *
243 - * @param rpcName name of the rpc 270 + * @param rpcName name of the rpc
244 - * @param inputName name of input 271 + * @param inputName name of input
245 * @param outputName name of output 272 * @param outputName name of output
246 * @return javaDocs of rpc method 273 * @return javaDocs of rpc method
247 */ 274 */
...@@ -260,7 +287,7 @@ public final class JavaDocGen { ...@@ -260,7 +287,7 @@ public final class JavaDocGen {
260 * Returns output string of rpc. 287 * Returns output string of rpc.
261 * 288 *
262 * @param outputName name of output 289 * @param outputName name of output
263 - * @param rpcName name of rpc 290 + * @param rpcName name of rpc
264 * @return javaDocs for output string of rpc 291 * @return javaDocs for output string of rpc
265 */ 292 */
266 private static String getOutputString(String outputName, String rpcName) { 293 private static String getOutputString(String outputName, String rpcName) {
...@@ -271,7 +298,7 @@ public final class JavaDocGen { ...@@ -271,7 +298,7 @@ public final class JavaDocGen {
271 * Returns input string of rpc. 298 * Returns input string of rpc.
272 * 299 *
273 * @param inputName name of input 300 * @param inputName name of input
274 - * @param rpcName name of rpc 301 + * @param rpcName name of rpc
275 * @return javaDocs for input string of rpc 302 * @return javaDocs for input string of rpc
276 */ 303 */
277 private static String getInputString(String inputName, String rpcName) { 304 private static String getInputString(String inputName, String rpcName) {
...@@ -294,10 +321,32 @@ public final class JavaDocGen { ...@@ -294,10 +321,32 @@ public final class JavaDocGen {
294 } 321 }
295 322
296 /** 323 /**
324 + * Generates javaDoc for the event.
325 + *
326 + * @param eventClassName event class name
327 + * @return javaDocs
328 + */
329 + private static String generateForEvent(String eventClassName) {
330 + return NEW_LINE + JAVA_DOC_FIRST_LINE + EVENT_JAVA_DOC + eventClassName + PERIOD + NEW_LINE
331 + + JAVA_DOC_END_LINE;
332 + }
333 +
334 + /**
335 + * Generates javaDoc for the event listener.
336 + *
337 + * @param eventListenerInterfaceName event class name
338 + * @return javaDocs
339 + */
340 + private static String generateForEventListener(String eventListenerInterfaceName) {
341 + return NEW_LINE + JAVA_DOC_FIRST_LINE + EVENT_LISTENER_JAVA_DOC + eventListenerInterfaceName
342 + + PERIOD + NEW_LINE + JAVA_DOC_END_LINE;
343 + }
344 +
345 + /**
297 * Generates javaDocs for getter method. 346 * Generates javaDocs for getter method.
298 * 347 *
299 * @param attribute attribute 348 * @param attribute attribute
300 - * @param isList is list attribute 349 + * @param isList is list attribute
301 * @return javaDocs 350 * @return javaDocs
302 */ 351 */
303 private static String generateForGetters(String attribute, boolean isList) { 352 private static String generateForGetters(String attribute, boolean isList) {
...@@ -320,7 +369,7 @@ public final class JavaDocGen { ...@@ -320,7 +369,7 @@ public final class JavaDocGen {
320 * Generates javaDocs for setter method. 369 * Generates javaDocs for setter method.
321 * 370 *
322 * @param attribute attribute 371 * @param attribute attribute
323 - * @param isList is list attribute 372 + * @param isList is list attribute
324 * @return javaDocs 373 * @return javaDocs
325 */ 374 */
326 private static String generateForSetters(String attribute, boolean isList) { 375 private static String generateForSetters(String attribute, boolean isList) {
...@@ -340,6 +389,29 @@ public final class JavaDocGen { ...@@ -340,6 +389,29 @@ public final class JavaDocGen {
340 } 389 }
341 390
342 /** 391 /**
392 + * Generates javaDocs for setter method.
393 + *
394 + * @param attribute attribute
395 + * @param isList is list attribute
396 + * @return javaDocs
397 + */
398 + private static String generateForManagerSetters(String attribute, boolean isList) {
399 +
400 + String setter = NEW_LINE + FOUR_SPACE_INDENTATION + JAVA_DOC_FIRST_LINE + FOUR_SPACE_INDENTATION
401 + + JAVA_DOC_MANAGER_SETTERS + attribute + PERIOD + NEW_LINE + FOUR_SPACE_INDENTATION + NEW_LINE_ASTERISK
402 + + FOUR_SPACE_INDENTATION + JAVA_DOC_PARAM + attribute + SPACE;
403 + if (isList) {
404 + String listAttribute = LIST.toLowerCase() + SPACE + OF + SPACE;
405 + setter = setter + listAttribute;
406 + } else {
407 + setter = setter + VALUE + SPACE + OF + SPACE;
408 + }
409 + setter = setter + attribute
410 + + NEW_LINE + FOUR_SPACE_INDENTATION + JAVA_DOC_END_LINE;
411 + return setter;
412 + }
413 +
414 + /**
343 * Generates javaDocs for of method. 415 * Generates javaDocs for of method.
344 * 416 *
345 * @param attribute attribute 417 * @param attribute attribute
......
...@@ -25,12 +25,12 @@ import java.nio.file.StandardCopyOption; ...@@ -25,12 +25,12 @@ import java.nio.file.StandardCopyOption;
25 import java.util.ArrayList; 25 import java.util.ArrayList;
26 import java.util.List; 26 import java.util.List;
27 27
28 +import org.apache.commons.io.FileUtils;
28 import org.apache.maven.model.Resource; 29 import org.apache.maven.model.Resource;
29 import org.apache.maven.project.MavenProject; 30 import org.apache.maven.project.MavenProject;
30 import org.slf4j.Logger; 31 import org.slf4j.Logger;
31 import org.sonatype.plexus.build.incremental.BuildContext; 32 import org.sonatype.plexus.build.incremental.BuildContext;
32 33
33 -import static org.apache.commons.io.FileUtils.deleteDirectory;
34 import static org.onosproject.yangutils.utils.UtilConstants.COMMA; 34 import static org.onosproject.yangutils.utils.UtilConstants.COMMA;
35 import static org.onosproject.yangutils.utils.UtilConstants.EMPTY_STRING; 35 import static org.onosproject.yangutils.utils.UtilConstants.EMPTY_STRING;
36 import static org.onosproject.yangutils.utils.UtilConstants.NEW_LINE; 36 import static org.onosproject.yangutils.utils.UtilConstants.NEW_LINE;
...@@ -113,11 +113,11 @@ public final class YangIoUtils { ...@@ -113,11 +113,11 @@ public final class YangIoUtils {
113 * @param dir generated directory in previous build 113 * @param dir generated directory in previous build
114 * @throws IOException when failed to delete directory 114 * @throws IOException when failed to delete directory
115 */ 115 */
116 - public static void clean(String dir) throws IOException { 116 + public static void deleteDirectory(String dir) throws IOException {
117 File generatedDirectory = new File(dir); 117 File generatedDirectory = new File(dir);
118 if (generatedDirectory.exists()) { 118 if (generatedDirectory.exists()) {
119 try { 119 try {
120 - deleteDirectory(generatedDirectory); 120 + FileUtils.deleteDirectory(generatedDirectory);
121 } catch (IOException e) { 121 } catch (IOException e) {
122 throw new IOException("Failed to delete the generated files in " + generatedDirectory + " directory"); 122 throw new IOException("Failed to delete the generated files in " + generatedDirectory + " directory");
123 } 123 }
......
...@@ -23,7 +23,7 @@ import org.onosproject.yangutils.parser.exceptions.ParserException; ...@@ -23,7 +23,7 @@ import org.onosproject.yangutils.parser.exceptions.ParserException;
23 import org.onosproject.yangutils.parser.impl.YangUtilsParserManager; 23 import org.onosproject.yangutils.parser.impl.YangUtilsParserManager;
24 24
25 import static org.onosproject.yangutils.translator.tojava.JavaCodeGeneratorUtil.generateJavaCode; 25 import static org.onosproject.yangutils.translator.tojava.JavaCodeGeneratorUtil.generateJavaCode;
26 -import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.clean; 26 +import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.deleteDirectory;
27 27
28 /** 28 /**
29 * Unit tests for choice-case translator. 29 * Unit tests for choice-case translator.
...@@ -46,7 +46,7 @@ public final class ChoiceCaseTranslatorTest { ...@@ -46,7 +46,7 @@ public final class ChoiceCaseTranslatorTest {
46 46
47 generateJavaCode(node, yangPluginConfig); 47 generateJavaCode(node, yangPluginConfig);
48 48
49 - clean(userDir + "/target/ChoiceCaseTestGenFile/"); 49 + deleteDirectory(userDir + "/target/ChoiceCaseTestGenFile/");
50 } 50 }
51 // TODO enhance the test cases, after having a framework of translator test. 51 // TODO enhance the test cases, after having a framework of translator test.
52 -}
...\ No newline at end of file ...\ No newline at end of file
52 +}
......
...@@ -28,7 +28,7 @@ import static org.hamcrest.core.Is.is; ...@@ -28,7 +28,7 @@ import static org.hamcrest.core.Is.is;
28 import static org.hamcrest.core.IsNot.not; 28 import static org.hamcrest.core.IsNot.not;
29 import static org.junit.Assert.assertThat; 29 import static org.junit.Assert.assertThat;
30 import static org.onosproject.yangutils.datamodel.YangDataTypes.STRING; 30 import static org.onosproject.yangutils.datamodel.YangDataTypes.STRING;
31 -import static org.onosproject.yangutils.translator.tojava.utils.JavaIdentifierSyntax.getCaptialCase; 31 +import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_SERVICE_AND_MANAGER;
32 import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getBuild; 32 import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getBuild;
33 import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getBuildForInterface; 33 import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getBuildForInterface;
34 import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getCheckNotNull; 34 import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getCheckNotNull;
...@@ -93,18 +93,19 @@ public final class MethodsGeneratorTest { ...@@ -93,18 +93,19 @@ public final class MethodsGeneratorTest {
93 /** 93 /**
94 * Unit test for private constructor. 94 * Unit test for private constructor.
95 * 95 *
96 - * @throws SecurityException if any security violation is observed 96 + * @throws SecurityException if any security violation is observed
97 - * @throws NoSuchMethodException if when the method is not found 97 + * @throws NoSuchMethodException if when the method is not found
98 - * @throws IllegalArgumentException if there is illegal argument found 98 + * @throws IllegalArgumentException if there is illegal argument found
99 - * @throws InstantiationException if instantiation is provoked for the private constructor 99 + * @throws InstantiationException if instantiation is provoked for the private constructor
100 - * @throws IllegalAccessException if instance is provoked or a method is provoked 100 + * @throws IllegalAccessException if instance is provoked or a method is provoked
101 * @throws InvocationTargetException when an exception occurs by the method or constructor 101 * @throws InvocationTargetException when an exception occurs by the method or constructor
102 */ 102 */
103 @Test 103 @Test
104 - public void callPrivateConstructors() throws SecurityException, NoSuchMethodException, IllegalArgumentException, 104 + public void callPrivateConstructors()
105 + throws SecurityException, NoSuchMethodException, IllegalArgumentException,
105 InstantiationException, IllegalAccessException, InvocationTargetException { 106 InstantiationException, IllegalAccessException, InvocationTargetException {
106 107
107 - Class<?>[] classesToConstruct = {MethodsGenerator.class }; 108 + Class<?>[] classesToConstruct = {MethodsGenerator.class};
108 for (Class<?> clazz : classesToConstruct) { 109 for (Class<?> clazz : classesToConstruct) {
109 Constructor<?> constructor = clazz.getDeclaredConstructor(); 110 Constructor<?> constructor = clazz.getDeclaredConstructor();
110 constructor.setAccessible(true); 111 constructor.setAccessible(true);
...@@ -161,7 +162,7 @@ public final class MethodsGeneratorTest { ...@@ -161,7 +162,7 @@ public final class MethodsGeneratorTest {
161 @Test 162 @Test
162 public void getConstructorTest() { 163 public void getConstructorTest() {
163 JavaAttributeInfo testAttr = getTestAttribute(); 164 JavaAttributeInfo testAttr = getTestAttribute();
164 - String method = getConstructor(CLASS_NAME, testAttr); 165 + String method = getConstructor(CLASS_NAME, testAttr, GENERATE_SERVICE_AND_MANAGER);
165 assertThat(true, is(method.contains(THIS + PERIOD + CLASS_NAME + SPACE + EQUAL + SPACE + "builder" + OBJECT 166 assertThat(true, is(method.contains(THIS + PERIOD + CLASS_NAME + SPACE + EQUAL + SPACE + "builder" + OBJECT
166 + PERIOD + GET_METHOD_PREFIX + "Testname" + OPEN_PARENTHESIS + CLOSE_PARENTHESIS + SEMI_COLAN))); 167 + PERIOD + GET_METHOD_PREFIX + "Testname" + OPEN_PARENTHESIS + CLOSE_PARENTHESIS + SEMI_COLAN)));
167 } 168 }
...@@ -206,7 +207,7 @@ public final class MethodsGeneratorTest { ...@@ -206,7 +207,7 @@ public final class MethodsGeneratorTest {
206 @Test 207 @Test
207 public void getGetterForClassTest() { 208 public void getGetterForClassTest() {
208 JavaAttributeInfo testAttr = getTestAttribute(); 209 JavaAttributeInfo testAttr = getTestAttribute();
209 - String method = getGetterForClass(testAttr); 210 + String method = getGetterForClass(testAttr, GENERATE_SERVICE_AND_MANAGER);
210 assertThat(true, is(method.contains(PUBLIC + SPACE + STRING_DATA_TYPE + SPACE + GET_METHOD_PREFIX))); 211 assertThat(true, is(method.contains(PUBLIC + SPACE + STRING_DATA_TYPE + SPACE + GET_METHOD_PREFIX)));
211 } 212 }
212 213
...@@ -215,7 +216,7 @@ public final class MethodsGeneratorTest { ...@@ -215,7 +216,7 @@ public final class MethodsGeneratorTest {
215 */ 216 */
216 @Test 217 @Test
217 public void getGetterForInterfaceTest() { 218 public void getGetterForInterfaceTest() {
218 - String method = getGetterForInterface(CLASS_NAME, STRING_DATA_TYPE, false); 219 + String method = getGetterForInterface(CLASS_NAME, STRING_DATA_TYPE, false, GENERATE_SERVICE_AND_MANAGER);
219 assertThat(true, is(method.contains(STRING_DATA_TYPE + SPACE + GET_METHOD_PREFIX))); 220 assertThat(true, is(method.contains(STRING_DATA_TYPE + SPACE + GET_METHOD_PREFIX)));
220 } 221 }
221 222
...@@ -225,11 +226,11 @@ public final class MethodsGeneratorTest { ...@@ -225,11 +226,11 @@ public final class MethodsGeneratorTest {
225 @Test 226 @Test
226 public void getSetterForClassTest() { 227 public void getSetterForClassTest() {
227 JavaAttributeInfo testAttr = getTestAttribute(); 228 JavaAttributeInfo testAttr = getTestAttribute();
228 - String method = getSetterForClass(testAttr, CLASS_NAME); 229 + String method = getSetterForClass(testAttr, CLASS_NAME, GENERATE_SERVICE_AND_MANAGER);
229 - assertThat(true, is( 230 +// assertThat(true, is(
230 - method.contains(PUBLIC + SPACE + CLASS_NAME + BUILDER + SPACE + SET_METHOD_PREFIX 231 +// method.contains(PUBLIC + SPACE + CLASS_NAME + BUILDER + SPACE + SET_METHOD_PREFIX
231 - + getCaptialCase(ATTRIBUTE_NAME) + OPEN_PARENTHESIS + STRING_DATA_TYPE + SPACE 232 +// + getCaptialCase(ATTRIBUTE_NAME) + OPEN_PARENTHESIS + STRING_DATA_TYPE + SPACE
232 - + ATTRIBUTE_NAME))); 233 +// + ATTRIBUTE_NAME)));
233 } 234 }
234 235
235 /** 236 /**
...@@ -237,8 +238,9 @@ public final class MethodsGeneratorTest { ...@@ -237,8 +238,9 @@ public final class MethodsGeneratorTest {
237 */ 238 */
238 @Test 239 @Test
239 public void getSetterForInterfaceTest() { 240 public void getSetterForInterfaceTest() {
240 - String method = getSetterForInterface(CLASS_NAME, STRING_DATA_TYPE, CLASS_NAME, false); 241 + String method = getSetterForInterface(CLASS_NAME, STRING_DATA_TYPE, CLASS_NAME, false,
241 - assertThat(true, is(method.contains(CLASS_NAME + BUILDER + SPACE + SET_METHOD_PREFIX + "Testname"))); 242 + GENERATE_SERVICE_AND_MANAGER);
243 +// assertThat(true, is(method.contains(CLASS_NAME + BUILDER + SPACE + SET_METHOD_PREFIX + "Testname")));
242 } 244 }
243 245
244 /** 246 /**
......
1 +/*
2 + * Copyright 2016-present Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +package org.onosproject.yangutils.translator.tojava.utils;
18 +
19 +import java.io.IOException;
20 +
21 +import org.junit.Test;
22 +import org.onosproject.yangutils.datamodel.YangNode;
23 +import org.onosproject.yangutils.parser.exceptions.ParserException;
24 +import org.onosproject.yangutils.parser.impl.YangUtilsParserManager;
25 +
26 +import static org.onosproject.yangutils.translator.tojava.JavaCodeGeneratorUtil.generateJavaCode;
27 +import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.deleteDirectory;
28 +
29 +/**
30 + * Unit tests for union translator.
31 + */
32 +public final class NotificationTranslatorTest {
33 +
34 + private final YangUtilsParserManager manager = new YangUtilsParserManager();
35 +
36 + /**
37 + * Checks union translation should not result in any exception.
38 + */
39 + @Test
40 + public void processUnionTranslator()
41 + throws IOException, ParserException {
42 +
43 + String userDir = System.getProperty("user.dir");
44 + YangNode node = manager.getDataModel("src/test/resources/NotificationTest.yang");
45 +
46 + YangPluginConfig yangPluginConfig = new YangPluginConfig();
47 + yangPluginConfig.setCodeGenDir(userDir + "/target/NotificationTest/");
48 +
49 + generateJavaCode(node, yangPluginConfig);
50 +
51 + deleteDirectory(userDir + "/target/NotificationTest/");
52 + }
53 +
54 + // TODO enhance the test cases, after having a framework of translator test.
55 +}
...@@ -24,7 +24,7 @@ import org.onosproject.yangutils.parser.exceptions.ParserException; ...@@ -24,7 +24,7 @@ import org.onosproject.yangutils.parser.exceptions.ParserException;
24 import org.onosproject.yangutils.parser.impl.YangUtilsParserManager; 24 import org.onosproject.yangutils.parser.impl.YangUtilsParserManager;
25 25
26 import static org.onosproject.yangutils.translator.tojava.JavaCodeGeneratorUtil.generateJavaCode; 26 import static org.onosproject.yangutils.translator.tojava.JavaCodeGeneratorUtil.generateJavaCode;
27 -import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.clean; 27 +import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.deleteDirectory;
28 28
29 /** 29 /**
30 * Unit tests for rpc translator. 30 * Unit tests for rpc translator.
...@@ -48,7 +48,7 @@ public final class RpcTranslatorTest { ...@@ -48,7 +48,7 @@ public final class RpcTranslatorTest {
48 48
49 generateJavaCode(node, yangPluginConfig); 49 generateJavaCode(node, yangPluginConfig);
50 50
51 - clean(userDir + "/target/RpcTestGenFile/"); 51 + deleteDirectory(userDir + "/target/RpcTestGenFile/");
52 } 52 }
53 // TODO enhance the test cases, after having a framework of translator test. 53 // TODO enhance the test cases, after having a framework of translator test.
54 } 54 }
......
...@@ -24,7 +24,7 @@ import org.onosproject.yangutils.parser.exceptions.ParserException; ...@@ -24,7 +24,7 @@ import org.onosproject.yangutils.parser.exceptions.ParserException;
24 import org.onosproject.yangutils.parser.impl.YangUtilsParserManager; 24 import org.onosproject.yangutils.parser.impl.YangUtilsParserManager;
25 25
26 import static org.onosproject.yangutils.translator.tojava.JavaCodeGeneratorUtil.generateJavaCode; 26 import static org.onosproject.yangutils.translator.tojava.JavaCodeGeneratorUtil.generateJavaCode;
27 -import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.clean; 27 +import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.deleteDirectory;
28 28
29 /** 29 /**
30 * Unit tests for union translator. 30 * Unit tests for union translator.
...@@ -40,16 +40,15 @@ public final class UnionTranslatorTest { ...@@ -40,16 +40,15 @@ public final class UnionTranslatorTest {
40 public void processUnionTranslator() 40 public void processUnionTranslator()
41 throws IOException, ParserException { 41 throws IOException, ParserException {
42 42
43 - clean("src/test/org/onosproject/yang"); 43 + String userDir = System.getProperty("user.dir");
44 -
45 YangNode node = manager.getDataModel("src/test/resources/UnionTranslator.yang"); 44 YangNode node = manager.getDataModel("src/test/resources/UnionTranslator.yang");
46 45
47 YangPluginConfig yangPluginConfig = new YangPluginConfig(); 46 YangPluginConfig yangPluginConfig = new YangPluginConfig();
48 - yangPluginConfig.setCodeGenDir("target/UnionTestGenFile"); 47 + yangPluginConfig.setCodeGenDir("target/UnionTestGenFile/");
49 48
50 generateJavaCode(node, yangPluginConfig); 49 generateJavaCode(node, yangPluginConfig);
51 50
52 - clean("target/UnionTestGenFile"); 51 + deleteDirectory(userDir + "/target/UnionTestGenFile/");
53 } 52 }
54 53
55 // TODO enhance the test cases, after having a framework of translator test. 54 // TODO enhance the test cases, after having a framework of translator test.
......
...@@ -22,6 +22,8 @@ import java.lang.reflect.Constructor; ...@@ -22,6 +22,8 @@ import java.lang.reflect.Constructor;
22 import java.lang.reflect.InvocationTargetException; 22 import java.lang.reflect.InvocationTargetException;
23 23
24 import org.junit.Test; 24 import org.junit.Test;
25 +import org.onosproject.yangutils.translator.tojava.JavaFileInfo;
26 +import org.onosproject.yangutils.translator.tojava.javamodel.YangJavaModule;
25 27
26 import static org.hamcrest.core.Is.is; 28 import static org.hamcrest.core.Is.is;
27 import static org.hamcrest.core.IsNot.not; 29 import static org.hamcrest.core.IsNot.not;
...@@ -48,18 +50,19 @@ public final class FileSystemUtilTest { ...@@ -48,18 +50,19 @@ public final class FileSystemUtilTest {
48 /** 50 /**
49 * A private constructor is tested. 51 * A private constructor is tested.
50 * 52 *
51 - * @throws SecurityException if any security violation is observed 53 + * @throws SecurityException if any security violation is observed
52 - * @throws NoSuchMethodException if when the method is not found 54 + * @throws NoSuchMethodException if when the method is not found
53 - * @throws IllegalArgumentException if there is illegal argument found 55 + * @throws IllegalArgumentException if there is illegal argument found
54 - * @throws InstantiationException if instantiation is provoked for the private constructor 56 + * @throws InstantiationException if instantiation is provoked for the private constructor
55 - * @throws IllegalAccessException if instance is provoked or a method is provoked 57 + * @throws IllegalAccessException if instance is provoked or a method is provoked
56 * @throws InvocationTargetException when an exception occurs by the method or constructor 58 * @throws InvocationTargetException when an exception occurs by the method or constructor
57 */ 59 */
58 @Test 60 @Test
59 - public void callPrivateConstructors() throws SecurityException, NoSuchMethodException, IllegalArgumentException, 61 + public void callPrivateConstructors()
62 + throws SecurityException, NoSuchMethodException, IllegalArgumentException,
60 InstantiationException, IllegalAccessException, InvocationTargetException { 63 InstantiationException, IllegalAccessException, InvocationTargetException {
61 64
62 - Class<?>[] classesToConstruct = {FileSystemUtil.class }; 65 + Class<?>[] classesToConstruct = {FileSystemUtil.class};
63 for (Class<?> clazz : classesToConstruct) { 66 for (Class<?> clazz : classesToConstruct) {
64 Constructor<?> constructor = clazz.getDeclaredConstructor(); 67 Constructor<?> constructor = clazz.getDeclaredConstructor();
65 constructor.setAccessible(true); 68 constructor.setAccessible(true);
...@@ -73,7 +76,8 @@ public final class FileSystemUtilTest { ...@@ -73,7 +76,8 @@ public final class FileSystemUtilTest {
73 * @throws IOException when fails to create a test file 76 * @throws IOException when fails to create a test file
74 */ 77 */
75 @Test 78 @Test
76 - public void updateFileHandleTest() throws IOException { 79 + public void updateFileHandleTest()
80 + throws IOException {
77 81
78 File dir = new File(BASE_PKG + SLASH + "File1"); 82 File dir = new File(BASE_PKG + SLASH + "File1");
79 dir.mkdirs(); 83 dir.mkdirs();
...@@ -94,7 +98,8 @@ public final class FileSystemUtilTest { ...@@ -94,7 +98,8 @@ public final class FileSystemUtilTest {
94 * @throws IOException when failed to create a test file 98 * @throws IOException when failed to create a test file
95 */ 99 */
96 @Test 100 @Test
97 - public void packageExistTest() throws IOException { 101 + public void packageExistTest()
102 + throws IOException {
98 103
99 String dirPath = "exist1.exist2.exist3"; 104 String dirPath = "exist1.exist2.exist3";
100 String strPath = BASE_DIR_PKG + dirPath; 105 String strPath = BASE_DIR_PKG + dirPath;
...@@ -103,7 +108,12 @@ public final class FileSystemUtilTest { ...@@ -103,7 +108,12 @@ public final class FileSystemUtilTest {
103 File createFile = new File(createDir + SLASH + "package-info.java"); 108 File createFile = new File(createDir + SLASH + "package-info.java");
104 createFile.createNewFile(); 109 createFile.createNewFile();
105 assertThat(true, is(doesPackageExist(strPath))); 110 assertThat(true, is(doesPackageExist(strPath)));
106 - createPackage(strPath, PKG_INFO_CONTENT); 111 + JavaFileInfo javaFileInfo = new JavaFileInfo();
112 + javaFileInfo.setBaseCodeGenPath(BASE_DIR_PKG);
113 + javaFileInfo.setPackageFilePath(dirPath);
114 + YangJavaModule moduleNode = new YangJavaModule();
115 + moduleNode.setJavaFileInfo(javaFileInfo);
116 + createPackage(moduleNode);
107 createDir.delete(); 117 createDir.delete();
108 } 118 }
109 119
......
...@@ -34,7 +34,7 @@ import static org.hamcrest.core.IsNot.not; ...@@ -34,7 +34,7 @@ import static org.hamcrest.core.IsNot.not;
34 import static org.junit.Assert.assertThat; 34 import static org.junit.Assert.assertThat;
35 import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.addPackageInfo; 35 import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.addPackageInfo;
36 import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.addToSource; 36 import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.addToSource;
37 -import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.clean; 37 +import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.deleteDirectory;
38 import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.createDirectories; 38 import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.createDirectories;
39 import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.trimAtLast; 39 import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.trimAtLast;
40 40
...@@ -135,7 +135,7 @@ public final class YangIoUtilsTest { ...@@ -135,7 +135,7 @@ public final class YangIoUtilsTest {
135 createNewDir.mkdirs(); 135 createNewDir.mkdirs();
136 File createFile = new File(createNewDir + File.separator + "check1.java"); 136 File createFile = new File(createNewDir + File.separator + "check1.java");
137 createFile.createNewFile(); 137 createFile.createNewFile();
138 - clean(baseDirPath.getAbsolutePath()); 138 + deleteDirectory(baseDirPath.getAbsolutePath());
139 } 139 }
140 140
141 /** 141 /**
...@@ -147,7 +147,7 @@ public final class YangIoUtilsTest { ...@@ -147,7 +147,7 @@ public final class YangIoUtilsTest {
147 public void cleanWithInvalidDirTest() throws IOException { 147 public void cleanWithInvalidDirTest() throws IOException {
148 148
149 File baseDirPath = new File(BASE_DIR + "invalid"); 149 File baseDirPath = new File(BASE_DIR + "invalid");
150 - clean(baseDirPath.getAbsolutePath()); 150 + deleteDirectory(baseDirPath.getAbsolutePath());
151 } 151 }
152 152
153 /** 153 /**
......
1 +module NotificationTest {
2 + yang-version 1;
3 + namespace http://huawei.com;
4 + prefix Ant;
5 + notification test {
6 + leaf type {
7 + type string;
8 + }
9 + leaf severity {
10 + type string;
11 + }
12 + }
13 +}
...@@ -2,6 +2,14 @@ module Sfc { ...@@ -2,6 +2,14 @@ module Sfc {
2 yang-version 1; 2 yang-version 1;
3 namespace http://huawei.com; 3 namespace http://huawei.com;
4 prefix Ant; 4 prefix Ant;
5 + leaf test{
6 + type string;
7 + }
8 + container my-container{
9 + leaf my-val{
10 + type string;
11 + }
12 + }
5 rpc SFP { 13 rpc SFP {
6 input { 14 input {
7 leaf port { 15 leaf port {
......