From 1a243b3a4e5a91f9f624810c881afbe30ab763c8 Mon Sep 17 00:00:00 2001 From: Michael Hirsch Date: Tue, 6 Sep 2016 14:24:50 +0200 Subject: [PATCH] code improvements Signed-off-by: Michael Hirsch --- .../repository/jpa/model/JpaAction.java | 4 +- .../jpa/model/JpaDistributionSet.java | 5 +- .../repository/jpa/model/JpaRollout.java | 4 +- .../repository/jpa/model/JpaRolloutGroup.java | 4 +- .../helper/EntityPropertyChangeHelper.java | 13 +- .../management/dstable/DistributionTable.java | 17 +- .../hawkbit/ui/utils/HawkbitCommonUtil.java | 227 ------------------ 7 files changed, 20 insertions(+), 254 deletions(-) diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaAction.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaAction.java index 72ef46ba3..42184c8b0 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaAction.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaAction.java @@ -183,8 +183,8 @@ public class JpaAction extends AbstractJpaTenantAwareBaseEntity implements Actio @Override public void fireUpdateEvent(final DescriptorEvent descriptorEvent) { - EventBusHolder.getInstance().getEventBus().post(new ActionPropertyChangeEvent(this, - EntityPropertyChangeHelper.getChangeSet(Action.class, descriptorEvent))); + EventBusHolder.getInstance().getEventBus() + .post(new ActionPropertyChangeEvent(this, EntityPropertyChangeHelper.getChangeSet(descriptorEvent))); } @Override diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java index 661474668..6f7d05f60 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java @@ -72,8 +72,6 @@ import org.eclipse.persistence.descriptors.DescriptorEvent; public class JpaDistributionSet extends AbstractJpaNamedVersionedEntity implements DistributionSet, EventAwareEntity { private static final long serialVersionUID = 1L; - private static final String COMPLETE_PROPERTY = "complete"; - private static final String DELETED_PROPERTY = "deleted"; @Column(name = "required_migration_step") @@ -299,8 +297,7 @@ public class JpaDistributionSet extends AbstractJpaNamedVersionedEntity implemen @Override public void fireUpdateEvent(final DescriptorEvent descriptorEvent) { - final Map changeSet = EntityPropertyChangeHelper.getChangeSet(JpaDistributionSet.class, - descriptorEvent); + final Map changeSet = EntityPropertyChangeHelper.getChangeSet(descriptorEvent); EventBusHolder.getInstance().getEventBus().post(new DistributionSetUpdateEvent(this)); if (changeSet.containsKey(DELETED_PROPERTY)) { diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRollout.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRollout.java index 85395e27b..570158240 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRollout.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRollout.java @@ -208,8 +208,8 @@ public class JpaRollout extends AbstractJpaNamedEntity implements Rollout, Event @Override public void fireUpdateEvent(final DescriptorEvent descriptorEvent) { - EventBusHolder.getInstance().getEventBus().post(new RolloutPropertyChangeEvent(this, - EntityPropertyChangeHelper.getChangeSet(Rollout.class, descriptorEvent))); + EventBusHolder.getInstance().getEventBus() + .post(new RolloutPropertyChangeEvent(this, EntityPropertyChangeHelper.getChangeSet(descriptorEvent))); } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRolloutGroup.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRolloutGroup.java index 9bb8644f4..0c43bf2da 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRolloutGroup.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRolloutGroup.java @@ -247,8 +247,8 @@ public class JpaRolloutGroup extends AbstractJpaNamedEntity implements RolloutGr @Override public void fireUpdateEvent(final DescriptorEvent descriptorEvent) { - EventBusHolder.getInstance().getEventBus().post(new RolloutGroupPropertyChangeEvent(this, - EntityPropertyChangeHelper.getChangeSet(RolloutGroup.class, descriptorEvent))); + EventBusHolder.getInstance().getEventBus().post( + new RolloutGroupPropertyChangeEvent(this, EntityPropertyChangeHelper.getChangeSet(descriptorEvent))); } @Override diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/EntityPropertyChangeHelper.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/EntityPropertyChangeHelper.java index 9e759640d..3d296c513 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/EntityPropertyChangeHelper.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/EntityPropertyChangeHelper.java @@ -12,7 +12,6 @@ import java.util.Map; import java.util.stream.Collectors; import org.eclipse.hawkbit.repository.eventbus.event.AbstractPropertyChangeEvent.PropertyChange; -import org.eclipse.hawkbit.repository.model.TenantAwareBaseEntity; import org.eclipse.persistence.descriptors.DescriptorEvent; import org.eclipse.persistence.internal.sessions.ObjectChangeSet; import org.eclipse.persistence.queries.UpdateObjectQuery; @@ -21,9 +20,12 @@ import org.eclipse.persistence.sessions.changesets.DirectToFieldChangeRecord; /** * Helper class to get the change set for the property changes in the Entity. * - * @param */ -public class EntityPropertyChangeHelper { +public final class EntityPropertyChangeHelper { + + private EntityPropertyChangeHelper() { + // noop + } /** * To get the map of entity property change set @@ -32,14 +34,11 @@ public class EntityPropertyChangeHelper { * @param event * @return the map of the changeSet */ - public static Map getChangeSet(final Class clazz, - final DescriptorEvent event) { - final T rolloutGroup = clazz.cast(event.getObject()); + public static Map getChangeSet(final DescriptorEvent event) { final ObjectChangeSet changeSet = ((UpdateObjectQuery) event.getQuery()).getObjectChangeSet(); return changeSet.getChanges().stream().filter(record -> record instanceof DirectToFieldChangeRecord) .map(record -> (DirectToFieldChangeRecord) record) .collect(Collectors.toMap(record -> record.getAttribute(), record -> new PropertyChange(record.getOldValue(), record.getNewValue()))); } - } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java index b6b616417..3bf60df52 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java @@ -18,7 +18,6 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; import org.eclipse.hawkbit.repository.DistributionSetManagement; -import org.eclipse.hawkbit.repository.EntityFactory; import org.eclipse.hawkbit.repository.SpPermissionChecker; import org.eclipse.hawkbit.repository.TargetManagement; import org.eclipse.hawkbit.repository.eventbus.event.DistributionCreatedEvent; @@ -84,7 +83,7 @@ public class DistributionTable extends AbstractNamedVersionTable= 1 && managementUIState.getDistributionTableFilters().isNoTagSelected()) { refreshFilter(); } @@ -414,7 +410,8 @@ public class DistributionTable extends AbstractNamedVersionTable" + getFormattedName(desc)) - .append(DIV_DESCRIPTION_END).toString(); - } - /** * Get Label for Artifact Details. * @@ -294,31 +238,6 @@ public final class HawkbitCommonUtil { return trimAndNullIfEmpty(orgText) == null ? SPUIDefinitions.SPACE : orgText; } - /** - * Find extra height required to increase by all the components to utilize - * the full height of browser for the responsive UI. - * - * @param newBrowserHeight - * as current browser height. - * @return extra height required to increase. - */ - public static float findRequiredExtraHeight(final float newBrowserHeight) { - return newBrowserHeight > SPUIDefinitions.REQ_MIN_BROWSER_HEIGHT - ? (newBrowserHeight - SPUIDefinitions.REQ_MIN_BROWSER_HEIGHT) : 0; - } - - /** - * Find required extra height of software module. - * - * @param newBrowserHeight - * new browser height - * @return float heigth of software module table - */ - public static float findRequiredSwModuleExtraHeight(final float newBrowserHeight) { - return newBrowserHeight > SPUIDefinitions.REQ_MIN_UPLOAD_BROWSER_HEIGHT - ? (newBrowserHeight - SPUIDefinitions.REQ_MIN_UPLOAD_BROWSER_HEIGHT) : 0; - } - /** * Find required extra width of software module. * @@ -363,94 +282,6 @@ public final class HawkbitCommonUtil { return extraWidth + minPopupHeight; } - /** - * Find extra width required to increase by all the components to utilize - * the full width of browser for the responsive UI. - * - * @param newBrowserWidth - * as current browser width. - * @return extra width required to be increased. - */ - public static float findRequiredExtraWidth(final float newBrowserWidth) { - float width = 0; - if (newBrowserWidth < SPUIDefinitions.REQ_MIN_BROWSER_WIDTH) { - width = SPUIDefinitions.REQ_MIN_BROWSER_WIDTH - newBrowserWidth; - } - return width; - } - - /** - * Find extra width required to increase by all the components to utilize - * the full width of browser for the responsive UI. - * - * @param newBrowserWidth - * as current browser width. - * @return extra width required to be increased. - */ - public static float findExtraWidth(final float newBrowserWidth) { - return newBrowserWidth > SPUIDefinitions.REQ_MIN_BROWSER_WIDTH - ? (newBrowserWidth - SPUIDefinitions.REQ_MIN_BROWSER_WIDTH) : 0; - } - - /** - * Get target table width based on screen width. - * - * @param newBrowserWidth - * new browser width. - * @param minTargetTableLength - * minimum target table width. - * @param minDistTableLength - * minimum distribution table width. - * @return float as table width - */ - public static float getTargetTableWidth(final float newBrowserWidth, final float minTargetTableLength, - final float minDistTableLength) { - float width = 0; - final float requiredExtraWidth = findRequiredExtraWidth(newBrowserWidth); - // adjusting the target table width if distribution table width has - // reached the maximum width - if (requiredExtraWidth + minDistTableLength > SPUIDefinitions.MAX_DIST_TABLE_WIDTH) { - width = requiredExtraWidth + minDistTableLength - SPUIDefinitions.MAX_DIST_TABLE_WIDTH; - } - if (width + minTargetTableLength + requiredExtraWidth > SPUIDefinitions.MAX_TARGET_TABLE_WIDTH) { - return SPUIDefinitions.MAX_TARGET_TABLE_WIDTH; - } - return width + minTargetTableLength + requiredExtraWidth; - } - - /** - * Get distribution table width based on screen width. - * - * @param newBrowserWidth - * new browser width. - * @param minTableWidth - * min distribution table width. - * @return float as distribution table width. - */ - public static float getDistTableWidth(final float newBrowserWidth, final float minTableWidth) { - final float requiredExtraWidth = findExtraWidth(newBrowserWidth); - float expectedDistWidth = minTableWidth; - if (requiredExtraWidth > 0) { - expectedDistWidth = expectedDistWidth + Math.round(requiredExtraWidth * 0.5F); - } - return expectedDistWidth; - } - - /** - * Get software module table width. - * - * @param newBrowserWidth - * @param minTableWidth - * @return - */ - public static float getSoftwareModuleTableWidth(final float newBrowserWidth, final float minTableWidth) { - final float requiredExtraWidth = findRequiredExtraWidth(newBrowserWidth); - if (requiredExtraWidth + minTableWidth > SPUIDefinitions.MAX_UPLOAD_SW_MODULE_TABLE_WIDTH) { - return SPUIDefinitions.MAX_UPLOAD_SW_MODULE_TABLE_WIDTH; - } - return requiredExtraWidth + minTableWidth; - } - /** * Remove the prefix from text. * @@ -514,55 +345,6 @@ public final class HawkbitCommonUtil { return name + ":" + version; } - /** - * Set height of artifact details table and drop area layout. - * - * @param dropLayout - * drop area layout - * @param artifactDetailsLayout - * artifact details table - * @param newHeight - * new browser height - */ - public static void setArtifactDetailsLayoutHeight(final Component artifactDetailsLayout, final float newHeight) { - final float extraBrowserHeight = HawkbitCommonUtil.findRequiredSwModuleExtraHeight(newHeight); - final float tableHeight = SPUIDefinitions.MIN_UPLOAD_ARTIFACT_TABLE_HEIGHT + extraBrowserHeight; - artifactDetailsLayout.setHeight(tableHeight, Unit.PIXELS); - } - - /** - * Set height of artifact details table and drop area layout. - * - * @param artifactDetailsLayout - * artifact details table - * @param newHeight - * new browser height - */ - public static void setManageDistArtifactDetailsLayoutHeight(final Component artifactDetailsLayout, - final float newHeight) { - final float tableHeight = SPUIDefinitions.MIN_TARGET_DIST_TABLE_HEIGHT - + HawkbitCommonUtil.findRequiredExtraHeight(newHeight) + 62; - artifactDetailsLayout.setHeight(tableHeight, Unit.PIXELS); - } - - /** - * Duplicate check - Unique Key. - * - * @param name - * as string - * @param version - * as string - * @param type - * key as string - * @return boolean as flag - */ - public static boolean isDuplicate(final String name, final String version, final String type) { - final SoftwareManagement swMgmtService = SpringContextHelper.getBean(SoftwareManagement.class); - final SoftwareModule swModule = swMgmtService.findSoftwareModuleByNameAndVersion(name, version, - swMgmtService.findSoftwareModuleTypeByName(type)); - return swModule != null; - } - /** * Add new base software module. * @@ -593,15 +375,6 @@ public final class HawkbitCommonUtil { return newSWModule; } - public static void setTargetVisibleColumns(final Table targTable) { - final List targColumnIds = new ArrayList<>(); - final List targColumnLabels = new ArrayList<>(); - targColumnIds.add(SPUIDefinitions.TARGET_TABLE_VISIBILE_COLUMN_NAME); - targColumnLabels.add(SPUIDefinitions.TARGET_TABLE_VISIBILE_COLUMN_NAME); - targTable.setVisibleColumns(targColumnIds.toArray()); - targTable.setColumnHeaders(targColumnLabels.toArray(new String[0])); - } - /** * @param distName * @param distVersion