HHH-17404 : removed dead code

Author: ejannett

hibernate-core/src/main/java/org/hibernate/dialect/JsonHelper.java

@@ -36,7 +36,7 @@
 import org.hibernate.type.descriptor.jdbc.AggregateJdbcType;
 import org.hibernate.type.descriptor.jdbc.ArrayJdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
-import org.hibernate.type.format.JsonDocumentItem;
+import org.hibernate.type.format.JsonDocumentItemType;
 import org.hibernate.type.format.JsonDocumentReader;
 import org.hibernate.type.format.JsonDocumentReaderFactory;
 import org.hibernate.type.format.JsonDocumentWriter;
@@ -258,7 +258,7 @@ private static <X> X consumeJsonDocumentItems(JsonDocumentReader reader, Embedda
 		objectArrays.push( objectArrayResult );
 
 		while(reader.hasNext()) {
-			JsonDocumentItem.JsonDocumentItemType type = reader.next();
+			JsonDocumentItemType type = reader.next();
 			switch (type) {
 				case VALUE_KEY:
 					currentKeyName = reader.getObjectKeyName();
@@ -430,12 +430,12 @@ public static <X> X arrayFromString(
 		JsonValueJDBCTypeAdapter adapter = JsonValueJDBCTypeAdapterFactory.getAdapter(reader,false);
 
 		assert reader.hasNext():"Invalid array string";
-		assert reader.next() == JsonDocumentItem.JsonDocumentItemType.ARRAY_START:"Invalid start of array";
+		assert reader.next() == JsonDocumentItemType.ARRAY_START:"Invalid start of array";
 		boolean endArrayFound = false;
 		while(reader.hasNext()) {
-			JsonDocumentItem.JsonDocumentItemType type = reader.next();
+			JsonDocumentItemType type = reader.next();
 			switch ( type ) {
-				case JsonDocumentItem.JsonDocumentItemType.ARRAY_END:
+				case JsonDocumentItemType.ARRAY_END:
 					endArrayFound=true;
 					break;
 				case NULL_VALUE:

hibernate-core/src/main/java/org/hibernate/dialect/OracleOsonJacksonJdbcType.java

@@ -149,21 +149,12 @@ private X fromOson(InputStream osonBytes, WrapperOptions options) throws Excepti
 					// and build the array.(as opposed to let Jackson do it as we do not
 					// have a proper object definition at that stage).
 					OracleJsonParser osonParser = new OracleJsonFactory().createJsonBinaryParser( osonBytes );
-
-
-					//ObjectArrayOsonDocumentHandler handler = new ObjectArrayOsonDocumentHandler( getEmbeddableMappingType(),
-						//	options);
-					//OsonHelper.consumeOsonTokens(osonParser, osonParser.next(), handler);
-
-					//osonBytes.reset();
-					//OracleJsonParser osonParser2 = new OracleJsonFactory().createJsonBinaryParser( osonBytes);
 					Object[] objects =  JsonHelper.deserialize(
 							getEmbeddableMappingType(),
 							osonParser,
 							javaType.getJavaTypeClass() != Object[].class,
 							options
 					);
-					//Object[] objects2 = (Object[]) handler.getObjectArray();
 					return (X) objects;
 				}
 

hibernate-core/src/main/java/org/hibernate/dialect/OsonHelper.java

@@ -0,0 +1,47 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.type.format;
+
+/**
+ * Json item types
+ */
+public enum JsonDocumentItemType {
+	/**
+	 * Start of a Json Object '{'
+	 */
+	OBJECT_START,
+	/**
+	 * end  of a Json Object '}'
+	 */
+	OBJECT_END,
+	/**
+	 * Start of a Json array '['
+	 */
+	ARRAY_START,
+	/**
+	 * End of a Json array ']'
+	 */
+	ARRAY_END,
+	/**
+	 * key of Json attribute
+	 */
+	VALUE_KEY,
+	/**
+	 * boolean value within Json object or array
+	 */
+	BOOLEAN_VALUE,
+	/**
+	 * null value within Json object or array
+	 */
+	NULL_VALUE,
+	/**
+	 * numeric value within Json object or array
+	 */
+	NUMERIC_VALUE,
+	/**
+	 * String (quoted) value within Json object or array
+	 */
+	VALUE
+}

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

@@ -79,7 +79,7 @@
  *
  * @author Emmanuel Jannetti
  */
-public interface JsonDocumentReader extends Iterator<JsonDocumentItem.JsonDocumentItemType> {
+public interface JsonDocumentReader extends Iterator<JsonDocumentItemType> {
 	default void forEachRemaining() {
 		throw new UnsupportedOperationException("forEachRemaining");
 	}