Remove checkstyle errors from generated code

The generated code in the APEX model module creates checkstyle errors
in Eclipse becasue there is no license header on the generated Java code.
This change adds the copyright header to the code generation templates.

Also this change introduces teh latest version of ahtlr 4 for code generation
from a grammar.

Issue-ID: POLICY-716

Change-Id: Ib02cc4e1a6e815cf6d4b386c19f7eb2542f9ed00
Signed-off-by: liamfallon <liam.fallon@ericsson.com>

diff --git a/.gitignore b/.gitignore
index 3a97353..8f36297 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ target
 .metadata/
 /bin/
 derby.log
+.checkstyle

diff --git a/model/utilities/pom.xml b/model/utilities/pom.xml
index 90b9937..7247423 100644 (file)
--- a/model/utilities/pom.xml
+++ b/model/utilities/pom.xml
@@ -32,12 +32,11 @@
         <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>antlr4-runtime</artifactId>
-            <version>4.6</version>
+            <version>4.7.1</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.7</version>
         </dependency>
     </dependencies>
 
@@ -59,4 +58,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>

diff --git a/model/utilities/src/main/antlr4/org/onap/policy/apex/model/utilities/typeutils/ParametrizedType.g4 b/model/utilities/src/main/antlr4/org/onap/policy/apex/model/utilities/typeutils/ParametrizedType.g4
index 3a37d40..384c37b 100644 (file)
--- a/model/utilities/src/main/antlr4/org/onap/policy/apex/model/utilities/typeutils/ParametrizedType.g4
+++ b/model/utilities/src/main/antlr4/org/onap/policy/apex/model/utilities/typeutils/ParametrizedType.g4
@@ -20,20 +20,26 @@
 
 grammar ParametrizedType;
 
-//For more information see:
-// http://stackoverflow.com/questions/39401083/class-forname-equivalent-for-creating-parameterizedtypes-from-string
-// https://github.com/KetothXupack/stackoverflow-answers/tree/master/q39401083
-
-@parser::header {
- //For more information see:
- // http://stackoverflow.com/questions/39401083/class-forname-equivalent-for-creating-parameterizedtypes-from-string
- // https://github.com/KetothXupack/stackoverflow-answers/tree/master/q39401083
-
-
- //Note: Unused Imports  
- //Since this is generated code compile warnings are to be expected and cannot always be suppressed
- //See https://github.com/antlr/antlr4/issues/1192 
- import org.onap.policy.apex.model.utilities.typeutils.ClassBuilder;
+@header {
+/*
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
 }
 
 type returns[ClassBuilder value]