Skip to content
This repository was archived by the owner on Nov 5, 2024. It is now read-only.

Commit 9a1a7c1

Browse files
Correct and better logging of exceptions
Change-Id: I866b5bdabf8dd1eadb1fe68f93038cbb43d6e328
1 parent 7ff0e25 commit 9a1a7c1

File tree

6 files changed

+20
-7
lines changed

6 files changed

+20
-7
lines changed

compiler/base/datamodel/src/main/java/org/onosproject/yang/compiler/datamodel/utils/DataModelUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -797,7 +797,7 @@ public static void updateClonedLeavesUnionEnumRef(YangLeavesHolder leavesHolder)
797797
} catch (DataModelException e) {
798798
throw e;
799799
} catch (CloneNotSupportedException e) {
800-
e.printStackTrace();
800+
log.error("Error in cloning", e);
801801
throw new DataModelException("Could not clone Type node " +
802802
leaf.getDataType().getDataTypeName() + " in " +
803803
leaf.getDataType().getLineNumber() + " at " +

compiler/base/tool/src/main/java/org/onosproject/yang/compiler/tool/YangCompilerManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ private void processYangFiles(YangCompilationParam param) throws IOException {
200200
translatorErrorHandler(curYangFileInfo.getRootNode(),
201201
config);
202202
} catch (IOException ex) {
203-
e.printStackTrace();
203+
log.error("Error in processing the files", e);
204204
throw ex;
205205
}
206206
}

runtime/src/test/java/org/onosproject/yang/runtime/impl/DefaultYangModelRegistryTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.onosproject.yang.model.YangModel;
2626
import org.onosproject.yang.model.YangModule;
2727
import org.onosproject.yang.model.YangModuleId;
28+
import org.slf4j.Logger;
2829

2930
import java.io.IOException;
3031
import java.io.InputStream;
@@ -41,12 +42,15 @@
4142
import static org.onosproject.yang.runtime.impl.MockYangSchemaNodeProvider.processSchemaRegistry;
4243
import static org.onosproject.yang.runtime.impl.MockYangSchemaNodeProvider.registry;
4344
import static org.onosproject.yang.runtime.impl.MockYangSchemaNodeProvider.unRegister;
45+
import static org.slf4j.LoggerFactory.getLogger;
4446

4547
/**
4648
* Unit test for model registry.
4749
*/
4850
public class DefaultYangModelRegistryTest {
4951

52+
private static final Logger log = getLogger(DefaultYangModelRegistryTest.class);
53+
5054
private static final String SCHEMA_NAME_3 = "ietf-network3";
5155
private static final String INTERFACE_NAME_3 =
5256
"org.onosproject.yang.gen.v1.ietfnetwork3.rev20151208.IetfNetwork3";
@@ -166,7 +170,7 @@ public void testForGetMetaData()
166170
try {
167171
node = ((YangNode) objectInputStream.readObject());
168172
} catch (ClassNotFoundException e) {
169-
System.out.println(e);
173+
log.error("Class not found", e);
170174
}
171175
objectInputStream.close();
172176
assertThat(true, is(

serializers/json/src/main/java/org/onosproject/yang/serializers/json/DefaultJsonBuilder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,8 @@ public ObjectNode getTreeNode() {
204204
m.configure(JsonParser.Feature.ALLOW_UNQUOTED_CONTROL_CHARS, true);
205205
node = (ObjectNode) m.readTree(getTreeString());
206206
} catch (IOException e) {
207-
e.printStackTrace();
207+
log.error("Error in processing the tree", e);
208+
log.debug("tree {}", getTreeString());
208209
}
209210
return node;
210211
}

serializers/json/src/test/java/org/onosproject/yang/serializers/json/JsonSerializerTest.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.onosproject.yang.runtime.RuntimeContext;
3838
import org.onosproject.yang.runtime.YangSerializer;
3939
import org.onosproject.yang.runtime.YangSerializerContext;
40+
import org.slf4j.Logger;
4041

4142
import java.io.BufferedReader;
4243
import java.io.FileReader;
@@ -53,12 +54,15 @@
5354
import static org.hamcrest.core.Is.is;
5455
import static org.junit.Assert.assertEquals;
5556
import static org.onosproject.yang.serializers.utils.SerializersUtil.convertRidToUri;
57+
import static org.slf4j.LoggerFactory.getLogger;
5658

5759
/**
5860
* Unit Test for Json Serializer.
5961
*/
6062
public class JsonSerializerTest {
6163

64+
private static final Logger log = getLogger(JsonSerializerTest.class);
65+
6266
private static YangSerializerContext context;
6367
private static YangSerializer jsonSerializer;
6468

@@ -342,7 +346,7 @@ private static InputStream parseInput(String path) {
342346
sb.append(temp);
343347
}
344348
} catch (IOException e) {
345-
e.printStackTrace();
349+
log.error("Error in processing the path {}", path, e);
346350
}
347351
return IOUtils.toInputStream(sb);
348352
}
@@ -362,7 +366,7 @@ private static String parseJsonToString(String path) {
362366
sb.append(temp);
363367
}
364368
} catch (IOException e) {
365-
e.printStackTrace();
369+
log.error("Error in processing the path {}", path, e);
366370
}
367371
return sb.toString();
368372
}

serializers/xml/src/test/java/org/onosproject/yang/serializers/xml/XmlSerializerTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.onosproject.yang.runtime.DefaultCompositeStream;
4141
import org.onosproject.yang.runtime.YangSerializer;
4242
import org.onosproject.yang.runtime.YangSerializerContext;
43+
import org.slf4j.Logger;
4344

4445
import java.io.BufferedReader;
4546
import java.io.FileReader;
@@ -52,12 +53,15 @@
5253

5354
import static org.hamcrest.MatcherAssert.assertThat;
5455
import static org.hamcrest.Matchers.is;
56+
import static org.slf4j.LoggerFactory.getLogger;
5557

5658
/**
5759
*
5860
*/
5961
public class XmlSerializerTest {
6062

63+
private static final Logger log = getLogger(XmlSerializerTest.class);
64+
6165
public static final String LNS = "yrt:list.anydata";
6266
private static final String LIST_NS = "yrt:list";
6367
private static YangSerializerContext context;
@@ -232,7 +236,7 @@ private static InputStream parseInput(String path) {
232236
sb.append(temp);
233237
}
234238
} catch (IOException e) {
235-
e.printStackTrace();
239+
log.error("Error in processing the path {}", path, e);
236240
}
237241
return IOUtils.toInputStream(sb);
238242
}

0 commit comments

Comments
 (0)