Skip to content

Commit fe1a22a

Browse files
knutwannhedenknutwannheden
committed
Regenerate Java and Python code
1 parent a7fdfbd commit fe1a22a

File tree

13 files changed

+173
-31
lines changed

13 files changed

+173
-31
lines changed

‎rewrite-python-remote/src/main/java/org/openrewrite/python/remote/Python.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
/*
1718
* -------------------THIS FILE IS AUTO GENERATED--------------------------
1819
* Changes to this file may cause incorrect behavior and will be lost if
@@ -22,10 +23,14 @@
2223
package org.openrewrite.python.remote;
2324

2425
import com.fasterxml.jackson.core.type.TypeReference;
25-
import org.openrewrite.python.tree.Py;
26-
import org.openrewrite.remote.model.LstModel;
27-
import org.openrewrite.remote.model.LstProperty;
28-
import org.openrewrite.remote.model.LstType;
26+
import org.jspecify.annotations.Nullable;
27+
import org.openrewrite.*;
28+
import org.openrewrite.remote.model.*;
29+
import org.openrewrite.tree.*;
30+
import org.openrewrite.java.tree.*;
31+
import org.openrewrite.python.tree.*;
32+
33+
import java.util.List;
2934

3035
public class Python implements LstModel {
3136

‎rewrite-python-remote/src/main/java/org/openrewrite/python/remote/PythonReceiver.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
/*
1718
* -------------------THIS FILE IS AUTO GENERATED--------------------------
1819
* Changes to this file may cause incorrect behavior and will be lost if
@@ -1156,6 +1157,15 @@ public J.Unknown.Source visitUnknownSource(J.Unknown.Source source, ReceiverCont
11561157
return source;
11571158
}
11581159

1160+
@Override
1161+
public J.Erroneous visitErroneous(J.Erroneous erroneous, ReceiverContext ctx) {
1162+
erroneous = erroneous.withId(ctx.receiveNonNullValue(erroneous.getId(), UUID.class));
1163+
erroneous = erroneous.withPrefix(ctx.receiveNonNullNode(erroneous.getPrefix(), PythonReceiver::receiveSpace));
1164+
erroneous = erroneous.withMarkers(ctx.receiveNonNullNode(erroneous.getMarkers(), ctx::receiveMarkers));
1165+
erroneous = erroneous.withText(ctx.receiveNonNullValue(erroneous.getText(), String.class));
1166+
return erroneous;
1167+
}
1168+
11591169
}
11601170

11611171
private static class Factory implements ReceiverFactory {
@@ -1267,6 +1277,7 @@ protected Function<ReceiverContext, Object> computeValue(Class type) {
12671277
if (type == J.Yield.class) return Factory::createJYield;
12681278
if (type == J.Unknown.class) return Factory::createJUnknown;
12691279
if (type == J.Unknown.Source.class) return Factory::createJUnknownSource;
1280+
if (type == J.Erroneous.class) return Factory::createJErroneous;
12701281
throw new IllegalArgumentException("Unknown type: " + type);
12711282
}
12721283
};
@@ -2390,6 +2401,15 @@ private static J.Unknown.Source createJUnknownSource(ReceiverContext ctx) {
23902401
);
23912402
}
23922403

2404+
private static J.Erroneous createJErroneous(ReceiverContext ctx) {
2405+
return new J.Erroneous(
2406+
ctx.receiveNonNullValue(null, UUID.class),
2407+
ctx.receiveNonNullNode(null, PythonReceiver::receiveSpace),
2408+
ctx.receiveNonNullNode(null, ctx::receiveMarkers),
2409+
ctx.receiveNonNullValue(null, String.class)
2410+
);
2411+
}
2412+
23932413
}
23942414

23952415
private static J.ClassDeclaration.Kind receiveClassDeclarationKind(J.ClassDeclaration.@Nullable Kind kind, @Nullable Class<?> type, ReceiverContext ctx) {

‎rewrite-python-remote/src/main/java/org/openrewrite/python/remote/PythonSender.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
/*
1718
* -------------------THIS FILE IS AUTO GENERATED--------------------------
1819
* Changes to this file may cause incorrect behavior and will be lost if
@@ -1167,6 +1168,15 @@ public J.Unknown.Source visitUnknownSource(J.Unknown.Source source, SenderContex
11671168
return source;
11681169
}
11691170

1171+
@Override
1172+
public J.Erroneous visitErroneous(J.Erroneous erroneous, SenderContext ctx) {
1173+
ctx.sendValue(erroneous, J.Erroneous::getId);
1174+
ctx.sendNode(erroneous, J.Erroneous::getPrefix, PythonSender::sendSpace);
1175+
ctx.sendNode(erroneous, J.Erroneous::getMarkers, ctx::sendMarkers);
1176+
ctx.sendValue(erroneous, J.Erroneous::getText);
1177+
return erroneous;
1178+
}
1179+
11701180
}
11711181

11721182
private static <T extends J> void sendContainer(JContainer<T> container, SenderContext ctx) {

‎rewrite-python-remote/src/main/java/org/openrewrite/python/remote/PythonValidator.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
/*
1718
* -------------------THIS FILE IS AUTO GENERATED--------------------------
1819
* Changes to this file may cause incorrect behavior and will be lost if
@@ -751,4 +752,9 @@ public J.Unknown.Source visitUnknownSource(J.Unknown.Source source, P p) {
751752
return source;
752753
}
753754

755+
@Override
756+
public J.Erroneous visitErroneous(J.Erroneous erroneous, P p) {
757+
return erroneous;
758+
}
759+
754760
}

‎rewrite/rewrite/java/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
'Empty',
4949
'EnumValue',
5050
'EnumValueSet',
51+
'Erroneous',
5152
'FieldAccess',
5253
'ForEachLoop',
5354
'ForLoop',

‎rewrite/rewrite/java/remote/receiver.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -644,6 +644,13 @@ def visit_unknown_source(self, source: Unknown.Source, ctx: ReceiverContext) ->
644644
source = source.with_text(ctx.receive_value(source.text, str))
645645
return source
646646

647+
def visit_erroneous(self, erroneous: Erroneous, ctx: ReceiverContext) -> J:
648+
erroneous = erroneous.with_id(ctx.receive_value(erroneous.id, UUID))
649+
erroneous = erroneous.with_prefix(ctx.receive_node(erroneous.prefix, JavaReceiver.receive_space))
650+
erroneous = erroneous.with_markers(ctx.receive_node(erroneous.markers, ctx.receive_markers))
651+
erroneous = erroneous.with_text(ctx.receive_value(erroneous.text, str))
652+
return erroneous
653+
647654
# noinspection PyTypeChecker
648655
class Factory(ReceiverFactory):
649656
def create(self, type: str, ctx: ReceiverContext) -> Tree:
@@ -1329,6 +1336,14 @@ def create(self, type: str, ctx: ReceiverContext) -> Tree:
13291336
ctx.receive_value(None, str)
13301337
)
13311338

1339+
if type in ["rewrite.java.tree.Erroneous", "org.openrewrite.java.tree.J$Erroneous"]:
1340+
return Erroneous(
1341+
ctx.receive_value(None, UUID),
1342+
ctx.receive_node(None, JavaReceiver.receive_space),
1343+
ctx.receive_node(None, ctx.receive_markers),
1344+
ctx.receive_value(None, str)
1345+
)
1346+
13321347
raise NotImplementedError("No factory method for type: " + type)
13331348

13341349
@classmethod

‎rewrite/rewrite/java/remote/sender.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,13 @@ def visit_unknown_source(self, source: Unknown.Source, ctx: SenderContext) -> J:
642642
ctx.send_value(source, attrgetter('_text'))
643643
return source
644644

645+
def visit_erroneous(self, erroneous: Erroneous, ctx: SenderContext) -> J:
646+
ctx.send_value(erroneous, attrgetter('_id'))
647+
ctx.send_node(erroneous, attrgetter('_prefix'), JavaSender.send_space)
648+
ctx.send_node(erroneous, attrgetter('_markers'), ctx.send_markers)
649+
ctx.send_value(erroneous, attrgetter('_text'))
650+
return erroneous
651+
645652
@classmethod
646653
def send_container(cls, container: JContainer[T], ctx: SenderContext):
647654
extensions.send_container(container, ctx)

‎rewrite/rewrite/java/support_types.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -131,21 +131,21 @@ def format_first_prefix(cls, trees: List[J2], prefix: Space) -> List[J2]:
131131
SINGLE_SPACE: ClassVar[Space]
132132

133133
class Location(Enum):
134-
ANY = auto()
135134
ANNOTATED_TYPE_PREFIX = auto()
135+
ANNOTATIONS = auto()
136136
ANNOTATION_ARGUMENTS = auto()
137137
ANNOTATION_ARGUMENT_SUFFIX = auto()
138-
ANNOTATIONS = auto()
139138
ANNOTATION_PREFIX = auto()
139+
ANY = auto()
140140
ARRAY_ACCESS_PREFIX = auto()
141141
ARRAY_INDEX_SUFFIX = auto()
142142
ARRAY_TYPE_PREFIX = auto()
143-
ASSERT_PREFIX = auto()
144143
ASSERT_DETAIL = auto()
145144
ASSERT_DETAIL_PREFIX = auto()
145+
ASSERT_PREFIX = auto()
146146
ASSIGNMENT = auto()
147-
ASSIGNMENT_OPERATION_PREFIX = auto()
148147
ASSIGNMENT_OPERATION_OPERATOR = auto()
148+
ASSIGNMENT_OPERATION_PREFIX = auto()
149149
ASSIGNMENT_PREFIX = auto()
150150
BINARY_OPERATOR = auto()
151151
BINARY_PREFIX = auto()
@@ -154,9 +154,9 @@ class Location(Enum):
154154
BLOCK_STATEMENT_SUFFIX = auto()
155155
BREAK_PREFIX = auto()
156156
CASE = auto()
157-
CASE_PREFIX = auto()
158157
CASE_BODY = auto()
159158
CASE_EXPRESSION = auto()
159+
CASE_PREFIX = auto()
160160
CASE_SUFFIX = auto()
161161
CATCH_ALTERNATIVE_SUFFIX = auto()
162162
CATCH_PREFIX = auto()
@@ -166,15 +166,16 @@ class Location(Enum):
166166
COMPILATION_UNIT_PREFIX = auto()
167167
CONTINUE_PREFIX = auto()
168168
CONTROL_PARENTHESES_PREFIX = auto()
169-
DIMENSION_PREFIX = auto()
170169
DIMENSION = auto()
170+
DIMENSION_PREFIX = auto()
171171
DIMENSION_SUFFIX = auto()
172172
DO_WHILE_PREFIX = auto()
173173
ELSE_PREFIX = auto()
174174
EMPTY_PREFIX = auto()
175175
ENUM_VALUE_PREFIX = auto()
176176
ENUM_VALUE_SET_PREFIX = auto()
177177
ENUM_VALUE_SUFFIX = auto()
178+
ERRONEOUS_PREFIX = auto()
178179
EXPRESSION_PREFIX = auto()
179180
EXTENDS = auto()
180181
FIELD_ACCESS_NAME = auto()
@@ -194,9 +195,8 @@ class Location(Enum):
194195
IF_PREFIX = auto()
195196
IF_THEN_SUFFIX = auto()
196197
IMPLEMENTS = auto()
197-
IMPORT_ALIAS_PREFIX = auto()
198-
PERMITS = auto()
199198
IMPLEMENTS_SUFFIX = auto()
199+
IMPORT_ALIAS_PREFIX = auto()
200200
IMPORT_PREFIX = auto()
201201
IMPORT_SUFFIX = auto()
202202
INSTANCEOF_PREFIX = auto()
@@ -213,9 +213,9 @@ class Location(Enum):
213213
MEMBER_REFERENCE_CONTAINING = auto()
214214
MEMBER_REFERENCE_NAME = auto()
215215
MEMBER_REFERENCE_PREFIX = auto()
216+
METHOD_DECLARATION_DEFAULT_VALUE = auto()
216217
METHOD_DECLARATION_PARAMETERS = auto()
217218
METHOD_DECLARATION_PARAMETER_SUFFIX = auto()
218-
METHOD_DECLARATION_DEFAULT_VALUE = auto()
219219
METHOD_DECLARATION_PREFIX = auto()
220220
METHOD_INVOCATION_ARGUMENTS = auto()
221221
METHOD_INVOCATION_ARGUMENT_SUFFIX = auto()
@@ -240,6 +240,7 @@ class Location(Enum):
240240
PARAMETERIZED_TYPE_PREFIX = auto()
241241
PARENTHESES_PREFIX = auto()
242242
PARENTHESES_SUFFIX = auto()
243+
PERMITS = auto()
243244
PERMITS_SUFFIX = auto()
244245
PRIMITIVE_PREFIX = auto()
245246
RECORD_STATE_VECTOR = auto()
@@ -248,8 +249,8 @@ class Location(Enum):
248249
STATEMENT_PREFIX = auto()
249250
STATIC_IMPORT = auto()
250251
STATIC_INIT_SUFFIX = auto()
251-
SWITCH_PREFIX = auto()
252252
SWITCH_EXPRESSION_PREFIX = auto()
253+
SWITCH_PREFIX = auto()
253254
SYNCHRONIZED_PREFIX = auto()
254255
TERNARY_FALSE = auto()
255256
TERNARY_PREFIX = auto()

‎rewrite/rewrite/java/tree.py

Lines changed: 52 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ def with_statements(self, statements: List[Statement]) -> Case:
832832

833833
@property
834834
def body(self) -> Optional[J]:
835-
return self._body.element
835+
return self._body.element if self._body else None
836836

837837
def with_body(self, body: Optional[J]) -> Case:
838838
return self.padding.with_body(JRightPadded.with_element(self._body, body))
@@ -969,7 +969,7 @@ def with_primary_constructor(self, primary_constructor: Optional[List[Statement]
969969

970970
@property
971971
def extends(self) -> Optional[TypeTree]:
972-
return self._extends.element
972+
return self._extends.element if self._extends else None
973973

974974
def with_extends(self, extends: Optional[TypeTree]) -> ClassDeclaration:
975975
return self.padding.with_extends(JLeftPadded.with_element(self._extends, extends))
@@ -1213,7 +1213,7 @@ def with_checksum(self, checksum: Optional[Checksum]) -> CompilationUnit:
12131213

12141214
@property
12151215
def package_declaration(self) -> Optional[Package]:
1216-
return self._package_declaration.element
1216+
return self._package_declaration.element if self._package_declaration else None
12171217

12181218
def with_package_declaration(self, package_declaration: Optional[Package]) -> CompilationUnit:
12191219
return self.padding.with_package_declaration(JRightPadded.with_element(self._package_declaration, package_declaration))
@@ -2340,7 +2340,7 @@ def with_qualid(self, qualid: FieldAccess) -> Import:
23402340

23412341
@property
23422342
def alias(self) -> Optional[Identifier]:
2343-
return self._alias.element
2343+
return self._alias.element if self._alias else None
23442344

23452345
def with_alias(self, alias: Optional[Identifier]) -> Import:
23462346
return self.padding.with_alias(JLeftPadded.with_element(self._alias, alias))
@@ -3081,7 +3081,7 @@ def with_body(self, body: Optional[Block]) -> MethodDeclaration:
30813081

30823082
@property
30833083
def default_value(self) -> Optional[Expression]:
3084-
return self._default_value.element
3084+
return self._default_value.element if self._default_value else None
30853085

30863086
def with_default_value(self, default_value: Optional[Expression]) -> MethodDeclaration:
30873087
return self.padding.with_default_value(JLeftPadded.with_element(self._default_value, default_value))
@@ -3262,7 +3262,7 @@ def with_markers(self, markers: Markers) -> MethodInvocation:
32623262

32633263
@property
32643264
def select(self) -> Optional[Expression]:
3265-
return self._select.element
3265+
return self._select.element if self._select else None
32663266

32673267
def with_select(self, select: Optional[Expression]) -> MethodInvocation:
32683268
return self.padding.with_select(JRightPadded.with_element(self._select, select))
@@ -3695,7 +3695,7 @@ def with_markers(self, markers: Markers) -> NewClass:
36953695

36963696
@property
36973697
def enclosing(self) -> Optional[Expression]:
3698-
return self._enclosing.element
3698+
return self._enclosing.element if self._enclosing else None
36993699

37003700
def with_enclosing(self, enclosing: Optional[Expression]) -> NewClass:
37013701
return self.padding.with_enclosing(JRightPadded.with_element(self._enclosing, enclosing))
@@ -4575,7 +4575,7 @@ def with_catches(self, catches: List[Catch]) -> Try:
45754575

45764576
@property
45774577
def finally_(self) -> Optional[Block]:
4578-
return self._finally.element
4578+
return self._finally.element if self._finally else None
45794579

45804580
def with_finally(self, finally_: Optional[Block]) -> Try:
45814581
return self.padding.with_finally(JLeftPadded.with_element(self._finally, finally_))
@@ -5177,7 +5177,7 @@ def with_dimensions_after_name(self, dimensions_after_name: List[JLeftPadded[Spa
51775177

51785178
@property
51795179
def initializer(self) -> Optional[Expression]:
5180-
return self._initializer.element
5180+
return self._initializer.element if self._initializer else None
51815181

51825182
def with_initializer(self, initializer: Optional[Expression]) -> VariableDeclarations.NamedVariable:
51835183
return self.padding.with_initializer(JLeftPadded.with_element(self._initializer, initializer))
@@ -5363,7 +5363,7 @@ def with_markers(self, markers: Markers) -> Wildcard:
53635363

53645364
@property
53655365
def bound(self) -> Optional[Bound]:
5366-
return self._bound.element
5366+
return self._bound.element if self._bound else None
53675367

53685368
def with_bound(self, bound: Optional[Bound]) -> Wildcard:
53695369
return self.padding.with_bound(JLeftPadded.with_element(self._bound, bound))
@@ -5545,3 +5545,45 @@ def accept_java(self, v: JavaVisitor[P], p: P) -> J:
55455545

55465546
def accept_java(self, v: JavaVisitor[P], p: P) -> J:
55475547
return v.visit_unknown(self, p)
5548+
5549+
# noinspection PyShadowingBuiltins,PyShadowingNames,DuplicatedCode
5550+
@dataclass(frozen=True, eq=False)
5551+
class Erroneous(Statement, Expression):
5552+
_id: UUID
5553+
5554+
@property
5555+
def id(self) -> UUID:
5556+
return self._id
5557+
5558+
def with_id(self, id: UUID) -> Erroneous:
5559+
return self if id is self._id else replace(self, _id=id)
5560+
5561+
_prefix: Space
5562+
5563+
@property
5564+
def prefix(self) -> Space:
5565+
return self._prefix
5566+
5567+
def with_prefix(self, prefix: Space) -> Erroneous:
5568+
return self if prefix is self._prefix else replace(self, _prefix=prefix)
5569+
5570+
_markers: Markers
5571+
5572+
@property
5573+
def markers(self) -> Markers:
5574+
return self._markers
5575+
5576+
def with_markers(self, markers: Markers) -> Erroneous:
5577+
return self if markers is self._markers else replace(self, _markers=markers)
5578+
5579+
_text: str
5580+
5581+
@property
5582+
def text(self) -> str:
5583+
return self._text
5584+
5585+
def with_text(self, text: str) -> Erroneous:
5586+
return self if text is self._text else replace(self, _text=text)
5587+
5588+
def accept_java(self, v: JavaVisitor[P], p: P) -> J:
5589+
return v.visit_erroneous(self, p)

0 commit comments

Comments
 (0)