Merge "Log exceptions from CachingUtil.java"

diff --git a/pom.xml b/pom.xml
index 9358583..fdb776b 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -599,19 +599,6 @@
                                         <dockerFileDir>${project.basedir}/distribution/cassandra_job</dockerFileDir>
                                     </build>
                                 </image>
-                                <!-- Trigger -->
-                                <image>
-                                    <name>onap/music/musictrigger</name>
-                                    <alias>docker_trigger</alias>
-                                    <build>
-                                        <cleanup>true</cleanup>
-                                        <tags>
-                                            <tag>${docker.tag}</tag>
-                                            <tag>${docker.latest.tag}</tag>
-                                        </tags>
-                                        <dockerFileDir>${project.basedir}/distribution/trigger</dockerFileDir>
-                                    </build>
-                                </image>
                                 <!-- tomcat 8.5 -->
                                 <!-- <image> <name>onap/music/tomcat_music</name>
                                     <alias>docker_tomcat</alias> <build> <cleanup>true</cleanup> <tags> <tag>8.5-${timestamp}</tag>

diff --git a/src/main/java/org/onap/music/JerseyConfig.java b/src/main/java/org/onap/music/JerseyConfig.java
index 1b5f034..b311846 100755 (executable)
--- a/src/main/java/org/onap/music/JerseyConfig.java
+++ b/src/main/java/org/onap/music/JerseyConfig.java
@@ -20,6 +20,7 @@ import io.swagger.jaxrs.config.BeanConfig;
 import io.swagger.jaxrs.listing.ApiListingResource;
 import io.swagger.jaxrs.listing.SwaggerSerializers;
 import org.glassfish.jersey.server.ResourceConfig;
+import org.onap.music.exceptions.MusicExceptionMapper;
 import org.onap.music.rest.*;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -32,6 +33,7 @@ import javax.annotation.PostConstruct;
 
     public JerseyConfig() {
         this.registerEndpoints();
+        register(MusicExceptionMapper.class);
     }
 
     @PostConstruct public void init() {