sparate beans and repositories 73/65373/3
authorBenjamin, Max (mb388a) <mb388a@us.att.com>
Mon, 10 Sep 2018 13:28:05 +0000 (09:28 -0400)
committerBenjamin, Max (mb388a) <mb388a@us.att.com>
Mon, 10 Sep 2018 13:33:37 +0000 (09:33 -0400)
Seperate out Beans and repositories for RequestDB

Change-Id: I67d6597d580e9828b6bb8faafaea7e09cc6467c0
Issue-ID: SO-999
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
35 files changed:
.gitignore
adapters/mso-requests-db-adapter/pom.xml
adapters/mso-vfc-adapter/pom.xml
asdc-controller/pom.xml
bpmn/MSOCommonBPMN/pom.xml
mso-api-handlers/mso-api-handler-infra/pom.xml
mso-api-handlers/mso-requests-db-repositories/pom.xml [new file with mode: 0644]
mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/ArchivedInfraRequestsRepository.java [moved from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/ArchivedInfraRequestsRepository.java with 100% similarity]
mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepository.java [moved from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepository.java with 100% similarity]
mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryCustom.java [moved from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryCustom.java with 100% similarity]
mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImpl.java [moved from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImpl.java with 100% similarity]
mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OperationStatusRepository.java [moved from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/OperationStatusRepository.java with 100% similarity]
mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvDistributionStatusRepository.java [moved from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvDistributionStatusRepository.java with 100% similarity]
mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvServiceModelStatusRepository.java [moved from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/OperationalEnvServiceModelStatusRepository.java with 100% similarity]
mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/RequestProcessingDataRepository.java [moved from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/RequestProcessingDataRepository.java with 100% similarity]
mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/ResourceOperationStatusRepository.java [moved from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/ResourceOperationStatusRepository.java with 100% similarity]
mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/SiteStatusRepository.java [moved from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/SiteStatusRepository.java with 100% similarity]
mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/WatchdogComponentDistributionStatusRepository.java [moved from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/WatchdogComponentDistributionStatusRepository.java with 100% similarity]
mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/WatchdogDistributionStatusRepository.java [moved from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/WatchdogDistributionStatusRepository.java with 100% similarity]
mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/WatchdogServiceModVerIdLookupRepository.java [moved from mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/data/repository/WatchdogServiceModVerIdLookupRepository.java with 100% similarity]
mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/BaseTest.java [moved from mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/BaseTest.java with 100% similarity]
mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/TestApplication.java [moved from mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/TestApplication.java with 100% similarity]
mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/OperationStatusTest.java [moved from mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/OperationStatusTest.java with 100% similarity]
mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/OperationalEnvServiceModelStatusTest.java [moved from mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/OperationalEnvServiceModelStatusTest.java with 100% similarity]
mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/RequestDBConfig.java [moved from mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/RequestDBConfig.java with 100% similarity]
mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/SiteStatusTest.java [moved from mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/SiteStatusTest.java with 100% similarity]
mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImplTest.java [moved from mso-api-handlers/mso-requests-db/src/test/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImplTest.java with 100% similarity]
mso-api-handlers/mso-requests-db-repositories/src/test/resources/afterMigrate.sql [moved from mso-api-handlers/mso-requests-db/src/test/resources/afterMigrate.sql with 100% similarity]
mso-api-handlers/mso-requests-db-repositories/src/test/resources/application-test.yaml [new file with mode: 0644]
mso-api-handlers/mso-requests-db-repositories/src/test/resources/logback-test.xml [new file with mode: 0644]
mso-api-handlers/mso-requests-db-repositories/src/test/resources/schema.sql [moved from mso-api-handlers/mso-requests-db/src/test/resources/schema.sql with 100% similarity]
mso-api-handlers/mso-requests-db/pom.xml
mso-api-handlers/mso-requests-db/src/main/java/META-INF/MANIFEST.MF [deleted file]
mso-api-handlers/mso-requests-db/src/main/resources/beans.xml [deleted file]
mso-api-handlers/pom.xml

index 5817c69..51723ae 100644 (file)
@@ -1,9 +1,10 @@
 target
-.settings
-.classpath
-.project
-.buildpath
-.factorypath
+**/.settings
+**/.classpath
+**/.project
+**/.buildpath
+**/.factorypath
+**/.springBeans
 .idea
 .checkstyle
 .DS_Store
index 6669895..9dff66b 100644 (file)
                        <artifactId>mso-requests-db</artifactId>
                        <version>${project.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.onap.so</groupId>
+                       <artifactId>mso-requests-db-repositories</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
                <dependency>
                        <groupId>org.springframework.boot</groupId>
                        <artifactId>spring-boot-starter-data-jpa</artifactId>
index d416c8e..4d1c612 100644 (file)
                        <artifactId>mso-requests-db</artifactId>
                        <version>${project.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.onap.so</groupId>
+                       <artifactId>mso-requests-db-repositories</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
                <dependency>
                        <groupId>org.mariadb.jdbc</groupId>
                        <artifactId>mariadb-java-client</artifactId>
index 28fd24c..87b269f 100644 (file)
                        <groupId>org.onap.so</groupId>
                        <artifactId>mso-requests-db</artifactId>
                        <version>${project.version}</version>
-               </dependency>
+               </dependency>           
                <dependency>
-               <groupId>janino</groupId>
-               <artifactId>janino</artifactId>
-               <version>2.5.15</version>
+                       <groupId>org.onap.so</groupId>
+                       <artifactId>mso-requests-db-repositories</artifactId>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.antlr</groupId>
index 532c062..c993071 100644 (file)
                </dependency>
                <dependency>
                        <groupId>org.onap.so</groupId>
-                       <artifactId>mso-requests-db</artifactId>
-                       <classifier>client</classifier>
+                       <artifactId>mso-requests-db</artifactId>                        
                        <version>${project.version}</version>
                </dependency>
                <dependency>
index f871e12..37941b8 100644 (file)
                        <artifactId>mso-requests-db</artifactId>
                        <version>${project.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.onap.so</groupId>
+                       <artifactId>mso-requests-db-repositories</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
                <dependency>
                        <groupId>org.onap.so</groupId>
                        <artifactId>mso-catalog-db</artifactId>
diff --git a/mso-api-handlers/mso-requests-db-repositories/pom.xml b/mso-api-handlers/mso-requests-db-repositories/pom.xml
new file mode 100644 (file)
index 0000000..a46111b
--- /dev/null
@@ -0,0 +1,55 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+
+       <parent>
+               <groupId>org.onap.so</groupId>
+               <artifactId>mso-api-handlers</artifactId>
+               <version>1.3.0-SNAPSHOT</version>
+       </parent>
+
+       <artifactId>mso-requests-db-repositories</artifactId>
+
+       <name>mso-requests-db-repositories</name>
+       <description>SO Request Database JPA Respositories</description>
+       <properties>
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+       </properties>
+       <dependencies>          
+               <dependency>
+                       <groupId>org.onap.so</groupId>
+                       <artifactId>mso-requests-db</artifactId>
+                       <version>${project.version}</version>
+               </dependency>           
+               <dependency>
+                       <groupId>org.springframework.boot</groupId>
+                       <artifactId>spring-boot-starter-data-jpa</artifactId>
+                       <optional>true</optional>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework.boot</groupId>
+                       <artifactId>spring-boot-starter-data-rest</artifactId>
+                       <optional>true</optional>
+               </dependency>
+               <dependency>
+                       <groupId>com.h2database</groupId>
+                       <artifactId>h2</artifactId>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.mariadb.jdbc</groupId>
+                       <artifactId>mariadb-java-client</artifactId>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework.boot</groupId>
+                       <artifactId>spring-boot-starter-test</artifactId>
+                       <scope>test</scope>
+               </dependency>
+       </dependencies>
+       <packaging>jar</packaging>
+       <build>
+               <finalName>${project.artifactId}</finalName>            
+       </build>
+</project>
\ No newline at end of file
diff --git a/mso-api-handlers/mso-requests-db-repositories/src/test/resources/application-test.yaml b/mso-api-handlers/mso-requests-db-repositories/src/test/resources/application-test.yaml
new file mode 100644 (file)
index 0000000..c4dd603
--- /dev/null
@@ -0,0 +1,45 @@
+# will be used as entry in DB to say SITE OFF/ON for healthcheck
+
+server:
+    port: 8080
+    tomcat:
+        max-threads: 50
+ssl-enable: false
+mso:
+  adapters:
+    requestDb:
+      auth: Basic YnBlbDptc28tZGItMTUwNyE=
+      endpoint: http://localhost:8081
+  site-name: localDevEnv
+  logPath: logs
+        
+# H2
+spring:
+  datasource:
+    url: jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;
+    username: sa
+    password: sa
+    driver-class-name: org.h2.Driver
+  h2:
+    console:
+      enabled: true
+      path: /h2
+
+  jpa:
+      show-sql: true
+      hibernate:
+        dialect: org.hibernate.dialect.MySQL5Dialect
+        ddl-auto: none
+        naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
+        enable-lazy-load-no-trans: true
+
+
+#Actuator
+management:
+  security:
+    enabled: false
+    basic:
+      enabled: false
+
+
+
diff --git a/mso-api-handlers/mso-requests-db-repositories/src/test/resources/logback-test.xml b/mso-api-handlers/mso-requests-db-repositories/src/test/resources/logback-test.xml
new file mode 100644 (file)
index 0000000..1951484
--- /dev/null
@@ -0,0 +1,46 @@
+<configuration >
+  
+  
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+
+  <logger name="com.att.ecomp.audit" level="info" additivity="false">
+    <appender-ref ref="STDOUT" />
+  </logger>
+  
+  <logger name="com.att.eelf.metrics" level="info" additivity="false">
+        <appender-ref ref="STDOUT" />
+  </logger>
+
+  <logger name="com.att.eelf.error" level="trace" additivity="false">
+    <appender-ref ref="STDOUT" />
+  </logger> 
+
+       <logger name="org.onap" level="${so.log.level:-DEBUG}" additivity="false">
+               <appender-ref ref="STDOUT" />
+       </logger>
+  <root level="debug">
+    <appender-ref ref="STDOUT" />
+  </root>
+  
+       <!-- Spring related loggers -->
+       <logger name="org.springframework" level="WARN" />
+       <logger name="org.springframework.beans" level="WARN" />
+       <logger name="org.springframework.web" level="WARN" />
+       <logger name="com.blog.spring.jms" level="WARN" />
+       
+       <logger name="org.hibernate" level="WARN" />
+
+       
+       <!-- Tomcat related loggers -->
+       <logger name="org.apache.tomcat.util.digester.Digester" level="WARN" />
+       <logger name="org.apache.tomcat.util.modeler.modules.*" level="WARN" />
+       <logger name="org.apache.tomcat.util.IntrospectionUtils" level="WARN" />
+       <logger name="org.apache.catalina.loader.WebappClassLoaderBase" level="WARN" />
+       <logger name="wiremock.org.eclipse.jetty" level="WARN" />
+
+</configuration>
\ No newline at end of file
index a3b0ec1..5ef683b 100644 (file)
@@ -9,7 +9,6 @@
        </parent>
 
        <artifactId>mso-requests-db</artifactId>
-
        <name>mso-requests-db</name>
        <description>MSO Requests Database definition and Hibernate objects</description>
        <properties>
                        <groupId>uk.co.blackpepper.bowman</groupId>
                        <artifactId>bowman-client</artifactId>
                        <version>0.3.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.hibernate</groupId>
-                       <artifactId>hibernate-core</artifactId>
-                       <optional>true</optional>
-               </dependency>
-               <dependency>
-                       <groupId>org.hibernate</groupId>
-                       <artifactId>hibernate-entitymanager</artifactId>
-                       <optional>true</optional>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-data-jpa</artifactId>
-                       <optional>true</optional>
-               </dependency>
-               <dependency>
-                       <groupId>org.hibernate.javax.persistence</groupId>
-                       <artifactId>hibernate-jpa-2.1-api</artifactId>
-                       <version>1.0.0.Final</version>
-                       <optional>true</optional>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-tomcat</artifactId>
-               </dependency>
+               </dependency>   
                <dependency>
                        <groupId>org.onap.so</groupId>
                        <artifactId>common</artifactId>
                        <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>javax.annotation</groupId>
-                       <artifactId>javax.annotation-api</artifactId>
-                       <version>1.2</version>
-               </dependency>
+               </dependency>           
                <dependency>
                        <groupId>org.springframework.boot</groupId>
                        <artifactId>spring-boot-starter-test</artifactId>
                        <scope>test</scope>
                </dependency>
-               <dependency>
-                       <groupId>com.h2database</groupId>
-                       <artifactId>h2</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.mariadb.jdbc</groupId>
-                       <artifactId>mariadb-java-client</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-data-rest</artifactId>
-                       <optional>true</optional>
-               </dependency>
        </dependencies>
        <packaging>jar</packaging>
        <build>
-               <finalName>${project.artifactId}</finalName>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>jar</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <classifier>client</classifier>
-                                                       <excludes>
-                                                               <exclude>**/repository/**</exclude>                                                             
-                                                       </excludes>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
+               <finalName>${project.artifactId}</finalName>            
        </build>
-
 </project>
\ No newline at end of file
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/META-INF/MANIFEST.MF b/mso-api-handlers/mso-requests-db/src/main/java/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index 5e94951..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0\r
-Class-Path: \r
-\r
diff --git a/mso-api-handlers/mso-requests-db/src/main/resources/beans.xml b/mso-api-handlers/mso-requests-db/src/main/resources/beans.xml
deleted file mode 100644 (file)
index cd1bc8b..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:jpa="http://www.springframework.org/schema/data/jpa"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans
-    http://www.springframework.org/schema/beans/spring-beans.xsd
-    http://www.springframework.org/schema/data/jpa
-    http://www.springframework.org/schema/data/jpa/spring-jpa.xsd">
-
-  <jpa:repositories base-package="org.onap.so.db.request.data.repository" />
-
-</beans>
\ No newline at end of file
index aed0520..078971e 100644 (file)
@@ -14,6 +14,7 @@
 
        <modules>
                <module>mso-requests-db</module>
+               <module>mso-requests-db-repositories</module>
                <module>mso-api-handler-common</module>
                <module>mso-api-handler-infra</module>
   </modules>