Skip to content

Commit

Permalink
style(lint): A bunch of lint changes. Disabled VisibilityModifier rule
Browse files Browse the repository at this point in the history
Signed-off-by: Stefan Genov <[email protected]>
  • Loading branch information
Michaelpalacce committed Jan 14, 2025
1 parent 4a9801c commit df3e9fb
Show file tree
Hide file tree
Showing 118 changed files with 560 additions and 387 deletions.
3 changes: 0 additions & 3 deletions .github/linters/sun_checks.xml
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,6 @@ https://www.oracle.com/java/technologies/javase/codeconventions-contents.html
<module name="FinalClass" />
<module name="HideUtilityClassConstructor" />
<module name="InterfaceIsType" />
<module name="VisibilityModifier">
<property name="protectedAllowed" value="true" />
</module>

<!-- Miscellaneous other checks. -->
<!-- See https://checkstyle.org/config_misc.html -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import com.vmware.pscoe.iac.artifact.model.abx.AbxConstant;
import com.vmware.pscoe.iac.artifact.model.abx.AbxPackageContent;
import com.vmware.pscoe.iac.artifact.model.abx.AbxPackageDescriptor;
import com.vmware.pscoe.iac.artifact.aria.model.VraNgSecret;
import com.vmware.pscoe.iac.artifact.aria.models.VraNgSecret;
import com.vmware.pscoe.iac.artifact.aria.rest.RestClientVraNg;
import org.apache.commons.lang3.NotImplementedException;
import org.slf4j.Logger;
Expand Down
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.model;
package com.vmware.pscoe.iac.artifact.aria.models;

/**
* Interface that makes a Aria automation resource identifiable.
Expand Down
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.model;
package com.vmware.pscoe.iac.artifact.aria.models;

import com.google.gson.JsonObject;

Expand Down
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.model;
package com.vmware.pscoe.iac.artifact.aria.models;

import org.apache.commons.lang3.builder.HashCodeBuilder;

Expand Down
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.model;
package com.vmware.pscoe.iac.artifact.aria.models;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,39 +12,59 @@
* 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.model;
package com.vmware.pscoe.iac.artifact.aria.models;

import java.util.LinkedHashMap;
import java.util.Map;

/**
* VraNgCatalogEntitlementDto is used to store the entitlement details of the
* VraNgCatalog.
*/
public class VraNgCatalogEntitlementDto {

private String id;
private String projectId;
private Map<String, String> definition = new LinkedHashMap<String, String>();

/**
* @return the id
*/
public String getId() {
return id;
}

/**
* @param id the id to set
*/
public void setId(String id) {
this.id = id;
}

/**
* @return the project id
*/
public String getProjectId() {
return projectId;
}

/**
* @param projectId to set
*/
public void setProjectId(String projectId) {
this.projectId = projectId;
}

/**
* @return the definition
*/
public Map<String, String> getDefinition() {
return definition;
}

/**
* @param definition to set
*/
public void setDefinition(Map<String, String> definition) {
this.definition = definition;
}

}
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.model;
package com.vmware.pscoe.iac.artifact.aria.models;

import com.google.gson.annotations.SerializedName;

Expand Down
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.model;
package com.vmware.pscoe.iac.artifact.aria.models;

/**
* Service Broker catalog item.
Expand Down
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.model;
package com.vmware.pscoe.iac.artifact.aria.models;

public class VraNgCatalogItemType {
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,28 @@
* 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.model;
package com.vmware.pscoe.iac.artifact.aria.models;

import java.util.Collections;
import java.util.List;

/**
* VraNgCloudAccount is the Aria Automation > Infrastructire > Cloud Account
* representation.
*/
public class VraNgCloudAccount {

private final String id;
private final String name;
private final String type;
private final List<String> regionIds;
private final List<String> tags;

/**
* @param id - the id of the CA
* @param name - the name of the CA
* @param type - the type of the CA
* @param regionIds - all the region IDs for the cloud account
*/
public VraNgCloudAccount(String id, String name, String type, List<String> regionIds, List<String> tags) {
this.id = id;
this.name = name;
Expand All @@ -33,26 +42,44 @@ public VraNgCloudAccount(String id, String name, String type, List<String> regio
this.tags = tags;
}

/**
* @return the id of the cloud account
*/
public String getId() {
return this.id;
}

/**
* @return the name of the CA
*/
public String getName() {
return this.name;
}

/**
* @return the type of the CA
*/
public String getType() {
return this.type;
}

/**
* @return the region ids associated with the CA
*/
public List<String> getRegionIds() {
return Collections.unmodifiableList(this.regionIds);
}

/**
* @return the tags associated with the CA
*/
public List<String> getTags() {
return Collections.unmodifiableList(this.tags);
}

/**
* @param obj - object to check if it equals to this one
*/
@Override
public boolean equals(Object obj) {
if (obj == null || !this.getClass().equals(obj.getClass())) {
Expand All @@ -63,4 +90,15 @@ public boolean equals(Object obj) {
return this.id.equals(other.getId());
}

/**
* @return the hash code of the object
*/
@Override
public int hashCode() {
int hash = 7;
hash = 31 * hash + (name == null ? 0 : name.hashCode());
hash = 31 * hash + (type == null ? 0 : type.hashCode());
return hash;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,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.model;
package com.vmware.pscoe.iac.artifact.aria.models;

import java.io.Serializable;
import java.util.ArrayList;
Expand All @@ -23,6 +23,9 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;

/**
* Content Source Configuration.
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({ "workflows" })
public class VraNgConfig implements Serializable {
Expand All @@ -31,11 +34,17 @@ public class VraNgConfig implements Serializable {
@JsonProperty("workflows")
private List<VraNgWorkflow> workflows = new ArrayList<>();

/**
* @return the workflows
*/
@JsonProperty("workflows")
public List<VraNgWorkflow> getWorkflows() {
return workflows;
}

/**
* @param workflows - the workflows to set
*/
@JsonProperty("workflows")
public void setWorkflows(List<VraNgWorkflow> workflows) {
this.workflows = workflows;
Expand Down
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.model;
package com.vmware.pscoe.iac.artifact.aria.models;

/**
Expand Down
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.model;
package com.vmware.pscoe.iac.artifact.aria.models;

import java.util.List;
import java.util.Map;
Expand Down
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.model;
package com.vmware.pscoe.iac.artifact.aria.models;

import java.util.ArrayList;
import java.util.List;
Expand Down
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.model;
package com.vmware.pscoe.iac.artifact.aria.models;

import com.google.gson.annotations.SerializedName;

Expand Down
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.model;
package com.vmware.pscoe.iac.artifact.aria.models;

import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
Expand Down
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.model;
package com.vmware.pscoe.iac.artifact.aria.models;

import com.google.gson.JsonParser;
import com.google.gson.JsonElement;
Expand Down
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.model;
package com.vmware.pscoe.iac.artifact.aria.models;

import org.apache.commons.lang3.builder.HashCodeBuilder;

Expand Down
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.model;
package com.vmware.pscoe.iac.artifact.aria.models;

import com.google.gson.JsonObject;

Expand Down
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.model;
package com.vmware.pscoe.iac.artifact.aria.models;

import java.util.List;

Expand Down
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.model;
package com.vmware.pscoe.iac.artifact.aria.models;

import com.google.gson.JsonObject;

Expand Down
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.model;
package com.vmware.pscoe.iac.artifact.aria.models;

import java.util.List;

Expand Down
Loading

0 comments on commit df3e9fb

Please sign in to comment.