X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fmusic%2FJerseyConfig.java;h=b64e704484cc4ca37bd7b5f3526495e125e9eea8;hb=881f14bc8676cedd68e17bd007a869fa85578fa1;hp=74958363172efa6aa8e44fd0c44d35de4def6df5;hpb=a27be9fdbbf2d271c9c5780ba70fe15a24dbdb63;p=music.git

diff --git a/src/main/java/org/onap/music/JerseyConfig.java b/src/main/java/org/onap/music/JerseyConfig.java
index 74958363..b64e7044 100755
--- a/src/main/java/org/onap/music/JerseyConfig.java
+++ b/src/main/java/org/onap/music/JerseyConfig.java
@@ -1,25 +1,36 @@
-/* 
- * Copyright 2012-2015 the original author or authors. 
+/*
+ * ============LICENSE_START==========================================
+ * org.onap.music
+ * ===================================================================
+ *  Copyright (c) 2019 AT&T Intellectual Property
+ * ===================================================================
+ *  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
  * 
- * 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
  * 
- *      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.
  * 
- * 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.onap.music; 
- 
+ * ============LICENSE_END=============================================
+ * ====================================================================
+ */
+
+package org.onap.music;
+
+import io.swagger.jaxrs.config.BeanConfig;
+import io.swagger.jaxrs.listing.ApiListingResource;
+import io.swagger.jaxrs.listing.SwaggerSerializers;
+
 import javax.annotation.PostConstruct;
-import javax.ws.rs.ApplicationPath;
-import org.glassfish.jersey.server.ResourceConfig; 
-import org.onap.music.rest.RestMusicAdminAPI;
+
+import org.glassfish.jersey.server.ResourceConfig;
+import org.onap.music.conductor.conditionals.RestMusicConditionalAPI;
+import org.onap.music.exceptions.MusicExceptionMapper;
 import org.onap.music.rest.RestMusicDataAPI;
 import org.onap.music.rest.RestMusicHealthCheckAPI;
 import org.onap.music.rest.RestMusicLocksAPI; 
@@ -28,35 +39,34 @@ import org.onap.music.rest.RestMusicTestAPI;
 import org.onap.music.rest.RestMusicVersionAPI;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import io.swagger.jaxrs.config.BeanConfig;
-import io.swagger.jaxrs.listing.ApiListingResource;
-import io.swagger.jaxrs.listing.SwaggerSerializers; 
- 
-@Component
-public class JerseyConfig extends ResourceConfig { 
- 
-    @Value("${spring.jersey.application-path:/}")
+
+@Component 
+public class JerseyConfig extends ResourceConfig {
+
+    @Value("${spring.jersey.application-path:/}") 
     private String apiPath;
-    
+
     public JerseyConfig() { 
         this.registerEndpoints();
+        register(MusicExceptionMapper.class);
     } 
-    
+
     @PostConstruct
     public void init() {
         this.configureSwagger();
     }
-    
+
     private void registerEndpoints() {
-        register(RestMusicAdminAPI.class); 
-        register(RestMusicDataAPI.class); 
+        register(RestMusicDataAPI.class);
         register(RestMusicLocksAPI.class); 
+        register(RestMusicConditionalAPI.class); 
         register(RestMusicQAPI.class); 
         register(RestMusicTestAPI.class); 
         register(RestMusicVersionAPI.class);
         register(RestMusicHealthCheckAPI.class);
-    }
     
+    }
+
     private void configureSwagger() {
         // Available at localhost:port/swagger.json
         this.register(ApiListingResource.class);
@@ -67,11 +77,11 @@ public class JerseyConfig extends ResourceConfig {
         config.setTitle("MUSIC");
         config.setVersion("v2");
         config.setContact("Thomas Nelson");
-        config.setSchemes(new String[] { "http", "https" });
+        config.setSchemes(new String[] {"http", "https"});
         config.setBasePath("/MUSIC/rest");
         config.setResourcePackage("org.onap.music");
         config.setPrettyPrint(true);
         config.setScan(true);
     }
- 
+
 }