3131import javax .ws .rs .core .MediaType ;
3232import javax .ws .rs .core .Response ;
3333
34+ import org .eclipse .jdt .annotation .NonNullByDefault ;
35+ import org .eclipse .jdt .annotation .Nullable ;
3436import org .openhab .binding .tesla .internal .TeslaBindingConstants ;
3537import org .openhab .binding .tesla .internal .discovery .TeslaVehicleDiscoveryService ;
36- import org .openhab .binding .tesla .internal .protocol .Vehicle ;
37- import org .openhab .binding .tesla .internal .protocol .VehicleConfig ;
38- import org .openhab .binding .tesla .internal .protocol .VehicleData ;
39- import org .openhab .binding .tesla .internal .protocol .sso .TokenResponse ;
38+ import org .openhab .binding .tesla .internal .protocol .dto . Vehicle ;
39+ import org .openhab .binding .tesla .internal .protocol .dto . VehicleConfig ;
40+ import org .openhab .binding .tesla .internal .protocol .dto . VehicleData ;
41+ import org .openhab .binding .tesla .internal .protocol .dto . sso .TokenResponse ;
4042import org .openhab .core .io .net .http .HttpClientFactory ;
4143import org .openhab .core .thing .Bridge ;
4244import org .openhab .core .thing .ChannelUID ;
6365 * @author Nicolai Grødum - Adding token based auth
6466 * @author Kai Kreuzer - refactored to use separate vehicle handlers
6567 */
68+ @ NonNullByDefault
6669public class TeslaAccountHandler extends BaseBridgeHandler {
6770
6871 public static final int API_MAXIMUM_ERRORS_IN_INTERVAL = 3 ;
@@ -86,17 +89,20 @@ public class TeslaAccountHandler extends BaseBridgeHandler {
8689 private final ThingTypeMigrationService thingTypeMigrationService ;
8790
8891 // Threading and Job related variables
92+ @ Nullable
8993 protected ScheduledFuture <?> connectJob ;
9094
9195 protected long lastTimeStamp ;
9296 protected long apiIntervalTimestamp ;
9397 protected int apiIntervalErrors ;
9498 protected long eventIntervalTimestamp ;
9599 protected int eventIntervalErrors ;
96- protected ReentrantLock lock ;
100+
101+ protected ReentrantLock lock = new ReentrantLock ();
97102
98103 private final Gson gson = new Gson ();
99104
105+ @ Nullable
100106 private TokenResponse logonToken ;
101107 private final Set <VehicleListener > vehicleListeners = new HashSet <>();
102108
@@ -122,31 +128,17 @@ public void initialize() {
122128
123129 updateStatus (ThingStatus .UNKNOWN );
124130
125- lock = new ReentrantLock ();
126- lock .lock ();
127-
128- try {
129- if (connectJob == null || connectJob .isCancelled ()) {
130- connectJob = scheduler .scheduleWithFixedDelay (connectRunnable , 0 , CONNECT_RETRY_INTERVAL ,
131- TimeUnit .MILLISECONDS );
132- }
133- } finally {
134- lock .unlock ();
135- }
131+ connectJob = scheduler .scheduleWithFixedDelay (connectRunnable , 0 , CONNECT_RETRY_INTERVAL ,
132+ TimeUnit .MILLISECONDS );
136133 }
137134
138135 @ Override
139136 public void dispose () {
140137 logger .debug ("Disposing the Tesla account handler for {}" , getThing ().getUID ());
141-
142- lock .lock ();
143- try {
144- if (connectJob != null && !connectJob .isCancelled ()) {
145- connectJob .cancel (true );
146- connectJob = null ;
147- }
148- } finally {
149- lock .unlock ();
138+ ScheduledFuture <?> connectJob = this .connectJob ;
139+ if (connectJob != null && !connectJob .isCancelled ()) {
140+ connectJob .cancel (true );
141+ this .connectJob = null ;
150142 }
151143 }
152144
@@ -167,19 +159,25 @@ public void handleCommand(ChannelUID channelUID, Command command) {
167159 // we do not have any channels -> nothing to do here
168160 }
169161
170- public String getAuthHeader () {
171- if (logonToken != null ) {
172- return "Bearer " + logonToken .access_token ;
162+ public @ Nullable String getAuthHeader () {
163+ String accessToken = getAccessToken ();
164+ if (accessToken != null ) {
165+ return "Bearer " + accessToken ;
173166 } else {
174167 return null ;
175168 }
176169 }
177170
178- public String getAccessToken () {
179- return logonToken .access_token ;
171+ public @ Nullable String getAccessToken () {
172+ TokenResponse logonToken = this .logonToken ;
173+ if (logonToken != null ) {
174+ return logonToken .accessToken ;
175+ } else {
176+ return null ;
177+ }
180178 }
181179
182- protected boolean checkResponse (Response response , boolean immediatelyFail ) {
180+ protected boolean checkResponse (@ Nullable Response response , boolean immediatelyFail ) {
183181 if (response != null && response .getStatus () == 200 ) {
184182 return true ;
185183 } else if (response != null && response .getStatus () == 401 ) {
@@ -221,17 +219,23 @@ protected Vehicle[] queryVehicles() {
221219
222220 if (!checkResponse (response , true )) {
223221 logger .debug ("An error occurred while querying the vehicle" );
224- return null ;
222+ return new Vehicle [ 0 ] ;
225223 }
226224
227225 JsonObject jsonObject = JsonParser .parseString (response .readEntity (String .class )).getAsJsonObject ();
228226 Vehicle [] vehicleArray = gson .fromJson (jsonObject .getAsJsonArray ("response" ), Vehicle [].class );
229-
227+ if (vehicleArray == null ) {
228+ logger .debug ("Response resulted in unexpected null array" );
229+ return new Vehicle [0 ];
230+ }
230231 for (Vehicle vehicle : vehicleArray ) {
231232 String responseString = invokeAndParse (vehicle .id , null , null , dataRequestTarget , 0 );
232233 VehicleConfig vehicleConfig = null ;
233234 if (responseString != null && !responseString .isBlank ()) {
234- vehicleConfig = gson .fromJson (responseString , VehicleData .class ).vehicle_config ;
235+ VehicleData vehicleData = gson .fromJson (responseString , VehicleData .class );
236+ if (vehicleData != null ) {
237+ vehicleConfig = vehicleData .vehicleConfig ;
238+ }
235239 }
236240 for (VehicleListener listener : vehicleListeners ) {
237241 listener .vehicleFound (vehicle , vehicleConfig );
@@ -251,7 +255,7 @@ protected Vehicle[] queryVehicles() {
251255 logger .debug ("Querying the vehicle: VIN {}" , vehicle .vin );
252256 String vehicleJSON = gson .toJson (vehicle );
253257 vehicleHandler .parseAndUpdate ("queryVehicle" , null , vehicleJSON );
254- logger .trace ("Vehicle is id {}/vehicle_id {}/tokens {}" , vehicle .id , vehicle .vehicle_id ,
258+ logger .trace ("Vehicle is id {}/vehicle_id {}/tokens {}" , vehicle .id , vehicle .vehicleId ,
255259 vehicle .tokens );
256260 }
257261 }
@@ -274,8 +278,8 @@ ThingStatusInfo authenticate() {
274278 logger .debug ("Current authentication time {}" , DATE_FORMATTER .format (Instant .now ()));
275279
276280 if (token != null ) {
277- Instant tokenCreationInstant = Instant .ofEpochMilli (token .created_at * 1000 );
278- Instant tokenExpiresInstant = Instant .ofEpochMilli ((token .created_at + token .expires_in ) * 1000 );
281+ Instant tokenCreationInstant = Instant .ofEpochMilli (token .createdAt * 1000 );
282+ Instant tokenExpiresInstant = Instant .ofEpochMilli ((token .createdAt + token .expiresIn ) * 1000 );
279283 logger .debug ("Found a request token from {}" , DATE_FORMATTER .format (tokenCreationInstant ));
280284 logger .debug ("Access token expiration time {}" , DATE_FORMATTER .format (tokenExpiresInstant ));
281285
@@ -306,8 +310,8 @@ ThingStatusInfo authenticate() {
306310 return new ThingStatusInfo (ThingStatus .ONLINE , ThingStatusDetail .NONE , null );
307311 }
308312
309- protected String invokeAndParse (String vehicleId , String command , String payLoad , WebTarget target ,
310- int noOfretries ) {
313+ protected @ Nullable String invokeAndParse (@ Nullable String vehicleId , @ Nullable String command ,
314+ @ Nullable String payLoad , WebTarget target , int noOfretries ) {
311315 logger .debug ("Invoking: {}" , command );
312316
313317 if (vehicleId != null ) {
@@ -316,26 +320,29 @@ protected String invokeAndParse(String vehicleId, String command, String payLoad
316320 if (payLoad != null ) {
317321 if (command != null ) {
318322 response = target .resolveTemplate ("cmd" , command ).resolveTemplate ("vid" , vehicleId ).request ()
319- .header ("Authorization" , "Bearer " + logonToken . access_token )
323+ .header ("Authorization" , getAuthHeader () )
320324 .post (Entity .entity (payLoad , MediaType .APPLICATION_JSON_TYPE ));
321325 } else {
322326 response = target .resolveTemplate ("vid" , vehicleId ).request ()
323- .header ("Authorization" , "Bearer " + logonToken . access_token )
327+ .header ("Authorization" , getAuthHeader () )
324328 .post (Entity .entity (payLoad , MediaType .APPLICATION_JSON_TYPE ));
325329 }
326330 } else if (command != null ) {
327331 response = target .resolveTemplate ("cmd" , command ).resolveTemplate ("vid" , vehicleId )
328- .request (MediaType .APPLICATION_JSON_TYPE )
329- .header ("Authorization" , "Bearer " + logonToken .access_token ).get ();
332+ .request (MediaType .APPLICATION_JSON_TYPE ).header ("Authorization" , getAuthHeader ()).get ();
330333 } else {
331334 response = target .resolveTemplate ("vid" , vehicleId ).request (MediaType .APPLICATION_JSON_TYPE )
332- .header ("Authorization" , "Bearer " + logonToken . access_token ).get ();
335+ .header ("Authorization" , getAuthHeader () ).get ();
333336 }
334337
335338 if (!checkResponse (response , false )) {
339+ if (response == null ) {
340+ logger .debug (
341+ "An error occurred while communicating with the vehicle during request, the response was null" );
342+ return null ;
343+ }
336344 logger .debug ("An error occurred while communicating with the vehicle during request {}: {}: {}" ,
337- command , (response != null ) ? response .getStatus () : "" ,
338- (response != null ) ? response .getStatusInfo ().getReasonPhrase () : "No Response" );
345+ command , response .getStatus (), response .getStatusInfo ().getReasonPhrase ());
339346 if (response .getStatus () == 408 && noOfretries > 0 ) {
340347 try {
341348 // we give the vehicle a moment to wake up and try the request again
@@ -377,7 +384,7 @@ protected String invokeAndParse(String vehicleId, String command, String payLoad
377384 if (authenticationResult .getStatus () == ThingStatus .ONLINE ) {
378385 // get a list of vehicles
379386 Response response = productsTarget .request (MediaType .APPLICATION_JSON_TYPE )
380- .header ("Authorization" , "Bearer " + logonToken . access_token ).get ();
387+ .header ("Authorization" , getAuthHeader () ).get ();
381388
382389 if (response != null && response .getStatus () == 200 && response .hasEntity ()) {
383390 updateStatus (ThingStatus .ONLINE );
@@ -436,11 +443,12 @@ protected class Request implements Runnable {
436443
437444 private TeslaVehicleHandler handler ;
438445 private String request ;
446+ @ Nullable
439447 private String payLoad ;
440448 private WebTarget target ;
441449 private boolean allowWakeUpForCommands ;
442450
443- public Request (TeslaVehicleHandler handler , String request , String payLoad , WebTarget target ,
451+ public Request (TeslaVehicleHandler handler , String request , @ Nullable String payLoad , WebTarget target ,
444452 boolean allowWakeUpForCommands ) {
445453 this .handler = handler ;
446454 this .request = request ;
@@ -467,8 +475,8 @@ public void run() {
467475 }
468476 }
469477
470- public Request newRequest (TeslaVehicleHandler teslaVehicleHandler , String command , String payLoad , WebTarget target ,
471- boolean allowWakeUpForCommands ) {
478+ public Request newRequest (TeslaVehicleHandler teslaVehicleHandler , String command , @ Nullable String payLoad ,
479+ WebTarget target , boolean allowWakeUpForCommands ) {
472480 return new Request (teslaVehicleHandler , command , payLoad , target , allowWakeUpForCommands );
473481 }
474482
0 commit comments