Skip to content

Commit

Permalink
Merge pull request #25083 from dmatej/imports
Browse files Browse the repository at this point in the history 
Enabled checkstyle rules for imports
  • Loading branch information
@dmatej
dmatej authored Aug 12, 2024
2 parents 73f0dbf + 27bf35b commit cb81dc4
Show file tree
Hide file tree
Showing 3,065 changed files with 18,692 additions and 13,354 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 3 additions & 3 deletions appserver/admin/admin-core/src/main/java/com/sun/enterprise/admin/AdminContext.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@

package com.sun.enterprise.admin;

import java.util.logging.Logger;
import com.sun.enterprise.admin.util.proxy.Interceptor;

import java.net.URL;
import java.util.logging.Logger;

import javax.management.MBeanServer;
//import com.sun.enterprise.config.ConfigContext;
import com.sun.enterprise.admin.util.proxy.Interceptor;

/**
* This interface defines the environment for administration.
Expand Down
27 changes: 15 additions & 12 deletions appserver/admin/admin-core/src/main/java/com/sun/enterprise/admin/UpgradeService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,31 @@

package com.sun.enterprise.admin;

import java.beans.PropertyVetoException;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.List;
import java.util.ArrayList;
import com.sun.enterprise.config.serverbeans.Application;
import com.sun.enterprise.config.serverbeans.Domain;
import com.sun.enterprise.config.serverbeans.Engine;
import com.sun.enterprise.config.serverbeans.Module;

import jakarta.inject.Inject;
import jakarta.inject.Named;

import com.sun.enterprise.config.serverbeans.*;
import java.beans.PropertyVetoException;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;

import org.glassfish.api.admin.config.ConfigurationUpgrade;
import org.jvnet.hk2.config.types.Property;
import org.glassfish.hk2.api.PostConstruct;
import org.jvnet.hk2.annotations.Optional;
import org.jvnet.hk2.annotations.Service;
import org.glassfish.hk2.api.PostConstruct;
import org.jvnet.hk2.config.ConfigSupport;
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.Transaction;
import org.jvnet.hk2.config.ConfigBeanProxy;
import org.jvnet.hk2.config.ConfigSupport;
import org.jvnet.hk2.config.SingleConfigCode;
import org.jvnet.hk2.config.Transaction;
import org.jvnet.hk2.config.TransactionFailure;
import org.jvnet.hk2.config.types.Property;
import org.jvnet.hk2.config.types.PropertyBag;
import com.sun.enterprise.config.serverbeans.Module;


/**
Expand Down
3 changes: 2 additions & 1 deletion appserver/admin/admin-core/src/test/java/com/sun/enterprise/admin/tests/UpgradeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import com.sun.enterprise.module.bootstrap.StartupContext;
import com.sun.enterprise.util.SystemPropertyConstants;

import jakarta.inject.Inject;

import java.util.List;
import java.util.logging.Logger;

Expand All @@ -38,7 +40,6 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import jakarta.inject.Inject;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.arrayContaining;
Expand Down
4 changes: 2 additions & 2 deletions appserver/admin/backup/src/main/java/com/sun/enterprise/backup/BackupFilenameManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@

package com.sun.enterprise.backup;

import java.io.*;
import java.util.Date;
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.SortedMap;
Expand Down
5 changes: 3 additions & 2 deletions appserver/admin/backup/src/main/java/com/sun/enterprise/backup/BackupManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@

import com.sun.enterprise.backup.util.BackupUtils;
import com.sun.enterprise.util.io.FileUtils;
import java.io.*;
import java.util.List;

import java.io.File;
import java.util.Date;
import java.util.List;

/**
*
Expand Down
4 changes: 2 additions & 2 deletions appserver/admin/backup/src/main/java/com/sun/enterprise/backup/BackupRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@

package com.sun.enterprise.backup;

import java.io.*;

import com.sun.enterprise.util.ObjectAnalyzer;
import com.sun.enterprise.util.io.FileUtils;

import java.io.File;

/**
* This class holds all of the values that the caller needs.
* An instance of this class can be used to create a request object.
Expand Down
3 changes: 2 additions & 1 deletion appserver/admin/backup/src/main/java/com/sun/enterprise/backup/BackupRestoreManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
package com.sun.enterprise.backup;

import com.sun.enterprise.util.io.FileUtils;
import java.io.*;

import java.io.File;

/**
* Baseclass for BackupManager and RestoreManager. Common code between
Expand Down
3 changes: 2 additions & 1 deletion appserver/admin/backup/src/main/java/com/sun/enterprise/backup/DirectoryFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@

package com.sun.enterprise.backup;

import java.io.*;
import java.io.File;
import java.io.FilenameFilter;

class DirectoryFilter implements FilenameFilter {
public boolean accept(File dir, String name) {
Expand Down
12 changes: 8 additions & 4 deletions appserver/admin/backup/src/main/java/com/sun/enterprise/backup/ListManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,16 @@

package com.sun.enterprise.backup;

import com.sun.enterprise.util.ColumnFormatter;
import com.sun.enterprise.universal.i18n.LocalStringsImpl;

import com.sun.enterprise.util.ColumnFormatter;
import com.sun.enterprise.util.io.FileUtils;
import java.io.*;
import java.util.*;

import java.io.File;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.TreeSet;


/**
Expand Down
5 changes: 4 additions & 1 deletion appserver/admin/backup/src/main/java/com/sun/enterprise/backup/LoggerHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@

package com.sun.enterprise.backup;

import java.util.logging.*;
import java.util.logging.ConsoleHandler;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.Logger;

// Resource Bundle:
// com/sun/logging/enterprise/system/tools/deployment/backend/LogStrings.properties
Expand Down
4 changes: 3 additions & 1 deletion appserver/admin/backup/src/main/java/com/sun/enterprise/backup/RestoreManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
import com.sun.enterprise.backup.util.BackupUtils;
import com.sun.enterprise.util.io.FileUtils;
import com.sun.enterprise.util.zip.ZipFile;
import java.io.*;

import java.io.File;
import java.io.IOException;

/**
*
Expand Down
2 changes: 1 addition & 1 deletion appserver/admin/backup/src/main/java/com/sun/enterprise/backup/StringHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

package com.sun.enterprise.backup;

import java.util.ResourceBundle;
import java.text.MessageFormat;
import java.util.ResourceBundle;

/**
*
Expand Down
3 changes: 2 additions & 1 deletion appserver/admin/backup/src/main/java/com/sun/enterprise/backup/ZipFilenameFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@

package com.sun.enterprise.backup;

import java.io.*;
import java.io.File;
import java.io.FilenameFilter;
import java.util.Locale;

/**
Expand Down
8 changes: 5 additions & 3 deletions appserver/admin/backup/src/main/java/com/sun/enterprise/backup/ZipStorage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@

package com.sun.enterprise.backup;

import com.sun.enterprise.util.io.*;
import com.sun.enterprise.util.zip.*;
import com.sun.enterprise.util.io.FileListerRelative;
import com.sun.enterprise.util.io.FileUtils;
import com.sun.enterprise.util.zip.ZipFileException;
import com.sun.enterprise.util.zip.ZipWriter;

import java.io.*;
import java.io.File;

/**
* This class implements storing backups as zip files.
Expand Down
2 changes: 1 addition & 1 deletion appserver/admin/backup/src/main/java/com/sun/enterprise/backup/util/BackupUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import com.sun.enterprise.util.OS;

import java.io.*;
import java.io.File;

public class BackupUtils {

Expand Down
12 changes: 6 additions & 6 deletions ...dmin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/BackupCommands.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@

package com.sun.enterprise.admin.cli.optional;

import static com.sun.enterprise.util.Utility.isEmpty;
import static com.sun.enterprise.util.io.DomainDirs.getDefaultDomainsDir;
import com.sun.enterprise.admin.servermgmt.cli.LocalDomainCommand;
import com.sun.enterprise.backup.BackupRequest;
import com.sun.enterprise.universal.i18n.LocalStringsImpl;
import com.sun.enterprise.util.ObjectAnalyzer;

import java.io.File;
import java.io.IOException;
Expand All @@ -27,10 +29,8 @@
import org.glassfish.api.admin.CommandException;
import org.glassfish.api.admin.CommandValidationException;

import com.sun.enterprise.admin.servermgmt.cli.LocalDomainCommand;
import com.sun.enterprise.backup.BackupRequest;
import com.sun.enterprise.universal.i18n.LocalStringsImpl;
import com.sun.enterprise.util.ObjectAnalyzer;
import static com.sun.enterprise.util.Utility.isEmpty;
import static com.sun.enterprise.util.io.DomainDirs.getDefaultDomainsDir;

/**
* This is a local command for backing-up domains.
Expand Down
14 changes: 7 additions & 7 deletions ...cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/BackupDomainCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@

package com.sun.enterprise.admin.cli.optional;

import java.io.File;

import org.glassfish.api.Param;
import org.glassfish.api.admin.CommandException;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.annotations.Service;

import com.sun.enterprise.admin.cli.remote.RemoteCLICommand;
import com.sun.enterprise.backup.BackupException;
import com.sun.enterprise.backup.BackupManager;
Expand All @@ -32,6 +25,13 @@
import com.sun.enterprise.universal.process.ProcessUtils;
import com.sun.enterprise.util.ObjectAnalyzer;

import java.io.File;

import org.glassfish.api.Param;
import org.glassfish.api.admin.CommandException;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.annotations.Service;

/**
* This is a local command for backing-up domains.
*
Expand Down
14 changes: 7 additions & 7 deletions ...min/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/DatabaseCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@

package com.sun.enterprise.admin.cli.optional;

import static com.sun.enterprise.util.SystemPropertyConstants.DERBY_ROOT_PROPERTY;
import static com.sun.enterprise.util.SystemPropertyConstants.INSTALL_ROOT_PROPERTY;
import static com.sun.enterprise.util.SystemPropertyConstants.JAVA_ROOT_PROPERTY;
import com.sun.enterprise.admin.cli.CLICommand;
import com.sun.enterprise.admin.cli.ClassPathBuilder;
import com.sun.enterprise.universal.i18n.LocalStringsImpl;
import com.sun.enterprise.util.OS;

import java.io.File;

import org.glassfish.api.Param;
import org.glassfish.api.admin.CommandException;
import org.glassfish.api.admin.CommandValidationException;

import com.sun.enterprise.admin.cli.CLICommand;
import com.sun.enterprise.admin.cli.ClassPathBuilder;
import com.sun.enterprise.universal.i18n.LocalStringsImpl;
import com.sun.enterprise.util.OS;
import static com.sun.enterprise.util.SystemPropertyConstants.DERBY_ROOT_PROPERTY;
import static com.sun.enterprise.util.SystemPropertyConstants.INSTALL_ROOT_PROPERTY;
import static com.sun.enterprise.util.SystemPropertyConstants.JAVA_ROOT_PROPERTY;

/**
* This is an abstract class to be inherited by StartDatabaseCommand and StopDatabaseCommand. This classes prepares the
Expand Down
6 changes: 3 additions & 3 deletions .../admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/DerbyControl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@

package com.sun.enterprise.admin.cli.optional;

import static com.sun.enterprise.util.Utility.isAllNull;
import static com.sun.enterprise.util.Utility.isEmpty;
import com.sun.enterprise.util.i18n.StringManager;

import java.io.File;
import java.io.FileOutputStream;
Expand All @@ -28,7 +27,8 @@

import org.glassfish.api.admin.CommandException;

import com.sun.enterprise.util.i18n.StringManager;
import static com.sun.enterprise.util.Utility.isAllNull;
import static com.sun.enterprise.util.Utility.isEmpty;

/**
* This class uses Java reflection to invoke Derby NetworkServerControl class.
Expand Down
12 changes: 6 additions & 6 deletions .../cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/ListBackupsCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@

package com.sun.enterprise.admin.cli.optional;

import java.io.File;

import org.glassfish.api.admin.CommandException;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.annotations.Service;

import com.sun.enterprise.backup.BackupException;
import com.sun.enterprise.backup.BackupWarningException;
import com.sun.enterprise.backup.ListManager;
import com.sun.enterprise.universal.i18n.LocalStringsImpl;
import com.sun.enterprise.util.ObjectAnalyzer;

import java.io.File;

import org.glassfish.api.admin.CommandException;
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.annotations.Service;

/**
* This is a local command for listing backed up domains.
*
Expand Down
16 changes: 8 additions & 8 deletions ...li-optional/src/main/java/com/sun/enterprise/admin/cli/optional/StartDatabaseCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

package com.sun.enterprise.admin.cli.optional;

import static com.sun.enterprise.admin.cli.optional.DerbyControl.DB_LOG_FILENAME;
import static java.io.File.pathSeparator;
import static java.io.File.separator;
import static java.util.Arrays.asList;
import com.sun.enterprise.admin.cli.CLIProcessExecutor;
import com.sun.enterprise.universal.glassfish.GFLauncherUtils;
import com.sun.enterprise.universal.i18n.LocalStringsImpl;
import com.sun.enterprise.util.OS;

import java.io.File;
import java.io.IOException;
Expand All @@ -33,10 +33,10 @@
import org.glassfish.hk2.api.PerLookup;
import org.jvnet.hk2.annotations.Service;

import com.sun.enterprise.admin.cli.CLIProcessExecutor;
import com.sun.enterprise.universal.glassfish.GFLauncherUtils;
import com.sun.enterprise.universal.i18n.LocalStringsImpl;
import com.sun.enterprise.util.OS;
import static com.sun.enterprise.admin.cli.optional.DerbyControl.DB_LOG_FILENAME;
import static java.io.File.pathSeparator;
import static java.io.File.separator;
import static java.util.Arrays.asList;

/**
* start-database command This command class will invoke DerbyControl to first ping if the database is running. If not
Expand Down
Loading

0 comments on commit cb81dc4

Please sign in to comment.