summaryrefslogtreecommitdiffstats
path: root/mso-catalog-db
diff options
context:
space:
mode:
authorSteve Smokowski <ss835w@att.com>2021-02-17 14:35:54 +0000
committerGerrit Code Review <gerrit@onap.org>2021-02-17 14:35:54 +0000
commitba4f60d79b9039c9cb1db46e68c4e9b3efe8f708 (patch)
treeb7e1aa340c13abddd6019c350dda8f59efabff0b /mso-catalog-db
parent207a5e38c1f565c4f07f54b7ff174c0002fdb413 (diff)
parentd5968f56b382c50dfafc3b6feeccf5b81d176b9d (diff)
Merge "update camunda and spring to latest versions"
Diffstat (limited to 'mso-catalog-db')
-rw-r--r--mso-catalog-db/pom.xml2
-rw-r--r--mso-catalog-db/src/main/java/org/onap/so/rest/catalog/beans/HeatEnvironment.java160
2 files changed, 1 insertions, 161 deletions
diff --git a/mso-catalog-db/pom.xml b/mso-catalog-db/pom.xml
index c0bdd90f43..80ad6cc86e 100644
--- a/mso-catalog-db/pom.xml
+++ b/mso-catalog-db/pom.xml
@@ -64,7 +64,7 @@
<dependency>
<groupId>ch.vorburger.mariaDB4j</groupId>
<artifactId>mariaDB4j</artifactId>
- <version>2.2.3</version>
+ <version>2.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/mso-catalog-db/src/main/java/org/onap/so/rest/catalog/beans/HeatEnvironment.java b/mso-catalog-db/src/main/java/org/onap/so/rest/catalog/beans/HeatEnvironment.java
deleted file mode 100644
index 97f67a5438..0000000000
--- a/mso-catalog-db/src/main/java/org/onap/so/rest/catalog/beans/HeatEnvironment.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.rest.catalog.beans;
-
-import java.io.Serializable;
-import java.text.DateFormat;
-import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.PrePersist;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import com.openpojo.business.annotation.BusinessKey;
-
-@Entity
-@Table(name = "heat_environment")
-public class HeatEnvironment implements Serializable {
-
- private static final long serialVersionUID = 768026109321305392L;
-
- @BusinessKey
- @Id
- @Column(name = "ARTIFACT_UUID")
- private String artifactUuid;
-
- @Column(name = "NAME")
- private String name = null;
-
- @Column(name = "DESCRIPTION")
- private String description = null;
-
- @Lob
- @Column(name = "BODY", columnDefinition = "LONGTEXT")
- private String environment = null;
-
- @Column(name = "ARTIFACT_CHECKSUM")
- private String artifactChecksum;
-
- @Column(name = "CREATION_TIMESTAMP", updatable = false)
- @Temporal(TemporalType.TIMESTAMP)
- private Date created;
-
- @BusinessKey
- @Column(name = "VERSION")
- private String version;
-
- @PrePersist
- protected void onCreate() {
- this.created = new Date();
- }
-
- @Override
- public boolean equals(final Object other) {
- if (!(other instanceof HeatEnvironment)) {
- return false;
- }
- HeatEnvironment castOther = (HeatEnvironment) other;
- return new EqualsBuilder().append(artifactUuid, castOther.artifactUuid).append(version, castOther.version)
- .isEquals();
- }
-
- @Override
- public int hashCode() {
- return new HashCodeBuilder().append(artifactUuid).append(version).toHashCode();
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public String getArtifactUuid() {
- return this.artifactUuid;
- }
-
- public void setArtifactUuid(String artifactUuid) {
- this.artifactUuid = artifactUuid;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return this.description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getEnvironment() {
- return this.environment;
- }
-
- public void setEnvironment(String environment) {
- this.environment = environment;
- }
-
- public String getArtifactChecksum() {
- return artifactChecksum;
- }
-
- public void setArtifactChecksum(String artifactChecksum) {
- this.artifactChecksum = artifactChecksum;
- }
-
- public Date getCreated() {
- return created;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("Artifact UUID=" + this.artifactUuid);
- sb.append(", name=");
- sb.append(name);
- sb.append(", version=");
- sb.append(version);
- sb.append(", description=");
- sb.append(this.description == null ? "null" : this.description);
- sb.append(", body=");
- sb.append(this.environment == null ? "null" : this.environment);
- if (this.created != null) {
- sb.append(",creationTimestamp=");
- sb.append(DateFormat.getInstance().format(this.created));
- }
- return sb.toString();
- }
-}