From d1bdca04a1c033f22b2ffcfcfaca8ad7165e4833 Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Thu, 11 Jan 2024 18:07:24 +0200 Subject: [PATCH] Rename simple ui package com -> org (#1541) Signed-off-by: Marinov Avgustin --- hawkbit-runtime/hawkbit-simple-ui/pom.xml | 4 +- .../eclipse/hawkbit/ui/HawkbitClient.java | 6 +- .../eclipse/hawkbit/ui/MainLayout.java | 15 ++--- .../eclipse/hawkbit/ui/SimpleUIApp.java | 2 +- .../ui/security/AuthenticatedUser.java | 2 +- .../ui/security/SecurityConfiguration.java | 4 +- .../eclipse/hawkbit/ui/view/AboutView.java | 4 +- .../eclipse/hawkbit/ui/view/Constants.java | 2 +- .../hawkbit/ui/view/DistributionSetView.java | 50 ++++++++-------- .../eclipse/hawkbit/ui/view/LoginView.java | 4 +- .../eclipse/hawkbit/ui/view/RolloutView.java | 14 ++--- .../hawkbit/ui/view/SoftwareModuleView.java | 60 +++++++++---------- .../eclipse/hawkbit/ui/view/TargetView.java | 44 +++++++------- .../eclipse/hawkbit/ui/view/util/Filter.java | 2 +- .../hawkbit/ui/view/util/SelectionGrid.java | 2 +- .../hawkbit/ui/view/util/TableView.java | 4 +- .../eclipse/hawkbit/ui/view/util/Utils.java | 3 +- .../src/main/resources/application.properties | 2 +- 18 files changed, 111 insertions(+), 113 deletions(-) rename hawkbit-runtime/hawkbit-simple-ui/src/main/java/{com => org}/eclipse/hawkbit/ui/HawkbitClient.java (97%) rename hawkbit-runtime/hawkbit-simple-ui/src/main/java/{com => org}/eclipse/hawkbit/ui/MainLayout.java (94%) rename hawkbit-runtime/hawkbit-simple-ui/src/main/java/{com => org}/eclipse/hawkbit/ui/SimpleUIApp.java (99%) rename hawkbit-runtime/hawkbit-simple-ui/src/main/java/{com => org}/eclipse/hawkbit/ui/security/AuthenticatedUser.java (95%) rename hawkbit-runtime/hawkbit-simple-ui/src/main/java/{com => org}/eclipse/hawkbit/ui/security/SecurityConfiguration.java (94%) rename hawkbit-runtime/hawkbit-simple-ui/src/main/java/{com => org}/eclipse/hawkbit/ui/view/AboutView.java (94%) rename hawkbit-runtime/hawkbit-simple-ui/src/main/java/{com => org}/eclipse/hawkbit/ui/view/Constants.java (97%) rename hawkbit-runtime/hawkbit-simple-ui/src/main/java/{com => org}/eclipse/hawkbit/ui/view/DistributionSetView.java (91%) rename hawkbit-runtime/hawkbit-simple-ui/src/main/java/{com => org}/eclipse/hawkbit/ui/view/LoginView.java (95%) rename hawkbit-runtime/hawkbit-simple-ui/src/main/java/{com => org}/eclipse/hawkbit/ui/view/RolloutView.java (98%) rename hawkbit-runtime/hawkbit-simple-ui/src/main/java/{com => org}/eclipse/hawkbit/ui/view/SoftwareModuleView.java (90%) rename hawkbit-runtime/hawkbit-simple-ui/src/main/java/{com => org}/eclipse/hawkbit/ui/view/TargetView.java (91%) rename hawkbit-runtime/hawkbit-simple-ui/src/main/java/{com => org}/eclipse/hawkbit/ui/view/util/Filter.java (99%) rename hawkbit-runtime/hawkbit-simple-ui/src/main/java/{com => org}/eclipse/hawkbit/ui/view/util/SelectionGrid.java (98%) rename hawkbit-runtime/hawkbit-simple-ui/src/main/java/{com => org}/eclipse/hawkbit/ui/view/util/TableView.java (96%) rename hawkbit-runtime/hawkbit-simple-ui/src/main/java/{com => org}/eclipse/hawkbit/ui/view/util/Utils.java (99%) diff --git a/hawkbit-runtime/hawkbit-simple-ui/pom.xml b/hawkbit-runtime/hawkbit-simple-ui/pom.xml index d20450b28..983d5c2d0 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/pom.xml +++ b/hawkbit-runtime/hawkbit-simple-ui/pom.xml @@ -24,7 +24,7 @@ - com.eclipse.hawkbit + org.eclipse.hawkbit hawkbit-simple-ui ${revision} jar @@ -272,7 +272,7 @@ ossrh https://oss.sonatype.org/ - 1d2b23f380235e + false diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/HawkbitClient.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitClient.java similarity index 97% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/HawkbitClient.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitClient.java index 325cebbc9..67fb85640 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/HawkbitClient.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitClient.java @@ -7,16 +7,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package com.eclipse.hawkbit.ui; +package org.eclipse.hawkbit.ui; -import com.eclipse.hawkbit.ui.view.util.Utils; -import com.vaadin.flow.component.UI; +import org.eclipse.hawkbit.ui.view.util.Utils; import feign.Client; import feign.Contract; import feign.Feign; import feign.FeignException; import feign.RequestInterceptor; -import feign.Response; import feign.codec.Decoder; import feign.codec.Encoder; import feign.codec.ErrorDecoder; diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/MainLayout.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/MainLayout.java similarity index 94% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/MainLayout.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/MainLayout.java index 424c48d3f..eb94f1657 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/MainLayout.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/MainLayout.java @@ -7,14 +7,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package com.eclipse.hawkbit.ui; +package org.eclipse.hawkbit.ui; -import com.eclipse.hawkbit.ui.view.RolloutView; -import com.eclipse.hawkbit.ui.view.TargetView; -import com.eclipse.hawkbit.ui.security.AuthenticatedUser; -import com.eclipse.hawkbit.ui.view.AboutView; -import com.eclipse.hawkbit.ui.view.DistributionSetView; -import com.eclipse.hawkbit.ui.view.SoftwareModuleView; +import org.eclipse.hawkbit.ui.view.RolloutView; +import org.eclipse.hawkbit.ui.view.TargetView; +import org.eclipse.hawkbit.ui.security.AuthenticatedUser; +import org.eclipse.hawkbit.ui.view.AboutView; +import org.eclipse.hawkbit.ui.view.DistributionSetView; +import org.eclipse.hawkbit.ui.view.SoftwareModuleView; import com.vaadin.flow.component.Unit; import com.vaadin.flow.component.applayout.AppLayout; import com.vaadin.flow.component.applayout.DrawerToggle; @@ -38,6 +38,7 @@ import com.vaadin.flow.component.sidenav.SideNavItem; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.server.auth.AccessAnnotationChecker; import com.vaadin.flow.theme.lumo.LumoUtility; + import java.util.Optional; /** diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/SimpleUIApp.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/SimpleUIApp.java similarity index 99% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/SimpleUIApp.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/SimpleUIApp.java index a4a6d0341..5918cca37 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/SimpleUIApp.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/SimpleUIApp.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package com.eclipse.hawkbit.ui; +package org.eclipse.hawkbit.ui; import com.vaadin.flow.component.page.AppShellConfigurator; import com.vaadin.flow.server.PWA; diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/security/AuthenticatedUser.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/security/AuthenticatedUser.java similarity index 95% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/security/AuthenticatedUser.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/security/AuthenticatedUser.java index 6faa1bb6e..04ab5b57e 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/security/AuthenticatedUser.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/security/AuthenticatedUser.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package com.eclipse.hawkbit.ui.security; +package org.eclipse.hawkbit.ui.security; import com.vaadin.flow.spring.security.AuthenticationContext; import org.springframework.stereotype.Component; diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/security/SecurityConfiguration.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/security/SecurityConfiguration.java similarity index 94% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/security/SecurityConfiguration.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/security/SecurityConfiguration.java index 07cc876b7..dd2aff842 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/security/SecurityConfiguration.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/security/SecurityConfiguration.java @@ -7,9 +7,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package com.eclipse.hawkbit.ui.security; +package org.eclipse.hawkbit.ui.security; -import com.eclipse.hawkbit.ui.view.LoginView; +import org.eclipse.hawkbit.ui.view.LoginView; import com.vaadin.flow.spring.security.VaadinWebSecurity; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/AboutView.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/AboutView.java similarity index 94% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/AboutView.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/AboutView.java index ef585e64a..517f8efff 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/AboutView.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/AboutView.java @@ -7,9 +7,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package com.eclipse.hawkbit.ui.view; +package org.eclipse.hawkbit.ui.view; -import com.eclipse.hawkbit.ui.MainLayout; +import org.eclipse.hawkbit.ui.MainLayout; import com.vaadin.flow.component.html.H2; import com.vaadin.flow.component.html.Image; import com.vaadin.flow.component.orderedlayout.VerticalLayout; diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/Constants.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/Constants.java similarity index 97% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/Constants.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/Constants.java index 37c79d9c4..f2ede440f 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/Constants.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/Constants.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package com.eclipse.hawkbit.ui.view; +package org.eclipse.hawkbit.ui.view; public interface Constants { diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/DistributionSetView.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/DistributionSetView.java similarity index 91% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/DistributionSetView.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/DistributionSetView.java index 81978cf1c..b84644f5e 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/DistributionSetView.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/DistributionSetView.java @@ -7,14 +7,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package com.eclipse.hawkbit.ui.view; +package org.eclipse.hawkbit.ui.view; -import com.eclipse.hawkbit.ui.HawkbitClient; -import com.eclipse.hawkbit.ui.view.util.Filter; -import com.eclipse.hawkbit.ui.MainLayout; -import com.eclipse.hawkbit.ui.view.util.SelectionGrid; -import com.eclipse.hawkbit.ui.view.util.TableView; -import com.eclipse.hawkbit.ui.view.util.Utils; +import org.eclipse.hawkbit.ui.HawkbitClient; +import org.eclipse.hawkbit.ui.view.util.Filter; +import org.eclipse.hawkbit.ui.MainLayout; +import org.eclipse.hawkbit.ui.view.util.SelectionGrid; +import org.eclipse.hawkbit.ui.view.util.TableView; +import org.eclipse.hawkbit.ui.view.util.Utils; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.Key; import com.vaadin.flow.component.button.Button; @@ -65,10 +65,10 @@ public class DistributionSetView extends TableView { @Override protected void addColumns(Grid grid) { - grid.addColumn(MgmtDistributionSet::getDsId).setHeader(ID).setAutoWidth(true); - grid.addColumn(MgmtDistributionSet::getName).setHeader(NAME).setAutoWidth(true); - grid.addColumn(MgmtDistributionSet::getVersion).setHeader(VERSION).setAutoWidth(true); - grid.addColumn(MgmtDistributionSet::getTypeName).setHeader(TYPE).setAutoWidth(true); + grid.addColumn(MgmtDistributionSet::getDsId).setHeader(Constants.ID).setAutoWidth(true); + grid.addColumn(MgmtDistributionSet::getName).setHeader(Constants.NAME).setAutoWidth(true); + grid.addColumn(MgmtDistributionSet::getVersion).setHeader(Constants.VERSION).setAutoWidth(true); + grid.addColumn(MgmtDistributionSet::getTypeName).setHeader(Constants.TYPE).setAutoWidth(true); grid.setItemDetailsRenderer(new ComponentRenderer<>( () -> details, DistributionSetDetails::setItem)); @@ -76,7 +76,7 @@ public class DistributionSetView extends TableView { }, (query, rsqlFilter) -> hawkbitClient.getDistributionSetRestApi() .getDistributionSets( - query.getOffset(), query.getPageSize(), NAME_ASC, rsqlFilter) + query.getOffset(), query.getPageSize(), Constants.NAME_ASC, rsqlFilter) .getBody() .getContent() .stream(), @@ -95,11 +95,11 @@ public class DistributionSetView extends TableView { MgmtSoftwareModule.class, MgmtSoftwareModule::getModuleId) { @Override protected void addColumns(Grid grid) { - grid.addColumn(MgmtSoftwareModule::getModuleId).setHeader(ID).setAutoWidth(true); - grid.addColumn(MgmtSoftwareModule::getName).setHeader(NAME).setAutoWidth(true); - grid.addColumn(MgmtSoftwareModule::getVersion).setHeader(VERSION).setAutoWidth(true); - grid.addColumn(MgmtSoftwareModule::getTypeName).setHeader(TYPE).setAutoWidth(true); - grid.addColumn(MgmtSoftwareModule::getVendor).setHeader(VENDOR).setAutoWidth(true); + grid.addColumn(MgmtSoftwareModule::getModuleId).setHeader(Constants.ID).setAutoWidth(true); + grid.addColumn(MgmtSoftwareModule::getName).setHeader(Constants.NAME).setAutoWidth(true); + grid.addColumn(MgmtSoftwareModule::getVersion).setHeader(Constants.VERSION).setAutoWidth(true); + grid.addColumn(MgmtSoftwareModule::getTypeName).setHeader(Constants.TYPE).setAutoWidth(true); + grid.addColumn(MgmtSoftwareModule::getVendor).setHeader(Constants.VENDOR).setAutoWidth(true); } }); } @@ -115,13 +115,13 @@ public class DistributionSetView extends TableView { type.setItemLabelGenerator(MgmtDistributionSetType::getName); type.setItems( hawkbitClient.getDistributionSetTypeRestApi() - .getDistributionSetTypes(0, 20, NAME_ASC, null) + .getDistributionSetTypes(0, 20, Constants.NAME_ASC, null) .getBody() .getContent()); tag.setItemLabelGenerator(MgmtTag::getName); tag.setItems( hawkbitClient.getDistributionSetTagRestApi() - .getDistributionSetTags(0, 20, NAME_ASC, null) + .getDistributionSetTags(0, 20, Constants.NAME_ASC, null) .getBody() .getContent()); } @@ -183,7 +183,7 @@ public class DistributionSetView extends TableView { hawkbitClient.getDistributionSetRestApi() .getAssignedSoftwareModules( distributionSet.getDsId(), - query.getOffset(), query.getLimit(), NAME_ASC) + query.getOffset(), query.getLimit(), Constants.NAME_ASC) .getBody() .getContent() .stream()); @@ -210,7 +210,7 @@ public class DistributionSetView extends TableView { "Type", this::readyToCreate, hawkbitClient.getDistributionSetTypeRestApi() - .getDistributionSetTypes(0, 30, NAME_ASC, null) + .getDistributionSetTypes(0, 30, Constants.NAME_ASC, null) .getBody() .getContent() .toArray(new MgmtDistributionSetType[0])); @@ -218,10 +218,10 @@ public class DistributionSetView extends TableView { type.setWidthFull(); type.setRequiredIndicatorVisible(true); type.setItemLabelGenerator(MgmtDistributionSetType::getName); - name = Utils.textField(NAME, this::readyToCreate); - version = Utils.textField(VERSION, this::readyToCreate); - final TextField vendor = Utils.textField(VENDOR); - description = new TextArea(DESCRIPTION); + name = Utils.textField(Constants.NAME, this::readyToCreate); + version = Utils.textField(Constants.VERSION, this::readyToCreate); + final TextField vendor = Utils.textField(Constants.VENDOR); + description = new TextArea(Constants.DESCRIPTION); description.setWidthFull(); description.setMinLength(2); requiredMigrationStep = new Checkbox("Required Migration Step"); diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/LoginView.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/LoginView.java similarity index 95% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/LoginView.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/LoginView.java index acb551c1b..4f50b4684 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/LoginView.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/LoginView.java @@ -7,9 +7,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package com.eclipse.hawkbit.ui.view; +package org.eclipse.hawkbit.ui.view; -import com.eclipse.hawkbit.ui.security.AuthenticatedUser; +import org.eclipse.hawkbit.ui.security.AuthenticatedUser; import com.vaadin.flow.component.login.LoginI18n; import com.vaadin.flow.component.login.LoginOverlay; import com.vaadin.flow.router.BeforeEnterEvent; diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/RolloutView.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/RolloutView.java similarity index 98% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/RolloutView.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/RolloutView.java index 1c18c9a57..b624d8646 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/RolloutView.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/RolloutView.java @@ -7,14 +7,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package com.eclipse.hawkbit.ui.view; +package org.eclipse.hawkbit.ui.view; -import com.eclipse.hawkbit.ui.HawkbitClient; -import com.eclipse.hawkbit.ui.view.util.Filter; -import com.eclipse.hawkbit.ui.MainLayout; -import com.eclipse.hawkbit.ui.view.util.SelectionGrid; -import com.eclipse.hawkbit.ui.view.util.TableView; -import com.eclipse.hawkbit.ui.view.util.Utils; +import org.eclipse.hawkbit.ui.HawkbitClient; +import org.eclipse.hawkbit.ui.view.util.Filter; +import org.eclipse.hawkbit.ui.MainLayout; +import org.eclipse.hawkbit.ui.view.util.SelectionGrid; +import org.eclipse.hawkbit.ui.view.util.TableView; +import org.eclipse.hawkbit.ui.view.util.Utils; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.Key; import com.vaadin.flow.component.Text; diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/SoftwareModuleView.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/SoftwareModuleView.java similarity index 90% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/SoftwareModuleView.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/SoftwareModuleView.java index b87dde657..788180287 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/SoftwareModuleView.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/SoftwareModuleView.java @@ -7,14 +7,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package com.eclipse.hawkbit.ui.view; +package org.eclipse.hawkbit.ui.view; -import com.eclipse.hawkbit.ui.HawkbitClient; -import com.eclipse.hawkbit.ui.view.util.Filter; -import com.eclipse.hawkbit.ui.view.util.SelectionGrid; -import com.eclipse.hawkbit.ui.MainLayout; -import com.eclipse.hawkbit.ui.view.util.TableView; -import com.eclipse.hawkbit.ui.view.util.Utils; +import org.eclipse.hawkbit.ui.HawkbitClient; +import org.eclipse.hawkbit.ui.view.util.Filter; +import org.eclipse.hawkbit.ui.view.util.SelectionGrid; +import org.eclipse.hawkbit.ui.MainLayout; +import org.eclipse.hawkbit.ui.view.util.TableView; +import org.eclipse.hawkbit.ui.view.util.Utils; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.Key; import com.vaadin.flow.component.button.Button; @@ -60,7 +60,7 @@ import java.util.stream.Stream; @Route(value = "software_modules", layout = MainLayout.class) @RolesAllowed({"SOFTWARE_MODULE_READ"}) @Uses(Icon.class) -public class SoftwareModuleView extends TableView{ +public class SoftwareModuleView extends TableView { @Autowired public SoftwareModuleView(final HawkbitClient hawkbitClient) { @@ -75,11 +75,11 @@ public class SoftwareModuleView extends TableView{ private final SoftwareModuleDetails details = new SoftwareModuleDetails(hawkbitClient); @Override protected void addColumns(final Grid grid) { - grid.addColumn(MgmtSoftwareModule::getModuleId).setHeader(ID).setAutoWidth(true); - grid.addColumn(MgmtSoftwareModule::getName).setHeader(NAME).setAutoWidth(true); - grid.addColumn(MgmtSoftwareModule::getVersion).setHeader(VERSION).setAutoWidth(true); - grid.addColumn(MgmtSoftwareModule::getTypeName).setHeader(TYPE).setAutoWidth(true); - grid.addColumn(MgmtSoftwareModule::getVendor).setHeader(VENDOR).setAutoWidth(true); + grid.addColumn(MgmtSoftwareModule::getModuleId).setHeader(Constants.ID).setAutoWidth(true); + grid.addColumn(MgmtSoftwareModule::getName).setHeader(Constants.NAME).setAutoWidth(true); + grid.addColumn(MgmtSoftwareModule::getVersion).setHeader(Constants.VERSION).setAutoWidth(true); + grid.addColumn(MgmtSoftwareModule::getTypeName).setHeader(Constants.TYPE).setAutoWidth(true); + grid.addColumn(MgmtSoftwareModule::getVendor).setHeader(Constants.VENDOR).setAutoWidth(true); grid.setItemDetailsRenderer(new ComponentRenderer<>( () -> details, SoftwareModuleDetails::setItem)); @@ -88,7 +88,7 @@ public class SoftwareModuleView extends TableView{ }, (query, rsqlFilter) -> hawkbitClient.getSoftwareModuleRestApi() .getSoftwareModules( - query.getOffset(), query.getPageSize(), NAME_ASC, rsqlFilter) + query.getOffset(), query.getPageSize(), Constants.NAME_ASC, rsqlFilter) .getBody() .getContent() .stream(), @@ -110,8 +110,8 @@ public class SoftwareModuleView extends TableView{ new SelectionGrid.EntityRepresentation<>(MgmtArtifact.class, MgmtArtifact::getArtifactId) { @Override protected void addColumns(final Grid grid) { - grid.addColumn(MgmtArtifact::getArtifactId).setHeader(ID).setAutoWidth(true); - grid.addColumn(MgmtArtifact::getProvidedFilename).setHeader(NAME).setAutoWidth(true); + grid.addColumn(MgmtArtifact::getArtifactId).setHeader(Constants.ID).setAutoWidth(true); + grid.addColumn(MgmtArtifact::getProvidedFilename).setHeader(Constants.NAME).setAutoWidth(true); grid.addColumn(MgmtArtifact::getSize).setHeader("Size").setAutoWidth(true); } }); @@ -119,15 +119,15 @@ public class SoftwareModuleView extends TableView{ private static class SoftwareModuleFilter implements Filter.Rsql { - private final TextField name = Utils.textField(NAME); - private final CheckboxGroup type = new CheckboxGroup<>(TYPE); + private final TextField name = Utils.textField(Constants.NAME); + private final CheckboxGroup type = new CheckboxGroup<>(Constants.TYPE); private SoftwareModuleFilter(final HawkbitClient hawkbitClient) { name.setPlaceholder(""); type.setItemLabelGenerator(MgmtSoftwareModuleType::getName); type.setItems( hawkbitClient.getSoftwareModuleTypeRestApi() - .getTypes(0, 20, NAME_ASC, null) + .getTypes(0, 20, Constants.NAME_ASC, null) .getBody() .getContent()); } @@ -152,11 +152,11 @@ public class SoftwareModuleView extends TableView{ private final transient HawkbitClient hawkbitClient; - private final TextArea description = new TextArea(DESCRIPTION); - private final TextField createdBy = Utils.textField(CREATED_BY); - private final TextField createdAt = Utils.textField(CREATED_AT); - private final TextField lastModifiedBy = Utils.textField(LAST_MODIFIED_BY); - private final TextField lastModifiedAt = Utils.textField(LAST_MODIFIED_AT); + private final TextArea description = new TextArea(Constants.DESCRIPTION); + private final TextField createdBy = Utils.textField(Constants.CREATED_BY); + private final TextField createdAt = Utils.textField(Constants.CREATED_AT); + private final TextField lastModifiedBy = Utils.textField(Constants.LAST_MODIFIED_BY); + private final TextField lastModifiedAt = Utils.textField(Constants.LAST_MODIFIED_AT); private final SelectionGrid artifactGrid; private SoftwareModuleDetails(final HawkbitClient hawkbitClient) { @@ -211,10 +211,10 @@ public class SoftwareModuleView extends TableView{ super("Create Software Module"); type = new Select<>( - TYPE, + Constants.TYPE, this::readyToCreate, hawkbitClient.getSoftwareModuleTypeRestApi() - .getTypes(0, 30, NAME_ASC, null) + .getTypes(0, 30, Constants.NAME_ASC, null) .getBody() .getContent() .toArray(new MgmtSoftwareModuleType[0])); @@ -222,10 +222,10 @@ public class SoftwareModuleView extends TableView{ type.setRequiredIndicatorVisible(true); type.setItemLabelGenerator(MgmtSoftwareModuleType::getName); type.focus(); - name = Utils.textField(NAME, this::readyToCreate); - version = Utils.textField(VERSION, this::readyToCreate); - vendor = Utils.textField(VENDOR); - description = new TextArea(DESCRIPTION); + name = Utils.textField(Constants.NAME, this::readyToCreate); + version = Utils.textField(Constants.VERSION, this::readyToCreate); + vendor = Utils.textField(Constants.VENDOR); + description = new TextArea(Constants.DESCRIPTION); description.setWidthFull(); description.setMinLength(2); enableArtifactEncryption = new Checkbox("Enable artifact encryption"); diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/TargetView.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java similarity index 91% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/TargetView.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java index 370dff2a8..b072fa75c 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/TargetView.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java @@ -7,14 +7,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package com.eclipse.hawkbit.ui.view; +package org.eclipse.hawkbit.ui.view; -import com.eclipse.hawkbit.ui.HawkbitClient; -import com.eclipse.hawkbit.ui.view.util.Filter; -import com.eclipse.hawkbit.ui.MainLayout; -import com.eclipse.hawkbit.ui.view.util.SelectionGrid; -import com.eclipse.hawkbit.ui.view.util.TableView; -import com.eclipse.hawkbit.ui.view.util.Utils; +import org.eclipse.hawkbit.ui.HawkbitClient; +import org.eclipse.hawkbit.ui.view.util.Filter; +import org.eclipse.hawkbit.ui.MainLayout; +import org.eclipse.hawkbit.ui.view.util.SelectionGrid; +import org.eclipse.hawkbit.ui.view.util.TableView; +import org.eclipse.hawkbit.ui.view.util.Utils; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.Key; import com.vaadin.flow.component.button.Button; @@ -68,8 +68,8 @@ public class TargetView extends TableView { @Override protected void addColumns(final Grid grid) { grid.addColumn(MgmtTarget::getControllerId).setHeader(CONTROLLER_ID).setAutoWidth(true); - grid.addColumn(MgmtTarget::getName).setHeader(NAME).setAutoWidth(true); - grid.addColumn(MgmtTarget::getTargetTypeName).setHeader(TYPE).setAutoWidth(true); + grid.addColumn(MgmtTarget::getName).setHeader(Constants.NAME).setAutoWidth(true); + grid.addColumn(MgmtTarget::getTargetTypeName).setHeader(Constants.TYPE).setAutoWidth(true); grid.setItemDetailsRenderer(new ComponentRenderer<>( TargetDetails::new, TargetDetails::setItem)); @@ -77,7 +77,7 @@ public class TargetView extends TableView { }, (query, filter) -> hawkbitClient.getTargetRestApi() .getTargets( - query.getOffset(), query.getPageSize(), NAME_ASC, + query.getOffset(), query.getPageSize(), Constants.NAME_ASC, filter) .getBody() .getContent() @@ -103,7 +103,7 @@ public class TargetView extends TableView { controllerId = Utils.textField(CONTROLLER_ID); controllerId.setPlaceholder(""); - type = new CheckboxGroup<>(TYPE); + type = new CheckboxGroup<>(Constants.TYPE); type.setItemLabelGenerator(MgmtTargetType::getName); tag = new CheckboxGroup<>(TAG); tag.setItemLabelGenerator(MgmtTag::getName); @@ -113,11 +113,11 @@ public class TargetView extends TableView { public List components() { final List components = new LinkedList<>(); components.add(controllerId); - type.setItems(hawkbitClient.getTargetTypeRestApi().getTargetTypes(0, 20, NAME_ASC, null).getBody().getContent()); + type.setItems(hawkbitClient.getTargetTypeRestApi().getTargetTypes(0, 20, Constants.NAME_ASC, null).getBody().getContent()); if (!type.getValue().isEmpty()) { components.add(type); } - tag.setItems(hawkbitClient.getTargetTagRestApi().getTargetTags(0, 20, NAME_ASC, null).getBody().getContent()); + tag.setItems(hawkbitClient.getTargetTagRestApi().getTargetTags(0, 20, Constants.NAME_ASC, null).getBody().getContent()); if (!tag.isEmpty()) { components.add(tag); } @@ -166,7 +166,7 @@ public class TargetView extends TableView { setHeight("40%"); final Button finishBtn = Utils.tooltip(new Button("Save"), "Save (Enter)"); final TextField name = Utils.textField( - NAME, + Constants.NAME, e -> finishBtn.setEnabled(!e.getHasValue().isEmpty())); name.focus(); finishBtn.addClickShortcut(Key.ENTER); @@ -206,11 +206,11 @@ public class TargetView extends TableView { private static class TargetDetails extends FormLayout { - private final TextArea description = new TextArea(DESCRIPTION); - private final TextField createdBy = Utils.textField(CREATED_BY); - private final TextField createdAt = Utils.textField(CREATED_AT); - private final TextField lastModifiedBy = Utils.textField(LAST_MODIFIED_BY); - private final TextField lastModifiedAt = Utils.textField(LAST_MODIFIED_AT); + private final TextArea description = new TextArea(Constants.DESCRIPTION); + private final TextField createdBy = Utils.textField(Constants.CREATED_BY); + private final TextField createdAt = Utils.textField(Constants.CREATED_AT); + private final TextField lastModifiedBy = Utils.textField(Constants.LAST_MODIFIED_BY); + private final TextField lastModifiedAt = Utils.textField(Constants.LAST_MODIFIED_AT); private TargetDetails() { description.setMinLength(2); @@ -251,7 +251,7 @@ public class TargetView extends TableView { "Type", e -> {}, hawkbitClient.getTargetTypeRestApi() - .getTargetTypes(0, 30, NAME_ASC, null) + .getTargetTypes(0, 30, Constants.NAME_ASC, null) .getBody() .getContent() .toArray(new MgmtTargetType[0])); @@ -261,9 +261,9 @@ public class TargetView extends TableView { controllerId = Utils.textField(CONTROLLER_ID, e -> register.setEnabled(!e.getHasValue().isEmpty())); controllerId.focus(); - name = Utils.textField(NAME); + name = Utils.textField(Constants.NAME); name.setWidthFull(); - description = new TextArea(DESCRIPTION); + description = new TextArea(Constants.DESCRIPTION); description.setMinLength(2); description.setWidthFull(); diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/util/Filter.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/Filter.java similarity index 99% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/util/Filter.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/Filter.java index 95650182c..e8ebf650b 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/util/Filter.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/Filter.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package com.eclipse.hawkbit.ui.view.util; +package org.eclipse.hawkbit.ui.view.util; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.HasValue; diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/util/SelectionGrid.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/SelectionGrid.java similarity index 98% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/util/SelectionGrid.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/SelectionGrid.java index d727bfcef..a42a0ff5f 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/util/SelectionGrid.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/SelectionGrid.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package com.eclipse.hawkbit.ui.view.util; +package org.eclipse.hawkbit.ui.view.util; import com.google.common.collect.Streams; import com.vaadin.flow.component.grid.Grid; diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/util/TableView.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/TableView.java similarity index 96% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/util/TableView.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/TableView.java index aca4ea957..9ec5cff54 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/util/TableView.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/TableView.java @@ -7,9 +7,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package com.eclipse.hawkbit.ui.view.util; +package org.eclipse.hawkbit.ui.view.util; -import com.eclipse.hawkbit.ui.view.Constants; +import org.eclipse.hawkbit.ui.view.Constants; import com.vaadin.flow.component.html.Div; import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.data.provider.Query; diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/util/Utils.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/Utils.java similarity index 99% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/util/Utils.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/Utils.java index 4609dd4c9..c851d9590 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/com/eclipse/hawkbit/ui/view/util/Utils.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/Utils.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package com.eclipse.hawkbit.ui.view.util; +package org.eclipse.hawkbit.ui.view.util; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.HasValue; @@ -30,7 +30,6 @@ import com.vaadin.flow.theme.lumo.LumoUtility; import java.util.Collection; import java.util.Iterator; -import java.util.Optional; import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/resources/application.properties b/hawkbit-runtime/hawkbit-simple-ui/src/main/resources/application.properties index 4a53e4d65..56448c291 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/resources/application.properties +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/resources/application.properties @@ -20,5 +20,5 @@ spring.mustache.check-template-location = false vaadin.launch-browser=true # To improve the performance during development. # For more information https://vaadin.com/docs/flow/spring/tutorial-spring-configuration.html#special-configuration-parameters -vaadin.whitelisted-packages = com.vaadin,org.vaadin,dev.hilla,com.eclipse.hawkbit +vaadin.whitelisted-packages = com.vaadin,org.vaadin,dev.hilla,org.eclipse.hawkbit ### Vaadin end ### \ No newline at end of file