Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 66894e1

Browse files
hoegertnhoegertn
committed
Merge pull request taimos#14 from SmartCarSioux/master
Migrate from java.util.logging to SLF4J
2 parents 8dbd7d9 + a3937b1 commit 66894e1

File tree

5 files changed

+43
-31
lines changed

5 files changed

+43
-31
lines changed

‎pom.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,23 @@
3333
<artifactId>json</artifactId>
3434
<version>20090211</version>
3535
</dependency>
36+
<dependency>
37+
<groupId>org.slf4j</groupId>
38+
<artifactId>slf4j-api</artifactId>
39+
<version>1.7.7</version>
40+
</dependency>
3641
<dependency>
3742
<groupId>junit</groupId>
3843
<artifactId>junit</artifactId>
3944
<version>4.11</version>
4045
<scope>test</scope>
4146
</dependency>
47+
<dependency>
48+
<groupId>ch.qos.logback</groupId>
49+
<artifactId>logback-classic</artifactId>
50+
<version>1.1.2</version>
51+
<scope>test</scope>
52+
</dependency>
4253
</dependencies>
4354

4455
<scm>

‎src/main/java/de/taimos/gpsd4java/backend/AbstractResultParser.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
import java.util.Date;
2727
import java.util.List;
2828
import java.util.TimeZone;
29-
import java.util.logging.Level;
30-
import java.util.logging.Logger;
3129

3230
import org.json.JSONArray;
3331
import org.json.JSONException;
3432
import org.json.JSONObject;
33+
import org.slf4j.Logger;
34+
import org.slf4j.LoggerFactory;
3535

3636
import de.taimos.gpsd4java.types.IGPSObject;
3737
import de.taimos.gpsd4java.types.ParseException;
@@ -42,7 +42,7 @@
4242
*/
4343
public abstract class AbstractResultParser {
4444

45-
protected static final Logger LOG = Logger.getLogger(ResultParser.class.getName());
45+
protected static final Logger LOG = LoggerFactory.getLogger(ResultParser.class);
4646

4747
protected final DateFormat dateFormat; // Don't make this static!
4848

@@ -102,18 +102,18 @@ protected <T extends IGPSObject> List<T> parseObjectArray(final JSONArray array,
102102
protected double parseTimestamp(final JSONObject json, final String fieldName) {
103103
try {
104104
final String text = json.optString(fieldName, null);
105-
AbstractResultParser.LOG.log(Level.FINE, fieldName + ": {0}", text);
105+
AbstractResultParser.LOG.debug(fieldName + ": {}", text);
106106

107107
if (text != null) {
108108
final Date date = this.dateFormat.parse(text);
109-
if (AbstractResultParser.LOG.isLoggable(Level.FINE)) {
109+
if (AbstractResultParser.LOG.isDebugEnabled()) {
110110
final String ds = DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL).format(date);
111-
AbstractResultParser.LOG.log(Level.FINE, "Date: {0}", ds);
111+
AbstractResultParser.LOG.debug("Date: {}", ds);
112112
}
113113
return date.getTime() / 1000.0;
114114
}
115115
} catch (final Exception ex) {
116-
AbstractResultParser.LOG.log(Level.INFO, "Failed to parse time", ex);
116+
AbstractResultParser.LOG.info("Failed to parse time", ex);
117117
}
118118
return Double.NaN;
119119
}

‎src/main/java/de/taimos/gpsd4java/backend/GPSdEndpoint.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
import java.net.UnknownHostException;
3030
import java.util.ArrayList;
3131
import java.util.List;
32-
import java.util.logging.Level;
33-
import java.util.logging.Logger;
3432

3533
import org.json.JSONException;
3634
import org.json.JSONObject;
35+
import org.slf4j.Logger;
36+
import org.slf4j.LoggerFactory;
3737

3838
import de.taimos.gpsd4java.api.IObjectListener;
3939
import de.taimos.gpsd4java.types.ATTObject;
@@ -54,7 +54,7 @@
5454
*/
5555
public class GPSdEndpoint {
5656

57-
private static final Logger LOG = Logger.getLogger(GPSdEndpoint.class.getName());
57+
private static final Logger LOG = LoggerFactory.getLogger(GPSdEndpoint.class);
5858

5959
private final Socket socket;
6060

@@ -113,7 +113,7 @@ public void start() {
113113
try {
114114
Thread.sleep(500);
115115
} catch (final InterruptedException e) {
116-
GPSdEndpoint.LOG.log(Level.FINE, null, e);
116+
GPSdEndpoint.LOG.debug("Interrupted while sleeping", e);
117117
}
118118
}
119119

@@ -124,7 +124,7 @@ public void stop() {
124124
try {
125125
this.listenThread.halt();
126126
} catch (final Exception e) {
127-
GPSdEndpoint.LOG.log(Level.FINE, null, e);
127+
GPSdEndpoint.LOG.debug("Interrupted while waiting for listenThread to stop", e);
128128
}
129129
this.listenThread = null;
130130
}
@@ -250,7 +250,7 @@ private IGPSObject waitForResult() {
250250
try {
251251
this.asyncWaitMutex.wait(1000);
252252
} catch (final InterruptedException e) {
253-
GPSdEndpoint.LOG.log(Level.INFO, null, e);
253+
GPSdEndpoint.LOG.info("Interrupted while waiting for result", e);
254254
}
255255
if (this.asnycResult != null) {
256256
return this.asnycResult;

‎src/main/java/de/taimos/gpsd4java/backend/SocketThread.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@
2424
import java.io.IOException;
2525
import java.net.SocketException;
2626
import java.util.concurrent.atomic.AtomicBoolean;
27-
import java.util.logging.Level;
28-
import java.util.logging.Logger;
27+
28+
import org.slf4j.Logger;
29+
import org.slf4j.LoggerFactory;
2930

3031
/**
3132
* thread reading input from GPSd server
@@ -34,7 +35,7 @@
3435
*/
3536
public class SocketThread extends Thread {
3637

37-
private static final Logger LOG = Logger.getLogger(SocketThread.class.getName());
38+
private static final Logger LOG = LoggerFactory.getLogger(SocketThread.class);
3839

3940
private final BufferedReader reader;
4041

@@ -89,7 +90,7 @@ public void run() {
8990
break;
9091
} catch (final Exception e) {
9192
// TODO handle this better
92-
SocketThread.LOG.log(Level.WARNING, null, e);
93+
SocketThread.LOG.warn("Problem encountered while reading/parsing/handling line", e);
9394
}
9495
}
9596
}

‎src/test/java/de/taimos/gpsd4java/test/Tester.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
* #L%
2121
*/
2222

23-
import java.util.logging.Level;
24-
import java.util.logging.Logger;
23+
import org.slf4j.Logger;
24+
import org.slf4j.LoggerFactory;
2525

2626
import de.taimos.gpsd4java.api.ObjectListener;
2727
import de.taimos.gpsd4java.backend.GPSdEndpoint;
@@ -43,7 +43,7 @@
4343
*/
4444
public class Tester {
4545

46-
static final Logger log = Logger.getLogger(Tester.class.getName());
46+
static final Logger log = LoggerFactory.getLogger(Tester.class);
4747

4848

4949
private Tester() {
@@ -83,51 +83,51 @@ public static void main(final String[] args) {
8383

8484
@Override
8585
public void handleTPV(final TPVObject tpv) {
86-
Tester.log.log(Level.INFO, "TPV: {0}", tpv);
86+
Tester.log.info("TPV: {}", tpv);
8787
}
8888

8989
@Override
9090
public void handleSKY(final SKYObject sky) {
91-
Tester.log.log(Level.INFO, "SKY: {0}", sky);
91+
Tester.log.info("SKY: {}", sky);
9292
for (final SATObject sat : sky.getSatellites()) {
93-
Tester.log.log(Level.INFO, " SAT: {0}", sat);
93+
Tester.log.info(" SAT: {}", sat);
9494
}
9595
}
9696

9797
@Override
9898
public void handleSUBFRAME(final SUBFRAMEObject subframe) {
99-
Tester.log.log(Level.INFO, "SUBFRAME: {0}", subframe);
99+
Tester.log.info("SUBFRAME: {}", subframe);
100100
}
101101

102102
@Override
103103
public void handleATT(final ATTObject att) {
104-
Tester.log.log(Level.INFO, "ATT: {0}", att);
104+
Tester.log.info("ATT: {}", att);
105105
}
106106

107107
@Override
108108
public void handleDevice(final DeviceObject device) {
109-
Tester.log.log(Level.INFO, "Device: {0}", device);
109+
Tester.log.info("Device: {}", device);
110110
}
111111

112112
@Override
113113
public void handleDevices(final DevicesObject devices) {
114114
for (final DeviceObject d : devices.getDevices()) {
115-
Tester.log.log(Level.INFO, "Device: {0}", d);
115+
Tester.log.info("Device: {}", d);
116116
}
117117
}
118118
});
119119

120120
ep.start();
121121

122-
Tester.log.log(Level.INFO, "Version: {0}", ep.version());
122+
Tester.log.info("Version: {}", ep.version());
123123

124-
Tester.log.log(Level.INFO, "Watch: {0}", ep.watch(true, true));
124+
Tester.log.info("Watch: {}", ep.watch(true, true));
125125

126-
Tester.log.log(Level.INFO, "Poll: {0}", ep.poll());
126+
Tester.log.info("Poll: {}", ep.poll());
127127

128128
Thread.sleep(60000);
129129
} catch (final Exception e) {
130-
Tester.log.log(Level.SEVERE, null, e);
130+
Tester.log.error("Problem encountered", e);
131131
}
132132
}
133133
}

0 commit comments

Comments
 (0)