You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2020/02/19 08:11:17 UTC
[groovy] branch master updated (5b4953f -> 02f8cd9)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 5b4953f GROOVY-9406: `VerifyError` when annotating with both @InheritConstructors and @NullCheck and calling the resulting c'tor
new 1ca6fe0 remove deprecated class
new 02f8cd9 rat exclusion for CI
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
gradle/quality.gradle | 1 +
.../groovy/transform/AbstractASTTransformUtil.java | 184 ---------------------
2 files changed, 1 insertion(+), 184 deletions(-)
delete mode 100644 src/main/java/org/codehaus/groovy/transform/AbstractASTTransformUtil.java
[groovy] 01/02: remove deprecated class
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 1ca6fe05027d30c1f7cbd1565f212e5c830037d2
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Feb 19 18:10:01 2020 +1000
remove deprecated class
---
.../groovy/transform/AbstractASTTransformUtil.java | 184 ---------------------
1 file changed, 184 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/transform/AbstractASTTransformUtil.java b/src/main/java/org/codehaus/groovy/transform/AbstractASTTransformUtil.java
deleted file mode 100644
index 35bf848..0000000
--- a/src/main/java/org/codehaus/groovy/transform/AbstractASTTransformUtil.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- */
-package org.codehaus.groovy.transform;
-
-import org.codehaus.groovy.ast.ClassNode;
-import org.codehaus.groovy.ast.FieldNode;
-import org.codehaus.groovy.ast.PropertyNode;
-import org.codehaus.groovy.ast.expr.BooleanExpression;
-import org.codehaus.groovy.ast.expr.Expression;
-import org.codehaus.groovy.ast.stmt.ExpressionStatement;
-import org.codehaus.groovy.ast.stmt.IfStatement;
-import org.codehaus.groovy.ast.stmt.Statement;
-import org.codehaus.groovy.ast.tools.GeneralUtils;
-import org.objectweb.asm.Opcodes;
-
-import java.util.List;
-
-/**
- * @deprecated use org.codehaus.groovy.ast.tools.GeneralUtils
- */
-@Deprecated
-public abstract class AbstractASTTransformUtil implements Opcodes {
- @Deprecated
- public static Statement assignStatement(Expression target, Expression value) {
- return GeneralUtils.assignS(target, value);
- }
-
- @Deprecated
- public static Statement createConstructorStatementDefault(FieldNode fNode) {
- return GeneralUtils.createConstructorStatementDefault(fNode);
- }
-
- @Deprecated
- public static ExpressionStatement declStatement(Expression result, Expression init) {
- return (ExpressionStatement) GeneralUtils.declS(result, init);
- }
-
- @Deprecated
- public static BooleanExpression differentExpr(Expression self, Expression other) {
- return GeneralUtils.notX(GeneralUtils.sameX(self, other));
- }
-
- @Deprecated
- public static BooleanExpression differentFieldExpr(FieldNode fNode, Expression other) {
- return GeneralUtils.notX(GeneralUtils.hasSameFieldX(fNode, other));
- }
-
- @Deprecated
- public static BooleanExpression differentPropertyExpr(PropertyNode pNode, Expression other) {
- return GeneralUtils.notX(GeneralUtils.hasSamePropertyX(pNode, other));
- }
-
- @Deprecated
- public static BooleanExpression equalsNullExpr(Expression argExpr) {
- return GeneralUtils.equalsNullX(argExpr);
- }
-
- @Deprecated
- public static Expression findArg(String argName) {
- return GeneralUtils.findArg(argName);
- }
-
- @Deprecated
- public static List<FieldNode> getInstanceNonPropertyFields(ClassNode cNode) {
- return GeneralUtils.getInstanceNonPropertyFields(cNode);
- }
-
- @Deprecated
- public static List<PropertyNode> getInstanceProperties(ClassNode cNode) {
- return GeneralUtils.getInstanceProperties(cNode);
- }
-
- @Deprecated
- public static List<FieldNode> getInstancePropertyFields(ClassNode cNode) {
- return GeneralUtils.getInstancePropertyFields(cNode);
- }
-
- @Deprecated
- public static List<FieldNode> getSuperNonPropertyFields(ClassNode cNode) {
- return GeneralUtils.getSuperNonPropertyFields(cNode);
- }
-
- @Deprecated
- public static List<FieldNode> getSuperPropertyFields(ClassNode cNode) {
- return GeneralUtils.getSuperPropertyFields(cNode);
- }
-
- @Deprecated
- public static boolean hasDeclaredMethod(ClassNode cNode, String name, int argsCount) {
- return GeneralUtils.hasDeclaredMethod(cNode, name, argsCount);
- }
-
- @Deprecated
- public static BooleanExpression identicalExpr(Expression self, Expression other) {
- return GeneralUtils.sameX(self, other);
- }
-
- @Deprecated
- public static BooleanExpression isInstanceOf(Expression objectExpression, ClassNode cNode) {
- return GeneralUtils.isInstanceOfX(objectExpression, cNode);
- }
-
- @Deprecated
- public static BooleanExpression isInstanceof(ClassNode cNode, Expression other) {
- return GeneralUtils.isInstanceOfX(other, cNode);
- }
-
- @Deprecated
- public static BooleanExpression isOneExpr(Expression expr) {
- return GeneralUtils.isOneX(expr);
- }
-
- @Deprecated
- public static boolean isOrImplements(ClassNode fieldType, ClassNode interfaceType) {
- return GeneralUtils.isOrImplements(fieldType, interfaceType);
- }
-
- @Deprecated
- public static BooleanExpression isTrueExpr(Expression argExpr) {
- return GeneralUtils.isTrueX(argExpr);
- }
-
- @Deprecated
- public static BooleanExpression isZeroExpr(Expression expr) {
- return GeneralUtils.isZeroX(expr);
- }
-
- @Deprecated
- public static BooleanExpression notNullExpr(Expression argExpr) {
- return GeneralUtils.notNullX(argExpr);
- }
-
- @Deprecated
- public static Statement returnFalseIfFieldNotEqual(FieldNode fNode, Expression other) {
- return GeneralUtils.ifS(GeneralUtils.notX(GeneralUtils.hasEqualFieldX(fNode, other)), GeneralUtils.returnS(GeneralUtils.constX(Boolean.FALSE)));
- }
-
- @Deprecated
- public static Statement returnFalseIfNotInstanceof(ClassNode cNode, Expression other) {
- return GeneralUtils.ifS(GeneralUtils.notX(GeneralUtils.isInstanceOfX(other, cNode)), GeneralUtils.returnS(GeneralUtils.constX(Boolean.FALSE)));
- }
-
- @Deprecated
- public static IfStatement returnFalseIfNull(Expression other) {
- return (IfStatement) GeneralUtils.ifS(GeneralUtils.equalsNullX(other), GeneralUtils.returnS(GeneralUtils.constX(Boolean.FALSE)));
- }
-
- @Deprecated
- public static Statement returnFalseIfPropertyNotEqual(PropertyNode pNode, Expression other) {
- return GeneralUtils.ifS(GeneralUtils.notX(GeneralUtils.hasEqualPropertyX(pNode, other)), GeneralUtils.returnS(GeneralUtils.constX(Boolean.FALSE)));
- }
-
- @Deprecated
- public static Statement returnFalseIfWrongType(ClassNode cNode, Expression other) {
- return GeneralUtils.ifS(GeneralUtils.notX(GeneralUtils.hasClassX(other, cNode)), GeneralUtils.returnS(GeneralUtils.constX(Boolean.FALSE)));
- }
-
- @Deprecated
- public static IfStatement returnTrueIfIdentical(Expression self, Expression other) {
- return (IfStatement) GeneralUtils.ifS(GeneralUtils.sameX(self, other), GeneralUtils.returnS(GeneralUtils.constX(Boolean.TRUE)));
- }
-
- @Deprecated
- public static Statement safeExpression(Expression fieldExpr, Expression expression) {
- return GeneralUtils.safeExpression(fieldExpr, expression);
- }
-
-}
[groovy] 02/02: rat exclusion for CI
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 02f8cd9d05eb3a79abdda67854ff4368b235e9f6
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Feb 19 18:11:02 2020 +1000
rat exclusion for CI
---
gradle/quality.gradle | 1 +
1 file changed, 1 insertion(+)
diff --git a/gradle/quality.gradle b/gradle/quality.gradle
index 8ee8491..f06da99 100644
--- a/gradle/quality.gradle
+++ b/gradle/quality.gradle
@@ -188,6 +188,7 @@ rat {
'src/test/org/codehaus/groovy/ast/LineColumnCheck.txt', // test file
'security/groovykeys', // excluded from src zip
'**/.gradle/**', '**/wrapper/**', 'gradlew*', // gradle wrapper files excluded from src zip
+ 'artifactory.properties', // potential file on CI server
'gradle.properties', // artifactory release plugin removes header when bumping version
'**/target/**', '**/build/**', 'licenses/**', 'notices/**',
'out/**', '*.ipr', '**/*.iml', '*.iws', '.idea/**', // Intellij files