From 6d8a6a21c8f489ad9133f78a9cc38586b4898fb9 Mon Sep 17 00:00:00 2001 From: Roland Hochmuth Date: Thu, 8 May 2014 15:23:23 -0600 Subject: [PATCH] Added copyright and license to README.md --- README.md | 17 +++++ .../com/hpcloud/mon/MonApiApplication.java | 67 ++++++++----------- 2 files changed, 44 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index 1ea69930a..2f507f7d6 100644 --- a/README.md +++ b/README.md @@ -35,3 +35,20 @@ When running mon-api the API docs along with the API test interface can be acces [http://localhost:8080/swagger-ui/](http://localhost:8080/swagger-ui/) Note: the trailing "/" is necessary for the Swagger UI to work properly. + +# License + +Copyright (c) 2014 Hewlett-Packard Development Company, L.P. + +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. diff --git a/src/main/java/com/hpcloud/mon/MonApiApplication.java b/src/main/java/com/hpcloud/mon/MonApiApplication.java index 933dde475..3a63cff24 100644 --- a/src/main/java/com/hpcloud/mon/MonApiApplication.java +++ b/src/main/java/com/hpcloud/mon/MonApiApplication.java @@ -16,20 +16,6 @@ */ package com.hpcloud.mon; -import io.dropwizard.Application; -import io.dropwizard.jdbi.bundles.DBIExceptionsBundle; -import io.dropwizard.setup.Bootstrap; -import io.dropwizard.setup.Environment; - -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; - -import javax.servlet.FilterRegistration.Dynamic; -import javax.ws.rs.ext.ExceptionMapper; - import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.SerializationFeature; @@ -40,22 +26,18 @@ import com.hpcloud.mon.bundle.SwaggerBundle; import com.hpcloud.mon.infrastructure.servlet.MockAuthenticationFilter; import com.hpcloud.mon.infrastructure.servlet.PostAuthenticationFilter; import com.hpcloud.mon.infrastructure.servlet.PreAuthenticationFilter; -import com.hpcloud.mon.resource.AlarmResource; -import com.hpcloud.mon.resource.MeasurementResource; -import com.hpcloud.mon.resource.MetricResource; -import com.hpcloud.mon.resource.NotificationMethodResource; -import com.hpcloud.mon.resource.StatisticResource; -import com.hpcloud.mon.resource.VersionResource; -import com.hpcloud.mon.resource.exception.ConstraintViolationExceptionMapper; -import com.hpcloud.mon.resource.exception.EntityExistsExceptionMapper; -import com.hpcloud.mon.resource.exception.EntityNotFoundExceptionMapper; -import com.hpcloud.mon.resource.exception.IllegalArgumentExceptionMapper; -import com.hpcloud.mon.resource.exception.InvalidEntityExceptionMapper; -import com.hpcloud.mon.resource.exception.JsonMappingExceptionManager; -import com.hpcloud.mon.resource.exception.JsonProcessingExceptionMapper; -import com.hpcloud.mon.resource.exception.ThrowableExceptionMapper; +import com.hpcloud.mon.resource.*; +import com.hpcloud.mon.resource.exception.*; import com.hpcloud.mon.resource.serialization.SubAlarmExpressionSerializer; import com.hpcloud.util.Injector; +import io.dropwizard.Application; +import io.dropwizard.jdbi.bundles.DBIExceptionsBundle; +import io.dropwizard.setup.Bootstrap; +import io.dropwizard.setup.Environment; + +import javax.servlet.FilterRegistration.Dynamic; +import javax.ws.rs.ext.ExceptionMapper; +import java.util.*; /** * Monitoring API application. @@ -115,9 +97,11 @@ public class MonApiApplication extends Application { environment.healthChecks().register("kafka", new KafkaHealthCheck(config.kafka)); /** Configure auth filters */ - environment.servlets() - .addFilter("pre-auth", new PreAuthenticationFilter()) - .addMappingForUrlPatterns(null, true, "/*"); + Dynamic preAuthenticationFilter = environment.servlets() + .addFilter("pre-auth", new PreAuthenticationFilter()); + preAuthenticationFilter.addMappingForUrlPatterns(null, true, "/"); + preAuthenticationFilter.addMappingForUrlPatterns(null, true, "/v2.0/*"); + if (config.middleware.enabled) { Map authInitParams = new HashMap(); authInitParams.put("ServiceIds", config.middleware.serviceIds); @@ -137,17 +121,20 @@ public class MonApiApplication extends Application { authInitParams.put("ConnRetryTimes", config.middleware.connRetryTimes); authInitParams.put("ConnRetryInterval", config.middleware.connRetryInterval); - Dynamic filter = environment.servlets().addFilter("token-auth", new TokenAuth()); - filter.addMappingForUrlPatterns(null, true, "/*"); - filter.setInitParameters(authInitParams); + Dynamic tokenAuthFilter = environment.servlets().addFilter("token-auth", new TokenAuth()); + tokenAuthFilter.addMappingForUrlPatterns(null, true, "/"); + tokenAuthFilter.addMappingForUrlPatterns(null, true, "/v2.0/*"); + tokenAuthFilter.setInitParameters(authInitParams); } else { - environment.servlets() - .addFilter("mock-auth", new MockAuthenticationFilter()) - .addMappingForUrlPatterns(null, true, "/*"); + Dynamic mockAuthenticationFilter = environment.servlets() + .addFilter("mock-auth", new MockAuthenticationFilter()); + mockAuthenticationFilter.addMappingForUrlPatterns(null, true, "/"); + mockAuthenticationFilter.addMappingForUrlPatterns(null, true, "/v2.0/*"); } - environment.servlets() - .addFilter("post-auth", new PostAuthenticationFilter(Collections.singletonList(""))) - .addMappingForUrlPatterns(null, true, "/v2.0/*"); + Dynamic postAuthenticationFilter = environment.servlets() + .addFilter("post-auth", new PostAuthenticationFilter(Collections.singletonList(""))); + postAuthenticationFilter.addMappingForUrlPatterns(null, true, "/"); + postAuthenticationFilter.addMappingForUrlPatterns(null, true, "/v2.0/*"); /** Configure swagger */ SwaggerBundle.configure(config);