[Ambari-22776] Ambari Blueprint 3.0/3.1 database tables and JPA objects + DDL cleanup

ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintEntity.java

@@ -18,6 +18,7 @@
 
 package org.apache.ambari.server.orm.entities;
 
+import java.util.ArrayList;
 import java.util.Collection;
 
 import javax.persistence.Basic;
@@ -63,17 +64,20 @@ public class BlueprintEntity {
    * Unidirectional one-to-one association to {@link StackEntity}
    */
   @OneToOne
-  @JoinColumn(name = "stack_id", unique = false, nullable = false, insertable = true, updatable = false)
+  @JoinColumn(name = "stack_id", unique = false, nullable = true, insertable = true, updatable = false)
   private StackEntity stack;
 
   @OneToMany(cascade = CascadeType.ALL, mappedBy = "blueprint")
-  private Collection<HostGroupEntity> hostGroups;
+  private Collection<HostGroupEntity> hostGroups = new ArrayList<>();
 
   @OneToMany(cascade = CascadeType.ALL, mappedBy = "blueprint")
-  private Collection<BlueprintConfigEntity> configurations;
+  private Collection<BlueprintConfigEntity> configurations = new ArrayList<>();
 
   @OneToMany(cascade = CascadeType.ALL, mappedBy = "blueprint")
-  private Collection<BlueprintSettingEntity> settings;
+  private Collection<BlueprintSettingEntity> settings = new ArrayList<>();
+
+  @OneToMany(cascade = CascadeType.ALL, mappedBy = "blueprint")
+  private Collection<BlueprintMpackReferenceEntity> mpackReferences = new ArrayList<>();
 
 
   /**
@@ -182,4 +186,12 @@ public String getSecurityDescriptorReference() {
   public void setSecurityDescriptorReference(String securityDescriptorReference) {
     this.securityDescriptorReference = securityDescriptorReference;
   }
+
+  public Collection<BlueprintMpackReferenceEntity> getMpackReferences() {
+    return mpackReferences;
+  }
+
+  public void setMpackReferences(Collection<BlueprintMpackReferenceEntity> mpackReferences) {
+    this.mpackReferences = mpackReferences;
+  }
 }

ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintMpackConfigEntity.java

@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.ambari.server.orm.entities;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "blueprint_mpack_configuration")
+@IdClass(BlueprintMpackConfigEntityPk.class)
+public class BlueprintMpackConfigEntity implements BlueprintConfiguration {
+
+  @Id
+  @Column(name = "mpack_ref_id", nullable = false, insertable = false, updatable = false)
+  private Long mpackRefId;
+
+  @Id
+  @Column(name = "type_name", nullable = false, insertable = true, updatable = false, length = 100)
+  private String type;
+
+  @Column(name = "config_data")
+  @Basic(fetch = FetchType.LAZY)
+  @Lob
+  private String configData;
+
+  @Column(name = "config_attributes")
+  @Basic(fetch = FetchType.LAZY)
+  @Lob
+  private String configAttributes;
+
+  @ManyToOne
+  @JoinColumn(name = "mpack_ref_id", referencedColumnName = "id", nullable = false)
+  private BlueprintMpackReferenceEntity mpackReference;
+
+  public Long getMpackRefId() {
+    return mpackRefId;
+  }
+
+  public void setMpackRefId(Long mpackRefId) {
+    this.mpackRefId = mpackRefId;
+  }
+
+  @Override
+  public String getType() {
+    return type;
+  }
+
+  @Override
+  public void setType(String typeName) {
+    this.type = typeName;
+  }
+
+  public String getConfigData() {
+    return configData;
+  }
+
+  @Override
+  public void setBlueprintName(String blueprintName) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public String getBlueprintName() {
+    return getMpackReference().getBlueprint().getBlueprintName();
+  }
+
+  public void setConfigData(String configData) {
+    this.configData = configData;
+  }
+
+  public String getConfigAttributes() {
+    return configAttributes;
+  }
+
+  public void setConfigAttributes(String configAttributes) {
+    this.configAttributes = configAttributes;
+  }
+
+  public BlueprintMpackReferenceEntity getMpackReference() {
+    return mpackReference;
+  }
+
+  public void setMpackReference(BlueprintMpackReferenceEntity mpackReference) {
+    this.mpackReference = mpackReference;
+  }
+}

ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintMpackConfigEntityPk.java

@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.ambari.server.orm.entities;
+
+import java.util.Objects;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+
+public class BlueprintMpackConfigEntityPk {
+  @Id
+  @Column(name = "mpack_ref_id", nullable = false, insertable = true, updatable = false)
+  private Long mpackRefId;
+
+  @Id
+  @Column(name = "type_name", nullable = false, insertable = true, updatable = false, length = 100)
+  private String type;
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    BlueprintMpackConfigEntityPk that = (BlueprintMpackConfigEntityPk) o;
+    return Objects.equals(mpackRefId, that.mpackRefId) &&
+      Objects.equals(type, that.type);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(mpackRefId, type);
+  }
+}

ambari-server/src/main/java/org/apache/ambari/server/orm/entities/BlueprintMpackReferenceEntity.java

@@ -0,0 +1,121 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+package org.apache.ambari.server.orm.entities;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+
+@Entity
+@Table(name = "blueprint_mpack_reference")
+@TableGenerator(name = "blueprint_mpack_reference_id_generator", table = "ambari_sequences", pkColumnName = "sequence_name",
+  valueColumnName = "sequence_value", pkColumnValue = "blueprint_mpack_ref_id_seq", initialValue = 1)
+public class BlueprintMpackReferenceEntity {
+  @Id
+  @GeneratedValue(strategy = GenerationType.TABLE, generator = "blueprint_mpack_reference_id_generator")
+  @Column(name = "id", nullable = false, updatable = false)
+  private Long id;
+
+  @Column(name = "mpack_name")
+  private String mpackName;
+
+  @Column(name = "mpack_version")
+  private String mpackVersion;
+
+  @Column(name = "mpack_uri")
+  private String mpackUri;
+
+  @OneToMany(cascade = CascadeType.ALL, mappedBy = "mpackReference")
+  private Collection<BlueprintServiceEntity> serviceInstances = new ArrayList<>();
+
+  @OneToMany(cascade = CascadeType.ALL, mappedBy = "mpackReference")
+  private Collection<BlueprintMpackConfigEntity> configurations = new ArrayList<>();
+
+
+  @ManyToOne
+  @JoinColumn(name = "blueprint_name", referencedColumnName = "blueprint_name", nullable = false)
+  private BlueprintEntity blueprint;
+
+  public Collection<BlueprintServiceEntity> getServiceInstances() {
+    return serviceInstances;
+  }
+
+  public void setServiceInstances(Collection<BlueprintServiceEntity> serviceInstances) {
+    this.serviceInstances = serviceInstances;
+  }
+
+  public String getMpackName() {
+    return mpackName;
+  }
+
+  public void setMpackName(String mpackName) {
+    this.mpackName = mpackName;
+  }
+
+  public String getMpackVersion() {
+    return mpackVersion;
+  }
+
+  public void setMpackVersion(String mpackVersion) {
+    this.mpackVersion = mpackVersion;
+  }
+
+  public String getMpackUri() {
+    return mpackUri;
+  }
+
+  public void setMpackUri(String mpackUri) {
+    this.mpackUri = mpackUri;
+  }
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public BlueprintEntity getBlueprint() {
+    return blueprint;
+  }
+
+  public void setBlueprint(BlueprintEntity blueprint) {
+    this.blueprint = blueprint;
+  }
+
+  public Collection<BlueprintMpackConfigEntity> getConfigurations() {
+    return configurations;
+  }
+
+  public void setConfigurations(Collection<BlueprintMpackConfigEntity> configurations) {
+    this.configurations = configurations;
+  }
+}