Add missing @OverRide, remove duplicate javadoc

Author: mrotteveel

src/main/org/firebirdsql/management/FBBackupManager.java

@@ -64,11 +64,13 @@ public FBBackupManager(GDSType gdsType) {
         super(gdsType);
     }
 
+    @Override
     public void setBackupPath(String backupPath) {
         addBackupPath(backupPath, -1);
         noLimitBackup = true;
     }
 
+    @Override
     public void addBackupPath(String path, int size) {
         if (noLimitBackup) {
             throw new IllegalArgumentException(
@@ -77,29 +79,27 @@ public void addBackupPath(String path, int size) {
         backupPaths.add(new PathSizeStruct(path, size));
     }
 
+    @Override
     public void clearBackupPaths() {
         backupPaths.clear();
         noLimitBackup = false;
     }
 
+    @Override
     public void backupDatabase(int options) throws SQLException {
         try (FbService service = attachServiceManager()) {
             executeServicesOperation(service, getBackupSRB(service, options));
         }
     }
 
+    @Override
     public void restoreDatabase(int options) throws SQLException {
         try (FbService service = attachServiceManager()) {
             executeServicesOperation(service, getRestoreSRB(service, options));
         }
     }
 
-    /**
-     * Adds the currentDatabase as a source for the backup operation
-     *
-     * @param backupSPB
-     *        The buffer to be used during the backup operation
-     */
+    @Override
     protected void addBackupsToBackupRequestBuffer(FbService service, ServiceRequestBuffer backupSPB)
             throws SQLException {
         for (Iterator<PathSizeStruct> iter = backupPaths.iterator(); iter.hasNext();) {
@@ -116,12 +116,7 @@ protected void addBackupsToBackupRequestBuffer(FbService service, ServiceRequest
         }
     }
 
-    /**
-     * Adds the list of backups to be used for the restore operation
-     *
-     * @param restoreSPB
-     *        The buffer to be used during the restore operation
-     */
+    @Override
     protected void addBackupsToRestoreRequestBuffer(FbService service, ServiceRequestBuffer restoreSPB) {
         for (PathSizeStruct pathSize : backupPaths) {
             restoreSPB.addArgument(isc_spb_bkp_file, pathSize.path());

src/main/org/firebirdsql/management/FBBackupManagerBase.java

@@ -377,13 +377,16 @@ protected ServiceRequestBuffer getRestoreSRB(FbService service, int options) thr
      * Adds the backup source for the backup operation, depending on the manager used
      *
      * @param backupSPB
-     *         The buffer to be used during the backup operation
+     *         buffer to be used during the backup operation
      */
     protected abstract void addBackupsToBackupRequestBuffer(FbService service, ServiceRequestBuffer backupSPB)
             throws SQLException;
 
     /**
      * Adds the backup files to be used during restore
+     *
+     * @param restoreSPB
+     *         buffer to be used during the restore operation
      */
     protected abstract void addBackupsToRestoreRequestBuffer(FbService service, ServiceRequestBuffer restoreSPB);
 

src/main/org/firebirdsql/management/FBServiceManager.java

@@ -273,17 +273,12 @@ public Map<ConnectionProperty, Object> connectionPropertyValues() {
         return serviceProperties.connectionPropertyValues();
     }
 
-    /**
-     * @return Returns the out.
-     */
+    @Override
     public synchronized @Nullable OutputStream getLogger() {
         return logger;
     }
 
-    /**
-     * @param logger
-     *         The out to set.
-     */
+    @Override
     public synchronized void setLogger(@Nullable OutputStream logger) {
         this.logger = logger;
     }

src/main/org/firebirdsql/management/FBStatisticsManager.java

@@ -75,20 +75,23 @@ public FBStatisticsManager(GDSType gdsType) {
         super(gdsType);
     }
 
+    @Override
     public void getHeaderPage() throws SQLException {
         try (FbService service = attachServiceManager()) {
             ServiceRequestBuffer srb = createStatsSRB(service, isc_spb_sts_hdr_pages);
             executeServicesOperation(service, srb);
         }
     }
 
+    @Override
     public void getDatabaseStatistics() throws SQLException {
         try (FbService service = attachServiceManager()) {
             ServiceRequestBuffer srb = createDefaultStatsSRB(service);
             executeServicesOperation(service, srb);
         }
     }
 
+    @Override
     public void getDatabaseStatistics(int options) throws SQLException {
         if (options != 0 && (options | POSSIBLE_STATISTICS) != POSSIBLE_STATISTICS) {
             throw new IllegalArgumentException("options must be 0 or a "

src/main/org/firebirdsql/management/FBStreamingBackupManager.java

@@ -85,10 +85,12 @@ public FBStreamingBackupManager(GDSType gdsType) {
         super(gdsType);
     }
 
+    @Override
     public void setBackupPath(String backupPath) {
         throw new IllegalArgumentException("You cannot use setBackupPath(String) for Streaming backups.");
     }
 
+    @Override
     public void addBackupPath(String path, int size) {
         throw new IllegalArgumentException("You cannot use setBackupPath(String) for Streaming backups.");
     }
@@ -103,10 +105,12 @@ public void setRestoreInputStream(InputStream restoreStream) {
                 : new BufferedInputStream(restoreStream, 128 * MAX_RESTORE_CHUNK);
     }
 
+    @Override
     public void clearBackupPaths() {
         backupOutputStream = null;
     }
 
+    @Override
     public void backupDatabase(int options) throws SQLException {
         final OutputStream backupOutputStream = this.backupOutputStream;
         if (backupOutputStream == null) {
@@ -118,6 +122,7 @@ public void backupDatabase(int options) throws SQLException {
         }
     }
 
+    @Override
     public void restoreDatabase(int options) throws SQLException {
         final InputStream restoreInputStream = this.restoreInputStream;
         if (restoreInputStream == null) {
@@ -131,6 +136,7 @@ public void restoreDatabase(int options) throws SQLException {
     /**
      * Streaming backups are currently not capable of verbose output
      */
+    @Override
     protected boolean verboseBackup() {
         return false;
     }
@@ -155,22 +161,12 @@ public void setRestorePageSize(int pageSize) {
         super.setRestorePageSize(pageSize);
     }
 
-    /**
-     * Adds stdout as a source for the backup operation
-     *
-     * @param backupSPB
-     *        The buffer to be used during the backup operation
-     */
+    @Override
     protected void addBackupsToBackupRequestBuffer(FbService service, ServiceRequestBuffer backupSPB) {
         backupSPB.addArgument(isc_spb_bkp_file, "stdout");
     }
 
-    /**
-     * Adds stdin as a source for the restore operation
-     *
-     * @param restoreSPB
-     *        The buffer to be used during the restore operation
-     */
+    @Override
     protected void addBackupsToRestoreRequestBuffer(FbService service, ServiceRequestBuffer restoreSPB) {
         restoreSPB.addArgument(isc_spb_bkp_file, "stdin");
     }

src/main/org/firebirdsql/management/FBTraceManager.java

@@ -129,15 +129,7 @@ private ServiceRequestBuffer getTraceSPB(FbService service, int action, String t
         return traceSPB;
     }
 
-    /**
-     * Starts a trace session with an optional trace session name and configuration
-     *
-     * @param traceSessionName
-     *         The trace session name (optional)
-     * @param configuration
-     *         The trace configuration. For an example, look into fbtrace.conf in the root directory of your
-     *         Firebird installation
-     */
+    @Override
     public void startTraceSession(@Nullable String traceSessionName, String configuration) throws SQLException {
         if (isNullOrEmpty(configuration)) {
             throw new SQLException("No configuration provided");
@@ -160,64 +152,35 @@ public void startTraceSession(@Nullable String traceSessionName, String configur
         }
     }
 
-    /**
-     * Stops a trace session with the given trace session ID
-     *
-     * @param traceSessionId
-     *         The trace session ID
-     */
+    @Override
     public void stopTraceSession(int traceSessionId) throws SQLException {
         try (FbService service = attachServiceManager()) {
             executeServicesOperation(service, getTraceSPB(service, isc_action_svc_trace_stop, traceSessionId));
         }
     }
 
-    /**
-     * Suspends a trace session with the given trace session ID
-     *
-     * @param traceSessionId
-     *         The trace session ID
-     */
+    @Override
     public void suspendTraceSession(int traceSessionId) throws SQLException {
         try (FbService service = attachServiceManager()) {
             executeServicesOperation(service, getTraceSPB(service, isc_action_svc_trace_suspend, traceSessionId));
         }
     }
 
-    /**
-     * Resumes a trace session with the given trace session ID
-     *
-     * @param traceSessionId
-     *         The trace session ID
-     */
+    @Override
     public void resumeTraceSession(int traceSessionId) throws SQLException {
         try (FbService service = attachServiceManager()) {
             executeServicesOperation(service, getTraceSPB(service, isc_action_svc_trace_resume, traceSessionId));
         }
     }
 
-    /**
-     * List all currently registered trace sessions
-     */
+    @Override
     public void listTraceSessions() throws SQLException {
         try (FbService service = attachServiceManager()) {
             executeServicesOperation(service, getTraceSPB(service, isc_action_svc_trace_list));
         }
     }
 
-    /**
-     * Gets the sessionId for the given name.
-     * <p>
-     * Returns null if the sessionName does not exist or hasn't been initialized yet.
-     * </p>
-     * <p>
-     * If multiple sessions are started with the same name, the last one is returned.
-     * </p>
-     *
-     * @param sessionName
-     *         Name of the session
-     * @return Id of the session or null otherwise
-     */
+    @Override
     public @Nullable Integer getSessionId(String sessionName) {
         return traceSessions.get(sessionName);
     }