Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[artifact-manager,plugins,installer] (#305) Restructure Aria Operations components #593

Merged
merged 11 commits into from
Jan 17, 2025
Merged

[artifact-manager,plugins,installer] (#305) Restructure Aria Operations components #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4c9e7c0
refactor(vrops): Moved models
Michaelpalacce Jan 16, 2025
46690a1
refactor(vrops): Removed old models
Michaelpalacce Jan 16, 2025
b6f95e9
fix(vrops): Importedt the VROPS classes everywhere needed
Michaelpalacce Jan 16, 2025
09c86d6
feat(vrang): Moved tests and store models to the correct place
Michaelpalacce Jan 16, 2025
af4def4
refactor(vrops-tests): Moved to correct place
Michaelpalacce Jan 16, 2025
b6ece6a
refactor(vrops): Moved vrops store models to the correct place
Michaelpalacce Jan 16, 2025
f21c20d
fix: Import for mojo
Michaelpalacce Jan 16, 2025
f83940a
docs: Release docs
Michaelpalacce Jan 16, 2025
61f43b5
style(lint): Cleared lint from the codeql report
Michaelpalacce Jan 16, 2025
6df96d4
Merge branch 'main' of https://github.com/vmware/build-tools-for-vmwa…
Michaelpalacce Jan 16, 2025
23e4f1c
style(lint): Declared CliManagerFactory as final
Michaelpalacce Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/IMPORTANT.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The structure of this folder is being reworked. Classes are being moved based on
- [x] Aria Automation
- [ ] Aria Orchestrator
- [ ] Aria Logs
- [ ] Aria Operations
- [x] Aria Operations
- [ ] SSH
- [ ] vCD
- [ ] CS
Expand Down
4 changes: 4 additions & 0 deletions common/artifact-manager/src/main/java/com/vmware/pscoe/iac/artifact/PackageStoreFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@
import org.slf4j.LoggerFactory;

import com.vmware.pscoe.iac.artifact.aria.automation.rest.RestClientVraNg;
import com.vmware.pscoe.iac.artifact.aria.operations.configuration.ConfigurationVrops;
import com.vmware.pscoe.iac.artifact.aria.operations.rest.RestClientVrops;
import com.vmware.pscoe.iac.artifact.aria.operations.store.VropsPackageStore;
import com.vmware.pscoe.iac.artifact.aria.automation.configuration.ConfigurationVraNg;
import com.vmware.pscoe.iac.artifact.aria.automation.pack.VraNgPackageStore;
import com.vmware.pscoe.iac.artifact.cli.CliManagerFactory;
import com.vmware.pscoe.iac.artifact.cli.CliManagerVrops;
import com.vmware.pscoe.iac.artifact.model.Version;
Expand Down
13 changes: 8 additions & 5 deletions ...automation/package/VraNgPackageStore.java → ...ia/automation/pack/VraNgPackageStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* LICENSE file.
* #L%
*/
package com.vmware.pscoe.iac.artifact;
package com.vmware.pscoe.iac.artifact.aria.automation.pack;

import java.io.File;
import java.io.IOException;
Expand All @@ -25,12 +25,15 @@
import java.util.Collections;
import java.util.List;

import com.vmware.pscoe.iac.artifact.GenericPackageStore;
import com.vmware.pscoe.iac.artifact.PackageManager;
import com.vmware.pscoe.iac.artifact.PackageStore;
import com.vmware.pscoe.iac.artifact.aria.automation.configuration.ConfigurationVraNg;
import com.vmware.pscoe.iac.artifact.model.Package;
import com.vmware.pscoe.iac.artifact.model.PackageContent.Content;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageAdapter;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageDescriptor;
import com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageAdapter;
import com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent;
import com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageDescriptor;
import com.vmware.pscoe.iac.artifact.aria.automation.rest.RestClientVraNg;
import com.vmware.pscoe.iac.artifact.aria.automation.store.VraNgTypeStoreFactory;

Expand Down Expand Up @@ -58,7 +61,7 @@ public class VraNgPackageStore extends GenericPackageStore<VraNgPackageDescripto
* @param vraRestClient the vRA rest client
* @param vraConfig the vRA config
*/
protected VraNgPackageStore(final RestClientVraNg vraRestClient, final ConfigurationVraNg vraConfig) {
public VraNgPackageStore(final RestClientVraNg vraRestClient, final ConfigurationVraNg vraConfig) {
this.restClient = vraRestClient;
this.config = vraConfig;
}
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/vmware/pscoe/iac/artifact/aria/automation/store/AbstractVraNgStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import com.vmware.pscoe.iac.artifact.aria.automation.configuration.ConfigurationVraNg;
import com.vmware.pscoe.iac.artifact.model.Package;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgIntegration;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageDescriptor;
import com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageDescriptor;
import com.vmware.pscoe.iac.artifact.aria.automation.rest.RestClientVraNg;
import com.vmware.pscoe.iac.artifact.aria.automation.utils.VraNgIntegrationUtils;

Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgContentSourceStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgContentSourceBase;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgContentSourceType;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgIntegration;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageDescriptor;
import com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageDescriptor;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgWorkflow;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgWorkflowContentSource;
import com.vmware.pscoe.iac.artifact.aria.automation.rest.RestClientVraNg;
Expand Down
2 changes: 1 addition & 1 deletion ...in/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgCustomResourceStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import com.vmware.pscoe.iac.artifact.aria.automation.configuration.ConfigurationVraNg;
import com.vmware.pscoe.iac.artifact.model.Package;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgCustomResource;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageDescriptor;
import com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageDescriptor;
import com.vmware.pscoe.iac.artifact.aria.automation.rest.RestClientVraNg;
import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter;
import com.vmware.pscoe.iac.artifact.aria.automation.utils.VraNgOrganizationUtil;
Expand Down
2 changes: 1 addition & 1 deletion .../main/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgEntitlementStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgCatalogItem;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgContentSourceBase;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgContentSourceType;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageDescriptor;
import com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageDescriptor;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgProject;
import com.vmware.pscoe.iac.artifact.aria.automation.rest.RestClientVraNg;
import com.vmware.pscoe.iac.artifact.store.filters.CustomFolderFileFilter;
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgPropertyGroupStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import com.google.gson.stream.JsonReader;
import com.vmware.pscoe.iac.artifact.aria.automation.configuration.ConfigurationVraNg;
import com.vmware.pscoe.iac.artifact.model.Package;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageDescriptor;
import com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageDescriptor;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPropertyGroup;
import com.vmware.pscoe.iac.artifact.aria.automation.rest.RestClientVraNg;

Expand Down
2 changes: 1 addition & 1 deletion ...main/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgSubscriptionStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import com.vmware.pscoe.iac.artifact.aria.automation.configuration.ConfigurationVraNg;
import com.vmware.pscoe.iac.artifact.model.Package;
import com.vmware.pscoe.iac.artifact.model.abx.AbxAction;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageDescriptor;
import com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageDescriptor;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgProject;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgSubscription;
import com.vmware.pscoe.iac.artifact.aria.automation.rest.RestClientVraNg;
Expand Down
32 changes: 16 additions & 16 deletions .../main/java/com/vmware/pscoe/iac/artifact/aria/automation/store/VraNgTypeStoreFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,24 @@

import com.vmware.pscoe.iac.artifact.aria.automation.configuration.ConfigurationVraNg;
import com.vmware.pscoe.iac.artifact.model.Package;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent;
import com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageDescriptor;
import com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent;
import com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageDescriptor;
import com.vmware.pscoe.iac.artifact.aria.automation.rest.RestClientVraNg;

import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.APPROVAL_POLICY;
import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.BLUEPRINT;
import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.CATALOG_ENTITLEMENT;
import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.CATALOG_ITEM;
import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.CONTENT_SHARING_POLICY;
import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.CONTENT_SOURCE;
import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.CUSTOM_RESOURCE;
import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.DAY2_ACTIONS_POLICY;
import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.DEPLOYMENT_LIMIT_POLICY;
import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.LEASE_POLICY;
import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.PROPERTY_GROUP;
import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.RESOURCE_ACTION;
import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.RESOURCE_QUOTA_POLICY;
import static com.vmware.pscoe.iac.artifact.aria.automation.models.VraNgPackageContent.ContentType.SUBSCRIPTION;
import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.APPROVAL_POLICY;
import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.BLUEPRINT;
import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.CATALOG_ENTITLEMENT;
import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.CATALOG_ITEM;
import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.CONTENT_SHARING_POLICY;
import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.CONTENT_SOURCE;
import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.CUSTOM_RESOURCE;
import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.DAY2_ACTIONS_POLICY;
import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.DEPLOYMENT_LIMIT_POLICY;
import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.LEASE_POLICY;
import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.PROPERTY_GROUP;
import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.RESOURCE_ACTION;
import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.RESOURCE_QUOTA_POLICY;
import static com.vmware.pscoe.iac.artifact.aria.automation.store.models.VraNgPackageContent.ContentType.SUBSCRIPTION;

/**
* Factory to select and setup the store (handler) and determine the order of
Expand Down
2 changes: 1 addition & 1 deletion ...utomation/models/VraNgPackageAdapter.java → ...ion/store/models/VraNgPackageAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
* #L%
*/
package com.vmware.pscoe.iac.artifact.aria.automation.models;
package com.vmware.pscoe.iac.artifact.aria.automation.store.models;

import java.io.IOException;
import java.nio.file.Files;
Expand Down
2 changes: 1 addition & 1 deletion ...utomation/models/VraNgPackageContent.java → ...ion/store/models/VraNgPackageContent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
* #L%
*/
package com.vmware.pscoe.iac.artifact.aria.automation.models;
package com.vmware.pscoe.iac.artifact.aria.automation.store.models;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion ...mation/models/VraNgPackageDescriptor.java → .../store/models/VraNgPackageDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
* #L%
*/
package com.vmware.pscoe.iac.artifact.aria.automation.models;
package com.vmware.pscoe.iac.artifact.aria.automation.store.models;

import java.io.File;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion ...mation/models/VraNgPackageMemberType.java → .../store/models/VraNgPackageMemberType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
* #L%
*/
package com.vmware.pscoe.iac.artifact.aria.automation.models;
package com.vmware.pscoe.iac.artifact.aria.automation.store.models;

public enum VraNgPackageMemberType {
BLUEPRINT("blueprint"),
Expand Down
2 changes: 1 addition & 1 deletion ...t/aria/automation/models/VraNgPolicy.java → .../automation/store/models/VraNgPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
* #L%
*/
package com.vmware.pscoe.iac.artifact.aria.automation.models;
package com.vmware.pscoe.iac.artifact.aria.automation.store.models;

import java.util.List;
import java.util.ArrayList;
Expand Down
6 changes: 4 additions & 2 deletions ...act/configuration/ConfigurationVrops.java → ...ons/configuration/ConfigurationVrops.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
* #L%
*/
package com.vmware.pscoe.iac.artifact.configuration;
package com.vmware.pscoe.iac.artifact.aria.operations.configuration;

import java.net.InetAddress;
import java.net.URISyntaxException;
Expand All @@ -22,6 +22,8 @@
import org.apache.hc.core5.net.URIBuilder;
import org.springframework.util.StringUtils;

import com.vmware.pscoe.iac.artifact.configuration.ConfigurationException;
import com.vmware.pscoe.iac.artifact.configuration.ConfigurationWithRefreshToken;
import com.vmware.pscoe.iac.artifact.model.PackageType;

public class ConfigurationVrops extends ConfigurationWithRefreshToken {
Expand All @@ -42,7 +44,7 @@ public class ConfigurationVrops extends ConfigurationWithRefreshToken {
*/
public static final String PACKAGE_IMPORT_OVERWRITE_MODE = "packageImportOverwriteMode";

protected ConfigurationVrops(Properties props) {
public ConfigurationVrops(Properties props) {
super(PackageType.VROPS, props);
}

Expand Down
2 changes: 1 addition & 1 deletion ...fact/rest/model/vrops/AdapterKindDTO.java → ...ria/operations/models/AdapterKindDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
* #L%
*/
package com.vmware.pscoe.iac.artifact.rest.model.vrops;
package com.vmware.pscoe.iac.artifact.aria.operations.models;

import java.io.Serializable;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion .../rest/model/vrops/AlertDefinitionDTO.java → ...operations/models/AlertDefinitionDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
* #L%
*/
package com.vmware.pscoe.iac.artifact.rest.model.vrops;
package com.vmware.pscoe.iac.artifact.aria.operations.models;

import java.io.Serializable;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion ...tifact/rest/model/vrops/AuthGroupDTO.java → .../aria/operations/models/AuthGroupDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
* #L%
*/
package com.vmware.pscoe.iac.artifact.rest.model.vrops;
package com.vmware.pscoe.iac.artifact.aria.operations.models;

import java.io.Serializable;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion ...ifact/rest/model/vrops/AuthGroupsDTO.java → ...aria/operations/models/AuthGroupsDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
* #L%
*/
package com.vmware.pscoe.iac.artifact.rest.model.vrops;
package com.vmware.pscoe.iac.artifact.aria.operations.models;

import java.io.Serializable;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion ...rtifact/rest/model/vrops/AuthUserDTO.java → ...t/aria/operations/models/AuthUserDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
* #L%
*/
package com.vmware.pscoe.iac.artifact.rest.model.vrops;
package com.vmware.pscoe.iac.artifact.aria.operations.models;

import java.util.LinkedHashMap;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...tifact/rest/model/vrops/AuthUsersDTO.java → .../aria/operations/models/AuthUsersDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
* #L%
*/
package com.vmware.pscoe.iac.artifact.rest.model.vrops;
package com.vmware.pscoe.iac.artifact.aria.operations.models;

import java.util.LinkedHashMap;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...fact/rest/model/vrops/CustomGroupDTO.java → ...ria/operations/models/CustomGroupDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
* #L%
*/
package com.vmware.pscoe.iac.artifact.rest.model.vrops;
package com.vmware.pscoe.iac.artifact.aria.operations.models;

import java.io.Serializable;
import java.util.ArrayList;
Expand Down
13 changes: 1 addition & 12 deletions .../rest/model/vrops/CustomGroupTypeDTO.java → ...operations/models/CustomGroupTypeDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,8 @@
* This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
* #L%
*/
package com.vmware.pscoe.iac.artifact.rest.model.vrops;
package com.vmware.pscoe.iac.artifact.aria.operations.models;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;

Expand Down
2 changes: 1 addition & 1 deletion ...vrops/PolicyCustomGroupAssignmentDTO.java → ...odels/PolicyCustomGroupAssignmentDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
* #L%
*/
package com.vmware.pscoe.iac.artifact.rest.model.vrops;
package com.vmware.pscoe.iac.artifact.aria.operations.models;

import java.io.Serializable;
import java.util.LinkedHashMap;
Expand Down
2 changes: 1 addition & 1 deletion .../artifact/rest/model/vrops/PolicyDTO.java → ...act/aria/operations/models/PolicyDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
* #L%
*/
package com.vmware.pscoe.iac.artifact.rest.model.vrops;
package com.vmware.pscoe.iac.artifact.aria.operations.models;

import java.util.HashMap;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...st/model/vrops/PolicyImportResultDTO.java → ...rations/models/PolicyImportResultDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
* #L%
*/
package com.vmware.pscoe.iac.artifact.rest.model.vrops;
package com.vmware.pscoe.iac.artifact.aria.operations.models;

import java.io.Serializable;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion ...t/rest/model/vrops/RecommendationDTO.java → .../operations/models/RecommendationDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
* #L%
*/
package com.vmware.pscoe.iac.artifact.rest.model.vrops;
package com.vmware.pscoe.iac.artifact.aria.operations.models;

import java.io.Serializable;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion ...rest/model/vrops/ReportDefinitionDTO.java → ...perations/models/ReportDefinitionDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
* #L%
*/
package com.vmware.pscoe.iac.artifact.rest.model.vrops;
package com.vmware.pscoe.iac.artifact.aria.operations.models;

import java.io.Serializable;
import java.util.ArrayList;
Expand Down
Loading
Loading