From fb3de14d8336494248b5e456072479777e227ef7 Mon Sep 17 00:00:00 2001 From: Sasha Didukh Date: Thu, 6 Oct 2016 11:57:54 +0300 Subject: [PATCH] KAA-1279: Fixed some log appenders and verifiers errors --- .../appender/CassandraLogAppender.java | 28 +++++++++++-------- .../appender/CassandraLogEventDao.java | 24 ++++++++++------ .../appender/CassandraLogEventDto.java | 3 ++ .../kafka/appender/KafkaLogAppender.java | 25 +++++++++-------- .../kafka/appender/KafkaLogEventDao.java | 27 ++++++++++-------- .../kafka/appender/KafkaLogEventDto.java | 3 ++ .../appender/OracleNoSqlLogAppender.java | 28 +++++++++---------- .../verifier/FacebookUserVerifier.java | 28 +++++++++---------- .../gplus/verifier/GplusUserVerifier.java | 20 ++++++------- .../twitter/verifier/OAuthHeaderBuilder.java | 3 +- .../twitter/verifier/TwitterUserVerifier.java | 24 ++++++++-------- 11 files changed, 119 insertions(+), 94 deletions(-) diff --git a/server/appenders/cassandra-appender/src/main/java/org/kaaproject/kaa/server/appenders/cassandra/appender/CassandraLogAppender.java b/server/appenders/cassandra-appender/src/main/java/org/kaaproject/kaa/server/appenders/cassandra/appender/CassandraLogAppender.java index 352d417392..ae126a20a4 100644 --- a/server/appenders/cassandra-appender/src/main/java/org/kaaproject/kaa/server/appenders/cassandra/appender/CassandraLogAppender.java +++ b/server/appenders/cassandra-appender/src/main/java/org/kaaproject/kaa/server/appenders/cassandra/appender/CassandraLogAppender.java @@ -78,7 +78,9 @@ protected Map> initialValue() { }; - + /** + * Instantiates a new CassandraLogAppender. + */ public CassandraLogAppender() { super(CassandraConfig.class); scheduler.scheduleWithFixedDelay(new Runnable() { @@ -137,13 +139,15 @@ public void run() { listener.onSuccess(); cassandraSuccessLogCount.getAndAdd(logCount); break; + default: + break; } LOG.debug("[{}] appended {} logs to cassandra collection", tableName, logEventPack.getEvents().size()); } else { listener.onInternalError(); } - } catch (Exception e) { - LOG.warn("Got exception. Can't process log events", e); + } catch (Exception ex) { + LOG.warn("Got exception. Can't process log events", ex); listener.onInternalError(); } } @@ -167,8 +171,8 @@ protected void initFromConfiguration(LogAppenderDto appender, CassandraConfig co executor = Executors.newFixedThreadPool(executorPoolSize); callbackExecutor = Executors.newFixedThreadPool(callbackPoolSize); LOG.info("Cassandra log appender initialized"); - } catch (Exception e) { - LOG.error("Failed to init cassandra log appender: ", e); + } catch (Exception ex) { + LOG.error("Failed to init cassandra log appender: ", ex); } } @@ -229,9 +233,9 @@ protected List generateCassandraLogEvent(LogEventPack logE GenericRecord decodedLog = eventConverter.decodeBinary(logEvent.getLogData()); events.add(new CassandraLogEventDto(header, decodedLog)); } - } catch (IOException e) { - LOG.error("Unexpected IOException while decoding LogEvents", e); - throw e; + } catch (IOException ex) { + LOG.error("Unexpected IOException while decoding LogEvents", ex); + throw ex; } return events; } @@ -286,12 +290,12 @@ public void onSuccess(ResultSet result) { } @Override - public void onFailure(Throwable t) { + public void onFailure(Throwable throwable) { cassandraFailureLogCount.getAndAdd(size); - LOG.warn("Failed to store record", t); - if (t instanceof UnsupportedFeatureException) { + LOG.warn("Failed to store record", throwable); + if (throwable instanceof UnsupportedFeatureException) { callback.onRemoteError(); - } else if (t instanceof IOException) { + } else if (throwable instanceof IOException) { callback.onConnectionError(); } else { callback.onInternalError(); diff --git a/server/appenders/cassandra-appender/src/main/java/org/kaaproject/kaa/server/appenders/cassandra/appender/CassandraLogEventDao.java b/server/appenders/cassandra-appender/src/main/java/org/kaaproject/kaa/server/appenders/cassandra/appender/CassandraLogEventDao.java index a6d62a1e29..16ff907a68 100644 --- a/server/appenders/cassandra-appender/src/main/java/org/kaaproject/kaa/server/appenders/cassandra/appender/CassandraLogEventDao.java +++ b/server/appenders/cassandra-appender/src/main/java/org/kaaproject/kaa/server/appenders/cassandra/appender/CassandraLogEventDao.java @@ -87,6 +87,9 @@ public class CassandraLogEventDao implements LogEventDao { private String keyspaceName; private CassandraConfig configuration; + /** + * Instantiates a new CassandraLogEventDao. + */ public CassandraLogEventDao(CassandraConfig configuration) throws UnknownHostException { if (configuration == null) { throw new IllegalArgumentException("Configuration shouldn't be null"); @@ -249,8 +252,10 @@ public List save(List logEventDtoLis @Override public ListenableFuture saveAsync(List logEventDtoList, String tableName, - GenericAvroConverter eventConverter, GenericAvroConverter headerConverter, - GenericAvroConverter clientProfileConverter, GenericAvroConverter serverProfileConverter, + GenericAvroConverter eventConverter, + GenericAvroConverter headerConverter, + GenericAvroConverter clientProfileConverter, + GenericAvroConverter serverProfileConverter, String clientProfileJson, String serverProfileJson) throws IOException { LOG.debug("Execute async bath request for cassandra table {}", tableName); @@ -388,6 +393,7 @@ private Insert[] prepareQuery(List logEventDtoList, String } else { throw new RuntimeException(ABSENT_SERVER_PROFILE_ERROR); } + break; case SERVER_BINARY: if (serverProfileBinary != null) { insert.value(element.getColumnName(), clientProfileBinary); @@ -402,6 +408,8 @@ private Insert[] prepareQuery(List logEventDtoList, String reuseTsValue = formatTs(reuseTsValue, element); insert.value(element.getColumnName(), reuseTsValue); break; + default: + break; } } @@ -421,20 +429,20 @@ private String formatTs(String tsValue, ColumnMappingElement element) { if (pattern == null || pattern.isEmpty()) { tsValue = ts + ""; } else { - ThreadLocal formatterTL = dateFormatMap.get(pattern); - if (formatterTL == null) { - formatterTL = new ThreadLocal() { + ThreadLocal formatterTl = dateFormatMap.get(pattern); + if (formatterTl == null) { + formatterTl = new ThreadLocal() { @Override protected SimpleDateFormat initialValue() { return new SimpleDateFormat(pattern); } }; - dateFormatMap.putIfAbsent(pattern, formatterTL); + dateFormatMap.putIfAbsent(pattern, formatterTl); } - SimpleDateFormat formatter = formatterTL.get(); + SimpleDateFormat formatter = formatterTl.get(); if (formatter == null) { formatter = new SimpleDateFormat(pattern); - formatterTL.set(formatter); + formatterTl.set(formatter); } tsValue = formatter.format(new Date(ts)); } diff --git a/server/appenders/cassandra-appender/src/main/java/org/kaaproject/kaa/server/appenders/cassandra/appender/CassandraLogEventDto.java b/server/appenders/cassandra-appender/src/main/java/org/kaaproject/kaa/server/appenders/cassandra/appender/CassandraLogEventDto.java index 4d569dda72..f98d782a42 100644 --- a/server/appenders/cassandra-appender/src/main/java/org/kaaproject/kaa/server/appenders/cassandra/appender/CassandraLogEventDto.java +++ b/server/appenders/cassandra-appender/src/main/java/org/kaaproject/kaa/server/appenders/cassandra/appender/CassandraLogEventDto.java @@ -24,6 +24,9 @@ public class CassandraLogEventDto { private final RecordHeader header; private final GenericRecord event; + /** + * Instantiates a new CassandraLogEventDto. + */ public CassandraLogEventDto(RecordHeader header, GenericRecord event) { super(); this.header = header; diff --git a/server/appenders/kafka-appender/src/main/java/org/kaaproject/kaa/server/appenders/kafka/appender/KafkaLogAppender.java b/server/appenders/kafka-appender/src/main/java/org/kaaproject/kaa/server/appenders/kafka/appender/KafkaLogAppender.java index 49be12fdeb..05ebe4bf4d 100644 --- a/server/appenders/kafka-appender/src/main/java/org/kaaproject/kaa/server/appenders/kafka/appender/KafkaLogAppender.java +++ b/server/appenders/kafka-appender/src/main/java/org/kaaproject/kaa/server/appenders/kafka/appender/KafkaLogAppender.java @@ -66,6 +66,9 @@ protected Map> initialValue() { }; + /** + * Instantiates a new KafkaLogAppender. + */ public KafkaLogAppender() { super(KafkaConfig.class); scheduler.scheduleWithFixedDelay(new Runnable() { @@ -123,8 +126,8 @@ public void run() { } else { listener.onInternalError(); } - } catch (Exception e) { - LOG.warn("Got exception. Can't process log events", e); + } catch (Exception ex) { + LOG.warn("Got exception. Can't process log events", ex); listener.onInternalError(); } } @@ -145,8 +148,8 @@ protected void initFromConfiguration(LogAppenderDto appender, KafkaConfig config executor = Executors.newFixedThreadPool(executorPoolSize); topicName = configuration.getTopic(); LOG.info("Kafka log appender initialized"); - } catch (Exception e) { - LOG.error("Failed to init kafka log appender: ", e); + } catch (Exception ex) { + LOG.error("Failed to init kafka log appender: ", ex); } } @@ -165,9 +168,9 @@ protected List generateKafkaLogEvent(LogEventPack logEventPack GenericRecord decodedLog = eventConverter.decodeBinary(logEvent.getLogData()); events.add(new KafkaLogEventDto(header, decodedLog)); } - } catch (IOException e) { - LOG.error("Unexpected IOException while decoding LogEvents", e); - throw e; + } catch (IOException ex) { + LOG.error("Unexpected IOException while decoding LogEvents", ex); + throw ex; } return events; } @@ -208,14 +211,14 @@ private LogAppenderCallback(LogDeliveryCallback callback, AtomicInteger kafkaSuc } @Override - public void onCompletion(RecordMetadata record, Exception e) { - if (e == null) { + public void onCompletion(RecordMetadata record, Exception ex) { + if (ex == null) { kafkaSuccessLogCount.getAndAdd(size); callback.onSuccess(); } else { kafkaFailureLogCount.getAndAdd(size); - LOG.warn("Failed to store record", e); - if (e instanceof IOException) { + LOG.warn("Failed to store record", ex); + if (ex instanceof IOException) { callback.onConnectionError(); } else { callback.onInternalError(); diff --git a/server/appenders/kafka-appender/src/main/java/org/kaaproject/kaa/server/appenders/kafka/appender/KafkaLogEventDao.java b/server/appenders/kafka-appender/src/main/java/org/kaaproject/kaa/server/appenders/kafka/appender/KafkaLogEventDao.java index 5de7eabd55..bbf8216056 100644 --- a/server/appenders/kafka-appender/src/main/java/org/kaaproject/kaa/server/appenders/kafka/appender/KafkaLogEventDao.java +++ b/server/appenders/kafka-appender/src/main/java/org/kaaproject/kaa/server/appenders/kafka/appender/KafkaLogEventDao.java @@ -43,13 +43,16 @@ public class KafkaLogEventDao implements LogEventDao { private static final String KEY_SERIALIZER = "org.apache.kafka.common.serialization.StringSerializer"; private static final String VALUE_SERIALIZER = "org.apache.kafka.common.serialization.StringSerializer"; - private final Random RANDOM = new Random(); + private static final Random RANDOM = new Random(); private KafkaProducer producer; private KafkaConfig configuration; private String topicName; private int partitionCount; + /** + * Instantiates a new KafkaLogEventDao. + */ public KafkaLogEventDao(KafkaConfig configuration) { if (configuration == null) { throw new IllegalArgumentException("Configuration shouldn't be null"); @@ -58,13 +61,13 @@ public KafkaLogEventDao(KafkaConfig configuration) { this.configuration = configuration; this.topicName = configuration.getTopic(); this.partitionCount = configuration.getPartitionCount(); - Properties kafkaProperties = new Properties(); StringBuilder serverList = new StringBuilder(); for (KafkaServer server : configuration.getKafkaServers()) { serverList.append(server.getHost() + ":" + server.getPort() + ","); } serverList = serverList.deleteCharAt(serverList.length() - 1); LOG.info("Init kafka cluster with property {}={}", ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, serverList); + Properties kafkaProperties = new Properties(); kafkaProperties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, serverList.toString()); LOG.info("Init kafka cluster with property {}={}", ProducerConfig.ACKS_CONFIG, configuration.getKafkaAcknowledgement()); @@ -97,11 +100,11 @@ public List> save(List logEventDtoList, for (KafkaLogEventDto dto : logEventDtoList) { ProducerRecord recordToWrite; if (configuration.getUseDefaultPartitioner()) { - recordToWrite = new ProducerRecord(topicName, getKey(dto), formKafkaJSON(dto, + recordToWrite = new ProducerRecord(topicName, getKey(dto), formKafkaJson(dto, eventConverter, headerConverter)); } else { - recordToWrite = new ProducerRecord(topicName, calculatePartitionID(dto), getKey(dto), - formKafkaJSON(dto, eventConverter, headerConverter)); + recordToWrite = new ProducerRecord(topicName, calculatePartitionId(dto), getKey(dto), + formKafkaJson(dto, eventConverter, headerConverter)); } results.add(producer.send(recordToWrite, callback)); } @@ -116,7 +119,7 @@ public void close() { } } - private int calculatePartitionID(KafkaLogEventDto eventDto) { + private int calculatePartitionId(KafkaLogEventDto eventDto) { return eventDto.hashCode() % partitionCount; } @@ -135,15 +138,15 @@ private String parseAcknowledgement(String record) { } } - private String formKafkaJSON(KafkaLogEventDto dto, GenericAvroConverter eventConverter, + private String formKafkaJson(KafkaLogEventDto dto, GenericAvroConverter eventConverter, GenericAvroConverter headerConverter) throws IOException { - String eventJSON = eventConverter.encodeToJson(dto.getEvent()); - String headerJSON = headerConverter.encodeToJson(dto.getHeader()); + String eventJson = eventConverter.encodeToJson(dto.getEvent()); + String headerJson = headerConverter.encodeToJson(dto.getHeader()); StringBuilder result = new StringBuilder("{"); - if (headerJSON != null && !headerJSON.isEmpty()) { - result.append("\"header\":" + headerJSON + ","); + if (headerJson != null && !headerJson.isEmpty()) { + result.append("\"header\":" + headerJson + ","); } - result.append("\"event\":" + eventJSON + "}"); + result.append("\"event\":" + eventJson + "}"); return result.toString(); } diff --git a/server/appenders/kafka-appender/src/main/java/org/kaaproject/kaa/server/appenders/kafka/appender/KafkaLogEventDto.java b/server/appenders/kafka-appender/src/main/java/org/kaaproject/kaa/server/appenders/kafka/appender/KafkaLogEventDto.java index 23cb366f35..26b19b2e50 100644 --- a/server/appenders/kafka-appender/src/main/java/org/kaaproject/kaa/server/appenders/kafka/appender/KafkaLogEventDto.java +++ b/server/appenders/kafka-appender/src/main/java/org/kaaproject/kaa/server/appenders/kafka/appender/KafkaLogEventDto.java @@ -28,6 +28,9 @@ public class KafkaLogEventDto implements Serializable { private final RecordHeader header; private final GenericRecord event; + /** + * Instantiates a new KafkaLogEventDto. + */ public KafkaLogEventDto(RecordHeader header, GenericRecord event) { super(); this.header = header; diff --git a/server/appenders/oracle-nosql-appender/src/main/java/org/kaaproject/kaa/server/appenders/oraclenosql/appender/OracleNoSqlLogAppender.java b/server/appenders/oracle-nosql-appender/src/main/java/org/kaaproject/kaa/server/appenders/oraclenosql/appender/OracleNoSqlLogAppender.java index bf9181bd73..127ebb0270 100644 --- a/server/appenders/oracle-nosql-appender/src/main/java/org/kaaproject/kaa/server/appenders/oraclenosql/appender/OracleNoSqlLogAppender.java +++ b/server/appenders/oracle-nosql-appender/src/main/java/org/kaaproject/kaa/server/appenders/oraclenosql/appender/OracleNoSqlLogAppender.java @@ -83,7 +83,7 @@ public OracleNoSqlLogAppender() { private static String getHostName() { try { return InetAddress.getLocalHost().getHostName(); - } catch (UnknownHostException e) { + } catch (UnknownHostException ex) { return ""; } } @@ -96,11 +96,11 @@ public void doAppend(LogEventPack logEventPack, RecordHeader header, LogDelivery try { doAppendGenericAvro(logEventPack, header); listener.onSuccess(); - } catch (FaultException e) { - LOG.error("Unable to append logs due to remote exception!", e); + } catch (FaultException ex) { + LOG.error("Unable to append logs due to remote exception!", ex); listener.onRemoteError(); - } catch (Exception e) { - LOG.error("Unable to append logs!", e); + } catch (Exception ex) { + LOG.error("Unable to append logs!", ex); listener.onInternalError(); } } else { @@ -117,8 +117,8 @@ public void doAppend(LogEventPack logEventPack, RecordHeader header, LogDelivery protected void initFromConfiguration(LogAppenderDto appender, OracleNoSqlConfig configuration) { try { kvStore = initKvStore(configuration); - } catch (Exception e) { - LOG.error("Failed to init kvStore: ", e); + } catch (Exception ex) { + LOG.error("Failed to init kvStore: ", ex); } } @@ -141,9 +141,9 @@ private void doAppendGenericAvro(LogEventPack logEventPack, RecordHeader header) binaryDecoder = DecoderFactory.get().binaryDecoder(event.getLogData(), binaryDecoder); try { recordData = datumReader.read(recordData, binaryDecoder); - } catch (IOException e) { - LOG.error("[{}] Unable to read log event!", e); - throw e; + } catch (IOException ex) { + LOG.error("[{}] Unable to read log event!", ex); + throw ex; } wrapperRecord.put(RecordWrapperSchemaGenerator.RECORD_HEADER_FIELD, header); wrapperRecord.put(RecordWrapperSchemaGenerator.RECORD_DATA_FIELD, recordData); @@ -165,9 +165,9 @@ private void initialize(LogEventPack logEventPack) throws Exception { Schema userSchema = new Schema.Parser().parse(logEventPack.getLogSchema().getSchema()); datumReader = new GenericDatumReader(userSchema); wrapperRecord = new GenericData.Record(recordWrapperSchema); - } catch (Exception e) { + } catch (Exception ex) { LOG.error("[{}] Unable to initialize parameters for log event pack.", getName()); - throw e; + throw ex; } } @@ -231,8 +231,6 @@ private KVStore initKvStore(OracleNoSqlConfig configuration) throws Exception { helperHostPorts[i] = node.getHost() + ":" + node.getPort(); } - KVStoreConfig config = new KVStoreConfig(configuration.getStoreName(), helperHostPorts); - Properties securityProperties = new Properties(); if (configuration.getUsername() != null) { username = configuration.getUsername(); @@ -270,6 +268,8 @@ private KVStore initKvStore(OracleNoSqlConfig configuration) throws Exception { if (configuration.getSslTrustStoreType() != null) { securityProperties.put(KVSecurityConstants.SSL_TRUSTSTORE_TYPE_PROPERTY, configuration.getSslTrustStoreType()); } + + KVStoreConfig config = new KVStoreConfig(configuration.getStoreName(), helperHostPorts); config.setSecurityProperties(securityProperties); KVStore kvStore = KVStoreFactory.getStore(config); diff --git a/server/verifiers/facebook-verifier/src/main/java/org/kaaproject/kaa/server/verifiers/facebook/verifier/FacebookUserVerifier.java b/server/verifiers/facebook-verifier/src/main/java/org/kaaproject/kaa/server/verifiers/facebook/verifier/FacebookUserVerifier.java index 8bca312735..d099a4fbe8 100644 --- a/server/verifiers/facebook-verifier/src/main/java/org/kaaproject/kaa/server/verifiers/facebook/verifier/FacebookUserVerifier.java +++ b/server/verifiers/facebook-verifier/src/main/java/org/kaaproject/kaa/server/verifiers/facebook/verifier/FacebookUserVerifier.java @@ -126,8 +126,8 @@ private void handleBadResponse(CloseableHttpResponse connection, UserVerifierCal if (errorMap != null) { LOG.trace("Unable to verify token: {}, errcode: [{}]", errorMap.get(MESSAGE), errorMap.get(ERRCODE)); - callback.onVerificationFailure("Unable to verify token: " + errorMap.get(MESSAGE) + - ", errorcode: " + errorMap.get(ERRCODE)); + callback.onVerificationFailure("Unable to verify token: " + errorMap.get(MESSAGE) + + ", errorcode: " + errorMap.get(ERRCODE)); } else { LOG.trace("Unable to verify token. HTTP response 400"); callback.onVerificationFailure("Unable to verify token. HTTP response 400"); @@ -147,8 +147,8 @@ protected CloseableHttpResponse establishConnection(String userAccessToken, Stri try { String facebookUriQuery = "input_token=" + userAccessToken + "&access_token=" + accessToken; uri = new URI(FACEBOOK_URI_SCHEME, FACEBOOK_URI_AUTHORITY, FACEBOOK_URI_PATH, facebookUriQuery, null); - } catch (URISyntaxException e) { - LOG.debug("Malformed URI", e); + } catch (URISyntaxException ex) { + LOG.debug("Malformed URI", ex); } return httpClient.execute(new HttpGet(uri)); } @@ -170,8 +170,8 @@ public void stop() { tokenVerifiersPool.shutdown(); try { httpClient.close(); - } catch (IOException e) { - LOG.debug("Unable to close HttpClient ", e); + } catch (IOException ex) { + LOG.debug("Unable to close HttpClient ", ex); } LOG.info("facebook user verifier stopped"); } @@ -216,18 +216,18 @@ public void run() { callback.onVerificationFailure("Server response code:" + responseCode + ", no data can be retrieved"); } - } catch (IOException e) { - LOG.debug("Connection error", e); - callback.onConnectionError(e.getMessage()); - } catch (Exception e) { - LOG.debug("Unexpected error", e); - callback.onInternalError(e.getMessage()); + } catch (IOException ex) { + LOG.debug("Connection error", ex); + callback.onConnectionError(ex.getMessage()); + } catch (Exception ex) { + LOG.debug("Unexpected error", ex); + callback.onInternalError(ex.getMessage()); } finally { if (closeableHttpResponse != null) { try { closeableHttpResponse.close(); - } catch (IOException e) { - LOG.debug("Connection error: can't close CloseableHttpResponse ", e); + } catch (IOException ex) { + LOG.debug("Connection error: can't close CloseableHttpResponse ", ex); } } } diff --git a/server/verifiers/gplus-verifier/src/main/java/org/kaaproject/kaa/server/verifiers/gplus/verifier/GplusUserVerifier.java b/server/verifiers/gplus-verifier/src/main/java/org/kaaproject/kaa/server/verifiers/gplus/verifier/GplusUserVerifier.java index f37e5a5f77..2ea1224669 100644 --- a/server/verifiers/gplus-verifier/src/main/java/org/kaaproject/kaa/server/verifiers/gplus/verifier/GplusUserVerifier.java +++ b/server/verifiers/gplus-verifier/src/main/java/org/kaaproject/kaa/server/verifiers/gplus/verifier/GplusUserVerifier.java @@ -62,8 +62,8 @@ public void checkAccessToken(String userExternalId, String accessToken, UserVeri try { URI uri = new URI(GOOGLE_OAUTH + accessToken); threadPool.submit(new RunnableVerifier(uri, callback, userExternalId)); - } catch (URISyntaxException e) { - LOG.warn("Internal error", e); + } catch (URISyntaxException ex) { + LOG.warn("Internal error", ex); callback.onInternalError(); } } @@ -100,8 +100,8 @@ public void stop() { if (null != httpClient) { try { httpClient.close(); - } catch (IOException e) { - LOG.warn("Internal error: ", e); + } catch (IOException ex) { + LOG.warn("Internal error: ", ex); } } LOG.info("user verifier stopped"); @@ -151,18 +151,18 @@ public void run() { LOG.trace("Server returned the following error code: {}", responseCode); callback.onInternalError(); } - } catch (IOException e) { - LOG.warn("Internal error: ", e); + } catch (IOException ex) { + LOG.warn("Internal error: ", ex); callback.onInternalError(); - } catch (Exception e) { - LOG.warn("Internal error: ", e); + } catch (Exception ex) { + LOG.warn("Internal error: ", ex); callback.onInternalError(); } finally { if (null != closeableHttpResponse) { try { closeableHttpResponse.close(); - } catch (IOException e) { - LOG.warn("Internal error: ", e); + } catch (IOException ex) { + LOG.warn("Internal error: ", ex); } } } diff --git a/server/verifiers/twitter-verifier/src/main/java/org/kaaproject/kaa/server/verifiers/twitter/verifier/OAuthHeaderBuilder.java b/server/verifiers/twitter-verifier/src/main/java/org/kaaproject/kaa/server/verifiers/twitter/verifier/OAuthHeaderBuilder.java index 5bb8c7bd13..53bb5e2a78 100644 --- a/server/verifiers/twitter-verifier/src/main/java/org/kaaproject/kaa/server/verifiers/twitter/verifier/OAuthHeaderBuilder.java +++ b/server/verifiers/twitter-verifier/src/main/java/org/kaaproject/kaa/server/verifiers/twitter/verifier/OAuthHeaderBuilder.java @@ -26,7 +26,7 @@ import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; - +//CHECKSTYLE:OFF public class OAuthHeaderBuilder { private final String SIGNATURE_METHOD; private final String REQUEST_METHOD; @@ -62,6 +62,7 @@ public String generateHeader(String accessToken, String accessTokenSecret) throw return header; } + //CHECKSTYLE:ON private String generateSignatureBase(String consumerKey, String accessToken, String timestamp, String nonce) { StringBuilder parameters = new StringBuilder(); diff --git a/server/verifiers/twitter-verifier/src/main/java/org/kaaproject/kaa/server/verifiers/twitter/verifier/TwitterUserVerifier.java b/server/verifiers/twitter-verifier/src/main/java/org/kaaproject/kaa/server/verifiers/twitter/verifier/TwitterUserVerifier.java index 05924326f5..96ffec7f1c 100644 --- a/server/verifiers/twitter-verifier/src/main/java/org/kaaproject/kaa/server/verifiers/twitter/verifier/TwitterUserVerifier.java +++ b/server/verifiers/twitter-verifier/src/main/java/org/kaaproject/kaa/server/verifiers/twitter/verifier/TwitterUserVerifier.java @@ -105,8 +105,8 @@ private void handleBadResponse(CloseableHttpResponse connection, UserVerifierCal callback.onTokenInvalid(); } else { LOG.trace("Unable to verify token. Error code: [{}], message[{}]", error.get(CODE), error.get(MESSAGE)); - callback.onVerificationFailure("Unable to verify token. Error code: " + error.get(CODE) + - ", message: " + error.get(MESSAGE)); + callback.onVerificationFailure("Unable to verify token. Error code: " + error.get(CODE) + + ", message: " + error.get(MESSAGE)); } } @@ -150,8 +150,8 @@ public void stop() { tokenVerifiersPool.shutdown(); try { httpClient.close(); - } catch (IOException e) { - LOG.debug("Unable to close HttpClient ", e); + } catch (IOException ex) { + LOG.debug("Unable to close HttpClient ", ex); } LOG.info("twitter user verifier stopped"); } @@ -190,18 +190,18 @@ public void run() { callback.onVerificationFailure("Server response code:" + responseCode + ", no data can be retrieved"); } - } catch (IOException e) { - LOG.debug("Connection error", e); - callback.onConnectionError(e.getMessage()); - } catch (Exception e) { - LOG.debug("Unexpected error", e); - callback.onInternalError(e.getMessage()); + } catch (IOException ex) { + LOG.debug("Connection error", ex); + callback.onConnectionError(ex.getMessage()); + } catch (Exception ex) { + LOG.debug("Unexpected error", ex); + callback.onInternalError(ex.getMessage()); } finally { if (closeableHttpResponse != null) { try { closeableHttpResponse.close(); - } catch (IOException e) { - LOG.debug("Connection error: can't close CloseableHttpResponse ", e); + } catch (IOException ex) { + LOG.debug("Connection error: can't close CloseableHttpResponse ", ex); } } }