diff --git a/tigon-service-support/src/main/java/me/chyxion/tigon/service/support/BaseServiceSupport.java b/tigon-service-support/src/main/java/me/chyxion/tigon/service/support/BaseServiceSupport.java index 1f3404a..34984f5 100644 --- a/tigon-service-support/src/main/java/me/chyxion/tigon/service/support/BaseServiceSupport.java +++ b/tigon-service-support/src/main/java/me/chyxion/tigon/service/support/BaseServiceSupport.java @@ -56,9 +56,8 @@ public class BaseServiceSupport */ @Override public ViewModel toViewModel(Model model) { - ViewModel viewModel = - new ViewModel(model); - log.debug("Model [{}] To View Model.", model); + final ViewModel viewModel = new ViewModel<>(model); + log.debug("Model [{}] to view model.", model); processViewModel(viewModel, model); return viewModel; } @@ -68,9 +67,9 @@ public class BaseServiceSupport */ @Override public List> toViewModel(List models) { - List> viewModels = null; + final List> viewModels; if (models != null && !models.isEmpty()) { - viewModels = new ArrayList>(models.size()); + viewModels = new ArrayList<>(models.size()); for (Model model : models) { viewModels.add(toViewModel(model)); } @@ -82,14 +81,23 @@ public class BaseServiceSupport } /** + * url cache clear * @param model model * @param url url * @return url */ protected String urlCacheClear(M1 model, String url) { - Date dateUpdated = model.getDateUpdated(); - return dateUpdated != null ? - url + "?_d=" + dateUpdated.getTime() : url; + return urlCacheClear(url, model.getDateUpdated()); + } + + /** + * url cache clear + * @param url url + * @param date date + * @return url + */ + protected String urlCacheClear(final String url, final Date date) { + return date != null ? url + "?_d=" + date.getTime() : url; } /**