Index: branches/grails3_dealer-service/grails-app/controllers/com/lemans/paytrace/PayTraceCustomerProfileController.groovy =================================================================== diff -u -r9528 -r9543 --- branches/grails3_dealer-service/grails-app/controllers/com/lemans/paytrace/PayTraceCustomerProfileController.groovy (.../PayTraceCustomerProfileController.groovy) (revision 9528) +++ branches/grails3_dealer-service/grails-app/controllers/com/lemans/paytrace/PayTraceCustomerProfileController.groovy (.../PayTraceCustomerProfileController.groovy) (revision 9543) @@ -4,7 +4,6 @@ import org.apache.http.entity.StringEntity import javax.annotation.Resource -@SuppressWarnings(['UnnecessarySetter']) class PayTraceCustomerProfileController extends PayTraceBaseController { static final String PAYTRACE_BUSINESS_DISP_NAME_PARTS_UNLIMITED = 'PARTS UNLIMITED' @@ -154,9 +153,12 @@ if (metaData.paytraceApproveUrl) { payload += "|APPROVEURL~${metaData.paytraceApproveUrl}" } if (metaData.paytraceDeclineUrl) { payload += "|DECLINEURL~${metaData.paytraceDeclineUrl}" } HttpPost httpMethod = new HttpPost(paytraceContext + paytraceValidateUrl) + httpMethod.setHeader 'Content-Type', 'application/x-www-form-urlencoded' + httpMethod.entity = new StringEntity(payload, 'UTF-8') + /* httpMethod.setHeader('Content-Type', 'application/x-www-form-urlencoded') httpMethod.setEntity(new StringEntity(payload, 'UTF-8')) - +*/ String returnMessage = externalAPICallerService.callRestfulService(httpMethod) if (returnMessage?.startsWith('ERROR')) { Index: branches/grails3_dealer-service/grails-app/services/com/lemans/paytrace/PayTraceCustomerProfileService.groovy =================================================================== diff -u -r9528 -r9543 --- branches/grails3_dealer-service/grails-app/services/com/lemans/paytrace/PayTraceCustomerProfileService.groovy (.../PayTraceCustomerProfileService.groovy) (revision 9528) +++ branches/grails3_dealer-service/grails-app/services/com/lemans/paytrace/PayTraceCustomerProfileService.groovy (.../PayTraceCustomerProfileService.groovy) (revision 9543) @@ -8,7 +8,6 @@ import org.apache.http.client.methods.HttpPost import org.apache.http.entity.StringEntity -@SuppressWarnings(['UnnecessarySetter']) @Transactional class PayTraceCustomerProfileService extends LemansService { @@ -162,8 +161,8 @@ def url = "${eportalServiceHost}/PayTraceWebAPI/ep/PayTrace/payTraceDealerProfileRequest" log.debug 'mainframe url:' + url HttpPost httpMethod = new HttpPost(url) - httpMethod.setHeader('Content-Type', 'application/json') - httpMethod.setEntity(new StringEntity(payload, 'UTF-8')) + httpMethod.setHeader 'Content-Type', 'application/json' + httpMethod.entity = new StringEntity(payload, 'UTF-8') String returnMessage = externalAPICallerService.callRestfulService(httpMethod) log.debug 'mainframe returnMessage:' + returnMessage def returnMessageJSON = JSON.parse(returnMessage) Index: branches/grails3_dealer-service/grails-app/controllers/com/lemans/paytrace/PayTraceCustomerProfileCallbackController.groovy =================================================================== diff -u -r9528 -r9543 --- branches/grails3_dealer-service/grails-app/controllers/com/lemans/paytrace/PayTraceCustomerProfileCallbackController.groovy (.../PayTraceCustomerProfileCallbackController.groovy) (revision 9528) +++ branches/grails3_dealer-service/grails-app/controllers/com/lemans/paytrace/PayTraceCustomerProfileCallbackController.groovy (.../PayTraceCustomerProfileCallbackController.groovy) (revision 9543) @@ -4,7 +4,6 @@ import org.apache.http.entity.StringEntity import javax.annotation.Resource -@SuppressWarnings(['UnnecessarySetter']) class PayTraceCustomerProfileCallbackController extends PayTraceBaseController { def externalAPICallerService @@ -56,8 +55,8 @@ "ParmList=UN~${payTraceUserName}|PSWD~${payTracePassword}|" + "TERMS~Y|METHOD~ProcessTranx|TRANXTYPE~Void|TranxID~${transId}" HttpPost httpMethod = new HttpPost(paytraceContext + paytraceVoidUrl) - httpMethod.setHeader('Content-Type', 'application/x-www-form-urlencoded') - httpMethod.setEntity(new StringEntity(payload, 'UTF-8')) + httpMethod.setHeader 'content-Type', 'application/x-www-form-urlencoded' + httpMethod.entity = new StringEntity(payload, 'UTF-8') String returnMessage = externalAPICallerService.callRestfulService(httpMethod, false) if (returnMessage?.startsWith('ERROR')) { log.error('voiding paytrace transaction failed on callback: ' + returnMessage) Index: branches/grails3_dealer-service/grails-app/services/com/lemans/paytrace/ExternalAPICallerService.groovy =================================================================== diff -u -r9529 -r9543 --- branches/grails3_dealer-service/grails-app/services/com/lemans/paytrace/ExternalAPICallerService.groovy (.../ExternalAPICallerService.groovy) (revision 9529) +++ branches/grails3_dealer-service/grails-app/services/com/lemans/paytrace/ExternalAPICallerService.groovy (.../ExternalAPICallerService.groovy) (revision 9543) @@ -24,16 +24,15 @@ import java.security.cert.CertificateException import java.security.cert.X509Certificate -@SuppressWarnings(['UnnecessarySetter']) class ExternalAPICallerService { @Resource def httpClient String callRestfulService(HttpRequestBase httpMethod, boolean throwExceptionOnError = true) { - httpMethod.params.setParameter('http.socket.timeout', new Integer(30 * 1000)) - httpMethod.params.setParameter('http.connection.timeout', new Integer(30 * 1000)) + httpMethod.params.setParameter 'http.socket.timeout', new Integer(30 * 1000) + httpMethod.params.setParameter 'http.connection.timeout', new Integer(30 * 1000) DefaultHttpClient defaultHttpClient = newHttpClient @@ -62,10 +61,10 @@ trustStore.load(null, null) SSLSocketFactory sf = new LemansSSLSocketFactory(trustStore) - sf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER) - HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1) - HttpProtocolParams.setContentCharset(params, HTTP.UTF_8) + sf.hostnameVerifier = SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER + HttpProtocolParams.setVersion params, HttpVersion.HTTP_1_1 + HttpProtocolParams.setContentCharset params, HTTP.UTF_8 SchemeRegistry registry = new SchemeRegistry() registry.register(new Scheme('http', PlainSocketFactory.socketFactory, 80)) Index: branches/grails3_dealer-service/grails-app/services/com/lemans/rider/RaceReportManagerService.groovy =================================================================== diff -u -r9529 -r9543 --- branches/grails3_dealer-service/grails-app/services/com/lemans/rider/RaceReportManagerService.groovy (.../RaceReportManagerService.groovy) (revision 9529) +++ branches/grails3_dealer-service/grails-app/services/com/lemans/rider/RaceReportManagerService.groovy (.../RaceReportManagerService.groovy) (revision 9543) @@ -10,7 +10,6 @@ import javax.mail.internet.InternetAddress import javax.mail.internet.MimeMessage -@SuppressWarnings(['UnnecessarySetter']) @Transactional class RaceReportManagerService extends LemansManager { @@ -70,9 +69,9 @@ MimeMessage mimeMessage = mailSender.createMimeMessage() model.to.each { mimeMessage.addRecipient(MimeMessage.RecipientType.TO, new InternetAddress(it)) } - mimeMessage.setFrom(new InternetAddress(NO_REPLY_FROM)) - mimeMessage.setSubject(model.subject) - mimeMessage.setContent(writer.toString(), 'text/html') + mimeMessage.from = new InternetAddress(NO_REPLY_FROM) + mimeMessage.subject = model.subject + mimeMessage.setContent writer.toString(), 'text/html' mimeMessage } Index: branches/grails3_dealer-service/grails-app/services/com/lemans/salesman/SalesmanWeeklyRecapManagerService.groovy =================================================================== diff -u -r9528 -r9543 --- branches/grails3_dealer-service/grails-app/services/com/lemans/salesman/SalesmanWeeklyRecapManagerService.groovy (.../SalesmanWeeklyRecapManagerService.groovy) (revision 9528) +++ branches/grails3_dealer-service/grails-app/services/com/lemans/salesman/SalesmanWeeklyRecapManagerService.groovy (.../SalesmanWeeklyRecapManagerService.groovy) (revision 9543) @@ -13,7 +13,6 @@ import java.time.ZoneId import java.time.format.DateTimeFormatter -@SuppressWarnings(['UnnecessarySetter']) @Transactional class SalesmanWeeklyRecapManagerService extends LemansManager { @@ -118,13 +117,13 @@ output.writeTo(writer) MimeMessage mimeMessage = mailSender.createMimeMessage() MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true, 'UTF-8') - if (model.to) { helper.setTo(new InternetAddress(model.to)) } - if (model.cc) { helper.setCc(new InternetAddress(model.cc)) } - helper.setFrom(new InternetAddress(NO_REPLY_FROM)) - helper.setSubject(model.subject) + if (model.to) { helper.to = new InternetAddress(model.to) } + if (model.cc) { helper.cc = new InternetAddress(model.cc) } + helper.from = new InternetAddress(NO_REPLY_FROM) + helper.subject = model.subject String body = writer - helper.setText(body, true) - mimeMessage.setContent(body, 'text/html') + helper.setText body, true + mimeMessage.setContent body, 'text/html' Map criteria = [salesmanId: model.recap.salesman.id, startDate: (model.recap.weekEndDate - 6).format('MM/dd/yyyy'), endDate: model.recap.weekEndDate.format('MM/dd/yyyy')] ByteArrayResource activityReportAttachment = getDealerActivityAttachment(criteria) Index: branches/grails3_dealer-service/grails-app/services/com/lemans/media/MediaManagerService.groovy =================================================================== diff -u -r9528 -r9543 --- branches/grails3_dealer-service/grails-app/services/com/lemans/media/MediaManagerService.groovy (.../MediaManagerService.groovy) (revision 9528) +++ branches/grails3_dealer-service/grails-app/services/com/lemans/media/MediaManagerService.groovy (.../MediaManagerService.groovy) (revision 9543) @@ -14,7 +14,7 @@ import javax.mail.internet.MimeMessage @Transactional -@SuppressWarnings(['JavaIoPackageAccess', 'UnnecessarySetter']) +@SuppressWarnings(['JavaIoPackageAccess']) class MediaManagerService extends LemansManager { def mediaService @@ -229,10 +229,9 @@ output.writeTo(writer) MimeMessage mimeMessage = mailSender.createMimeMessage() model.to.each { mimeMessage.addRecipient(MimeMessage.RecipientType.TO, new InternetAddress(it)) } - mimeMessage. - setFrom(new InternetAddress(NO_REPLY_FROM)) - mimeMessage.setSubject(model.subject) - mimeMessage.setContent(writer.toString(), 'text/html') + mimeMessage.from = new InternetAddress(NO_REPLY_FROM) + mimeMessage.subject = model.subject + mimeMessage.setContent writer.toString(), 'text/html' mimeMessage } @@ -249,7 +248,7 @@ } private rollback() { - TransactionAspectSupport.currentTransactionStatus().setRollbackOnly() + TransactionAspectSupport.currentTransactionStatus().rollbackOnly() } private MimeType mimeType(String extension, MediaType mediaType, String description) { Index: branches/grails3_dealer-service/src/main/groovy/com/lemans/reporting/DealerServiceProviderReporter.groovy =================================================================== diff -u -r9529 -r9543 --- branches/grails3_dealer-service/src/main/groovy/com/lemans/reporting/DealerServiceProviderReporter.groovy (.../DealerServiceProviderReporter.groovy) (revision 9529) +++ branches/grails3_dealer-service/src/main/groovy/com/lemans/reporting/DealerServiceProviderReporter.groovy (.../DealerServiceProviderReporter.groovy) (revision 9543) @@ -5,7 +5,6 @@ import org.apache.poi.ss.util.CellRangeAddress import org.gsheets.building.WorkbookBuilder -@SuppressWarnings(['UnnecessarySetter']) class DealerServiceProviderReporter { final static Map HEADER_FONT_CONFIG = [ @@ -36,7 +35,7 @@ ) } autoColumnWidth(6) - }.setAutoFilter(new CellRangeAddress(0, 0, 0, 5)) + }.autoFilter = new CellRangeAddress(0, 0, 0, 5) // setAutoFilter(new CellRangeAddress(0, 0, 0, 5)) } } @@ -64,6 +63,6 @@ ) } autoColumnWidth(4) - }.setAutoFilter(new CellRangeAddress(0, 0, 0, 3)) + }.autoFilter = new CellRangeAddress(0, 0, 0, 5) } }