You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/11/19 16:09:31 UTC
ignite git commit: IGNITE-1946 Finished reworking codegeneration to
produce XML and java code with new API.
Repository: ignite
Updated Branches:
refs/heads/ignite-1753-1282 e2a844e23 -> 8f5770524
IGNITE-1946 Finished reworking codegeneration to produce XML and java code with new API.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8f577052
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8f577052
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8f577052
Branch: refs/heads/ignite-1753-1282
Commit: 8f5770524040f7ce2181b2f97d582a9300aab14b
Parents: e2a844e
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Nov 19 22:09:12 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Nov 19 22:09:12 2015 +0700
----------------------------------------------------------------------
.../org/apache/ignite/cache/QueryIndex.java | 37 ++++++--
.../ignite/schema/generator/CodeGenerator.java | 60 +++++++------
.../ignite/schema/generator/XmlGenerator.java | 91 +++++++++++++-------
.../ignite/schema/model/SchemaDescriptor.java | 6 +-
.../schema/parser/DatabaseMetadataParser.java | 4 +-
.../parser/dialect/DatabaseMetadataDialect.java | 2 +-
.../parser/dialect/JdbcMetadataDialect.java | 4 +-
.../parser/dialect/OracleMetadataDialect.java | 4 +-
.../apache/ignite/schema/ui/ModalDialog.java | 6 +-
.../ignite/schema/ui/SchemaImportApp.java | 13 +--
.../schema/test/AbstractSchemaImportTest.java | 4 +-
11 files changed, 145 insertions(+), 86 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f577052/modules/core/src/main/java/org/apache/ignite/cache/QueryIndex.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/QueryIndex.java b/modules/core/src/main/java/org/apache/ignite/cache/QueryIndex.java
index f12044d..abff192 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/QueryIndex.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/QueryIndex.java
@@ -50,20 +50,33 @@ public class QueryIndex implements Serializable {
/**
* Creates single-field sorted ascending index.
*
- * @param name Field name.
+ * @param field Field name.
*/
- public QueryIndex(String name) {
- this(name, QueryIndexType.SORTED, true);
+ public QueryIndex(String field) {
+ this(field, QueryIndexType.SORTED, true);
}
/**
* Creates single-field sorted index.
*
- * @param name Field name.
+ * @param field Field name.
* @param asc Ascending flag.
*/
- public QueryIndex(String name, boolean asc) {
- this(name, QueryIndexType.SORTED, asc);
+ public QueryIndex(String field, boolean asc) {
+ this(field, QueryIndexType.SORTED, asc);
+ }
+
+ /**
+ * Creates single-field sorted index.
+ *
+ * @param field Field name.
+ * @param asc Ascending flag.
+ * @param name Index name.
+ */
+ public QueryIndex(String field, boolean asc, String name) {
+ this(field, QueryIndexType.SORTED, asc);
+
+ this.name = name;
}
/**
@@ -71,14 +84,20 @@ public class QueryIndex implements Serializable {
* If index is sorted, then ascending sorting is used by default.
* To specify sort order, use the next method.
* This constructor should also have a corresponding setter method.
+ *
+ * @param field Field name.
+ * @param type Index type.
*/
public QueryIndex(String field, QueryIndexType type) {
this(Arrays.asList(field), type);
}
/**
- * Creates index for one field. The last boolean parameter
- * is ignored for non-sorted indexes.
+ * Creates index for one field. The last boolean parameter is ignored for non-sorted indexes.
+ *
+ * @param field Field name.
+ * @param type Index type.
+ * @param asc Ascending flag.
*/
public QueryIndex(String field, QueryIndexType type, boolean asc) {
fields = new LinkedHashMap<>();
@@ -189,4 +208,4 @@ public class QueryIndex implements Serializable {
public void setIndexType(QueryIndexType type) {
this.type = type;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f577052/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
index a3b5802..93a2cec 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
@@ -35,6 +35,7 @@ import java.util.Set;
import java.util.regex.Pattern;
import org.apache.ignite.cache.QueryIndex;
+import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.schema.model.PojoDescriptor;
import org.apache.ignite.schema.model.PojoField;
import org.apache.ignite.schema.ui.ConfirmCallable;
@@ -273,11 +274,15 @@ public class CodeGenerator {
boolean constructor, boolean includeKeys, ConfirmCallable askOverwrite) throws IOException {
String type = key ? pojo.keyClassName() : pojo.valueClassName();
- File out = new File(pkgFolder, type + ".java");
-
checkValidJavaIdentifier(pkg, true, "Package", type);
+
checkValidJavaIdentifier(type, false, "Type", type);
+ if (!pkgFolder.exists() && !pkgFolder.mkdirs())
+ throw new IOException("Failed to create folders for package: " + pkg);
+
+ File out = new File(pkgFolder, type + ".java");
+
if (out.exists()) {
MessageBox.Result choice = askOverwrite.confirm(out.getName());
@@ -524,9 +529,6 @@ public class CodeGenerator {
boolean includeKeys, ConfirmCallable askOverwrite) throws IOException {
File pkgFolder = new File(outFolder, pkg.replace('.', File.separatorChar));
- if (!pkgFolder.exists() && !pkgFolder.mkdirs())
- throw new IOException("Failed to create folders for package: " + pkg);
-
generateCode(pojo, true, pkg, pkgFolder, constructor, false, askOverwrite);
generateCode(pojo, false, pkg, pkgFolder, constructor, includeKeys, askOverwrite);
@@ -637,8 +639,6 @@ public class CodeGenerator {
add0(src, "");
boolean first = true;
- boolean firstIdxs = true;
- boolean firstIdx = true;
for (PojoDescriptor pojo : pojos) {
String tbl = pojo.table();
@@ -680,12 +680,14 @@ public class CodeGenerator {
add0(src, "");
// Queries entities.
- first = true;
-
add2(src, "// Configure query entities. ");
add2(src, "Collection<QueryEntity> qryEntities = new ArrayList<>();");
add0(src, "");
+ first = true;
+ boolean firstIdxs = true;
+ boolean firstIdx = true;
+
for (PojoDescriptor pojo : pojos) {
String tbl = pojo.table();
@@ -709,33 +711,41 @@ public class CodeGenerator {
firstIdxs = false;
for (QueryIndex idx : idxs) {
- add2(src, (firstIdx ? "QueryIndex " : "") + "idx = new QueryIndex();");
- add0(src, "");
+ if (idx.getFields().size() == 1) {
+ Map.Entry<String, Boolean> fld = F.first(idx.getFields().entrySet());
- add2(src, "idx.setName(\"" + idx.getName() + "\");");
- add0(src, "");
+ add2(src, "idxs.add(new QueryIndex(\"" + fld.getKey() + fld.getValue() +
+ "\"" + idx.getName() + "\"));");
+ add0(src, "");
+ }
+ else {
+ add2(src, (firstIdx ? "QueryIndex " : "") + "idx = new QueryIndex();");
+ add0(src, "");
- add2(src, (firstIdx ? "LinkedHashMap<String, Boolean> " : "") +
- "idxFlds = new LinkedHashMap<>();");
+ add2(src, "idx.setName(\"" + idx.getName() + "\");");
+ add0(src, "");
- add0(src, "");
+ add2(src, (firstIdx ? "LinkedHashMap<String, Boolean> " : "") +
+ "idxFlds = new LinkedHashMap<>();");
+ add0(src, "");
- for (Map.Entry<String, Boolean> idxFld : idx.getFields().entrySet())
- add2(src, "idxFlds.put(\"" + idxFld.getKey() + "\", " + idxFld.getValue() + ");");
+ for (Map.Entry<String, Boolean> idxFld : idx.getFields().entrySet())
+ add2(src, "idxFlds.put(\"" + idxFld.getKey() + "\", " + idxFld.getValue() + ");");
- add0(src, "");
+ add0(src, "");
- add2(src, "idx.setFields(idxFlds);");
- add0(src, "");
+ add2(src, "idx.setFields(idxFlds);");
+ add0(src, "");
- add2(src, "idxs.add(idx);");
+ add2(src, "idxs.add(idx);");
+ add0(src, "");
- firstIdx = false;
+ firstIdx = false;
+ }
}
- add0(src, "");
-
add2(src, "qryEntity.setIndexes(idxs);");
+ add0(src, "");
}
add2(src, "ccfg.setQueryEntities(qryEntities);");
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f577052/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/XmlGenerator.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/XmlGenerator.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/XmlGenerator.java
index b32534f..6e6a878 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/XmlGenerator.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/XmlGenerator.java
@@ -25,6 +25,7 @@ import java.text.SimpleDateFormat;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
+import java.util.Map;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -34,9 +35,11 @@ import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.apache.ignite.cache.CacheTypeFieldMetadata;
-import org.apache.ignite.cache.CacheTypeMetadata;
+import org.apache.ignite.cache.QueryEntity;
import org.apache.ignite.cache.QueryIndex;
+import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreFactory;
+import org.apache.ignite.cache.store.jdbc.JdbcType;
+import org.apache.ignite.cache.store.jdbc.JdbcTypeField;
import org.apache.ignite.schema.model.PojoDescriptor;
import org.apache.ignite.schema.model.PojoField;
import org.apache.ignite.schema.ui.ConfirmCallable;
@@ -164,20 +167,20 @@ public class XmlGenerator {
* @param name Property name.
* @param fields Collection of POJO fields.
*/
- private static void addFields(Document doc, Node parent, String name, Collection<PojoField> fields) {
+ private static void addJdbcFields(Document doc, Node parent, String name, Collection<PojoField> fields) {
if (!fields.isEmpty()) {
Element prop = addProperty(doc, parent, name, null);
Element list = addElement(doc, prop, "list");
for (PojoField field : fields) {
- Element item = addBean(doc, list, CacheTypeFieldMetadata.class);
+ Element item = addBean(doc, list, JdbcTypeField.class);
- addProperty(doc, item, "databaseName", field.dbName());
- Element dbType = addProperty(doc, item, "databaseType", null);
+ Element dbType = addProperty(doc, item, "databaseFieldType", null);
addElement(doc, dbType, "util:constant", "static-field", "java.sql.Types." + field.dbTypeName());
- addProperty(doc, item, "javaName", field.javaName());
- addProperty(doc, item, "javaType", field.javaTypeName());
+ addProperty(doc, item, "databaseFieldName", field.dbName());
+ addProperty(doc, item, "javaFieldType", field.javaTypeName());
+ addProperty(doc, item, "javaFieldName", field.javaName());
}
}
}
@@ -212,40 +215,39 @@ public class XmlGenerator {
if (!idxs.isEmpty()) {
Element prop = addProperty(doc, parent, "indexes", null);
- Element map = addElement(doc, prop, "map");
+ Element list = addElement(doc, prop, "list");
+
+ for (QueryIndex idx : idxs) {
+ Element idxBean = addBean(doc, list, QueryIndex.class);
+
+ addProperty(doc, idxBean, "name", idx.getName());
+
+ Element idxType = addProperty(doc, idxBean, "indexType", null);
+ addElement(doc, idxType, "util:constant", "static-field", "org.apache.ignite.cache.QueryIndexType." + idx.getIndexType());
+
+ addProperty(doc, idxBean, "fields", null);
+
+ Element fldsMap = addElement(doc, idxBean, "map");
-// for (Map.Entry<String, Map<String, IndexItem>> group : idxs.entrySet()) {
-// Element entry1 = addElement(doc, map, "entry", "key", group.getKey());
-//
-// Element val1 = addElement(doc, entry1, "map");
-//
-// Map<String, IndexItem> grpItems = group.getValue();
-//
-// for (Map.Entry<String, IndexItem> grpItem : grpItems.entrySet()) {
-// Element entry2 = addElement(doc, val1, "entry", "key", grpItem.getKey());
-//
-// Element val2 = addBean(doc, entry2, IgniteBiTuple.class);
-//
-// IndexItem idxCol = grpItem.getValue();
-//
-// addElement(doc, val2, "constructor-arg", null, null, "value", idxCol.type());
-// addElement(doc, val2, "constructor-arg", null, null, "value", String.valueOf(idxCol.descending()));
-// }
-// }
+ Map<String, Boolean> flds = idx.getFields();
+
+ for (Map.Entry<String, Boolean> fld : flds.entrySet())
+ addElement(doc, fldsMap, "entry", "key", fld.getKey(), "value", fld.getValue().toString());
+ }
}
}
/**
- * Add element with type metadata to XML document.
+ * Add element with JDBC POJO store factory to XML document.
*
* @param doc XML document.
* @param parent Parent XML node.
* @param pkg Package fo types.
* @param pojo POJO descriptor.
*/
- private static void addTypeMetadata(Document doc, Node parent, String pkg, PojoDescriptor pojo,
+ private static void addJdbcPojoStoreFactory(Document doc, Node parent, String pkg, PojoDescriptor pojo,
boolean includeKeys) {
- Element bean = addBean(doc, parent, CacheTypeMetadata.class);
+ Element bean = addBean(doc, parent, JdbcType.class);
addProperty(doc, bean, "databaseSchema", pojo.schema());
@@ -255,9 +257,25 @@ public class XmlGenerator {
addProperty(doc, bean, "valueType", pkg + "." + pojo.valueClassName());
- addFields(doc, bean, "keyFields", pojo.keyFields());
+ addJdbcFields(doc, bean, "keyFields", pojo.keyFields());
- addFields(doc, bean, "valueFields", pojo.valueFields(includeKeys));
+ addJdbcFields(doc, bean, "valueFields", pojo.valueFields(includeKeys));
+ }
+
+ /**
+ * Add element with query entity to XML document.
+ *
+ * @param doc XML document.
+ * @param parent Parent XML node.
+ * @param pkg Package fo types.
+ * @param pojo POJO descriptor.
+ */
+ private static void addQueryEntity(Document doc, Node parent, String pkg, PojoDescriptor pojo) {
+ Element bean = addBean(doc, parent, QueryEntity.class);
+
+ addProperty(doc, bean, "keyType", pkg + "." + pojo.keyClassName());
+
+ addProperty(doc, bean, "valueType", pkg + "." + pojo.valueClassName());
addQueryFields(doc, bean, "queryFields", pojo.fields());
@@ -326,8 +344,15 @@ public class XmlGenerator {
"http://www.springframework.org/schema/util " +
"http://www.springframework.org/schema/util/spring-util.xsd");
+ Element factoryBean = addBean(doc, beans, CacheJdbcPojoStoreFactory.class);
+ Element typesElem = addProperty(doc, factoryBean, "types", null);
+ Element typesItemsElem = addElement(doc, typesElem, "list");
+
+ for (PojoDescriptor pojo : pojos)
+ addJdbcPojoStoreFactory(doc, typesItemsElem, pkg, pojo, includeKeys);
+
for (PojoDescriptor pojo : pojos)
- addTypeMetadata(doc, beans, pkg, pojo, includeKeys);
+ addQueryEntity(doc, beans, pkg, pojo);
TransformerFactory transformerFactory = TransformerFactory.newInstance();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f577052/modules/schema-import/src/main/java/org/apache/ignite/schema/model/SchemaDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/model/SchemaDescriptor.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/model/SchemaDescriptor.java
index 1dc66f2..7de2247 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/model/SchemaDescriptor.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/model/SchemaDescriptor.java
@@ -55,8 +55,8 @@ public class SchemaDescriptor {
return selected;
}
- @Override
- public String toString() {
+ /** {@inheritDoc} */
+ @Override public String toString() {
return schema;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f577052/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java
index 8818842..b68f90d 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java
@@ -60,7 +60,7 @@ public class DatabaseMetadataParser {
return new OracleMetadataDialect();
else if (dbProductName.startsWith("DB2/"))
return new DB2MetadataDialect();
- else if (dbProductName.equals("MySQL"))
+ else if ("MySQL".equals(dbProductName))
return new MySQLMetadataDialect();
else
return new JdbcMetadataDialect();
@@ -94,7 +94,7 @@ public class DatabaseMetadataParser {
* Parse database metadata.
*
* @param conn Connection to database.
- * @param schemas Collention of schema names to load.
+ * @param schemas Collection of schema names to load.
* @param tblsOnly If {@code true} then process tables only else process tables and views.
* @return Collection of POJO descriptors.
* @throws SQLException If parsing failed.
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f577052/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/DatabaseMetadataDialect.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/DatabaseMetadataDialect.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/DatabaseMetadataDialect.java
index e93682d..bdf309b 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/DatabaseMetadataDialect.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/DatabaseMetadataDialect.java
@@ -45,7 +45,7 @@ public abstract class DatabaseMetadataDialect {
* Gets tables from database.
*
* @param conn Database connection.
- * @param schemas Collention of schema names to load.
+ * @param schemas Collection of schema names to load.
* @param tblsOnly If {@code true} then gets only tables otherwise gets tables and views.
* @return Collection of table descriptors.
* @throws SQLException If failed to get tables.
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f577052/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/JdbcMetadataDialect.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/JdbcMetadataDialect.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/JdbcMetadataDialect.java
index e22ea12..45f0f9f 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/JdbcMetadataDialect.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/JdbcMetadataDialect.java
@@ -30,6 +30,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.ignite.cache.QueryIndex;
+import org.apache.ignite.cache.QueryIndexType;
import org.apache.ignite.schema.parser.DbColumn;
import org.apache.ignite.schema.parser.DbTable;
@@ -117,7 +118,7 @@ public class JdbcMetadataDialect extends DatabaseMetadataDialect {
Collection<DbTable> tbls = new ArrayList<>();
- if (schemas.size() == 0)
+ if (schemas.isEmpty())
schemas.add(null);
for (String toSchema: schemas) {
@@ -172,6 +173,7 @@ public class JdbcMetadataDialect extends DatabaseMetadataDialect {
if (idx == null) {
idx = new QueryIndex();
idx.setName(idxName);
+ idx.setIndexType(QueryIndexType.SORTED);
idx.setFields(new LinkedHashMap<String, Boolean>());
idxs.put(idxName, idx);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f577052/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/OracleMetadataDialect.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/OracleMetadataDialect.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/OracleMetadataDialect.java
index 76222d4..0d4e8d6 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/OracleMetadataDialect.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/OracleMetadataDialect.java
@@ -33,6 +33,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.ignite.cache.QueryIndex;
+import org.apache.ignite.cache.QueryIndexType;
import org.apache.ignite.schema.parser.DbColumn;
import org.apache.ignite.schema.parser.DbTable;
@@ -273,6 +274,7 @@ public class OracleMetadataDialect extends DatabaseMetadataDialect {
if (idx == null) {
idx = new QueryIndex();
idx.setName(idxName);
+ idx.setIndexType(QueryIndexType.SORTED);
idx.setFields(new LinkedHashMap<String, Boolean>());
idxs.put(idxName, idx);
@@ -298,7 +300,7 @@ public class OracleMetadataDialect extends DatabaseMetadataDialect {
PreparedStatement idxStmt = conn.prepareStatement(SQL_INDEXES);
- if (schemas.size() == 0)
+ if (schemas.isEmpty())
schemas.add(null);
Set<String> sysSchemas = systemSchemas();
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f577052/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/ModalDialog.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/ModalDialog.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/ModalDialog.java
index 29c8a49..a1e34a1 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/ModalDialog.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/ModalDialog.java
@@ -34,8 +34,8 @@ public abstract class ModalDialog extends Stage {
protected ModalDialog(Stage owner, int width, int height) {
this.owner = owner;
- this.setWidth(width);
- this.setHeight(height);
+ setWidth(width);
+ setHeight(height);
}
/**
@@ -47,4 +47,4 @@ public abstract class ModalDialog extends Stage {
showAndWait();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f577052/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
index 4f419e6..495c316 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
@@ -313,6 +313,7 @@ public class SchemaImportApp extends Application {
/** */
private ProgressIndicator pi;
+ /** */
private ObservableList<SchemaDescriptor> schemas = FXCollections.emptyObservableList();
/** List with POJOs descriptors. */
@@ -425,7 +426,7 @@ public class SchemaImportApp extends Application {
if (schema.selected().getValue())
selSchemas.add(schema.schema());
- if (selSchemas.size() == 0)
+ if (selSchemas.isEmpty())
if (!MessageBox.confirmDialog(owner, "No schemas selected.\nExtract tables for all available schemas?"))
return;
@@ -944,8 +945,8 @@ public class SchemaImportApp extends Application {
schemaPnl.wrap();
schemaPnl.add(button("Load schemas", "Load schemas for specified database", new EventHandler<ActionEvent>() {
- @Override
- public void handle(ActionEvent evt) {
+ /** {@inheritDoc} */
+ @Override public void handle(ActionEvent evt) {
loadSchemas();
}
}));
@@ -1827,8 +1828,8 @@ public class SchemaImportApp extends Application {
* Special list view cell to select loaded schemas.
*/
private static class SchemaCell implements Callback<SchemaDescriptor, ObservableValue<Boolean>> {
- @Override
- public ObservableValue<Boolean> call(SchemaDescriptor item) {
+ /** {@inheritDoc} */
+ @Override public ObservableValue<Boolean> call(SchemaDescriptor item) {
return item.selected();
}
}
@@ -1947,4 +1948,4 @@ public class SchemaImportApp extends Application {
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f577052/modules/schema-import/src/test/java/org/apache/ignite/schema/test/AbstractSchemaImportTest.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/test/java/org/apache/ignite/schema/test/AbstractSchemaImportTest.java b/modules/schema-import/src/test/java/org/apache/ignite/schema/test/AbstractSchemaImportTest.java
index 8c2b046..bf0f94a 100644
--- a/modules/schema-import/src/test/java/org/apache/ignite/schema/test/AbstractSchemaImportTest.java
+++ b/modules/schema-import/src/test/java/org/apache/ignite/schema/test/AbstractSchemaImportTest.java
@@ -48,7 +48,7 @@ public abstract class AbstractSchemaImportTest extends TestCase {
protected static final String OUT_DIR_PATH = System.getProperty("java.io.tmpdir") + "/ignite-schema-import/out";
/** Auto confirmation of file conflicts. */
- protected ConfirmCallable askOverwrite = new ConfirmCallable(null, "") {
+ protected final ConfirmCallable askOverwrite = new ConfirmCallable(null, "") {
@Override public MessageBox.Result confirm(String msg) {
return YES_TO_ALL;
}
@@ -141,4 +141,4 @@ public abstract class AbstractSchemaImportTest extends TestCase {
return false;
}
}
-}
\ No newline at end of file
+}