From 8d5acfdf04ca2b267f99fe13a5cbc5021de89d29 Mon Sep 17 00:00:00 2001 From: Ruud Senden <8635138+rsenden@users.noreply.github.com> Date: Tue, 19 Sep 2023 09:38:59 +0200 Subject: [PATCH] chore: Rename package for consistency --- .../fod/app/attr/{cli => }/helper/FoDAttributeDescriptor.java | 2 +- .../cli/fod/app/attr/{cli => }/helper/FoDAttributeHelper.java | 2 +- .../fod/app/attr/{cli => }/helper/FoDPickListDescriptor.java | 2 +- .../com/fortify/cli/fod/app/cli/cmd/FoDAppCreateCommand.java | 2 +- .../com/fortify/cli/fod/app/cli/cmd/FoDAppUpdateCommand.java | 4 ++-- .../java/com/fortify/cli/fod/app/helper/FoDAppDescriptor.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/{cli => }/helper/FoDAttributeDescriptor.java (96%) rename fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/{cli => }/helper/FoDAttributeHelper.java (99%) rename fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/{cli => }/helper/FoDPickListDescriptor.java (95%) diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDAttributeDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/helper/FoDAttributeDescriptor.java similarity index 96% rename from fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDAttributeDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/helper/FoDAttributeDescriptor.java index 09163441e7..5b83bb0a40 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDAttributeDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/helper/FoDAttributeDescriptor.java @@ -10,7 +10,7 @@ * herein. The information contained herein is subject to change * without notice. *******************************************************************************/ -package com.fortify.cli.fod.app.attr.cli.helper; +package com.fortify.cli.fod.app.attr.helper; import java.util.ArrayList; diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDAttributeHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/helper/FoDAttributeHelper.java similarity index 99% rename from fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDAttributeHelper.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/helper/FoDAttributeHelper.java index bd1a74bc5b..6468815d7f 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDAttributeHelper.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/helper/FoDAttributeHelper.java @@ -10,7 +10,7 @@ * herein. The information contained herein is subject to change * without notice. *******************************************************************************/ -package com.fortify.cli.fod.app.attr.cli.helper; +package com.fortify.cli.fod.app.attr.helper; import java.util.ArrayList; import java.util.HashMap; diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDPickListDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/helper/FoDPickListDescriptor.java similarity index 95% rename from fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDPickListDescriptor.java rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/helper/FoDPickListDescriptor.java index 2e6b5af432..86ebfe9145 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/cli/helper/FoDPickListDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/attr/helper/FoDPickListDescriptor.java @@ -10,7 +10,7 @@ * herein. The information contained herein is subject to change * without notice. *******************************************************************************/ -package com.fortify.cli.fod.app.attr.cli.helper; +package com.fortify.cli.fod.app.attr.helper; import com.formkiq.graalvm.annotations.Reflectable; import com.fortify.cli.common.json.JsonNodeHolder; diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateCommand.java index c0deeb96ce..862b050a28 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateCommand.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCreateCommand.java @@ -26,8 +26,8 @@ import com.fortify.cli.common.util.DisableTest; import com.fortify.cli.common.util.StringUtils; import com.fortify.cli.fod._common.output.cli.AbstractFoDJsonNodeOutputCommand; -import com.fortify.cli.fod.app.attr.cli.helper.FoDAttributeHelper; import com.fortify.cli.fod.app.attr.cli.mixin.FoDAttributeUpdateOptions; +import com.fortify.cli.fod.app.attr.helper.FoDAttributeHelper; import com.fortify.cli.fod.app.cli.mixin.FoDAppTypeOptions; import com.fortify.cli.fod.app.cli.mixin.FoDCriticalityTypeOptions; import com.fortify.cli.fod.app.cli.mixin.FoDMicroserviceAndReleaseNameResolverMixin; diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppUpdateCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppUpdateCommand.java index 76d2b5bd91..b14f244aec 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppUpdateCommand.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppUpdateCommand.java @@ -25,9 +25,9 @@ import com.fortify.cli.common.util.DisableTest; import com.fortify.cli.common.util.StringUtils; import com.fortify.cli.fod._common.output.cli.AbstractFoDJsonNodeOutputCommand; -import com.fortify.cli.fod.app.attr.cli.helper.FoDAttributeDescriptor; -import com.fortify.cli.fod.app.attr.cli.helper.FoDAttributeHelper; import com.fortify.cli.fod.app.attr.cli.mixin.FoDAttributeUpdateOptions; +import com.fortify.cli.fod.app.attr.helper.FoDAttributeDescriptor; +import com.fortify.cli.fod.app.attr.helper.FoDAttributeHelper; import com.fortify.cli.fod.app.cli.mixin.FoDAppResolverMixin; import com.fortify.cli.fod.app.cli.mixin.FoDCriticalityTypeOptions; import com.fortify.cli.fod.app.helper.FoDAppDescriptor; diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppDescriptor.java index 874c37108a..34e53025fb 100644 --- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppDescriptor.java +++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/helper/FoDAppDescriptor.java @@ -18,7 +18,7 @@ import com.formkiq.graalvm.annotations.Reflectable; import com.fortify.cli.common.json.JsonNodeHolder; -import com.fortify.cli.fod.app.attr.cli.helper.FoDAttributeDescriptor; +import com.fortify.cli.fod.app.attr.helper.FoDAttributeDescriptor; import lombok.Data; import lombok.EqualsAndHashCode;