Skip to content

Commit 0e0c781

Browse files
beikovejannett
authored andcommitted
HHH-17404 Fix compile errors
1 parent ae52e3e commit 0e0c781

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JsonHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ public static <X> X deserializeArray(
456456
while(reader.hasNext()) {
457457
JsonDocumentItemType type = reader.next();
458458
switch ( type ) {
459-
case JsonDocumentItemType.ARRAY_END:
459+
case ARRAY_END:
460460
endArrayFound=true;
461461
break;
462462
case NULL_VALUE:

hibernate-core/src/main/java/org/hibernate/type/format/OsonDocumentReader.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,52 +50,52 @@ public JsonDocumentItemType next() {
5050
currentKeyName = null;
5151
currentValue = null;
5252
switch (evt) {
53-
case OracleJsonParser.Event.START_OBJECT:
53+
case START_OBJECT:
5454
return JsonDocumentItemType.OBJECT_START;
55-
case OracleJsonParser.Event.END_OBJECT:
55+
case END_OBJECT:
5656
return JsonDocumentItemType.OBJECT_END;
57-
case OracleJsonParser.Event.START_ARRAY:
57+
case START_ARRAY:
5858
return JsonDocumentItemType.ARRAY_START;
59-
case OracleJsonParser.Event.END_ARRAY:
59+
case END_ARRAY:
6060
return JsonDocumentItemType.ARRAY_END;
61-
case OracleJsonParser.Event.KEY_NAME:
61+
case KEY_NAME:
6262
currentKeyName = this.parser.getString();
6363
return JsonDocumentItemType.VALUE_KEY;
64-
case OracleJsonParser.Event.VALUE_TIMESTAMPTZ:
64+
case VALUE_TIMESTAMPTZ:
6565
currentValue = this.parser.getOffsetDateTime();
6666
return JsonDocumentItemType.VALUE;
67-
case OracleJsonParser.Event.VALUE_DATE:
68-
case OracleJsonParser.Event.VALUE_TIMESTAMP:
67+
case VALUE_DATE:
68+
case VALUE_TIMESTAMP:
6969
currentValue = this.parser.getLocalDateTime();
7070
return JsonDocumentItemType.VALUE;
71-
case OracleJsonParser.Event.VALUE_INTERVALDS:
71+
case VALUE_INTERVALDS:
7272
currentValue = this.parser.getDuration();
7373
return JsonDocumentItemType.VALUE;
74-
case OracleJsonParser.Event.VALUE_INTERVALYM:
74+
case VALUE_INTERVALYM:
7575
currentValue = this.parser.getPeriod();
7676
return JsonDocumentItemType.VALUE;
77-
case OracleJsonParser.Event.VALUE_STRING:
77+
case VALUE_STRING:
7878
currentValue = this.parser.getString();
7979
return JsonDocumentItemType.VALUE;
80-
case OracleJsonParser.Event.VALUE_TRUE:
80+
case VALUE_TRUE:
8181
currentValue = Boolean.TRUE;
8282
return JsonDocumentItemType.BOOLEAN_VALUE;
83-
case OracleJsonParser.Event.VALUE_FALSE:
83+
case VALUE_FALSE:
8484
currentValue = Boolean.FALSE;
8585
return JsonDocumentItemType.BOOLEAN_VALUE;
86-
case OracleJsonParser.Event.VALUE_NULL:
86+
case VALUE_NULL:
8787
currentValue = null;
8888
return JsonDocumentItemType.NULL_VALUE;
89-
case OracleJsonParser.Event.VALUE_DECIMAL:
89+
case VALUE_DECIMAL:
9090
currentValue = this.parser.getBigDecimal();
9191
return JsonDocumentItemType.VALUE;
92-
case OracleJsonParser.Event.VALUE_DOUBLE:
92+
case VALUE_DOUBLE:
9393
currentValue = this.parser.getDouble();
9494
return JsonDocumentItemType.VALUE;
95-
case OracleJsonParser.Event.VALUE_FLOAT:
95+
case VALUE_FLOAT:
9696
currentValue = this.parser.getFloat();
9797
return JsonDocumentItemType.VALUE;
98-
case OracleJsonParser.Event.VALUE_BINARY:
98+
case VALUE_BINARY:
9999
currentValue = this.parser.getBytes();
100100
return JsonDocumentItemType.VALUE;
101101
default :

hibernate-core/src/main/java/org/hibernate/type/format/StringJsonDocumentReader.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ private void moveStateMachine(StringJsonDocumentMarker marker) {
115115
break;
116116
case QUOTE:
117117
switch ( currentState ) {
118-
case JsonProcessingState.STARTING_ARRAY:
118+
case STARTING_ARRAY:
119119
this.processingStates.push( JsonProcessingState.ARRAY );
120120
break;
121-
case JsonProcessingState.STARTING_OBJECT:
121+
case STARTING_OBJECT:
122122
this.processingStates.push( JsonProcessingState.OBJECT );
123123
this.processingStates.push( JsonProcessingState.OBJECT_KEY_NAME );
124124
break;
@@ -175,18 +175,18 @@ public JsonDocumentItemType next() {
175175
// - if we just hit ':' that's a quoted value
176176
// - if we just hit ',' that's a quoted key
177177
switch ( this.processingStates.getCurrent() ) {
178-
case JsonProcessingState.STARTING_ARRAY:
178+
case STARTING_ARRAY:
179179
//this.processingStates.push( JsonProcessingState.ARRAY );
180180
return JsonDocumentItemType.VALUE;
181-
case JsonProcessingState.ARRAY:
181+
case ARRAY:
182182
return JsonDocumentItemType.VALUE;
183-
case JsonProcessingState.STARTING_OBJECT:
183+
case STARTING_OBJECT:
184184
//this.processingStates.push( JsonProcessingState.OBJECT );
185185
//this.processingStates.push( JsonProcessingState.OBJECT_KEY_NAME );
186186
return JsonDocumentItemType.VALUE_KEY;
187-
case JsonProcessingState.OBJECT: // we are processing object attribute value elements
187+
case OBJECT: // we are processing object attribute value elements
188188
return JsonDocumentItemType.VALUE;
189-
case JsonProcessingState.OBJECT_KEY_NAME: // we are processing object elements key
189+
case OBJECT_KEY_NAME: // we are processing object elements key
190190
return JsonDocumentItemType.VALUE_KEY;
191191
default:
192192
throw new IllegalStateException( "unexpected quote read in current processing state " +
@@ -211,8 +211,8 @@ public JsonDocumentItemType next() {
211211
this.jsonString.charAt( this.position )));
212212
}
213213
switch ( this.processingStates.getCurrent() ) {
214-
case JsonProcessingState.ARRAY:
215-
case JsonProcessingState.OBJECT:
214+
case ARRAY:
215+
case OBJECT:
216216
return getUnquotedValueType(this.jsonString.charAt( this.jsonValueStart));
217217
default:
218218
throw new IllegalStateException( "unexpected read ["+

0 commit comments

Comments
 (0)