diff --git a/iplass-admin/src/main/java/org/iplass/adminconsole/server/tools/rpc/metaexplorer/MetaDataConfigUploadServiceImpl.java b/iplass-admin/src/main/java/org/iplass/adminconsole/server/tools/rpc/metaexplorer/MetaDataConfigUploadServiceImpl.java index 16b85faae5..7d1ee9239b 100644 --- a/iplass-admin/src/main/java/org/iplass/adminconsole/server/tools/rpc/metaexplorer/MetaDataConfigUploadServiceImpl.java +++ b/iplass-admin/src/main/java/org/iplass/adminconsole/server/tools/rpc/metaexplorer/MetaDataConfigUploadServiceImpl.java @@ -20,10 +20,6 @@ package org.iplass.adminconsole.server.tools.rpc.metaexplorer; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParserFactory; -import javax.xml.transform.sax.SAXSource; - import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -31,6 +27,10 @@ import java.util.HashMap; import java.util.List; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParserFactory; +import javax.xml.transform.sax.SAXSource; + import org.apache.commons.io.FilenameUtils; import org.iplass.adminconsole.server.base.i18n.AdminResourceBundleUtil; import org.iplass.adminconsole.server.base.io.upload.AdminUploadAction; diff --git a/iplass-core/src/main/java/org/iplass/mtp/impl/auth/authenticate/jaas/JaasAccountHandle.java b/iplass-core/src/main/java/org/iplass/mtp/impl/auth/authenticate/jaas/JaasAccountHandle.java index 81c0c9be6f..b58ad9e68a 100644 --- a/iplass-core/src/main/java/org/iplass/mtp/impl/auth/authenticate/jaas/JaasAccountHandle.java +++ b/iplass-core/src/main/java/org/iplass/mtp/impl/auth/authenticate/jaas/JaasAccountHandle.java @@ -19,14 +19,14 @@ */ package org.iplass.mtp.impl.auth.authenticate.jaas; -import javax.security.auth.Subject; -import javax.security.auth.login.LoginContext; - import java.security.Principal; import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import javax.security.auth.Subject; +import javax.security.auth.login.LoginContext; + import org.iplass.mtp.auth.login.Credential; import org.iplass.mtp.auth.login.IdPasswordCredential; import org.iplass.mtp.impl.auth.authenticate.AccountHandle; diff --git a/iplass-core/src/main/java/org/iplass/mtp/impl/auth/authenticate/jaas/JaasAuthenticationProvider.java b/iplass-core/src/main/java/org/iplass/mtp/impl/auth/authenticate/jaas/JaasAuthenticationProvider.java index 5a4545e3f3..60f098eb2f 100644 --- a/iplass-core/src/main/java/org/iplass/mtp/impl/auth/authenticate/jaas/JaasAuthenticationProvider.java +++ b/iplass-core/src/main/java/org/iplass/mtp/impl/auth/authenticate/jaas/JaasAuthenticationProvider.java @@ -19,6 +19,9 @@ */ package org.iplass.mtp.impl.auth.authenticate.jaas; +import java.io.IOException; +import java.security.Principal; + import javax.security.auth.Subject; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; @@ -28,9 +31,6 @@ import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import java.io.IOException; -import java.security.Principal; - import org.iplass.mtp.SystemException; import org.iplass.mtp.auth.User; import org.iplass.mtp.auth.login.Credential; diff --git a/iplass-core/src/main/java/org/iplass/mtp/impl/auth/authenticate/ldap/LdapAccountHandle.java b/iplass-core/src/main/java/org/iplass/mtp/impl/auth/authenticate/ldap/LdapAccountHandle.java index 3a36d778a4..31cd46baee 100644 --- a/iplass-core/src/main/java/org/iplass/mtp/impl/auth/authenticate/ldap/LdapAccountHandle.java +++ b/iplass-core/src/main/java/org/iplass/mtp/impl/auth/authenticate/ldap/LdapAccountHandle.java @@ -20,11 +20,11 @@ package org.iplass.mtp.impl.auth.authenticate.ldap; -import javax.security.auth.login.LoginContext; - import java.util.HashMap; import java.util.Map; +import javax.security.auth.login.LoginContext; + import org.iplass.mtp.auth.login.Credential; import org.iplass.mtp.auth.login.IdPasswordCredential; import org.iplass.mtp.impl.auth.authenticate.AccountHandle; diff --git a/iplass-core/src/main/java/org/iplass/mtp/impl/auth/authenticate/ldap/LdapAuthenticationProvider.java b/iplass-core/src/main/java/org/iplass/mtp/impl/auth/authenticate/ldap/LdapAuthenticationProvider.java index e26863dd7a..d8e4c5138d 100644 --- a/iplass-core/src/main/java/org/iplass/mtp/impl/auth/authenticate/ldap/LdapAuthenticationProvider.java +++ b/iplass-core/src/main/java/org/iplass/mtp/impl/auth/authenticate/ldap/LdapAuthenticationProvider.java @@ -20,10 +20,10 @@ package org.iplass.mtp.impl.auth.authenticate.ldap; -import javax.naming.Context; - import java.util.Map; +import javax.naming.Context; + import org.iplass.mtp.auth.User; import org.iplass.mtp.auth.login.Credential; import org.iplass.mtp.auth.login.IdPasswordCredential; diff --git a/iplass-core/src/main/java/org/iplass/mtp/impl/auth/authenticate/ldap/NeoLdapAuthStrategy.java b/iplass-core/src/main/java/org/iplass/mtp/impl/auth/authenticate/ldap/NeoLdapAuthStrategy.java index e99f62be77..63c9a394a3 100644 --- a/iplass-core/src/main/java/org/iplass/mtp/impl/auth/authenticate/ldap/NeoLdapAuthStrategy.java +++ b/iplass-core/src/main/java/org/iplass/mtp/impl/auth/authenticate/ldap/NeoLdapAuthStrategy.java @@ -19,6 +19,13 @@ */ package org.iplass.mtp.impl.auth.authenticate.ldap; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; + import javax.naming.Context; import javax.naming.InvalidNameException; import javax.naming.NamingEnumeration; @@ -30,13 +37,6 @@ import javax.naming.ldap.InitialLdapContext; import javax.naming.ldap.LdapName; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.List; -import java.util.Map; -import java.util.regex.Pattern; - import org.iplass.mtp.auth.login.Credential; import org.iplass.mtp.auth.login.IdPasswordCredential; import org.iplass.mtp.impl.auth.authenticate.AccountHandle; diff --git a/iplass-core/src/main/java/org/iplass/mtp/impl/core/config/DefaultPropertyValueCoder.java b/iplass-core/src/main/java/org/iplass/mtp/impl/core/config/DefaultPropertyValueCoder.java index a4669b5db4..175bd5ea3e 100644 --- a/iplass-core/src/main/java/org/iplass/mtp/impl/core/config/DefaultPropertyValueCoder.java +++ b/iplass-core/src/main/java/org/iplass/mtp/impl/core/config/DefaultPropertyValueCoder.java @@ -20,16 +20,6 @@ package org.iplass.mtp.impl.core.config; -import javax.crypto.BadPaddingException; -import javax.crypto.Cipher; -import javax.crypto.IllegalBlockSizeException; -import javax.crypto.NoSuchPaddingException; -import javax.crypto.SecretKey; -import javax.crypto.SecretKeyFactory; -import javax.crypto.spec.IvParameterSpec; -import javax.crypto.spec.PBEKeySpec; -import javax.crypto.spec.SecretKeySpec; - import java.io.IOException; import java.io.UnsupportedEncodingException; import java.security.InvalidAlgorithmParameterException; @@ -40,6 +30,16 @@ import java.util.Arrays; import java.util.Properties; +import javax.crypto.BadPaddingException; +import javax.crypto.Cipher; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.NoSuchPaddingException; +import javax.crypto.SecretKey; +import javax.crypto.SecretKeyFactory; +import javax.crypto.spec.IvParameterSpec; +import javax.crypto.spec.PBEKeySpec; +import javax.crypto.spec.SecretKeySpec; + import org.apache.commons.codec.binary.Base64; import org.iplass.mtp.spi.ServiceConfigrationException; diff --git a/iplass-core/src/main/java/org/iplass/mtp/impl/metadata/xmlfile/DomXmlExternalRefHandler.java b/iplass-core/src/main/java/org/iplass/mtp/impl/metadata/xmlfile/DomXmlExternalRefHandler.java index dafdc47e59..516c7582f7 100644 --- a/iplass-core/src/main/java/org/iplass/mtp/impl/metadata/xmlfile/DomXmlExternalRefHandler.java +++ b/iplass-core/src/main/java/org/iplass/mtp/impl/metadata/xmlfile/DomXmlExternalRefHandler.java @@ -19,15 +19,6 @@ */ package org.iplass.mtp.impl.metadata.xmlfile; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.OutputKeys; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; - import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; @@ -37,6 +28,15 @@ import java.nio.file.Files; import java.util.List; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.OutputKeys; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + import org.iplass.mtp.impl.metadata.MetaDataRepository; import org.iplass.mtp.impl.metadata.MetaDataRuntimeException; import org.iplass.mtp.impl.metadata.xmlfile.dom.DomHandler; diff --git a/iplass-core/src/main/java/org/iplass/mtp/impl/rdb/connection/DataSourceConnectionFactory.java b/iplass-core/src/main/java/org/iplass/mtp/impl/rdb/connection/DataSourceConnectionFactory.java index 160349597a..1622ffe068 100644 --- a/iplass-core/src/main/java/org/iplass/mtp/impl/rdb/connection/DataSourceConnectionFactory.java +++ b/iplass-core/src/main/java/org/iplass/mtp/impl/rdb/connection/DataSourceConnectionFactory.java @@ -20,15 +20,15 @@ package org.iplass.mtp.impl.rdb.connection; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.sql.DataSource; - import java.io.Closeable; import java.sql.Connection; import java.sql.SQLException; import java.util.Hashtable; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.sql.DataSource; + import org.iplass.mtp.spi.Config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/iplass-core/src/main/java/org/iplass/mtp/impl/rdb/connection/ReplicationAwareDataSourceConnectionFactory.java b/iplass-core/src/main/java/org/iplass/mtp/impl/rdb/connection/ReplicationAwareDataSourceConnectionFactory.java index b6e6e04553..49c4f61f63 100644 --- a/iplass-core/src/main/java/org/iplass/mtp/impl/rdb/connection/ReplicationAwareDataSourceConnectionFactory.java +++ b/iplass-core/src/main/java/org/iplass/mtp/impl/rdb/connection/ReplicationAwareDataSourceConnectionFactory.java @@ -20,10 +20,6 @@ package org.iplass.mtp.impl.rdb.connection; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.sql.DataSource; - import java.io.Closeable; import java.sql.Connection; import java.sql.SQLException; @@ -32,6 +28,10 @@ import java.util.Random; import java.util.function.Function; +import javax.naming.InitialContext; +import javax.naming.NamingException; +import javax.sql.DataSource; + import org.iplass.mtp.spi.Config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/iplass-core/src/main/java/org/iplass/mtp/impl/webhook/WebhookServiceImpl.java b/iplass-core/src/main/java/org/iplass/mtp/impl/webhook/WebhookServiceImpl.java index 2c14aacc34..b0b59f20eb 100644 --- a/iplass-core/src/main/java/org/iplass/mtp/impl/webhook/WebhookServiceImpl.java +++ b/iplass-core/src/main/java/org/iplass/mtp/impl/webhook/WebhookServiceImpl.java @@ -19,10 +19,6 @@ */ package org.iplass.mtp.impl.webhook; -import javax.crypto.Mac; -import javax.crypto.spec.SecretKeySpec; -import javax.net.ssl.SSLException; - import java.io.IOException; import java.io.InterruptedIOException; import java.net.ConnectException; @@ -34,6 +30,10 @@ import java.util.Map; import java.util.concurrent.Callable; +import javax.crypto.Mac; +import javax.crypto.spec.SecretKeySpec; +import javax.net.ssl.SSLException; + import org.apache.commons.codec.binary.Base64; import org.apache.hc.client5.http.classic.methods.HttpDelete; import org.apache.hc.client5.http.classic.methods.HttpGet; diff --git a/iplass-core/src/main/java/org/iplass/mtp/impl/webhook/endpoint/WebhookEndpointServiceImpl.java b/iplass-core/src/main/java/org/iplass/mtp/impl/webhook/endpoint/WebhookEndpointServiceImpl.java index b26c957d65..c120ecaabb 100644 --- a/iplass-core/src/main/java/org/iplass/mtp/impl/webhook/endpoint/WebhookEndpointServiceImpl.java +++ b/iplass-core/src/main/java/org/iplass/mtp/impl/webhook/endpoint/WebhookEndpointServiceImpl.java @@ -19,12 +19,12 @@ */ package org.iplass.mtp.impl.webhook.endpoint; -import javax.crypto.KeyGenerator; -import javax.crypto.SecretKey; - import java.security.NoSuchAlgorithmException; import java.util.Map; +import javax.crypto.KeyGenerator; +import javax.crypto.SecretKey; + import org.apache.commons.codec.binary.Base64; import org.iplass.mtp.ManagerLocator; import org.iplass.mtp.definition.TypedDefinitionManager; diff --git a/iplass-core/src/main/java/org/iplass/mtp/impl/xml/jaxb/SecureSAXParserFactory.java b/iplass-core/src/main/java/org/iplass/mtp/impl/xml/jaxb/SecureSAXParserFactory.java index 76857cabc4..e55736c596 100644 --- a/iplass-core/src/main/java/org/iplass/mtp/impl/xml/jaxb/SecureSAXParserFactory.java +++ b/iplass-core/src/main/java/org/iplass/mtp/impl/xml/jaxb/SecureSAXParserFactory.java @@ -20,17 +20,17 @@ package org.iplass.mtp.impl.xml.jaxb; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; + import javax.xml.XMLConstants; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import javax.xml.validation.Schema; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.EntityResolver; diff --git a/iplass-core/src/main/java/org/iplass/mtp/impl/xml/jaxb/XmlDate.java b/iplass-core/src/main/java/org/iplass/mtp/impl/xml/jaxb/XmlDate.java index c7504cfad4..05e42c2bcb 100644 --- a/iplass-core/src/main/java/org/iplass/mtp/impl/xml/jaxb/XmlDate.java +++ b/iplass-core/src/main/java/org/iplass/mtp/impl/xml/jaxb/XmlDate.java @@ -20,12 +20,12 @@ package org.iplass.mtp.impl.xml.jaxb; -import javax.xml.datatype.DatatypeConstants; -import javax.xml.datatype.XMLGregorianCalendar; - import java.sql.Date; import java.util.GregorianCalendar; +import javax.xml.datatype.DatatypeConstants; +import javax.xml.datatype.XMLGregorianCalendar; + import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlValue; diff --git a/iplass-core/src/main/java/org/iplass/mtp/impl/xml/jaxb/XmlDateTime.java b/iplass-core/src/main/java/org/iplass/mtp/impl/xml/jaxb/XmlDateTime.java index 2804732a3c..1927b6becc 100644 --- a/iplass-core/src/main/java/org/iplass/mtp/impl/xml/jaxb/XmlDateTime.java +++ b/iplass-core/src/main/java/org/iplass/mtp/impl/xml/jaxb/XmlDateTime.java @@ -20,13 +20,13 @@ package org.iplass.mtp.impl.xml.jaxb; -import javax.xml.datatype.XMLGregorianCalendar; - import java.math.BigDecimal; import java.math.BigInteger; import java.sql.Timestamp; import java.util.GregorianCalendar; +import javax.xml.datatype.XMLGregorianCalendar; + import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlValue; diff --git a/iplass-core/src/main/java/org/iplass/mtp/impl/xml/jaxb/XmlTime.java b/iplass-core/src/main/java/org/iplass/mtp/impl/xml/jaxb/XmlTime.java index 2fcd94dbff..b7b9c24e5e 100644 --- a/iplass-core/src/main/java/org/iplass/mtp/impl/xml/jaxb/XmlTime.java +++ b/iplass-core/src/main/java/org/iplass/mtp/impl/xml/jaxb/XmlTime.java @@ -20,12 +20,12 @@ package org.iplass.mtp.impl.xml.jaxb; -import javax.xml.datatype.DatatypeConstants; -import javax.xml.datatype.XMLGregorianCalendar; - import java.sql.Time; import java.util.GregorianCalendar; +import javax.xml.datatype.DatatypeConstants; +import javax.xml.datatype.XMLGregorianCalendar; + import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlValue; diff --git a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/batch/MtpCuiBase.java b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/batch/MtpCuiBase.java index 9f79887f83..7be03f6146 100644 --- a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/batch/MtpCuiBase.java +++ b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/batch/MtpCuiBase.java @@ -20,8 +20,6 @@ package org.iplass.mtp.tools.batch; -import javax.sql.DataSource; - import java.io.BufferedReader; import java.io.Console; import java.io.IOException; @@ -32,6 +30,8 @@ import java.util.ResourceBundle; import java.util.function.Predicate; +import javax.sql.DataSource; + import org.iplass.mtp.SystemException; import org.iplass.mtp.impl.core.ExecuteContext; import org.iplass.mtp.impl.core.config.BootstrapProps; diff --git a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/MtpJDialogBase.java b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/MtpJDialogBase.java index 6177a4837a..a25050525d 100644 --- a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/MtpJDialogBase.java +++ b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/MtpJDialogBase.java @@ -20,11 +20,11 @@ package org.iplass.mtp.tools.gui; -import javax.swing.JDialog; - import java.awt.Frame; import java.util.ResourceBundle; +import javax.swing.JDialog; + import org.iplass.mtp.impl.core.ExecuteContext; import org.iplass.mtp.tools.ToolsBatchResourceBundleUtil; diff --git a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/MtpJFrameBase.java b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/MtpJFrameBase.java index ab1cd18859..d467d952a5 100644 --- a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/MtpJFrameBase.java +++ b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/MtpJFrameBase.java @@ -20,10 +20,10 @@ package org.iplass.mtp.tools.gui; -import javax.swing.JFrame; - import java.util.ResourceBundle; +import javax.swing.JFrame; + import org.iplass.mtp.impl.core.ExecuteContext; import org.iplass.mtp.tools.ToolsBatchResourceBundleUtil; diff --git a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/partition/MySQLPartitionManagerApp.java b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/partition/MySQLPartitionManagerApp.java index 257eed85b3..ba8cdb06df 100644 --- a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/partition/MySQLPartitionManagerApp.java +++ b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/partition/MySQLPartitionManagerApp.java @@ -20,10 +20,10 @@ package org.iplass.mtp.tools.gui.partition; -import javax.swing.UIManager; - import java.awt.EventQueue; +import javax.swing.UIManager; + import org.iplass.mtp.tools.batch.partition.PostgreSQLPartitionBatch; import org.iplass.mtp.tools.batch.tenant.TenantBatch.TenantBatchExecMode; diff --git a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/partition/PartitionCreateDialog.java b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/partition/PartitionCreateDialog.java index 0ca79f93ab..8b4d3a294e 100644 --- a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/partition/PartitionCreateDialog.java +++ b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/partition/PartitionCreateDialog.java @@ -20,6 +20,19 @@ package org.iplass.mtp.tools.gui.partition; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.Frame; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.ArrayList; +import java.util.List; + import javax.swing.Box; import javax.swing.BoxLayout; import javax.swing.JButton; @@ -38,19 +51,6 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Font; -import java.awt.Frame; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.ArrayList; -import java.util.List; - import org.iplass.mtp.impl.rdb.adapter.RdbAdapter; import org.iplass.mtp.impl.rdb.adapter.RdbAdapterService; import org.iplass.mtp.impl.rdb.mysql.MysqlRdbAdaptor; diff --git a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/partition/PartitionManagerApp.java b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/partition/PartitionManagerApp.java index d541053df3..1ee7025e1e 100644 --- a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/partition/PartitionManagerApp.java +++ b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/partition/PartitionManagerApp.java @@ -20,6 +20,18 @@ package org.iplass.mtp.tools.gui.partition; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.ExecutionException; + import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JLabel; @@ -33,18 +45,6 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.ExecutionException; - import org.iplass.mtp.impl.tools.tenant.PartitionInfo; import org.iplass.mtp.tools.batch.partition.PartitionBatch; import org.iplass.mtp.tools.gui.MtpJFrameBase; diff --git a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/partition/PartitionTable.java b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/partition/PartitionTable.java index ea27ad01db..601fc6f100 100644 --- a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/partition/PartitionTable.java +++ b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/partition/PartitionTable.java @@ -20,12 +20,12 @@ package org.iplass.mtp.tools.gui.partition; -import javax.swing.JTable; -import javax.swing.table.DefaultTableModel; - import java.util.ArrayList; import java.util.List; +import javax.swing.JTable; +import javax.swing.table.DefaultTableModel; + import org.iplass.mtp.impl.tools.tenant.PartitionInfo; public class PartitionTable extends JTable { diff --git a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/partition/PostgreSQLPartitionManagerApp.java b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/partition/PostgreSQLPartitionManagerApp.java index 388fa8e4cd..65b7b0f671 100644 --- a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/partition/PostgreSQLPartitionManagerApp.java +++ b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/partition/PostgreSQLPartitionManagerApp.java @@ -20,10 +20,10 @@ package org.iplass.mtp.tools.gui.partition; -import javax.swing.UIManager; - import java.awt.EventQueue; +import javax.swing.UIManager; + import org.iplass.mtp.tools.batch.partition.PostgreSQLPartitionBatch; import org.iplass.mtp.tools.batch.tenant.TenantBatch.TenantBatchExecMode; diff --git a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/tenant/TenantCreateDialog.java b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/tenant/TenantCreateDialog.java index bba680dfd6..652be274cf 100644 --- a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/tenant/TenantCreateDialog.java +++ b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/tenant/TenantCreateDialog.java @@ -20,6 +20,23 @@ package org.iplass.mtp.tools.gui.tenant; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.Frame; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.util.ArrayList; +import java.util.List; + import javax.swing.Box; import javax.swing.BoxLayout; import javax.swing.JButton; @@ -40,23 +57,6 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Font; -import java.awt.Frame; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; -import java.util.ArrayList; -import java.util.List; - import org.iplass.mtp.impl.i18n.I18nService; import org.iplass.mtp.impl.rdb.adapter.RdbAdapter; import org.iplass.mtp.impl.rdb.adapter.RdbAdapterService; diff --git a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/tenant/TenantDeleteDialog.java b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/tenant/TenantDeleteDialog.java index 6ceecdb732..1477d228ba 100644 --- a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/tenant/TenantDeleteDialog.java +++ b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/tenant/TenantDeleteDialog.java @@ -20,6 +20,19 @@ package org.iplass.mtp.tools.gui.tenant; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.Frame; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.ArrayList; +import java.util.List; + import javax.swing.Box; import javax.swing.BoxLayout; import javax.swing.JButton; @@ -38,19 +51,6 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Font; -import java.awt.Frame; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.ArrayList; -import java.util.List; - import org.iplass.mtp.impl.rdb.adapter.RdbAdapter; import org.iplass.mtp.impl.rdb.adapter.RdbAdapterService; import org.iplass.mtp.impl.rdb.mysql.MysqlRdbAdaptor; diff --git a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/tenant/TenantDialogTableModel.java b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/tenant/TenantDialogTableModel.java index 96943438e0..594eef5c35 100644 --- a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/tenant/TenantDialogTableModel.java +++ b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/tenant/TenantDialogTableModel.java @@ -20,10 +20,10 @@ package org.iplass.mtp.tools.gui.tenant; -import javax.swing.table.DefaultTableModel; - import java.util.List; +import javax.swing.table.DefaultTableModel; + import org.iplass.mtp.impl.tools.tenant.TenantInfo; @SuppressWarnings("serial") diff --git a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/tenant/TenantManagerApp.java b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/tenant/TenantManagerApp.java index 61f5ac301e..58b034fc08 100644 --- a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/tenant/TenantManagerApp.java +++ b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/tenant/TenantManagerApp.java @@ -20,6 +20,20 @@ package org.iplass.mtp.tools.gui.tenant; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.EventQueue; +import java.awt.FlowLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.ExecutionException; + import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JLabel; @@ -36,20 +50,6 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.EventQueue; -import java.awt.FlowLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.ExecutionException; - import org.iplass.mtp.impl.rdb.adapter.RdbAdapter; import org.iplass.mtp.impl.rdb.adapter.RdbAdapterService; import org.iplass.mtp.impl.rdb.mysql.MysqlRdbAdaptor; diff --git a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/widget/menu/BasicMenuBar.java b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/widget/menu/BasicMenuBar.java index 3a672c6638..a242e3c8e3 100644 --- a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/widget/menu/BasicMenuBar.java +++ b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/widget/menu/BasicMenuBar.java @@ -20,10 +20,10 @@ package org.iplass.mtp.tools.gui.widget.menu; -import javax.swing.JMenuBar; - import java.awt.Frame; +import javax.swing.JMenuBar; + public class BasicMenuBar extends JMenuBar { private static final long serialVersionUID = 1934796961778764411L; diff --git a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/widget/menu/DBConfigMenu.java b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/widget/menu/DBConfigMenu.java index 4e95cbbba7..6853ced719 100644 --- a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/widget/menu/DBConfigMenu.java +++ b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/widget/menu/DBConfigMenu.java @@ -20,19 +20,6 @@ package org.iplass.mtp.tools.gui.widget.menu; -import javax.sql.DataSource; -import javax.swing.Box; -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JDialog; -import javax.swing.JLabel; -import javax.swing.JMenu; -import javax.swing.JMenuItem; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JTextField; -import javax.swing.border.EmptyBorder; - import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.FlowLayout; @@ -46,6 +33,19 @@ import java.lang.reflect.Field; import java.util.Properties; +import javax.sql.DataSource; +import javax.swing.Box; +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuItem; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JTextField; +import javax.swing.border.EmptyBorder; + import org.iplass.mtp.impl.core.config.BootstrapProps; import org.iplass.mtp.impl.rdb.adapter.RdbAdapter; import org.iplass.mtp.impl.rdb.adapter.RdbAdapterService; diff --git a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/widget/menu/LookAndFeelMenu.java b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/widget/menu/LookAndFeelMenu.java index 85cc4727dd..01b5dc29c9 100644 --- a/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/widget/menu/LookAndFeelMenu.java +++ b/iplass-tools-batch/src/main/java/org/iplass/mtp/tools/gui/widget/menu/LookAndFeelMenu.java @@ -20,6 +20,11 @@ package org.iplass.mtp.tools.gui.widget.menu; +import java.awt.Frame; +import java.awt.Window; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + import javax.swing.ButtonGroup; import javax.swing.JMenu; import javax.swing.JMenuItem; @@ -28,11 +33,6 @@ import javax.swing.UIManager; import javax.swing.UIManager.LookAndFeelInfo; -import java.awt.Frame; -import java.awt.Window; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/iplass-tools/src/main/java/org/iplass/mtp/impl/tools/metaport/MetaDataPortingServiceImpl.java b/iplass-tools/src/main/java/org/iplass/mtp/impl/tools/metaport/MetaDataPortingServiceImpl.java index 8f3c7169b5..262eb0d0a7 100644 --- a/iplass-tools/src/main/java/org/iplass/mtp/impl/tools/metaport/MetaDataPortingServiceImpl.java +++ b/iplass-tools/src/main/java/org/iplass/mtp/impl/tools/metaport/MetaDataPortingServiceImpl.java @@ -20,10 +20,6 @@ package org.iplass.mtp.impl.tools.metaport; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParserFactory; -import javax.xml.transform.sax.SAXSource; - import java.io.InputStream; import java.io.PrintWriter; import java.util.ArrayList; @@ -34,6 +30,10 @@ import java.util.Map; import java.util.Objects; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParserFactory; +import javax.xml.transform.sax.SAXSource; + import org.apache.commons.collections4.CollectionUtils; import org.iplass.mtp.ManagerLocator; import org.iplass.mtp.auth.login.IdPasswordCredential; diff --git a/iplass-web/src/main/java/org/iplass/mtp/impl/webapi/command/entity/GetEntityCommand.java b/iplass-web/src/main/java/org/iplass/mtp/impl/webapi/command/entity/GetEntityCommand.java index 859256c4e5..d9a7498b90 100644 --- a/iplass-web/src/main/java/org/iplass/mtp/impl/webapi/command/entity/GetEntityCommand.java +++ b/iplass-web/src/main/java/org/iplass/mtp/impl/webapi/command/entity/GetEntityCommand.java @@ -21,14 +21,14 @@ import static org.iplass.mtp.impl.web.WebResourceBundleUtil.resourceString; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + import org.iplass.mtp.SystemException; import org.iplass.mtp.command.RequestContext; import org.iplass.mtp.command.annotation.CommandClass; diff --git a/iplass-web/src/main/java/org/iplass/mtp/impl/webapi/command/entity/QueryXmlWriter.java b/iplass-web/src/main/java/org/iplass/mtp/impl/webapi/command/entity/QueryXmlWriter.java index 5a152f2988..f842b44aa5 100644 --- a/iplass-web/src/main/java/org/iplass/mtp/impl/webapi/command/entity/QueryXmlWriter.java +++ b/iplass-web/src/main/java/org/iplass/mtp/impl/webapi/command/entity/QueryXmlWriter.java @@ -19,11 +19,6 @@ */ package org.iplass.mtp.impl.webapi.command.entity; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLOutputFactory; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; - import java.io.BufferedWriter; import java.io.IOException; import java.io.OutputStream; @@ -33,6 +28,11 @@ import java.util.Map; import java.util.function.Predicate; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLOutputFactory; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; + import org.iplass.mtp.ManagerLocator; import org.iplass.mtp.SystemException; import org.iplass.mtp.entity.EntityManager; diff --git a/iplass-web/src/main/java/org/iplass/mtp/impl/webapi/rest/RestCommandInvoker.java b/iplass-web/src/main/java/org/iplass/mtp/impl/webapi/rest/RestCommandInvoker.java index 4d8430600e..3080e18a72 100644 --- a/iplass-web/src/main/java/org/iplass/mtp/impl/webapi/rest/RestCommandInvoker.java +++ b/iplass-web/src/main/java/org/iplass/mtp/impl/webapi/rest/RestCommandInvoker.java @@ -20,10 +20,6 @@ package org.iplass.mtp.impl.webapi.rest; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.parsers.SAXParserFactory; -import javax.xml.transform.sax.SAXSource; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -39,6 +35,10 @@ import java.util.Map; import java.util.function.BiFunction; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParserFactory; +import javax.xml.transform.sax.SAXSource; + import org.iplass.mtp.command.RequestContext; import org.iplass.mtp.impl.session.SessionService; import org.iplass.mtp.impl.web.LimitRequestBodyHttpServletRequest;