Merge branch 'master' into refactor/url

dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java

@@ -1,71 +1,71 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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 org.apache.dubbo.monitor.dubbo;
-
-import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.URLBuilder;
-import org.apache.dubbo.common.utils.StringUtils;
-import org.apache.dubbo.monitor.Monitor;
-import org.apache.dubbo.monitor.MonitorService;
-import org.apache.dubbo.monitor.support.AbstractMonitorFactory;
-import org.apache.dubbo.rpc.Invoker;
-import org.apache.dubbo.rpc.Protocol;
-import org.apache.dubbo.rpc.ProxyFactory;
-
-import static org.apache.dubbo.common.Constants.CHECK_KEY;
-import static org.apache.dubbo.common.Constants.DUBBO_PROTOCOL;
-import static org.apache.dubbo.common.Constants.PROTOCOL_KEY;
-import static org.apache.dubbo.common.Constants.REFERENCE_FILTER_KEY;
-
-/**
- * DefaultMonitorFactory
- */
-public class DubboMonitorFactory extends AbstractMonitorFactory {
-
-    private Protocol protocol;
-
-    private ProxyFactory proxyFactory;
-
-    public void setProtocol(Protocol protocol) {
-        this.protocol = protocol;
-    }
-
-    public void setProxyFactory(ProxyFactory proxyFactory) {
-        this.proxyFactory = proxyFactory;
-    }
-
-    @Override
-    protected Monitor createMonitor(URL url) {
-        URLBuilder urlBuilder = URLBuilder.from(url);
-        urlBuilder.setProtocol(url.getParameter(PROTOCOL_KEY, DUBBO_PROTOCOL));
-        if (StringUtils.isEmpty(url.getPath())) {
-            urlBuilder.setPath(MonitorService.class.getName());
-        }
-        String filter = url.getParameter(REFERENCE_FILTER_KEY);
-        if (StringUtils.isEmpty(filter)) {
-            filter = "";
-        } else {
-            filter = filter + ",";
-        }
-        urlBuilder.addParameters(CHECK_KEY, String.valueOf(false),
-                REFERENCE_FILTER_KEY, filter + "-monitor");
-        Invoker<MonitorService> monitorInvoker = protocol.refer(MonitorService.class, urlBuilder.build());
-        MonitorService monitorService = proxyFactory.getProxy(monitorInvoker);
-        return new DubboMonitor(monitorInvoker, monitorService);
-    }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 org.apache.dubbo.monitor.dubbo;
+
+import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.URLBuilder;
+import org.apache.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.monitor.Monitor;
+import org.apache.dubbo.monitor.MonitorService;
+import org.apache.dubbo.monitor.support.AbstractMonitorFactory;
+import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.Protocol;
+import org.apache.dubbo.rpc.ProxyFactory;
+
+import static org.apache.dubbo.common.Constants.CHECK_KEY;
+import static org.apache.dubbo.common.Constants.DUBBO_PROTOCOL;
+import static org.apache.dubbo.common.Constants.PROTOCOL_KEY;
+import static org.apache.dubbo.common.Constants.REFERENCE_FILTER_KEY;
+
+/**
+ * DefaultMonitorFactory
+ */
+public class DubboMonitorFactory extends AbstractMonitorFactory {
+
+    private Protocol protocol;
+
+    private ProxyFactory proxyFactory;
+
+    public void setProtocol(Protocol protocol) {
+        this.protocol = protocol;
+    }
+
+    public void setProxyFactory(ProxyFactory proxyFactory) {
+        this.proxyFactory = proxyFactory;
+    }
+
+    @Override
+    protected Monitor createMonitor(URL url) {
+        URLBuilder urlBuilder = URLBuilder.from(url);
+        urlBuilder.setProtocol(url.getParameter(PROTOCOL_KEY, DUBBO_PROTOCOL));
+        if (StringUtils.isEmpty(url.getPath())) {
+            urlBuilder.setPath(MonitorService.class.getName());
+        }
+        String filter = url.getParameter(REFERENCE_FILTER_KEY);
+        if (StringUtils.isEmpty(filter)) {
+            filter = "";
+        } else {
+            filter = filter + ",";
+        }
+        urlBuilder.addParameters(CHECK_KEY, String.valueOf(false),
+                REFERENCE_FILTER_KEY, filter + "-monitor");
+        Invoker<MonitorService> monitorInvoker = protocol.refer(MonitorService.class, urlBuilder.build());
+        MonitorService monitorService = proxyFactory.getProxy(monitorInvoker);
+        return new DubboMonitor(monitorInvoker, monitorService);
+    }
+
+}