Skip to content

Commit

Permalink
[HWKMETRICS-199] fixing import statements
Browse files Browse the repository at this point in the history
  • Loading branch information
John Sanda committed Aug 11, 2015
1 parent 4c2eb57 commit 00b2e89
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 67 deletions.
39 changes: 15 additions & 24 deletions ...trics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricsServiceLifecycle.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,6 @@
*/
package org.hawkular.metrics.api.jaxrs;

import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.hawkular.metrics.api.jaxrs.config.ConfigurationKey.CASSANDRA_CQL_PORT;
import static org.hawkular.metrics.api.jaxrs.config.ConfigurationKey.CASSANDRA_KEYSPACE;
import static org.hawkular.metrics.api.jaxrs.config.ConfigurationKey.CASSANDRA_NODES;
import static org.hawkular.metrics.api.jaxrs.config.ConfigurationKey.CASSANDRA_RESETDB;
import static org.hawkular.metrics.api.jaxrs.config.ConfigurationKey.CASSANDRA_USESSL;
import static org.hawkular.metrics.api.jaxrs.config.ConfigurationKey.USE_VIRTUAL_CLOCK;
import static org.hawkular.metrics.api.jaxrs.config.ConfigurationKey.WAIT_FOR_SERVICE;

import java.util.Arrays;
import java.util.Locale;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadFactory;

import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
import javax.inject.Inject;

import com.codahale.metrics.MetricRegistry;
import com.datastax.driver.core.Cluster;
import com.datastax.driver.core.Session;
Expand All @@ -63,6 +39,21 @@
import rx.schedulers.Schedulers;
import rx.schedulers.TestScheduler;

import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
import javax.inject.Inject;
import java.util.Arrays;
import java.util.Locale;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadFactory;

import static java.util.concurrent.TimeUnit.*;
import static org.hawkular.metrics.api.jaxrs.config.ConfigurationKey.*;

/**
* Bean created on startup to manage the lifecycle of the {@link MetricsService} instance shared in application scope.
*
Expand Down
13 changes: 6 additions & 7 deletions api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/filter/TenantFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,20 @@
*/
package org.hawkular.metrics.api.jaxrs.filter;

import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;

import java.io.IOException;
import org.hawkular.metrics.api.jaxrs.ApiError;
import org.hawkular.metrics.api.jaxrs.handler.BaseHandler;
import org.hawkular.metrics.api.jaxrs.handler.StatusHandler;
import org.hawkular.metrics.api.jaxrs.handler.VirtualClockHandler;

import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import javax.ws.rs.core.UriInfo;
import javax.ws.rs.ext.Provider;
import java.io.IOException;

import org.hawkular.metrics.api.jaxrs.ApiError;
import org.hawkular.metrics.api.jaxrs.handler.BaseHandler;
import org.hawkular.metrics.api.jaxrs.handler.StatusHandler;
import org.hawkular.metrics.api.jaxrs.handler.VirtualClockHandler;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;

/**
* @author Stefan Negrea
Expand Down
25 changes: 9 additions & 16 deletions ...s-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/VirtualClockHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,6 @@
*/
package org.hawkular.metrics.api.jaxrs.handler;

import static java.util.concurrent.TimeUnit.SECONDS;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;

import java.util.Map;
import java.util.concurrent.TimeUnit;

import javax.inject.Inject;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Response;

import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableMap;
import org.hawkular.metrics.api.jaxrs.param.Duration;
Expand All @@ -42,6 +26,15 @@
import rx.observers.TestSubscriber;
import rx.schedulers.Schedulers;

import javax.inject.Inject;
import javax.ws.rs.*;
import javax.ws.rs.core.Response;
import java.util.Map;
import java.util.concurrent.TimeUnit;

import static java.util.concurrent.TimeUnit.SECONDS;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;


/**
* @author jsanda
Expand Down
4 changes: 2 additions & 2 deletions api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/util/VirtualClock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
*/
package org.hawkular.metrics.api.jaxrs.util;

import java.util.concurrent.TimeUnit;

import rx.schedulers.TestScheduler;

import java.util.concurrent.TimeUnit;

/**
* @author jsanda
*/
Expand Down
11 changes: 11 additions & 0 deletions core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,17 @@
import rx.functions.Func1;
import rx.subjects.PublishSubject;

import java.util.*;
import java.util.concurrent.*;
import java.util.function.Predicate;
import java.util.regex.Pattern;

import static java.util.Comparator.comparingLong;
import static org.hawkular.metrics.core.api.MetricType.*;
import static org.hawkular.metrics.core.impl.Functions.getTTLAvailabilityDataPoint;
import static org.hawkular.metrics.core.impl.Functions.getTTLGaugeDataPoint;
import static org.joda.time.Hours.hours;

/**
* @author John Sanda
*/
Expand Down
4 changes: 2 additions & 2 deletions task-queue/src/main/java/org/hawkular/metrics/tasks/api/TaskScheduler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
*/
package org.hawkular.metrics.tasks.api;

import java.util.Map;

import org.hawkular.metrics.tasks.impl.Lease;
import rx.Observable;
import rx.Subscriber;
import rx.Subscription;
import rx.functions.Action1;

import java.util.Map;

/**
* @author jsanda
*/
Expand Down
20 changes: 4 additions & 16 deletions task-queue/src/main/java/org/hawkular/metrics/tasks/impl/TaskSchedulerImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,6 @@
*/
package org.hawkular.metrics.tasks.impl;

import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;

import com.datastax.driver.core.KeyspaceMetadata;
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.UDTValue;
Expand All @@ -36,11 +25,7 @@
import com.google.common.hash.Hashing;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.hawkular.metrics.tasks.DateTimeService;
import org.hawkular.metrics.tasks.api.RepeatingTrigger;
import org.hawkular.metrics.tasks.api.SingleExecutionTrigger;
import org.hawkular.metrics.tasks.api.Task2;
import org.hawkular.metrics.tasks.api.TaskScheduler;
import org.hawkular.metrics.tasks.api.Trigger;
import org.hawkular.metrics.tasks.api.*;
import org.hawkular.rx.cassandra.driver.RxSession;
import org.joda.time.DateTime;
import org.joda.time.Duration;
Expand All @@ -54,6 +39,9 @@
import rx.schedulers.Schedulers;
import rx.subjects.PublishSubject;

import java.util.*;
import java.util.concurrent.*;

/**
* @author jsanda
*/
Expand Down

0 comments on commit 00b2e89

Please sign in to comment.