diff --git a/hawkbit-runtime/hawkbit-simple-ui/pom.xml b/hawkbit-runtime/hawkbit-simple-ui/pom.xml index 983d5c2d0..abfb96dbd 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/pom.xml +++ b/hawkbit-runtime/hawkbit-simple-ui/pom.xml @@ -241,6 +241,18 @@ + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitClient.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/HawkbitClient.java similarity index 98% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitClient.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/HawkbitClient.java index 67fb85640..3a493e0bb 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitClient.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/HawkbitClient.java @@ -7,9 +7,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui; +package org.eclipse.hawkbit.ui.simple; -import org.eclipse.hawkbit.ui.view.util.Utils; +import org.eclipse.hawkbit.ui.simple.view.util.Utils; import feign.Client; import feign.Contract; import feign.Feign; diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/MainLayout.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/MainLayout.java similarity index 93% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/MainLayout.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/MainLayout.java index eb94f1657..2ee52a3f9 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/MainLayout.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/MainLayout.java @@ -7,14 +7,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui; +package org.eclipse.hawkbit.ui.simple; -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 org.eclipse.hawkbit.ui.simple.view.TargetView; +import org.eclipse.hawkbit.ui.simple.view.RolloutView; +import org.eclipse.hawkbit.ui.simple.security.AuthenticatedUser; +import org.eclipse.hawkbit.ui.simple.view.AboutView; +import org.eclipse.hawkbit.ui.simple.view.DistributionSetView; +import org.eclipse.hawkbit.ui.simple.view.SoftwareModuleView; import com.vaadin.flow.component.Unit; import com.vaadin.flow.component.applayout.AppLayout; import com.vaadin.flow.component.applayout.DrawerToggle; diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/SimpleUIApp.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java similarity index 99% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/SimpleUIApp.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java index 5918cca37..729db35a8 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/SimpleUIApp.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/SimpleUIApp.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui; +package org.eclipse.hawkbit.ui.simple; import com.vaadin.flow.component.page.AppShellConfigurator; import com.vaadin.flow.server.PWA; diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/security/AuthenticatedUser.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/AuthenticatedUser.java similarity index 94% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/security/AuthenticatedUser.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/AuthenticatedUser.java index 04ab5b57e..0e39188ba 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/security/AuthenticatedUser.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/AuthenticatedUser.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.security; +package org.eclipse.hawkbit.ui.simple.security; import com.vaadin.flow.spring.security.AuthenticationContext; import org.springframework.stereotype.Component; diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/security/SecurityConfiguration.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/SecurityConfiguration.java similarity index 93% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/security/SecurityConfiguration.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/SecurityConfiguration.java index dd2aff842..d0c3d4f73 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/security/SecurityConfiguration.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/security/SecurityConfiguration.java @@ -7,9 +7,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.security; +package org.eclipse.hawkbit.ui.simple.security; -import org.eclipse.hawkbit.ui.view.LoginView; +import org.eclipse.hawkbit.ui.simple.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/org/eclipse/hawkbit/ui/view/AboutView.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/AboutView.java similarity index 93% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/AboutView.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/AboutView.java index 517f8efff..60c38f9c6 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/AboutView.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/AboutView.java @@ -7,9 +7,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.view; +package org.eclipse.hawkbit.ui.simple.view; -import org.eclipse.hawkbit.ui.MainLayout; +import org.eclipse.hawkbit.ui.simple.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/org/eclipse/hawkbit/ui/view/Constants.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/Constants.java similarity index 96% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/Constants.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/Constants.java index f2ede440f..bf30b5ed3 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/Constants.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/Constants.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.view; +package org.eclipse.hawkbit.ui.simple.view; public interface Constants { diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/DistributionSetView.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/DistributionSetView.java similarity index 97% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/DistributionSetView.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/DistributionSetView.java index b84644f5e..659fb4e8c 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/DistributionSetView.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/DistributionSetView.java @@ -7,14 +7,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.view; +package org.eclipse.hawkbit.ui.simple.view; -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 org.eclipse.hawkbit.ui.simple.MainLayout; +import org.eclipse.hawkbit.ui.simple.HawkbitClient; +import org.eclipse.hawkbit.ui.simple.view.util.Filter; +import org.eclipse.hawkbit.ui.simple.view.util.SelectionGrid; +import org.eclipse.hawkbit.ui.simple.view.util.TableView; +import org.eclipse.hawkbit.ui.simple.view.util.Utils; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.Key; import com.vaadin.flow.component.button.Button; diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/LoginView.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/LoginView.java similarity index 94% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/LoginView.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/LoginView.java index 4f50b4684..6746a07d5 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/LoginView.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/LoginView.java @@ -7,9 +7,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.view; +package org.eclipse.hawkbit.ui.simple.view; -import org.eclipse.hawkbit.ui.security.AuthenticatedUser; +import org.eclipse.hawkbit.ui.simple.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/org/eclipse/hawkbit/ui/view/RolloutView.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/RolloutView.java similarity index 85% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/RolloutView.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/RolloutView.java index b624d8646..ca747824b 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/RolloutView.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/RolloutView.java @@ -7,14 +7,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.view; +package org.eclipse.hawkbit.ui.simple.view; -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 org.eclipse.hawkbit.ui.simple.HawkbitClient; +import org.eclipse.hawkbit.ui.simple.MainLayout; +import org.eclipse.hawkbit.ui.simple.view.util.SelectionGrid; +import org.eclipse.hawkbit.ui.simple.view.util.TableView; +import org.eclipse.hawkbit.ui.simple.view.util.Utils; +import org.eclipse.hawkbit.ui.simple.view.util.Filter; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.Key; import com.vaadin.flow.component.Text; @@ -69,14 +69,15 @@ public class RolloutView extends TableView { private final RolloutDetails details = new RolloutDetails(hawkbitClient); @Override protected void addColumns(final Grid grid) { - grid.addColumn(MgmtRolloutResponseBody::getRolloutId).setHeader(ID).setAutoWidth(true); - grid.addColumn(MgmtRolloutResponseBody::getName).setHeader(NAME).setAutoWidth(true); - grid.addColumn(MgmtRolloutResponseBody::getTotalGroups).setHeader(GROUP_COUNT).setAutoWidth(true); - grid.addColumn(MgmtRolloutResponseBody::getTotalTargets).setHeader(TARGET_COUNT).setAutoWidth(true); - grid.addColumn(MgmtRolloutResponseBody::getTotalTargetsPerStatus).setHeader(STATS).setAutoWidth(true); - grid.addColumn(MgmtRolloutResponseBody::getStatus).setHeader(STATUS).setAutoWidth(true); + grid.addColumn(MgmtRolloutResponseBody::getRolloutId).setHeader(Constants.ID).setAutoWidth(true); + grid.addColumn(MgmtRolloutResponseBody::getName).setHeader(Constants.NAME).setAutoWidth(true); + grid.addColumn(MgmtRolloutResponseBody::getTotalGroups).setHeader(Constants.GROUP_COUNT).setAutoWidth(true); + grid.addColumn(MgmtRolloutResponseBody::getTotalTargets).setHeader(Constants.TARGET_COUNT).setAutoWidth(true); + grid.addColumn(MgmtRolloutResponseBody::getTotalTargetsPerStatus).setHeader(Constants.STATS).setAutoWidth(true); + grid.addColumn(MgmtRolloutResponseBody::getStatus).setHeader(Constants.STATUS).setAutoWidth(true); - grid.addComponentColumn(rollout -> new Actions(rollout, grid, hawkbitClient)).setHeader(ACTIONS).setAutoWidth(true); + grid.addComponentColumn(rollout -> new Actions(rollout, grid, hawkbitClient)).setHeader( + Constants.ACTIONS).setAutoWidth(true); grid.setItemDetailsRenderer(new ComponentRenderer<>( () -> details, RolloutDetails::setItem)); @@ -84,7 +85,7 @@ public class RolloutView extends TableView { }, (query, rsqlFilter) -> hawkbitClient.getRolloutRestApi() .getRollouts( - query.getOffset(), query.getPageSize(), NAME_ASC, rsqlFilter, null) + query.getOffset(), query.getPageSize(), Constants.NAME_ASC, rsqlFilter, null) .getBody() .getContent() .stream(), @@ -102,11 +103,11 @@ public class RolloutView extends TableView { new SelectionGrid.EntityRepresentation<>(MgmtRolloutGroupResponseBody.class, MgmtRolloutGroupResponseBody::getRolloutGroupId) { @Override protected void addColumns(final Grid grid) { - grid.addColumn(MgmtRolloutGroupResponseBody::getRolloutGroupId).setHeader(ID).setAutoWidth(true); - grid.addColumn(MgmtRolloutGroupResponseBody::getName).setHeader(NAME).setAutoWidth(true); - grid.addColumn(MgmtRolloutGroupResponseBody::getTotalTargets).setHeader(TARGET_COUNT).setAutoWidth(true); - grid.addColumn(MgmtRolloutGroupResponseBody::getTotalTargetsPerStatus).setHeader(STATS).setAutoWidth(true); - grid.addColumn(MgmtRolloutGroupResponseBody::getStatus).setHeader(STATUS).setAutoWidth(true); + grid.addColumn(MgmtRolloutGroupResponseBody::getRolloutGroupId).setHeader(Constants.ID).setAutoWidth(true); + grid.addColumn(MgmtRolloutGroupResponseBody::getName).setHeader(Constants.NAME).setAutoWidth(true); + grid.addColumn(MgmtRolloutGroupResponseBody::getTotalTargets).setHeader(Constants.TARGET_COUNT).setAutoWidth(true); + grid.addColumn(MgmtRolloutGroupResponseBody::getTotalTargetsPerStatus).setHeader(Constants.STATS).setAutoWidth(true); + grid.addColumn(MgmtRolloutGroupResponseBody::getStatus).setHeader(Constants.STATUS).setAutoWidth(true); } }); } @@ -163,7 +164,7 @@ public class RolloutView extends TableView { private static class RolloutFilter implements Filter.Rsql { - private final TextField name = Utils.textField(NAME); + private final TextField name = Utils.textField(Constants.NAME); private RolloutFilter() { name.setPlaceholder(""); @@ -184,15 +185,15 @@ public class RolloutView 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 TextField targetFilter = Utils.textField(TARGET_FILTER); - private final TextField distributionSet = Utils.textField(DISTRIBUTION_SET); - private final TextField actonType = Utils.textField(ACTION_TYPE); - private final TextField startAt = Utils.textField(START_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 TextField targetFilter = Utils.textField(Constants.TARGET_FILTER); + private final TextField distributionSet = Utils.textField(Constants.DISTRIBUTION_SET); + private final TextField actonType = Utils.textField(Constants.ACTION_TYPE); + private final TextField startAt = Utils.textField(Constants.START_AT); private final SelectionGrid groupGrid; private RolloutDetails(final HawkbitClient hawkbitClient) { @@ -228,9 +229,9 @@ public class RolloutView extends TableView { .getDistributionSet(rollout.getDistributionSetId()).getBody(); distributionSet.setValue(distributionSetMgmt.getName() + ":" + distributionSetMgmt.getVersion()); actonType.setValue(switch (rollout.getType()) { - case SOFT -> SOFT; - case FORCED -> FORCED; - case DOWNLOAD_ONLY -> DOWNLOAD_ONLY; + case SOFT -> Constants.SOFT; + case FORCED -> Constants.FORCED; + case DOWNLOAD_ONLY -> Constants.DOWNLOAD_ONLY; case TIMEFORCED -> "Scheduled at " + new Date(rollout.getForcetime()); }); startAt.setValue(ObjectUtils.isEmpty(rollout.getStartAt()) ? "" : new Date(rollout.getStartAt()).toString()); @@ -261,7 +262,7 @@ public class RolloutView extends TableView { private final Select actionType; private final DateTimePicker forceTime = new DateTimePicker("Force Time"); private final Select startType; - private final DateTimePicker startAt = new DateTimePicker(START_AT); + private final DateTimePicker startAt = new DateTimePicker(Constants.START_AT); private final NumberField groupNumber; private final NumberField triggerThreshold; private final NumberField errorThreshold; @@ -277,7 +278,7 @@ public class RolloutView extends TableView { "Distribution Set", this::readyToCreate, hawkbitClient.getDistributionSetRestApi() - .getDistributionSets(0, 30, NAME_ASC, null) + .getDistributionSets(0, 30, Constants.NAME_ASC, null) .getBody() .getContent() .toArray(new MgmtDistributionSet[0])); @@ -289,54 +290,54 @@ public class RolloutView extends TableView { "Target Filter", this::readyToCreate, hawkbitClient.getTargetFilterQueryRestApi() - .getFilters(0, 30, NAME_ASC, null, null) + .getFilters(0, 30, Constants.NAME_ASC, null, null) .getBody() .getContent() .toArray(new MgmtTargetFilterQuery[0])); targetFilter.setRequiredIndicatorVisible(true); targetFilter.setItemLabelGenerator(MgmtTargetFilterQuery::getName); targetFilter.setWidthFull(); - description = new TextArea(DESCRIPTION); + description = new TextArea(Constants.DESCRIPTION); description.setMinLength(2); description.setWidthFull(); actionType = new Select<>(); - actionType.setLabel(ACTION_TYPE); + actionType.setLabel(Constants.ACTION_TYPE); actionType.setItems(MgmtActionType.values()); actionType.setValue(MgmtActionType.FORCED); final ComponentRenderer actionTypeRenderer = new ComponentRenderer<>(actionTypeO -> switch (actionTypeO) { - case SOFT -> new Text(SOFT); - case FORCED -> new Text(FORCED); - case DOWNLOAD_ONLY -> new Text(DOWNLOAD_ONLY); + case SOFT -> new Text(Constants.SOFT); + case FORCED -> new Text(Constants.FORCED); + case DOWNLOAD_ONLY -> new Text(Constants.DOWNLOAD_ONLY); case TIMEFORCED -> forceTime; }); actionType.addValueChangeListener(e -> actionType.setRenderer(actionTypeRenderer)); actionType.setItemLabelGenerator(startTypeO -> switch (startTypeO) { - case SOFT -> SOFT; - case FORCED -> FORCED; - case DOWNLOAD_ONLY -> DOWNLOAD_ONLY; + case SOFT -> Constants.SOFT; + case FORCED -> Constants.FORCED; + case DOWNLOAD_ONLY -> Constants.DOWNLOAD_ONLY; case TIMEFORCED -> "Time Forced at " + (forceTime.isEmpty() ? "" : " " + forceTime.getValue()); }); actionType.setWidthFull(); startType = new Select<>(); startType.setValue(StartType.MANUAL); - startType.setLabel(START_TYPE); + startType.setLabel(Constants.START_TYPE); startType.setItems(StartType.values()); startType.setValue(StartType.MANUAL); final ComponentRenderer startTypeRenderer = new ComponentRenderer<>(startTypeO -> switch (startTypeO) { - case MANUAL -> new Text(MANUAL); - case AUTO -> new Text(AUTO); + case MANUAL -> new Text(Constants.MANUAL); + case AUTO -> new Text(Constants.AUTO); case SCHEDULED -> startAt; }); startType.setRenderer(startTypeRenderer); startType.addValueChangeListener(e -> startType.setRenderer(startTypeRenderer)); startType.setItemLabelGenerator(startTypeO -> switch (startTypeO) { - case MANUAL -> MANUAL; - case AUTO -> AUTO; + case MANUAL -> Constants.MANUAL; + case AUTO -> Constants.AUTO; case SCHEDULED -> "Scheduled" + (startAt.isEmpty() ? "" : " at " + startAt.getValue()); }); startType.setWidthFull(); diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/SoftwareModuleView.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/SoftwareModuleView.java similarity index 97% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/SoftwareModuleView.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/SoftwareModuleView.java index 788180287..046fd91d3 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/SoftwareModuleView.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/SoftwareModuleView.java @@ -7,14 +7,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.view; +package org.eclipse.hawkbit.ui.simple.view; -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 org.eclipse.hawkbit.ui.simple.HawkbitClient; +import org.eclipse.hawkbit.ui.simple.MainLayout; +import org.eclipse.hawkbit.ui.simple.view.util.SelectionGrid; +import org.eclipse.hawkbit.ui.simple.view.util.TableView; +import org.eclipse.hawkbit.ui.simple.view.util.Utils; +import org.eclipse.hawkbit.ui.simple.view.util.Filter; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.Key; import com.vaadin.flow.component.button.Button; diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java similarity index 97% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java index b072fa75c..82955ac69 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/TargetView.java @@ -7,14 +7,14 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.view; +package org.eclipse.hawkbit.ui.simple.view; -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 org.eclipse.hawkbit.ui.simple.HawkbitClient; +import org.eclipse.hawkbit.ui.simple.view.util.Filter; +import org.eclipse.hawkbit.ui.simple.MainLayout; +import org.eclipse.hawkbit.ui.simple.view.util.SelectionGrid; +import org.eclipse.hawkbit.ui.simple.view.util.TableView; +import org.eclipse.hawkbit.ui.simple.view.util.Utils; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.Key; import com.vaadin.flow.component.button.Button; diff --git a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/Filter.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java similarity index 99% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/Filter.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java index e8ebf650b..0a47611b4 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/Filter.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.view.util; +package org.eclipse.hawkbit.ui.simple.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/org/eclipse/hawkbit/ui/view/util/SelectionGrid.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/SelectionGrid.java similarity index 98% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/SelectionGrid.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/SelectionGrid.java index a42a0ff5f..d6b497769 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/SelectionGrid.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/SelectionGrid.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.view.util; +package org.eclipse.hawkbit.ui.simple.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/org/eclipse/hawkbit/ui/view/util/TableView.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/TableView.java similarity index 96% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/TableView.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/TableView.java index 9ec5cff54..f5d923d99 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/TableView.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/TableView.java @@ -7,9 +7,9 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.view.util; +package org.eclipse.hawkbit.ui.simple.view.util; -import org.eclipse.hawkbit.ui.view.Constants; +import org.eclipse.hawkbit.ui.simple.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/org/eclipse/hawkbit/ui/view/util/Utils.java b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Utils.java similarity index 99% rename from hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/Utils.java rename to hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Utils.java index c851d9590..449090dae 100644 --- a/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/view/util/Utils.java +++ b/hawkbit-runtime/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Utils.java @@ -7,7 +7,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ui.view.util; +package org.eclipse.hawkbit.ui.simple.view.util; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.HasValue;