summaryrefslogtreecommitdiff
path: root/dev-java/univocity-parsers/files/univocity-parsers-2.9.1-explicitly-import-Record.patch
blob: ca18412aeac4671660e2e2591507518868879898 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
From 6dffca791430639ca06dc6f2d9c309e085d8ba32 Mon Sep 17 00:00:00 2001
From: Yuan Liao <liaoyuan@gmail.com>
Date: Mon, 4 Apr 2022 09:36:20 -0700
Subject: [PATCH] Fix "reference to Record is ambiguous" for JDK 16+

Since Java 16, a new java.lang.Record class has been added to the Java
SE API.  Classes under the java.lang package, including this Record
class, are automatically imported in any Java source file.  Because this
project also has a com.univocity.parsers.common.record.Record interface,
when it is being compiled on JDK 16 and above, there would be an
ambiguity as to which class/interface to use for the 'Record' type:

src/main/java/com/univocity/parsers/common/Context.java:136: error: reference to Record is ambiguous
        Record toRecord(String[] row);
        ^
  both interface com.univocity.parsers.common.record.Record in com.univocity.parsers.common.record and class java.lang.Record in java.lang match

The resolution to this issue is simply to import the Record interface
under this project explicitly in every source file using it.

Bug: https://github.com/Leo3418/junit-5-ebuild-repo/issues/4
Reported-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
---
 src/main/java/com/univocity/parsers/common/AbstractParser.java   | 1 +
 src/main/java/com/univocity/parsers/common/AbstractWriter.java   | 1 +
 src/main/java/com/univocity/parsers/common/Context.java          | 1 +
 src/main/java/com/univocity/parsers/common/ContextWrapper.java   | 1 +
 src/main/java/com/univocity/parsers/common/DefaultContext.java   | 1 +
 .../java/com/univocity/parsers/common/NoopParsingContext.java    | 1 +
 .../java/com/univocity/parsers/common/ParsingContextWrapper.java | 1 +
 .../com/univocity/parsers/common/iterators/RecordIterator.java   | 1 +
 src/main/java/com/univocity/parsers/fixed/FixedWidthParser.java  | 1 +
 src/main/java/com/univocity/parsers/fixed/Lookup.java            | 1 +
 10 files changed, 10 insertions(+)

diff --git a/src/main/java/com/univocity/parsers/common/AbstractParser.java b/src/main/java/com/univocity/parsers/common/AbstractParser.java
index 42191ad..6dd4dac 100644
--- a/src/main/java/com/univocity/parsers/common/AbstractParser.java
+++ b/src/main/java/com/univocity/parsers/common/AbstractParser.java
@@ -20,6 +20,7 @@ import com.univocity.parsers.common.input.*;
 import com.univocity.parsers.common.iterators.*;
 import com.univocity.parsers.common.processor.*;
 import com.univocity.parsers.common.processor.core.*;
+import com.univocity.parsers.common.record.Record;
 import com.univocity.parsers.common.record.*;
 
 import java.io.*;
diff --git a/src/main/java/com/univocity/parsers/common/AbstractWriter.java b/src/main/java/com/univocity/parsers/common/AbstractWriter.java
index 6a19562..d7a5207 100644
--- a/src/main/java/com/univocity/parsers/common/AbstractWriter.java
+++ b/src/main/java/com/univocity/parsers/common/AbstractWriter.java
@@ -18,6 +18,7 @@ package com.univocity.parsers.common;
 import com.univocity.parsers.common.fields.*;
 import com.univocity.parsers.common.input.*;
 import com.univocity.parsers.common.processor.*;
+import com.univocity.parsers.common.record.Record;
 import com.univocity.parsers.common.record.*;
 import com.univocity.parsers.fixed.*;
 
diff --git a/src/main/java/com/univocity/parsers/common/Context.java b/src/main/java/com/univocity/parsers/common/Context.java
index d0adf5f..f3b28c9 100644
--- a/src/main/java/com/univocity/parsers/common/Context.java
+++ b/src/main/java/com/univocity/parsers/common/Context.java
@@ -15,6 +15,7 @@
  ******************************************************************************/
 package com.univocity.parsers.common;
 
+import com.univocity.parsers.common.record.Record;
 import com.univocity.parsers.common.record.*;
 
 /**
diff --git a/src/main/java/com/univocity/parsers/common/ContextWrapper.java b/src/main/java/com/univocity/parsers/common/ContextWrapper.java
index bee87e8..c338895 100644
--- a/src/main/java/com/univocity/parsers/common/ContextWrapper.java
+++ b/src/main/java/com/univocity/parsers/common/ContextWrapper.java
@@ -15,6 +15,7 @@
  ******************************************************************************/
 package com.univocity.parsers.common;
 
+import com.univocity.parsers.common.record.Record;
 import com.univocity.parsers.common.record.*;
 
 /**
diff --git a/src/main/java/com/univocity/parsers/common/DefaultContext.java b/src/main/java/com/univocity/parsers/common/DefaultContext.java
index 11ea961..7346e64 100644
--- a/src/main/java/com/univocity/parsers/common/DefaultContext.java
+++ b/src/main/java/com/univocity/parsers/common/DefaultContext.java
@@ -15,6 +15,7 @@
  */
 package com.univocity.parsers.common;
 
+import com.univocity.parsers.common.record.Record;
 import com.univocity.parsers.common.record.*;
 
 /**
diff --git a/src/main/java/com/univocity/parsers/common/NoopParsingContext.java b/src/main/java/com/univocity/parsers/common/NoopParsingContext.java
index fe1f07d..79d8787 100644
--- a/src/main/java/com/univocity/parsers/common/NoopParsingContext.java
+++ b/src/main/java/com/univocity/parsers/common/NoopParsingContext.java
@@ -15,6 +15,7 @@
  ******************************************************************************/
 package com.univocity.parsers.common;
 
+import com.univocity.parsers.common.record.Record;
 import com.univocity.parsers.common.record.*;
 
 import java.util.*;
diff --git a/src/main/java/com/univocity/parsers/common/ParsingContextWrapper.java b/src/main/java/com/univocity/parsers/common/ParsingContextWrapper.java
index 20a59d8..e8b4f9d 100644
--- a/src/main/java/com/univocity/parsers/common/ParsingContextWrapper.java
+++ b/src/main/java/com/univocity/parsers/common/ParsingContextWrapper.java
@@ -15,6 +15,7 @@
  */
 package com.univocity.parsers.common;
 
+import com.univocity.parsers.common.record.Record;
 import com.univocity.parsers.common.record.*;
 
 import java.util.*;
diff --git a/src/main/java/com/univocity/parsers/common/iterators/RecordIterator.java b/src/main/java/com/univocity/parsers/common/iterators/RecordIterator.java
index 01b22cb..1620205 100644
--- a/src/main/java/com/univocity/parsers/common/iterators/RecordIterator.java
+++ b/src/main/java/com/univocity/parsers/common/iterators/RecordIterator.java
@@ -16,6 +16,7 @@
 package com.univocity.parsers.common.iterators;
 
 import com.univocity.parsers.common.*;
+import com.univocity.parsers.common.record.Record;
 import com.univocity.parsers.common.record.*;
 
 import java.io.*;
diff --git a/src/main/java/com/univocity/parsers/fixed/FixedWidthParser.java b/src/main/java/com/univocity/parsers/fixed/FixedWidthParser.java
index b38bc99..25285eb 100644
--- a/src/main/java/com/univocity/parsers/fixed/FixedWidthParser.java
+++ b/src/main/java/com/univocity/parsers/fixed/FixedWidthParser.java
@@ -17,6 +17,7 @@ package com.univocity.parsers.fixed;
 
 import com.univocity.parsers.common.*;
 import com.univocity.parsers.common.input.*;
+import com.univocity.parsers.common.record.Record;
 import com.univocity.parsers.common.record.*;
 
 /**
diff --git a/src/main/java/com/univocity/parsers/fixed/Lookup.java b/src/main/java/com/univocity/parsers/fixed/Lookup.java
index 1aeff0d..bcf0f98 100644
--- a/src/main/java/com/univocity/parsers/fixed/Lookup.java
+++ b/src/main/java/com/univocity/parsers/fixed/Lookup.java
@@ -16,6 +16,7 @@
 package com.univocity.parsers.fixed;
 
 import com.univocity.parsers.common.*;
+import com.univocity.parsers.common.record.Record;
 import com.univocity.parsers.common.record.*;
 
 import java.util.*;
-- 
2.35.1