Temporarilty allow null injection until ActiveTraceRepository is refactored

Author: Xylus

profiler/src/main/java/com/navercorp/pinpoint/profiler/context/module/Nullable.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2017 NAVER Corp.
+ *
+ * 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.
+ */
+
+package com.navercorp.pinpoint.profiler.context.module;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * @author HyunGil Jeong
+ */
+@Target(PARAMETER)
+@Retention(RUNTIME)
+public @interface Nullable {
+}

profiler/src/main/java/com/navercorp/pinpoint/profiler/context/provider/CommandDispatcherProvider.java

@@ -20,6 +20,7 @@
 import com.google.inject.Provider;
 import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig;
 import com.navercorp.pinpoint.profiler.context.active.ActiveTraceRepository;
+import com.navercorp.pinpoint.profiler.context.module.Nullable;
 import com.navercorp.pinpoint.profiler.receiver.CommandDispatcher;
 import com.navercorp.pinpoint.profiler.receiver.ProfilerCommandLocatorBuilder;
 import com.navercorp.pinpoint.profiler.receiver.ProfilerCommandServiceLocator;
@@ -35,13 +36,10 @@ public class CommandDispatcherProvider implements Provider<CommandDispatcher> {
     private final ActiveTraceRepository activeTraceRepository;
 
     @Inject
-    public CommandDispatcherProvider(ProfilerConfig profilerConfig, ActiveTraceRepository activeTraceRepository) {
+    public CommandDispatcherProvider(ProfilerConfig profilerConfig, @Nullable /*TODO Disallow null*/ ActiveTraceRepository activeTraceRepository) {
         if (profilerConfig == null) {
             throw new NullPointerException("profilerConfig must not be null");
         }
-        if (activeTraceRepository == null) {
-            throw new NullPointerException("activeTraceRepository must not be null");
-        }
         this.profilerConfig = profilerConfig;
         this.activeTraceRepository = activeTraceRepository;
     }

profiler/src/main/java/com/navercorp/pinpoint/profiler/context/provider/TraceFactoryProvider.java

@@ -32,6 +32,7 @@
 import com.navercorp.pinpoint.profiler.context.TraceIdFactory;
 import com.navercorp.pinpoint.profiler.context.active.ActiveTraceFactory;
 import com.navercorp.pinpoint.profiler.context.active.ActiveTraceRepository;
+import com.navercorp.pinpoint.profiler.context.module.Nullable;
 import com.navercorp.pinpoint.profiler.context.storage.StorageFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,8 +59,8 @@ public class TraceFactoryProvider implements Provider<TraceFactory> {
 
 
     @Inject
-    public TraceFactoryProvider(CallStackFactory callStackFactory, StorageFactory storageFactory, Sampler sampler, IdGenerator idGenerator, TraceIdFactory traceIdFactory, AsyncIdGenerator asyncIdGenerator, ActiveTraceRepository activeTraceRepository,
-                                SpanFactory spanFactory, RecorderFactory recorderFactory) {
+    public TraceFactoryProvider(CallStackFactory callStackFactory, StorageFactory storageFactory, Sampler sampler, IdGenerator idGenerator, TraceIdFactory traceIdFactory, AsyncIdGenerator asyncIdGenerator,
+                                @Nullable /*TODO Disallow null*/ ActiveTraceRepository activeTraceRepository, SpanFactory spanFactory, RecorderFactory recorderFactory) {
         if (callStackFactory == null) {
             throw new NullPointerException("callStackFactory must not be null");
         }

profiler/src/main/java/com/navercorp/pinpoint/profiler/context/provider/stat/activethread/ActiveTraceMetricProvider.java

@@ -21,6 +21,7 @@
 import com.navercorp.pinpoint.profiler.context.active.ActiveTraceHistogramFactory;
 import com.navercorp.pinpoint.profiler.context.active.ActiveTraceLocator;
 import com.navercorp.pinpoint.profiler.context.active.ActiveTraceRepository;
+import com.navercorp.pinpoint.profiler.context.module.Nullable;
 import com.navercorp.pinpoint.profiler.monitor.metric.activethread.ActiveTraceMetric;
 import com.navercorp.pinpoint.profiler.monitor.metric.activethread.DefaultActiveTraceMetric;
 
@@ -32,7 +33,7 @@ public class ActiveTraceMetricProvider implements Provider<ActiveTraceMetric> {
     private final ActiveTraceLocator activeTraceLocator;
 
     @Inject
-    public ActiveTraceMetricProvider(ActiveTraceRepository activeTraceLocator) {
+    public ActiveTraceMetricProvider(@Nullable /*TODO Disallow null*/ ActiveTraceRepository activeTraceLocator) {
         this.activeTraceLocator = activeTraceLocator;
     }