Skip to content

Commit 14e09ae

Browse files
committed
Added logging.
1 parent 878b843 commit 14e09ae

9 files changed

+149
-21
lines changed

ojdbc-provider-jackson-oson/src/main/java/oracle/jdbc/provider/oson/JacksonOsonConverter.java

+11-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
import oracle.sql.json.OracleJsonParser;
4848

4949
import java.io.IOException;
50+
import java.util.logging.Level;
51+
import java.util.logging.Logger;
5052

5153
/**
5254
* Converter class that facilitates the integration of Jackson and Oson libraries.
@@ -68,6 +70,7 @@ public class JacksonOsonConverter implements OsonConverter{
6870

6971
private static final OsonFactory osonFactory = new OsonFactory();
7072
private static final ObjectMapper om = new ObjectMapper(osonFactory);
73+
private static final Logger logger = Logger.getLogger(JacksonOsonConverter.class.getName());
7174

7275
static {
7376
om.findAndRegisterModules();
@@ -89,6 +92,7 @@ public JacksonOsonConverter(){}
8992
*/
9093
@Override
9194
public void serialize(OracleJsonGenerator oGen, Object object) throws IllegalStateException {
95+
logger.log(Level.FINEST, "Serializing to OSON");
9296
try {
9397
om.writeValue(osonFactory.createGenerator(oGen), object);
9498
}
@@ -107,6 +111,7 @@ public void serialize(OracleJsonGenerator oGen, Object object) throws IllegalSta
107111
*/
108112
@Override
109113
public Object deserialize(OracleJsonParser oParser, Class<?> type) throws IllegalStateException {
114+
logger.log(Level.FINEST, "Deserializing OSON");
110115
if(!oParser.hasNext()) return null;
111116
try {
112117
return om.readValue(osonFactory.createParser(oParser), type);
@@ -124,7 +129,8 @@ public Object deserialize(OracleJsonParser oParser, Class<?> type) throws Illega
124129
* @return the converted value
125130
*/
126131
public static Object convertValue(Object fromValue, JavaType javaType) {
127-
return om.convertValue(fromValue, javaType);
132+
logger.log(Level.FINEST, "Converting value to JavaType");
133+
return om.convertValue(fromValue, javaType);
128134
}
129135

130136
/**
@@ -135,6 +141,10 @@ public static ObjectMapper getObjectMapper() {
135141
return om;
136142
}
137143

144+
/**
145+
* Get the OsonFactory instance.
146+
* @return the OsonFactory
147+
*/
138148
public static OsonFactory getOsonFactory() {
139149
return osonFactory;
140150
}

ojdbc-provider-jackson-oson/src/main/java/oracle/jdbc/provider/oson/JacksonOsonProvider.java

+4
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import oracle.jdbc.spi.OsonConverter;
4343

4444
import java.util.Map;
45+
import java.util.logging.Logger;
4546

4647
/**
4748
* Provider class for integrating Jackson with the Oson library.
@@ -64,6 +65,8 @@ public class JacksonOsonProvider implements JsonProvider{
6465
*/
6566
public static final String PROVIDER_NAME = "jackson-json-provider";
6667

68+
private final Logger logger = Logger.getLogger(JacksonOsonProvider.class.getName());
69+
6770
/**
6871
* Default constructor.
6972
*/
@@ -87,6 +90,7 @@ public String getName() {
8790
*/
8891
@Override
8992
public OsonConverter getOsonConverter(Map<Parameter, CharSequence> parameterValues) {
93+
logger.fine("JacksonOsonProvider getOsonConverter");
9094
return new JacksonOsonConverter();
9195
}
9296

ojdbc-provider-jackson-oson/src/main/java/oracle/jdbc/provider/oson/OsonFactory.java

+27-4
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,16 @@
4747
import java.io.*;
4848
import java.net.URL;
4949
import java.nio.ByteBuffer;
50+
import java.util.logging.Level;
51+
import java.util.logging.Logger;
5052

5153
/**
5254
* The OsonFactory class extends the JsonFactory to provide custom JSON generation and parsing
5355
* capabilities using {@link OsonGenerator} and {@link OsonParser}. This class overrides methods from
5456
* JsonFactory to create instances of JsonGenerator and JsonParser.
5557
*/
5658
public class OsonFactory extends JsonFactory {
57-
59+
private final Logger logger = Logger.getLogger(OsonFactory.class.getName());
5860
/**
5961
* {@link OracleJsonFactory} object to create generator/parser instances.
6062
*/
@@ -68,6 +70,7 @@ public class OsonFactory extends JsonFactory {
6870
*/
6971
@Override
7072
public JsonGenerator createGenerator(OutputStream out) throws IOException {
73+
logger.log(Level.FINEST, "createGenerator(OutputStream)");
7174
return createGenerator(out, JsonEncoding.UTF8);
7275
}
7376

@@ -81,6 +84,7 @@ public JsonGenerator createGenerator(OutputStream out) throws IOException {
8184
*/
8285
@Override
8386
public JsonGenerator createGenerator(OutputStream out, JsonEncoding enc) throws IOException {
87+
logger.log(Level.FINEST, "createGenerator(OutputStream, JsonEncoding)");
8488
IOContext ctxt = _createContext(out, true);
8589
ctxt.setEncoding(enc);
8690
if (_outputDecorator != null) {
@@ -108,6 +112,7 @@ public JsonGenerator createGenerator(OutputStream out, JsonEncoding enc) throws
108112
*/
109113
@Override
110114
public JsonGenerator createGenerator(Writer out) throws IOException {
115+
logger.log(Level.FINEST, "createGenerator(Writer)");
111116
IOContext ctxt = _createContext(_createContentReference(out), true);
112117
OsonGenerator g = new OsonGenerator(_generatorFeatures, null,
113118
factory.createJsonTextGenerator(_decorate(out,ctxt)));
@@ -130,6 +135,7 @@ public JsonGenerator createGenerator(Writer out) throws IOException {
130135
*/
131136
@Override
132137
public JsonGenerator createGenerator(DataOutput out) throws IOException {
138+
logger.log(Level.FINEST, "createGenerator(DataOutput)");
133139
return createGenerator((OutputStream) out, JsonEncoding.UTF8);
134140
}
135141

@@ -142,6 +148,7 @@ public JsonGenerator createGenerator(DataOutput out) throws IOException {
142148
*/
143149
@Override
144150
public JsonGenerator createGenerator(DataOutput out, JsonEncoding enc) throws IOException {
151+
logger.log(Level.FINEST, "createGenerator(DataOutput, JsonEncoding)");
145152
return createGenerator((OutputStream) out, enc);
146153
}
147154

@@ -155,6 +162,7 @@ public JsonGenerator createGenerator(DataOutput out, JsonEncoding enc) throws IO
155162
*/
156163
@Override
157164
public JsonGenerator createGenerator(File f, JsonEncoding enc) throws IOException {
165+
logger.log(Level.FINEST, "createGenerator(File, JsonEncoding)");
158166
OutputStream out = new FileOutputStream(f);
159167
IOContext ctxt = _createContext(out, true);
160168
ctxt.setEncoding(enc);
@@ -171,6 +179,7 @@ public JsonGenerator createGenerator(File f, JsonEncoding enc) throws IOExceptio
171179
* @return A custom OsonGenerator instance.
172180
*/
173181
public JsonGenerator createGenerator(OracleJsonGenerator oGen) {
182+
logger.log(Level.FINEST, "createGenerator(OracleJsonGenerator)");
174183
OsonGenerator g = new OsonGenerator(_generatorFeatures, null, oGen);
175184
ObjectCodec codec = getCodec();
176185
if (codec != null) {
@@ -190,6 +199,7 @@ public JsonGenerator createGenerator(OracleJsonGenerator oGen) {
190199
*/
191200
@Override
192201
public JsonParser createParser(byte[] data) {
202+
logger.log(Level.FINEST, "createParser(byte[])");
193203
IOContext ctxt = _createContext(data, true);
194204
return _createParser(data, 0, data.length, ctxt);
195205
}
@@ -202,6 +212,7 @@ public JsonParser createParser(byte[] data) {
202212
*/
203213
@Override
204214
public JsonParser createParser(char[] content) {
215+
logger.log(Level.FINEST, "createParser(char[])");
205216
IOContext ctxt = _createContext(content, true);
206217
return _createParser(content, 0, content.length, ctxt, false);
207218
}
@@ -215,6 +226,7 @@ public JsonParser createParser(char[] content) {
215226
@SuppressWarnings({ "deprecation", "resource" })
216227
@Override
217228
public JsonParser createParser(File f) throws IOException {
229+
logger.log(Level.FINEST, "createParser(File)");
218230
IOContext ctxt = _createContext(f, true);
219231
InputStream in = new FileInputStream(f);
220232
if (_inputDecorator != null) {
@@ -231,6 +243,7 @@ public JsonParser createParser(File f) throws IOException {
231243
*/
232244
@Override
233245
public JsonParser createParser(Reader r) throws IOException {
246+
logger.log(Level.FINEST, "createParser(Reader)");
234247
IOContext ctxt = _createContext(r, true);
235248
return _createParser(_decorate(r,ctxt), ctxt);
236249
}
@@ -243,6 +256,7 @@ public JsonParser createParser(Reader r) throws IOException {
243256
*/
244257
@Override
245258
public JsonParser createParser(InputStream in) throws IOException {
259+
logger.log(Level.FINEST, "createParser(InputStream)");
246260
IOContext ctxt = _createContext(in, true);
247261
return _createParser(_decorate(in, ctxt), ctxt);
248262
}
@@ -255,6 +269,7 @@ public JsonParser createParser(InputStream in) throws IOException {
255269
*/
256270
@Override
257271
public JsonParser createParser(String content) throws IOException {
272+
logger.log(Level.FINEST, "createParser(String)");
258273
IOContext ctxt = _createContext(content, true);
259274
return _createParser(content.toCharArray(), 0, content.length(), ctxt, false);
260275
}
@@ -269,6 +284,7 @@ public JsonParser createParser(String content) throws IOException {
269284
*/
270285
@Override
271286
public JsonParser createParser(URL url) throws IOException {
287+
logger.log(Level.FINEST, "createParser(URL)");
272288
IOContext ctxt = _createContext(url, true);
273289
InputStream in = _optimizedStreamFromURL(url);
274290
if (_inputDecorator != null) {
@@ -289,6 +305,7 @@ public JsonParser createParser(URL url) throws IOException {
289305
*/
290306
@Override
291307
public JsonParser createParser(byte[] data, int offset, int len) throws IOException {
308+
logger.log(Level.FINEST, "createParser(byte[], int, int)");
292309
IOContext ctxt = _createContext(data, true);
293310
if (_inputDecorator != null) {
294311
InputStream in = _inputDecorator.decorate(ctxt, data, offset, len);
@@ -310,6 +327,7 @@ public JsonParser createParser(byte[] data, int offset, int len) throws IOExcept
310327
*/
311328
@Override
312329
public JsonParser createParser(char[] content, int offset, int len) throws IOException {
330+
logger.log(Level.FINEST, "createParser(char[], int, int)");
313331
IOContext ctxt = _createContext(content, true);
314332
Reader r = new CharArrayReader(content, offset, len);
315333
if (_inputDecorator != null) {
@@ -328,6 +346,7 @@ public JsonParser createParser(char[] content, int offset, int len) throws IOExc
328346
*/
329347
@Override
330348
public JsonParser _createParser(InputStream in, IOContext ctxt) {
349+
logger.log(Level.FINEST, "_createParser(InputStream)");
331350
return new OsonParser(ctxt, _factoryFeatures, factory.createJsonBinaryParser(in));
332351
}
333352

@@ -340,6 +359,7 @@ public JsonParser _createParser(InputStream in, IOContext ctxt) {
340359
*/
341360
@Override
342361
public JsonParser _createParser(Reader r, IOContext ctxt) {
362+
logger.log(Level.FINEST, "_createParser(Reader)");
343363
return new OsonParser(ctxt, _factoryFeatures, factory.createJsonTextParser(r));
344364
}
345365

@@ -356,7 +376,8 @@ public JsonParser _createParser(Reader r, IOContext ctxt) {
356376
*/
357377
@Override
358378
public JsonParser _createParser(char[] data, int offset, int len, IOContext ctxt, boolean recyclable) {
359-
return new OsonParser(ctxt, _factoryFeatures,
379+
logger.log(Level.FINEST, "_createParser(char[], int, int, IOContext)");
380+
return new OsonParser(ctxt, _factoryFeatures,
360381
factory.createJsonTextParser(new CharArrayReader(data, offset, len)));
361382
}
362383

@@ -371,7 +392,8 @@ public JsonParser _createParser(char[] data, int offset, int len, IOContext ctxt
371392
*/
372393
@Override
373394
public JsonParser _createParser(byte[] data, int offset, int len, IOContext ctxt) {
374-
return new OsonParser(ctxt, _factoryFeatures,
395+
logger.log(Level.FINEST, "_createParser(byte[], int, int, IOContext)");
396+
return new OsonParser(ctxt, _factoryFeatures,
375397
factory.createJsonBinaryParser(ByteBuffer.wrap(data, offset, len)));
376398
}
377399

@@ -381,6 +403,7 @@ public JsonParser _createParser(byte[] data, int offset, int len, IOContext ctxt
381403
* @return
382404
*/
383405
public JsonParser createParser(OracleJsonParser oParser) {
406+
logger.log(Level.FINEST, "createParser(OracleJsonParser)");
384407
return new OsonParser(this._createContext(null, false), _factoryFeatures, oParser);
385408
}
386409

@@ -400,7 +423,7 @@ public JsonParser createParser(OracleJsonParser oParser) {
400423
*/
401424
@Override
402425
protected JsonParser _createParser(DataInput input, IOContext ctxt) {
403-
426+
logger.log(Level.FINEST, "_createParser(DataInput, IOContext)");
404427
InputStream stream = new InputStream() {
405428
@Override
406429
public int read() throws IOException {

0 commit comments

Comments
 (0)