From 49fed53f2e586f20dd7fc41fefcf231cc8df9491 Mon Sep 17 00:00:00 2001
From: Jongho Moon <jongho.moon@navercorp.com>
Date: Mon, 13 Apr 2015 17:45:50 +0900
Subject: [PATCH] Removed ModifierProvider

---
 .../ClassFileTransformerDispatcher.java       | 18 ----------
 .../profiler/modifier/ModifierProvider.java   | 35 -------------------
 2 files changed, 53 deletions(-)
 delete mode 100644 profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/ModifierProvider.java

diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/ClassFileTransformerDispatcher.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/ClassFileTransformerDispatcher.java
index bf06bd784..51a72239b 100644
--- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/ClassFileTransformerDispatcher.java
+++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/ClassFileTransformerDispatcher.java
@@ -27,11 +27,8 @@ import org.slf4j.LoggerFactory;
 import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig;
 import com.navercorp.pinpoint.bootstrap.instrument.ByteCodeInstrumentor;
 import com.navercorp.pinpoint.bootstrap.plugin.transformer.DedicatedClassFileTransformer;
-import com.navercorp.pinpoint.common.plugin.PluginLoader;
 import com.navercorp.pinpoint.profiler.modifier.AbstractModifier;
 import com.navercorp.pinpoint.profiler.modifier.DefaultModifierRegistry;
-import com.navercorp.pinpoint.profiler.modifier.Modifier;
-import com.navercorp.pinpoint.profiler.modifier.ModifierProvider;
 import com.navercorp.pinpoint.profiler.modifier.ModifierRegistry;
 import com.navercorp.pinpoint.profiler.plugin.ClassFileTransformerAdaptor;
 import com.navercorp.pinpoint.profiler.plugin.DefaultProfilerPluginContext;
@@ -160,26 +157,11 @@ public class ClassFileTransformerDispatcher implements ClassFileTransformer {
         // logback
         modifierRepository.addLogbackModifier();
         
-        loadModifiers(modifierRepository);
         loadEditorsFromPlugins(modifierRepository, pluginContexts);
         
         return modifierRepository;
     }
 
-    private void loadModifiers(DefaultModifierRegistry modifierRepository) {
-        for (ModifierProvider provider : PluginLoader.load(ModifierProvider.class, getClass().getClassLoader())) {
-            for (Modifier modifier : provider.getModifiers(byteCodeInstrumentor, agent)) {
-                if (modifier instanceof AbstractModifier) {
-                    AbstractModifier abstractModifier = (AbstractModifier)modifier;
-                    modifierRepository.addModifier(abstractModifier);
-                    logger.info("Registering modifier {} from {} for {} ", abstractModifier.getClass().getName(), abstractModifier.getClass().getProtectionDomain().getCodeSource(), abstractModifier.getTargetClass());
-                } else {
-                    logger.warn("Ignore modifier {} from {}", modifier.getClass().getName(), modifier.getClass().getProtectionDomain().getCodeSource());
-                }
-            }
-        }
-    }
-
     private void loadEditorsFromPlugins(DefaultModifierRegistry modifierRepository, List<DefaultProfilerPluginContext> pluginContexts) {
         for (DefaultProfilerPluginContext pluginContext : pluginContexts) {
             for (ClassFileTransformer transformer : pluginContext.getClassEditors()) {
diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/ModifierProvider.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/ModifierProvider.java
deleted file mode 100644
index c3ec8f01d..000000000
--- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/modifier/ModifierProvider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2014 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.modifier;
-
-import java.util.List;
-
-import com.navercorp.pinpoint.bootstrap.Agent;
-import com.navercorp.pinpoint.bootstrap.instrument.ByteCodeInstrumentor;
-import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPlugin;
-
-/**
- * ModifierProvider is a temporary interface to provide additional modifiers to Pinpoint profiler.
- * This will be replaced by {@link ProfilerPlugin} later.
- * 
- * @deprecated
- * @author lioolli
- */
-@Deprecated
-public interface ModifierProvider {
-    List<Modifier> getModifiers(ByteCodeInstrumentor byteCodeInstrumentor, Agent agent);
-}