Revert "Add cleaner for orphaned files"

multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/Messages.java

@@ -13,7 +13,6 @@ public final class Messages {
     public static final String FILE_WITH_ID_AND_SPACE_DOES_NOT_EXIST = "File with ID \"{0}\" and space \"{1}\" does not exist.";
     public static final String ERROR_DELETING_FILE_WITH_ID = "Error deleting file with ID \"{0}\"";
     public static final String ERROR_GETTING_FILES_WITH_SPACE_AND_NAMESPACE = "Error getting files with space {0} and namespace {1}";
-    public static final String ERROR_GETTING_FILES_CREATED_AFTER_0 = "Error getting files created after {0}";
     public static final String ERROR_GETTING_FILES_WITH_SPACE_NAMESPACE_AND_NAME = "Error getting files with space {0} namespace {1} and file name {2}";
     public static final String ERROR_GETTING_ALL_FILES = "Error getting all files";
     public static final String ERROR_DELETING_PROCESS_LOGS_WITH_NAMESPACE = "Error deleting process logs with namespace \"{0}\"";

multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/query/OperationQuery.java

@@ -27,8 +27,6 @@ public interface OperationQuery extends Query<Operation, OperationQuery> {
 
     OperationQuery startedBefore(LocalDateTime startedBefore);
 
-    OperationQuery startedAfter(LocalDateTime timestamp);
-
     OperationQuery endedBefore(LocalDateTime endedBefore);
 
     OperationQuery endedAfter(LocalDateTime endedAfter);

multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/query/impl/OperationQueryImpl.java

@@ -117,16 +117,6 @@ public OperationQuery startedBefore(LocalDateTime startedBefore) {
         return this;
     }
 
-    @Override
-    public OperationQuery startedAfter(LocalDateTime timestamp) {
-        queryCriteria.addRestriction(ImmutableQueryAttributeRestriction.<LocalDateTime> builder()
-                                                                       .attribute(AttributeNames.STARTED_AT)
-                                                                       .condition(getCriteriaBuilder()::greaterThanOrEqualTo)
-                                                                       .value(timestamp)
-                                                                       .build());
-        return this;
-    }
-
     @Override
     public OperationQuery endedBefore(LocalDateTime endedBefore) {
         queryCriteria.addRestriction(ImmutableQueryAttributeRestriction.<LocalDateTime> builder()

multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/query/providers/SqlFileQueryProvider.java

@@ -38,7 +38,6 @@ public abstract class SqlFileQueryProvider {
     private static final String UPDATE_FILE_DIGEST = "UPDATE %s SET DIGEST = ? WHERE FILE_ID = ?";
     private static final String INSERT_FILE_ATTRIBUTES = "INSERT INTO %s (FILE_ID, SPACE, FILE_NAME, NAMESPACE, FILE_SIZE, DIGEST, DIGEST_ALGORITHM, MODIFIED) VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
     private static final String SELECT_ALL_FILES = "SELECT FILE_ID, SPACE, DIGEST, DIGEST_ALGORITHM, MODIFIED, FILE_NAME, NAMESPACE, FILE_SIZE FROM %s";
-    private static final String SELECT_FILES_CREATED_AFTER = "SELECT FILE_ID, SPACE, DIGEST, DIGEST_ALGORITHM, MODIFIED, FILE_NAME, NAMESPACE, FILE_SIZE FROM %s WHERE MODIFIED > ?";
     private static final String SELECT_FILES_BY_NAMESPACE_AND_SPACE = "SELECT FILE_ID, SPACE, DIGEST, DIGEST_ALGORITHM, MODIFIED, FILE_NAME, NAMESPACE, FILE_SIZE FROM %s WHERE NAMESPACE=? AND SPACE=?";
     private static final String SELECT_FILES_BY_NAMESPACE_SPACE_AND_NAME = "SELECT FILE_ID, SPACE, DIGEST, DIGEST_ALGORITHM, MODIFIED, FILE_NAME, NAMESPACE, FILE_SIZE FROM %s WHERE NAMESPACE=? AND SPACE=? AND FILE_NAME=? ORDER BY MODIFIED ASC";
     private static final String SELECT_FILES_BY_SPACE_WITH_NO_NAMESPACE = "SELECT FILE_ID, SPACE, DIGEST, DIGEST_ALGORITHM, MODIFIED, FILE_NAME, NAMESPACE, FILE_SIZE FROM %s WHERE SPACE=? AND NAMESPACE IS NULL";
@@ -198,27 +197,6 @@ public SqlQuery<List<FileEntry>> getListAllFilesQuery() {
         };
     }
 
-    public SqlQuery<List<FileEntry>> getListFilesCreatedAfterQuery(LocalDateTime timestamp) {
-        return (Connection connection) -> {
-            PreparedStatement statement = null;
-            ResultSet resultSet = null;
-            try {
-                List<FileEntry> files = new ArrayList<>();
-                statement = connection.prepareStatement(getQuery(SELECT_FILES_CREATED_AFTER));
-                statement.setTimestamp(1, Timestamp.from(timestamp.atZone(ZoneId.systemDefault())
-                                                                  .toInstant()));
-                resultSet = statement.executeQuery();
-                while (resultSet.next()) {
-                    files.add(getFileEntry(resultSet));
-                }
-                return files;
-            } finally {
-                JdbcUtil.closeQuietly(resultSet);
-                JdbcUtil.closeQuietly(statement);
-            }
-        };
-    }
-
     public SqlQuery<FileEntry> getRetrieveFileQuery(String space, String id) {
         return (Connection connection) -> {
             PreparedStatement statement = null;
@@ -312,8 +290,9 @@ public SqlQuery<Integer> getDeleteModifiedBeforeQuery(LocalDateTime modification
             PreparedStatement statement = null;
             try {
                 statement = connection.prepareStatement(getQuery(DELETE_FILES_MODIFIED_BEFORE));
-                statement.setTimestamp(1, Timestamp.from(modificationTime.atZone(ZoneId.systemDefault())
-                                                                         .toInstant()));
+                statement.setTimestamp(1, new Timestamp(modificationTime.atZone(ZoneId.systemDefault())
+                                                                        .toInstant()
+                                                                        .toEpochMilli()));
                 int deletedFiles = statement.executeUpdate();
                 logger.debug(MessageFormat.format(Messages.DELETED_0_FILES_MODIFIED_BEFORE_1, deletedFiles, modificationTime));
                 return deletedFiles;

multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/services/FileService.java

@@ -89,15 +89,6 @@ public List<FileEntry> listFiles(String space, String namespace) throws FileStor
         }
     }
 
-    public List<FileEntry> listFilesCreatedAfter(LocalDateTime timestamp) throws FileStorageException {
-        try {
-            return getSqlQueryExecutor().execute(getSqlFileQueryProvider().getListFilesCreatedAfterQuery(timestamp));
-        } catch (SQLException e) {
-            throw new FileStorageException(MessageFormat.format(Messages.ERROR_GETTING_FILES_CREATED_AFTER_0, timestamp),
-                                           e);
-        }
-    }
-
     public FileEntry getFile(String space, String id) throws FileStorageException {
         try {
             return getSqlQueryExecutor().execute(getSqlFileQueryProvider().getRetrieveFileQuery(space, id));

multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/Messages.java

@@ -40,7 +40,6 @@ public class Messages {
     public static final String VERSION_RULE_DOES_NOT_ALLOW_DEPLOYMENT_TYPE = "Version rule \"{0}\" does not allow deployment type \"{1}\".";
     public static final String UNKNOWN_UPLOAD_STATUS = "Unknown upload status: {0}";
     public static final String COULD_NOT_DELETE_FILES_MODIFIED_BEFORE_0 = "Could not delete files modified before {0}";
-    public static final String COULD_NOT_DELETE_ORPHANED_FILES_MODIFIED_AFTER_0 = "Could not delete orphaned files modified after {0}";
     public static final String COULD_NOT_DELETE_PROCESS_LOGS_MODIFIED_BEFORE_0 = "Could not delete process logs modified before {0}";
     public static final String MODULES_0_SPECIFIED_FOR_DEPLOYMENT_ARE_NOT_PART_OF_DEPLOYMENT_DESCRIPTOR_MODULES = "Modules {0}, specified for deployment, are not part of deployment descriptor modules";
     public static final String SERVICE_BROKER_0_DOES_NOT_EXIST = "Service broker \"{0}\" does not exist";
@@ -672,11 +671,6 @@ public class Messages {
     public static final String PROCESS_WAS_DELETED_0 = "Process was deleted: {0}";
     public static final String MODULE_0_WAS_NOT_FOUND = "Module \"{0}\" was not found";
     public static final String DETECTING_LIVE_APPLICATION_ENV = "Detecting live application env...";
-    public static final String GETTING_FILES_CREATED_AFTER_0 = "Getting files created after {0} to check for deletion";
-    public static final String GETTING_OPERATIONS_STARTED_AFTER_0 = "Getting operations started after {0} to check for orphaned files";
-    public static final String GETTING_HISTORIC_VARIABLES_FOR_OPERATIONS_STARTED_AFTER_0 = "Getting historic variables for operations started after {0}";
-    public static final String NO_ORPHANED_FILES_TO_DELETE = "No orphaned files to delete.";
-    public static final String DELETING_ORPHANED_FILES_0 = "Deleting {0} orphaned files: {1}";
     public static final String USED_EXTENSION_DESCRIPTORS_IDS = "Used extension descriptors with IDs: [{0}]";
     public static final String NO_EXTENSION_DESCRIPTORS_PROVIDED = "No extension descriptors provided";
 

multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/bean/factory/ObjectStoreFileStorageFactoryBean.java

@@ -104,4 +104,4 @@ public Class<?> getObjectType() {
         return ObjectStoreFileStorage.class;
     }
 
-}
+}