From d8c44ad0273ee54d8ee94ab2be06330cac9c08f3 Mon Sep 17 00:00:00 2001
From: Sandeep J <sandeejh@in.ibm.com>
Date: Mon, 21 Jan 2019 15:43:09 +0530
Subject: refactord RestMusicAdminAPI.java as per spring MVC

refactored the class and updated unit test cases as per the code changes

Issue-ID: MUSIC-212
Change-Id: Id66854be3894d36e2c2b0a6d86c2f6bb29e48db6
Signed-off-by: Sandeep J <sandeejh@in.ibm.com>
---
 pom.xml | 87 ++++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 40 insertions(+), 47 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 5b123137..fbb1ad69 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!-- ============LICENSE_START========================================== 
 	org.onap.music =================================================================== 
-	Copyright (c) 2017 AT&T Intellectual Property 
-	Modifications Copyright (c) 2018 IBM=================================================================== 
+	Copyright (c) 2017 AT&T Intellectual Property ============Modifications Copyright 
+	(c) 2018-2019 IBM=================================================================== 
 	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 
@@ -29,13 +29,13 @@
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jersey1.version>1.19</jersey1.version>
-        <jersey2.version>2.25.1</jersey2.version>
-        <jaxrs.version>2.0.1</jaxrs.version>
-        <cassandra.version>3.6.0</cassandra.version>
-        <zookeeper.version>3.4.11</zookeeper.version>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<jersey1.version>1.19</jersey1.version>
+		<jersey2.version>2.25.1</jersey2.version>
+		<jaxrs.version>2.0.1</jaxrs.version>
+		<cassandra.version>3.6.0</cassandra.version>
+		<zookeeper.version>3.4.11</zookeeper.version>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -139,40 +139,40 @@
 					</execution>
 				</executions>
 			</plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <shadedArtifactAttached>true</shadedArtifactAttached>
-                            <transformers>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<shadedArtifactAttached>true</shadedArtifactAttached>
+							<transformers>
 								<transformer
-										implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+									implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
 									<resource>META-INF/spring.handlers</resource>
 								</transformer>
 								<transformer
-										implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
+									implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
 									<resource>META-INF/spring.factories</resource>
 								</transformer>
 								<transformer
-										implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+									implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
 									<resource>META-INF/spring.schemas</resource>
 								</transformer>
 								<transformer
-										implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
-								/>
-								<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.onap.music.testruns.MTBench</mainClass>
-                                </transformer>
-                            </transformers>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+									implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+									<mainClass>org.onap.music.testruns.MTBench</mainClass>
+								</transformer>
+							</transformers>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-install-plugin</artifactId>
@@ -207,13 +207,6 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<!-- Development -->
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.4</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
@@ -388,16 +381,16 @@
 			<artifactId>jbcrypt</artifactId>
 			<version>0.4</version>
 		</dependency>
-		<dependency>		
-				<groupId>io.netty</groupId>		
-				<artifactId>netty-buffer</artifactId>		
-				<version>4.1.30.Final</version>		
-			</dependency>
-		
+		<dependency>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-buffer</artifactId>
+			<version>4.1.30.Final</version>
+		</dependency>
+
 		<!-- <dependency> <groupId>com.owlike</groupId> <artifactId>genson</artifactId> 
 			<version>1.3</version> </dependency> -->
 	</dependencies>
-		<reporting>
+	<reporting>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-- 
cgit 1.2.3-korg