Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
TatuJLund committed May 25, 2024
1 parent 55231a5 commit 3705f48
Show file tree
Hide file tree
Showing 15 changed files with 39 additions and 40 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import org.slf4j.LoggerFactory;
import org.vaadin.tatu.vaadincreate.auth.AccessControl;
import org.vaadin.tatu.vaadincreate.auth.AllPermitted;
import org.vaadin.tatu.vaadincreate.auth.RolesPermitted;
import org.vaadin.tatu.vaadincreate.auth.CurrentUser;
import org.vaadin.tatu.vaadincreate.auth.RolesPermitted;
import org.vaadin.tatu.vaadincreate.backend.data.User.Role;
import org.vaadin.tatu.vaadincreate.i18n.HasI18N;

Expand Down Expand Up @@ -43,7 +43,7 @@ public class AppLayout extends HorizontalLayout implements HasI18N {

/**
* Constructor.
*
*
* @param ui
* The UI
*/
Expand Down Expand Up @@ -169,7 +169,7 @@ private boolean hasAccessToView(Class<? extends View> view) {
/**
* Add a new view to application shell if the current user has access to it
* based on @AccessAllowed annotation in the view.
*
*
* @param view
* The view class
* @param viewName
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package org.vaadin.tatu.vaadincreate;

import javax.servlet.annotation.WebInitParam;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.Cookie;

import javax.servlet.annotation.WebInitParam;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.vaadin.tatu.vaadincreate.admin.AdminView;
Expand Down Expand Up @@ -126,7 +125,7 @@ public AccessControl getAccessControl() {

/**
* Get ProductDataService in use
*
*
* @return Instance of ProductDataService
*/
public ProductDataService getProductService() {
Expand Down Expand Up @@ -213,7 +212,7 @@ private boolean handleRequest(VaadinSession session,
toSave = true;
}
}
if (toSave == true) {
if (toSave) {
logger.info("Saving language '{}' in cookie", locale);
response.addCookie(localeCookie);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public void enter(ViewChangeEvent event) {

/**
* Update the fragment without causing navigator to change view
*
*
* @param tabName
* The name of the tab to show
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public void enter() {

/**
* Sets the categories for the CategoryManagementView.
*
*
* @param categories
* the collection of categories to be set
*/
Expand Down Expand Up @@ -137,7 +137,7 @@ private Component createCategoryEditor(Category category) {
deleteButton.addStyleName(ValoTheme.BUTTON_DANGER);
deleteButton.setDescription(getTranslation(DELETE));

var binder = new BeanValidationBinder<Category>(Category.class);
var binder = new BeanValidationBinder<>(Category.class);
binder.forField(nameField).bind("name");
binder.setBean(category);
binder.addValueChangeListener(event -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
* Class for retrieving and setting the name of the current user of the current
* session (without using JAAS). All methods of this class require that a
* {@link VaadinRequest} is bound to the current thread.
*
*
*
*
* @see com.vaadin.server.VaadinService#getCurrentRequest()
*/
public final class CurrentUser {
Expand All @@ -29,7 +29,7 @@ private CurrentUser() {
/**
* Returns the name of the current user stored in the current session, or an
* empty string if no user name is stored.
*
*
* @throws IllegalStateException
* if the current session cannot be accessed.
*/
Expand All @@ -46,7 +46,7 @@ public static Optional<User> get() {
/**
* Sets the name of the current user and stores it in the current session.
* Using a {@code null} username will remove the username from the session.
*
*
* @throws IllegalStateException
* if the current session cannot be accessed.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import org.vaadin.tatu.vaadincreate.AttributeExtension;
import org.vaadin.tatu.vaadincreate.CharacterCountExtension;
import org.vaadin.tatu.vaadincreate.ConfirmDialog;
import org.vaadin.tatu.vaadincreate.VaadinCreateTheme;
import org.vaadin.tatu.vaadincreate.ConfirmDialog.Type;
import org.vaadin.tatu.vaadincreate.VaadinCreateTheme;
import org.vaadin.tatu.vaadincreate.backend.data.Availability;
import org.vaadin.tatu.vaadincreate.backend.data.Category;
import org.vaadin.tatu.vaadincreate.backend.data.Product;
Expand All @@ -18,12 +18,12 @@
import com.vaadin.data.BeanValidationBinder;
import com.vaadin.data.Binder;
import com.vaadin.data.Result;
import com.vaadin.data.converter.StringToIntegerConverter;
import com.vaadin.data.ValueContext;
import com.vaadin.data.converter.StringToIntegerConverter;
import com.vaadin.server.AbstractErrorMessage.ContentMode;
import com.vaadin.server.Page;
import com.vaadin.server.UserError;
import com.vaadin.shared.ui.ErrorLevel;
import com.vaadin.server.AbstractErrorMessage.ContentMode;
import com.vaadin.ui.AbstractComponent;
import com.vaadin.ui.Button;
import com.vaadin.ui.CheckBoxGroup;
Expand Down Expand Up @@ -69,7 +69,7 @@ public class BookForm extends Composite implements HasI18N {
private Binder<Product> binder;
private Product currentProduct;
private CssLayout layout = new CssLayout();

private static class StockCountConverter extends StringToIntegerConverter {

public StockCountConverter(String message) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
package org.vaadin.tatu.vaadincreate.crud;

import java.io.Serializable;
import java.util.Collection;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.vaadin.tatu.vaadincreate.VaadinCreateUI;
Expand All @@ -9,12 +15,6 @@
import org.vaadin.tatu.vaadincreate.backend.data.Product;
import org.vaadin.tatu.vaadincreate.backend.data.User.Role;

import java.io.Serializable;
import java.util.Collection;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;

/**
* This class provides an interface for the logical operations between the CRUD
* view, its parts like the product editor form and the data source, including
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
package org.vaadin.tatu.vaadincreate.crud;

import org.vaadin.tatu.vaadincreate.backend.ProductDataService;
import org.vaadin.tatu.vaadincreate.backend.data.Product;
import org.vaadin.tatu.vaadincreate.backend.data.User.Role;
import org.vaadin.tatu.vaadincreate.i18n.HasI18N;

import java.util.Collection;

import org.slf4j.Logger;
Expand All @@ -15,6 +10,10 @@
import org.vaadin.tatu.vaadincreate.VaadinCreateUI;
import org.vaadin.tatu.vaadincreate.auth.AccessControl;
import org.vaadin.tatu.vaadincreate.auth.RolesPermitted;
import org.vaadin.tatu.vaadincreate.backend.ProductDataService;
import org.vaadin.tatu.vaadincreate.backend.data.Product;
import org.vaadin.tatu.vaadincreate.backend.data.User.Role;
import org.vaadin.tatu.vaadincreate.i18n.HasI18N;

import com.vaadin.data.provider.ListDataProvider;
import com.vaadin.icons.VaadinIcons;
Expand Down Expand Up @@ -179,7 +178,7 @@ public void cancelProduct() {
* Set Grid's DataProvider to use collection of products as data. The update
* is done in {@link UI#access(Runnable)} wrapping in order to be thread
* safe and ensure locking of the UI during update.
*
*
* @param products
* Collection of Product
*/
Expand Down Expand Up @@ -272,7 +271,7 @@ public void detach() {

/**
* Update the fragment without causing navigator to change view
*
*
* @param productId
* The parameter
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import java.util.Locale;

import com.vaadin.data.Result;
import com.vaadin.data.converter.StringToBigDecimalConverter;
import com.vaadin.data.ValueContext;
import com.vaadin.data.converter.StringToBigDecimalConverter;

/**
* A converter that adds/removes the euro sign and formats currencies with two
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public synchronized static EventBus getInstance() {
private EventBusImpl() {
}

@Override
public void post(Object event) {
synchronized (eventListeners) {
logger.info("EventBus ({}) event fired for {} recipients.",
Expand All @@ -40,13 +41,15 @@ public void post(Object event) {
}
}

@Override
public void registerEventBusListener(EventBusListener listener) {
synchronized (eventListeners) {
logger.info("EventBus ({}) listenerer registered", this.hashCode());
eventListeners.put(listener, null);
}
}

@Override
public void unregisterEventBusListener(EventBusListener listener) {
synchronized (eventListeners) {
logger.info("EventBus ({}) listenerer un-registered",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@ public synchronized static I18NProvider getInstance() {
return INSTANCE;
}

@Override
public List<Locale> getLocales() {
return locales;
}

@Override
public String getTranslation(String key, Locale locale, Object... params) {
if (key == null) {
logger.warn("Got lang request for key with null value!");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import java.util.Locale;

import org.vaadin.tatu.vaadincreate.i18n.HasI18N;
import org.vaadin.tatu.vaadincreate.i18n.DefaultI18NProvider;
import org.vaadin.tatu.vaadincreate.i18n.HasI18N;

import com.vaadin.server.ThemeResource;
import com.vaadin.ui.ComboBox;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ private void showNotification(Notification notification) {

/**
* Add event listener for login event. Event is fired when user logged in.
*
*
* @param listener
* The listener, can be Lambda expression.
* @return Registration Use Registration#remove() for listener removal.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -111,6 +110,7 @@ public boolean isInPriceBracket(BigDecimal price) {
&& price.doubleValue() >= (max - 10);
}

@Override
public String toString() {
return (max - 10) + " - " + max + " €";
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
package org.vaadin.tatu.vaadincreate.stats;

import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.vaadin.tatu.vaadincreate.VaadinCreateTheme;
import org.vaadin.tatu.vaadincreate.auth.RolesPermitted;
import org.vaadin.tatu.vaadincreate.auth.CurrentUser;
import org.vaadin.tatu.vaadincreate.backend.data.Availability;
import org.vaadin.tatu.vaadincreate.backend.data.User.Role;
import org.vaadin.tatu.vaadincreate.i18n.HasI18N;
Expand All @@ -18,7 +15,6 @@
import com.vaadin.addon.charts.model.DataSeries;
import com.vaadin.addon.charts.model.DataSeriesItem;
import com.vaadin.addon.charts.model.Lang;
import com.vaadin.addon.charts.model.Legend;
import com.vaadin.addon.charts.model.YAxis;
import com.vaadin.addon.charts.model.style.SolidColor;
import com.vaadin.navigator.View;
Expand Down Expand Up @@ -174,7 +170,7 @@ private void updateAvailabilityChart(
var conf = availabilityChart.getConfiguration();
conf.setSeries(availabilitySeries);
conf.getLegend().setEnabled(false);
var categories = (String[]) availabilitySeries.getData().stream()
var categories = availabilitySeries.getData().stream()
.map(item -> item.getName()).toArray(String[]::new);
var axis = conf.getxAxis();
axis.setCategories(categories);
Expand Down

0 comments on commit 3705f48

Please sign in to comment.