Move JavaSE classes to use the new logError Apis

RHenigan · RHenigan · commit e298cb9c16be · 2020-06-26T16:45:11.000-04:00
diff --git a/base/src/main/java/com/livio/BSON/BsonEncoder.java b/base/src/main/java/com/livio/BSON/BsonEncoder.java
@@ -47,7 +47,7 @@ public static byte[] encodeToBytes(HashMap<String, Object> map) throws ClassCast
 
             return encoder.encode(bson);
         }
-        DebugTool.logError("Something went wrong encoding the map into BSON bytes");
+        DebugTool.logError(null, "Something went wrong encoding the map into BSON bytes");
 
         return null;
     }
@@ -63,7 +63,7 @@ public static HashMap<String, Object> decodeFromBytes(byte[] bytes) {
                 }
             }
         }
-        DebugTool.logError("Something went wrong decoding bytes into BSON");
+        DebugTool.logError(null, "Something went wrong decoding bytes into BSON");
         return null;
     }
 
diff --git a/base/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java b/base/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
@@ -295,7 +295,7 @@ public void onProtocolSessionEnded(SessionType sessionType, byte sessionID,
     @Override
     public void onProtocolError(String info, Exception e) {
         this.sessionListener.onProtocolError(info, e);
-        DebugTool.logError("on protocol error", e);
+        DebugTool.logError(TAG,"on protocol error", e);
     }
 
 
diff --git a/base/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java b/base/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
@@ -118,7 +118,7 @@ public void run() {
 							mPauseLock.wait();
                         }
                         catch (InterruptedException e) {
-							DebugTool.logError("Streaming thread has been interrupted", e);
+							DebugTool.logError(TAG, "Streaming thread has been interrupted", e);
 						}
                     }
                 }
diff --git a/base/src/main/java/com/smartdevicelink/trace/SdlTrace.java b/base/src/main/java/com/smartdevicelink/trace/SdlTrace.java
@@ -419,7 +419,7 @@ private static boolean writeXmlTraceMessage(String msg) {
 				try {
 					localTraceListener.logXmlMsg(msg, SDL_LIB_TRACE_KEY);
 				} catch (Exception ex) {
-					DebugTool.logError("Failure calling ISTListener: " + ex.toString(), ex);
+					DebugTool.logError(null,"Failure calling ISTListener: " + ex.toString(), ex);
 					return false;
 				}
 			}
diff --git a/base/src/main/java/com/smartdevicelink/transport/CustomTransport.java b/base/src/main/java/com/smartdevicelink/transport/CustomTransport.java
@@ -138,7 +138,7 @@ public void write(SdlPacket packet) {
             try {
                 onWrite(bytes, 0, bytes.length);
             } catch (Exception exc) {
-                DebugTool.logError("Error attempting to write packet", exc);
+                DebugTool.logError(TAG, "Error attempting to write packet", exc);
             }
         }
     }
diff --git a/base/src/main/java/com/smartdevicelink/transport/TransportManager.java b/base/src/main/java/com/smartdevicelink/transport/TransportManager.java
@@ -180,7 +180,7 @@ public void onConnectionEstablished() {
 
         @Override
         public void onError() {
-            DebugTool.logError("Error in the transport manager from the web socket server");
+            DebugTool.logError(TAG, "Error in the transport manager from the web socket server");
             if(transportListener != null){
                 transportListener.onError("");
             }
diff --git a/base/src/main/java/com/smartdevicelink/transport/WebSocketServer.java b/base/src/main/java/com/smartdevicelink/transport/WebSocketServer.java
@@ -66,7 +66,7 @@ public WebSocketServer(WebSocketServerConfig config, TransportCallback callback)
             if(factory!=null){
                 this.setWebSocketFactory(factory);
             }else{
-                DebugTool.logError("WebSocketServer: Unable to generate SSL Web Socket Server Factory");
+                DebugTool.logError(TAG, "WebSocketServer: Unable to generate SSL Web Socket Server Factory");
             }
         }
 
@@ -138,7 +138,7 @@ public void onWebsocketCloseInitiated(WebSocket conn, int code, String reason) {
 
     @Override
     public void onMessage(WebSocket webSocket, String s) {
-        DebugTool.logError("Incorrect message type received, dropping. - String: " + s);
+        DebugTool.logError(TAG, "Incorrect message type received, dropping. - String: " + s);
     }
 
     @Override
@@ -182,7 +182,7 @@ public void onMessage(WebSocket conn, ByteBuffer message) {
 
     @Override
     public void onError(WebSocket webSocket, Exception e) {
-        DebugTool.logError("bad", e);
+        DebugTool.logError(TAG, "bad", e);
         if(callback!=null) {
             callback.onError();
         }
diff --git a/base/src/main/java/com/smartdevicelink/transport/utl/SSLWebSocketFactoryGenerator.java b/base/src/main/java/com/smartdevicelink/transport/utl/SSLWebSocketFactoryGenerator.java
@@ -70,13 +70,13 @@ public static WebSocketServerFactory generateWebSocketServer(SSLConfig config){
                 context = getSSLContextFromPem(config);
                 break;
             default:
-                DebugTool.logError("Unable to generateWebSocketServer. Unsupported cert type.");
+                DebugTool.logError(null, "Unable to generateWebSocketServer. Unsupported cert type.");
                 return null;
         }
         if(context != null) {
             return new DefaultSSLWebSocketServerFactory(context);
         }else{
-            DebugTool.logError("SSLWebSocketFactoryGenerator: Unable to create SSL Context");
+            DebugTool.logError(null, "SSLWebSocketFactoryGenerator: Unable to create SSL Context");
             return null;
         }
     }
@@ -101,7 +101,7 @@ private static SSLContext getSSLContextFromJKS(SSLConfig config){
             return sslContext;
         }
         catch(Exception e){
-            DebugTool.logError("Issue creating SSLContext with JKS : " , e);
+            DebugTool.logError(null, "Issue creating SSLContext with JKS : " , e);
         }
         return null;
     }
@@ -133,7 +133,7 @@ private static SSLContext getSSLContextFromPem(SSLConfig config) {
             context.init( km, null, null );
         } catch ( Exception e ) {
             context = null;
-            DebugTool.logError("Issue creating SSLContext with PEM Cert : " , e);
+            DebugTool.logError(null, "Issue creating SSLContext with PEM Cert : " , e);
         }
         return context;
     }
diff --git a/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java b/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java
@@ -103,7 +103,7 @@ void checkState() {
                 onReady();
             } else if (permissionManager.getState() == BaseSubManager.ERROR && fileManager.getState() == BaseSubManager.ERROR && screenManager.getState() == BaseSubManager.ERROR) {
                 String info = "ERROR starting sdl manager, all sub managers are in error state";
-                DebugTool.logError(info);
+                DebugTool.logError(TAG, info);
                 transitionToState(BaseSubManager.ERROR);
                 notifyDevListener(info);
             } else if (permissionManager.getState() == BaseSubManager.SETTING_UP || fileManager.getState() == BaseSubManager.SETTING_UP || screenManager.getState() == BaseSubManager.SETTING_UP) {
@@ -120,7 +120,7 @@ void checkState() {
         } else {
             // We should never be here, but somehow one of the sub-sub managers is null
             String info = "ERROR one of the sdl sub managers is null";
-            DebugTool.logError(info);
+            DebugTool.logError(TAG, info);
             transitionToState(BaseSubManager.ERROR);
             notifyDevListener(info);
         }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public static byte[] encodeToBytes(HashMap<String, Object> map) throws ClassCast`
`47`	`47`
`48`	`48`	`return encoder.encode(bson);`
`49`	`49`	`}`
`50`		`- DebugTool.logError("Something went wrong encoding the map into BSON bytes");`
	`50`	`+ DebugTool.logError(null, "Something went wrong encoding the map into BSON bytes");`
`51`	`51`
`52`	`52`	`return null;`
`53`	`53`	`}`
`@@ -63,7 +63,7 @@ public static HashMap<String, Object> decodeFromBytes(byte[] bytes) {`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`}`
`66`		`- DebugTool.logError("Something went wrong decoding bytes into BSON");`
	`66`	`+ DebugTool.logError(null, "Something went wrong decoding bytes into BSON");`
`67`	`67`	`return null;`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ public void onProtocolSessionEnded(SessionType sessionType, byte sessionID,`
`295`	`295`	`@Override`
`296`	`296`	`public void onProtocolError(String info, Exception e) {`
`297`	`297`	`this.sessionListener.onProtocolError(info, e);`
`298`		`- DebugTool.logError("on protocol error", e);`
	`298`	`+ DebugTool.logError(TAG,"on protocol error", e);`
`299`	`299`	`}`
`300`	`300`
`301`	`301`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public void run() {`
`118`	`118`	`mPauseLock.wait();`
`119`	`119`	`}`
`120`	`120`	`catch (InterruptedException e) {`
`121`		`- DebugTool.logError("Streaming thread has been interrupted", e);`
	`121`	`+ DebugTool.logError(TAG, "Streaming thread has been interrupted", e);`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,7 @@ private static boolean writeXmlTraceMessage(String msg) {`
`419`	`419`	`try {`
`420`	`420`	`localTraceListener.logXmlMsg(msg, SDL_LIB_TRACE_KEY);`
`421`	`421`	`} catch (Exception ex) {`
`422`		`- DebugTool.logError("Failure calling ISTListener: " + ex.toString(), ex);`
	`422`	`+ DebugTool.logError(null,"Failure calling ISTListener: " + ex.toString(), ex);`
`423`	`423`	`return false;`
`424`	`424`	`}`
`425`	`425`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public void write(SdlPacket packet) {`
`138`	`138`	`try {`
`139`	`139`	`onWrite(bytes, 0, bytes.length);`
`140`	`140`	`} catch (Exception exc) {`
`141`		`- DebugTool.logError("Error attempting to write packet", exc);`
	`141`	`+ DebugTool.logError(TAG, "Error attempting to write packet", exc);`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ public void onConnectionEstablished() {`
`180`	`180`
`181`	`181`	`@Override`
`182`	`182`	`public void onError() {`
`183`		`- DebugTool.logError("Error in the transport manager from the web socket server");`
	`183`	`+ DebugTool.logError(TAG, "Error in the transport manager from the web socket server");`
`184`	`184`	`if(transportListener != null){`
`185`	`185`	`transportListener.onError("");`
`186`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public WebSocketServer(WebSocketServerConfig config, TransportCallback callback)`
`66`	`66`	`if(factory!=null){`
`67`	`67`	`this.setWebSocketFactory(factory);`
`68`	`68`	`}else{`
`69`		`- DebugTool.logError("WebSocketServer: Unable to generate SSL Web Socket Server Factory");`
	`69`	`+ DebugTool.logError(TAG, "WebSocketServer: Unable to generate SSL Web Socket Server Factory");`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
`@@ -138,7 +138,7 @@ public void onWebsocketCloseInitiated(WebSocket conn, int code, String reason) {`
`138`	`138`
`139`	`139`	`@Override`
`140`	`140`	`public void onMessage(WebSocket webSocket, String s) {`
`141`		`- DebugTool.logError("Incorrect message type received, dropping. - String: " + s);`
	`141`	`+ DebugTool.logError(TAG, "Incorrect message type received, dropping. - String: " + s);`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`@Override`
`@@ -182,7 +182,7 @@ public void onMessage(WebSocket conn, ByteBuffer message) {`
`182`	`182`
`183`	`183`	`@Override`
`184`	`184`	`public void onError(WebSocket webSocket, Exception e) {`
`185`		`- DebugTool.logError("bad", e);`
	`185`	`+ DebugTool.logError(TAG, "bad", e);`
`186`	`186`	`if(callback!=null) {`
`187`	`187`	`callback.onError();`
`188`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,13 +70,13 @@ public static WebSocketServerFactory generateWebSocketServer(SSLConfig config){`
`70`	`70`	`context = getSSLContextFromPem(config);`
`71`	`71`	`break;`
`72`	`72`	`default:`
`73`		`- DebugTool.logError("Unable to generateWebSocketServer. Unsupported cert type.");`
	`73`	`+ DebugTool.logError(null, "Unable to generateWebSocketServer. Unsupported cert type.");`
`74`	`74`	`return null;`
`75`	`75`	`}`
`76`	`76`	`if(context != null) {`
`77`	`77`	`return new DefaultSSLWebSocketServerFactory(context);`
`78`	`78`	`}else{`
`79`		`- DebugTool.logError("SSLWebSocketFactoryGenerator: Unable to create SSL Context");`
	`79`	`+ DebugTool.logError(null, "SSLWebSocketFactoryGenerator: Unable to create SSL Context");`
`80`	`80`	`return null;`
`81`	`81`	`}`
`82`	`82`	`}`
`@@ -101,7 +101,7 @@ private static SSLContext getSSLContextFromJKS(SSLConfig config){`
`101`	`101`	`return sslContext;`
`102`	`102`	`}`
`103`	`103`	`catch(Exception e){`
`104`		`- DebugTool.logError("Issue creating SSLContext with JKS : " , e);`
	`104`	`+ DebugTool.logError(null, "Issue creating SSLContext with JKS : " , e);`
`105`	`105`	`}`
`106`	`106`	`return null;`
`107`	`107`	`}`
`@@ -133,7 +133,7 @@ private static SSLContext getSSLContextFromPem(SSLConfig config) {`
`133`	`133`	`context.init( km, null, null );`
`134`	`134`	`} catch ( Exception e ) {`
`135`	`135`	`context = null;`
`136`		`- DebugTool.logError("Issue creating SSLContext with PEM Cert : " , e);`
	`136`	`+ DebugTool.logError(null, "Issue creating SSLContext with PEM Cert : " , e);`
`137`	`137`	`}`
`138`	`138`	`return context;`
`139`	`139`	`}`