You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2021/02/11 15:52:27 UTC

[iotdb] branch master updated: [IOTDB-1154] Remove `final` if there are no subclasses by design.(Happy New Year) (#2674)

This is an automated email from the ASF dual-hosted git repository.

jincheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 119fe81  [IOTDB-1154] Remove `final` if there are no subclasses by design.(Happy New Year) (#2674)
119fe81 is described below

commit 119fe8149311a4a2f6f5ba6afcbe7679356866f1
Author: Jincheng Sun <su...@gmail.com>
AuthorDate: Thu Feb 11 23:52:04 2021 +0800

    [IOTDB-1154] Remove `final` if there are no subclasses by design.(Happy New Year) (#2674)
---
 server/src/main/java/org/apache/iotdb/db/service/JMXService.java  | 2 +-
 server/src/main/java/org/apache/iotdb/db/service/MQTTService.java | 8 ++++++--
 .../src/main/java/org/apache/iotdb/db/service/MetricsService.java | 6 +++++-
 server/src/main/java/org/apache/iotdb/db/service/RPCService.java  | 2 +-
 .../org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java     | 2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/service/JMXService.java b/server/src/main/java/org/apache/iotdb/db/service/JMXService.java
index 7993151..39ba4ba 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/JMXService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/JMXService.java
@@ -38,7 +38,7 @@ public class JMXService implements IService {
   private JMXService() {
   }
 
-  public static final JMXService getInstance() {
+  public static JMXService getInstance() {
     return JMXServerHolder.INSTANCE;
   }
 
diff --git a/server/src/main/java/org/apache/iotdb/db/service/MQTTService.java b/server/src/main/java/org/apache/iotdb/db/service/MQTTService.java
index c6bdec1..d34296a 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/MQTTService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/MQTTService.java
@@ -41,7 +41,11 @@ import org.slf4j.LoggerFactory;
 public class MQTTService implements IService {
     private static final Logger LOG = LoggerFactory.getLogger(MQTTService.class);
     private Server server = new Server();
-    
+
+    private MQTTService(){
+
+    }
+
     @Override
     public void start() throws StartupException {
         startup();
@@ -91,7 +95,7 @@ public class MQTTService implements IService {
         return ServiceType.MQTT_SERVICE;
     }
 
-    public static final MQTTService getInstance() {
+    public static MQTTService getInstance() {
         return MQTTServiceHolder.INSTANCE;
     }
 
diff --git a/server/src/main/java/org/apache/iotdb/db/service/MetricsService.java b/server/src/main/java/org/apache/iotdb/db/service/MetricsService.java
index aede01a..6c3a230 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/MetricsService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/MetricsService.java
@@ -47,7 +47,11 @@ public class MetricsService implements MetricsServiceMBean, IService {
   private Server server;
   private ExecutorService executorService;
 
-  public static final MetricsService getInstance() {
+  private MetricsService(){
+
+  }
+
+  public static MetricsService getInstance() {
     return MetricsServiceHolder.INSTANCE;
   }
 
diff --git a/server/src/main/java/org/apache/iotdb/db/service/RPCService.java b/server/src/main/java/org/apache/iotdb/db/service/RPCService.java
index 73646e3..35c88a0 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/RPCService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/RPCService.java
@@ -36,7 +36,7 @@ public class RPCService extends ThriftService implements RPCServiceMBean {
   private RPCService() {
   }
 
-  public static final RPCService getInstance() {
+  public static RPCService getInstance() {
     return RPCServiceHolder.INSTANCE;
   }
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java
index dd79cec..0cd477c 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileDescriptor.java
@@ -47,7 +47,7 @@ public class TSFileDescriptor {
     loadProps();
   }
 
-  public static final TSFileDescriptor getInstance() {
+  public static TSFileDescriptor getInstance() {
     return TsfileDescriptorHolder.INSTANCE;
   }