summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2018-06-06 15:34:30 +0000
committerGerrit Code Review <gerrit@onap.org>2018-06-06 15:34:30 +0000
commit407c388c4e2eae3e1d9ac77d5f8a8ca76b730f26 (patch)
treec2ca96bd424c9d272e99b3cd909e2b654ef8014e
parentf94d7521936e66febee983ee7633aacaaf9d7390 (diff)
parent8dd87c465e6e22fe568fdd4a6b6d94cdbe0203a5 (diff)
Merge "Remove checkstyle errors from generated code"
-rw-r--r--.gitignore1
-rw-r--r--model/utilities/pom.xml5
-rw-r--r--model/utilities/src/main/antlr4/org/onap/policy/apex/model/utilities/typeutils/ParametrizedType.g434
3 files changed, 23 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore
index 3a9735328..8f3629739 100644
--- 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 90b9937d8..7247423d0 100644
--- 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 3a37d4043..384c37b0a 100644
--- 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]