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 2018/04/03 12:43:00 UTC
[1/3] groovy git commit: fix some serializable incompatible issues
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X 7d9b50441 -> 588495768
fix some serializable incompatible issues
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/e6e7f08b
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/e6e7f08b
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/e6e7f08b
Branch: refs/heads/GROOVY_2_6_X
Commit: e6e7f08b9f072935dd13d2ac945d389285e766f9
Parents: 7d9b504
Author: Paul King <pa...@asert.com.au>
Authored: Tue Apr 3 20:40:31 2018 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Tue Apr 3 22:42:46 2018 +1000
----------------------------------------------------------------------
gradle/pomconfigurer.gradle | 3 +++
src/main/groovy/groovy/lang/GroovyRuntimeException.java | 4 +---
src/main/groovy/groovy/lang/MissingMethodException.java | 2 +-
src/main/groovy/groovy/lang/MissingPropertyException.java | 5 +----
src/main/groovy/groovy/lang/Sequence.java | 4 ++--
src/main/groovy/groovy/lang/SpreadMap.java | 5 +----
src/main/groovy/groovy/util/NodeList.java | 5 +----
.../groovy-test/src/test/groovy/groovy/lang/SpreadMapTest.java | 2 --
8 files changed, 10 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/e6e7f08b/gradle/pomconfigurer.gradle
----------------------------------------------------------------------
diff --git a/gradle/pomconfigurer.gradle b/gradle/pomconfigurer.gradle
index d6ee1df..1ecaf40 100644
--- a/gradle/pomconfigurer.gradle
+++ b/gradle/pomconfigurer.gradle
@@ -556,6 +556,9 @@ project.ext.pomConfigureClosureWithoutTweaks = {
name 'Thibault Kruse'
}
contributor {
+ name 'Tim Tiemens'
+ }
+ contributor {
name 'Paolo Di Tommaso'
}
contributor {
http://git-wip-us.apache.org/repos/asf/groovy/blob/e6e7f08b/src/main/groovy/groovy/lang/GroovyRuntimeException.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/GroovyRuntimeException.java b/src/main/groovy/groovy/lang/GroovyRuntimeException.java
index 00f8f96..de489c3 100644
--- a/src/main/groovy/groovy/lang/GroovyRuntimeException.java
+++ b/src/main/groovy/groovy/lang/GroovyRuntimeException.java
@@ -23,12 +23,10 @@ import org.codehaus.groovy.ast.ModuleNode;
/**
* An exception thrown by the interpreter
- *
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
*/
public class GroovyRuntimeException extends RuntimeException {
- private static final long serialVersionUID = 3699943230572902549L;
+ private static final long serialVersionUID = -193137033604506378L;
private ModuleNode module;
private ASTNode node;
http://git-wip-us.apache.org/repos/asf/groovy/blob/e6e7f08b/src/main/groovy/groovy/lang/MissingMethodException.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/MissingMethodException.java b/src/main/groovy/groovy/lang/MissingMethodException.java
index b463c34..3dbaf86 100644
--- a/src/main/groovy/groovy/lang/MissingMethodException.java
+++ b/src/main/groovy/groovy/lang/MissingMethodException.java
@@ -30,7 +30,7 @@ import org.codehaus.groovy.runtime.MethodRankHelper;
public class MissingMethodException extends GroovyRuntimeException {
private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
- private static final long serialVersionUID = -2423785115382704124L;
+ private static final long serialVersionUID = -6676430495683939401L;
private final String method;
private final Class type;
private final boolean isStatic;
http://git-wip-us.apache.org/repos/asf/groovy/blob/e6e7f08b/src/main/groovy/groovy/lang/MissingPropertyException.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/MissingPropertyException.java b/src/main/groovy/groovy/lang/MissingPropertyException.java
index 552031a..273d963 100644
--- a/src/main/groovy/groovy/lang/MissingPropertyException.java
+++ b/src/main/groovy/groovy/lang/MissingPropertyException.java
@@ -20,19 +20,16 @@ package groovy.lang;
import org.codehaus.groovy.runtime.MethodRankHelper;
-
/**
* An exception occurred if a dynamic property dispatch fails with an unknown property.
*
* Note that the Missing*Exception classes were named for consistency and
* to avoid conflicts with JDK exceptions of the same name.
- *
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
*/
public class MissingPropertyException extends GroovyRuntimeException {
public static final Object MPE = new Object();
- private static final long serialVersionUID = -5493778577329511881L;
+ private static final long serialVersionUID = -1780027060966200019L;
private final String property;
private final Class type;
http://git-wip-us.apache.org/repos/asf/groovy/blob/e6e7f08b/src/main/groovy/groovy/lang/Sequence.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/Sequence.java b/src/main/groovy/groovy/lang/Sequence.java
index 1cc6079..54f27d4 100644
--- a/src/main/groovy/groovy/lang/Sequence.java
+++ b/src/main/groovy/groovy/lang/Sequence.java
@@ -31,8 +31,8 @@ import java.util.List;
*/
public class Sequence extends ArrayList implements GroovyObject {
- private static final long serialVersionUID = 7498505573299850715L;
- private transient groovy.lang.MetaClass metaClass = InvokerHelper.getMetaClass(getClass());
+ private static final long serialVersionUID = 5697409354934589471L;
+ private transient MetaClass metaClass = InvokerHelper.getMetaClass(getClass());
private final Class type;
private int hashCode;
http://git-wip-us.apache.org/repos/asf/groovy/blob/e6e7f08b/src/main/groovy/groovy/lang/SpreadMap.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/lang/SpreadMap.java b/src/main/groovy/groovy/lang/SpreadMap.java
index b9d742b..6b3d27b 100644
--- a/src/main/groovy/groovy/lang/SpreadMap.java
+++ b/src/main/groovy/groovy/lang/SpreadMap.java
@@ -27,12 +27,9 @@ import java.util.Map;
/**
* Helper to turn a list with an even number of elements into a Map.
- *
- * @author Pilho Kim
- * @author Tim Tiemens
*/
public class SpreadMap extends HashMap {
- private static final long serialVersionUID = 2870520857928038334L;
+ private static final long serialVersionUID = 3827653766235954251L;
private int hashCode;
public SpreadMap(Object[] values) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/e6e7f08b/src/main/groovy/groovy/util/NodeList.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/groovy/util/NodeList.java b/src/main/groovy/groovy/util/NodeList.java
index 2822d9d..8ce39f4 100644
--- a/src/main/groovy/groovy/util/NodeList.java
+++ b/src/main/groovy/groovy/util/NodeList.java
@@ -33,12 +33,9 @@ import java.util.List;
/**
* A List implementation which is returned by queries on a {@link Node}
* which provides some XPath like helper methods for GPath.
- *
- * @author <a href="mailto:james@coredevelopers.net">James Strachan</a>
- * @author Paul King
*/
public class NodeList extends ArrayList {
- private static final long serialVersionUID = 5454686773425258279L;
+ private static final long serialVersionUID = 8307095805417308716L;
static {
// wrap the standard MetaClass with the delegate
http://git-wip-us.apache.org/repos/asf/groovy/blob/e6e7f08b/subprojects/groovy-test/src/test/groovy/groovy/lang/SpreadMapTest.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-test/src/test/groovy/groovy/lang/SpreadMapTest.java b/subprojects/groovy-test/src/test/groovy/groovy/lang/SpreadMapTest.java
index cb88874..d7bfae7 100644
--- a/subprojects/groovy-test/src/test/groovy/groovy/lang/SpreadMapTest.java
+++ b/subprojects/groovy-test/src/test/groovy/groovy/lang/SpreadMapTest.java
@@ -24,8 +24,6 @@ import java.util.Map;
/**
* Tests the SpreadMap implementation.
- *
- * @author Tim Tiemens
*/
public class SpreadMapTest extends GroovyTestCase {
Map map;
[3/3] groovy git commit: fix serializable compatibility test
Posted by pa...@apache.org.
fix serializable compatibility test
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/58849576
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/58849576
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/58849576
Branch: refs/heads/GROOVY_2_6_X
Commit: 5884957687ba92025c216965a6dc93925f95ee91
Parents: a0b8b54
Author: Paul King <pa...@asert.com.au>
Authored: Tue Apr 3 22:11:49 2018 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Tue Apr 3 22:42:48 2018 +1000
----------------------------------------------------------------------
src/test/groovy/SerializableCompatibilityTest.groovy | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/58849576/src/test/groovy/SerializableCompatibilityTest.groovy
----------------------------------------------------------------------
diff --git a/src/test/groovy/SerializableCompatibilityTest.groovy b/src/test/groovy/SerializableCompatibilityTest.groovy
index c0704c1..4acbc44 100644
--- a/src/test/groovy/SerializableCompatibilityTest.groovy
+++ b/src/test/groovy/SerializableCompatibilityTest.groovy
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package groovy
import groovy.bugs.TestSupport
@@ -37,7 +36,7 @@ class SerializableCompatibilityTest extends TestSupport {
void testDeserialize() {
// generated by testSerialize
- def serializedObjectStr_2_4_X = 'rO0ABXNyACJncm9vdnkubGFuZy5Hcm9vdnlSdW50aW1lRXhjZXB0aW9uM1jWw9touJUCAAJMAAZtb2R1bGV0ACRMb3JnL2NvZGVoYXVzL2dyb292eS9hc3QvTW9kdWxlTm9kZTtMAARub2RldAAhTG9yZy9jb2RlaGF1cy9ncm9vdnkvYXN0L0FTVE5vZGU7eHIAGmphdmEubGFuZy5SdW50aW1lRXhjZXB0aW9unl8GRwo0g+UCAAB4cgATamF2YS5sYW5nLkV4Y2VwdGlvbtD9Hz4aOxzEAgAAeHIAE2phdmEubGFuZy5UaHJvd2FibGXVxjUnOXe4ywMABEwABWNhdXNldAAVTGphdmEvbGFuZy9UaHJvd2FibGU7TAANZGV0YWlsTWVzc2FnZXQAEkxqYXZhL2xhbmcvU3RyaW5nO1sACnN0YWNrVHJhY2V0AB5bTGphdmEvbGFuZy9TdGFja1RyYWNlRWxlbWVudDtMABRzdXBwcmVzc2VkRXhjZXB0aW9uc3QAEExqYXZhL3V0aWwvTGlzdDt4cHEAfgAKdAAEYm9vbXVyAB5bTGphdmEubGFuZy5TdGFja1RyYWNlRWxlbWVudDsCRio8PP0iOQIAAHhwAAAAHHNyABtqYXZhLmxhbmcuU3RhY2tUcmFjZUVsZW1lbnRhCcWaJjbdhQIABEkACmxpbmVOdW1iZXJMAA5kZWNsYXJpbmdDbGFzc3EAfgAHTAAIZmlsZU5hbWVxAH4AB0wACm1ldGhvZE5hbWVxAH4AB3hw/////nQAKXN1bi5yZWZsZWN0Lk5hdGl2ZUNvbnN0cnVjdG9yQWNjZXNzb3JJbXBsdAAiTmF0aXZlQ29uc3RydWN0b3JBY2Nlc3NvckltcGwuamF2YXQADG5ld0luc3RhbmNlMHNxAH4ADgAAAD5xAH4AEHEAfgARdAALbmV3SW5z
dGFuY2VzcQB+AA4AAAAtdAAtc3VuLnJlZmxlY3QuRGVsZWdhdGluZ0NvbnN0cnVjdG9yQWNjZXNzb3JJbXBsdAAmRGVsZWdhdGluZ0NvbnN0cnVjdG9yQWNjZXNzb3JJbXBsLmphdmFxAH4AFHNxAH4ADgAAAad0AB1qYXZhLmxhbmcucmVmbGVjdC5Db25zdHJ1Y3RvcnQAEENvbnN0cnVjdG9yLmphdmFxAH4AFHNxAH4ADgAAAFN0ADBvcmcuY29kZWhhdXMuZ3Jvb3Z5LnJlZmxlY3Rpb24uQ2FjaGVkQ29uc3RydWN0b3J0ABZDYWNoZWRDb25zdHJ1Y3Rvci5qYXZhdAAGaW52b2tlc3EAfgAOAAAAaXQAVG9yZy5jb2RlaGF1cy5ncm9vdnkucnVudGltZS5jYWxsc2l0ZS5Db25zdHJ1Y3RvclNpdGUkQ29uc3RydWN0b3JTaXRlTm9VbndyYXBOb0NvZXJjZXQAFENvbnN0cnVjdG9yU2l0ZS5qYXZhdAAPY2FsbENvbnN0cnVjdG9yc3EAfgAOAAAAO3QAMm9yZy5jb2RlaGF1cy5ncm9vdnkucnVudGltZS5jYWxsc2l0ZS5DYWxsU2l0ZUFycmF5dAASQ2FsbFNpdGVBcnJheS5qYXZhdAAWZGVmYXVsdENhbGxDb25zdHJ1Y3RvcnNxAH4ADgAAAO50ADVvcmcuY29kZWhhdXMuZ3Jvb3Z5LnJ1bnRpbWUuY2FsbHNpdGUuQWJzdHJhY3RDYWxsU2l0ZXQAFUFic3RyYWN0Q2FsbFNpdGUuamF2YXEAfgAic3EAfgAOAAAA+nEAfgAocQB+AClxAH4AInNxAH4ADgAAABh0AA1TZXJpYWxpemVUZXN0dAAUU2VyaWFsaXplVGVzdC5ncm9vdnl0AAR0ZXN0c3EAfgAO/////nQAJHN1bi5yZWZsZWN0Lk5hdGl2ZU1ldGhvZEFjY2Vzc29ySW1wbHQAHU5hd
Gl2ZU1ldGhvZEFjY2Vzc29ySW1wbC5qYXZhdAAHaW52b2tlMHNxAH4ADgAAAD5xAH4AMHEAfgAxcQB+AB5zcQB+AA4AAAArdAAoc3VuLnJlZmxlY3QuRGVsZWdhdGluZ01ldGhvZEFjY2Vzc29ySW1wbHQAIURlbGVnYXRpbmdNZXRob2RBY2Nlc3NvckltcGwuamF2YXEAfgAec3EAfgAOAAAB8nQAGGphdmEubGFuZy5yZWZsZWN0Lk1ldGhvZHQAC01ldGhvZC5qYXZhcQB+AB5zcQB+AA4AAACwdAAYanVuaXQuZnJhbWV3b3JrLlRlc3RDYXNldAANVGVzdENhc2UuamF2YXQAB3J1blRlc3RzcQB+AA4AAACNcQB+ADtxAH4APHQAB3J1bkJhcmVzcQB+AA4AAAB6dAAcanVuaXQuZnJhbWV3b3JrLlRlc3RSZXN1bHQkMXQAD1Rlc3RSZXN1bHQuamF2YXQAB3Byb3RlY3RzcQB+AA4AAACOdAAaanVuaXQuZnJhbWV3b3JrLlRlc3RSZXN1bHRxAH4AQnQADHJ1blByb3RlY3RlZHNxAH4ADgAAAH1xAH4ARXEAfgBCdAADcnVuc3EAfgAOAAAAgXEAfgA7cQB+ADxxAH4ASHNxAH4ADgAAAPx0ABlqdW5pdC5mcmFtZXdvcmsuVGVzdFN1aXRldAAOVGVzdFN1aXRlLmphdmFxAH4APXNxAH4ADgAAAPdxAH4AS3EAfgBMcQB+AEhzcQB+AA4AAABWdAAtb3JnLmp1bml0LmludGVybmFsLnJ1bm5lcnMuSlVuaXQzOENsYXNzUnVubmVydAAXSlVuaXQzOENsYXNzUnVubmVyLmphdmFxAH4ASHNxAH4ADgAAAIl0ABpvcmcuanVuaXQucnVubmVyLkpVbml0Q29yZXQADkpVbml0Q29yZS5qYXZhcQB+AEhzcQB+AA4AAABEdAAoY29tLmludGVsbGlqLmp1bm
l0NC5KVW5pdDRJZGVhVGVzdFJ1bm5lcnQAGUpVbml0NElkZWFUZXN0UnVubmVyLmphdmF0ABNzdGFydFJ1bm5lcldpdGhBcmdzc3EAfgAOAAAAL3QAN2NvbS5pbnRlbGxpai5ydC5leGVjdXRpb24uanVuaXQuSWRlYVRlc3RSdW5uZXIkUmVwZWF0ZXJ0ABNJZGVhVGVzdFJ1bm5lci5qYXZhcQB+AFdzcQB+AA4AAADydAAsY29tLmludGVsbGlqLnJ0LmV4ZWN1dGlvbi5qdW5pdC5KVW5pdFN0YXJ0ZXJ0ABFKVW5pdFN0YXJ0ZXIuamF2YXQAFnByZXBhcmVTdHJlYW1zQW5kU3RhcnRzcQB+AA4AAABGcQB+AFxxAH4AXXQABG1haW5zcgAmamF2YS51dGlsLkNvbGxlY3Rpb25zJFVubW9kaWZpYWJsZUxpc3T8DyUxteyOEAIAAUwABGxpc3RxAH4ACXhyACxqYXZhLnV0aWwuQ29sbGVjdGlvbnMkVW5tb2RpZmlhYmxlQ29sbGVjdGlvbhlCAIDLXvceAgABTAABY3QAFkxqYXZhL3V0aWwvQ29sbGVjdGlvbjt4cHNyABNqYXZhLnV0aWwuQXJyYXlMaXN0eIHSHZnHYZ0DAAFJAARzaXpleHAAAAAAdwQAAAAAeHEAfgBmeHBw'
+ def serializedObjectStr_2_4_X = 'rO0ABXNyACJncm9vdnkubGFuZy5Hcm9vdnlSdW50aW1lRXhjZXB0aW9u/VHW5CcH3PYCAAJMAAZtb2R1bGV0ACRMb3JnL2NvZGVoYXVzL2dyb292eS9hc3QvTW9kdWxlTm9kZTtMAARub2RldAAhTG9yZy9jb2RlaGF1cy9ncm9vdnkvYXN0L0FTVE5vZGU7eHIAGmphdmEubGFuZy5SdW50aW1lRXhjZXB0aW9unl8GRwo0g+UCAAB4cgATamF2YS5sYW5nLkV4Y2VwdGlvbtD9Hz4aOxzEAgAAeHIAE2phdmEubGFuZy5UaHJvd2FibGXVxjUnOXe4ywMABEwABWNhdXNldAAVTGphdmEvbGFuZy9UaHJvd2FibGU7TAANZGV0YWlsTWVzc2FnZXQAEkxqYXZhL2xhbmcvU3RyaW5nO1sACnN0YWNrVHJhY2V0AB5bTGphdmEvbGFuZy9TdGFja1RyYWNlRWxlbWVudDtMABRzdXBwcmVzc2VkRXhjZXB0aW9uc3QAEExqYXZhL3V0aWwvTGlzdDt4cHEAfgAKdAAEYm9vbXVyAB5bTGphdmEubGFuZy5TdGFja1RyYWNlRWxlbWVudDsCRio8PP0iOQIAAHhwAAAAIHNyABtqYXZhLmxhbmcuU3RhY2tUcmFjZUVsZW1lbnRhCcWaJjbdhQIABEkACmxpbmVOdW1iZXJMAA5kZWNsYXJpbmdDbGFzc3EAfgAHTAAIZmlsZU5hbWVxAH4AB0wACm1ldGhvZE5hbWVxAH4AB3hw/////nQAKXN1bi5yZWZsZWN0Lk5hdGl2ZUNvbnN0cnVjdG9yQWNjZXNzb3JJbXBsdAAiTmF0aXZlQ29uc3RydWN0b3JBY2Nlc3NvckltcGwuamF2YXQADG5ld0luc3RhbmNlMHNxAH4ADgAAAD5xAH4AEHEAfgARdAALbmV3SW5z
dGFuY2VzcQB+AA4AAAAtdAAtc3VuLnJlZmxlY3QuRGVsZWdhdGluZ0NvbnN0cnVjdG9yQWNjZXNzb3JJbXBsdAAmRGVsZWdhdGluZ0NvbnN0cnVjdG9yQWNjZXNzb3JJbXBsLmphdmFxAH4AFHNxAH4ADgAAAad0AB1qYXZhLmxhbmcucmVmbGVjdC5Db25zdHJ1Y3RvcnQAEENvbnN0cnVjdG9yLmphdmFxAH4AFHNxAH4ADgAAAFN0ADBvcmcuY29kZWhhdXMuZ3Jvb3Z5LnJlZmxlY3Rpb24uQ2FjaGVkQ29uc3RydWN0b3J0ABZDYWNoZWRDb25zdHJ1Y3Rvci5qYXZhdAAGaW52b2tlc3EAfgAOAAAAaXQAVG9yZy5jb2RlaGF1cy5ncm9vdnkucnVudGltZS5jYWxsc2l0ZS5Db25zdHJ1Y3RvclNpdGUkQ29uc3RydWN0b3JTaXRlTm9VbndyYXBOb0NvZXJjZXQAFENvbnN0cnVjdG9yU2l0ZS5qYXZhdAAPY2FsbENvbnN0cnVjdG9yc3EAfgAOAAAAO3QAMm9yZy5jb2RlaGF1cy5ncm9vdnkucnVudGltZS5jYWxsc2l0ZS5DYWxsU2l0ZUFycmF5dAASQ2FsbFNpdGVBcnJheS5qYXZhdAAWZGVmYXVsdENhbGxDb25zdHJ1Y3RvcnNxAH4ADgAAAO50ADVvcmcuY29kZWhhdXMuZ3Jvb3Z5LnJ1bnRpbWUuY2FsbHNpdGUuQWJzdHJhY3RDYWxsU2l0ZXQAFUFic3RyYWN0Q2FsbFNpdGUuamF2YXEAfgAic3EAfgAOAAAA+nEAfgAocQB+AClxAH4AInNxAH4ADgAAAAF0AA9Db25zb2xlU2NyaXB0MzVxAH4ALHQAA3J1bnNxAH4ADgAAAQd0ABdncm9vdnkubGFuZy5Hcm9vdnlTaGVsbHQAEEdyb292eVNoZWxsLmphdmF0AB9ydW5TY3JpcHRPck1ha
W5PclRlc3RPclJ1bm5hYmxlc3EAfgAOAAAB+3EAfgAvcQB+ADBxAH4ALXNxAH4ADgAAAeZxAH4AL3EAfgAwcQB+AC1zcQB+AA4AAACrcQB+AC9xAH4AMHEAfgAtc3EAfgAO/////3QAHWdyb292eS5sYW5nLkdyb292eVNoZWxsJHJ1biQwcHQABGNhbGxzcQB+AA4AAAAvcQB+ACRxAH4AJXQAC2RlZmF1bHRDYWxsc3EAfgAOAAAAdHEAfgAocQB+AClxAH4AN3NxAH4ADgAAAJBxAH4AKHEAfgApcQB+ADdzcQB+AA4AAAPndAAqZ3Jvb3Z5LnVpLkNvbnNvbGUkX3J1blNjcmlwdEltcGxfY2xvc3VyZTE2dAAOQ29uc29sZS5ncm9vdnl0AAZkb0NhbGxzcQB+AA7/////cQB+AD1xAH4APnEAfgA/c3EAfgAO/////nQAJHN1bi5yZWZsZWN0Lk5hdGl2ZU1ldGhvZEFjY2Vzc29ySW1wbHQAHU5hdGl2ZU1ldGhvZEFjY2Vzc29ySW1wbC5qYXZhdAAHaW52b2tlMHNxAH4ADgAAAD5xAH4AQnEAfgBDcQB+AB5zcQB+AA4AAAArdAAoc3VuLnJlZmxlY3QuRGVsZWdhdGluZ01ldGhvZEFjY2Vzc29ySW1wbHQAIURlbGVnYXRpbmdNZXRob2RBY2Nlc3NvckltcGwuamF2YXEAfgAec3EAfgAOAAAB8nQAGGphdmEubGFuZy5yZWZsZWN0Lk1ldGhvZHQAC01ldGhvZC5qYXZhcQB+AB5zcQB+AA4AAABidAArb3JnLmNvZGVoYXVzLmdyb292eS5yZWZsZWN0aW9uLkNhY2hlZE1ldGhvZHQAEUNhY2hlZE1ldGhvZC5qYXZhcQB+AB5zcQB+AA4AAAFFdAAWZ3Jvb3Z5LmxhbmcuTWV0YU1ldGhvZHQAD01ldGFNZXRob2QuamF2YXQADmRvTWV0aG9kSW52b2
tlc3EAfgAOAAABCHQANm9yZy5jb2RlaGF1cy5ncm9vdnkucnVudGltZS5tZXRhY2xhc3MuQ2xvc3VyZU1ldGFDbGFzc3QAFUNsb3N1cmVNZXRhQ2xhc3MuamF2YXQADGludm9rZU1ldGhvZHNxAH4ADgAABAp0ABlncm9vdnkubGFuZy5NZXRhQ2xhc3NJbXBsdAASTWV0YUNsYXNzSW1wbC5qYXZhcQB+AFZzcQB+AA4AAAGidAATZ3Jvb3Z5LmxhbmcuQ2xvc3VyZXQADENsb3N1cmUuamF2YXEAfgA3c3EAfgAOAAABnHEAfgBbcQB+AFxxAH4AN3NxAH4ADgAAAfNxAH4AW3EAfgBccQB+AC1zcQB+AA4AAALsdAAQamF2YS5sYW5nLlRocmVhZHQAC1RocmVhZC5qYXZhcQB+AC1zcgAmamF2YS51dGlsLkNvbGxlY3Rpb25zJFVubW9kaWZpYWJsZUxpc3T8DyUxteyOEAIAAUwABGxpc3RxAH4ACXhyACxqYXZhLnV0aWwuQ29sbGVjdGlvbnMkVW5tb2RpZmlhYmxlQ29sbGVjdGlvbhlCAIDLXvceAgABTAABY3QAFkxqYXZhL3V0aWwvQ29sbGVjdGlvbjt4cHNyABNqYXZhLnV0aWwuQXJyYXlMaXN0eIHSHZnHYZ0DAAFJAARzaXpleHAAAAAAdwQAAAAAeHEAfgBneHBw'
new ByteArrayInputStream(serializedObjectStr_2_4_X.decodeBase64()).withObjectInputStream {
def newObj = it.readObject()
assert newObj instanceof GroovyRuntimeException
@@ -45,4 +44,3 @@ class SerializableCompatibilityTest extends TestSupport {
}
}
}
-
[2/3] groovy git commit: fix some serializable incompatible issues
(some more)
Posted by pa...@apache.org.
fix some serializable incompatible issues (some more)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a0b8b54e
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a0b8b54e
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a0b8b54e
Branch: refs/heads/GROOVY_2_6_X
Commit: a0b8b54ec7e83e0cefa1d56797ef72741ae0ec89
Parents: e6e7f08
Author: Paul King <pa...@asert.com.au>
Authored: Tue Apr 3 22:05:24 2018 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Tue Apr 3 22:42:47 2018 +1000
----------------------------------------------------------------------
gradle/pomconfigurer.gradle | 3 +
.../org/codehaus/groovy/GroovyBugError.java | 55 +++++++------
.../groovy/antlr/ASTParserException.java | 3 +-
.../groovy/antlr/ASTRuntimeException.java | 4 +-
.../codehaus/groovy/antlr/GroovySourceAST.java | 5 +-
.../org/codehaus/groovy/antlr/LexerFrame.java | 2 +-
.../groovy/control/ConfigurationException.java | 85 +++++++-------------
.../codehaus/groovy/control/ErrorCollector.java | 9 +--
.../MultipleCompilationErrorsException.java | 4 +-
.../codehaus/groovy/runtime/GStringImpl.java | 2 +-
.../codehaus/groovy/runtime/WritableFile.java | 5 +-
.../codehaus/groovy/syntax/ReadException.java | 3 +-
.../codehaus/groovy/syntax/SyntaxException.java | 2 +-
13 files changed, 74 insertions(+), 108 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/a0b8b54e/gradle/pomconfigurer.gradle
----------------------------------------------------------------------
diff --git a/gradle/pomconfigurer.gradle b/gradle/pomconfigurer.gradle
index 1ecaf40..de35cdf 100644
--- a/gradle/pomconfigurer.gradle
+++ b/gradle/pomconfigurer.gradle
@@ -559,6 +559,9 @@ project.ext.pomConfigureClosureWithoutTweaks = {
name 'Tim Tiemens'
}
contributor {
+ name 'Mike Spille'
+ }
+ contributor {
name 'Paolo Di Tommaso'
}
contributor {
http://git-wip-us.apache.org/repos/asf/groovy/blob/a0b8b54e/src/main/java/org/codehaus/groovy/GroovyBugError.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/GroovyBugError.java b/src/main/java/org/codehaus/groovy/GroovyBugError.java
index 89d855d..d234bb5 100644
--- a/src/main/java/org/codehaus/groovy/GroovyBugError.java
+++ b/src/main/java/org/codehaus/groovy/GroovyBugError.java
@@ -19,15 +19,13 @@
package org.codehaus.groovy;
/**
- * This class represents an error that is thrown when a bug is
+ * This class represents an error that is thrown when a bug is
* recognized inside the runtime. Basically it is thrown when
* a constraint is not fulfilled that should be fulfilled.
- *
- * @author Jochen Theodorou
*/
public class GroovyBugError extends AssertionError {
- private static final long serialVersionUID = 7170193853899664927L;
+ private static final long serialVersionUID = -9165076784700059275L;
// message string
private String message;
// optional exception
@@ -35,74 +33,75 @@ public class GroovyBugError extends AssertionError {
/**
* constructs a bug error using the given text
+ *
* @param message the error message text
*/
- public GroovyBugError( String message ) {
+ public GroovyBugError(String message) {
this(message, null);
}
-
+
/**
* Constructs a bug error using the given exception
+ *
* @param exception cause of this error
*/
- public GroovyBugError( Exception exception ) {
+ public GroovyBugError(Exception exception) {
this(null, exception);
}
-
+
/**
* Constructs a bug error using the given exception and
- * a text with additional information about the cause
- * @param msg additional information about this error
+ * a text with additional information about the cause
+ *
+ * @param msg additional information about this error
* @param exception cause of this error
*/
- public GroovyBugError( String msg, Exception exception ) {
+ public GroovyBugError(String msg, Exception exception) {
this.exception = exception;
this.message = msg;
}
/**
- * Returns a String representation of this class by calling <code>getMessage()</code>.
+ * Returns a String representation of this class by calling <code>getMessage()</code>.
+ *
* @see #getMessage()
*/
public String toString() {
return getMessage();
}
-
+
/**
- * Returns the detail message string of this error. The message
+ * Returns the detail message string of this error. The message
* will consist of the bug text prefixed by "BUG! " if there this
* instance was created using a message. If this error was
- * constructed without using a bug text the message of the cause
+ * constructed without using a bug text the message of the cause
* is used prefixed by "BUG! UNCAUGHT EXCEPTION: "
- *
+ *
* @return the detail message string of this error.
*/
public String getMessage() {
- if( message != null )
- {
- return "BUG! "+message;
- }
- else
- {
+ if (message != null) {
+ return "BUG! " + message;
+ } else {
return "BUG! UNCAUGHT EXCEPTION: " + exception.getMessage();
}
}
-
+
public Throwable getCause() {
return this.exception;
- }
-
+ }
+
/**
* Returns the bug text to describe this error
*/
- public String getBugText(){
- if( message != null ){
+ public String getBugText() {
+ if (message != null) {
return message;
} else {
return exception.getMessage();
}
}
-
+
/**
* Sets the bug text to describe this error
*/
http://git-wip-us.apache.org/repos/asf/groovy/blob/a0b8b54e/src/main/java/org/codehaus/groovy/antlr/ASTParserException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/antlr/ASTParserException.java b/src/main/java/org/codehaus/groovy/antlr/ASTParserException.java
index 372b04d..a74ed93 100644
--- a/src/main/java/org/codehaus/groovy/antlr/ASTParserException.java
+++ b/src/main/java/org/codehaus/groovy/antlr/ASTParserException.java
@@ -23,10 +23,9 @@ import org.codehaus.groovy.syntax.ParserException;
/**
* Thrown when trying to parse the AST
- *
*/
public class ASTParserException extends ParserException {
- private static final long serialVersionUID = 2537232761345194260L;
+ private static final long serialVersionUID = 7307319325760515017L;
private final AST ast;
public ASTParserException(ASTRuntimeException e) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/a0b8b54e/src/main/java/org/codehaus/groovy/antlr/ASTRuntimeException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/antlr/ASTRuntimeException.java b/src/main/java/org/codehaus/groovy/antlr/ASTRuntimeException.java
index 032c24d..11f082b 100644
--- a/src/main/java/org/codehaus/groovy/antlr/ASTRuntimeException.java
+++ b/src/main/java/org/codehaus/groovy/antlr/ASTRuntimeException.java
@@ -21,10 +21,10 @@ package org.codehaus.groovy.antlr;
import antlr.collections.AST;
/**
- * @author <a href="mailto:jstrachan@protique.com">James Strachan</a>
+ * Used within the Groovy's AntlrParserPlugin
*/
public class ASTRuntimeException extends RuntimeException {
- private static final long serialVersionUID = 3980229202392379560L;
+ private static final long serialVersionUID = 238104771184624613L;
private final AST ast;
public ASTRuntimeException(AST ast, String message) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/a0b8b54e/src/main/java/org/codehaus/groovy/antlr/GroovySourceAST.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/antlr/GroovySourceAST.java b/src/main/java/org/codehaus/groovy/antlr/GroovySourceAST.java
index fc62836..80da241 100644
--- a/src/main/java/org/codehaus/groovy/antlr/GroovySourceAST.java
+++ b/src/main/java/org/codehaus/groovy/antlr/GroovySourceAST.java
@@ -28,12 +28,9 @@ import java.util.List;
/**
* We have an AST subclass so we can track source information.
* Very odd that ANTLR doesn't do this by default.
- *
- * @author Mike Spille
- * @author Jeremy Rayner <gr...@ross-rayner.com>
*/
public class GroovySourceAST extends CommonAST implements Comparable, SourceInfo {
- private static final long serialVersionUID = 2019901428136117486L;
+ private static final long serialVersionUID = 9116765466538981906L;
private int line;
private int col;
private int lineLast;
http://git-wip-us.apache.org/repos/asf/groovy/blob/a0b8b54e/src/main/java/org/codehaus/groovy/antlr/LexerFrame.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/antlr/LexerFrame.java b/src/main/java/org/codehaus/groovy/antlr/LexerFrame.java
index 94dd173..8bce286 100644
--- a/src/main/java/org/codehaus/groovy/antlr/LexerFrame.java
+++ b/src/main/java/org/codehaus/groovy/antlr/LexerFrame.java
@@ -47,7 +47,7 @@ import java.util.Hashtable;
* Swing application to graphically display the tokens produced by the lexer.
*/
public class LexerFrame extends JFrame implements ActionListener {
- private static final long serialVersionUID = 4753761422597441243L;
+ private static final long serialVersionUID = 2715693043143492893L;
private final JSplitPane jSplitPane1 = new JSplitPane();
private final JScrollPane jScrollPane1 = new JScrollPane();
private final JScrollPane jScrollPane2 = new JScrollPane();
http://git-wip-us.apache.org/repos/asf/groovy/blob/a0b8b54e/src/main/java/org/codehaus/groovy/control/ConfigurationException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/control/ConfigurationException.java b/src/main/java/org/codehaus/groovy/control/ConfigurationException.java
index 9e226ad..5778209 100644
--- a/src/main/java/org/codehaus/groovy/control/ConfigurationException.java
+++ b/src/main/java/org/codehaus/groovy/control/ConfigurationException.java
@@ -20,74 +20,47 @@ package org.codehaus.groovy.control;
import org.codehaus.groovy.GroovyExceptionInterface;
-
-
-
/**
- * Thrown when configuration data is invalid.
- *
- * @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
+ * Thrown when configuration data is invalid.
*/
-
-public class ConfigurationException extends RuntimeException implements GroovyExceptionInterface
-{
- private static final long serialVersionUID = -630757959041134069L;
-
- //---------------------------------------------------------------------------
- // CONSTRUCTION AND SUCH
+public class ConfigurationException extends RuntimeException implements GroovyExceptionInterface {
+ private static final long serialVersionUID = -3844401402301111613L;
protected Exception cause; // The phase in which the failures occurred
-
- /**
- * Initializes the exception from a cause exception.
- */
-
- public ConfigurationException( Exception cause )
- {
- super( cause.getMessage() );
+ /**
+ * Initializes the exception from a cause exception.
+ */
+ public ConfigurationException(Exception cause) {
+ super(cause.getMessage());
this.cause = cause;
}
-
-
- /**
- * Initializes the exception with just a message.
- */
-
- public ConfigurationException( String message )
- {
- super( message );
+
+ /**
+ * Initializes the exception with just a message.
+ */
+ public ConfigurationException(String message) {
+ super(message);
}
-
-
- /**
- * Returns the causing exception, if available.
- */
-
- public Throwable getCause()
- {
+ /**
+ * Returns the causing exception, if available.
+ */
+ public Throwable getCause() {
return cause;
}
-
-
- /**
- * Its always fatal.
- */
-
- public boolean isFatal()
- {
+
+ /**
+ * Its always fatal.
+ */
+ public boolean isFatal() {
return true;
}
-
-
-
- /**
- * Set fatal is just ignored.
- */
-
- public void setFatal( boolean fatal )
- {
+
+ /**
+ * Set fatal is just ignored.
+ */
+ public void setFatal(boolean fatal) {
}
-
+
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/a0b8b54e/src/main/java/org/codehaus/groovy/control/ErrorCollector.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/control/ErrorCollector.java b/src/main/java/org/codehaus/groovy/control/ErrorCollector.java
index d6c97a8..67de50a 100644
--- a/src/main/java/org/codehaus/groovy/control/ErrorCollector.java
+++ b/src/main/java/org/codehaus/groovy/control/ErrorCollector.java
@@ -27,6 +27,7 @@ import org.codehaus.groovy.syntax.CSTNode;
import org.codehaus.groovy.syntax.SyntaxException;
import java.io.PrintWriter;
+import java.io.Serializable;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -35,12 +36,10 @@ import java.util.List;
* A base class for collecting messages and errors during processing.
* Each CompilationUnit should have an ErrorCollector, and the SourceUnits
* should share their ErrorCollector with the CompilationUnit.
- *
- * @author <a href="mailto:cpoirier@dreaming.org">Chris Poirier</a>
- * @author <a href="mailto:blackdrag@gmx.org">Jochen Theodorou</a>
*/
-public class ErrorCollector {
-
+public class ErrorCollector implements Serializable {
+
+ private static final long serialVersionUID = 2844774170905056755L;
/**
* WarningMessages collected during processing
*/
http://git-wip-us.apache.org/repos/asf/groovy/blob/a0b8b54e/src/main/java/org/codehaus/groovy/control/MultipleCompilationErrorsException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/control/MultipleCompilationErrorsException.java b/src/main/java/org/codehaus/groovy/control/MultipleCompilationErrorsException.java
index 5e0a6e7..8d7d14c 100644
--- a/src/main/java/org/codehaus/groovy/control/MultipleCompilationErrorsException.java
+++ b/src/main/java/org/codehaus/groovy/control/MultipleCompilationErrorsException.java
@@ -24,12 +24,12 @@ import java.io.PrintWriter;
import java.io.Writer;
/**
- * @author Jochen Theodorou
+ * Represents multiple other exceptions
*/
public class MultipleCompilationErrorsException extends
CompilationFailedException {
- private static final long serialVersionUID = 2948487149304811836L;
+ private static final long serialVersionUID = 8583586586290252555L;
protected ErrorCollector collector;
public MultipleCompilationErrorsException(ErrorCollector ec) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/a0b8b54e/src/main/java/org/codehaus/groovy/runtime/GStringImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/runtime/GStringImpl.java b/src/main/java/org/codehaus/groovy/runtime/GStringImpl.java
index f886ccd..7e5beec 100644
--- a/src/main/java/org/codehaus/groovy/runtime/GStringImpl.java
+++ b/src/main/java/org/codehaus/groovy/runtime/GStringImpl.java
@@ -29,7 +29,7 @@ import groovy.lang.GString;
* @see groovy.lang.GString
*/
public class GStringImpl extends GString {
- private static final long serialVersionUID = -6400178815578597715L;
+ private static final long serialVersionUID = 3581289038662723858L;
private String[] strings;
/**
http://git-wip-us.apache.org/repos/asf/groovy/blob/a0b8b54e/src/main/java/org/codehaus/groovy/runtime/WritableFile.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/runtime/WritableFile.java b/src/main/java/org/codehaus/groovy/runtime/WritableFile.java
index 21a9e40..b4aef73 100644
--- a/src/main/java/org/codehaus/groovy/runtime/WritableFile.java
+++ b/src/main/java/org/codehaus/groovy/runtime/WritableFile.java
@@ -27,12 +27,9 @@ import java.io.Writer;
/**
* A Writable File.
- *
- * @author John Wilson
- *
*/
public class WritableFile extends File implements Writable {
- private static final long serialVersionUID = 1661640530283827325L;
+ private static final long serialVersionUID = 4157767752861425917L;
private final String encoding;
public WritableFile(final File delegate) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/a0b8b54e/src/main/java/org/codehaus/groovy/syntax/ReadException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/syntax/ReadException.java b/src/main/java/org/codehaus/groovy/syntax/ReadException.java
index af70dd0..930b767 100644
--- a/src/main/java/org/codehaus/groovy/syntax/ReadException.java
+++ b/src/main/java/org/codehaus/groovy/syntax/ReadException.java
@@ -25,9 +25,8 @@ import java.io.IOException;
/**
* Encapsulates non-specific i/o exceptions.
*/
-
public class ReadException extends GroovyException {
- private static final long serialVersionUID = -6171846198126205359L;
+ private static final long serialVersionUID = 848585058428047961L;
private final IOException cause;
public ReadException(IOException cause) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/a0b8b54e/src/main/java/org/codehaus/groovy/syntax/SyntaxException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/syntax/SyntaxException.java b/src/main/java/org/codehaus/groovy/syntax/SyntaxException.java
index 53bb453..660c87f 100644
--- a/src/main/java/org/codehaus/groovy/syntax/SyntaxException.java
+++ b/src/main/java/org/codehaus/groovy/syntax/SyntaxException.java
@@ -26,7 +26,7 @@ import org.codehaus.groovy.ast.ASTNode;
*/
public class SyntaxException extends GroovyException {
- private static final long serialVersionUID = 5547021570604495375L;
+ private static final long serialVersionUID = 7447641806794047013L;
/** Line upon which the error occurred. */
private final int startLine;
private final int endLine;