Merge pull request #328 in DM/herd from develop to master

* commit '955aaae3615ceb505424379bb26af1db3aaa4d5c':
  Added initial version of the herd.postgres.0.69.0-to-0.70.0.upgrade.sql script
  Adding empty file placeholder to avoid Git EOL Style error
  Added initial version of the herd.postgres.0.69.0-to-0.70.0.upgrade.sql script
  DM-10718: Factory CQ - Optimize a poorly performing query that occurs during a BData POST
  DM-10707 Suggest an edit to BDef Descriptive Information
  DM-10707 Suggest an edit to BDef Descriptive Information
  DM-10690: Factory CQ - NullPointerException thrown in herd IndexFunctionsDaoImpl.buildIndexSearchResults()
  DM-10629: Factory CQ - NullPointerException thrown in herd IndexFunctionsDaoImpl.getIndexStats()
  DM-10629: Factory CQ - NullPointerException thrown in herd IndexFunctionsDaoImpl.getIndexStats()
  DM-10707 Suggest an edit to BDef Descriptive Information
  DM-10684: Locate BData eligible for retention expiration based on BData-level date
  Increment Maven POM version numbers to 0.70.0-SNAPSHOT

herd-build/herd-build-tools/pom.xml

@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-build</artifactId>
-      <version>0.69.0-SNAPSHOT</version>
+      <version>0.70.0-SNAPSHOT</version>
    </parent>
 
    <name>herd build tools</name>

herd-build/herd-docs/herd-docs-javadoc/pom.xml

@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-docs</artifactId>
-      <version>0.69.0-SNAPSHOT</version>
+      <version>0.70.0-SNAPSHOT</version>
    </parent>
 
    <name>herd docs javadoc</name>

herd-build/herd-docs/herd-docs-swagger/pom.xml

@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-docs</artifactId>
-      <version>0.69.0-SNAPSHOT</version>
+      <version>0.70.0-SNAPSHOT</version>
    </parent>
 
    <name>herd docs swagger</name>

herd-build/herd-docs/pom.xml

@@ -22,7 +22,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-build</artifactId>
-      <version>0.69.0-SNAPSHOT</version>
+      <version>0.70.0-SNAPSHOT</version>
    </parent>
 
    <name>herd docs</name>

herd-build/herd-scripts/herd-scripts-bootstrap/pom.xml

@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-scripts</artifactId>
-      <version>0.69.0-SNAPSHOT</version>
+      <version>0.70.0-SNAPSHOT</version>
    </parent>
 
    <description>This project contains the core herd EMR bootstrap scripts.</description>

herd-build/herd-scripts/herd-scripts-cloud-formation/pom.xml

@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-scripts</artifactId>
-      <version>0.69.0-SNAPSHOT</version>
+      <version>0.70.0-SNAPSHOT</version>
    </parent>
 
    <name>herd scripts cloud formation</name>

herd-build/herd-scripts/herd-scripts-sql/pom.xml

@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-scripts</artifactId>
-      <version>0.69.0-SNAPSHOT</version>
+      <version>0.70.0-SNAPSHOT</version>
    </parent>
 
    <name>herd scripts sql</name>

herd-build/herd-scripts/herd-scripts-sql/src/main/resources/herd.postgres.0.69.0-to-0.70.0.upgrade.sql

@@ -0,0 +1,65 @@
+/*
+* Copyright 2015 herd contributors
+*
+* 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.
+*/
+
+-- bus_objct_dfntn_dscr_sgstn
+
+create table bus_objct_dfntn_dscr_sgstn
+(
+    bus_objct_dfntn_dscr_sgstn_id BIGINT          NOT NULL,
+    bus_objct_dfntn_id            BIGINT          NOT NULL,
+    user_id                       VARCHAR(100)    NOT NULL,
+    dscr_sgstn_tx                 VARCHAR(24000)  NOT NULL,
+    creat_ts                      TIMESTAMP       NOT NULL DEFAULT ('now'::text)::timestamp without time zone,
+    creat_user_id                 VARCHAR(100)    NOT NULL,
+    updt_ts                       TIMESTAMP       NOT NULL DEFAULT ('now'::text)::timestamp without time zone,
+    updt_user_id                  VARCHAR(100)    NOT NULL
+);
+
+alter table bus_objct_dfntn_dscr_sgstn add constraint bus_objct_dfntn_dscr_sgstn_pk  primary key (bus_objct_dfntn_dscr_sgstn_id); 
+alter table bus_objct_dfntn_dscr_sgstn add constraint bus_objct_dfntn_dscr_sgstn_fk1 foreign key (bus_objct_dfntn_id) references bus_objct_dfntn (bus_objct_dfntn_id);
+
+create index bus_objct_dfntn_dscr_sgstn_ix1 on bus_objct_dfntn_dscr_sgstn (bus_objct_dfntn_id);
+create unique index bus_objct_dfntn_dscr_sgstn_ak on bus_objct_dfntn_dscr_sgstn (bus_objct_dfntn_id, user_id);
+
+create sequence bus_objct_dfntn_dscr_sgstn_seq;
+
+-- strge_unit indexes
+
+create index strge_unit_ix1 on strge_unit (strge_cd);
+create index strge_unit_ix4 on strge_unit (drcty_path_tx);
+
+--scrty_fn_lk
+
+insert into scrty_fn_lk (scrty_fn_cd, creat_ts, creat_user_id, updt_ts, updt_user_id)
+values ('FN_BUSINESS_OBJECT_DEFINITION_DESCRIPTION_SUGGESTIONS_GET', current_timestamp, 'SYSTEM', current_timestamp, 'SYSTEM');
+
+insert into scrty_fn_lk (scrty_fn_cd, creat_ts, creat_user_id, updt_ts, updt_user_id)
+values ('FN_BUSINESS_OBJECT_DEFINITION_DESCRIPTION_SUGGESTIONS_DELETE', current_timestamp, 'SYSTEM', current_timestamp, 'SYSTEM');
+
+insert into scrty_fn_lk (scrty_fn_cd, creat_ts, creat_user_id, updt_ts, updt_user_id)
+values ('FN_BUSINESS_OBJECT_DEFINITION_DESCRIPTION_SUGGESTIONS_ALL_GET', current_timestamp, 'SYSTEM', current_timestamp, 'SYSTEM');
+
+insert into scrty_fn_lk (scrty_fn_cd, creat_ts, creat_user_id, updt_ts, updt_user_id)
+values ('FN_BUSINESS_OBJECT_DEFINITION_DESCRIPTION_SUGGESTIONS_POST', current_timestamp, 'SYSTEM', current_timestamp, 'SYSTEM');
+
+insert into scrty_fn_lk (scrty_fn_cd, creat_ts, creat_user_id, updt_ts, updt_user_id)
+values ('FN_BUSINESS_OBJECT_DEFINITION_DESCRIPTION_SUGGESTIONS_PUT', current_timestamp, 'SYSTEM', current_timestamp, 'SYSTEM');
+
+--file_type_cd_lk
+
+insert into file_type_cd_lk (file_type_cd, file_type_ds, creat_ts, creat_user_id, updt_ts, updt_user_id)
+values ('PDF', 'PDF file', current_timestamp, 'SYSTEM', current_timestamp, 'SYSTEM');
+

herd-build/herd-scripts/pom.xml

@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-build</artifactId>
-      <version>0.69.0-SNAPSHOT</version>
+      <version>0.70.0-SNAPSHOT</version>
    </parent>
 
    <name>herd scripts</name>

herd-build/herd-swaggergen-maven-plugin/pom.xml

@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-build</artifactId>
-      <version>0.69.0-SNAPSHOT</version>
+      <version>0.70.0-SNAPSHOT</version>
    </parent>
 
    <name>herd swaggergen maven plugin</name>

herd-build/pom.xml

@@ -22,7 +22,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd</artifactId>
-      <version>0.69.0-SNAPSHOT</version>
+      <version>0.70.0-SNAPSHOT</version>
    </parent>
 
    <name>herd build</name>

herd-code/herd-app/pom.xml

@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-code</artifactId>
-      <version>0.69.0-SNAPSHOT</version>
+      <version>0.70.0-SNAPSHOT</version>
    </parent>
 
    <name>herd app</name>

herd-code/herd-core/pom.xml

@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-code</artifactId>
-      <version>0.69.0-SNAPSHOT</version>
+      <version>0.70.0-SNAPSHOT</version>
    </parent>
 
    <name>herd core</name>

herd-code/herd-dao/pom.xml

@@ -21,7 +21,7 @@
    <parent>
       <groupId>org.finra.herd</groupId>
       <artifactId>herd-code</artifactId>
-      <version>0.69.0-SNAPSHOT</version>
+      <version>0.70.0-SNAPSHOT</version>
    </parent>
 
    <name>herd dao</name>

herd-code/herd-dao/src/main/java/org/finra/herd/dao/BusinessObjectDefinitionDescriptionSuggestionDao.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015 herd contributors
+ *
+ * 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.
+ */
+package org.finra.herd.dao;
+
+import java.util.List;
+
+import org.finra.herd.model.api.xml.BusinessObjectDefinitionDescriptionSuggestionKey;
+import org.finra.herd.model.jpa.BusinessObjectDefinitionDescriptionSuggestionEntity;
+import org.finra.herd.model.jpa.BusinessObjectDefinitionEntity;
+
+public interface BusinessObjectDefinitionDescriptionSuggestionDao extends BaseJpaDao
+{
+    /**
+     * Gets a business object definition description suggestion by business object definition entity and user id.
+     *
+     * @param businessObjectDefinitionEntity the business object definition entity associated with the description suggestion
+     * @param userId the user id associated with the description suggestion
+     *
+     * @return the business object definition description suggestion for the specified business object definition and user id.
+     */
+    BusinessObjectDefinitionDescriptionSuggestionEntity getBusinessObjectDefinitionDescriptionSuggestionByBusinessObjectDefinitionEntityAndUserId(
+        BusinessObjectDefinitionEntity businessObjectDefinitionEntity, String userId);
+
+    /**
+     * Gets a collection of business object definition description suggestion keys by business object definition entity.
+     *
+     * @param businessObjectDefinitionEntity the business object definition entity associated with the description suggestions
+     *
+     * @return the business object definition description suggestions for the specified business object definition
+     */
+    List<BusinessObjectDefinitionDescriptionSuggestionKey> getBusinessObjectDefinitionDescriptionSuggestionsByBusinessObjectDefinitionEntity(
+        BusinessObjectDefinitionEntity businessObjectDefinitionEntity);
+}

herd-code/herd-dao/src/main/java/org/finra/herd/dao/StorageUnitDao.java

@@ -99,12 +99,12 @@ public interface StorageUnitDao extends BaseJpaDao
     /**
      * Returns a first discovered storage unit in the specified storage that overlaps with the directory path.
      *
-     * @param storageName the storage name (case-insensitive)
+     * @param storageEntity the storage entity
      * @param directoryPath the directory path
      *
      * @return the first found storage unit in the specified storage that overlaps with the directory path or null if none were found
      */
-    StorageUnitEntity getStorageUnitByStorageNameAndDirectoryPath(String storageName, String directoryPath);
+    StorageUnitEntity getStorageUnitByStorageAndDirectoryPath(StorageEntity storageEntity, String directoryPath);
 
     /**
      * Retrieves a list of storage unit entities per specified parameters.