diff --git a/komodo-core-tests/.classpath b/komodo-core-tests/.classpath index fae1a2b3..f8ce0d30 100644 --- a/komodo-core-tests/.classpath +++ b/komodo-core-tests/.classpath @@ -6,11 +6,6 @@ - - - - - @@ -22,7 +17,7 @@ - + diff --git a/komodo-core-tests/pom.xml b/komodo-core-tests/pom.xml index 7ade7567..8c0c2726 100644 --- a/komodo-core-tests/pom.xml +++ b/komodo-core-tests/pom.xml @@ -9,7 +9,7 @@ komodo-core-tests Komodo Core Tests Tests for Komodo Core that would otherwise cause cyclic dependencies - + org.komodo diff --git a/komodo-core/.classpath b/komodo-core/.classpath index fae1a2b3..c2e15478 100644 --- a/komodo-core/.classpath +++ b/komodo-core/.classpath @@ -17,17 +17,13 @@ - - - - - - + + - + diff --git a/komodo-core/.project b/komodo-core/.project index d1b6bef3..b8db0a1f 100644 --- a/komodo-core/.project +++ b/komodo-core/.project @@ -5,11 +5,21 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder + + org.eclipse.wst.validation.validationbuilder + + + org.eclipse.m2e.core.maven2Builder @@ -19,5 +29,7 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.common.modulecore.ModuleCoreNature diff --git a/komodo-core/pom.xml b/komodo-core/pom.xml index 2a93b78d..5512e6a9 100644 --- a/komodo-core/pom.xml +++ b/komodo-core/pom.xml @@ -9,7 +9,7 @@ komodo-core Komodo Core Komodo Core - + org.komodo diff --git a/komodo-core/src/main/java/org/komodo/core/KomodoLexicon.java b/komodo-core/src/main/java/org/komodo/core/KomodoLexicon.java index bd0dccd1..7b29805b 100644 --- a/komodo-core/src/main/java/org/komodo/core/KomodoLexicon.java +++ b/komodo-core/src/main/java/org/komodo/core/KomodoLexicon.java @@ -9,7 +9,7 @@ import org.komodo.spi.constants.StringConstants; import org.modeshape.jcr.JcrNtLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; /** * Constants for the JCR names of node types and properties related to the Komodo engine. diff --git a/komodo-core/src/main/java/org/komodo/repository/KomodoTypeRegistry.java b/komodo-core/src/main/java/org/komodo/repository/KomodoTypeRegistry.java index 56b7a5e0..ad79947d 100644 --- a/komodo-core/src/main/java/org/komodo/repository/KomodoTypeRegistry.java +++ b/komodo-core/src/main/java/org/komodo/repository/KomodoTypeRegistry.java @@ -24,7 +24,6 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; - import org.komodo.core.KomodoLexicon; import org.komodo.modeshape.teiid.cnd.TeiidSqlLexicon; import org.komodo.spi.constants.StringConstants; @@ -32,9 +31,9 @@ import org.komodo.spi.utils.KeyInValueHashMap; import org.komodo.spi.utils.KeyInValueHashMap.KeyFromValueAdapter; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * diff --git a/komodo-core/src/main/java/org/komodo/repository/LocalRepository.java b/komodo-core/src/main/java/org/komodo/repository/LocalRepository.java index 2691c18a..13c64ecb 100644 --- a/komodo-core/src/main/java/org/komodo/repository/LocalRepository.java +++ b/komodo-core/src/main/java/org/komodo/repository/LocalRepository.java @@ -122,7 +122,7 @@ public String toString() { } } - private WeakHashMap< Session, UnitOfWork > sessions = new WeakHashMap<>(); + private WeakHashMap< Session, UnitOfWork > sessions = new WeakHashMap< Session, UnitOfWork >(); private State state = State.NOT_REACHABLE; diff --git a/komodo-core/src/main/java/org/komodo/repository/ObjectImpl.java b/komodo-core/src/main/java/org/komodo/repository/ObjectImpl.java index ac257e1d..c85f6cb0 100644 --- a/komodo-core/src/main/java/org/komodo/repository/ObjectImpl.java +++ b/komodo-core/src/main/java/org/komodo/repository/ObjectImpl.java @@ -42,10 +42,10 @@ import org.modeshape.jcr.JcrNtLexicon; import org.modeshape.jcr.JcrSession; import org.modeshape.jcr.api.JcrTools; -import org.modeshape.sequencer.ddl.DdlConstants; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlConstants; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.DdlConstants; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlConstants; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; /** * An implementation of a {@link KomodoObject Komodo object}. @@ -985,7 +985,7 @@ public final PropertyDescriptor[] getRawPropertyDescriptors( final UnitOfWork tr return PropertyDescriptor.NO_DESCRIPTORS; } - final List< PropertyDescriptor > result = new ArrayList<>(); + final List< PropertyDescriptor > result = new ArrayList< PropertyDescriptor >(); for ( final Descriptor descriptor : getAllDescriptors( transaction, this ) ) { result.addAll( Arrays.asList( descriptor.getPropertyDescriptors( transaction ) ) ); diff --git a/komodo-core/src/main/java/org/komodo/repository/RepositoryImpl.java b/komodo-core/src/main/java/org/komodo/repository/RepositoryImpl.java index fd504b2b..7a5de43d 100644 --- a/komodo-core/src/main/java/org/komodo/repository/RepositoryImpl.java +++ b/komodo-core/src/main/java/org/komodo/repository/RepositoryImpl.java @@ -965,7 +965,7 @@ public void notify( final RepositoryClientEvent event ) { } protected void notifyObservers() { - final Set copy = new HashSet<>(this.observers); + final Set copy = new HashSet(this.observers); for (final RepositoryObserver observer : copy) { try { diff --git a/komodo-core/src/main/java/org/komodo/repository/internal/KSequencers.java b/komodo-core/src/main/java/org/komodo/repository/internal/KSequencers.java index f042787d..371973b6 100644 --- a/komodo-core/src/main/java/org/komodo/repository/internal/KSequencers.java +++ b/komodo-core/src/main/java/org/komodo/repository/internal/KSequencers.java @@ -45,9 +45,9 @@ import org.komodo.utils.KLog; import org.modeshape.jcr.api.JcrConstants; import org.modeshape.jcr.api.Session; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** diff --git a/komodo-core/src/main/java/org/komodo/repository/search/ObjectSearcher.java b/komodo-core/src/main/java/org/komodo/repository/search/ObjectSearcher.java index 5f94f5b8..26406e4b 100644 --- a/komodo-core/src/main/java/org/komodo/repository/search/ObjectSearcher.java +++ b/komodo-core/src/main/java/org/komodo/repository/search/ObjectSearcher.java @@ -64,7 +64,7 @@ public class ObjectSearcher implements SQLConstants { private String customWhereClause; - private Map parameters = new HashMap<>(); + private Map parameters = new HashMap(); /** * @param repository the repository to search diff --git a/komodo-core/src/main/java/org/komodo/repository/search/ParanthesisClause.java b/komodo-core/src/main/java/org/komodo/repository/search/ParanthesisClause.java index 3ce59cba..c0f9b11e 100644 --- a/komodo-core/src/main/java/org/komodo/repository/search/ParanthesisClause.java +++ b/komodo-core/src/main/java/org/komodo/repository/search/ParanthesisClause.java @@ -39,7 +39,7 @@ */ public class ParanthesisClause extends Clause { - private List childClauses = new ArrayList<>(); + private List childClauses = new ArrayList(); /** * @param operator the logical operator preceding this clause (can be null if this is the only clause) diff --git a/komodo-core/src/main/java/org/komodo/repository/validation/RuleImpl.java b/komodo-core/src/main/java/org/komodo/repository/validation/RuleImpl.java index 3d2498ee..0899c8d1 100644 --- a/komodo-core/src/main/java/org/komodo/repository/validation/RuleImpl.java +++ b/komodo-core/src/main/java/org/komodo/repository/validation/RuleImpl.java @@ -395,7 +395,7 @@ private Result evaluateChildRule( final UnitOfWork transaction, break; } case SAME_NAME_SIBLING: { - final Set< String > names = new HashSet<>(); + final Set< String > names = new HashSet< String >(); for ( final KomodoObject kid : kobject.getChildrenOfType( transaction, childType ) ) { final String name = kid.getName( transaction ); diff --git a/komodo-core/src/main/java/org/komodo/repository/validation/ValidationManagerImpl.java b/komodo-core/src/main/java/org/komodo/repository/validation/ValidationManagerImpl.java index 4d320fbb..f670a03e 100644 --- a/komodo-core/src/main/java/org/komodo/repository/validation/ValidationManagerImpl.java +++ b/komodo-core/src/main/java/org/komodo/repository/validation/ValidationManagerImpl.java @@ -11,12 +11,10 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; - import javax.jcr.Node; import javax.jcr.Session; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; - import org.komodo.core.KomodoLexicon; import org.komodo.repository.ObjectImpl; import org.komodo.repository.RepositoryImpl; @@ -47,8 +45,8 @@ public class ValidationManagerImpl implements ValidationManager { */ public static class ValidationHandler extends DefaultHandler { - private final List< String > errors = new ArrayList<>(); - private final List< String > fatals = new ArrayList<>(); + private final List< String > errors = new ArrayList< String >(); + private final List< String > fatals = new ArrayList< String >(); /** * {@inheritDoc} @@ -633,7 +631,7 @@ public List< String > validateRules( final File rulesXmlFile ) throws KException _parser.parse( rulesXmlFile, handler ); // return any errors - List< String > result = new ArrayList<>(); + List< String > result = new ArrayList< String >(); result.addAll( handler.getFatalErrors() ); result.addAll( handler.getErrors() ); return result; diff --git a/komodo-core/src/main/resources/org/komodo/repository/local-repository-config.json b/komodo-core/src/main/resources/org/komodo/repository/local-repository-config.json index 2f80873f..66cd2322 100644 --- a/komodo-core/src/main/resources/org/komodo/repository/local-repository-config.json +++ b/komodo-core/src/main/resources/org/komodo/repository/local-repository-config.json @@ -66,7 +66,7 @@ "threadPool" : "modeshape-workers", "sequencers" : { "VDB Dynamic Sequencer" : { - "classname" : "org.modeshape.sequencer.teiid.VdbDynamicSequencer" + "classname" : "org.teiid.modeshape.sequencer.vdb.VdbDynamicSequencer" }, "DDL Sequencer" : { "classname" : "org.komodo.modeshape.lib.sequencer.KDdlSequencer" diff --git a/komodo-importer/.classpath b/komodo-importer/.classpath index fae1a2b3..c2e15478 100644 --- a/komodo-importer/.classpath +++ b/komodo-importer/.classpath @@ -17,17 +17,13 @@ - - - - - - + + - + diff --git a/komodo-importer/.project b/komodo-importer/.project index 69847bb3..667d3512 100644 --- a/komodo-importer/.project +++ b/komodo-importer/.project @@ -5,11 +5,21 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder + + org.eclipse.wst.validation.validationbuilder + + + org.eclipse.m2e.core.maven2Builder @@ -19,5 +29,7 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.common.modulecore.ModuleCoreNature diff --git a/komodo-importer/pom.xml b/komodo-importer/pom.xml index 86675c28..3278f352 100644 --- a/komodo-importer/pom.xml +++ b/komodo-importer/pom.xml @@ -9,7 +9,7 @@ komodo-importer Komodo Importer Importing of artifacts in komodo engine - + org.komodo diff --git a/komodo-importer/src/main/java/org/komodo/importer/ImportMessages.java b/komodo-importer/src/main/java/org/komodo/importer/ImportMessages.java index 21d2fd76..95d3560b 100644 --- a/komodo-importer/src/main/java/org/komodo/importer/ImportMessages.java +++ b/komodo-importer/src/main/java/org/komodo/importer/ImportMessages.java @@ -29,7 +29,7 @@ import org.komodo.spi.constants.StringConstants; import org.komodo.utils.ArgCheck; import org.modeshape.common.text.Position; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlParsingException; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlParsingException; /** * ImportMessages diff --git a/komodo-modeshape-sequencer-teiid-sql-tests/.classpath b/komodo-modeshape-sequencer-teiid-sql-tests/.classpath index fae1a2b3..f8ce0d30 100644 --- a/komodo-modeshape-sequencer-teiid-sql-tests/.classpath +++ b/komodo-modeshape-sequencer-teiid-sql-tests/.classpath @@ -6,11 +6,6 @@ - - - - - @@ -22,7 +17,7 @@ - + diff --git a/komodo-modeshape-sequencer-teiid-sql-tests/pom.xml b/komodo-modeshape-sequencer-teiid-sql-tests/pom.xml index c225b312..8ed5344c 100644 --- a/komodo-modeshape-sequencer-teiid-sql-tests/pom.xml +++ b/komodo-modeshape-sequencer-teiid-sql-tests/pom.xml @@ -9,7 +9,7 @@ komodo-modeshape-sequencer-teiid-sql-tests Komodo Modeshape Teiid SQL Sequencer Tests Tests for sequencer that are separate to avoid cyclic dependencies - + org.komodo diff --git a/komodo-modeshape-sequencer-teiid-sql-tests/src/test/java/org/komodo/modeshape/teiid/sequencer/AbstractTestSequencers.java b/komodo-modeshape-sequencer-teiid-sql-tests/src/test/java/org/komodo/modeshape/teiid/sequencer/AbstractTestSequencers.java index 1070efa3..2cc16a89 100644 --- a/komodo-modeshape-sequencer-teiid-sql-tests/src/test/java/org/komodo/modeshape/teiid/sequencer/AbstractTestSequencers.java +++ b/komodo-modeshape-sequencer-teiid-sql-tests/src/test/java/org/komodo/modeshape/teiid/sequencer/AbstractTestSequencers.java @@ -37,8 +37,8 @@ import org.komodo.repository.KSequencerController.SequencerType; import org.komodo.spi.query.sql.lang.JoinType; import org.komodo.spi.runtime.version.TeiidVersion; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; /** * @@ -55,14 +55,14 @@ public AbstractTestSequencers(TeiidVersion teiidVersion) { @Test(timeout = 5000000) public void testBasicDDLStatement() throws Exception { - String ddl = "CREATE VIEW Tweet AS select * FROM twitterview.getTweets;"; + String ddl = "CREATE VIEW Tweet AS select * FROM twitterview.getTweets;"; Node fileNode = prepareSequence(ddl, SequencerType.DDL); // // Sequencing completed, now verify // - // DDL Sequencer creates the 'Tweet' node + // DDL Sequencer creates the 'Tweet' node Node tweetNode = fileNode.getNode("Tweet"); assertNotNull(tweetNode); @@ -96,19 +96,19 @@ public void testComplexDDLStatement() throws Exception { // ddl.append("CREATE FOREIGN SCHEMA TWITTER (connection-jndi-name=\"java:/twitterDS\":translator-name=\"rest\") ") ddl.append("CREATE VIRTUAL PROCEDURE getTweets(query varchar) RETURNS (created_on varchar(25), from_user varchar(25), to_user varchar(25), ") - .append("profile_image_url varchar(25), source varchar(25), text varchar(140)) AS ") + .append("profile_image_url varchar(25), source varchar(25), text varchar(140)) AS ") .append("select tweet.* from ") .append("(call twitter.invokeHTTP(action => 'GET', endpoint =>querystring(\'',query as \"q\"))) w, ") .append("XMLTABLE('results' passing JSONTOXML('myxml', w.result) columns ") .append("created_on string PATH 'created_at', ") .append("from_user string PATH 'from_user', ") .append("to_user string PATH 'to_user', ") - .append("profile_image_url string PATH 'profile_image_url', ") + .append("profile_image_url string PATH 'profile_image_url', ") .append("source string PATH 'source', ") .append("text string PATH 'text') tweet; ") .append("CREATE VIEW Tweet AS select * FROM twitterview.getTweets; ") // .append("CREATE FOREIGN SCHEMA PARTSSUPPLIER (connection-jndi-name=\"parts-oracle\":translator-name=\"jdbc\") ") - .append("CREATE FOREIGN TABLE PARTSSUPPLIER.PART (id integer PRIMARY KEY, name varchar(25), color varchar(25), weight integer); ") + .append("CREATE FOREIGN TABLE PARTSSUPPLIER.PART (id integer PRIMARY KEY, name varchar(25), color varchar(25), weight integer); ") // .append("CREATE VIRTUAL SCHEMA PARTS_VIEWS ") .append("CREATE VIEW PARTS_VIEWS.PARTS ( ") .append("PART_ID integer PRIMARY KEY, ") diff --git a/komodo-modeshape-sequencer-teiid-sql/.classpath b/komodo-modeshape-sequencer-teiid-sql/.classpath index 95b7b0a6..121196c2 100644 --- a/komodo-modeshape-sequencer-teiid-sql/.classpath +++ b/komodo-modeshape-sequencer-teiid-sql/.classpath @@ -17,34 +17,25 @@ - - - - - - - - - - + - + - + - + diff --git a/komodo-modeshape-sequencer-teiid-sql/.project b/komodo-modeshape-sequencer-teiid-sql/.project index e0252e0c..97b4db7e 100644 --- a/komodo-modeshape-sequencer-teiid-sql/.project +++ b/komodo-modeshape-sequencer-teiid-sql/.project @@ -5,11 +5,21 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder + + org.eclipse.wst.validation.validationbuilder + + + org.eclipse.m2e.core.maven2Builder @@ -19,5 +29,7 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.common.modulecore.ModuleCoreNature diff --git a/komodo-modeshape-sequencer-teiid-sql/pom.xml b/komodo-modeshape-sequencer-teiid-sql/pom.xml index 8bc0e4f5..1956643a 100644 --- a/komodo-modeshape-sequencer-teiid-sql/pom.xml +++ b/komodo-modeshape-sequencer-teiid-sql/pom.xml @@ -96,7 +96,7 @@ false - + diff --git a/komodo-modeshape-vdb/.classpath b/komodo-modeshape-vdb/.classpath index fae1a2b3..d2bdee1b 100644 --- a/komodo-modeshape-vdb/.classpath +++ b/komodo-modeshape-vdb/.classpath @@ -6,11 +6,6 @@ - - - - - @@ -22,12 +17,13 @@ - + + - + diff --git a/komodo-modeshape-vdb/.project b/komodo-modeshape-vdb/.project index 906cb3ee..31f3f846 100644 --- a/komodo-modeshape-vdb/.project +++ b/komodo-modeshape-vdb/.project @@ -5,11 +5,21 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder + + org.eclipse.wst.validation.validationbuilder + + + org.eclipse.m2e.core.maven2Builder @@ -19,5 +29,7 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.common.modulecore.ModuleCoreNature diff --git a/komodo-modeshape-vdb/pom.xml b/komodo-modeshape-vdb/pom.xml index ec452784..10f86187 100644 --- a/komodo-modeshape-vdb/pom.xml +++ b/komodo-modeshape-vdb/pom.xml @@ -9,7 +9,7 @@ komodo-modeshape-vdb Komodo Modeshape Vdb Tools for handling Teiid Vdbs in Modeshape - + org.komodo diff --git a/komodo-modeshape-vdb/src/main/java/org/komodo/modeshape/visitor/DdlNodeVisitor.java b/komodo-modeshape-vdb/src/main/java/org/komodo/modeshape/visitor/DdlNodeVisitor.java index ea88fcb8..1b731b9f 100644 --- a/komodo-modeshape-vdb/src/main/java/org/komodo/modeshape/visitor/DdlNodeVisitor.java +++ b/komodo-modeshape-vdb/src/main/java/org/komodo/modeshape/visitor/DdlNodeVisitor.java @@ -47,8 +47,8 @@ import org.komodo.spi.utils.KeyInValueHashMap; import org.komodo.utils.StringUtils; import org.modeshape.jcr.JcrLexicon; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; /** * Visitor that will walk a ddl node tree and convert it to diff --git a/komodo-modeshape-vdb/src/main/java/org/komodo/modeshape/visitor/VdbNodeVisitor.java b/komodo-modeshape-vdb/src/main/java/org/komodo/modeshape/visitor/VdbNodeVisitor.java index b5ed524d..0d3306da 100644 --- a/komodo-modeshape-vdb/src/main/java/org/komodo/modeshape/visitor/VdbNodeVisitor.java +++ b/komodo-modeshape-vdb/src/main/java/org/komodo/modeshape/visitor/VdbNodeVisitor.java @@ -41,8 +41,8 @@ import org.komodo.spi.runtime.version.TeiidVersion; import org.modeshape.jcr.JcrLexicon; import org.modeshape.jcr.api.JcrConstants; -import org.modeshape.sequencer.teiid.lexicon.CoreLexicon; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.CoreLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * Visitor that will walk a vdb node tree and convert it to diff --git a/komodo-modeshape-vdb/src/test/java/org/komodo/modeshape/vdb/test/export/TestVdbExport.java b/komodo-modeshape-vdb/src/test/java/org/komodo/modeshape/vdb/test/export/TestVdbExport.java index 2b88dafa..f4faf275 100644 --- a/komodo-modeshape-vdb/src/test/java/org/komodo/modeshape/vdb/test/export/TestVdbExport.java +++ b/komodo-modeshape-vdb/src/test/java/org/komodo/modeshape/vdb/test/export/TestVdbExport.java @@ -23,23 +23,20 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; - import java.io.InputStream; import java.io.StringWriter; import java.io.Writer; import java.util.concurrent.TimeUnit; - import javax.jcr.Node; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamWriter; - import org.junit.Test; import org.komodo.modeshape.teiid.cnd.TeiidSqlLexicon; import org.komodo.modeshape.visitor.VdbNodeVisitor; import org.komodo.test.utils.AbstractSequencerTest; import org.komodo.test.utils.SynchronousSequencerListener; import org.komodo.test.utils.TestUtilities; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; import org.w3c.dom.Document; /** @@ -148,7 +145,7 @@ public void testBasicVdbExportUndefinedAttribute() throws Exception { // still equal. TestUtilities.compareDocuments(compareDoc, testDoc); } - + @Test(timeout=3000000) public void testAllElementsVdbExport() throws Exception { Node allElementsNode = TestUtilities.createAllElementsExampleNode(rootNode); diff --git a/komodo-modeshape-vdb/src/test/resources/test-repository-config.json b/komodo-modeshape-vdb/src/test/resources/test-repository-config.json index b81296cf..06eeda49 100644 --- a/komodo-modeshape-vdb/src/test/resources/test-repository-config.json +++ b/komodo-modeshape-vdb/src/test/resources/test-repository-config.json @@ -53,7 +53,7 @@ "threadPool" : "modeshape-workers", "sequencers" : { "VDB Sequencer" : { - "classname" : "VdbSequencer" + "classname" : "org.teiid.modeshape.sequencer.vdb.VdbSequencer" }, "DDL Sequencer" : { "classname" : "org.komodo.modeshape.lib.sequencer.KDdlSequencer" diff --git a/komodo-modeshape/.classpath b/komodo-modeshape/.classpath index e794a4d9..3abf06e8 100644 --- a/komodo-modeshape/.classpath +++ b/komodo-modeshape/.classpath @@ -6,19 +6,20 @@ - + + - + + - + - diff --git a/komodo-modeshape/.project b/komodo-modeshape/.project index 1b4d0c84..4fc2eb87 100644 --- a/komodo-modeshape/.project +++ b/komodo-modeshape/.project @@ -5,11 +5,21 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder + + org.eclipse.wst.validation.validationbuilder + + + org.eclipse.m2e.core.maven2Builder @@ -19,5 +29,7 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.common.modulecore.ModuleCoreNature diff --git a/komodo-modeshape/pom.xml b/komodo-modeshape/pom.xml index eed1a390..2218fe3b 100644 --- a/komodo-modeshape/pom.xml +++ b/komodo-modeshape/pom.xml @@ -10,7 +10,7 @@ komodo-modeshape jar - + diff --git a/komodo-modeshape/src/main/java/org/komodo/modeshape/lib/sequencer/KDdlSequencer.java b/komodo-modeshape/src/main/java/org/komodo/modeshape/lib/sequencer/KDdlSequencer.java index 607a9446..cd1b8702 100644 --- a/komodo-modeshape/src/main/java/org/komodo/modeshape/lib/sequencer/KDdlSequencer.java +++ b/komodo-modeshape/src/main/java/org/komodo/modeshape/lib/sequencer/KDdlSequencer.java @@ -3,17 +3,17 @@ * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. Some portions may be licensed * to Red Hat, Inc. under one or more contributor license agreements. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA @@ -24,8 +24,6 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.util.Collections; -import java.util.List; import javax.jcr.Binary; import javax.jcr.NamespaceRegistry; import javax.jcr.Node; @@ -36,39 +34,25 @@ import org.modeshape.common.text.ParsingException; import org.modeshape.common.util.IoUtil; import org.modeshape.jcr.api.nodetype.NodeTypeManager; -import org.modeshape.sequencer.ddl.DdlParser; -import org.modeshape.sequencer.ddl.DdlSequencer; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlParser; -import org.modeshape.sequencer.ddl.node.AstNode; -import org.modeshape.sequencer.ddl.node.AstNodeFactory; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlParser; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlSequencer; +import org.teiid.modeshape.sequencer.ddl.node.AstNode; +import org.teiid.modeshape.sequencer.ddl.node.AstNodeFactory; /** - * Subclass of {@link DdlSequencer} that only allows the - * Teiid DDL dialect, avoiding confusion with other ddl - * parsers. + * Subclass of {@link TeiidDdlSequencer} that only allows the Teiid DDL dialect, avoiding confusion with other DDL parsers. */ -public class KDdlSequencer extends DdlSequencer { +public class KDdlSequencer extends TeiidDdlSequencer { - private final DdlParser teiidParser = new TeiidDdlParser(); - - @Override - public void initialize( NamespaceRegistry registry, NodeTypeManager nodeTypeManager ) throws RepositoryException, IOException { - registerNodeTypes(DdlSequencer.class.getResourceAsStream("StandardDdl.cnd"), nodeTypeManager, true); //$NON-NLS-1$ - registerNodeTypes(DdlSequencer.class.getResourceAsStream("dialect/teiid/TeiidDdl.cnd"), nodeTypeManager, true); //$NON-NLS-1$ - } - - @Override - protected List getParserList() { - return Collections.singletonList(teiidParser); - } + private final TeiidDdlParser teiidParser = new TeiidDdlParser(); @Override public boolean execute(Property inputProperty, Node outputNode, Context context) throws Exception { if (! super.execute(inputProperty, outputNode, context)) { // - // We know the sequencer failed to execute but unforunately the parsing exception + // We know the sequencer failed to execute but unfortunately the parsing exception // are handled and simply pushed to the logger. We want to throw them back up to // the calling transaction so they get some visibility // @@ -76,13 +60,19 @@ public boolean execute(Property inputProperty, Node outputNode, Context context) AstNodeFactory nodeFactory = new AstNodeFactory(); final AstNode tempNode = nodeFactory.node(StandardDdlLexicon.STATEMENTS_CONTAINER); Binary ddlContent = inputProperty.getBinary(); + InputStream stream = null; - try (InputStream stream = ddlContent.getStream()) { + try { + stream = ddlContent.getStream(); teiidParser.parse(IoUtil.read(stream), tempNode, null); } catch (ParsingException e) { throw new Exception(e); } catch (IOException e) { throw new Exception(e); + } finally { + if ( stream != null ) { + stream.close(); + } } // @@ -110,4 +100,17 @@ public boolean execute(Property inputProperty, Node outputNode, Context context) return true; } + /** + * {@inheritDoc} + * + * @see org.teiid.modeshape.sequencer.ddl.TeiidDdlSequencer#initialize(javax.jcr.NamespaceRegistry, + * org.modeshape.jcr.api.nodetype.NodeTypeManager) + */ + @Override + public void initialize( final NamespaceRegistry registry, + final NodeTypeManager nodeTypeManager ) throws RepositoryException, IOException { + registerNodeTypes( TeiidDdlSequencer.class.getResourceAsStream( "StandardDdl.cnd" ), nodeTypeManager, true ); //$NON-NLS-1$ + registerNodeTypes( TeiidDdlSequencer.class.getResourceAsStream( "TeiidDdl.cnd" ), nodeTypeManager, true ); //$NON-NLS-1$ + } + } diff --git a/komodo-parent/pom.xml b/komodo-parent/pom.xml index 6d3c2a47..7e4743d5 100644 --- a/komodo-parent/pom.xml +++ b/komodo-parent/pom.xml @@ -102,7 +102,7 @@ - 6.0.0.Final + 6.0.0.CR30 UTF-8 diff --git a/komodo-relational-commands/.classpath b/komodo-relational-commands/.classpath index fae1a2b3..534b5e52 100644 --- a/komodo-relational-commands/.classpath +++ b/komodo-relational-commands/.classpath @@ -22,7 +22,7 @@ - + diff --git a/komodo-relational-commands/pom.xml b/komodo-relational-commands/pom.xml index 7d2f2099..93c7a0ff 100644 --- a/komodo-relational-commands/pom.xml +++ b/komodo-relational-commands/pom.xml @@ -12,7 +12,7 @@ - + maven-assembly-plugin diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/RelationalCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/RelationalCommandProvider.java index c9ce33ff..361eb1ed 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/RelationalCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/RelationalCommandProvider.java @@ -36,7 +36,7 @@ public RelationalCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( FindCommand.class ); result.add( SetCustomPropertyCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/column/ColumnCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/column/ColumnCommandProvider.java index e01871d3..77e74f7a 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/column/ColumnCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/column/ColumnCommandProvider.java @@ -36,7 +36,7 @@ public ColumnCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( SetColumnPropertyCommand.class ); result.add( UnsetColumnPropertyCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/column/SetColumnPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/column/SetColumnPropertyCommand.java index bb878e21..3f05d3b9 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/column/SetColumnPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/column/SetColumnPropertyCommand.java @@ -54,182 +54,139 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case AUTO_INCREMENTED: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - column.setAutoIncremented( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, AUTO_INCREMENTED ); - } - - break; - case CASE_SENSITIVE: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - column.setCaseSensitive( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, CASE_SENSITIVE ); - } - - break; - case CHAR_OCTET_LENGTH: - try { - final long octetLength = Long.parseLong( value ); - column.setCharOctetLength( transaction, octetLength ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, CHAR_OCTET_LENGTH ); - } - - break; - case COLLATION_NAME: - column.setCollationName( transaction, value ); - break; - case CURRENCY: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - column.setCurrency( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, CURRENCY ); - } - - break; - case DATATYPE_NAME: - column.setDatatypeName( transaction, value ); - break; - case DEFAULT_VALUE: - column.setDefaultValue( transaction, value ); - break; - case DESCRIPTION: - column.setDescription( transaction, value ); - break; - case DISTINCT_VALUES: - try { - final long nValues = Long.parseLong( value ); - column.setDistinctValues( transaction, nValues ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, DISTINCT_VALUES ); - } - - break; - case FIXED_LENGTH: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - column.setFixedLength( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, FIXED_LENGTH ); - } - - break; - case LENGTH: - try { - final long length = Long.parseLong( value ); - column.setLength( transaction, length ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, LENGTH ); - } - - break; - case MAX_VALUE: - column.setMaxValue( transaction, value ); - break; - case MIN_VALUE: - column.setMinValue( transaction, value ); - break; - case NAME_IN_SOURCE: - column.setNameInSource( transaction, value ); - break; - case NATIVE_TYPE: - column.setNativeType( transaction, value ); - break; - case NULLABLE: - if ( Nullable.NO_NULLS.name().equals( value ) ) { - column.setNullable( transaction, Nullable.NO_NULLS ); - } else if ( Nullable.NULLABLE.name().equals( value ) ) { - column.setNullable( transaction, Nullable.NULLABLE ); - } else if ( Nullable.NULLABLE_UNKNOWN.name().equals( value ) ) { - column.setNullable( transaction, Nullable.NULLABLE_UNKNOWN ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidNullablePropertyValue, NULLABLE ); - } - - break; - case NULL_VALUE_COUNT: - try { - final long count = Long.parseLong( value ); - column.setNullValueCount( transaction, count ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, NULL_VALUE_COUNT ); - } - - break; - case PRECISION: - try { - final long precision = Long.parseLong( value ); - column.setPrecision( transaction, precision ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, PRECISION ); - } - - break; - case RADIX: - try { - final long radix = Long.parseLong( value ); - column.setRadix( transaction, radix ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, RADIX ); - } - - break; - case SCALE: - try { - final long scale = Long.parseLong( value ); - column.setScale( transaction, scale ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, SCALE ); - } - - break; - case SEARCHABLE: - if ( Searchable.ALL_EXCEPT_LIKE.name().equals( value ) ) { - column.setSearchable( transaction, Searchable.ALL_EXCEPT_LIKE ); - } else if ( Searchable.LIKE_ONLY.name().equals( value ) ) { - column.setSearchable( transaction, Searchable.LIKE_ONLY ); - } else if ( Searchable.SEARCHABLE.name().equals( value ) ) { - column.setSearchable( transaction, Searchable.SEARCHABLE ); - } else if ( Searchable.UNSEARCHABLE.name().equals( value ) ) { - column.setSearchable( transaction, Searchable.UNSEARCHABLE ); - } else { - errorMsg = I18n.bind( ColumnCommandsI18n.invalidSearchablePropertyValue, SEARCHABLE ); - } - - break; - case SELECTABLE: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - column.setSelectable( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, SELECTABLE ); - } - - break; - case SIGNED: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - column.setSigned( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, SIGNED ); - } - - break; - case UPDATABLE: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - column.setUpdatable( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, UPDATABLE ); - } - - break; - case UUID: - column.setUuid( transaction, value ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Column.class.getSimpleName() ); - break; + if ( AUTO_INCREMENTED.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + column.setAutoIncremented( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, AUTO_INCREMENTED ); + } + } else if ( CASE_SENSITIVE.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + column.setCaseSensitive( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, CASE_SENSITIVE ); + } + } else if ( CHAR_OCTET_LENGTH.equals( name ) ) { + try { + final long octetLength = Long.parseLong( value ); + column.setCharOctetLength( transaction, octetLength ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, CHAR_OCTET_LENGTH ); + } + } else if ( COLLATION_NAME.equals( name ) ) { + column.setCollationName( transaction, value ); + } else if ( CURRENCY.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + column.setCurrency( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, CURRENCY ); + } + } else if ( DATATYPE_NAME.equals( name ) ) { + column.setDatatypeName( transaction, value ); + } else if ( DEFAULT_VALUE.equals( name ) ) { + column.setDefaultValue( transaction, value ); + } else if ( DESCRIPTION.equals( name ) ) { + column.setDescription( transaction, value ); + } else if ( DISTINCT_VALUES.equals( name ) ) { + try { + final long nValues = Long.parseLong( value ); + column.setDistinctValues( transaction, nValues ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, DISTINCT_VALUES ); + } + } else if ( FIXED_LENGTH.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + column.setFixedLength( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, FIXED_LENGTH ); + } + } else if ( LENGTH.equals( name ) ) { + try { + final long length = Long.parseLong( value ); + column.setLength( transaction, length ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, LENGTH ); + } + } else if ( MAX_VALUE.equals( name ) ) { + column.setMaxValue( transaction, value ); + } else if ( MIN_VALUE.equals( name ) ) { + column.setMinValue( transaction, value ); + } else if ( NAME_IN_SOURCE.equals( name ) ) { + column.setNameInSource( transaction, value ); + } else if ( NATIVE_TYPE.equals( name ) ) { + column.setNativeType( transaction, value ); + } else if ( NULLABLE.equals( name ) ) { + if ( Nullable.NO_NULLS.name().equals( value ) ) { + column.setNullable( transaction, Nullable.NO_NULLS ); + } else if ( Nullable.NULLABLE.name().equals( value ) ) { + column.setNullable( transaction, Nullable.NULLABLE ); + } else if ( Nullable.NULLABLE_UNKNOWN.name().equals( value ) ) { + column.setNullable( transaction, Nullable.NULLABLE_UNKNOWN ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidNullablePropertyValue, NULLABLE ); + } + } else if ( NULL_VALUE_COUNT.equals( name ) ) { + try { + final long count = Long.parseLong( value ); + column.setNullValueCount( transaction, count ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, NULL_VALUE_COUNT ); + } + } else if ( PRECISION.equals( name ) ) { + try { + final long precision = Long.parseLong( value ); + column.setPrecision( transaction, precision ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, PRECISION ); + } + } else if ( RADIX.equals( name ) ) { + try { + final long radix = Long.parseLong( value ); + column.setRadix( transaction, radix ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, RADIX ); + } + } else if ( SCALE.equals( name ) ) { + try { + final long scale = Long.parseLong( value ); + column.setScale( transaction, scale ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, SCALE ); + } + } else if ( SEARCHABLE.equals( name ) ) { + if ( Searchable.ALL_EXCEPT_LIKE.name().equals( value ) ) { + column.setSearchable( transaction, Searchable.ALL_EXCEPT_LIKE ); + } else if ( Searchable.LIKE_ONLY.name().equals( value ) ) { + column.setSearchable( transaction, Searchable.LIKE_ONLY ); + } else if ( Searchable.SEARCHABLE.name().equals( value ) ) { + column.setSearchable( transaction, Searchable.SEARCHABLE ); + } else if ( Searchable.UNSEARCHABLE.name().equals( value ) ) { + column.setSearchable( transaction, Searchable.UNSEARCHABLE ); + } else { + errorMsg = I18n.bind( ColumnCommandsI18n.invalidSearchablePropertyValue, SEARCHABLE ); + } + } else if ( SELECTABLE.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + column.setSelectable( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, SELECTABLE ); + } + } else if ( SIGNED.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + column.setSigned( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, SIGNED ); + } + } else if ( UPDATABLE.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + column.setUpdatable( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, UPDATABLE ); + } + } else if ( UUID.equals( name ) ) { + column.setUuid( transaction, value ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Column.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/column/UnsetColumnPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/column/UnsetColumnPropertyCommand.java index b74ea9fb..25d62b39 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/column/UnsetColumnPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/column/UnsetColumnPropertyCommand.java @@ -51,89 +51,64 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case AUTO_INCREMENTED: - column.setAutoIncremented( transaction, Column.DEFAULT_AUTO_INCREMENTED ); - break; - case CASE_SENSITIVE: - column.setCaseSensitive( transaction, Column.DEFAULT_CASE_SENSITIVE ); - break; - case CHAR_OCTET_LENGTH: - column.setCharOctetLength(transaction, Column.DEFAULT_CHAR_OCTET_LENGTH); - break; - case COLLATION_NAME: - column.setCollationName( transaction, null ); - break; - case CURRENCY: - column.setCurrency( transaction, Column.DEFAULT_CURRENCY ); - break; - case DATATYPE_NAME: - column.setDatatypeName( transaction, null ); - break; - case DEFAULT_VALUE: - column.setDefaultValue( transaction, null ); - break; - case DESCRIPTION: - column.setDescription( transaction, null ); - break; - case DISTINCT_VALUES: - column.setDistinctValues( transaction, Column.DEFAULT_DISTINCT_VALUES ); - break; - case FIXED_LENGTH: - column.setFixedLength( transaction, Column.DEFAULT_FIXED_LENGTH ); - break; - case LENGTH: - column.setLength( transaction, RelationalConstants.DEFAULT_LENGTH ); - break; - case MAX_VALUE: - column.setMaxValue( transaction, null ); - break; - case MIN_VALUE: - column.setMinValue( transaction, null ); - break; - case NAME_IN_SOURCE: - column.setNameInSource( transaction, null ); - break; - case NATIVE_TYPE: - column.setNativeType( transaction, null ); - break; - case NULLABLE: - column.setNullable( transaction, null ); - break; - case NULL_VALUE_COUNT: - column.setNullValueCount( transaction, Column.DEFAULT_NULL_VALUE_COUNT ); - break; - case PRECISION: - column.setPrecision( transaction, RelationalConstants.DEFAULT_PRECISION ); - break; - case RADIX: - column.setRadix( transaction, Column.DEFAULT_RADIX ); - break; - case SCALE: - column.setScale( transaction, RelationalConstants.DEFAULT_SCALE ); - break; - case SEARCHABLE: - column.setSearchable( transaction, null ); - break; - case SELECTABLE: - column.setSelectable( transaction, Column.DEFAULT_SELECTABLE ); - break; - case SIGNED: - column.setSigned( transaction, Column.DEFAULT_SIGNED ); - break; - case UPDATABLE: - column.setUpdatable( transaction, Column.DEFAULT_UPDATABLE ); - break; - case UUID: - column.setUuid( transaction, null ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Column.class.getSimpleName() ); - break; + if ( AUTO_INCREMENTED.equals( name ) ) { + column.setAutoIncremented( transaction, Column.DEFAULT_AUTO_INCREMENTED ); + } else if ( CASE_SENSITIVE.equals( name ) ) { + column.setCaseSensitive( transaction, Column.DEFAULT_CASE_SENSITIVE ); + } else if ( CHAR_OCTET_LENGTH.equals( name ) ) { + column.setCharOctetLength( transaction, Column.DEFAULT_CHAR_OCTET_LENGTH ); + } else if ( COLLATION_NAME.equals( name ) ) { + column.setCollationName( transaction, null ); + } else if ( CURRENCY.equals( name ) ) { + column.setCurrency( transaction, Column.DEFAULT_CURRENCY ); + } else if ( DATATYPE_NAME.equals( name ) ) { + column.setDatatypeName( transaction, null ); + } else if ( DEFAULT_VALUE.equals( name ) ) { + column.setDefaultValue( transaction, null ); + } else if ( DESCRIPTION.equals( name ) ) { + column.setDescription( transaction, null ); + } else if ( DISTINCT_VALUES.equals( name ) ) { + column.setDistinctValues( transaction, Column.DEFAULT_DISTINCT_VALUES ); + } else if ( FIXED_LENGTH.equals( name ) ) { + column.setFixedLength( transaction, Column.DEFAULT_FIXED_LENGTH ); + } else if ( LENGTH.equals( name ) ) { + column.setLength( transaction, RelationalConstants.DEFAULT_LENGTH ); + } else if ( MAX_VALUE.equals( name ) ) { + column.setMaxValue( transaction, null ); + } else if ( MIN_VALUE.equals( name ) ) { + column.setMinValue( transaction, null ); + } else if ( NAME_IN_SOURCE.equals( name ) ) { + column.setNameInSource( transaction, null ); + } else if ( NATIVE_TYPE.equals( name ) ) { + column.setNativeType( transaction, null ); + } else if ( NULLABLE.equals( name ) ) { + column.setNullable( transaction, null ); + } else if ( NULL_VALUE_COUNT.equals( name ) ) { + column.setNullValueCount( transaction, Column.DEFAULT_NULL_VALUE_COUNT ); + } else if ( PRECISION.equals( name ) ) { + column.setPrecision( transaction, RelationalConstants.DEFAULT_PRECISION ); + } else if ( RADIX.equals( name ) ) { + column.setRadix( transaction, Column.DEFAULT_RADIX ); + } else if ( SCALE.equals( name ) ) { + column.setScale( transaction, RelationalConstants.DEFAULT_SCALE ); + } else if ( SEARCHABLE.equals( name ) ) { + column.setSearchable( transaction, null ); + } else if ( SELECTABLE.equals( name ) ) { + column.setSelectable( transaction, Column.DEFAULT_SELECTABLE ); + } else if ( SIGNED.equals( name ) ) { + column.setSigned( transaction, Column.DEFAULT_SIGNED ); + } else if ( UPDATABLE.equals( name ) ) { + column.setUpdatable( transaction, Column.DEFAULT_UPDATABLE ); + } else if ( UUID.equals( name ) ) { + column.setUuid( transaction, null ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Column.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { - result = new CommandResultImpl( I18n.bind( WorkspaceCommandsI18n.unsetPropertySuccess, column.getName( transaction ), name ) ); + result = new CommandResultImpl( I18n.bind( WorkspaceCommandsI18n.unsetPropertySuccess, + column.getName( transaction ), + name ) ); } else { result = new CommandResultImpl( false, errorMsg, null ); } diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/condition/ConditionCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/condition/ConditionCommandProvider.java index 1ac9656b..4b2c44be 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/condition/ConditionCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/condition/ConditionCommandProvider.java @@ -36,7 +36,7 @@ public ConditionCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( SetConditionPropertyCommand.class ); result.add( UnsetConditionPropertyCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/condition/SetConditionPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/condition/SetConditionPropertyCommand.java index ca1c2496..c0092b2d 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/condition/SetConditionPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/condition/SetConditionPropertyCommand.java @@ -52,18 +52,14 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case CONSTRAINT: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - condition.setConstraint( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, CONSTRAINT ); - } - - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Condition.class.getSimpleName() ); - break; + if ( CONSTRAINT.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + condition.setConstraint( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, CONSTRAINT ); + } + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Condition.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/condition/UnsetConditionPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/condition/UnsetConditionPropertyCommand.java index 279a4893..011918ca 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/condition/UnsetConditionPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/condition/UnsetConditionPropertyCommand.java @@ -50,13 +50,10 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case CONSTRAINT: - condition.setConstraint( transaction, Condition.DEFAULT_CONSTRAINT ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Condition.class.getSimpleName() ); - break; + if ( CONSTRAINT.equals( name ) ) { + condition.setConstraint( transaction, Condition.DEFAULT_CONSTRAINT ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Condition.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datarole/DataRoleCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datarole/DataRoleCommandProvider.java index 871bf2bc..0b669c35 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datarole/DataRoleCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datarole/DataRoleCommandProvider.java @@ -37,7 +37,7 @@ public DataRoleCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( AddMappedRoleCommand.class ); result.add( AddPermissionCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datarole/SetDataRolePropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datarole/SetDataRolePropertyCommand.java index c304f90a..92897ad8 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datarole/SetDataRolePropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datarole/SetDataRolePropertyCommand.java @@ -52,37 +52,28 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case ALLOWED_CREATE_TEMPORARY_TABLES: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - dataRole.setAllowCreateTempTables( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOWED_CREATE_TEMPORARY_TABLES ); - } - - break; - case ANY_AUTHENTICATED: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - dataRole.setAnyAuthenticated( transaction, Boolean.parseBoolean( value ) ); - } else { - I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ANY_AUTHENTICATED ); - } - - break; - case DESCRIPTION: - dataRole.setDescription( transaction, value ); - break; - case GRANT_ALL: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - dataRole.setGrantAll( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, GRANT_ALL ); - } - - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, DataRole.class.getSimpleName() ); - break; + if ( ALLOWED_CREATE_TEMPORARY_TABLES.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + dataRole.setAllowCreateTempTables( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOWED_CREATE_TEMPORARY_TABLES ); + } + } else if ( ANY_AUTHENTICATED.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + dataRole.setAnyAuthenticated( transaction, Boolean.parseBoolean( value ) ); + } else { + I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ANY_AUTHENTICATED ); + } + } else if ( DESCRIPTION.equals( name ) ) { + dataRole.setDescription( transaction, value ); + } else if ( GRANT_ALL.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + dataRole.setGrantAll( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, GRANT_ALL ); + } + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, DataRole.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datarole/UnsetDataRolePropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datarole/UnsetDataRolePropertyCommand.java index 3e88684e..6006b568 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datarole/UnsetDataRolePropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datarole/UnsetDataRolePropertyCommand.java @@ -50,22 +50,16 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case ALLOWED_CREATE_TEMPORARY_TABLES: - dataRole.setAllowCreateTempTables( transaction, DataRole.DEFAULT_ALLOW_CREATE_TEMP_TABLES ); - break; - case ANY_AUTHENTICATED: - dataRole.setAnyAuthenticated( transaction, DataRole.DEFAULT_ANY_AUTHENTICATED ); - break; - case DESCRIPTION: - dataRole.setDescription( transaction, null ); - break; - case GRANT_ALL: - dataRole.setGrantAll( transaction, DataRole.DEFAULT_GRANT_ALL ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, DataRole.class.getSimpleName() ); - break; + if ( ALLOWED_CREATE_TEMPORARY_TABLES.equals( name ) ) { + dataRole.setAllowCreateTempTables( transaction, DataRole.DEFAULT_ALLOW_CREATE_TEMP_TABLES ); + } else if ( ANY_AUTHENTICATED.equals( name ) ) { + dataRole.setAnyAuthenticated( transaction, DataRole.DEFAULT_ANY_AUTHENTICATED ); + } else if ( DESCRIPTION.equals( name ) ) { + dataRole.setDescription( transaction, null ); + } else if ( GRANT_ALL.equals( name ) ) { + dataRole.setGrantAll( transaction, DataRole.DEFAULT_GRANT_ALL ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, DataRole.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datasource/DatasourceCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datasource/DatasourceCommandProvider.java index d3f68056..68524c0b 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datasource/DatasourceCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datasource/DatasourceCommandProvider.java @@ -36,7 +36,7 @@ public DatasourceCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( SetDatasourcePropertyCommand.class ); result.add( UnsetDatasourcePropertyCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datasource/SetDatasourcePropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datasource/SetDatasourcePropertyCommand.java index 5b541704..466899a8 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datasource/SetDatasourcePropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datasource/SetDatasourcePropertyCommand.java @@ -52,38 +52,28 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case JNDI_NAME: - datasource.setJndiName( transaction, value ); - break; - case DRIVER_NAME: - datasource.setDriverName( transaction, value ); - break; - case CLASS_NAME: - datasource.setClassName( transaction, value ); - break; - case PROFILE_NAME: - datasource.setProfileName( transaction, value ); - break; - case JDBC: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - datasource.setJdbc( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, JDBC ); - } - - break; - case PREVIEW: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - datasource.setPreview( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, PREVIEW ); - } - - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Datasource.class.getSimpleName() ); - break; + if ( JNDI_NAME.equals( name ) ) { + datasource.setJndiName( transaction, value ); + } else if ( DRIVER_NAME.equals( name ) ) { + datasource.setDriverName( transaction, value ); + } else if ( CLASS_NAME.equals( name ) ) { + datasource.setClassName( transaction, value ); + } else if ( PROFILE_NAME.equals( name ) ) { + datasource.setProfileName( transaction, value ); + } else if ( JDBC.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + datasource.setJdbc( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, JDBC ); + } + } else if ( PREVIEW.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + datasource.setPreview( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, PREVIEW ); + } + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Datasource.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datasource/UnsetDatasourcePropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datasource/UnsetDatasourcePropertyCommand.java index 9d081204..208009f4 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datasource/UnsetDatasourcePropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datasource/UnsetDatasourcePropertyCommand.java @@ -51,28 +51,20 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case JNDI_NAME: - datasource.setJndiName( transaction, null ); - break; - case DRIVER_NAME: - datasource.setDriverName( transaction, null ); - break; - case CLASS_NAME: - datasource.setDriverName( transaction, null ); - break; - case PROFILE_NAME: - datasource.setProfileName( transaction, null ); - break; - case JDBC: - datasource.setJdbc( transaction, Datasource.DEFAULT_JDBC ); - break; - case PREVIEW: - datasource.setPreview( transaction, Datasource.DEFAULT_PREVIEW ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Datasource.class.getSimpleName() ); - break; + if ( JNDI_NAME.equals( name ) ) { + datasource.setJndiName( transaction, null ); + } else if ( DRIVER_NAME.equals( name ) ) { + datasource.setDriverName( transaction, null ); + } else if ( CLASS_NAME.equals( name ) ) { + datasource.setDriverName( transaction, null ); + } else if ( PROFILE_NAME.equals( name ) ) { + datasource.setProfileName( transaction, null ); + } else if ( JDBC.equals( name ) ) { + datasource.setJdbc( transaction, Datasource.DEFAULT_JDBC ); + } else if ( PREVIEW.equals( name ) ) { + datasource.setPreview( transaction, Datasource.DEFAULT_PREVIEW ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Datasource.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datatyperesultset/DataTypeResultSetCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datatyperesultset/DataTypeResultSetCommandProvider.java index 0aa3d6bd..7dc0f2e2 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datatyperesultset/DataTypeResultSetCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datatyperesultset/DataTypeResultSetCommandProvider.java @@ -36,7 +36,7 @@ public DataTypeResultSetCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( SetDataTypeResultSetPropertyCommand.class ); result.add( UnsetDataTypeResultSetPropertyCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datatyperesultset/SetDataTypeResultSetPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datatyperesultset/SetDataTypeResultSetPropertyCommand.java index 1d751bd6..aaf85908 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datatyperesultset/SetDataTypeResultSetPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datatyperesultset/SetDataTypeResultSetPropertyCommand.java @@ -54,129 +54,112 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case DATATYPE_NAME: { - if ( DataTypeResultSet.Type.BIGDECIMAL.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.BIGDECIMAL ); - } else if ( DataTypeResultSet.Type.BIGINT.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.BIGINT ); - } else if ( DataTypeResultSet.Type.BIGINTEGER.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.BIGINTEGER ); - } else if ( DataTypeResultSet.Type.BLOB.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.BLOB ); - } else if ( DataTypeResultSet.Type.BOOLEAN.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.BOOLEAN ); - } else if ( DataTypeResultSet.Type.BYTE.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.BYTE ); - } else if ( DataTypeResultSet.Type.CHAR.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.CHAR ); - } else if ( DataTypeResultSet.Type.CLOB.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.CLOB ); - } else if ( DataTypeResultSet.Type.DATE.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.DATE ); - } else if ( DataTypeResultSet.Type.DECIMAL.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.DECIMAL ); - } else if ( DataTypeResultSet.Type.DEFAULT_VALUE.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.DEFAULT_VALUE ); - } else if ( DataTypeResultSet.Type.DOUBLE.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.DOUBLE ); - } else if ( DataTypeResultSet.Type.FLOAT.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.FLOAT ); - } else if ( DataTypeResultSet.Type.INTEGER.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.INTEGER ); - } else if ( DataTypeResultSet.Type.LONG.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.LONG ); - } else if ( DataTypeResultSet.Type.OBJECT.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.OBJECT ); - } else if ( DataTypeResultSet.Type.REAL.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.REAL ); - } else if ( DataTypeResultSet.Type.SHORT.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.SHORT ); - } else if ( DataTypeResultSet.Type.SMALLINT.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.SMALLINT ); - } else if ( DataTypeResultSet.Type.STRING.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.STRING ); - } else if ( DataTypeResultSet.Type.TIME.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.TIME ); - } else if ( DataTypeResultSet.Type.TIMESTAMP.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.TIMESTAMP ); - } else if ( DataTypeResultSet.Type.TINYINT.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.TINYINT ); - } else if ( DataTypeResultSet.Type.VARBINARY.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.VARBINARY ); - } else if ( DataTypeResultSet.Type.VARCHAR.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.VARCHAR ); - } else if ( DataTypeResultSet.Type.XML.name().equals( value ) ) { - rs.setType( transaction, DataTypeResultSet.Type.XML ); - } else { - errorMsg = I18n.bind( DataTypeResultSetCommandsI18n.invalidDataTypeName, DATATYPE_NAME ); - } - - // check to see if needs to be an array type - if ( StringUtils.isBlank( errorMsg ) ) { - final String arrayArg = optionalArgument( 2, Boolean.FALSE.toString() ); - - if ( KomodoObjectUtils.TRUE_STRING.equals( arrayArg ) - || KomodoObjectUtils.FALSE_STRING.equals( arrayArg ) ) { - rs.setArray( transaction, Boolean.parseBoolean( arrayArg ) ); - } else { - errorMsg = I18n.bind( DataTypeResultSetCommandsI18n.invalidDataTypeArrayIndicator ); - } - } - - break; + if ( DATATYPE_NAME.equals( name ) ) { + if ( DataTypeResultSet.Type.BIGDECIMAL.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.BIGDECIMAL ); + } else if ( DataTypeResultSet.Type.BIGINT.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.BIGINT ); + } else if ( DataTypeResultSet.Type.BIGINTEGER.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.BIGINTEGER ); + } else if ( DataTypeResultSet.Type.BLOB.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.BLOB ); + } else if ( DataTypeResultSet.Type.BOOLEAN.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.BOOLEAN ); + } else if ( DataTypeResultSet.Type.BYTE.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.BYTE ); + } else if ( DataTypeResultSet.Type.CHAR.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.CHAR ); + } else if ( DataTypeResultSet.Type.CLOB.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.CLOB ); + } else if ( DataTypeResultSet.Type.DATE.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.DATE ); + } else if ( DataTypeResultSet.Type.DECIMAL.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.DECIMAL ); + } else if ( DataTypeResultSet.Type.DEFAULT_VALUE.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.DEFAULT_VALUE ); + } else if ( DataTypeResultSet.Type.DOUBLE.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.DOUBLE ); + } else if ( DataTypeResultSet.Type.FLOAT.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.FLOAT ); + } else if ( DataTypeResultSet.Type.INTEGER.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.INTEGER ); + } else if ( DataTypeResultSet.Type.LONG.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.LONG ); + } else if ( DataTypeResultSet.Type.OBJECT.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.OBJECT ); + } else if ( DataTypeResultSet.Type.REAL.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.REAL ); + } else if ( DataTypeResultSet.Type.SHORT.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.SHORT ); + } else if ( DataTypeResultSet.Type.SMALLINT.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.SMALLINT ); + } else if ( DataTypeResultSet.Type.STRING.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.STRING ); + } else if ( DataTypeResultSet.Type.TIME.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.TIME ); + } else if ( DataTypeResultSet.Type.TIMESTAMP.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.TIMESTAMP ); + } else if ( DataTypeResultSet.Type.TINYINT.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.TINYINT ); + } else if ( DataTypeResultSet.Type.VARBINARY.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.VARBINARY ); + } else if ( DataTypeResultSet.Type.VARCHAR.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.VARCHAR ); + } else if ( DataTypeResultSet.Type.XML.name().equals( value ) ) { + rs.setType( transaction, DataTypeResultSet.Type.XML ); + } else { + errorMsg = I18n.bind( DataTypeResultSetCommandsI18n.invalidDataTypeName, DATATYPE_NAME ); } - case DESCRIPTION: - rs.setDescription( transaction, value ); - break; - case LENGTH: - try { - final long length = Long.parseLong( value ); - rs.setLength( transaction, length ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, LENGTH ); - } - break; - case NAME_IN_SOURCE: - rs.setNameInSource( transaction, value ); - break; - case NULLABLE: - if ( Nullable.NO_NULLS.name().equals( value ) ) { - rs.setNullable( transaction, Nullable.NO_NULLS ); - } else if ( Nullable.NULLABLE.name().equals( value ) ) { - rs.setNullable( transaction, Nullable.NULLABLE ); - } else if ( Nullable.NULLABLE_UNKNOWN.name().equals( value ) ) { - rs.setNullable( transaction, Nullable.NULLABLE_UNKNOWN ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidNullablePropertyValue, NULLABLE ); - } + // check to see if needs to be an array type + if ( StringUtils.isBlank( errorMsg ) ) { + final String arrayArg = optionalArgument( 2, Boolean.FALSE.toString() ); - break; - case PRECISION: - try { - final long precision = Long.parseLong( value ); - rs.setPrecision( transaction, precision ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, PRECISION ); - } - - break; - case SCALE: - try { - final long scale = Long.parseLong( value ); - rs.setScale( transaction, scale ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, SCALE ); + if ( KomodoObjectUtils.TRUE_STRING.equals( arrayArg ) || KomodoObjectUtils.FALSE_STRING.equals( arrayArg ) ) { + rs.setArray( transaction, Boolean.parseBoolean( arrayArg ) ); + } else { + errorMsg = I18n.bind( DataTypeResultSetCommandsI18n.invalidDataTypeArrayIndicator ); } - - break; - case UUID: - rs.setUuid( transaction, value ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, DataTypeResultSet.class.getSimpleName() ); - break; + } + } else if ( DESCRIPTION.equals( name ) ) { + rs.setDescription( transaction, value ); + } else if ( LENGTH.equals( name ) ) { + try { + final long length = Long.parseLong( value ); + rs.setLength( transaction, length ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, LENGTH ); + } + } else if ( NAME_IN_SOURCE.equals( name ) ) { + rs.setNameInSource( transaction, value ); + } else if ( NULLABLE.equals( name ) ) { + if ( Nullable.NO_NULLS.name().equals( value ) ) { + rs.setNullable( transaction, Nullable.NO_NULLS ); + } else if ( Nullable.NULLABLE.name().equals( value ) ) { + rs.setNullable( transaction, Nullable.NULLABLE ); + } else if ( Nullable.NULLABLE_UNKNOWN.name().equals( value ) ) { + rs.setNullable( transaction, Nullable.NULLABLE_UNKNOWN ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidNullablePropertyValue, NULLABLE ); + } + } else if ( PRECISION.equals( name ) ) { + try { + final long precision = Long.parseLong( value ); + rs.setPrecision( transaction, precision ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, PRECISION ); + } + } else if ( SCALE.equals( name ) ) { + try { + final long scale = Long.parseLong( value ); + rs.setScale( transaction, scale ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, SCALE ); + } + } else if ( UUID.equals( name ) ) { + rs.setUuid( transaction, value ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, DataTypeResultSet.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datatyperesultset/UnsetDataTypeResultSetPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datatyperesultset/UnsetDataTypeResultSetPropertyCommand.java index a315562b..7cb48683 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datatyperesultset/UnsetDataTypeResultSetPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/datatyperesultset/UnsetDataTypeResultSetPropertyCommand.java @@ -52,34 +52,24 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case DATATYPE_NAME: - rs.setType( transaction, null ); - break; - case DESCRIPTION: - rs.setDescription( transaction, null ); - break; - case LENGTH: - rs.setLength( transaction, RelationalConstants.DEFAULT_LENGTH ); - break; - case NAME_IN_SOURCE: - rs.setNameInSource( transaction, null ); - break; - case NULLABLE: - rs.setNullable( transaction, null ); - break; - case PRECISION: - rs.setPrecision( transaction, RelationalConstants.DEFAULT_PRECISION ); - break; - case SCALE: - rs.setScale( transaction, RelationalConstants.DEFAULT_SCALE ); - break; - case UUID: - rs.setUuid( transaction, null ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, DataTypeResultSet.class.getSimpleName() ); - break; + if ( DATATYPE_NAME.equals( name ) ) { + rs.setType( transaction, null ); + } else if ( DESCRIPTION.equals( name ) ) { + rs.setDescription( transaction, null ); + } else if ( LENGTH.equals( name ) ) { + rs.setLength( transaction, RelationalConstants.DEFAULT_LENGTH ); + } else if ( NAME_IN_SOURCE.equals( name ) ) { + rs.setNameInSource( transaction, null ); + } else if ( NULLABLE.equals( name ) ) { + rs.setNullable( transaction, null ); + } else if ( PRECISION.equals( name ) ) { + rs.setPrecision( transaction, RelationalConstants.DEFAULT_PRECISION ); + } else if ( SCALE.equals( name ) ) { + rs.setScale( transaction, RelationalConstants.DEFAULT_SCALE ); + } else if ( UUID.equals( name ) ) { + rs.setUuid( transaction, null ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, DataTypeResultSet.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/entry/EntryCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/entry/EntryCommandProvider.java index d19ad7f7..bea07813 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/entry/EntryCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/entry/EntryCommandProvider.java @@ -36,7 +36,7 @@ public EntryCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( SetEntryPropertyCommand.class ); result.add( UnsetEntryPropertyCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/entry/SetEntryPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/entry/SetEntryPropertyCommand.java index 51b6db2f..c36a47b8 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/entry/SetEntryPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/entry/SetEntryPropertyCommand.java @@ -52,16 +52,12 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case DESCRIPTION: - entry.setDescription( transaction, value ); - break; - case PATH: - entry.setPath( transaction, value ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Entry.class.getSimpleName() ); - break; + if ( DESCRIPTION.equals( name ) ) { + entry.setDescription( transaction, value ); + } else if ( PATH.equals( name ) ) { + entry.setPath( transaction, value ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Entry.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/entry/UnsetEntryPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/entry/UnsetEntryPropertyCommand.java index 4fa67b68..f5593a17 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/entry/UnsetEntryPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/entry/UnsetEntryPropertyCommand.java @@ -50,16 +50,12 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case DESCRIPTION: - entry.setDescription( transaction, null ); - break; - case PATH: - entry.setPath( transaction, null ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Entry.class.getSimpleName() ); - break; + if ( DESCRIPTION.equals( name ) ) { + entry.setDescription( transaction, null ); + } else if ( PATH.equals( name ) ) { + entry.setPath( transaction, null ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Entry.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/foreignkey/ForeignKeyCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/foreignkey/ForeignKeyCommandProvider.java index f6e08f06..f4523987 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/foreignkey/ForeignKeyCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/foreignkey/ForeignKeyCommandProvider.java @@ -36,7 +36,7 @@ public ForeignKeyCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( AddReferenceColumnCommand.class ); result.add( DeleteReferenceColumnCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/index/IndexCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/index/IndexCommandProvider.java index b2d5279d..5c4b04ed 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/index/IndexCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/index/IndexCommandProvider.java @@ -36,7 +36,7 @@ public IndexCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( SetIndexPropertyCommand.class ); result.add( UnsetIndexPropertyCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/index/SetIndexPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/index/SetIndexPropertyCommand.java index 96ada78f..b0c70388 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/index/SetIndexPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/index/SetIndexPropertyCommand.java @@ -50,13 +50,10 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case EXPRESSION: - index.setExpression( transaction, null ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Index.class.getSimpleName() ); - break; + if ( EXPRESSION.equals( name ) ) { + index.setExpression( transaction, null ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Index.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/index/UnsetIndexPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/index/UnsetIndexPropertyCommand.java index aab7e833..f228f510 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/index/UnsetIndexPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/index/UnsetIndexPropertyCommand.java @@ -13,8 +13,8 @@ import org.komodo.shell.CommandResultImpl; import org.komodo.shell.api.Arguments; import org.komodo.shell.api.CommandResult; -import org.komodo.shell.api.TabCompletionModifier; import org.komodo.shell.api.ShellCommand; +import org.komodo.shell.api.TabCompletionModifier; import org.komodo.shell.api.WorkspaceStatus; import org.komodo.shell.commands.UnsetPropertyCommand; import org.komodo.spi.repository.Repository.UnitOfWork; @@ -52,13 +52,10 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case EXPRESSION: - index.setExpression( transaction, null ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Index.class.getSimpleName() ); - break; + if ( EXPRESSION.equals( name ) ) { + index.setExpression( transaction, null ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Index.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/mask/MaskCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/mask/MaskCommandProvider.java index e94df7c0..09a6f54d 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/mask/MaskCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/mask/MaskCommandProvider.java @@ -36,7 +36,7 @@ public MaskCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( SetMaskPropertyCommand.class ); result.add( UnsetMaskPropertyCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/mask/SetMaskPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/mask/SetMaskPropertyCommand.java index f5bad925..6d321a69 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/mask/SetMaskPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/mask/SetMaskPropertyCommand.java @@ -52,13 +52,10 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case ORDER: - mask.setOrder( transaction, value ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Mask.class.getSimpleName() ); - break; + if ( ORDER.equals( name ) ) { + mask.setOrder( transaction, value ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Mask.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/mask/UnsetMaskPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/mask/UnsetMaskPropertyCommand.java index 3dee6e01..dbd8243d 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/mask/UnsetMaskPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/mask/UnsetMaskPropertyCommand.java @@ -51,13 +51,10 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case ORDER: - mask.setOrder( transaction, null ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Mask.class.getSimpleName() ); - break; + if ( ORDER.equals( name ) ) { + mask.setOrder( transaction, null ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Mask.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ExportCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ExportCommand.java index 0a47e152..e6de0b39 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ExportCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ExportCommand.java @@ -66,7 +66,10 @@ protected CommandResult doExecute() { } // write file - try ( final FileWriter recordingFileWriter = new FileWriter( fileName, false ) ) { + FileWriter recordingFileWriter = null; + + try { + recordingFileWriter = new FileWriter( fileName, false ); recordingFileWriter.write( ddl ); recordingFileWriter.flush(); return new CommandResultImpl( I18n.bind( ModelCommandsI18n.ddlExported, @@ -75,6 +78,10 @@ protected CommandResult doExecute() { override ) ); } catch ( final Exception e ) { return new CommandResultImpl( false, I18n.bind( WorkspaceCommandsI18n.errorWritingFile, fileName ), e ); + } finally { + if ( recordingFileWriter != null ) { + recordingFileWriter.close(); + } } } diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ModelCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ModelCommandProvider.java index eb5164b8..3c446fbe 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ModelCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ModelCommandProvider.java @@ -36,7 +36,7 @@ public ModelCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( AddPushdownFunctionCommand.class ); result.add( AddSourceCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/SetModelPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/SetModelPropertyCommand.java index 5d78aa08..d77810d4 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/SetModelPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/SetModelPropertyCommand.java @@ -52,33 +52,26 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case DESCRIPTION: - model.setDescription( transaction, value ); - break; - case METADATA_TYPE: - model.setMetadataType( transaction, value ); - break; - case MODEL_TYPE: - if ( Model.Type.PHYSICAL.name().equals( value ) ) { - model.setModelType( transaction, Model.Type.PHYSICAL ); - } else if ( Model.Type.VIRTUAL.name().equals( value ) ) { - model.setModelType( transaction, Model.Type.VIRTUAL ); - } else { - errorMsg = I18n.bind( ModelCommandsI18n.invalidModelTypePropertyValue, VISIBLE ); - } - break; - case VISIBLE: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - model.setVisible( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, VISIBLE ); - } - - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Model.class.getSimpleName() ); - break; + if ( DESCRIPTION.equals( name ) ) { + model.setDescription( transaction, value ); + } else if ( METADATA_TYPE.equals( name ) ) { + model.setMetadataType( transaction, value ); + } else if ( MODEL_TYPE.equals( name ) ) { + if ( Model.Type.PHYSICAL.name().equals( value ) ) { + model.setModelType( transaction, Model.Type.PHYSICAL ); + } else if ( Model.Type.VIRTUAL.name().equals( value ) ) { + model.setModelType( transaction, Model.Type.VIRTUAL ); + } else { + errorMsg = I18n.bind( ModelCommandsI18n.invalidModelTypePropertyValue, VISIBLE ); + } + } else if ( VISIBLE.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + model.setVisible( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, VISIBLE ); + } + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Model.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ShowPushdownFunctionsCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ShowPushdownFunctionsCommand.java index 7939917f..c19b9b20 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ShowPushdownFunctionsCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ShowPushdownFunctionsCommand.java @@ -8,10 +8,8 @@ package org.komodo.relational.commands.model; import static org.komodo.shell.CompletionConstants.MESSAGE_INDENT; - import java.util.ArrayList; import java.util.List; - import org.komodo.relational.commands.workspace.WorkspaceCommandsI18n; import org.komodo.relational.model.Function; import org.komodo.relational.model.Model; @@ -58,7 +56,7 @@ protected CommandResult doExecute() { I18n.bind( ModelCommandsI18n.noPushdownFunctions, model.getName( getTransaction() ) ) ); } } else { - final List< Function > pushdowns = new ArrayList< >( functions.length ); + final List< Function > pushdowns = new ArrayList< Function >( functions.length ); for ( final Function function : functions ) { if ( PushdownFunction.RESOLVER.resolvable( getTransaction(), function ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ShowStoredProceduresCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ShowStoredProceduresCommand.java index 93f977dd..5f14fda6 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ShowStoredProceduresCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ShowStoredProceduresCommand.java @@ -8,10 +8,8 @@ package org.komodo.relational.commands.model; import static org.komodo.shell.CompletionConstants.MESSAGE_INDENT; - import java.util.ArrayList; import java.util.List; - import org.komodo.relational.commands.workspace.WorkspaceCommandsI18n; import org.komodo.relational.model.Model; import org.komodo.relational.model.Procedure; @@ -57,7 +55,7 @@ protected CommandResult doExecute() { print( MESSAGE_INDENT, I18n.bind( ModelCommandsI18n.noStoredProcedures, model.getName( getTransaction() ) ) ); } } else { - final List< Procedure > storedProcedures = new ArrayList< >( procedures.length ); + final List< Procedure > storedProcedures = new ArrayList< Procedure >( procedures.length ); for ( final Procedure procedure : procedures ) { if ( StoredProcedure.RESOLVER.resolvable( getTransaction(), procedure ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ShowUserDefinedFunctionsCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ShowUserDefinedFunctionsCommand.java index c170297e..1e1b9dda 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ShowUserDefinedFunctionsCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ShowUserDefinedFunctionsCommand.java @@ -8,10 +8,8 @@ package org.komodo.relational.commands.model; import static org.komodo.shell.CompletionConstants.MESSAGE_INDENT; - import java.util.ArrayList; import java.util.List; - import org.komodo.relational.commands.workspace.WorkspaceCommandsI18n; import org.komodo.relational.model.Function; import org.komodo.relational.model.Model; @@ -58,7 +56,7 @@ protected CommandResult doExecute() { I18n.bind( ModelCommandsI18n.noUserDefinedFunctions, model.getName( getTransaction() ) ) ); } } else { - final List< Function > udfs = new ArrayList< >( functions.length ); + final List< Function > udfs = new ArrayList< Function >( functions.length ); for ( final Function function : functions ) { if ( UserDefinedFunction.RESOLVER.resolvable( getTransaction(), function ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ShowVirtualProceduresCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ShowVirtualProceduresCommand.java index f88a9a3a..4cd85f08 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ShowVirtualProceduresCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/ShowVirtualProceduresCommand.java @@ -8,10 +8,8 @@ package org.komodo.relational.commands.model; import static org.komodo.shell.CompletionConstants.MESSAGE_INDENT; - import java.util.ArrayList; import java.util.List; - import org.komodo.relational.commands.workspace.WorkspaceCommandsI18n; import org.komodo.relational.model.Model; import org.komodo.relational.model.Procedure; @@ -58,7 +56,7 @@ protected CommandResult doExecute() { I18n.bind( ModelCommandsI18n.noVirtualProcedures, model.getName( getTransaction() ) ) ); } } else { - final List< Procedure > virtualProcedures = new ArrayList< >( procedures.length ); + final List< Procedure > virtualProcedures = new ArrayList< Procedure >( procedures.length ); for ( final Procedure procedure : procedures ) { if ( VirtualProcedure.RESOLVER.resolvable( getTransaction(), procedure ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/UnsetModelPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/UnsetModelPropertyCommand.java index 2eb20ff4..f6100240 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/UnsetModelPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/model/UnsetModelPropertyCommand.java @@ -51,22 +51,16 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case DESCRIPTION: - model.setDescription( transaction, null ); - break; - case METADATA_TYPE: - model.setMetadataType( transaction, null ); - break; - case MODEL_TYPE: - model.setModelType( transaction, null ); - break; - case VISIBLE: - model.setVisible( transaction, Model.DEFAULT_VISIBLE ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Model.class.getSimpleName() ); - break; + if ( DESCRIPTION.equals( name ) ) { + model.setDescription( transaction, null ); + } else if ( METADATA_TYPE.equals( name ) ) { + model.setMetadataType( transaction, null ); + } else if ( MODEL_TYPE.equals( name ) ) { + model.setModelType( transaction, null ); + } else if ( VISIBLE.equals( name ) ) { + model.setVisible( transaction, Model.DEFAULT_VISIBLE ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Model.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/modelsource/ModelSourceCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/modelsource/ModelSourceCommandProvider.java index 21aad091..b149f703 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/modelsource/ModelSourceCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/modelsource/ModelSourceCommandProvider.java @@ -36,7 +36,7 @@ public ModelSourceCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( SetModelSourcePropertyCommand.class ); result.add( UnsetModelSourcePropertyCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/modelsource/SetModelSourcePropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/modelsource/SetModelSourcePropertyCommand.java index 02d19841..7a57d401 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/modelsource/SetModelSourcePropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/modelsource/SetModelSourcePropertyCommand.java @@ -52,16 +52,12 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case JNDI_NAME: - source.setJndiName( transaction, value ); - break; - case TRANSLATOR_NAME: - source.setTranslatorName( transaction, value ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, ModelSource.class.getSimpleName() ); - break; + if ( JNDI_NAME.equals( name ) ) { + source.setJndiName( transaction, value ); + } else if ( TRANSLATOR_NAME.equals( name ) ) { + source.setTranslatorName( transaction, value ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, ModelSource.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/modelsource/UnsetModelSourcePropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/modelsource/UnsetModelSourcePropertyCommand.java index cd47bcfa..09b093ee 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/modelsource/UnsetModelSourcePropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/modelsource/UnsetModelSourcePropertyCommand.java @@ -51,16 +51,12 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case JNDI_NAME: - source.setJndiName( transaction, null ); - break; - case TRANSLATOR_NAME: - source.setTranslatorName( transaction, null ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, ModelSource.class.getSimpleName() ); - break; + if ( JNDI_NAME.equals( name ) ) { + source.setJndiName( transaction, null ); + } else if ( TRANSLATOR_NAME.equals( name ) ) { + source.setTranslatorName( transaction, null ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, ModelSource.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/parameter/ParameterCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/parameter/ParameterCommandProvider.java index c5c1a010..fb8a383e 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/parameter/ParameterCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/parameter/ParameterCommandProvider.java @@ -36,7 +36,7 @@ public ParameterCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( SetParameterPropertyCommand.class ); result.add( UnsetParameterPropertyCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/parameter/SetParameterPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/parameter/SetParameterPropertyCommand.java index 50428601..66737434 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/parameter/SetParameterPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/parameter/SetParameterPropertyCommand.java @@ -54,77 +54,61 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case DATATYPE_NAME: - parameter.setDatatypeName( transaction, value ); - break; - case DEFAULT_VALUE: - parameter.setDefaultValue( transaction, value ); - break; - case DIRECTION: - if ( Direction.IN.name().equals( value ) ) { - parameter.setDirection( transaction, Direction.IN ); - } else if ( Direction.IN_OUT.name().equals( value ) ) { - parameter.setDirection( transaction, Direction.IN_OUT ); - } else if ( Direction.OUT.name().equals( value ) ) { - parameter.setDirection( transaction, Direction.OUT ); - } else if ( Direction.VARIADIC.name().equals( value ) ) { - parameter.setDirection( transaction, Direction.VARIADIC ); - } else { - errorMsg = I18n.bind( ParameterCommandsI18n.invalidDirectionPropertyValue, NULLABLE ); - } - - break; - case LENGTH: - try { - final long length = Long.parseLong( value ); - parameter.setLength( transaction, length ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, LENGTH ); - } - - break; - case NULLABLE: - if ( Nullable.NO_NULLS.name().equals( value ) ) { - parameter.setNullable( transaction, Nullable.NO_NULLS ); - } else if ( Nullable.NULLABLE.name().equals( value ) ) { - parameter.setNullable( transaction, Nullable.NULLABLE ); - } else if ( Nullable.NULLABLE_UNKNOWN.name().equals( value ) ) { - parameter.setNullable( transaction, Nullable.NULLABLE_UNKNOWN ); - } else { - errorMsg = I18n.bind( ParameterCommandsI18n.invalidNullablePropertyValue, NULLABLE ); - } - - break; - case PRECISION: - try { - final long precision = Long.parseLong( value ); - parameter.setPrecision( transaction, precision ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, PRECISION ); - } - - break; - case RESULT: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - parameter.setResult( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, RESULT ); - } - - break; - case SCALE: - try { - final long scale = Long.parseLong( value ); - parameter.setScale( transaction, scale ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, SCALE ); - } - - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Parameter.class.getSimpleName() ); - break; + if ( DATATYPE_NAME.equals( name ) ) { + parameter.setDatatypeName( transaction, value ); + } else if ( DEFAULT_VALUE.equals( name ) ) { + parameter.setDefaultValue( transaction, value ); + } else if ( DIRECTION.equals( name ) ) { + if ( Direction.IN.name().equals( value ) ) { + parameter.setDirection( transaction, Direction.IN ); + } else if ( Direction.IN_OUT.name().equals( value ) ) { + parameter.setDirection( transaction, Direction.IN_OUT ); + } else if ( Direction.OUT.name().equals( value ) ) { + parameter.setDirection( transaction, Direction.OUT ); + } else if ( Direction.VARIADIC.name().equals( value ) ) { + parameter.setDirection( transaction, Direction.VARIADIC ); + } else { + errorMsg = I18n.bind( ParameterCommandsI18n.invalidDirectionPropertyValue, NULLABLE ); + } + } else if ( LENGTH.equals( name ) ) { + try { + final long length = Long.parseLong( value ); + parameter.setLength( transaction, length ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, LENGTH ); + } + } else if ( NULLABLE.equals( name ) ) { + if ( Nullable.NO_NULLS.name().equals( value ) ) { + parameter.setNullable( transaction, Nullable.NO_NULLS ); + } else if ( Nullable.NULLABLE.name().equals( value ) ) { + parameter.setNullable( transaction, Nullable.NULLABLE ); + } else if ( Nullable.NULLABLE_UNKNOWN.name().equals( value ) ) { + parameter.setNullable( transaction, Nullable.NULLABLE_UNKNOWN ); + } else { + errorMsg = I18n.bind( ParameterCommandsI18n.invalidNullablePropertyValue, NULLABLE ); + } + } else if ( PRECISION.equals( name ) ) { + try { + final long precision = Long.parseLong( value ); + parameter.setPrecision( transaction, precision ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, PRECISION ); + } + } else if ( RESULT.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + parameter.setResult( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, RESULT ); + } + } else if ( SCALE.equals( name ) ) { + try { + final long scale = Long.parseLong( value ); + parameter.setScale( transaction, scale ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, SCALE ); + } + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Parameter.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/parameter/UnsetParameterPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/parameter/UnsetParameterPropertyCommand.java index e2858dcd..06199f24 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/parameter/UnsetParameterPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/parameter/UnsetParameterPropertyCommand.java @@ -52,34 +52,24 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case DATATYPE_NAME: - parameter.setDatatypeName( transaction, null ); - break; - case DEFAULT_VALUE: - parameter.setDefaultValue( transaction, null ); - break; - case DIRECTION: - parameter.setDirection( transaction, null ); - break; - case LENGTH: - parameter.setLength( transaction, RelationalConstants.DEFAULT_LENGTH ); - break; - case NULLABLE: - parameter.setNullable( transaction, null ); - break; - case PRECISION: - parameter.setPrecision( transaction, RelationalConstants.DEFAULT_PRECISION ); - break; - case RESULT: - parameter.setResult( transaction, Parameter.DEFAULT_RESULT ); - break; - case SCALE: - parameter.setScale( transaction, RelationalConstants.DEFAULT_SCALE ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Parameter.class.getSimpleName() ); - break; + if ( DATATYPE_NAME.equals( name ) ) { + parameter.setDatatypeName( transaction, null ); + } else if ( DEFAULT_VALUE.equals( name ) ) { + parameter.setDefaultValue( transaction, null ); + } else if ( DIRECTION.equals( name ) ) { + parameter.setDirection( transaction, null ); + } else if ( LENGTH.equals( name ) ) { + parameter.setLength( transaction, RelationalConstants.DEFAULT_LENGTH ); + } else if ( NULLABLE.equals( name ) ) { + parameter.setNullable( transaction, null ); + } else if ( PRECISION.equals( name ) ) { + parameter.setPrecision( transaction, RelationalConstants.DEFAULT_PRECISION ); + } else if ( RESULT.equals( name ) ) { + parameter.setResult( transaction, Parameter.DEFAULT_RESULT ); + } else if ( SCALE.equals( name ) ) { + parameter.setScale( transaction, RelationalConstants.DEFAULT_SCALE ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Parameter.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/permission/PermissionCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/permission/PermissionCommandProvider.java index 9868f9ce..b33ad237 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/permission/PermissionCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/permission/PermissionCommandProvider.java @@ -36,7 +36,7 @@ public PermissionCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( AddConditionCommand.class ); result.add( AddMaskCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/permission/SetPermissionPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/permission/SetPermissionPropertyCommand.java index a76c604a..9671c1f1 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/permission/SetPermissionPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/permission/SetPermissionPropertyCommand.java @@ -53,66 +53,50 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case ALLOW_ALTER: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - permission.setAllowAlter( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOW_ALTER ); - } - - break; - case ALLOW_CREATE: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - permission.setAllowAlter( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOW_CREATE ); - } - - break; - case ALLOW_DELETE: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - permission.setAllowAlter( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOW_DELETE ); - } - - break; - case ALLOW_EXECUTE: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - permission.setAllowAlter( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOW_EXECUTE ); - } - - break; - case ALLOW_LANGUAGE: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - permission.setAllowAlter( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOW_LANGUAGE ); - } - - break; - case ALLOW_READ: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - permission.setAllowAlter( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOW_READ ); - } - - break; - case ALLOW_UPDATE: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - permission.setAllowAlter( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOW_UPDATE ); - } - - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Permission.class.getSimpleName() ); - break; + if ( ALLOW_ALTER.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + permission.setAllowAlter( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOW_ALTER ); + } + } else if ( ALLOW_CREATE.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + permission.setAllowAlter( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOW_CREATE ); + } + } else if ( ALLOW_DELETE.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + permission.setAllowAlter( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOW_DELETE ); + } + } else if ( ALLOW_EXECUTE.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + permission.setAllowAlter( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOW_EXECUTE ); + } + } else if ( ALLOW_LANGUAGE.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + permission.setAllowAlter( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOW_LANGUAGE ); + } + } else if ( ALLOW_READ.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + permission.setAllowAlter( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOW_READ ); + } + } else if ( ALLOW_UPDATE.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + permission.setAllowAlter( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOW_UPDATE ); + } + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Permission.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/permission/UnsetPermissionPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/permission/UnsetPermissionPropertyCommand.java index 1413382f..939065c6 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/permission/UnsetPermissionPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/permission/UnsetPermissionPropertyCommand.java @@ -51,31 +51,22 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case ALLOW_ALTER: - permission.setAllowAlter( transaction, Permission.DEFAULT_ALLOW_ALTER ); - break; - case ALLOW_CREATE: - permission.setAllowCreate( transaction, Permission.DEFAULT_ALLOW_CREATE ); - break; - case ALLOW_DELETE: - permission.setAllowDelete( transaction, Permission.DEFAULT_ALLOW_DELETE ); - break; - case ALLOW_EXECUTE: - permission.setAllowExecute( transaction, Permission.DEFAULT_ALLOW_EXECUTE ); - break; - case ALLOW_LANGUAGE: - permission.setAllowLanguage( transaction, Permission.DEFAULT_ALLOW_LANGUAGE ); - break; - case ALLOW_READ: - permission.setAllowRead( transaction, Permission.DEFAULT_ALLOW_READ ); - break; - case ALLOW_UPDATE: - permission.setAllowUpdate( transaction, Permission.DEFAULT_ALLOW_UPDATE ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Permission.class.getSimpleName() ); - break; + if ( ALLOW_ALTER.equals( name ) ) { + permission.setAllowAlter( transaction, Permission.DEFAULT_ALLOW_ALTER ); + } else if ( ALLOW_CREATE.equals( name ) ) { + permission.setAllowCreate( transaction, Permission.DEFAULT_ALLOW_CREATE ); + } else if ( ALLOW_DELETE.equals( name ) ) { + permission.setAllowDelete( transaction, Permission.DEFAULT_ALLOW_DELETE ); + } else if ( ALLOW_EXECUTE.equals( name ) ) { + permission.setAllowExecute( transaction, Permission.DEFAULT_ALLOW_EXECUTE ); + } else if ( ALLOW_LANGUAGE.equals( name ) ) { + permission.setAllowLanguage( transaction, Permission.DEFAULT_ALLOW_LANGUAGE ); + } else if ( ALLOW_READ.equals( name ) ) { + permission.setAllowRead( transaction, Permission.DEFAULT_ALLOW_READ ); + } else if ( ALLOW_UPDATE.equals( name ) ) { + permission.setAllowUpdate( transaction, Permission.DEFAULT_ALLOW_UPDATE ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Permission.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/pushdownfunction/PushdownFunctionCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/pushdownfunction/PushdownFunctionCommandProvider.java index f0e1b6d5..c8fa9120 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/pushdownfunction/PushdownFunctionCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/pushdownfunction/PushdownFunctionCommandProvider.java @@ -36,7 +36,7 @@ public PushdownFunctionCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( AddParameterCommand.class ); result.add( DeleteParameterCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/pushdownfunction/PushdownFunctionRenameCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/pushdownfunction/PushdownFunctionRenameCommand.java index 8f680d92..43d26a04 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/pushdownfunction/PushdownFunctionRenameCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/pushdownfunction/PushdownFunctionRenameCommand.java @@ -17,7 +17,7 @@ import org.komodo.shell.api.WorkspaceStatus; import org.komodo.shell.commands.RenameCommand; import org.komodo.utils.i18n.I18n; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; /** * The {@link ProcedureResultSet result} child cannot be renamed. diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/pushdownfunction/SetPushdownFunctionPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/pushdownfunction/SetPushdownFunctionPropertyCommand.java index 00323d77..01ba33e1 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/pushdownfunction/SetPushdownFunctionPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/pushdownfunction/SetPushdownFunctionPropertyCommand.java @@ -54,120 +54,94 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case AGGREGATE: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - func.setAggregate( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, AGGREGATE ); - } - - break; - case ALLOWS_DISTINCT: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - func.setAllowsDistinct( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOWS_DISTINCT ); - } - - break; - case ALLOWS_ORDERBY: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - func.setAllowsOrderBy( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOWS_ORDERBY ); - } - - break; - case ANALYTIC: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - func.setAnalytic( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ANALYTIC ); - } - - break; - case DECOMPOSABLE: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - func.setDecomposable( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, DECOMPOSABLE ); - } - - break; - case DESCRIPTION: - func.setDescription( getTransaction(), value ); - break; - case DETERMINISM: - if ( Function.Determinism.COMMAND_DETERMINISTIC.name().equals( value ) ) { - func.setDeterminism( transaction, Function.Determinism.COMMAND_DETERMINISTIC ); - } else if ( Function.Determinism.DETERMINISTIC.name().equals( value ) ) { - func.setDeterminism( transaction, Function.Determinism.DETERMINISTIC ); - } else if ( Function.Determinism.NONDETERMINISTIC.name().equals( value ) ) { - func.setDeterminism( transaction, Function.Determinism.NONDETERMINISTIC ); - } else if ( Function.Determinism.SESSION_DETERMINISTIC.name().equals( value ) ) { - func.setDeterminism( transaction, Function.Determinism.SESSION_DETERMINISTIC ); - } else if ( Function.Determinism.USER_DETERMINISTIC.name().equals( value ) ) { - func.setDeterminism( transaction, Function.Determinism.USER_DETERMINISTIC ); - } else if ( Function.Determinism.VDB_DETERMINISTIC.name().equals( value ) ) { - func.setDeterminism( transaction, Function.Determinism.VDB_DETERMINISTIC ); - } else { - errorMsg = I18n.bind( PushdownFunctionCommandsI18n.invalidDeterministicPropertyValue, DETERMINISM ); - } - - break; - case NAME_IN_SOURCE: - func.setNameInSource( getTransaction(), value ); - break; - case NULL_ON_NULL: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - func.setNullOnNull( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, NULL_ON_NULL ); - } - - break; - case SCHEMA_ELEMENT_TYPE: - if ( SchemaElement.SchemaElementType.FOREIGN.name().equals( value ) ) { - func.setSchemaElementType( transaction, SchemaElement.SchemaElementType.FOREIGN ); - } else if ( SchemaElement.SchemaElementType.VIRTUAL.name().equals( value ) ) { - func.setSchemaElementType( transaction, SchemaElement.SchemaElementType.VIRTUAL ); - } else { - errorMsg = I18n.bind( PushdownFunctionCommandsI18n.invalidSchemaElementTypePropertyValue, SCHEMA_ELEMENT_TYPE ); - } - - break; - case UPDATE_COUNT: - try { - final long count = Long.parseLong( value ); - func.setUpdateCount( transaction, count ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, UPDATE_COUNT ); - } - - break; - case USES_DISTINCT_ROWS: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - func.setUsesDistinctRows( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, USES_DISTINCT_ROWS ); - } - - break; - case UUID: - func.setUuid( getTransaction(), value ); - break; - case VAR_ARGS: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - func.setVarArgs( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, VAR_ARGS ); - } - - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, PushdownFunction.class.getSimpleName() ); - break; + if ( AGGREGATE.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + func.setAggregate( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, AGGREGATE ); + } + } else if ( ALLOWS_DISTINCT.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + func.setAllowsDistinct( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOWS_DISTINCT ); + } + } else if ( ALLOWS_ORDERBY.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + func.setAllowsOrderBy( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOWS_ORDERBY ); + } + } else if ( ANALYTIC.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + func.setAnalytic( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ANALYTIC ); + } + } else if ( DECOMPOSABLE.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + func.setDecomposable( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, DECOMPOSABLE ); + } + } else if ( DESCRIPTION.equals( name ) ) { + func.setDescription( getTransaction(), value ); + } else if ( DETERMINISM.equals( name ) ) { + if ( Function.Determinism.COMMAND_DETERMINISTIC.name().equals( value ) ) { + func.setDeterminism( transaction, Function.Determinism.COMMAND_DETERMINISTIC ); + } else if ( Function.Determinism.DETERMINISTIC.name().equals( value ) ) { + func.setDeterminism( transaction, Function.Determinism.DETERMINISTIC ); + } else if ( Function.Determinism.NONDETERMINISTIC.name().equals( value ) ) { + func.setDeterminism( transaction, Function.Determinism.NONDETERMINISTIC ); + } else if ( Function.Determinism.SESSION_DETERMINISTIC.name().equals( value ) ) { + func.setDeterminism( transaction, Function.Determinism.SESSION_DETERMINISTIC ); + } else if ( Function.Determinism.USER_DETERMINISTIC.name().equals( value ) ) { + func.setDeterminism( transaction, Function.Determinism.USER_DETERMINISTIC ); + } else if ( Function.Determinism.VDB_DETERMINISTIC.name().equals( value ) ) { + func.setDeterminism( transaction, Function.Determinism.VDB_DETERMINISTIC ); + } else { + errorMsg = I18n.bind( PushdownFunctionCommandsI18n.invalidDeterministicPropertyValue, DETERMINISM ); + } + } else if ( NAME_IN_SOURCE.equals( name ) ) { + func.setNameInSource( getTransaction(), value ); + } else if ( NULL_ON_NULL.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + func.setNullOnNull( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, NULL_ON_NULL ); + } + } else if ( SCHEMA_ELEMENT_TYPE.equals( name ) ) { + if ( SchemaElement.SchemaElementType.FOREIGN.name().equals( value ) ) { + func.setSchemaElementType( transaction, SchemaElement.SchemaElementType.FOREIGN ); + } else if ( SchemaElement.SchemaElementType.VIRTUAL.name().equals( value ) ) { + func.setSchemaElementType( transaction, SchemaElement.SchemaElementType.VIRTUAL ); + } else { + errorMsg = I18n.bind( PushdownFunctionCommandsI18n.invalidSchemaElementTypePropertyValue, + SCHEMA_ELEMENT_TYPE ); + } + } else if ( UPDATE_COUNT.equals( name ) ) { + try { + final long count = Long.parseLong( value ); + func.setUpdateCount( transaction, count ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, UPDATE_COUNT ); + } + } else if ( USES_DISTINCT_ROWS.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + func.setUsesDistinctRows( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, USES_DISTINCT_ROWS ); + } + } else if ( UUID.equals( name ) ) { + func.setUuid( getTransaction(), value ); + } else if ( VAR_ARGS.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + func.setVarArgs( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, VAR_ARGS ); + } + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, PushdownFunction.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/pushdownfunction/UnsetPushdownFunctionPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/pushdownfunction/UnsetPushdownFunctionPropertyCommand.java index 96da5ce4..a1849d0b 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/pushdownfunction/UnsetPushdownFunctionPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/pushdownfunction/UnsetPushdownFunctionPropertyCommand.java @@ -54,52 +54,36 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case AGGREGATE: - func.setAggregate( transaction, Function.DEFAULT_AGGREGATE ); - break; - case ALLOWS_DISTINCT: - func.setAllowsDistinct( transaction, Function.DEFAULT_ALLOWS_DISTINCT ); - break; - case ALLOWS_ORDERBY: - func.setAllowsOrderBy( transaction, Function.DEFAULT_ALLOWS_ORDER_BY ); - break; - case ANALYTIC: - func.setAnalytic( transaction, Function.DEFAULT_ANALYTIC ); - break; - case DECOMPOSABLE: - func.setDecomposable( transaction, Function.DEFAULT_DECOMPOSABLE ); - break; - case DESCRIPTION: - func.setDescription( getTransaction(), null ); - break; - case DETERMINISM: - func.setDeterminism( transaction, Determinism.DEFAULT_VALUE ); - break; - case NAME_IN_SOURCE: - func.setNameInSource( getTransaction(), null ); - break; - case NULL_ON_NULL: - func.setNullOnNull( transaction, Function.DEFAULT_NULL_ON_NULL ); - break; - case SCHEMA_ELEMENT_TYPE: - func.setSchemaElementType( transaction, null ); - break; - case UPDATE_COUNT: - func.setUpdateCount( transaction, AbstractProcedure.DEFAULT_UPDATE_COUNT ); - break; - case USES_DISTINCT_ROWS: - func.setUsesDistinctRows( transaction, Function.DEFAULT_USES_DISTINCT_ROWS ); - break; - case UUID: - func.setUuid( getTransaction(), null ); - break; - case VAR_ARGS: - func.setVarArgs( transaction, Function.DEFAULT_VARARGS ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, PushdownFunction.class.getSimpleName() ); - break; + if ( AGGREGATE.equals( name ) ) { + func.setAggregate( transaction, Function.DEFAULT_AGGREGATE ); + } else if ( ALLOWS_DISTINCT.equals( name ) ) { + func.setAllowsDistinct( transaction, Function.DEFAULT_ALLOWS_DISTINCT ); + } else if ( ALLOWS_ORDERBY.equals( name ) ) { + func.setAllowsOrderBy( transaction, Function.DEFAULT_ALLOWS_ORDER_BY ); + } else if ( ANALYTIC.equals( name ) ) { + func.setAnalytic( transaction, Function.DEFAULT_ANALYTIC ); + } else if ( DECOMPOSABLE.equals( name ) ) { + func.setDecomposable( transaction, Function.DEFAULT_DECOMPOSABLE ); + } else if ( DESCRIPTION.equals( name ) ) { + func.setDescription( getTransaction(), null ); + } else if ( DETERMINISM.equals( name ) ) { + func.setDeterminism( transaction, Determinism.DEFAULT_VALUE ); + } else if ( NAME_IN_SOURCE.equals( name ) ) { + func.setNameInSource( getTransaction(), null ); + } else if ( NULL_ON_NULL.equals( name ) ) { + func.setNullOnNull( transaction, Function.DEFAULT_NULL_ON_NULL ); + } else if ( SCHEMA_ELEMENT_TYPE.equals( name ) ) { + func.setSchemaElementType( transaction, null ); + } else if ( UPDATE_COUNT.equals( name ) ) { + func.setUpdateCount( transaction, AbstractProcedure.DEFAULT_UPDATE_COUNT ); + } else if ( USES_DISTINCT_ROWS.equals( name ) ) { + func.setUsesDistinctRows( transaction, Function.DEFAULT_USES_DISTINCT_ROWS ); + } else if ( UUID.equals( name ) ) { + func.setUuid( getTransaction(), null ); + } else if ( VAR_ARGS.equals( name ) ) { + func.setVarArgs( transaction, Function.DEFAULT_VARARGS ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, PushdownFunction.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/resultset/ResultSetCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/resultset/ResultSetCommandProvider.java index 760081ec..caef0d4b 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/resultset/ResultSetCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/resultset/ResultSetCommandProvider.java @@ -7,7 +7,7 @@ */ package org.komodo.relational.commands.resultset; -import java.util.Collections; +import java.util.HashSet; import java.util.Set; import org.komodo.relational.model.DataTypeResultSet; import org.komodo.relational.model.ProcedureResultSet; @@ -60,7 +60,9 @@ public void initWorkspaceState( final WorkspaceStatus wsStatus ) { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - return Collections.singleton( ResultSetRenameCommand.class ); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >( 1 ); + result.add( ResultSetRenameCommand.class ); + return result; } /** diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/resultsetcolumn/ResultSetColumnCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/resultsetcolumn/ResultSetColumnCommandProvider.java index 6b523673..98a59227 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/resultsetcolumn/ResultSetColumnCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/resultsetcolumn/ResultSetColumnCommandProvider.java @@ -36,7 +36,7 @@ public ResultSetColumnCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( SetResultSetColumnPropertyCommand.class ); result.add( UnsetResultSetColumnPropertyCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/resultsetcolumn/SetResultSetColumnPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/resultsetcolumn/SetResultSetColumnPropertyCommand.java index d1b0de27..97d23c45 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/resultsetcolumn/SetResultSetColumnPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/resultsetcolumn/SetResultSetColumnPropertyCommand.java @@ -54,64 +54,49 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case DATATYPE_NAME: - column.setDatatypeName( transaction, value ); - break; - case DEFAULT_VALUE: - column.setDefaultValue( transaction, value ); - break; - case DESCRIPTION: - column.setDescription( transaction, value ); - break; - case LENGTH: - try { - final long length = Long.parseLong( value ); - column.setLength( transaction, length ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, LENGTH ); - } - - break; - case NAME_IN_SOURCE: - column.setNameInSource( transaction, value ); - break; - case NULLABLE: - if ( Nullable.NO_NULLS.name().equals( value ) ) { - column.setNullable( transaction, Nullable.NO_NULLS ); - } else if ( Nullable.NULLABLE.name().equals( value ) ) { - column.setNullable( transaction, Nullable.NULLABLE ); - } else if ( Nullable.NULLABLE_UNKNOWN.name().equals( value ) ) { - column.setNullable( transaction, Nullable.NULLABLE_UNKNOWN ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidNullablePropertyValue, NULLABLE ); - } - - break; - case PRECISION: - try { - final long precision = Long.parseLong( value ); - column.setPrecision( transaction, precision ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, PRECISION ); - } - - break; - case SCALE: - try { - final long scale = Long.parseLong( value ); - column.setScale( transaction, scale ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, SCALE ); - } - - break; - case UUID: - column.setUuid( transaction, value ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Column.class.getSimpleName() ); - break; + if ( DATATYPE_NAME.equals( name ) ) { + column.setDatatypeName( transaction, value ); + } else if ( DEFAULT_VALUE.equals( name ) ) { + column.setDefaultValue( transaction, value ); + } else if ( DESCRIPTION.equals( name ) ) { + column.setDescription( transaction, value ); + } else if ( LENGTH.equals( name ) ) { + try { + final long length = Long.parseLong( value ); + column.setLength( transaction, length ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, LENGTH ); + } + } else if ( NAME_IN_SOURCE.equals( name ) ) { + column.setNameInSource( transaction, value ); + } else if ( NULLABLE.equals( name ) ) { + if ( Nullable.NO_NULLS.name().equals( value ) ) { + column.setNullable( transaction, Nullable.NO_NULLS ); + } else if ( Nullable.NULLABLE.name().equals( value ) ) { + column.setNullable( transaction, Nullable.NULLABLE ); + } else if ( Nullable.NULLABLE_UNKNOWN.name().equals( value ) ) { + column.setNullable( transaction, Nullable.NULLABLE_UNKNOWN ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidNullablePropertyValue, NULLABLE ); + } + } else if ( PRECISION.equals( name ) ) { + try { + final long precision = Long.parseLong( value ); + column.setPrecision( transaction, precision ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, PRECISION ); + } + } else if ( SCALE.equals( name ) ) { + try { + final long scale = Long.parseLong( value ); + column.setScale( transaction, scale ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, SCALE ); + } + } else if ( UUID.equals( name ) ) { + column.setUuid( transaction, value ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Column.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/resultsetcolumn/UnsetResultSetColumnPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/resultsetcolumn/UnsetResultSetColumnPropertyCommand.java index 59a251bc..fb921ffe 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/resultsetcolumn/UnsetResultSetColumnPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/resultsetcolumn/UnsetResultSetColumnPropertyCommand.java @@ -52,37 +52,26 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case DATATYPE_NAME: - column.setDatatypeName( transaction, null ); - break; - case DEFAULT_VALUE: - column.setDefaultValue( transaction, null ); - break; - case DESCRIPTION: - column.setDescription( transaction, null ); - break; - case LENGTH: - column.setLength( transaction, RelationalConstants.DEFAULT_LENGTH ); - break; - case NAME_IN_SOURCE: - column.setNameInSource( transaction, null ); - break; - case NULLABLE: - column.setNullable( transaction, null ); - break; - case PRECISION: - column.setPrecision( transaction, RelationalConstants.DEFAULT_PRECISION ); - break; - case SCALE: - column.setScale( transaction, RelationalConstants.DEFAULT_SCALE ); - break; - case UUID: - column.setUuid( transaction, null ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Column.class.getSimpleName() ); - break; + if ( DATATYPE_NAME.equals( name ) ) { + column.setDatatypeName( transaction, null ); + } else if ( DEFAULT_VALUE.equals( name ) ) { + column.setDefaultValue( transaction, null ); + } else if ( DESCRIPTION.equals( name ) ) { + column.setDescription( transaction, null ); + } else if ( LENGTH.equals( name ) ) { + column.setLength( transaction, RelationalConstants.DEFAULT_LENGTH ); + } else if ( NAME_IN_SOURCE.equals( name ) ) { + column.setNameInSource( transaction, null ); + } else if ( NULLABLE.equals( name ) ) { + column.setNullable( transaction, null ); + } else if ( PRECISION.equals( name ) ) { + column.setPrecision( transaction, RelationalConstants.DEFAULT_PRECISION ); + } else if ( SCALE.equals( name ) ) { + column.setScale( transaction, RelationalConstants.DEFAULT_SCALE ); + } else if ( UUID.equals( name ) ) { + column.setUuid( transaction, null ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Column.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/schema/ExportCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/schema/ExportCommand.java index 96747f6d..bbe43c07 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/schema/ExportCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/schema/ExportCommand.java @@ -66,7 +66,10 @@ protected CommandResult doExecute() { } // write file - try ( final FileWriter recordingFileWriter = new FileWriter( fileName, false ) ) { + FileWriter recordingFileWriter = null; + + try { + recordingFileWriter = new FileWriter( fileName, false ); recordingFileWriter.write( ddl ); recordingFileWriter.flush(); return new CommandResultImpl( I18n.bind( SchemaCommandsI18n.ddlExported, @@ -75,6 +78,10 @@ protected CommandResult doExecute() { override ) ); } catch ( final Exception e ) { return new CommandResultImpl( false, I18n.bind( WorkspaceCommandsI18n.errorWritingFile, fileName ), e ); + } finally { + if ( recordingFileWriter != null ) { + recordingFileWriter.close(); + } } } diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/schema/SchemaCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/schema/SchemaCommandProvider.java index 9f97d411..cc158694 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/schema/SchemaCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/schema/SchemaCommandProvider.java @@ -36,7 +36,7 @@ public SchemaCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( SetSchemaPropertyCommand.class ); result.add( UnsetSchemaPropertyCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/schema/SetSchemaPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/schema/SetSchemaPropertyCommand.java index 8f5cba71..1278d75f 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/schema/SetSchemaPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/schema/SetSchemaPropertyCommand.java @@ -52,13 +52,10 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case RENDITION: - teiid.setRendition( transaction, value ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Schema.class.getSimpleName() ); - break; + if ( RENDITION.equals( name ) ) { + teiid.setRendition( transaction, value ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Schema.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/schema/UnsetSchemaPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/schema/UnsetSchemaPropertyCommand.java index 5b81b9f8..6e943692 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/schema/UnsetSchemaPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/schema/UnsetSchemaPropertyCommand.java @@ -51,13 +51,10 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case RENDITION: - teiid.setRendition( transaction, null ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Schema.class.getSimpleName() ); - break; + if ( RENDITION.equals( name ) ) { + teiid.setRendition( transaction, null ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Schema.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/server/ServerCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/server/ServerCommandProvider.java index 28ea5129..c9b331fe 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/server/ServerCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/server/ServerCommandProvider.java @@ -45,7 +45,7 @@ public ServerCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( ServerConnectCommand.class ); result.add( ServerDisconnectCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/server/ServerDeployVdbCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/server/ServerDeployVdbCommand.java index 29507445..aa8a82a3 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/server/ServerDeployVdbCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/server/ServerDeployVdbCommand.java @@ -33,7 +33,7 @@ import org.komodo.spi.runtime.TeiidVdb; import org.komodo.utils.StringUtils; import org.komodo.utils.i18n.I18n; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * A shell command to deploy a workspace VDB to the connected server. @@ -112,7 +112,7 @@ protected CommandResult doExecute() { } } } - + // Get VDB content String vdbXml = vdbToDeploy.export(getTransaction(), null); if (vdbXml == null || vdbXml.isEmpty()) { @@ -132,14 +132,14 @@ protected CommandResult doExecute() { return result; } - + /* * Gets the set of unique source jndi names used by the VDB */ private Set getPhysicalModelJndis(Vdb theVdb) throws Exception { // The set of Physical Modl Jndis HashSet physicalModelJndis = new HashSet(); - + Model[] models = theVdb.getModels(getTransaction()); for(Model model : models) { Model.Type modelType = model.getModelType(getTransaction()); @@ -153,10 +153,10 @@ private Set getPhysicalModelJndis(Vdb theVdb) throws Exception { } } } - + return physicalModelJndis; } - + /** * {@inheritDoc} * diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/server/ServerObjPrintUtils.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/server/ServerObjPrintUtils.java index faaa0c32..1a47c37f 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/server/ServerObjPrintUtils.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/server/ServerObjPrintUtils.java @@ -143,7 +143,7 @@ public static void printDatasourceDetails(Writer writer, int indent, TeiidDataSo * @param valueTitle the title of the value column */ public static void printDatasourceTemplateProperties(Writer writer, int indent, Collection propDefns, String nameTitle, String valueTitle) { - final Map< String, String > sorted = new TreeMap<>(); + final Map< String, String > sorted = new TreeMap< String, String >(); int maxNameWidth = DEFAULT_WIDTH; int maxValueWidth = DEFAULT_WIDTH; diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/storedprocedure/SetStoredProcedurePropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/storedprocedure/SetStoredProcedurePropertyCommand.java index 4d65b1c7..9105923f 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/storedprocedure/SetStoredProcedurePropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/storedprocedure/SetStoredProcedurePropertyCommand.java @@ -53,49 +53,37 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case DESCRIPTION: - proc.setDescription( getTransaction(), value ); - break; - case NAME_IN_SOURCE: - proc.setNameInSource( getTransaction(), value ); - break; - case NATIVE_QUERY: - proc.setNativeQuery( transaction, value ); - break; - case NON_PREPARED: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - proc.setNonPrepared( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, NON_PREPARED ); - } - - break; - case SCHEMA_ELEMENT_TYPE: - if ( SchemaElement.SchemaElementType.FOREIGN.name().equals( value ) ) { - proc.setSchemaElementType( transaction, SchemaElement.SchemaElementType.FOREIGN ); - } else if ( SchemaElement.SchemaElementType.VIRTUAL.name().equals( value ) ) { - proc.setSchemaElementType( transaction, SchemaElement.SchemaElementType.VIRTUAL ); - } else { - errorMsg = I18n.bind( StoredProcedureCommandsI18n.invalidSchemaElementTypePropertyValue, value ); - } - - break; - case UPDATE_COUNT: - try { - final long count = Long.parseLong( value ); - proc.setUpdateCount( transaction, count ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, UPDATE_COUNT ); - } - - break; - case UUID: - proc.setUuid( getTransaction(), value ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, StoredProcedure.class.getSimpleName() ); - break; + if ( DESCRIPTION.equals( name ) ) { + proc.setDescription( getTransaction(), value ); + } else if ( NAME_IN_SOURCE.equals( name ) ) { + proc.setNameInSource( getTransaction(), value ); + } else if ( NATIVE_QUERY.equals( name ) ) { + proc.setNativeQuery( transaction, value ); + } else if ( NON_PREPARED.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + proc.setNonPrepared( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, NON_PREPARED ); + } + } else if ( SCHEMA_ELEMENT_TYPE.equals( name ) ) { + if ( SchemaElement.SchemaElementType.FOREIGN.name().equals( value ) ) { + proc.setSchemaElementType( transaction, SchemaElement.SchemaElementType.FOREIGN ); + } else if ( SchemaElement.SchemaElementType.VIRTUAL.name().equals( value ) ) { + proc.setSchemaElementType( transaction, SchemaElement.SchemaElementType.VIRTUAL ); + } else { + errorMsg = I18n.bind( StoredProcedureCommandsI18n.invalidSchemaElementTypePropertyValue, value ); + } + } else if ( UPDATE_COUNT.equals( name ) ) { + try { + final long count = Long.parseLong( value ); + proc.setUpdateCount( transaction, count ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, UPDATE_COUNT ); + } + } else if ( UUID.equals( name ) ) { + proc.setUuid( getTransaction(), value ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, StoredProcedure.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/storedprocedure/StoredProcedureCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/storedprocedure/StoredProcedureCommandProvider.java index ab9db74a..f3e6eb93 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/storedprocedure/StoredProcedureCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/storedprocedure/StoredProcedureCommandProvider.java @@ -36,7 +36,7 @@ public StoredProcedureCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( AddParameterCommand.class ); result.add( DeleteParameterCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/storedprocedure/StoredProcedureRenameCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/storedprocedure/StoredProcedureRenameCommand.java index 073c6d97..08ff726f 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/storedprocedure/StoredProcedureRenameCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/storedprocedure/StoredProcedureRenameCommand.java @@ -17,7 +17,7 @@ import org.komodo.shell.api.WorkspaceStatus; import org.komodo.shell.commands.RenameCommand; import org.komodo.utils.i18n.I18n; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; /** * The {@link ProcedureResultSet result} child cannot be renamed. diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/storedprocedure/UnsetStoredProcedurePropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/storedprocedure/UnsetStoredProcedurePropertyCommand.java index 86b88f19..2a37a8af 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/storedprocedure/UnsetStoredProcedurePropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/storedprocedure/UnsetStoredProcedurePropertyCommand.java @@ -52,31 +52,22 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case DESCRIPTION: - proc.setDescription( getTransaction(), null ); - break; - case NAME_IN_SOURCE: - proc.setNameInSource( getTransaction(), null ); - break; - case NATIVE_QUERY: - proc.setNativeQuery( transaction, null ); - break; - case NON_PREPARED: - proc.setNonPrepared( transaction, StoredProcedure.DEFAULT_NON_PREPARED ); - break; - case SCHEMA_ELEMENT_TYPE: - proc.setSchemaElementType( transaction, null ); - break; - case UPDATE_COUNT: - proc.setUpdateCount( transaction, AbstractProcedure.DEFAULT_UPDATE_COUNT ); - break; - case UUID: - proc.setUuid( getTransaction(), null ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, StoredProcedure.class.getSimpleName() ); - break; + if ( DESCRIPTION.equals( name ) ) { + proc.setDescription( getTransaction(), null ); + } else if ( NAME_IN_SOURCE.equals( name ) ) { + proc.setNameInSource( getTransaction(), null ); + } else if ( NATIVE_QUERY.equals( name ) ) { + proc.setNativeQuery( transaction, null ); + } else if ( NON_PREPARED.equals( name ) ) { + proc.setNonPrepared( transaction, StoredProcedure.DEFAULT_NON_PREPARED ); + } else if ( SCHEMA_ELEMENT_TYPE.equals( name ) ) { + proc.setSchemaElementType( transaction, null ); + } else if ( UPDATE_COUNT.equals( name ) ) { + proc.setUpdateCount( transaction, AbstractProcedure.DEFAULT_UPDATE_COUNT ); + } else if ( UUID.equals( name ) ) { + proc.setUuid( getTransaction(), null ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, StoredProcedure.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/table/SetTablePropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/table/SetTablePropertyCommand.java index 185248dd..c55dfb07 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/table/SetTablePropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/table/SetTablePropertyCommand.java @@ -54,80 +54,61 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case DESCRIPTION: - table.setDescription( transaction, value ); - break; - case CARDINALITY: - try { - final int cardinality = Integer.parseInt( value ); - table.setCardinality( transaction, cardinality ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, CARDINALITY ); - } - - break; - case MATERIALIZED: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - table.setMaterialized( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, MATERIALIZED ); - } - - break; - case MATERIALIZED_TABLE: - table.setMaterializedTable( transaction, value ); - break; - case NAME_IN_SOURCE: - table.setNameInSource( transaction, value ); - break; - case UPDATABLE: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - table.setUpdatable( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, UPDATABLE ); - } - - break; - case UUID: - table.setUuid( transaction, value ); - break; - case ON_COMMIT_VALUE: - if ( OnCommit.DELETE_ROWS.name().equals( value ) ) { - table.setOnCommitValue( transaction, OnCommit.DELETE_ROWS ); - } else if ( OnCommit.PRESERVE_ROWS.name().equals( value ) ) { - table.setOnCommitValue( transaction, OnCommit.PRESERVE_ROWS ); - } else { - errorMsg = I18n.bind( TableCommandsI18n.invalidOnCommitPropertyValue, ON_COMMIT_VALUE ); - } - - break; - case QUERY_EXPRESSION: - table.setQueryExpression( transaction, value ); - break; - case SCHEMA_ELEMENT_TYPE: - if ( SchemaElement.SchemaElementType.FOREIGN.name().equals( value ) ) { - table.setSchemaElementType( transaction, SchemaElement.SchemaElementType.FOREIGN ); - } else if ( SchemaElement.SchemaElementType.VIRTUAL.name().equals( value ) ) { - table.setSchemaElementType( transaction, SchemaElement.SchemaElementType.VIRTUAL ); - } else { - errorMsg = I18n.bind( TableCommandsI18n.invalidSchemaElementTypePropertyValue, value ); - } - - break; - case TEMPORARY_TABLE_TYPE: - if ( Table.TemporaryType.GLOBAL.name().equals( value ) ) { - table.setTemporaryTableType( transaction, Table.TemporaryType.GLOBAL ); - } else if ( Table.TemporaryType.LOCAL.name().equals( value ) ) { - table.setTemporaryTableType( transaction, Table.TemporaryType.LOCAL ); - } else { - errorMsg = I18n.bind( TableCommandsI18n.invalidTemporaryTableTypePropertyValue, value ); - } - - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Table.class.getSimpleName() ); - break; + if ( DESCRIPTION.equals( name ) ) { + table.setDescription( transaction, value ); + } else if ( CARDINALITY.equals( name ) ) { + try { + final int cardinality = Integer.parseInt( value ); + table.setCardinality( transaction, cardinality ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, CARDINALITY ); + } + } else if ( MATERIALIZED.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + table.setMaterialized( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, MATERIALIZED ); + } + } else if ( MATERIALIZED_TABLE.equals( name ) ) { + table.setMaterializedTable( transaction, value ); + } else if ( NAME_IN_SOURCE.equals( name ) ) { + table.setNameInSource( transaction, value ); + } else if ( UPDATABLE.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + table.setUpdatable( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, UPDATABLE ); + } + } else if ( UUID.equals( name ) ) { + table.setUuid( transaction, value ); + } else if ( ON_COMMIT_VALUE.equals( name ) ) { + if ( OnCommit.DELETE_ROWS.name().equals( value ) ) { + table.setOnCommitValue( transaction, OnCommit.DELETE_ROWS ); + } else if ( OnCommit.PRESERVE_ROWS.name().equals( value ) ) { + table.setOnCommitValue( transaction, OnCommit.PRESERVE_ROWS ); + } else { + errorMsg = I18n.bind( TableCommandsI18n.invalidOnCommitPropertyValue, ON_COMMIT_VALUE ); + } + } else if ( QUERY_EXPRESSION.equals( name ) ) { + table.setQueryExpression( transaction, value ); + } else if ( SCHEMA_ELEMENT_TYPE.equals( name ) ) { + if ( SchemaElement.SchemaElementType.FOREIGN.name().equals( value ) ) { + table.setSchemaElementType( transaction, SchemaElement.SchemaElementType.FOREIGN ); + } else if ( SchemaElement.SchemaElementType.VIRTUAL.name().equals( value ) ) { + table.setSchemaElementType( transaction, SchemaElement.SchemaElementType.VIRTUAL ); + } else { + errorMsg = I18n.bind( TableCommandsI18n.invalidSchemaElementTypePropertyValue, value ); + } + } else if ( TEMPORARY_TABLE_TYPE.equals( name ) ) { + if ( Table.TemporaryType.GLOBAL.name().equals( value ) ) { + table.setTemporaryTableType( transaction, Table.TemporaryType.GLOBAL ); + } else if ( Table.TemporaryType.LOCAL.name().equals( value ) ) { + table.setTemporaryTableType( transaction, Table.TemporaryType.LOCAL ); + } else { + errorMsg = I18n.bind( TableCommandsI18n.invalidTemporaryTableTypePropertyValue, value ); + } + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Table.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/table/TableCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/table/TableCommandProvider.java index 5df98655..bae99612 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/table/TableCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/table/TableCommandProvider.java @@ -36,7 +36,7 @@ public TableCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( AddAccessPatternCommand.class ); result.add( AddColumnCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/table/UnsetTablePropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/table/UnsetTablePropertyCommand.java index baef64f0..1d01ccb7 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/table/UnsetTablePropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/table/UnsetTablePropertyCommand.java @@ -51,43 +51,30 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case DESCRIPTION: - table.setDescription( transaction, null ); - break; - case CARDINALITY: - table.setCardinality( transaction, Table.DEFAULT_CARDINALITY ); - break; - case MATERIALIZED: - table.setMaterialized( transaction, Table.DEFAULT_MATERIALIZED ); - break; - case MATERIALIZED_TABLE: - table.setMaterializedTable( transaction, null ); - break; - case NAME_IN_SOURCE: - table.setNameInSource( transaction, null ); - break; - case UPDATABLE: - table.setUpdatable( transaction, Table.DEFAULT_UPDATABLE ); - break; - case UUID: - table.setUuid( transaction, null ); - break; - case ON_COMMIT_VALUE: - table.setOnCommitValue( transaction, null ); - break; - case QUERY_EXPRESSION: - table.setQueryExpression( transaction, null ); - break; - case SCHEMA_ELEMENT_TYPE: - table.setSchemaElementType( transaction, null ); - break; - case TEMPORARY_TABLE_TYPE: - table.setTemporaryTableType( transaction, null ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Table.class.getSimpleName() ); - break; + if ( DESCRIPTION.equals( name ) ) { + table.setDescription( transaction, null ); + } else if ( CARDINALITY.equals( name ) ) { + table.setCardinality( transaction, Table.DEFAULT_CARDINALITY ); + } else if ( MATERIALIZED.equals( name ) ) { + table.setMaterialized( transaction, Table.DEFAULT_MATERIALIZED ); + } else if ( MATERIALIZED_TABLE.equals( name ) ) { + table.setMaterializedTable( transaction, null ); + } else if ( NAME_IN_SOURCE.equals( name ) ) { + table.setNameInSource( transaction, null ); + } else if ( UPDATABLE.equals( name ) ) { + table.setUpdatable( transaction, Table.DEFAULT_UPDATABLE ); + } else if ( UUID.equals( name ) ) { + table.setUuid( transaction, null ); + } else if ( ON_COMMIT_VALUE.equals( name ) ) { + table.setOnCommitValue( transaction, null ); + } else if ( QUERY_EXPRESSION.equals( name ) ) { + table.setQueryExpression( transaction, null ); + } else if ( SCHEMA_ELEMENT_TYPE.equals( name ) ) { + table.setSchemaElementType( transaction, null ); + } else if ( TEMPORARY_TABLE_TYPE.equals( name ) ) { + table.setTemporaryTableType( transaction, null ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Table.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/tableconstraint/TableConstraintCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/tableconstraint/TableConstraintCommandProvider.java index df5a6138..d48712d6 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/tableconstraint/TableConstraintCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/tableconstraint/TableConstraintCommandProvider.java @@ -63,7 +63,7 @@ public void initWorkspaceState( final WorkspaceStatus wsStatus ) { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( AddConstraintColumnCommand.class ); result.add( DeleteConstraintColumnCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/tabularresultset/TabularResultSetCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/tabularresultset/TabularResultSetCommandProvider.java index 284630e3..88789212 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/tabularresultset/TabularResultSetCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/tabularresultset/TabularResultSetCommandProvider.java @@ -36,7 +36,7 @@ public TabularResultSetCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( AddColumnCommand.class ); result.add( DeleteColumnCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/teiid/SetTeiidPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/teiid/SetTeiidPropertyCommand.java index 1b3d9595..4d024c67 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/teiid/SetTeiidPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/teiid/SetTeiidPropertyCommand.java @@ -53,59 +53,44 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case ADMIN_PORT: - try { - final int port = Integer.parseInt( value ); - teiid.setAdminPort( transaction, port ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, ADMIN_PORT ); - } - - break; - case ADMIN_PASSWORD: - teiid.setAdminPassword( transaction, value ); - break; - case ADMIN_SECURE: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - teiid.setAdminSecure( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ADMIN_SECURE ); - } - - break; - case ADMIN_USER: - teiid.setAdminUser( transaction, value ); - break; - case JDBC_PORT: - try { - final int port = Integer.parseInt( value ); - teiid.setJdbcPort( transaction, port ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, JDBC_PORT ); - } - - break; - case JDBC_PASSWORD: - teiid.setJdbcPassword( transaction, value ); - break; - case JDBC_SECURE: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - teiid.setJdbcSecure( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, JDBC_SECURE ); - } - - break; - case JDBC_USER: - teiid.setJdbcUsername( transaction, value ); - break; - case HOST: - teiid.setHost( transaction, value ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Teiid.class.getSimpleName() ); - break; + if ( ADMIN_PORT.equals( name ) ) { + try { + final int port = Integer.parseInt( value ); + teiid.setAdminPort( transaction, port ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, ADMIN_PORT ); + } + } else if ( ADMIN_PASSWORD.equals( name ) ) { + teiid.setAdminPassword( transaction, value ); + } else if ( ADMIN_SECURE.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + teiid.setAdminSecure( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ADMIN_SECURE ); + } + } else if ( ADMIN_USER.equals( name ) ) { + teiid.setAdminUser( transaction, value ); + } else if ( JDBC_PORT.equals( name ) ) { + try { + final int port = Integer.parseInt( value ); + teiid.setJdbcPort( transaction, port ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, JDBC_PORT ); + } + } else if ( JDBC_PASSWORD.equals( name ) ) { + teiid.setJdbcPassword( transaction, value ); + } else if ( JDBC_SECURE.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + teiid.setJdbcSecure( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, JDBC_SECURE ); + } + } else if ( JDBC_USER.equals( name ) ) { + teiid.setJdbcUsername( transaction, value ); + } else if ( HOST.equals( name ) ) { + teiid.setHost( transaction, value ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Teiid.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/teiid/TeiidCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/teiid/TeiidCommandProvider.java index f2787dc6..d91e9eee 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/teiid/TeiidCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/teiid/TeiidCommandProvider.java @@ -36,7 +36,7 @@ public TeiidCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( SetTeiidPropertyCommand.class ); result.add( UnsetTeiidPropertyCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/teiid/UnsetTeiidPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/teiid/UnsetTeiidPropertyCommand.java index fd2e5241..20f81d76 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/teiid/UnsetTeiidPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/teiid/UnsetTeiidPropertyCommand.java @@ -53,34 +53,24 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case ADMIN_PORT: - teiid.setAdminPort( transaction, TeiidAdminInfo.DEFAULT_PORT ); - break; - case ADMIN_PASSWORD: - teiid.setAdminPassword( transaction, null ); - break; - case ADMIN_SECURE: - teiid.setAdminSecure( transaction, TeiidAdminInfo.DEFAULT_SECURE ); - break; - case ADMIN_USER: - teiid.setAdminUser( transaction, null ); - break; - case JDBC_PORT: - teiid.setJdbcPort( transaction, TeiidJdbcInfo.DEFAULT_PORT ); - break; - case JDBC_PASSWORD: - teiid.setJdbcPassword( transaction, null ); - break; - case JDBC_SECURE: - teiid.setJdbcSecure( transaction, TeiidJdbcInfo.DEFAULT_SECURE ); - break; - case JDBC_USER: - teiid.setJdbcUsername( transaction, null ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Teiid.class.getSimpleName() ); - break; + if ( ADMIN_PORT.equals( name ) ) { + teiid.setAdminPort( transaction, TeiidAdminInfo.DEFAULT_PORT ); + } else if ( ADMIN_PASSWORD.equals( name ) ) { + teiid.setAdminPassword( transaction, null ); + } else if ( ADMIN_SECURE.equals( name ) ) { + teiid.setAdminSecure( transaction, TeiidAdminInfo.DEFAULT_SECURE ); + } else if ( ADMIN_USER.equals( name ) ) { + teiid.setAdminUser( transaction, null ); + } else if ( JDBC_PORT.equals( name ) ) { + teiid.setJdbcPort( transaction, TeiidJdbcInfo.DEFAULT_PORT ); + } else if ( JDBC_PASSWORD.equals( name ) ) { + teiid.setJdbcPassword( transaction, null ); + } else if ( JDBC_SECURE.equals( name ) ) { + teiid.setJdbcSecure( transaction, TeiidJdbcInfo.DEFAULT_SECURE ); + } else if ( JDBC_USER.equals( name ) ) { + teiid.setJdbcUsername( transaction, null ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Teiid.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/translator/SetTranslatorPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/translator/SetTranslatorPropertyCommand.java index 343f4921..ff123709 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/translator/SetTranslatorPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/translator/SetTranslatorPropertyCommand.java @@ -52,16 +52,12 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case DESCRIPTION: - translator.setDescription( transaction, value ); - break; - case TYPE: - translator.setType( transaction, value ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Translator.class.getSimpleName() ); - break; + if ( DESCRIPTION.equals( name ) ) { + translator.setDescription( transaction, value ); + } else if ( TYPE.equals( name ) ) { + translator.setType( transaction, value ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Translator.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/translator/TranslatorCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/translator/TranslatorCommandProvider.java index b2cc57f9..a06bee55 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/translator/TranslatorCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/translator/TranslatorCommandProvider.java @@ -36,7 +36,7 @@ public TranslatorCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( SetTranslatorPropertyCommand.class ); result.add( UnsetTranslatorPropertyCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/translator/UnsetTranslatorPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/translator/UnsetTranslatorPropertyCommand.java index ec2d6647..250c20ee 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/translator/UnsetTranslatorPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/translator/UnsetTranslatorPropertyCommand.java @@ -52,17 +52,13 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case DESCRIPTION: - translator.setDescription( transaction, null ); - break; - // TYPE is mandatory and does not have a default so it can't be unset - // case TYPE: - // translator.setType( transaction, null ); - // break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Translator.class.getSimpleName() ); - break; + if ( DESCRIPTION.equals( name ) ) { + translator.setDescription( transaction, null ); + // TYPE is mandatory and does not have a default so it can't be unset + // } else if ( TYPE.equals( name ) ) { + // translator.setType( transaction, null ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Translator.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { @@ -129,7 +125,7 @@ public TabCompletionModifier tabCompletion( final String lastArgument, if ( args.isEmpty() ) { // TYPE cannot be unset - final List< String > props = new ArrayList< >( ALL_PROPS ); + final List< String > props = new ArrayList< String >( ALL_PROPS ); props.remove( TYPE ); if ( lastArgument == null ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/userdefinedfunction/SetUserDefinedFunctionPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/userdefinedfunction/SetUserDefinedFunctionPropertyCommand.java index 59daeaa3..665cfe15 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/userdefinedfunction/SetUserDefinedFunctionPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/userdefinedfunction/SetUserDefinedFunctionPropertyCommand.java @@ -54,129 +54,102 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case AGGREGATE: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - func.setAggregate( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, AGGREGATE ); - } - - break; - case ALLOWS_DISTINCT: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - func.setAllowsDistinct( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOWS_DISTINCT ); - } - - break; - case ALLOWS_ORDERBY: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - func.setAllowsOrderBy( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOWS_ORDERBY ); - } - - break; - case ANALYTIC: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - func.setAnalytic( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ANALYTIC ); - } - - break; - case CATEGORY: - func.setCategory( getTransaction(), value ); - break; - case DECOMPOSABLE: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - func.setDecomposable( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, DECOMPOSABLE ); - } - - break; - case DESCRIPTION: - func.setDescription( getTransaction(), value ); - break; - case DETERMINISM: - if ( Function.Determinism.COMMAND_DETERMINISTIC.name().equals( value ) ) { - func.setDeterminism( transaction, Function.Determinism.COMMAND_DETERMINISTIC ); - } else if ( Function.Determinism.DETERMINISTIC.name().equals( value ) ) { - func.setDeterminism( transaction, Function.Determinism.DETERMINISTIC ); - } else if ( Function.Determinism.NONDETERMINISTIC.name().equals( value ) ) { - func.setDeterminism( transaction, Function.Determinism.NONDETERMINISTIC ); - } else if ( Function.Determinism.SESSION_DETERMINISTIC.name().equals( value ) ) { - func.setDeterminism( transaction, Function.Determinism.SESSION_DETERMINISTIC ); - } else if ( Function.Determinism.USER_DETERMINISTIC.name().equals( value ) ) { - func.setDeterminism( transaction, Function.Determinism.USER_DETERMINISTIC ); - } else if ( Function.Determinism.VDB_DETERMINISTIC.name().equals( value ) ) { - func.setDeterminism( transaction, Function.Determinism.VDB_DETERMINISTIC ); - } else { - errorMsg = I18n.bind( UserDefinedFunctionCommandsI18n.invalidDeterministicPropertyValue, DETERMINISM ); - } - - break; - case JAVA_CLASS: - func.setJavaClass( getTransaction(), value ); - break; - case JAVA_METHOD: - func.setJavaMethod( getTransaction(), value ); - break; - case NAME_IN_SOURCE: - func.setNameInSource( getTransaction(), value ); - break; - case NULL_ON_NULL: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - func.setNullOnNull( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, NULL_ON_NULL ); - } - - break; - case SCHEMA_ELEMENT_TYPE: - if ( SchemaElement.SchemaElementType.FOREIGN.name().equals( value ) ) { - func.setSchemaElementType( transaction, SchemaElement.SchemaElementType.FOREIGN ); - } else if ( SchemaElement.SchemaElementType.VIRTUAL.name().equals( value ) ) { - func.setSchemaElementType( transaction, SchemaElement.SchemaElementType.VIRTUAL ); - } else { - errorMsg = I18n.bind( UserDefinedFunctionCommandsI18n.invalidSchemaElementTypePropertyValue, SCHEMA_ELEMENT_TYPE ); - } - - break; - case UPDATE_COUNT: - try { - final long count = Long.parseLong( value ); - func.setUpdateCount( transaction, count ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, UPDATE_COUNT ); - } - - break; - case USES_DISTINCT_ROWS: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - func.setUsesDistinctRows( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, USES_DISTINCT_ROWS ); - } - - break; - case UUID: - func.setUuid( getTransaction(), value ); - break; - case VAR_ARGS: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - func.setVarArgs( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, VAR_ARGS ); - } - - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, UserDefinedFunction.class.getSimpleName() ); - break; + if ( AGGREGATE.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + func.setAggregate( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, AGGREGATE ); + } + } else if ( ALLOWS_DISTINCT.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + func.setAllowsDistinct( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOWS_DISTINCT ); + } + } else if ( ALLOWS_ORDERBY.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + func.setAllowsOrderBy( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ALLOWS_ORDERBY ); + } + } else if ( ANALYTIC.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + func.setAnalytic( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, ANALYTIC ); + } + } else if ( CATEGORY.equals( name ) ) { + func.setCategory( getTransaction(), value ); + } else if ( DECOMPOSABLE.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + func.setDecomposable( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, DECOMPOSABLE ); + } + } else if ( DESCRIPTION.equals( name ) ) { + func.setDescription( getTransaction(), value ); + } else if ( DETERMINISM.equals( name ) ) { + if ( Function.Determinism.COMMAND_DETERMINISTIC.name().equals( value ) ) { + func.setDeterminism( transaction, Function.Determinism.COMMAND_DETERMINISTIC ); + } else if ( Function.Determinism.DETERMINISTIC.name().equals( value ) ) { + func.setDeterminism( transaction, Function.Determinism.DETERMINISTIC ); + } else if ( Function.Determinism.NONDETERMINISTIC.name().equals( value ) ) { + func.setDeterminism( transaction, Function.Determinism.NONDETERMINISTIC ); + } else if ( Function.Determinism.SESSION_DETERMINISTIC.name().equals( value ) ) { + func.setDeterminism( transaction, Function.Determinism.SESSION_DETERMINISTIC ); + } else if ( Function.Determinism.USER_DETERMINISTIC.name().equals( value ) ) { + func.setDeterminism( transaction, Function.Determinism.USER_DETERMINISTIC ); + } else if ( Function.Determinism.VDB_DETERMINISTIC.name().equals( value ) ) { + func.setDeterminism( transaction, Function.Determinism.VDB_DETERMINISTIC ); + } else { + errorMsg = I18n.bind( UserDefinedFunctionCommandsI18n.invalidDeterministicPropertyValue, DETERMINISM ); + } + } else if ( JAVA_CLASS.equals( name ) ) { + func.setJavaClass( getTransaction(), value ); + } else if ( JAVA_METHOD.equals( name ) ) { + func.setJavaMethod( getTransaction(), value ); + } else if ( NAME_IN_SOURCE.equals( name ) ) { + func.setNameInSource( getTransaction(), value ); + } else if ( NULL_ON_NULL.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + func.setNullOnNull( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, NULL_ON_NULL ); + } + } else if ( SCHEMA_ELEMENT_TYPE.equals( name ) ) { + if ( SchemaElement.SchemaElementType.FOREIGN.name().equals( value ) ) { + func.setSchemaElementType( transaction, SchemaElement.SchemaElementType.FOREIGN ); + } else if ( SchemaElement.SchemaElementType.VIRTUAL.name().equals( value ) ) { + func.setSchemaElementType( transaction, SchemaElement.SchemaElementType.VIRTUAL ); + } else { + errorMsg = I18n.bind( UserDefinedFunctionCommandsI18n.invalidSchemaElementTypePropertyValue, + SCHEMA_ELEMENT_TYPE ); + } + } else if ( UPDATE_COUNT.equals( name ) ) { + try { + final long count = Long.parseLong( value ); + func.setUpdateCount( transaction, count ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, UPDATE_COUNT ); + } + } else if ( USES_DISTINCT_ROWS.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + func.setUsesDistinctRows( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, USES_DISTINCT_ROWS ); + } + } else if ( UUID.equals( name ) ) { + func.setUuid( getTransaction(), value ); + } else if ( VAR_ARGS.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + func.setVarArgs( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, VAR_ARGS ); + } + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, + name, + UserDefinedFunction.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/userdefinedfunction/UnsetUserDefinedFunctionPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/userdefinedfunction/UnsetUserDefinedFunctionPropertyCommand.java index df25736a..0ee13812 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/userdefinedfunction/UnsetUserDefinedFunctionPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/userdefinedfunction/UnsetUserDefinedFunctionPropertyCommand.java @@ -53,61 +53,44 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case AGGREGATE: - func.setAggregate( transaction, Function.DEFAULT_AGGREGATE ); - break; - case ALLOWS_DISTINCT: - func.setAllowsDistinct( transaction, Function.DEFAULT_ALLOWS_DISTINCT ); - break; - case ALLOWS_ORDERBY: - func.setAllowsOrderBy( transaction, Function.DEFAULT_ALLOWS_ORDER_BY ); - break; - case ANALYTIC: - func.setAnalytic( transaction, Function.DEFAULT_ANALYTIC ); - break; - case CATEGORY: - func.setCategory( getTransaction(), null ); - break; - case DECOMPOSABLE: - func.setDecomposable( transaction, Function.DEFAULT_DECOMPOSABLE ); - break; - case DESCRIPTION: - func.setDescription( getTransaction(), null ); - break; - case DETERMINISM: - func.setDeterminism( transaction, Function.Determinism.COMMAND_DETERMINISTIC ); - break; - case JAVA_CLASS: - func.setJavaClass( getTransaction(), null ); - break; - case JAVA_METHOD: - func.setJavaMethod( getTransaction(), null ); - break; - case NAME_IN_SOURCE: - func.setNameInSource( getTransaction(), null ); - break; - case NULL_ON_NULL: - func.setNullOnNull( transaction, Function.DEFAULT_NULL_ON_NULL ); - break; - case SCHEMA_ELEMENT_TYPE: - func.setSchemaElementType( transaction, null ); - break; - case UPDATE_COUNT: - func.setUpdateCount( transaction, AbstractProcedure.DEFAULT_UPDATE_COUNT ); - break; - case USES_DISTINCT_ROWS: - func.setUsesDistinctRows( transaction, Function.DEFAULT_USES_DISTINCT_ROWS ); - break; - case UUID: - func.setUuid( getTransaction(), null ); - break; - case VAR_ARGS: - func.setVarArgs( transaction, Function.DEFAULT_VARARGS ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, UserDefinedFunction.class.getSimpleName() ); - break; + if ( AGGREGATE.equals( name ) ) { + func.setAggregate( transaction, Function.DEFAULT_AGGREGATE ); + } else if ( ALLOWS_DISTINCT.equals( name ) ) { + func.setAllowsDistinct( transaction, Function.DEFAULT_ALLOWS_DISTINCT ); + } else if ( ALLOWS_ORDERBY.equals( name ) ) { + func.setAllowsOrderBy( transaction, Function.DEFAULT_ALLOWS_ORDER_BY ); + } else if ( ANALYTIC.equals( name ) ) { + func.setAnalytic( transaction, Function.DEFAULT_ANALYTIC ); + } else if ( CATEGORY.equals( name ) ) { + func.setCategory( getTransaction(), null ); + } else if ( DECOMPOSABLE.equals( name ) ) { + func.setDecomposable( transaction, Function.DEFAULT_DECOMPOSABLE ); + } else if ( DESCRIPTION.equals( name ) ) { + func.setDescription( getTransaction(), null ); + } else if ( DETERMINISM.equals( name ) ) { + func.setDeterminism( transaction, Function.Determinism.COMMAND_DETERMINISTIC ); + } else if ( JAVA_CLASS.equals( name ) ) { + func.setJavaClass( getTransaction(), null ); + } else if ( JAVA_METHOD.equals( name ) ) { + func.setJavaMethod( getTransaction(), null ); + } else if ( NAME_IN_SOURCE.equals( name ) ) { + func.setNameInSource( getTransaction(), null ); + } else if ( NULL_ON_NULL.equals( name ) ) { + func.setNullOnNull( transaction, Function.DEFAULT_NULL_ON_NULL ); + } else if ( SCHEMA_ELEMENT_TYPE.equals( name ) ) { + func.setSchemaElementType( transaction, null ); + } else if ( UPDATE_COUNT.equals( name ) ) { + func.setUpdateCount( transaction, AbstractProcedure.DEFAULT_UPDATE_COUNT ); + } else if ( USES_DISTINCT_ROWS.equals( name ) ) { + func.setUsesDistinctRows( transaction, Function.DEFAULT_USES_DISTINCT_ROWS ); + } else if ( UUID.equals( name ) ) { + func.setUuid( getTransaction(), null ); + } else if ( VAR_ARGS.equals( name ) ) { + func.setVarArgs( transaction, Function.DEFAULT_VARARGS ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, + name, + UserDefinedFunction.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/userdefinedfunction/UserDefinedFunctionCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/userdefinedfunction/UserDefinedFunctionCommandProvider.java index d43ef1a7..20005958 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/userdefinedfunction/UserDefinedFunctionCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/userdefinedfunction/UserDefinedFunctionCommandProvider.java @@ -36,7 +36,7 @@ public UserDefinedFunctionCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( AddParameterCommand.class ); result.add( DeleteParameterCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdb/SetVdbPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdb/SetVdbPropertyCommand.java index a7433897..6e33420b 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdb/SetVdbPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdb/SetVdbPropertyCommand.java @@ -52,60 +52,44 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case ALLOWED_LANGUAGES: - vdb.setAllowedLanguages( transaction, value ); - break; - case AUTHENTICATION_TYPE: - vdb.setAuthenticationType( transaction, value ); - break; - case CONNECTION_TYPE: - vdb.setConnectionType( transaction, value ); - break; - case DESCRIPTION: - vdb.setDescription( transaction, value ); - break; - case GSS_PATTERN: - vdb.setGssPattern( transaction, value ); - break; - case ORIGINAL_FILE_PATH: - vdb.setOriginalFilePath( transaction, value ); - break; - case PASSWORD_PATTERN: - vdb.setPasswordPattern( transaction, value ); - break; - case PREVIEW: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - vdb.setPreview( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, PREVIEW ); - } - - break; - case QUERY_TIMEOUT: - try { - final int timeout = Integer.parseInt( value ); - vdb.setQueryTimeout( transaction, timeout ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, QUERY_TIMEOUT ); - } - - break; - case SECURITY_DOMAIN: - vdb.setSecurityDomain( transaction, value ); - break; - case VERSION: - try { - final int version = Integer.parseInt( value ); - vdb.setVersion( transaction, version ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, VERSION ); - } - - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Vdb.class.getSimpleName() ); - break; + if ( ALLOWED_LANGUAGES.equals( name ) ) { + vdb.setAllowedLanguages( transaction, value ); + } else if ( AUTHENTICATION_TYPE.equals( name ) ) { + vdb.setAuthenticationType( transaction, value ); + } else if ( CONNECTION_TYPE.equals( name ) ) { + vdb.setConnectionType( transaction, value ); + } else if ( DESCRIPTION.equals( name ) ) { + vdb.setDescription( transaction, value ); + } else if ( GSS_PATTERN.equals( name ) ) { + vdb.setGssPattern( transaction, value ); + } else if ( ORIGINAL_FILE_PATH.equals( name ) ) { + vdb.setOriginalFilePath( transaction, value ); + } else if ( PASSWORD_PATTERN.equals( name ) ) { + vdb.setPasswordPattern( transaction, value ); + } else if ( PREVIEW.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + vdb.setPreview( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, PREVIEW ); + } + } else if ( QUERY_TIMEOUT.equals( name ) ) { + try { + final int timeout = Integer.parseInt( value ); + vdb.setQueryTimeout( transaction, timeout ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, QUERY_TIMEOUT ); + } + } else if ( SECURITY_DOMAIN.equals( name ) ) { + vdb.setSecurityDomain( transaction, value ); + } else if ( VERSION.equals( name ) ) { + try { + final int version = Integer.parseInt( value ); + vdb.setVersion( transaction, version ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, VERSION ); + } + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Vdb.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdb/UnsetVdbPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdb/UnsetVdbPropertyCommand.java index 4a3154d5..5f29ffcb 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdb/UnsetVdbPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdb/UnsetVdbPropertyCommand.java @@ -51,43 +51,30 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case ALLOWED_LANGUAGES: - vdb.setAllowedLanguages( transaction, null ); - break; - case AUTHENTICATION_TYPE: - vdb.setAuthenticationType( transaction, null ); - break; - case CONNECTION_TYPE: - vdb.setConnectionType( transaction, null ); - break; - case DESCRIPTION: - vdb.setDescription( transaction, null ); - break; - case GSS_PATTERN: - vdb.setGssPattern( transaction, null ); - break; - case ORIGINAL_FILE_PATH: - vdb.setOriginalFilePath( transaction, null ); - break; - case PASSWORD_PATTERN: - vdb.setPasswordPattern( transaction, null ); - break; - case PREVIEW: - vdb.setPreview( transaction, Vdb.DEFAULT_PREVIEW ); - break; - case QUERY_TIMEOUT: - vdb.setQueryTimeout( transaction, -1 ); - break; - case SECURITY_DOMAIN: - vdb.setSecurityDomain( transaction, null ); - break; - case VERSION: - vdb.setVersion( transaction, Vdb.DEFAULT_VERSION ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Vdb.class.getSimpleName() ); - break; + if ( ALLOWED_LANGUAGES.equals( name ) ) { + vdb.setAllowedLanguages( transaction, null ); + } else if ( AUTHENTICATION_TYPE.equals( name ) ) { + vdb.setAuthenticationType( transaction, null ); + } else if ( CONNECTION_TYPE.equals( name ) ) { + vdb.setConnectionType( transaction, null ); + } else if ( DESCRIPTION.equals( name ) ) { + vdb.setDescription( transaction, null ); + } else if ( GSS_PATTERN.equals( name ) ) { + vdb.setGssPattern( transaction, null ); + } else if ( ORIGINAL_FILE_PATH.equals( name ) ) { + vdb.setOriginalFilePath( transaction, null ); + } else if ( PASSWORD_PATTERN.equals( name ) ) { + vdb.setPasswordPattern( transaction, null ); + } else if ( PREVIEW.equals( name ) ) { + vdb.setPreview( transaction, Vdb.DEFAULT_PREVIEW ); + } else if ( QUERY_TIMEOUT.equals( name ) ) { + vdb.setQueryTimeout( transaction, -1 ); + } else if ( SECURITY_DOMAIN.equals( name ) ) { + vdb.setSecurityDomain( transaction, null ); + } else if ( VERSION.equals( name ) ) { + vdb.setVersion( transaction, Vdb.DEFAULT_VERSION ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, Vdb.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdb/UploadModelCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdb/UploadModelCommand.java index ab2ef4f5..0357245a 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdb/UploadModelCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdb/UploadModelCommand.java @@ -23,8 +23,8 @@ import org.komodo.spi.repository.Repository; import org.komodo.utils.StringUtils; import org.komodo.utils.i18n.I18n; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlParser; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlParser; /** * Loads a {@link Model MODEL} from a local file. diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdb/VdbCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdb/VdbCommandProvider.java index ffb26b62..36ff574a 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdb/VdbCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdb/VdbCommandProvider.java @@ -36,7 +36,7 @@ public VdbCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( AddDataRoleCommand.class ); result.add( AddEntryCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdbimport/SetVdbImportPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdbimport/SetVdbImportPropertyCommand.java index 3f3b8358..b009cacd 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdbimport/SetVdbImportPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdbimport/SetVdbImportPropertyCommand.java @@ -52,27 +52,21 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case IMPORT_DATA_POLICIES: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - vdbImport.setImportDataPolicies( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, IMPORT_DATA_POLICIES ); - } - - break; - case VERSION: - try { - final int version = Integer.parseInt( value ); - vdbImport.setVersion( transaction, version ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, VERSION ); - } - - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, VdbImport.class.getSimpleName() ); - break; + if ( IMPORT_DATA_POLICIES.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + vdbImport.setImportDataPolicies( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, IMPORT_DATA_POLICIES ); + } + } else if ( VERSION.equals( name ) ) { + try { + final int version = Integer.parseInt( value ); + vdbImport.setVersion( transaction, version ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, VERSION ); + } + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, VdbImport.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdbimport/UnsetVdbImportPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdbimport/UnsetVdbImportPropertyCommand.java index eafab279..3eac9d97 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdbimport/UnsetVdbImportPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdbimport/UnsetVdbImportPropertyCommand.java @@ -52,16 +52,12 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case IMPORT_DATA_POLICIES: - vdbImport.setImportDataPolicies( transaction, VdbImport.DEFAULT_IMPORT_DATA_POLICIES ); - break; - case VERSION: - vdbImport.setVersion( transaction, Vdb.DEFAULT_VERSION ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, VdbImport.class.getSimpleName() ); - break; + if ( IMPORT_DATA_POLICIES.equals( name ) ) { + vdbImport.setImportDataPolicies( transaction, VdbImport.DEFAULT_IMPORT_DATA_POLICIES ); + } else if ( VERSION.equals( name ) ) { + vdbImport.setVersion( transaction, Vdb.DEFAULT_VERSION ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, VdbImport.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdbimport/VdbImportCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdbimport/VdbImportCommandProvider.java index 3d50510f..aef62610 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdbimport/VdbImportCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/vdbimport/VdbImportCommandProvider.java @@ -36,7 +36,7 @@ public VdbImportCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( SetVdbImportPropertyCommand.class ); result.add( UnsetVdbImportPropertyCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/view/SetViewPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/view/SetViewPropertyCommand.java index 8c421a2e..a2a43168 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/view/SetViewPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/view/SetViewPropertyCommand.java @@ -55,80 +55,61 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case DESCRIPTION: - view.setDescription( transaction, value ); - break; - case CARDINALITY: - try { - final int cardinality = Integer.parseInt( value ); - view.setCardinality( transaction, cardinality ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, CARDINALITY ); - } - - break; - case MATERIALIZED: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - view.setMaterialized( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, MATERIALIZED ); - } - - break; - case MATERIALIZED_TABLE: - view.setMaterializedTable( transaction, value ); - break; - case NAME_IN_SOURCE: - view.setNameInSource( transaction, value ); - break; - case UPDATABLE: - if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { - view.setUpdatable( transaction, Boolean.parseBoolean( value ) ); - } else { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, UPDATABLE ); - } - - break; - case UUID: - view.setUuid( transaction, value ); - break; - case ON_COMMIT_VALUE: - if ( OnCommit.DELETE_ROWS.name().equals( value ) ) { - view.setOnCommitValue( transaction, OnCommit.DELETE_ROWS ); - } else if ( OnCommit.PRESERVE_ROWS.name().equals( value ) ) { - view.setOnCommitValue( transaction, OnCommit.PRESERVE_ROWS ); - } else { - errorMsg = I18n.bind( ViewCommandsI18n.invalidOnCommitPropertyValue, ON_COMMIT_VALUE ); - } - - break; - case QUERY_EXPRESSION: - view.setQueryExpression( transaction, value ); - break; - case SCHEMA_ELEMENT_TYPE: - if ( SchemaElement.SchemaElementType.FOREIGN.name().equals( value ) ) { - view.setSchemaElementType( transaction, SchemaElement.SchemaElementType.FOREIGN ); - } else if ( SchemaElement.SchemaElementType.VIRTUAL.name().equals( value ) ) { - view.setSchemaElementType( transaction, SchemaElement.SchemaElementType.VIRTUAL ); - } else { - errorMsg = I18n.bind( ViewCommandsI18n.invalidSchemaElementTypePropertyValue, SCHEMA_ELEMENT_TYPE ); - } - - break; - case TEMPORARY_TABLE_TYPE: - if ( Table.TemporaryType.GLOBAL.name().equals( value ) ) { - view.setTemporaryTableType( transaction, Table.TemporaryType.GLOBAL ); - } else if ( Table.TemporaryType.LOCAL.name().equals( value ) ) { - view.setTemporaryTableType( transaction, Table.TemporaryType.LOCAL ); - } else { - errorMsg = I18n.bind( ViewCommandsI18n.invalidTemporaryTableTypePropertyValue, TEMPORARY_TABLE_TYPE ); - } - - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, View.class.getSimpleName() ); - break; + if ( DESCRIPTION.equals( name ) ) { + view.setDescription( transaction, value ); + } else if ( CARDINALITY.equals( name ) ) { + try { + final int cardinality = Integer.parseInt( value ); + view.setCardinality( transaction, cardinality ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, CARDINALITY ); + } + } else if ( MATERIALIZED.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + view.setMaterialized( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, MATERIALIZED ); + } + } else if ( MATERIALIZED_TABLE.equals( name ) ) { + view.setMaterializedTable( transaction, value ); + } else if ( NAME_IN_SOURCE.equals( name ) ) { + view.setNameInSource( transaction, value ); + } else if ( UPDATABLE.equals( name ) ) { + if ( Boolean.TRUE.toString().equals( value ) || Boolean.FALSE.toString().equals( value ) ) { + view.setUpdatable( transaction, Boolean.parseBoolean( value ) ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidBooleanPropertyValue, UPDATABLE ); + } + } else if ( UUID.equals( name ) ) { + view.setUuid( transaction, value ); + } else if ( ON_COMMIT_VALUE.equals( name ) ) { + if ( OnCommit.DELETE_ROWS.name().equals( value ) ) { + view.setOnCommitValue( transaction, OnCommit.DELETE_ROWS ); + } else if ( OnCommit.PRESERVE_ROWS.name().equals( value ) ) { + view.setOnCommitValue( transaction, OnCommit.PRESERVE_ROWS ); + } else { + errorMsg = I18n.bind( ViewCommandsI18n.invalidOnCommitPropertyValue, ON_COMMIT_VALUE ); + } + } else if ( QUERY_EXPRESSION.equals( name ) ) { + view.setQueryExpression( transaction, value ); + } else if ( SCHEMA_ELEMENT_TYPE.equals( name ) ) { + if ( SchemaElement.SchemaElementType.FOREIGN.name().equals( value ) ) { + view.setSchemaElementType( transaction, SchemaElement.SchemaElementType.FOREIGN ); + } else if ( SchemaElement.SchemaElementType.VIRTUAL.name().equals( value ) ) { + view.setSchemaElementType( transaction, SchemaElement.SchemaElementType.VIRTUAL ); + } else { + errorMsg = I18n.bind( ViewCommandsI18n.invalidSchemaElementTypePropertyValue, SCHEMA_ELEMENT_TYPE ); + } + } else if ( TEMPORARY_TABLE_TYPE.equals( name ) ) { + if ( Table.TemporaryType.GLOBAL.name().equals( value ) ) { + view.setTemporaryTableType( transaction, Table.TemporaryType.GLOBAL ); + } else if ( Table.TemporaryType.LOCAL.name().equals( value ) ) { + view.setTemporaryTableType( transaction, Table.TemporaryType.LOCAL ); + } else { + errorMsg = I18n.bind( ViewCommandsI18n.invalidTemporaryTableTypePropertyValue, TEMPORARY_TABLE_TYPE ); + } + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, View.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/view/UnsetViewPropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/view/UnsetViewPropertyCommand.java index 4aa61ebe..2d6d8531 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/view/UnsetViewPropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/view/UnsetViewPropertyCommand.java @@ -52,43 +52,30 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case DESCRIPTION: - view.setDescription( transaction, null ); - break; - case CARDINALITY: - view.setCardinality( transaction, Table.DEFAULT_CARDINALITY ); - break; - case MATERIALIZED: - view.setMaterialized( transaction, Table.DEFAULT_MATERIALIZED ); - break; - case MATERIALIZED_TABLE: - view.setMaterializedTable( transaction, null ); - break; - case NAME_IN_SOURCE: - view.setNameInSource( transaction, null ); - break; - case UPDATABLE: - view.setUpdatable( transaction, Table.DEFAULT_UPDATABLE ); - break; - case UUID: - view.setUuid( transaction, null ); - break; - case ON_COMMIT_VALUE: - view.setOnCommitValue( transaction, null ); - break; - case QUERY_EXPRESSION: - view.setQueryExpression( transaction, null ); - break; - case SCHEMA_ELEMENT_TYPE: - view.setSchemaElementType( transaction, null ); - break; - case TEMPORARY_TABLE_TYPE: - view.setTemporaryTableType( transaction, null ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, View.class.getSimpleName() ); - break; + if ( DESCRIPTION.equals( name ) ) { + view.setDescription( transaction, null ); + } else if ( CARDINALITY.equals( name ) ) { + view.setCardinality( transaction, Table.DEFAULT_CARDINALITY ); + } else if ( MATERIALIZED.equals( name ) ) { + view.setMaterialized( transaction, Table.DEFAULT_MATERIALIZED ); + } else if ( MATERIALIZED_TABLE.equals( name ) ) { + view.setMaterializedTable( transaction, null ); + } else if ( NAME_IN_SOURCE.equals( name ) ) { + view.setNameInSource( transaction, null ); + } else if ( UPDATABLE.equals( name ) ) { + view.setUpdatable( transaction, Table.DEFAULT_UPDATABLE ); + } else if ( UUID.equals( name ) ) { + view.setUuid( transaction, null ); + } else if ( ON_COMMIT_VALUE.equals( name ) ) { + view.setOnCommitValue( transaction, null ); + } else if ( QUERY_EXPRESSION.equals( name ) ) { + view.setQueryExpression( transaction, null ); + } else if ( SCHEMA_ELEMENT_TYPE.equals( name ) ) { + view.setSchemaElementType( transaction, null ); + } else if ( TEMPORARY_TABLE_TYPE.equals( name ) ) { + view.setTemporaryTableType( transaction, null ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, View.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/view/ViewCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/view/ViewCommandProvider.java index 05d357a4..73d14c8c 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/view/ViewCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/view/ViewCommandProvider.java @@ -36,7 +36,7 @@ public ViewCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( AddColumnCommand.class ); result.add( DeleteColumnCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/virtualprocedure/SetVirtualProcedurePropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/virtualprocedure/SetVirtualProcedurePropertyCommand.java index 81b769ea..f2f93b89 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/virtualprocedure/SetVirtualProcedurePropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/virtualprocedure/SetVirtualProcedurePropertyCommand.java @@ -53,41 +53,31 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case AS_CLAUSE_STATEMENT: - proc.setAsClauseStatement( getTransaction(), value ); - break; - case DESCRIPTION: - proc.setDescription( getTransaction(), value ); - break; - case NAME_IN_SOURCE: - proc.setNameInSource( getTransaction(), value ); - break; - case SCHEMA_ELEMENT_TYPE: - if ( SchemaElement.SchemaElementType.FOREIGN.name().equals( value ) ) { - proc.setSchemaElementType( transaction, SchemaElement.SchemaElementType.FOREIGN ); - } else if ( SchemaElement.SchemaElementType.VIRTUAL.name().equals( value ) ) { - proc.setSchemaElementType( transaction, SchemaElement.SchemaElementType.VIRTUAL ); - } else { - errorMsg = I18n.bind( VirtualProcedureCommandsI18n.invalidSchemaElementTypePropertyValue, value ); - } - - break; - case UPDATE_COUNT: - try { - final long count = Long.parseLong( value ); - proc.setUpdateCount( transaction, count ); - } catch ( final NumberFormatException e ) { - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, value ); - } - - break; - case UUID: - proc.setUuid( getTransaction(), value ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, VirtualProcedure.class.getSimpleName() ); - break; + if ( AS_CLAUSE_STATEMENT.equals( name ) ) { + proc.setAsClauseStatement( getTransaction(), value ); + } else if ( DESCRIPTION.equals( name ) ) { + proc.setDescription( getTransaction(), value ); + } else if ( NAME_IN_SOURCE.equals( name ) ) { + proc.setNameInSource( getTransaction(), value ); + } else if ( SCHEMA_ELEMENT_TYPE.equals( name ) ) { + if ( SchemaElement.SchemaElementType.FOREIGN.name().equals( value ) ) { + proc.setSchemaElementType( transaction, SchemaElement.SchemaElementType.FOREIGN ); + } else if ( SchemaElement.SchemaElementType.VIRTUAL.name().equals( value ) ) { + proc.setSchemaElementType( transaction, SchemaElement.SchemaElementType.VIRTUAL ); + } else { + errorMsg = I18n.bind( VirtualProcedureCommandsI18n.invalidSchemaElementTypePropertyValue, value ); + } + } else if ( UPDATE_COUNT.equals( name ) ) { + try { + final long count = Long.parseLong( value ); + proc.setUpdateCount( transaction, count ); + } catch ( final NumberFormatException e ) { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidIntegerPropertyValue, value ); + } + } else if ( UUID.equals( name ) ) { + proc.setUuid( getTransaction(), value ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, VirtualProcedure.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/virtualprocedure/UnsetVirtualProcedurePropertyCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/virtualprocedure/UnsetVirtualProcedurePropertyCommand.java index dd52f270..03ec6a67 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/virtualprocedure/UnsetVirtualProcedurePropertyCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/virtualprocedure/UnsetVirtualProcedurePropertyCommand.java @@ -52,28 +52,20 @@ protected CommandResult doExecute() { final UnitOfWork transaction = getTransaction(); String errorMsg = null; - switch ( name ) { - case AS_CLAUSE_STATEMENT: - proc.setAsClauseStatement( getTransaction(), null ); - break; - case DESCRIPTION: - proc.setDescription( getTransaction(), null ); - break; - case NAME_IN_SOURCE: - proc.setNameInSource( getTransaction(), null ); - break; - case SCHEMA_ELEMENT_TYPE: - proc.setSchemaElementType( transaction, null ); - break; - case UPDATE_COUNT: - proc.setUpdateCount( transaction, AbstractProcedure.DEFAULT_UPDATE_COUNT ); - break; - case UUID: - proc.setUuid( getTransaction(), null ); - break; - default: - errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, VirtualProcedure.class.getSimpleName() ); - break; + if ( AS_CLAUSE_STATEMENT.equals( name ) ) { + proc.setAsClauseStatement( getTransaction(), null ); + } else if ( DESCRIPTION.equals( name ) ) { + proc.setDescription( getTransaction(), null ); + } else if ( NAME_IN_SOURCE.equals( name ) ) { + proc.setNameInSource( getTransaction(), null ); + } else if ( SCHEMA_ELEMENT_TYPE.equals( name ) ) { + proc.setSchemaElementType( transaction, null ); + } else if ( UPDATE_COUNT.equals( name ) ) { + proc.setUpdateCount( transaction, AbstractProcedure.DEFAULT_UPDATE_COUNT ); + } else if ( UUID.equals( name ) ) { + proc.setUuid( getTransaction(), null ); + } else { + errorMsg = I18n.bind( WorkspaceCommandsI18n.invalidPropertyName, name, VirtualProcedure.class.getSimpleName() ); } if ( StringUtils.isBlank( errorMsg ) ) { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/virtualprocedure/VirtualProcedureCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/virtualprocedure/VirtualProcedureCommandProvider.java index c131abd2..62bd51f8 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/virtualprocedure/VirtualProcedureCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/virtualprocedure/VirtualProcedureCommandProvider.java @@ -36,7 +36,7 @@ public VirtualProcedureCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( AddParameterCommand.class ); result.add( DeleteParameterCommand.class ); diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/workspace/DeleteVdbCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/workspace/DeleteVdbCommand.java index d124562f..47091bd0 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/workspace/DeleteVdbCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/workspace/DeleteVdbCommand.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.List; - import org.komodo.relational.workspace.WorkspaceManager; import org.komodo.shell.CommandResultImpl; import org.komodo.shell.api.Arguments; @@ -19,7 +18,7 @@ import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.utils.i18n.I18n; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * A shell command to delete a Vdb. @@ -47,7 +46,7 @@ protected CommandResult doExecute() { final String vdbName = requiredArgument( 0, I18n.bind( WorkspaceCommandsI18n.missingVdbName ) ); final KomodoObject vdbToDelete = getWorkspaceManager().getChild(getTransaction(), vdbName, VdbLexicon.Vdb.VIRTUAL_DATABASE); - + if( vdbToDelete==null ) { return new CommandResultImpl( false, I18n.bind( WorkspaceCommandsI18n.vdbNotFound, vdbName ), null ); } else { diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/workspace/ExportVdbCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/workspace/ExportVdbCommand.java index 23d5ff2d..1f70b100 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/workspace/ExportVdbCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/workspace/ExportVdbCommand.java @@ -27,7 +27,7 @@ import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.utils.StringUtils; import org.komodo.utils.i18n.I18n; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * A shell command to export a Vdb from Workspace context. diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/workspace/ImportVdbCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/workspace/ImportVdbCommand.java index 8af32823..2cac8b3b 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/workspace/ImportVdbCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/workspace/ImportVdbCommand.java @@ -28,7 +28,7 @@ import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.i18n.I18n; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * A shell command to import a VDB diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/workspace/UploadVdbCommand.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/workspace/UploadVdbCommand.java index a46cbec9..d6a600cb 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/workspace/UploadVdbCommand.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/workspace/UploadVdbCommand.java @@ -12,7 +12,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; - import org.komodo.relational.vdb.Vdb; import org.komodo.relational.workspace.WorkspaceManager; import org.komodo.shell.CommandResultImpl; @@ -27,7 +26,7 @@ import org.komodo.utils.StringUtils; import org.komodo.utils.i18n.I18n; import org.modeshape.jcr.JcrLexicon; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * Loads a {@link Vdb VDB} from a local file. diff --git a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/workspace/WorkspaceCommandProvider.java b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/workspace/WorkspaceCommandProvider.java index 21c1ecaa..32aefa8b 100644 --- a/komodo-relational-commands/src/main/java/org/komodo/relational/commands/workspace/WorkspaceCommandProvider.java +++ b/komodo-relational-commands/src/main/java/org/komodo/relational/commands/workspace/WorkspaceCommandProvider.java @@ -36,7 +36,7 @@ public WorkspaceCommandProvider() { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( CreateDatasourceCommand.class ); result.add( CreateSchemaCommand.class ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/AbstractCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/AbstractCommandTest.java index 2bc9ff73..0c7d79df 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/AbstractCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/AbstractCommandTest.java @@ -46,7 +46,10 @@ public abstract class AbstractCommandTest extends org.komodo.shell.AbstractComma final Path targetDir = Paths.get( relativeTargetPath ); LOGGER.debug( "AbstractCommandTest: Looking for jar here: {0}", targetDir ); - try ( final DirectoryStream< Path > stream = Files.newDirectoryStream( targetDir, "*-with-dependencies.jar" ) ) { + DirectoryStream< Path > stream = null; + + try { + stream = Files.newDirectoryStream( targetDir, "*-with-dependencies.jar" ); final Iterator< Path > itr = stream.iterator(); if ( itr.hasNext() ) { @@ -69,6 +72,10 @@ public abstract class AbstractCommandTest extends org.komodo.shell.AbstractComma } } catch ( final IOException e ) { Assert.fail( "Failed to copy jar to commands directory: " + e.getMessage() ); //$NON-NLS-1$ + } finally { + if ( stream != null ) { + stream.close(); + } } } } catch ( final Exception e ) { diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/column/ColumnRenameCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/column/ColumnRenameCommandTest.java index 28ef3e72..8ddaf93f 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/column/ColumnRenameCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/column/ColumnRenameCommandTest.java @@ -45,7 +45,7 @@ public void shouldNotHaveTabCompletion() throws Exception { final String[] commands = { "cd myColumn1" }; final CommandResult result = execute( commands ); assertCommandResultOk( result ); - assertTabCompletion( "rename ", Collections.emptyList() ); + assertTabCompletion( "rename ", Collections.emptyList() ); } @Test diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/column/SetColumnPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/column/SetColumnPropertyCommandTest.java index f41363d3..7611152d 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/column/SetColumnPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/column/SetColumnPropertyCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.column; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Column; @@ -73,7 +71,7 @@ public void testSetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addColumns.cmd"); final String[] commands = { "cd myColumn1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/column/UnsetColumnPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/column/UnsetColumnPropertyCommandTest.java index 9b336150..9eda495b 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/column/UnsetColumnPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/column/UnsetColumnPropertyCommandTest.java @@ -17,9 +17,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Column; @@ -77,7 +75,7 @@ public void testUnsetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addColumns.cmd"); final String[] commands = { "cd myColumn1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/condition/ConditionRenameCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/condition/ConditionRenameCommandTest.java index 016c20ac..637ef003 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/condition/ConditionRenameCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/condition/ConditionRenameCommandTest.java @@ -20,6 +20,7 @@ import java.util.Collections; import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; +import org.komodo.relational.commands.storedprocedure.StoredProcedureRenameCommand; import org.komodo.shell.api.CommandResult; /** @@ -45,7 +46,7 @@ public void shouldNotHaveTabCompletion() throws Exception { final String[] commands = { "cd myCondition1" }; final CommandResult result = execute( commands ); assertCommandResultOk( result ); - assertTabCompletion( "rename ", Collections.emptyList() ); + assertTabCompletion( "rename ", Collections.emptyList() ); } @Test diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/condition/SetConditionPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/condition/SetConditionPropertyCommandTest.java index 89d693d1..64c9c30c 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/condition/SetConditionPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/condition/SetConditionPropertyCommandTest.java @@ -66,7 +66,7 @@ public void testSetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addConditions.cmd"); final String[] commands = { "cd myCondition1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/condition/UnsetConditionPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/condition/UnsetConditionPropertyCommandTest.java index ca9c7485..6e1e5178 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/condition/UnsetConditionPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/condition/UnsetConditionPropertyCommandTest.java @@ -69,7 +69,7 @@ public void testUnsetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addConditions.cmd"); final String[] commands = { "cd myCondition1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/datarole/DeleteMappedRoleCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/datarole/DeleteMappedRoleCommandTest.java index 55d783a7..def79330 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/datarole/DeleteMappedRoleCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/datarole/DeleteMappedRoleCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.datarole; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.vdb.DataRole; @@ -63,7 +61,7 @@ public void testSetProperty1() throws Exception { public void testTabCompleter()throws Exception{ setup("commandFiles","addMappedRoles.cmd"); - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); candidates.add("myMappedRole1"); candidates.add("myMappedRole2"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/datarole/DeletePermissionCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/datarole/DeletePermissionCommandTest.java index 6da6e280..0c2e83bd 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/datarole/DeletePermissionCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/datarole/DeletePermissionCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.datarole; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.vdb.DataRole; @@ -64,7 +62,7 @@ public void testSetProperty1() throws Exception { public void testTabCompleter()throws Exception{ setup("commandFiles","addPermissions.cmd"); - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); candidates.add("myPermission1"); candidates.add("myPermission2"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/datarole/SetDataRolePropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/datarole/SetDataRolePropertyCommandTest.java index 7e86a094..bfcf9104 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/datarole/SetDataRolePropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/datarole/SetDataRolePropertyCommandTest.java @@ -56,7 +56,7 @@ public void testSetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addDataRoles.cmd"); final String[] commands = { "cd myDatarole1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/datarole/UnsetDataRolePropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/datarole/UnsetDataRolePropertyCommandTest.java index 56148979..76e6aa03 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/datarole/UnsetDataRolePropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/datarole/UnsetDataRolePropertyCommandTest.java @@ -56,7 +56,7 @@ public void testUnsetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addDataRoles.cmd"); final String[] commands = { "cd myDatarole1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/entry/EntryRenameCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/entry/EntryRenameCommandTest.java index 74d0ee18..1ee3662b 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/entry/EntryRenameCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/entry/EntryRenameCommandTest.java @@ -47,7 +47,7 @@ public void shouldNotHaveTabCompletion() throws Exception { final String[] commands = { "cd myEntry1" }; final CommandResult result = execute( commands ); assertCommandResultOk( result ); - assertTabCompletion( "rename ", Collections.emptyList() ); + assertTabCompletion( "rename ", Collections.emptyList() ); } @Test diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/foreignkey/DeleteReferenceColumnCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/foreignkey/DeleteReferenceColumnCommandTest.java index 84741aae..82373f85 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/foreignkey/DeleteReferenceColumnCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/foreignkey/DeleteReferenceColumnCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.foreignkey; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Column; @@ -89,7 +87,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addRefColumns.cmd"); candidates.add("/workspace/myVDB1/myModel1/myTable2/myColumn1"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/mask/MaskRenameCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/mask/MaskRenameCommandTest.java index 4c004736..2cae4385 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/mask/MaskRenameCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/mask/MaskRenameCommandTest.java @@ -45,7 +45,7 @@ public void shouldNotHaveTabCompletion() throws Exception { final String[] commands = { "cd myMask1" }; final CommandResult result = execute( commands ); assertCommandResultOk( result ); - assertTabCompletion( "rename ", Collections.emptyList() ); + assertTabCompletion( "rename ", Collections.emptyList() ); } @Test diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/mask/SetMaskPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/mask/SetMaskPropertyCommandTest.java index 58ecf918..893219bd 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/mask/SetMaskPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/mask/SetMaskPropertyCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.mask; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.vdb.DataRole; @@ -69,7 +67,7 @@ public void testSetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addMasks.cmd"); final String[] commands = { "cd myMask1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/mask/UnsetMaskPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/mask/UnsetMaskPropertyCommandTest.java index 0c6cd740..c0901c96 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/mask/UnsetMaskPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/mask/UnsetMaskPropertyCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.mask; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.vdb.DataRole; @@ -70,7 +68,7 @@ public void testUnsetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addMasks.cmd"); final String[] commands = { "cd myMask1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeletePushdownFunctionCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeletePushdownFunctionCommandTest.java index f132fedb..136d7e24 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeletePushdownFunctionCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeletePushdownFunctionCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.model; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Function; @@ -64,7 +62,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addPushdownFunctions.cmd"); candidates.add("myPushdownFunction1"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteSourceCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteSourceCommandTest.java index 734afe0d..d5bb88d8 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteSourceCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteSourceCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.model; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Model; @@ -62,7 +60,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addSources.cmd"); candidates.add("mySource1"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteStoredProcedureCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteStoredProcedureCommandTest.java index bfcf27ca..a06de011 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteStoredProcedureCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteStoredProcedureCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.model; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Model; @@ -64,7 +62,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addStoredProcedures.cmd"); candidates.add("myStoredProcedure1"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteTableCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteTableCommandTest.java index 3ea9024e..4325685e 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteTableCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteTableCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.model; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Model; @@ -62,7 +60,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addTables.cmd"); candidates.add("myTable1"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteUserDefinedFunctionCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteUserDefinedFunctionCommandTest.java index 2a814c4b..c977a1b0 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteUserDefinedFunctionCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteUserDefinedFunctionCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.model; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Function; @@ -64,7 +62,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addUserDefinedFunctions.cmd"); candidates.add("myUserDefinedFunction1"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteViewCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteViewCommandTest.java index f0a153ff..7aaa7d92 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteViewCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteViewCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.model; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Model; @@ -62,7 +60,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addViews.cmd"); candidates.add("myView1"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteVirtualProcedureCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteVirtualProcedureCommandTest.java index 96d0c3e0..de5d9597 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteVirtualProcedureCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/DeleteVirtualProcedureCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.model; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Model; @@ -64,7 +62,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addVirtualProcedures.cmd"); candidates.add("myVirtualProcedure1"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/SetModelPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/SetModelPropertyCommandTest.java index f799f2ed..b0203d31 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/SetModelPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/SetModelPropertyCommandTest.java @@ -55,7 +55,7 @@ public void testSetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addModels.cmd"); final String[] commands = { "cd myModel1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/UnsetModelPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/UnsetModelPropertyCommandTest.java index c685a0a5..014a957b 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/UnsetModelPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/model/UnsetModelPropertyCommandTest.java @@ -56,7 +56,7 @@ public void testUnsetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addModels.cmd"); final String[] commands = { "cd myModel1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/modelsource/SetModelSourcePropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/modelsource/SetModelSourcePropertyCommandTest.java index c76626ec..bacbd1ea 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/modelsource/SetModelSourcePropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/modelsource/SetModelSourcePropertyCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.modelsource; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Model; @@ -64,7 +62,7 @@ public void testSetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addSources.cmd"); final String[] commands = { "cd mySource1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/modelsource/UnsetModelSourcePropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/modelsource/UnsetModelSourcePropertyCommandTest.java index cf6cced1..eae3baf9 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/modelsource/UnsetModelSourcePropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/modelsource/UnsetModelSourcePropertyCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.modelsource; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Model; @@ -65,7 +63,7 @@ public void testUnsetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addSources.cmd"); final String[] commands = { "cd mySource1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/permission/DeleteConditionCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/permission/DeleteConditionCommandTest.java index 3a299b6f..86cb0819 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/permission/DeleteConditionCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/permission/DeleteConditionCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.permission; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.vdb.Condition; @@ -68,7 +66,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addConditions.cmd"); candidates.add("myCondition1"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/permission/DeleteMaskCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/permission/DeleteMaskCommandTest.java index 261cb2ce..917c5914 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/permission/DeleteMaskCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/permission/DeleteMaskCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.permission; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.vdb.DataRole; @@ -67,7 +65,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addMasks.cmd"); candidates.add("myMask1"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/permission/SetPermissionPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/permission/SetPermissionPropertyCommandTest.java index d566a39d..be229813 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/permission/SetPermissionPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/permission/SetPermissionPropertyCommandTest.java @@ -60,7 +60,7 @@ public void testSetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addPermissions.cmd"); final String[] commands = { "cd myPermission1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/permission/UnsetPermissionPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/permission/UnsetPermissionPropertyCommandTest.java index d1ad56c5..7e73dc09 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/permission/UnsetPermissionPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/permission/UnsetPermissionPropertyCommandTest.java @@ -61,7 +61,7 @@ public void testUnsetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addPermissions.cmd"); final String[] commands = { "cd myPermission1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/pushdownfunction/DeleteParameterCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/pushdownfunction/DeleteParameterCommandTest.java index 1b2d70c0..61fbafab 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/pushdownfunction/DeleteParameterCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/pushdownfunction/DeleteParameterCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.pushdownfunction; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Function; @@ -71,7 +69,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addPushdownFuncParams.cmd"); candidates.add("myParameter1"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/pushdownfunction/PushdownFunctionRenameCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/pushdownfunction/PushdownFunctionRenameCommandTest.java index 53334e31..03f401ae 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/pushdownfunction/PushdownFunctionRenameCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/pushdownfunction/PushdownFunctionRenameCommandTest.java @@ -19,7 +19,7 @@ import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.shell.api.CommandResult; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; /** * Test Class to test {@link PushdownFunctionRenameCommand}. @@ -53,7 +53,7 @@ public void shouldNotHaveResultSetCandidateInTabCompletion() throws Exception { "set-result-set DataTypeResultSet" }; final CommandResult result = execute( commands ); assertCommandResultOk( result ); - assertTabCompletion( "rename ", Collections.emptyList() ); + assertTabCompletion( "rename ", Collections.emptyList() ); } } diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/pushdownfunction/SetPushdownFunctionPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/pushdownfunction/SetPushdownFunctionPropertyCommandTest.java index 5222e1b4..512e3dd6 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/pushdownfunction/SetPushdownFunctionPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/pushdownfunction/SetPushdownFunctionPropertyCommandTest.java @@ -65,7 +65,7 @@ public void testSetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addPushdownFunctions.cmd"); final String[] commands = { "cd myPushdownFunction1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/pushdownfunction/UnsetPushdownFunctionPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/pushdownfunction/UnsetPushdownFunctionPropertyCommandTest.java index 14a7ac28..323d7fcf 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/pushdownfunction/UnsetPushdownFunctionPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/pushdownfunction/UnsetPushdownFunctionPropertyCommandTest.java @@ -66,7 +66,7 @@ public void testUnsetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addPushdownFunctions.cmd"); final String[] commands = { "cd myPushdownFunction1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/resultsetcolumn/SetResultSetColumnPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/resultsetcolumn/SetResultSetColumnPropertyCommandTest.java index 7930d4ab..75a2860b 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/resultsetcolumn/SetResultSetColumnPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/resultsetcolumn/SetResultSetColumnPropertyCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.resultsetcolumn; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Function; @@ -84,7 +82,7 @@ public void testSetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addResSetColumns.cmd"); final String[] commands = { "cd myColumn1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/resultsetcolumn/UnsetResultSetColumnPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/resultsetcolumn/UnsetResultSetColumnPropertyCommandTest.java index e11af8d3..cc6e0bca 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/resultsetcolumn/UnsetResultSetColumnPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/resultsetcolumn/UnsetResultSetColumnPropertyCommandTest.java @@ -17,9 +17,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Function; @@ -86,7 +84,7 @@ public void testUnsetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addResSetColumns.cmd"); final String[] commands = { "cd myColumn1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/schema/SetSchemaPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/schema/SetSchemaPropertyCommandTest.java index 7fdb8b41..0f3cc016 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/schema/SetSchemaPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/schema/SetSchemaPropertyCommandTest.java @@ -34,7 +34,7 @@ public void testSetProperty1() throws Exception { final String[] commands = { "create-schema testSchema", "cd testSchema", - "set-property rendition \"CREATE FOREIGN TABLE G1 (e1 integer) OPTIONS (ANNOTATION 'test', CARDINALITY '12');\"" }; + "set-property rendition \"CREATE FOREIGN TABLE G1 (e1 integer) OPTIONS (ANNOTATION 'test', CARDINALITY '12');\""}; final CommandResult result = execute( commands ); assertCommandResultOk(result); @@ -49,7 +49,7 @@ public void testSetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addSchemas.cmd"); final String[] commands = { "cd mySchema1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/schema/UnsetSchemaPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/schema/UnsetSchemaPropertyCommandTest.java index 979fce5c..883f56d0 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/schema/UnsetSchemaPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/schema/UnsetSchemaPropertyCommandTest.java @@ -52,7 +52,7 @@ public void testUnsetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addSchemas.cmd"); final String[] commands = { "cd mySchema1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/storedprocedure/DeleteParameterCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/storedprocedure/DeleteParameterCommandTest.java index 5d134a52..0d1cc4bd 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/storedprocedure/DeleteParameterCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/storedprocedure/DeleteParameterCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.storedprocedure; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Model; @@ -71,7 +69,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addStoredProcParams.cmd"); candidates.add("myParameter1"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/storedprocedure/SetStoredProcedurePropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/storedprocedure/SetStoredProcedurePropertyCommandTest.java index c905a69e..7921395b 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/storedprocedure/SetStoredProcedurePropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/storedprocedure/SetStoredProcedurePropertyCommandTest.java @@ -64,7 +64,7 @@ public void testSetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addStoredProcedures.cmd"); final String[] commands = { "cd myStoredProcedure1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/storedprocedure/StoredProcedureRenameCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/storedprocedure/StoredProcedureRenameCommandTest.java index 53b335d1..40f3b52c 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/storedprocedure/StoredProcedureRenameCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/storedprocedure/StoredProcedureRenameCommandTest.java @@ -19,7 +19,7 @@ import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.shell.api.CommandResult; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; /** * Test Class to test {@link StoredProcedureRenameCommand}. @@ -53,7 +53,7 @@ public void shouldNotHaveResultSetCandidateInTabCompletion() throws Exception { "set-result-set DataTypeResultSet" }; final CommandResult result = execute( commands ); assertCommandResultOk( result ); - assertTabCompletion( "rename ", Collections.emptyList() ); + assertTabCompletion( "rename ", Collections.emptyList() ); } } diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/storedprocedure/UnsetStoredProcedurePropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/storedprocedure/UnsetStoredProcedurePropertyCommandTest.java index 845f6b46..dd56e66c 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/storedprocedure/UnsetStoredProcedurePropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/storedprocedure/UnsetStoredProcedurePropertyCommandTest.java @@ -65,7 +65,7 @@ public void testUnsetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addStoredProcedures.cmd"); final String[] commands = { "cd myStoredProcedure1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeleteAccessPatternCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeleteAccessPatternCommandTest.java index a701ce3a..c4cfadd8 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeleteAccessPatternCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeleteAccessPatternCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.table; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.AccessPattern; @@ -70,7 +68,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addTableAccessPatterns.cmd"); candidates.add("myAccessPattern1"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeleteColumnCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeleteColumnCommandTest.java index 23c7458a..2328c7bb 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeleteColumnCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeleteColumnCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.table; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Column; @@ -70,7 +68,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); candidates.add("myColumn1"); candidates.add("myColumn2"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeleteForeignKeyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeleteForeignKeyCommandTest.java index 8ead7bc1..a19b4f9a 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeleteForeignKeyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeleteForeignKeyCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.table; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.ForeignKey; @@ -80,7 +78,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); candidates.add("myForeignKey1"); candidates.add("myForeignKey2"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeleteIndexCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeleteIndexCommandTest.java index f3e14fca..b4858514 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeleteIndexCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeleteIndexCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.table; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Index; @@ -70,7 +68,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); candidates.add("myIndex1"); candidates.add("myIndex2"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeletePrimaryKeyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeletePrimaryKeyCommandTest.java index b6c44f3d..49caf4eb 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeletePrimaryKeyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeletePrimaryKeyCommandTest.java @@ -17,9 +17,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Model; @@ -69,7 +67,7 @@ public void shouldRemovePrimaryKey() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); candidates.add("myPrimaryKey"); setup("commandFiles","addPrimaryKey.cmd"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeleteUniqueConstraintCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeleteUniqueConstraintCommandTest.java index c5737b1b..a860a2e7 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeleteUniqueConstraintCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/DeleteUniqueConstraintCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.table; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Model; @@ -70,7 +68,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); candidates.add("myUniqueConstraint1"); candidates.add("myUniqueConstraint2"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/SetTablePropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/SetTablePropertyCommandTest.java index aaa7b81d..1c35d2f3 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/SetTablePropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/SetTablePropertyCommandTest.java @@ -62,7 +62,7 @@ public void testSetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addTables.cmd"); final String[] commands = { "cd myTable1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/UnsetTablePropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/UnsetTablePropertyCommandTest.java index 9c01c19a..e037c1f9 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/UnsetTablePropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/table/UnsetTablePropertyCommandTest.java @@ -63,7 +63,7 @@ public void testUnsetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addTables.cmd"); final String[] commands = { "cd myTable1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/teiid/SetTeiidPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/teiid/SetTeiidPropertyCommandTest.java index ccc5d289..576bb1de 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/teiid/SetTeiidPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/teiid/SetTeiidPropertyCommandTest.java @@ -49,7 +49,7 @@ public void testSetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addServers.cmd"); final String[] commands = { "cd myServer1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/teiid/UnsetTeiidPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/teiid/UnsetTeiidPropertyCommandTest.java index dad68353..a98a88d9 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/teiid/UnsetTeiidPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/teiid/UnsetTeiidPropertyCommandTest.java @@ -50,7 +50,7 @@ public void testUnsetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addServers.cmd"); final String[] commands = { "cd myServer1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/translator/SetTranslatorPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/translator/SetTranslatorPropertyCommandTest.java index 885de9dd..0602bf2a 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/translator/SetTranslatorPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/translator/SetTranslatorPropertyCommandTest.java @@ -55,7 +55,7 @@ public void testSetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addTranslators.cmd"); final String[] commands = { "cd myTranslator1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/translator/TranslatorRenameCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/translator/TranslatorRenameCommandTest.java index a137da6e..e2e8528a 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/translator/TranslatorRenameCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/translator/TranslatorRenameCommandTest.java @@ -45,7 +45,7 @@ public void shouldNotHaveTabCompletion() throws Exception { final String[] commands = { "cd myTranslator1" }; final CommandResult result = execute( commands ); assertCommandResultOk( result ); - assertTabCompletion( "rename ", Collections.emptyList() ); + assertTabCompletion( "rename ", Collections.emptyList() ); } @Test diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/translator/UnsetTranslatorPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/translator/UnsetTranslatorPropertyCommandTest.java index 7f25c821..3ac16aff 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/translator/UnsetTranslatorPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/translator/UnsetTranslatorPropertyCommandTest.java @@ -56,7 +56,7 @@ public void testUnsetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addTranslators.cmd"); final String[] commands = { "cd myTranslator1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/userdefinedfunction/DeleteParameterCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/userdefinedfunction/DeleteParameterCommandTest.java index dd99fafb..badc6c57 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/userdefinedfunction/DeleteParameterCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/userdefinedfunction/DeleteParameterCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.userdefinedfunction; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Function; @@ -71,7 +69,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addUserDefFuncParams.cmd"); candidates.add("myParameter1"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/userdefinedfunction/SetUserDefinedFunctionPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/userdefinedfunction/SetUserDefinedFunctionPropertyCommandTest.java index 1c4cf39b..9b0a2a9b 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/userdefinedfunction/SetUserDefinedFunctionPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/userdefinedfunction/SetUserDefinedFunctionPropertyCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.userdefinedfunction; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Function; @@ -67,7 +65,7 @@ public void testSetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addUserDefinedFunctions.cmd"); final String[] commands = { "cd myUserDefinedFunction1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/userdefinedfunction/UnsetUserDefinedFunctionPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/userdefinedfunction/UnsetUserDefinedFunctionPropertyCommandTest.java index 274a7b9b..07dba0c8 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/userdefinedfunction/UnsetUserDefinedFunctionPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/userdefinedfunction/UnsetUserDefinedFunctionPropertyCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.userdefinedfunction; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Function; @@ -68,7 +66,7 @@ public void testUnsetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addUserDefinedFunctions.cmd"); final String[] commands = { "cd myUserDefinedFunction1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/DeleteDataRoleCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/DeleteDataRoleCommandTest.java index 632d7962..df93f912 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/DeleteDataRoleCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/DeleteDataRoleCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.vdb; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.vdb.DataRole; @@ -56,7 +54,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); candidates.add("myDatarole1"); candidates.add("myDatarole2"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/DeleteEntryCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/DeleteEntryCommandTest.java index 21c7d612..51c2589e 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/DeleteEntryCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/DeleteEntryCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.vdb; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Ignore; import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; @@ -59,7 +57,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); candidates.add("myEntry1"); candidates.add("myEntry2"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/DeleteImportCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/DeleteImportCommandTest.java index daccad50..e6729f99 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/DeleteImportCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/DeleteImportCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.vdb; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.vdb.Vdb; @@ -56,7 +54,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); candidates.add("myImport1"); candidates.add("myImport2"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/DeleteModelCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/DeleteModelCommandTest.java index 0cebfba5..69f94630 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/DeleteModelCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/DeleteModelCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.vdb; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Model; @@ -56,7 +54,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); candidates.add("myModel1"); candidates.add("myModel2"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/DeleteTranslatorCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/DeleteTranslatorCommandTest.java index 8d66dffa..c2a10c08 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/DeleteTranslatorCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/DeleteTranslatorCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.vdb; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.vdb.Translator; @@ -56,7 +54,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); candidates.add("myTranslator1"); candidates.add("myTranslator2"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/SetVdbPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/SetVdbPropertyCommandTest.java index e34ce110..3b184b92 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/SetVdbPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/SetVdbPropertyCommandTest.java @@ -49,7 +49,7 @@ public void testSetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addVDBs.cmd"); final String[] commands = { "cd myVDB1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/UnsetVdbPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/UnsetVdbPropertyCommandTest.java index 75393980..7a69e18a 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/UnsetVdbPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdb/UnsetVdbPropertyCommandTest.java @@ -50,7 +50,7 @@ public void testUnsetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addVDBs.cmd"); final String[] commands = { "cd myVDB1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdbimport/SetVdbImportPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdbimport/SetVdbImportPropertyCommandTest.java index 0880e6d9..ff73a986 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdbimport/SetVdbImportPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdbimport/SetVdbImportPropertyCommandTest.java @@ -55,7 +55,7 @@ public void testSetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addVDBImports.cmd"); final String[] commands = { "cd myImport1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdbimport/UnsetVdbImportPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdbimport/UnsetVdbImportPropertyCommandTest.java index e0cac8ea..52d6441b 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdbimport/UnsetVdbImportPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdbimport/UnsetVdbImportPropertyCommandTest.java @@ -56,7 +56,7 @@ public void testUnsetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addVDBImports.cmd"); final String[] commands = { "cd myImport1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdbimport/VdbImportRenameCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdbimport/VdbImportRenameCommandTest.java index df8bf07a..deeeb82f 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdbimport/VdbImportRenameCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/vdbimport/VdbImportRenameCommandTest.java @@ -45,7 +45,7 @@ public void shouldNotHaveTabCompletion() throws Exception { final String[] commands = { "cd myImport1" }; final CommandResult result = execute( commands ); assertCommandResultOk( result ); - assertTabCompletion( "rename ", Collections.emptyList() ); + assertTabCompletion( "rename ", Collections.emptyList() ); } @Test diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/view/DeleteColumnCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/view/DeleteColumnCommandTest.java index bbad7847..5a8face7 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/view/DeleteColumnCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/view/DeleteColumnCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.view; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Column; @@ -70,7 +68,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); candidates.add("myColumn1"); candidates.add("myColumn2"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/view/SetViewPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/view/SetViewPropertyCommandTest.java index be8be6eb..cdb18772 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/view/SetViewPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/view/SetViewPropertyCommandTest.java @@ -62,7 +62,7 @@ public void testSetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addViews.cmd"); final String[] commands = { "cd myView1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/view/UnsetViewPropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/view/UnsetViewPropertyCommandTest.java index a4701f0b..e4a1d224 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/view/UnsetViewPropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/view/UnsetViewPropertyCommandTest.java @@ -63,7 +63,7 @@ public void testUnsetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addViews.cmd"); final String[] commands = { "cd myView1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/virtualprocedure/DeleteParameterCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/virtualprocedure/DeleteParameterCommandTest.java index b1428421..bbbaa5c6 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/virtualprocedure/DeleteParameterCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/virtualprocedure/DeleteParameterCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.virtualprocedure; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Model; @@ -71,7 +69,7 @@ public void testDelete1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addVirtualProcParams.cmd"); candidates.add("myParameter1"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/virtualprocedure/SetVirtualProcedurePropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/virtualprocedure/SetVirtualProcedurePropertyCommandTest.java index 99d6bc50..7176a534 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/virtualprocedure/SetVirtualProcedurePropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/virtualprocedure/SetVirtualProcedurePropertyCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.virtualprocedure; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Model; @@ -67,7 +65,7 @@ public void testSetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addVirtualProcedures.cmd"); final String[] commands = { "cd myVirtualProcedure1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/virtualprocedure/UnsetVirtualProcedurePropertyCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/virtualprocedure/UnsetVirtualProcedurePropertyCommandTest.java index fbf68241..1d0a9946 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/virtualprocedure/UnsetVirtualProcedurePropertyCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/virtualprocedure/UnsetVirtualProcedurePropertyCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.virtualprocedure; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Model; @@ -68,7 +66,7 @@ public void testUnsetProperty1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addVirtualProcedures.cmd"); final String[] commands = { "cd myVirtualProcedure1" }; final CommandResult result = execute( commands ); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/workspace/DeleteSchemaCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/workspace/DeleteSchemaCommandTest.java index 96a5982d..8cd67c92 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/workspace/DeleteSchemaCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/workspace/DeleteSchemaCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.workspace; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.model.Schema; @@ -52,7 +50,7 @@ public void testDeleteSchema1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); candidates.add("mySchema1"); candidates.add("mySchema2"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/workspace/DeleteTeiidCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/workspace/DeleteTeiidCommandTest.java index 58af0177..8ef4e82a 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/workspace/DeleteTeiidCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/workspace/DeleteTeiidCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.workspace; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.teiid.Teiid; @@ -52,7 +50,7 @@ public void testDeleteTeiid1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); candidates.add("myServer1"); candidates.add("myServer2"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/workspace/DeleteVdbCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/workspace/DeleteVdbCommandTest.java index f7c41d5c..ba3bafbb 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/workspace/DeleteVdbCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/workspace/DeleteVdbCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.relational.commands.workspace; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.relational.vdb.Vdb; @@ -52,7 +50,7 @@ public void testDeleteVdb1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); candidates.add("myVDB1"); candidates.add("myVDB2"); diff --git a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/workspace/ExportVdbCommandTest.java b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/workspace/ExportVdbCommandTest.java index 53ad8709..d9ca2e47 100644 --- a/komodo-relational-commands/src/test/java/org/komodo/relational/commands/workspace/ExportVdbCommandTest.java +++ b/komodo-relational-commands/src/test/java/org/komodo/relational/commands/workspace/ExportVdbCommandTest.java @@ -17,12 +17,10 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; - import java.io.File; import java.io.FileInputStream; import java.io.InputStream; import java.util.ArrayList; - import org.junit.Test; import org.komodo.relational.commands.AbstractCommandTest; import org.komodo.shell.api.CommandResult; @@ -166,7 +164,7 @@ private void testExportAllElementsVdb( final boolean exportFromWorkspaceContext @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); candidates.add("myVDB1"); candidates.add("myVDB2"); diff --git a/komodo-relational/.classpath b/komodo-relational/.classpath index fae1a2b3..550e3f2a 100644 --- a/komodo-relational/.classpath +++ b/komodo-relational/.classpath @@ -22,12 +22,13 @@ - + + - + diff --git a/komodo-relational/.project b/komodo-relational/.project index 759d3991..38ff443b 100644 --- a/komodo-relational/.project +++ b/komodo-relational/.project @@ -5,11 +5,21 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder + + org.eclipse.wst.validation.validationbuilder + + + org.eclipse.m2e.core.maven2Builder @@ -19,5 +29,7 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.common.modulecore.ModuleCoreNature diff --git a/komodo-relational/pom.xml b/komodo-relational/pom.xml index 650d4206..927acdd8 100644 --- a/komodo-relational/pom.xml +++ b/komodo-relational/pom.xml @@ -9,7 +9,7 @@ komodo-relational Komodo Relational Relational modelling framework - + org.komodo diff --git a/komodo-relational/src/main/java/org/komodo/relational/ExcludeQNamesFilter.java b/komodo-relational/src/main/java/org/komodo/relational/ExcludeQNamesFilter.java index 403e0c4f..b3485c1a 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/ExcludeQNamesFilter.java +++ b/komodo-relational/src/main/java/org/komodo/relational/ExcludeQNamesFilter.java @@ -28,7 +28,7 @@ public class ExcludeQNamesFilter implements Filter { */ public ExcludeQNamesFilter( final String... namesToExclude ) { ArgCheck.isNotEmpty( namesToExclude, "qnames" ); //$NON-NLS-1$ - this.qnames = new ArrayList<>( namesToExclude.length ); + this.qnames = new ArrayList< String >( namesToExclude.length ); for ( final String name : namesToExclude ) { this.qnames.add( name ); diff --git a/komodo-relational/src/main/java/org/komodo/relational/RelationalLabelProvider.java b/komodo-relational/src/main/java/org/komodo/relational/RelationalLabelProvider.java index 7a3cd721..8cee2be3 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/RelationalLabelProvider.java +++ b/komodo-relational/src/main/java/org/komodo/relational/RelationalLabelProvider.java @@ -9,7 +9,6 @@ import java.util.Arrays; import java.util.List; - import org.komodo.relational.internal.TypeResolverRegistry; import org.komodo.shell.DefaultLabelProvider; import org.komodo.shell.ShellI18n; @@ -18,7 +17,7 @@ import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.utils.KLog; import org.komodo.utils.i18n.I18n; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * A label provider for relational objects. diff --git a/komodo-relational/src/main/java/org/komodo/relational/RelationalModelFactory.java b/komodo-relational/src/main/java/org/komodo/relational/RelationalModelFactory.java index d29e42ca..f1474fbb 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/RelationalModelFactory.java +++ b/komodo-relational/src/main/java/org/komodo/relational/RelationalModelFactory.java @@ -79,12 +79,12 @@ import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; import org.komodo.utils.StringUtils; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.Constraint; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateTable; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.SchemaElement; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.Constraint; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateTable; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.SchemaElement; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * A factory for {@link RelationalObject relational model objects}. diff --git a/komodo-relational/src/main/java/org/komodo/relational/RelationalObject.java b/komodo-relational/src/main/java/org/komodo/relational/RelationalObject.java index f312d5c5..69148e4d 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/RelationalObject.java +++ b/komodo-relational/src/main/java/org/komodo/relational/RelationalObject.java @@ -15,7 +15,7 @@ import org.modeshape.jcr.JcrMixLexicon; import org.modeshape.jcr.JcrNtLexicon; import org.modeshape.jcr.ModeShapeLexicon; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; /** * A {@link KomodoObject} related to a relational model. diff --git a/komodo-relational/src/main/java/org/komodo/relational/importer/ddl/DdlImporter.java b/komodo-relational/src/main/java/org/komodo/relational/importer/ddl/DdlImporter.java index 37afad4a..b4c8df45 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/importer/ddl/DdlImporter.java +++ b/komodo-relational/src/main/java/org/komodo/relational/importer/ddl/DdlImporter.java @@ -38,8 +38,8 @@ import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.utils.ArgCheck; import org.komodo.utils.ModelType; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlParser; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlParser; /** * Importer implementation for importing from DDL Schema. diff --git a/komodo-relational/src/main/java/org/komodo/relational/internal/RelationalObjectImpl.java b/komodo-relational/src/main/java/org/komodo/relational/internal/RelationalObjectImpl.java index ec2249e4..b4cb0b00 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/internal/RelationalObjectImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/internal/RelationalObjectImpl.java @@ -117,7 +117,7 @@ public KomodoObject[] getChildren( final UnitOfWork transaction, if ( kids.length == 0 ) { result = kids; } else { - final List< KomodoObject > temp = new ArrayList<>( kids.length ); + final List< KomodoObject > temp = new ArrayList< KomodoObject >( kids.length ); for ( final KomodoObject kobject : kids ) { // ensure child has at least one non-filtered descriptor @@ -159,7 +159,7 @@ public KomodoObject[] getChildrenOfType( final UnitOfWork transaction, if ( kids.length == 0 ) { result = kids; } else { - final List< KomodoObject > temp = new ArrayList<>( kids.length ); + final List< KomodoObject > temp = new ArrayList< KomodoObject >( kids.length ); for ( final KomodoObject kobject : kids ) { // ensure child has at least one non-filtered descriptor @@ -213,7 +213,7 @@ public Descriptor[] getDescriptors( final UnitOfWork transaction ) throws KExcep ArgCheck.isTrue( ( transaction.getState() == State.NOT_STARTED ), "transaction state is not NOT_STARTED" ); //$NON-NLS-1$ final Descriptor[] temp = super.getDescriptors( transaction ); - final List< Descriptor > result = new ArrayList<>( temp.length ); + final List< Descriptor > result = new ArrayList< Descriptor >( temp.length ); if ( ( temp.length != 0 ) && ( getFilters().length != 0 ) ) { for ( final Descriptor descriptor : temp ) { @@ -306,7 +306,7 @@ public PropertyDescriptor[] getPropertyDescriptors( final UnitOfWork transaction ArgCheck.isTrue( ( transaction.getState() == State.NOT_STARTED ), "transaction state is not NOT_STARTED" ); //$NON-NLS-1$ final PropertyDescriptor[] descriptors = super.getPropertyDescriptors( transaction ); - final List< PropertyDescriptor > result = new ArrayList<>( descriptors.length ); + final List< PropertyDescriptor > result = new ArrayList< PropertyDescriptor >( descriptors.length ); for ( final PropertyDescriptor descriptor : descriptors ) { if ( !isPropertyFiltered( descriptor.getName() ) ) { @@ -329,7 +329,7 @@ public String[] getPropertyNames( final UnitOfWork transaction ) throws KExcepti ArgCheck.isTrue( ( transaction.getState() == State.NOT_STARTED ), "transaction state is not NOT_STARTED" ); //$NON-NLS-1$ final String[] props = super.getPropertyNames( transaction ); - final List< String > result = new ArrayList<>( props.length ); + final List< String > result = new ArrayList< String >( props.length ); for ( final String propName : props ) { if ( !isPropertyFiltered( propName ) ) { @@ -633,7 +633,7 @@ public Descriptor[] getChildDescriptors( final UnitOfWork transaction ) throws K return descriptors; } - final List< Descriptor > result = new ArrayList<>( descriptors.length ); + final List< Descriptor > result = new ArrayList< Descriptor >( descriptors.length ); for ( final Descriptor descriptor : descriptors ) { if ( !RelationalObjectImpl.this.isDescriptorFiltered( descriptor.getName() ) ) { @@ -667,7 +667,7 @@ public PropertyDescriptor[] getPropertyDescriptors( final UnitOfWork transaction return descriptors; } - final List< PropertyDescriptor > result = new ArrayList<>( descriptors.length ); + final List< PropertyDescriptor > result = new ArrayList< PropertyDescriptor >( descriptors.length ); for ( final PropertyDescriptor descriptor : descriptors ) { if ( !RelationalObjectImpl.this.isPropertyFiltered( descriptor.getName() ) ) { diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/AccessPattern.java b/komodo-relational/src/main/java/org/komodo/relational/model/AccessPattern.java index 19994491..8d1b8404 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/AccessPattern.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/AccessPattern.java @@ -19,7 +19,7 @@ import org.komodo.spi.repository.KomodoType; import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.Constraint; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.Constraint; /** @@ -46,7 +46,7 @@ public interface AccessPattern extends TableConstraint { * An empty collection of access pattern constraints. */ AccessPattern[] NO_ACCESS_PATTERNS = new AccessPattern[0]; - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/Column.java b/komodo-relational/src/main/java/org/komodo/relational/model/Column.java index a6607fae..e06c79d6 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/Column.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/Column.java @@ -23,7 +23,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateTable; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateTable; /** * Represents a relational model column. @@ -131,7 +131,7 @@ public enum Searchable { * An empty array of columns. */ Column[] NO_COLUMNS = new Column[0]; - + /** * {@inheritDoc} * @@ -139,7 +139,7 @@ public enum Searchable { */ @Override Table getParent( final UnitOfWork transaction ) throws KException; - + /** * The resolver of a {@link Column}. */ diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/DataTypeResultSet.java b/komodo-relational/src/main/java/org/komodo/relational/model/DataTypeResultSet.java index d65fb49e..961a4410 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/DataTypeResultSet.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/DataTypeResultSet.java @@ -21,7 +21,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; /** * Represents a data type result set. @@ -74,7 +74,7 @@ enum Type { * The type identifier. */ int TYPE_ID = DataTypeResultSet.class.hashCode(); - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/ForeignKey.java b/komodo-relational/src/main/java/org/komodo/relational/model/ForeignKey.java index 56f3d543..d6496b8f 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/ForeignKey.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/ForeignKey.java @@ -20,7 +20,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.Constraint; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.Constraint; /** * Represents a relational model foreign key. @@ -46,7 +46,7 @@ public interface ForeignKey extends TableConstraint { * An empty collection of foreign key constraints. */ ForeignKey[] NO_FOREIGN_KEYS = new ForeignKey[0]; - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/Index.java b/komodo-relational/src/main/java/org/komodo/relational/model/Index.java index 3b463462..28eb5636 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/Index.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/Index.java @@ -20,7 +20,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.Constraint; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.Constraint; /** * Represents a relational model index. @@ -46,7 +46,7 @@ public interface Index extends TableConstraint { * An empty collection of index constraints. */ Index[] NO_INDEXES = new Index[0]; - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/Model.java b/komodo-relational/src/main/java/org/komodo/relational/model/Model.java index 8b1596fe..64ef8de4 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/Model.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/Model.java @@ -24,7 +24,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * Represents a relational model. @@ -50,7 +50,7 @@ public interface Model extends Exportable, RelationalObject { * Identifier of this object */ KomodoType IDENTIFIER = KomodoType.MODEL; - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/OptionContainer.java b/komodo-relational/src/main/java/org/komodo/relational/model/OptionContainer.java index 762934fa..79872b99 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/OptionContainer.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/OptionContainer.java @@ -7,7 +7,6 @@ */ package org.komodo.relational.model; -import java.util.Collections; import java.util.Map; import org.komodo.spi.KException; import org.komodo.spi.repository.KomodoObject; @@ -31,9 +30,7 @@ public interface OptionContainer extends KomodoObject { /** * @return the names of the standard options and their default value (never null but can be empty) */ - default Map< String, String > getStandardOptions() { - return Collections.emptyMap(); - } + Map< String, String > getStandardOptions(); /** * This result includes both the standard statement options and any custom options that have been set. diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/Parameter.java b/komodo-relational/src/main/java/org/komodo/relational/model/Parameter.java index b20fec55..5fe1e536 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/Parameter.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/Parameter.java @@ -22,9 +22,9 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlConstants.TeiidNonReservedWord; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlConstants.TeiidReservedWord; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlConstants.TeiidNonReservedWord; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlConstants.TeiidReservedWord; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; /** * Represents a relational model procedure parameter. @@ -111,7 +111,7 @@ public String toValue() { * An empty array of parameters. */ Parameter[] NO_PARAMETERS = new Parameter[0]; - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/PrimaryKey.java b/komodo-relational/src/main/java/org/komodo/relational/model/PrimaryKey.java index d6eeb0ae..98200bfa 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/PrimaryKey.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/PrimaryKey.java @@ -19,7 +19,7 @@ import org.komodo.spi.repository.KomodoType; import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.Constraint; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.Constraint; /** * Represents a relational model primary key. @@ -40,7 +40,7 @@ public interface PrimaryKey extends TableConstraint { * The constraint type for a primary key. Value is {@value} . */ ConstraintType CONSTRAINT_TYPE = ConstraintType.PRIMARY_KEY; - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/PushdownFunction.java b/komodo-relational/src/main/java/org/komodo/relational/model/PushdownFunction.java index df4000cc..003aea73 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/PushdownFunction.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/PushdownFunction.java @@ -20,8 +20,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.SchemaElement; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; /** * Represents a pushdown function (CREATE FOREIGN FUNCTION). @@ -42,7 +41,7 @@ public interface PushdownFunction extends Function { * The type identifier. */ int TYPE_ID = PushdownFunction.class.hashCode(); - + /** * {@inheritDoc} * @@ -114,7 +113,7 @@ public boolean resolvable( final UnitOfWork transaction, && ObjectImpl.validatePropertyValue( transaction, kobject.getRepository(), kobject, - SchemaElement.TYPE, + org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.SchemaElement.TYPE, SchemaElementType.FOREIGN.name() ); } diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/ResultSetColumn.java b/komodo-relational/src/main/java/org/komodo/relational/model/ResultSetColumn.java index 30a8dd46..a7a05ef7 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/ResultSetColumn.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/ResultSetColumn.java @@ -23,7 +23,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; /** * Represents a relational model result set column. diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/StatementOption.java b/komodo-relational/src/main/java/org/komodo/relational/model/StatementOption.java index 301eb2ec..a4b389fc 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/StatementOption.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/StatementOption.java @@ -22,7 +22,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; /** * Represents a DDL statement option from a relational model. diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/StoredProcedure.java b/komodo-relational/src/main/java/org/komodo/relational/model/StoredProcedure.java index ec58f4be..3f90af11 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/StoredProcedure.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/StoredProcedure.java @@ -20,8 +20,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.SchemaElement; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; /** * Represents a stored procedure (CREATE FOREIGN PROCEDURE). @@ -47,7 +46,7 @@ public interface StoredProcedure extends Procedure { * The type identifier. */ int TYPE_ID = StoredProcedure.class.hashCode(); - + /** * {@inheritDoc} * @@ -119,7 +118,7 @@ public boolean resolvable( final UnitOfWork transaction, && ObjectImpl.validatePropertyValue( transaction, kobject.getRepository(), kobject, - SchemaElement.TYPE, + org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.SchemaElement.TYPE, SchemaElementType.FOREIGN.name() ); } diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/Table.java b/komodo-relational/src/main/java/org/komodo/relational/model/Table.java index e06b55ea..c91b9e44 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/Table.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/Table.java @@ -21,7 +21,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateTable; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateTable; /** * Represents a relational model table. @@ -138,7 +138,7 @@ public static TemporaryType fromValue( final String value ) { * An empty array of tables. */ Table[] NO_TABLES = new Table[0]; - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/TableConstraint.java b/komodo-relational/src/main/java/org/komodo/relational/model/TableConstraint.java index 8833dd5f..0b4756c1 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/TableConstraint.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/TableConstraint.java @@ -11,8 +11,8 @@ import org.komodo.spi.KException; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.ddl.DdlConstants; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlConstants; +import org.teiid.modeshape.sequencer.ddl.DdlConstants; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlConstants; /** * Represents a relational model table constraint. diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/TabularResultSet.java b/komodo-relational/src/main/java/org/komodo/relational/model/TabularResultSet.java index 5bbc534b..d593f1db 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/TabularResultSet.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/TabularResultSet.java @@ -20,7 +20,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; /** * Represents a tabular result set. @@ -36,7 +36,7 @@ public interface TabularResultSet extends ProcedureResultSet { * The type identifier. */ int TYPE_ID = TabularResultSet.class.hashCode(); - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/UniqueConstraint.java b/komodo-relational/src/main/java/org/komodo/relational/model/UniqueConstraint.java index 2a55ac9d..6d692229 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/UniqueConstraint.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/UniqueConstraint.java @@ -19,7 +19,7 @@ import org.komodo.spi.repository.KomodoType; import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.Constraint; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.Constraint; /** * Represents a relational model unique constraint. @@ -45,7 +45,7 @@ public interface UniqueConstraint extends TableConstraint { * An empty collection of unique constraints. */ UniqueConstraint[] NO_UNIQUE_CONSTRAINTS = new UniqueConstraint[0]; - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/UserDefinedFunction.java b/komodo-relational/src/main/java/org/komodo/relational/model/UserDefinedFunction.java index 4d3741b2..89554320 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/UserDefinedFunction.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/UserDefinedFunction.java @@ -20,8 +20,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.SchemaElement; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; /** * Represents a user-defined function (CREATE VIRTUAL FUNCTION). @@ -42,7 +41,7 @@ public interface UserDefinedFunction extends Function { * The type identifier. */ int TYPE_ID = UserDefinedFunction.class.hashCode(); - + /** * {@inheritDoc} * @@ -114,7 +113,7 @@ public boolean resolvable( final UnitOfWork transaction, && ObjectImpl.validatePropertyValue( transaction, kobject.getRepository(), kobject, - SchemaElement.TYPE, + org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.SchemaElement.TYPE, SchemaElementType.VIRTUAL.name() ); } diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/View.java b/komodo-relational/src/main/java/org/komodo/relational/model/View.java index 1dfeadb8..4cd04940 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/View.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/View.java @@ -19,7 +19,7 @@ import org.komodo.spi.repository.KomodoType; import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateTable; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateTable; /** * Represents a relational model view. @@ -40,7 +40,7 @@ public interface View extends Table { * An empty array of views. */ View[] NO_VIEWS = new View[0]; - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/VirtualProcedure.java b/komodo-relational/src/main/java/org/komodo/relational/model/VirtualProcedure.java index bdcdc2fc..adb98348 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/VirtualProcedure.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/VirtualProcedure.java @@ -20,8 +20,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.SchemaElement; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; /** * Represents a virtual procedure (CREATE VIRTUAL PROCEDURE). @@ -42,7 +41,7 @@ public interface VirtualProcedure extends Procedure { * The type identifier. */ int TYPE_ID = VirtualProcedure.class.hashCode(); - + /** * {@inheritDoc} * @@ -114,7 +113,7 @@ public boolean resolvable( final UnitOfWork transaction, && ObjectImpl.validatePropertyValue( transaction, kobject.getRepository(), kobject, - SchemaElement.TYPE, + org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.SchemaElement.TYPE, SchemaElementType.VIRTUAL.name() ); } diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/internal/AbstractProcedureImpl.java b/komodo-relational/src/main/java/org/komodo/relational/model/internal/AbstractProcedureImpl.java index 483c9b58..1f390887 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/internal/AbstractProcedureImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/internal/AbstractProcedureImpl.java @@ -32,9 +32,9 @@ import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; import org.komodo.utils.StringUtils; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.SchemaElement; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.SchemaElement; /** * A base implementation of a relational model procedure or function. @@ -62,7 +62,7 @@ private enum StandardOption { static Map< String, String > defaultValues() { if ( _defaultValues == null ) { final StandardOption[] options = values(); - final Map< String, String > temp = new HashMap< >(); + final Map< String, String > temp = new HashMap< String, String >(); for ( final StandardOption option : options ) { temp.put( option.name(), option.defaultValue ); @@ -144,7 +144,7 @@ public KomodoObject[] getChildren( final UnitOfWork transaction, if ( kids.length == 0 ) { result = kids; } else { - final List< KomodoObject > temp = new ArrayList<>(); + final List< KomodoObject > temp = new ArrayList< KomodoObject >(); for ( final KomodoObject kid : kids ) { if ( kid.hasDescriptor( transaction, StandardDdlLexicon.TYPE_STATEMENT_OPTION ) ) { diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/internal/ColumnImpl.java b/komodo-relational/src/main/java/org/komodo/relational/model/internal/ColumnImpl.java index fec0e895..e36d86c4 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/internal/ColumnImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/internal/ColumnImpl.java @@ -10,7 +10,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; - import org.komodo.relational.RelationalConstants; import org.komodo.relational.RelationalConstants.Nullable; import org.komodo.relational.internal.RelationalChildRestrictedObject; @@ -29,8 +28,8 @@ import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; import org.komodo.utils.StringUtils; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateTable; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateTable; /** * An implementation of a relational model column. @@ -66,7 +65,7 @@ private enum StandardOption { static Map< String, String > defaultValues() { if ( _defaultValues == null ) { final StandardOption[] options = values(); - final Map< String, String > temp = new HashMap< >(); + final Map< String, String > temp = new HashMap< String, String >(); for ( final StandardOption option : options ) { temp.put( option.name(), option.defaultValue ); @@ -470,7 +469,7 @@ public KomodoType getTypeIdentifier( final UnitOfWork uow ) { public String getUuid( final UnitOfWork transaction ) throws KException { return OptionContainerUtils.getOption( transaction, this, StandardOption.UUID.name() ); } - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/internal/DataTypeResultSetImpl.java b/komodo-relational/src/main/java/org/komodo/relational/model/internal/DataTypeResultSetImpl.java index 3b752d1f..a1d19cb6 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/internal/DataTypeResultSetImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/internal/DataTypeResultSetImpl.java @@ -19,7 +19,7 @@ import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; import org.komodo.utils.StringUtils; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; /** * An implementation of a relational model procedure data type result set. @@ -105,7 +105,7 @@ public Type getType( final UnitOfWork uow ) throws KException { public KomodoType getTypeIdentifier( final UnitOfWork uow ) { return DataTypeResultSet.IDENTIFIER; } - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/internal/ForeignKeyImpl.java b/komodo-relational/src/main/java/org/komodo/relational/model/internal/ForeignKeyImpl.java index f823f8db..a5020814 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/internal/ForeignKeyImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/internal/ForeignKeyImpl.java @@ -21,7 +21,7 @@ import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; import org.modeshape.jcr.JcrLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.Constraint; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.Constraint; /** * An implementation of a relational model foreign key. @@ -162,7 +162,7 @@ public Table getReferencesTable( final UnitOfWork transaction ) throws KExceptio public int getTypeId() { return TYPE_ID; } - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/internal/FunctionImpl.java b/komodo-relational/src/main/java/org/komodo/relational/model/internal/FunctionImpl.java index 445d2048..7d4a09e2 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/internal/FunctionImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/internal/FunctionImpl.java @@ -45,7 +45,7 @@ private enum StandardOption { */ static Map< String, String > defaultValues() { final StandardOption[] options = values(); - final Map< String, String > result = new HashMap< >(); + final Map< String, String > result = new HashMap< String, String >(); for ( final StandardOption option : options ) { result.put( option.name(), option.defaultValue ); @@ -115,7 +115,7 @@ public StatementOption[] getCustomOptions( final UnitOfWork transaction ) throws StatementOption[] result = StatementOption.NO_OPTIONS; if ( superOptions.length != 0 ) { - final List< StatementOption > temp = new ArrayList<>( superOptions.length ); + final List< StatementOption > temp = new ArrayList< StatementOption >( superOptions.length ); for ( final StatementOption option : superOptions ) { if ( !isStandardOption( option.getName( transaction ) ) ) { @@ -159,7 +159,7 @@ public Map< String, String > getStandardOptions() { final Map< String, String > options = StandardOption.defaultValues(); // combine - final Map< String, String > combined = new HashMap< >( superOptions.size() + options.size() ); + final Map< String, String > combined = new HashMap< String, String >( superOptions.size() + options.size() ); combined.putAll( superOptions ); combined.putAll( options ); diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/internal/IndexImpl.java b/komodo-relational/src/main/java/org/komodo/relational/model/internal/IndexImpl.java index 7fc082b6..b2055e74 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/internal/IndexImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/internal/IndexImpl.java @@ -17,7 +17,7 @@ import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.Constraint; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.Constraint; /** * An implementation of a relational model index. @@ -74,7 +74,7 @@ public String getExpression( final UnitOfWork uow ) throws KException { public int getTypeId() { return TYPE_ID; } - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/internal/ModelImpl.java b/komodo-relational/src/main/java/org/komodo/relational/model/internal/ModelImpl.java index 3e3f1f26..6f45dd65 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/internal/ModelImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/internal/ModelImpl.java @@ -10,7 +10,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; - import org.komodo.core.KomodoLexicon; import org.komodo.modeshape.visitor.DdlNodeVisitor; import org.komodo.relational.ExcludeQNamesFilter; @@ -42,11 +41,11 @@ import org.komodo.spi.runtime.version.TeiidVersionProvider; import org.komodo.utils.ArgCheck; import org.komodo.utils.StringUtils; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateTable; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.SchemaElement; -import org.modeshape.sequencer.teiid.lexicon.CoreLexicon; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateTable; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.SchemaElement; +import org.teiid.modeshape.sequencer.vdb.lexicon.CoreLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * An implementation of a relational model. @@ -436,7 +435,7 @@ public ModelSource[] getSources( final UnitOfWork transaction, final KomodoObject grouping = getSourcesGroupingNode( transaction ); if ( grouping != null ) { - final List< ModelSource > temp = new ArrayList<>(); + final List< ModelSource > temp = new ArrayList< ModelSource >(); for ( final KomodoObject kobject : grouping.getChildren( transaction, namePatterns ) ) { final ModelSource source = new ModelSourceImpl( transaction, getRepository(), kobject.getAbsolutePath() ); @@ -522,7 +521,7 @@ public View[] getViews( final UnitOfWork transaction, return result.toArray( new View[ result.size() ] ); } - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/internal/OptionContainerUtils.java b/komodo-relational/src/main/java/org/komodo/relational/model/internal/OptionContainerUtils.java index 77208f87..8a89b6e1 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/internal/OptionContainerUtils.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/internal/OptionContainerUtils.java @@ -28,7 +28,7 @@ import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; import org.komodo.utils.StringUtils; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; /** * Utilities for retrieving and updating standard and custom statement options. @@ -243,7 +243,7 @@ public static StatementOption[] getCustomOptions( final UnitOfWork transaction, return options; } - final List< StatementOption > custom = new ArrayList<>( options.length ); + final List< StatementOption > custom = new ArrayList< StatementOption >( options.length ); for ( final StatementOption option : options ) { if ( !container.isStandardOption( option.getName( transaction ) ) ) { diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/internal/ParameterImpl.java b/komodo-relational/src/main/java/org/komodo/relational/model/internal/ParameterImpl.java index 6c1b2055..8060f0ca 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/internal/ParameterImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/internal/ParameterImpl.java @@ -7,6 +7,8 @@ */ package org.komodo.relational.model.internal; +import java.util.Collections; +import java.util.Map; import org.komodo.relational.RelationalConstants; import org.komodo.relational.RelationalConstants.Nullable; import org.komodo.relational.internal.RelationalChildRestrictedObject; @@ -24,8 +26,8 @@ import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; import org.komodo.utils.StringUtils; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; /** * An implementation of a relational model procedure parameter. @@ -218,6 +220,16 @@ public long getScale( final UnitOfWork uow ) throws KException { return value; } + /** + * {@inheritDoc} + * + * @see org.komodo.relational.model.OptionContainer#getStandardOptions() + */ + @Override + public Map< String, String > getStandardOptions() { + return Collections.emptyMap(); + } + /** * {@inheritDoc} * @@ -257,7 +269,7 @@ public int getTypeId() { public KomodoType getTypeIdentifier( final UnitOfWork uow ) { return Parameter.IDENTIFIER; } - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/internal/PushdownFunctionImpl.java b/komodo-relational/src/main/java/org/komodo/relational/model/internal/PushdownFunctionImpl.java index 82127760..4ed9ff08 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/internal/PushdownFunctionImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/internal/PushdownFunctionImpl.java @@ -22,7 +22,7 @@ import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; /** * An implementation of a pushdown function. @@ -114,7 +114,7 @@ public int getTypeId() { public KomodoType getTypeIdentifier( final UnitOfWork uow ) { return PushdownFunction.IDENTIFIER; } - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/internal/ResultSetColumnImpl.java b/komodo-relational/src/main/java/org/komodo/relational/model/internal/ResultSetColumnImpl.java index eab85bc1..e686df1f 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/internal/ResultSetColumnImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/internal/ResultSetColumnImpl.java @@ -10,16 +10,13 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; - import org.komodo.relational.RelationalConstants; import org.komodo.relational.RelationalConstants.Nullable; import org.komodo.relational.internal.RelationalChildRestrictedObject; import org.komodo.relational.model.ResultSetColumn; import org.komodo.relational.model.StatementOption; -import org.komodo.relational.model.TabularResultSet; import org.komodo.spi.KException; import org.komodo.spi.repository.Descriptor; -import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; import org.komodo.spi.repository.Property; import org.komodo.spi.repository.PropertyDescriptor; @@ -27,9 +24,8 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.komodo.utils.ArgCheck; import org.komodo.utils.StringUtils; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; /** * An implementation of a relational model tabular result set column. @@ -51,7 +47,7 @@ private enum StandardOption { static Map< String, String > defaultValues() { if ( _defaultValues == null ) { final StandardOption[] options = values(); - final Map< String, String > temp = new HashMap< >(); + final Map< String, String > temp = new HashMap< String, String >(); for ( final StandardOption option : options ) { temp.put( option.name(), null ); // no default values diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/internal/StatementOptionImpl.java b/komodo-relational/src/main/java/org/komodo/relational/model/internal/StatementOptionImpl.java index 5b80db8e..1c0ab5f9 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/internal/StatementOptionImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/internal/StatementOptionImpl.java @@ -24,7 +24,7 @@ import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; import org.komodo.utils.StringUtils; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; /** * An implementation of a relational model DDL statement option. diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/internal/StoredProcedureImpl.java b/komodo-relational/src/main/java/org/komodo/relational/model/internal/StoredProcedureImpl.java index ad1318bf..d59739ec 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/internal/StoredProcedureImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/internal/StoredProcedureImpl.java @@ -10,7 +10,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; - import org.komodo.relational.Messages; import org.komodo.relational.Messages.Relational; import org.komodo.relational.RelationalModelFactory; @@ -26,7 +25,7 @@ import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; /** * An implementation of a stored procedure. @@ -58,7 +57,7 @@ private enum StandardOption { */ static Map< String, String > defaultValues() { final StandardOption[] options = values(); - final Map< String, String > result = new HashMap< >(); + final Map< String, String > result = new HashMap< String, String >(); for ( final StandardOption option : options ) { result.put( option.name(), option.defaultValue ); @@ -171,7 +170,7 @@ public Map< String, String > getStandardOptions() { final Map< String, String > superOptions = super.getStandardOptions(); final Map< String, String > options = StandardOption.defaultValues(); - final Map< String, String > combined = new HashMap< >( superOptions.size() + options.size() ); + final Map< String, String > combined = new HashMap< String, String >( superOptions.size() + options.size() ); combined.putAll( superOptions ); combined.putAll( options ); @@ -190,7 +189,7 @@ public Map< String, String > getStandardOptions() { public KomodoType getTypeIdentifier( final UnitOfWork transaction ) { return StoredProcedure.IDENTIFIER; } - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/internal/TableConstraintImpl.java b/komodo-relational/src/main/java/org/komodo/relational/model/internal/TableConstraintImpl.java index d36df5f8..ecefd354 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/internal/TableConstraintImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/internal/TableConstraintImpl.java @@ -22,9 +22,9 @@ import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; import org.modeshape.jcr.JcrLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.Constraint; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateTable; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.Constraint; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateTable; /** * A base implementation of a relational model table constraint. diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/internal/TableImpl.java b/komodo-relational/src/main/java/org/komodo/relational/model/internal/TableImpl.java index 376ec893..0897afe8 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/internal/TableImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/internal/TableImpl.java @@ -12,7 +12,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - import org.komodo.relational.Messages; import org.komodo.relational.Messages.Relational; import org.komodo.relational.RelationalModelFactory; @@ -38,10 +37,10 @@ import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; import org.komodo.utils.StringUtils; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.Constraint; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateTable; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.SchemaElement; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.Constraint; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateTable; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.SchemaElement; /** * An implementation of a relational model table. @@ -74,7 +73,7 @@ private enum StandardOption { static Map< String, String > defaultValues() { if ( _defaultValues == null ) { final StandardOption[] options = values(); - final Map< String, String > temp = new HashMap< >(); + final Map< String, String > temp = new HashMap< String, String >(); for ( final StandardOption option : options ) { temp.put( option.name(), option.defaultValue ); @@ -602,7 +601,7 @@ public UniqueConstraint[] getUniqueConstraints( final UnitOfWork transaction, public String getUuid( final UnitOfWork transaction ) throws KException { return OptionContainerUtils.getOption( transaction, this, StandardOption.UUID.name() ); } - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/internal/TabularResultSetImpl.java b/komodo-relational/src/main/java/org/komodo/relational/model/internal/TabularResultSetImpl.java index e5be629a..1c5ad3b9 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/internal/TabularResultSetImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/internal/TabularResultSetImpl.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.List; - import org.komodo.relational.Messages; import org.komodo.relational.Messages.Relational; import org.komodo.relational.RelationalModelFactory; @@ -24,7 +23,7 @@ import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; /** * An implementation of a relational model procedure tabular result set. @@ -84,7 +83,7 @@ public ResultSetColumn[] getColumns( final UnitOfWork transaction ) throws KExce ArgCheck.isNotNull( transaction, "transaction" ); //$NON-NLS-1$ ArgCheck.isTrue( ( transaction.getState() == State.NOT_STARTED ), "transaction state is not NOT_STARTED" ); //$NON-NLS-1$ - final List< ResultSetColumn > result = new ArrayList<>(); + final List< ResultSetColumn > result = new ArrayList< ResultSetColumn >(); for ( final KomodoObject kobject : getChildrenOfType( transaction, CreateProcedure.RESULT_COLUMN ) ) { final ResultSetColumn column = new ResultSetColumnImpl( transaction, getRepository(), kobject.getAbsolutePath() ); @@ -107,7 +106,7 @@ public ResultSetColumn[] getColumns( final UnitOfWork transaction ) throws KExce public KomodoType getTypeIdentifier( final UnitOfWork uow ) { return TabularResultSet.IDENTIFIER; } - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/internal/UserDefinedFunctionImpl.java b/komodo-relational/src/main/java/org/komodo/relational/model/internal/UserDefinedFunctionImpl.java index 335561d2..1763339e 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/internal/UserDefinedFunctionImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/internal/UserDefinedFunctionImpl.java @@ -10,7 +10,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; - import org.komodo.relational.model.Model; import org.komodo.relational.model.UserDefinedFunction; import org.komodo.spi.KException; @@ -40,7 +39,7 @@ private enum StandardOption { */ static Map< String, String > defaultValues() { final StandardOption[] options = values(); - final Map< String, String > result = new HashMap< >(); + final Map< String, String > result = new HashMap< String, String >(); for ( final StandardOption option : options ) { result.put( option.name(), null ); // no default values @@ -123,7 +122,7 @@ public Map< String, String > getStandardOptions() { final Map< String, String > superOptions = super.getStandardOptions(); final Map< String, String > options = StandardOption.defaultValues(); - final Map< String, String > combined = new HashMap< >( superOptions.size() + options.size() ); + final Map< String, String > combined = new HashMap< String, String >( superOptions.size() + options.size() ); combined.putAll( superOptions ); combined.putAll( options ); @@ -152,7 +151,7 @@ public int getTypeId() { public KomodoType getTypeIdentifier( final UnitOfWork uow ) { return UserDefinedFunction.IDENTIFIER; } - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/model/internal/VirtualProcedureImpl.java b/komodo-relational/src/main/java/org/komodo/relational/model/internal/VirtualProcedureImpl.java index 4d8c6ed4..a0f64ad8 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/model/internal/VirtualProcedureImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/model/internal/VirtualProcedureImpl.java @@ -17,7 +17,7 @@ import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; /** * An implementation of a virtual procedure. @@ -59,7 +59,7 @@ public String getAsClauseStatement( final UnitOfWork uow ) throws KException { public KomodoType getTypeIdentifier( final UnitOfWork transaction ) { return VirtualProcedure.IDENTIFIER; } - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/vdb/Condition.java b/komodo-relational/src/main/java/org/komodo/relational/vdb/Condition.java index dd134ab0..ed7252fe 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/vdb/Condition.java +++ b/komodo-relational/src/main/java/org/komodo/relational/vdb/Condition.java @@ -21,7 +21,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * Represents a VDB permission condition. @@ -47,7 +47,7 @@ public interface Condition extends RelationalObject { * An empty array of conditions. */ Condition[] NO_CONDITIONS = new Condition[0]; - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/vdb/DataRole.java b/komodo-relational/src/main/java/org/komodo/relational/vdb/DataRole.java index 040cf890..387672e1 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/vdb/DataRole.java +++ b/komodo-relational/src/main/java/org/komodo/relational/vdb/DataRole.java @@ -21,7 +21,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * Represents a VDB data role. @@ -57,7 +57,7 @@ public interface DataRole extends RelationalObject { * An empty array of data roles. */ DataRole[] NO_DATA_ROLES = new DataRole[0]; - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/vdb/Entry.java b/komodo-relational/src/main/java/org/komodo/relational/vdb/Entry.java index 705f2ea5..6ef5e4fc 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/vdb/Entry.java +++ b/komodo-relational/src/main/java/org/komodo/relational/vdb/Entry.java @@ -21,7 +21,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * Represents a VDB entry. @@ -42,7 +42,7 @@ public interface Entry extends RelationalObject { * An empty array of VDB entries. */ Entry[] NO_ENTRIES = new Entry[0]; - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/vdb/Mask.java b/komodo-relational/src/main/java/org/komodo/relational/vdb/Mask.java index f2b9f1f1..3baaeb97 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/vdb/Mask.java +++ b/komodo-relational/src/main/java/org/komodo/relational/vdb/Mask.java @@ -21,7 +21,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * Represents a VDB permission mask. @@ -50,7 +50,7 @@ public interface Mask extends RelationalObject { */ @Override Permission getParent( final UnitOfWork transaction ) throws KException; - + /** * The resolver of a {@link Mask}. */ diff --git a/komodo-relational/src/main/java/org/komodo/relational/vdb/ModelSource.java b/komodo-relational/src/main/java/org/komodo/relational/vdb/ModelSource.java index 341a2000..c2af9fd6 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/vdb/ModelSource.java +++ b/komodo-relational/src/main/java/org/komodo/relational/vdb/ModelSource.java @@ -22,7 +22,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * Represents a VDB model source. @@ -43,7 +43,7 @@ public interface ModelSource extends RelationalObject { * An empty array of model sources. */ ModelSource[] NO_SOURCES = new ModelSource[0]; - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/vdb/Permission.java b/komodo-relational/src/main/java/org/komodo/relational/vdb/Permission.java index f396bd06..0966c619 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/vdb/Permission.java +++ b/komodo-relational/src/main/java/org/komodo/relational/vdb/Permission.java @@ -21,7 +21,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * Represents a VDB data policy permission. @@ -77,7 +77,7 @@ public interface Permission extends RelationalObject { * An empty array of permissions. */ Permission[] NO_PERMISSIONS = new Permission[0]; - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/vdb/Translator.java b/komodo-relational/src/main/java/org/komodo/relational/vdb/Translator.java index a3527983..518d5544 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/vdb/Translator.java +++ b/komodo-relational/src/main/java/org/komodo/relational/vdb/Translator.java @@ -21,7 +21,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * Represents a VDB translator. @@ -47,7 +47,7 @@ public interface Translator extends RelationalObject { * An empty array of translators. */ Translator[] NO_TRANSLATORS = new Translator[0]; - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/vdb/Vdb.java b/komodo-relational/src/main/java/org/komodo/relational/vdb/Vdb.java index 77a6fcc0..bc2d345f 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/vdb/Vdb.java +++ b/komodo-relational/src/main/java/org/komodo/relational/vdb/Vdb.java @@ -22,7 +22,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; import org.w3c.dom.Document; /** diff --git a/komodo-relational/src/main/java/org/komodo/relational/vdb/VdbImport.java b/komodo-relational/src/main/java/org/komodo/relational/vdb/VdbImport.java index 3531e42a..7632eb63 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/vdb/VdbImport.java +++ b/komodo-relational/src/main/java/org/komodo/relational/vdb/VdbImport.java @@ -21,7 +21,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * Represents a referenced VDB. @@ -47,7 +47,7 @@ public interface VdbImport extends RelationalObject { * An empty array of VDB imports. */ VdbImport[] NO_IMPORTS = new VdbImport[0]; - + /** * {@inheritDoc} * diff --git a/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/ConditionImpl.java b/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/ConditionImpl.java index 07f9d7c9..36b643ff 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/ConditionImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/ConditionImpl.java @@ -18,7 +18,7 @@ import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * An implementation of a VDB permission condition. diff --git a/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/DataRoleImpl.java b/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/DataRoleImpl.java index e5558bc7..9d70df28 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/DataRoleImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/DataRoleImpl.java @@ -26,7 +26,7 @@ import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * An implementation of a VDB data role. @@ -238,7 +238,7 @@ public String[] getMappedRoles( final UnitOfWork transaction, } final boolean matchPattern = ( ( namePatterns != null ) && ( namePatterns.length != 0 ) ); - final List< String > roleNames = new ArrayList< >(); + final List< String > roleNames = new ArrayList< String >(); for ( final String value : property.getStringValues( transaction ) ) { if ( matchPattern ) { @@ -287,7 +287,7 @@ public Permission[] getPermissions( final UnitOfWork transaction, final KomodoObject grouping = getPermissionsGroupingNode( transaction ); if ( grouping != null ) { - final List< Permission > temp = new ArrayList<>(); + final List< Permission > temp = new ArrayList< Permission >(); for ( final KomodoObject kobject : grouping.getChildren( transaction, namePatterns ) ) { final Permission permission = new PermissionImpl( transaction, getRepository(), kobject.getAbsolutePath() ); diff --git a/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/EntryImpl.java b/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/EntryImpl.java index 08626649..53b97675 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/EntryImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/EntryImpl.java @@ -18,7 +18,7 @@ import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * An implementation of a VDB entry. diff --git a/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/MaskImpl.java b/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/MaskImpl.java index d61d4e6d..6bfcf856 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/MaskImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/MaskImpl.java @@ -18,7 +18,7 @@ import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * An implementation of a VDB permission mask. @@ -58,14 +58,14 @@ public String getOrder( final UnitOfWork uow ) throws KException { /** * {@inheritDoc} - * + * * @see org.komodo.relational.internal.RelationalObjectImpl#getParent(org.komodo.spi.repository.Repository.UnitOfWork) */ @Override public Permission getParent(final UnitOfWork transaction) throws KException { ArgCheck.isNotNull(transaction, "transaction"); //$NON-NLS-1$ ArgCheck.isTrue((transaction.getState() == State.NOT_STARTED), "transaction state must be NOT_STARTED"); //$NON-NLS-1$ - + final KomodoObject grouping = super.getParent(transaction); final Permission result = Permission.RESOLVER.resolve(transaction, grouping.getParent(transaction)); return result; diff --git a/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/ModelSourceImpl.java b/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/ModelSourceImpl.java index db631bac..6102dba1 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/ModelSourceImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/ModelSourceImpl.java @@ -18,7 +18,7 @@ import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * An implementation of a VDB model source. diff --git a/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/PermissionImpl.java b/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/PermissionImpl.java index 60e4213f..db1ff276 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/PermissionImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/PermissionImpl.java @@ -25,7 +25,7 @@ import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * An implementation of a VDB data policy permission. @@ -242,7 +242,7 @@ public Condition[] getConditions( final UnitOfWork transaction, final KomodoObject grouping = getConditionsGroupingNode( transaction ); if ( grouping != null ) { - final List< Condition > temp = new ArrayList<>(); + final List< Condition > temp = new ArrayList< Condition >(); for ( final KomodoObject kobject : grouping.getChildrenOfType( transaction, VdbLexicon.DataRole.Permission.Condition.CONDITION, @@ -288,7 +288,7 @@ public Mask[] getMasks( final UnitOfWork transaction, final KomodoObject grouping = getMasksGroupingNode( transaction ); if ( grouping != null ) { - final List< Mask > temp = new ArrayList<>(); + final List< Mask > temp = new ArrayList< Mask >(); for ( final KomodoObject kobject : grouping.getChildrenOfType( transaction, VdbLexicon.DataRole.Permission.Mask.MASK, diff --git a/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/TranslatorImpl.java b/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/TranslatorImpl.java index fa0fb085..8e85be3e 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/TranslatorImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/TranslatorImpl.java @@ -18,7 +18,7 @@ import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * An implementation of a VDB translator. diff --git a/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/VdbImpl.java b/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/VdbImpl.java index 4f067afd..50771700 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/VdbImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/VdbImpl.java @@ -44,7 +44,7 @@ import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.spi.runtime.version.TeiidVersionProvider; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; import org.w3c.dom.Document; import org.xml.sax.InputSource; @@ -561,7 +561,7 @@ public DataRole[] getDataRoles( final UnitOfWork transaction, final KomodoObject grouping = getDataRolesGroupingNode( transaction ); if ( grouping != null ) { - final List< DataRole > temp = new ArrayList<>(); + final List< DataRole > temp = new ArrayList< DataRole >(); for ( final KomodoObject kobject : grouping.getChildren( transaction, namePatterns ) ) { final DataRole dataRole = new DataRoleImpl( transaction, getRepository(), kobject.getAbsolutePath() ); @@ -612,7 +612,7 @@ public Entry[] getEntries( final UnitOfWork transaction, final KomodoObject grouping = getEntriesGroupingNode( transaction); if ( grouping != null ) { - final List< Entry > temp = new ArrayList<>(); + final List< Entry > temp = new ArrayList< Entry >(); for ( final KomodoObject kobject : grouping.getChildren( transaction, namePatterns ) ) { final Entry entry = new EntryImpl( transaction, getRepository(), kobject.getAbsolutePath() ); @@ -666,7 +666,7 @@ public VdbImport[] getImports( final UnitOfWork transaction, final KomodoObject grouping = getImportsGroupingNode( transaction); if ( grouping != null ) { - final List< VdbImport > temp = new ArrayList<>(); + final List< VdbImport > temp = new ArrayList< VdbImport >(); for ( final KomodoObject kobject : grouping.getChildren( transaction, namePatterns ) ) { final VdbImport vdbImport = new VdbImportImpl( transaction, getRepository(), kobject.getAbsolutePath() ); @@ -704,7 +704,7 @@ public Model[] getModels( final UnitOfWork transaction, ArgCheck.isNotNull( transaction, "transaction" ); //$NON-NLS-1$ ArgCheck.isTrue( ( transaction.getState() == State.NOT_STARTED ), "transaction state is not NOT_STARTED" ); //$NON-NLS-1$ - final List< Model > result = new ArrayList<>(); + final List< Model > result = new ArrayList< Model >(); for ( final KomodoObject kobject : super.getChildrenOfType( transaction, VdbLexicon.Vdb.DECLARATIVE_MODEL, @@ -812,7 +812,7 @@ public Translator[] getTranslators( final UnitOfWork transaction, final KomodoObject grouping = getTranslatorsGroupingNode( transaction ); if ( grouping != null ) { - final List< Translator > temp = new ArrayList<>(); + final List< Translator > temp = new ArrayList< Translator >(); for ( final KomodoObject kobject : grouping.getChildren( transaction, namePatterns ) ) { final Translator translator = new TranslatorImpl( transaction, getRepository(), kobject.getAbsolutePath() ); diff --git a/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/VdbImportImpl.java b/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/VdbImportImpl.java index 90bbe2fa..462f7180 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/VdbImportImpl.java +++ b/komodo-relational/src/main/java/org/komodo/relational/vdb/internal/VdbImportImpl.java @@ -18,7 +18,7 @@ import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * An implementation of a referenced VDB. diff --git a/komodo-relational/src/main/java/org/komodo/relational/workspace/WorkspaceManager.java b/komodo-relational/src/main/java/org/komodo/relational/workspace/WorkspaceManager.java index 3262fd33..a061d7a5 100644 --- a/komodo-relational/src/main/java/org/komodo/relational/workspace/WorkspaceManager.java +++ b/komodo-relational/src/main/java/org/komodo/relational/workspace/WorkspaceManager.java @@ -58,7 +58,7 @@ import org.komodo.utils.ArgCheck; import org.komodo.utils.StringUtils; import org.modeshape.jcr.api.JcrConstants; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * @@ -68,7 +68,7 @@ public class WorkspaceManager extends ObjectImpl implements RelationalObject { /** * The allowed child types. */ - private static final KomodoType[] CHILD_TYPES = new KomodoType[] { Datasource.IDENTIFIER, Vdb.IDENTIFIER, + private static final KomodoType[] CHILD_TYPES = new KomodoType[] { Datasource.IDENTIFIER, Vdb.IDENTIFIER, Schema.IDENTIFIER, Teiid.IDENTIFIER }; /** diff --git a/komodo-relational/src/test/java/org/komodo/relational/RelationalModelTest.java b/komodo-relational/src/test/java/org/komodo/relational/RelationalModelTest.java index 4cc1c3c6..81db69f8 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/RelationalModelTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/RelationalModelTest.java @@ -18,7 +18,7 @@ import org.komodo.relational.workspace.WorkspaceManager; import org.komodo.spi.repository.KomodoObject; import org.komodo.test.utils.AbstractLocalRepositoryTest; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; @SuppressWarnings( { "javadoc", "nls" } ) public class RelationalModelTest extends AbstractLocalRepositoryTest { @@ -79,7 +79,7 @@ protected Vdb createVdb( final String vdbName, assertThat( vdb.getOriginalFilePath( getTransaction() ), is( originalFilePath ) ); return vdb; } - + protected Teiid createTeiid() throws Exception { return createTeiid( getDefaultTeiidName() ); } diff --git a/komodo-relational/src/test/java/org/komodo/relational/importer/ddl/TestTeiidDdlImporter.java b/komodo-relational/src/test/java/org/komodo/relational/importer/ddl/TestTeiidDdlImporter.java index ee5f564f..3968a91c 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/importer/ddl/TestTeiidDdlImporter.java +++ b/komodo-relational/src/test/java/org/komodo/relational/importer/ddl/TestTeiidDdlImporter.java @@ -24,13 +24,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; - import java.io.File; import java.io.InputStream; import java.nio.file.Files; import java.nio.file.StandardCopyOption; import java.util.List; - import org.junit.Ignore; import org.junit.Test; import org.komodo.core.KomodoLexicon; @@ -47,9 +45,9 @@ import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.test.utils.TestUtilities; import org.modeshape.jcr.api.JcrConstants; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * Test Class to test Teiid DDL import diff --git a/komodo-relational/src/test/java/org/komodo/relational/importer/vdb/TestTeiidVdbImporter.java b/komodo-relational/src/test/java/org/komodo/relational/importer/vdb/TestTeiidVdbImporter.java index 2e122bdc..020b6365 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/importer/vdb/TestTeiidVdbImporter.java +++ b/komodo-relational/src/test/java/org/komodo/relational/importer/vdb/TestTeiidVdbImporter.java @@ -56,9 +56,9 @@ import org.komodo.test.utils.TestUtilities; import org.komodo.utils.KLog; import org.modeshape.jcr.api.JcrConstants; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; -import org.modeshape.sequencer.teiid.lexicon.CoreLexicon; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.CoreLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * Test Class to test Teiid VDB import diff --git a/komodo-relational/src/test/java/org/komodo/relational/model/internal/AbstractProcedureImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/model/internal/AbstractProcedureImplTest.java index ce8be5e6..7a4159f0 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/model/internal/AbstractProcedureImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/model/internal/AbstractProcedureImplTest.java @@ -27,8 +27,8 @@ import org.komodo.spi.KException; import org.komodo.spi.constants.StringConstants; import org.komodo.spi.repository.PropertyDescriptor; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; @SuppressWarnings( { "javadoc", "nls" } ) public final class AbstractProcedureImplTest extends RelationalModelTest { diff --git a/komodo-relational/src/test/java/org/komodo/relational/model/internal/AccessPatternImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/model/internal/AccessPatternImplTest.java index 39d57ed3..545d55c2 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/model/internal/AccessPatternImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/model/internal/AccessPatternImplTest.java @@ -23,7 +23,7 @@ import org.komodo.spi.KException; import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; @SuppressWarnings( { "javadoc", "nls" } ) public final class AccessPatternImplTest extends RelationalModelTest { diff --git a/komodo-relational/src/test/java/org/komodo/relational/model/internal/ColumnImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/model/internal/ColumnImplTest.java index 6f70671e..62b069ca 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/model/internal/ColumnImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/model/internal/ColumnImplTest.java @@ -35,8 +35,8 @@ import org.komodo.spi.repository.KomodoType; import org.komodo.spi.repository.PropertyDescriptor; import org.komodo.utils.StringUtils; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; @SuppressWarnings( { "javadoc", "nls" } ) public final class ColumnImplTest extends RelationalModelTest { diff --git a/komodo-relational/src/test/java/org/komodo/relational/model/internal/DataTypeResultSetImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/model/internal/DataTypeResultSetImplTest.java index 9a59ad37..098fffd9 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/model/internal/DataTypeResultSetImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/model/internal/DataTypeResultSetImplTest.java @@ -28,8 +28,8 @@ import org.komodo.spi.constants.StringConstants; import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; @SuppressWarnings( { "javadoc", "nls" } ) public final class DataTypeResultSetImplTest extends RelationalModelTest { diff --git a/komodo-relational/src/test/java/org/komodo/relational/model/internal/ForeignKeyImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/model/internal/ForeignKeyImplTest.java index 48a43fec..958573f8 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/model/internal/ForeignKeyImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/model/internal/ForeignKeyImplTest.java @@ -32,8 +32,8 @@ import org.komodo.spi.KException; import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.Constraint; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.Constraint; @SuppressWarnings( { "javadoc", "nls" } ) public final class ForeignKeyImplTest extends RelationalModelTest { diff --git a/komodo-relational/src/test/java/org/komodo/relational/model/internal/IndexImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/model/internal/IndexImplTest.java index 11655970..dc6d5e1e 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/model/internal/IndexImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/model/internal/IndexImplTest.java @@ -30,7 +30,7 @@ import org.komodo.spi.constants.StringConstants; import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; @SuppressWarnings( { "javadoc", "nls" } ) public final class IndexImplTest extends RelationalModelTest { diff --git a/komodo-relational/src/test/java/org/komodo/relational/model/internal/ModelImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/model/internal/ModelImplTest.java index 2b0a0d22..c49dde6e 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/model/internal/ModelImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/model/internal/ModelImplTest.java @@ -33,9 +33,9 @@ import org.komodo.spi.constants.StringConstants; import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateTable; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateTable; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; @SuppressWarnings( { "javadoc", "nls" } ) public final class ModelImplTest extends RelationalModelTest { @@ -60,8 +60,9 @@ public void shouldAddPushdownFunction() throws Exception { assertThat( this.model.hasChild( getTransaction(), name ), is( true ) ); assertThat( this.model.hasChild( getTransaction(), name, CreateProcedure.FUNCTION_STATEMENT ), is( true ) ); assertThat( this.model.hasChildren( getTransaction() ), is( true ) ); - assertThat( this.model.getChild( getTransaction(), name ), is( function ) ); - assertThat( this.model.getChild( getTransaction(), name, CreateProcedure.FUNCTION_STATEMENT ), is( function ) ); + assertThat( this.model.getChild( getTransaction(), name ), is( ( KomodoObject )function ) ); + assertThat( this.model.getChild( getTransaction(), name, CreateProcedure.FUNCTION_STATEMENT ), + is( ( KomodoObject )function ) ); } @Test @@ -76,8 +77,8 @@ public void shouldAddSource() throws Exception { assertThat( this.model.hasChild( getTransaction(), name ), is( true ) ); assertThat( this.model.hasChild( getTransaction(), name, VdbLexicon.Source.SOURCE ), is( true ) ); assertThat( this.model.hasChildren( getTransaction() ), is( true ) ); - assertThat( this.model.getChild( getTransaction(), name ), is( source ) ); - assertThat( this.model.getChild( getTransaction(), name, VdbLexicon.Source.SOURCE ), is( source ) ); + assertThat( this.model.getChild( getTransaction(), name ), is( ( KomodoObject )source ) ); + assertThat( this.model.getChild( getTransaction(), name, VdbLexicon.Source.SOURCE ), is( ( KomodoObject )source ) ); } @Test @@ -92,8 +93,9 @@ public void shouldAddStoredProcedure() throws Exception { assertThat( this.model.hasChild( getTransaction(), name ), is( true ) ); assertThat( this.model.hasChild( getTransaction(), name, CreateProcedure.PROCEDURE_STATEMENT ), is( true ) ); assertThat( this.model.hasChildren( getTransaction() ), is( true ) ); - assertThat( this.model.getChild( getTransaction(), name ), is( procedure ) ); - assertThat( this.model.getChild( getTransaction(), name, CreateProcedure.PROCEDURE_STATEMENT ), is( procedure ) ); + assertThat( this.model.getChild( getTransaction(), name ), is( ( KomodoObject )procedure ) ); + assertThat( this.model.getChild( getTransaction(), name, CreateProcedure.PROCEDURE_STATEMENT ), + is( ( KomodoObject )procedure ) ); } @Test @@ -108,8 +110,8 @@ public void shouldAddTable() throws Exception { assertThat( this.model.hasChild( getTransaction(), name ), is( true ) ); assertThat( this.model.hasChild( getTransaction(), name, CreateTable.TABLE_STATEMENT ), is( true ) ); assertThat( this.model.hasChildren( getTransaction() ), is( true ) ); - assertThat( this.model.getChild( getTransaction(), name ), is( table ) ); - assertThat( this.model.getChild( getTransaction(), name, CreateTable.TABLE_STATEMENT ), is( table ) ); + assertThat( this.model.getChild( getTransaction(), name ), is( ( KomodoObject )table ) ); + assertThat( this.model.getChild( getTransaction(), name, CreateTable.TABLE_STATEMENT ), is( ( KomodoObject )table ) ); } @Test @@ -124,8 +126,9 @@ public void shouldAddUserDefinedFunction() throws Exception { assertThat( this.model.hasChild( getTransaction(), name ), is( true ) ); assertThat( this.model.hasChild( getTransaction(), name, CreateProcedure.FUNCTION_STATEMENT ), is( true ) ); assertThat( this.model.hasChildren( getTransaction() ), is( true ) ); - assertThat( this.model.getChild( getTransaction(), name ), is( function ) ); - assertThat( this.model.getChild( getTransaction(), name, CreateProcedure.FUNCTION_STATEMENT ), is( function ) ); + assertThat( this.model.getChild( getTransaction(), name ), is( ( KomodoObject )function ) ); + assertThat( this.model.getChild( getTransaction(), name, CreateProcedure.FUNCTION_STATEMENT ), + is( ( KomodoObject )function ) ); } @Test @@ -140,8 +143,8 @@ public void shouldAddView() throws Exception { assertThat( this.model.hasChild( getTransaction(), name ), is( true ) ); assertThat( this.model.hasChild( getTransaction(), name, CreateTable.VIEW_STATEMENT ), is( true ) ); assertThat( this.model.hasChildren( getTransaction() ), is( true ) ); - assertThat( this.model.getChild( getTransaction(), name ), is( view ) ); - assertThat( this.model.getChild( getTransaction(), name, CreateTable.VIEW_STATEMENT ), is( view ) ); + assertThat( this.model.getChild( getTransaction(), name ), is( ( KomodoObject )view ) ); + assertThat( this.model.getChild( getTransaction(), name, CreateTable.VIEW_STATEMENT ), is( ( KomodoObject )view ) ); } @Test @@ -156,8 +159,9 @@ public void shouldAddVirtualProcedure() throws Exception { assertThat( this.model.hasChild( getTransaction(), name ), is( true ) ); assertThat( this.model.hasChild( getTransaction(), name, CreateProcedure.PROCEDURE_STATEMENT ), is( true ) ); assertThat( this.model.hasChildren( getTransaction() ), is( true ) ); - assertThat( this.model.getChild( getTransaction(), name ), is( procedure ) ); - assertThat( this.model.getChild( getTransaction(), name, CreateProcedure.PROCEDURE_STATEMENT ), is( procedure ) ); + assertThat( this.model.getChild( getTransaction(), name ), is( ( KomodoObject )procedure ) ); + assertThat( this.model.getChild( getTransaction(), name, CreateProcedure.PROCEDURE_STATEMENT ), + is( ( KomodoObject )procedure ) ); } @Test diff --git a/komodo-relational/src/test/java/org/komodo/relational/model/internal/ParameterImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/model/internal/ParameterImplTest.java index 0bc4c735..33cda57c 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/model/internal/ParameterImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/model/internal/ParameterImplTest.java @@ -33,9 +33,9 @@ import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; import org.komodo.spi.repository.PropertyDescriptor; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; @SuppressWarnings( { "javadoc", "nls" } ) public final class ParameterImplTest extends RelationalModelTest { @@ -220,7 +220,7 @@ public void shouldHaveNullablePropertyDefaultValueAfterConstruction() throws Exc @Test public void shouldHaveParentProcedureAfterConstruction() throws Exception { - assertThat( ( AbstractProcedure )this.parameter.getParent( getTransaction() ), is( this.procedure ) ); + assertThat( this.parameter.getParent( getTransaction() ), is( this.procedure ) ); } @Test( expected = UnsupportedOperationException.class ) diff --git a/komodo-relational/src/test/java/org/komodo/relational/model/internal/PrimaryKeyImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/model/internal/PrimaryKeyImplTest.java index 490ba8da..f44a60ba 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/model/internal/PrimaryKeyImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/model/internal/PrimaryKeyImplTest.java @@ -25,8 +25,8 @@ import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; import org.modeshape.jcr.JcrLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.Constraint; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.Constraint; @SuppressWarnings( { "javadoc", "nls" } ) public final class PrimaryKeyImplTest extends RelationalModelTest { diff --git a/komodo-relational/src/test/java/org/komodo/relational/model/internal/ResultSetColumnImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/model/internal/ResultSetColumnImplTest.java index 39c330bb..da295495 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/model/internal/ResultSetColumnImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/model/internal/ResultSetColumnImplTest.java @@ -33,7 +33,7 @@ import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; import org.komodo.spi.repository.PropertyDescriptor; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; @SuppressWarnings( { "javadoc", "nls" } ) public final class ResultSetColumnImplTest extends RelationalModelTest { diff --git a/komodo-relational/src/test/java/org/komodo/relational/model/internal/StatementOptionImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/model/internal/StatementOptionImplTest.java index f3b356f2..da0dfb1b 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/model/internal/StatementOptionImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/model/internal/StatementOptionImplTest.java @@ -26,7 +26,7 @@ import org.komodo.spi.constants.StringConstants; import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; @SuppressWarnings( { "javadoc", "nls" } ) public final class StatementOptionImplTest extends RelationalModelTest { diff --git a/komodo-relational/src/test/java/org/komodo/relational/model/internal/TableConstraintTest.java b/komodo-relational/src/test/java/org/komodo/relational/model/internal/TableConstraintTest.java index 22cb3cdd..ae7b1100 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/model/internal/TableConstraintTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/model/internal/TableConstraintTest.java @@ -19,7 +19,7 @@ import org.komodo.relational.model.Table; import org.komodo.relational.model.TableConstraint; import org.komodo.spi.KException; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; @SuppressWarnings( { "javadoc", "nls" } ) public final class TableConstraintTest extends RelationalModelTest { diff --git a/komodo-relational/src/test/java/org/komodo/relational/model/internal/TableImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/model/internal/TableImplTest.java index ffed8b00..c66b0bb4 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/model/internal/TableImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/model/internal/TableImplTest.java @@ -43,8 +43,8 @@ import org.komodo.spi.repository.KomodoType; import org.komodo.spi.repository.PropertyDescriptor; import org.komodo.utils.StringUtils; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; @SuppressWarnings( { "javadoc", "nls" } ) public final class TableImplTest extends RelationalModelTest { diff --git a/komodo-relational/src/test/java/org/komodo/relational/model/internal/TabularResultSetImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/model/internal/TabularResultSetImplTest.java index 62a26436..eb776f1c 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/model/internal/TabularResultSetImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/model/internal/TabularResultSetImplTest.java @@ -26,7 +26,7 @@ import org.komodo.spi.KException; import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon.CreateProcedure; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon.CreateProcedure; @SuppressWarnings( { "javadoc", "nls" } ) public final class TabularResultSetImplTest extends RelationalModelTest { diff --git a/komodo-relational/src/test/java/org/komodo/relational/model/internal/UniqueConstraintImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/model/internal/UniqueConstraintImplTest.java index 75d898cc..93360ed5 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/model/internal/UniqueConstraintImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/model/internal/UniqueConstraintImplTest.java @@ -23,7 +23,7 @@ import org.komodo.spi.KException; import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; @SuppressWarnings( { "javadoc", "nls" } ) public final class UniqueConstraintImplTest extends RelationalModelTest { diff --git a/komodo-relational/src/test/java/org/komodo/relational/model/internal/VirtualProcedureImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/model/internal/VirtualProcedureImplTest.java index 311c6bbc..f39933b5 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/model/internal/VirtualProcedureImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/model/internal/VirtualProcedureImplTest.java @@ -25,7 +25,7 @@ import org.komodo.spi.constants.StringConstants; import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; @SuppressWarnings( { "javadoc", "nls" } ) public final class VirtualProcedureImplTest extends RelationalModelTest { diff --git a/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/ConditionImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/ConditionImplTest.java index 158777ad..22ea8aad 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/ConditionImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/ConditionImplTest.java @@ -24,7 +24,7 @@ import org.komodo.spi.KException; import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; @SuppressWarnings( { "javadoc", "nls" } ) public final class ConditionImplTest extends RelationalModelTest { diff --git a/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/DataRoleImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/DataRoleImplTest.java index 9d5acf4d..cdb8c27b 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/DataRoleImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/DataRoleImplTest.java @@ -27,7 +27,7 @@ import org.komodo.spi.constants.StringConstants; import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; @SuppressWarnings( { "javadoc", "nls" } ) public final class DataRoleImplTest extends RelationalModelTest { @@ -87,8 +87,9 @@ public void shouldAddPermission() throws Exception { assertThat( this.dataRole.hasChild( getTransaction(), name ), is( true ) ); assertThat( this.dataRole.hasChild( getTransaction(), name, VdbLexicon.DataRole.Permission.PERMISSION ), is( true ) ); assertThat( this.dataRole.hasChildren( getTransaction() ), is( true ) ); - assertThat( this.dataRole.getChild( getTransaction(), name ), is( added ) ); - assertThat( this.dataRole.getChild( getTransaction(), name, VdbLexicon.DataRole.Permission.PERMISSION ), is( added ) ); + assertThat( this.dataRole.getChild( getTransaction(), name ), is( ( KomodoObject )added ) ); + assertThat( this.dataRole.getChild( getTransaction(), name, VdbLexicon.DataRole.Permission.PERMISSION ), + is( ( KomodoObject )added ) ); } @Test( expected = KException.class ) diff --git a/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/EntryImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/EntryImplTest.java index f282cd52..08f6581e 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/EntryImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/EntryImplTest.java @@ -26,7 +26,7 @@ import org.komodo.spi.constants.StringConstants; import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; @SuppressWarnings( { "javadoc", "nls" } ) public final class EntryImplTest extends RelationalModelTest { diff --git a/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/MaskImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/MaskImplTest.java index ffa587e2..396e7ede 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/MaskImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/MaskImplTest.java @@ -25,7 +25,7 @@ import org.komodo.spi.KException; import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; @SuppressWarnings( { "javadoc", "nls" } ) public final class MaskImplTest extends RelationalModelTest { diff --git a/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/ModelSourceImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/ModelSourceImplTest.java index c1b87787..97ca1a5e 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/ModelSourceImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/ModelSourceImplTest.java @@ -24,7 +24,7 @@ import org.komodo.spi.constants.StringConstants; import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; @SuppressWarnings( { "javadoc", "nls" } ) public final class ModelSourceImplTest extends RelationalModelTest { diff --git a/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/PermissionImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/PermissionImplTest.java index 3026ccc9..3c766b1b 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/PermissionImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/PermissionImplTest.java @@ -28,7 +28,7 @@ import org.komodo.spi.constants.StringConstants; import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; @SuppressWarnings( { "javadoc", "nls" } ) public final class PermissionImplTest extends RelationalModelTest { @@ -60,9 +60,9 @@ public void shouldAddCondition() throws Exception { assertThat( this.permission.hasChild( getTransaction(), name, VdbLexicon.DataRole.Permission.Condition.CONDITION ), is( true ) ); assertThat( this.permission.hasChildren( getTransaction() ), is( true ) ); - assertThat( this.permission.getChild( getTransaction(), name ), is( added ) ); + assertThat( this.permission.getChild( getTransaction(), name ), is( ( KomodoObject )added ) ); assertThat( this.permission.getChild( getTransaction(), name, VdbLexicon.DataRole.Permission.Condition.CONDITION ), - is( added ) ); + is( ( KomodoObject )added ) ); } @Test @@ -81,8 +81,9 @@ public void shouldAddMask() throws Exception { assertThat( this.permission.hasChild( getTransaction(), name ), is( true ) ); assertThat( this.permission.hasChild( getTransaction(), name, VdbLexicon.DataRole.Permission.Mask.MASK ), is( true ) ); assertThat( this.permission.hasChildren( getTransaction() ), is( true ) ); - assertThat( this.permission.getChild( getTransaction(), name ), is( added ) ); - assertThat( this.permission.getChild( getTransaction(), name, VdbLexicon.DataRole.Permission.Mask.MASK ), is( added ) ); + assertThat( this.permission.getChild( getTransaction(), name ), is( ( KomodoObject )added ) ); + assertThat( this.permission.getChild( getTransaction(), name, VdbLexicon.DataRole.Permission.Mask.MASK ), + is( ( KomodoObject )added ) ); } @Test( expected = KException.class ) diff --git a/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/TranslatorImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/TranslatorImplTest.java index 741f75c2..bdddc85d 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/TranslatorImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/TranslatorImplTest.java @@ -26,7 +26,7 @@ import org.komodo.spi.constants.StringConstants; import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; @SuppressWarnings( { "javadoc", "nls" } ) public final class TranslatorImplTest extends RelationalModelTest { diff --git a/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/VdbImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/VdbImplTest.java index 0fbd6ec2..303247de 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/VdbImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/VdbImplTest.java @@ -14,8 +14,6 @@ import static org.hamcrest.core.IsNull.nullValue; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import java.io.File; -import java.io.FileInputStream; import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; @@ -45,7 +43,7 @@ import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; import org.komodo.spi.repository.PropertyDescriptor; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; @@ -81,8 +79,8 @@ public void shouldAddDataRole() throws Exception { assertThat( this.vdb.hasChild( getTransaction(), name ), is( true ) ); assertThat( this.vdb.hasChild( getTransaction(), name, VdbLexicon.DataRole.DATA_ROLE ), is( true ) ); assertThat( this.vdb.hasChildren( getTransaction() ), is( true ) ); - assertThat( this.vdb.getChild( getTransaction(), name ), is( added ) ); - assertThat( this.vdb.getChild( getTransaction(), name, VdbLexicon.DataRole.DATA_ROLE ), is( added ) ); + assertThat( this.vdb.getChild( getTransaction(), name ), is( ( KomodoObject )added ) ); + assertThat( this.vdb.getChild( getTransaction(), name, VdbLexicon.DataRole.DATA_ROLE ), is( ( KomodoObject )added ) ); } @Test @@ -103,8 +101,8 @@ public void shouldAddEntry() throws Exception { assertThat( this.vdb.hasChild( getTransaction(), name ), is( true ) ); assertThat( this.vdb.hasChild( getTransaction(), name, VdbLexicon.Entry.ENTRY ), is( true ) ); assertThat( this.vdb.hasChildren( getTransaction() ), is( true ) ); - assertThat( this.vdb.getChild( getTransaction(), name ), is( added ) ); - assertThat( this.vdb.getChild( getTransaction(), name, VdbLexicon.Entry.ENTRY ), is( added ) ); + assertThat( this.vdb.getChild( getTransaction(), name ), is( ( KomodoObject )added ) ); + assertThat( this.vdb.getChild( getTransaction(), name, VdbLexicon.Entry.ENTRY ), is( ( KomodoObject )added ) ); } @Test @@ -123,8 +121,8 @@ public void shouldAddImport() throws Exception { assertThat( this.vdb.hasChild( getTransaction(), name ), is( true ) ); assertThat( this.vdb.hasChild( getTransaction(), name, VdbLexicon.ImportVdb.IMPORT_VDB ), is( true ) ); assertThat( this.vdb.hasChildren( getTransaction() ), is( true ) ); - assertThat( this.vdb.getChild( getTransaction(), name ), is( added ) ); - assertThat( this.vdb.getChild( getTransaction(), name, VdbLexicon.ImportVdb.IMPORT_VDB ), is( added ) ); + assertThat( this.vdb.getChild( getTransaction(), name ), is( ( KomodoObject )added ) ); + assertThat( this.vdb.getChild( getTransaction(), name, VdbLexicon.ImportVdb.IMPORT_VDB ), is( ( KomodoObject )added ) ); } @Test @@ -143,8 +141,8 @@ public void shouldAddModel() throws Exception { assertThat( this.vdb.hasChild( getTransaction(), name ), is( true ) ); assertThat( this.vdb.hasChild( getTransaction(), name, VdbLexicon.Vdb.DECLARATIVE_MODEL ), is( true ) ); assertThat( this.vdb.hasChildren( getTransaction() ), is( true ) ); - assertThat( this.vdb.getChild( getTransaction(), name ), is( added ) ); - assertThat( this.vdb.getChild( getTransaction(), name, VdbLexicon.Vdb.DECLARATIVE_MODEL ), is( added ) ); + assertThat( this.vdb.getChild( getTransaction(), name ), is( ( KomodoObject )added ) ); + assertThat( this.vdb.getChild( getTransaction(), name, VdbLexicon.Vdb.DECLARATIVE_MODEL ), is( ( KomodoObject )added ) ); } @Test @@ -165,8 +163,8 @@ public void shouldAddTranslator() throws Exception { assertThat( this.vdb.hasChild( getTransaction(), name ), is( true ) ); assertThat( this.vdb.hasChild( getTransaction(), name, VdbLexicon.Translator.TRANSLATOR ), is( true ) ); assertThat( this.vdb.hasChildren( getTransaction() ), is( true ) ); - assertThat( this.vdb.getChild( getTransaction(), name ), is( added ) ); - assertThat( this.vdb.getChild( getTransaction(), name, VdbLexicon.Translator.TRANSLATOR ), is( added ) ); + assertThat( this.vdb.getChild( getTransaction(), name ), is( ( KomodoObject )added ) ); + assertThat( this.vdb.getChild( getTransaction(), name, VdbLexicon.Translator.TRANSLATOR ), is( ( KomodoObject )added ) ); } @Test @@ -328,7 +326,7 @@ public void shouldHaveStrongTypedChildren() throws Exception { @Test public void shouldIncludeSpecialPropertiesInPrimaryTypePropertyDescriptors() throws Exception { final PropertyDescriptor[] descriptors = this.vdb.getPrimaryType( getTransaction() ).getPropertyDescriptors( getTransaction() ); - final List< String > specialProps = new ArrayList<>( Arrays.asList( VdbImpl.SpecialProperty.valuesAsTeiidNames() ) ); + final List< String > specialProps = new ArrayList< String >( Arrays.asList( VdbImpl.SpecialProperty.valuesAsTeiidNames() ) ); // make sure we are returning more than just the special props assertThat( descriptors.length > specialProps.size(), is( true ) ); diff --git a/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/VdbImportImplTest.java b/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/VdbImportImplTest.java index 17d51229..8cb0db8a 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/VdbImportImplTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/vdb/internal/VdbImportImplTest.java @@ -22,7 +22,7 @@ import org.komodo.spi.KException; import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; @SuppressWarnings( { "javadoc", "nls" } ) public final class VdbImportImplTest extends RelationalModelTest { diff --git a/komodo-relational/src/test/java/org/komodo/relational/workspace/WorkspaceManagerTest.java b/komodo-relational/src/test/java/org/komodo/relational/workspace/WorkspaceManagerTest.java index 007e14d9..9a65ca40 100644 --- a/komodo-relational/src/test/java/org/komodo/relational/workspace/WorkspaceManagerTest.java +++ b/komodo-relational/src/test/java/org/komodo/relational/workspace/WorkspaceManagerTest.java @@ -55,9 +55,9 @@ import org.komodo.spi.constants.StringConstants; import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.KomodoType; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; @SuppressWarnings( {"javadoc", "nls"} ) public final class WorkspaceManagerTest extends RelationalModelTest { diff --git a/komodo-shell-api/.classpath b/komodo-shell-api/.classpath index fae1a2b3..c2e15478 100644 --- a/komodo-shell-api/.classpath +++ b/komodo-shell-api/.classpath @@ -17,17 +17,13 @@ - - - - - - + + - + diff --git a/komodo-shell-api/.project b/komodo-shell-api/.project index 001edad0..a2e2a45b 100644 --- a/komodo-shell-api/.project +++ b/komodo-shell-api/.project @@ -5,11 +5,21 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder + + org.eclipse.wst.validation.validationbuilder + + + org.eclipse.m2e.core.maven2Builder @@ -19,5 +29,7 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.common.modulecore.ModuleCoreNature diff --git a/komodo-shell-api/pom.xml b/komodo-shell-api/pom.xml index d84bfb33..47a0cc1c 100644 --- a/komodo-shell-api/pom.xml +++ b/komodo-shell-api/pom.xml @@ -9,7 +9,7 @@ komodo-shell-api Komodo Shell API The API for the shell - + org.komodo diff --git a/komodo-shell-api/src/main/java/org/komodo/shell/api/ShellCommand.java b/komodo-shell-api/src/main/java/org/komodo/shell/api/ShellCommand.java index fdc06d82..c55f6cad 100644 --- a/komodo-shell-api/src/main/java/org/komodo/shell/api/ShellCommand.java +++ b/komodo-shell-api/src/main/java/org/komodo/shell/api/ShellCommand.java @@ -18,8 +18,6 @@ import java.io.Writer; import java.util.List; -import org.komodo.utils.i18n.I18n; - /** * Interface implemented by all shell commands. * @@ -36,19 +34,17 @@ public interface ShellCommand { * * @return the command category (can be empty) */ - default String getCategory() { - return I18n.bind( ShellApiI18n.generalCommandCategory ); - } + String getCategory(); /** * @return the command name (never empty) */ String getName(); - /** - * @return the command name aliases (never null but can be empty) - */ - String[] getAliases(); + /** + * @return the command name aliases (never null but can be empty) + */ + String[] getAliases(); /** * @return the command arguments (can be null) @@ -61,22 +57,22 @@ default String getCategory() { */ void setArguments(Arguments arguments); - /** - * Configure the command's output. - * @param output the writer - */ - void setWriter(Writer output); + /** + * Configure the command's output. + * @param output the writer + */ + void setWriter(Writer output); - /** - * @return the stream writer (can be null if not set) - */ - Writer getWriter(); + /** + * @return the stream writer (can be null if not set) + */ + Writer getWriter(); - /** - * Get the WorkspaceStatus - * @return the workspace status - */ - WorkspaceStatus getWorkspaceStatus(); + /** + * Get the WorkspaceStatus + * @return the workspace status + */ + WorkspaceStatus getWorkspaceStatus(); /** * @return true if command is valid for the current context @@ -86,16 +82,12 @@ default String getCategory() { /** * @return true if the command is enabled */ - default boolean isEnabled() { - return true; - } + boolean isEnabled(); /** * @return true if the command can be overridden */ - default boolean isOverridable() { - return true; - } + boolean isOverridable(); /** * Called to execute the command. @@ -104,33 +96,31 @@ default boolean isOverridable() { */ CommandResult execute(); - /** - * Prints the usage help for this command. - * @param indent number of spaces to indent - */ - void printUsage(int indent); - - /** - * Prints the help text for this command. - * @param indent number of spaces to indent - */ - void printHelp(int indent); - - /** - * Handle tab completion for the command. This is optional, but provides a mechanism by - * which individual commands can enable command-specific tab completion functionality. - * - * The return value of this method is tab completion modifier through which an user is - * able to e.g. turn off tab completion or append separator after the auto completed text - * - * @param lastArgument the last arg - * @param candidates the candidates - * @return tab completion modifier - * @throws Exception if errors occur - */ - default TabCompletionModifier tabCompletion( final String lastArgument, - final List< CharSequence > candidates ) throws Exception { - return TabCompletionModifier.NO_AUTOCOMPLETION; - } + /** + * Prints the usage help for this command. + * @param indent number of spaces to indent + */ + void printUsage(int indent); + + /** + * Prints the help text for this command. + * @param indent number of spaces to indent + */ + void printHelp(int indent); + + /** + * Handle tab completion for the command. This is optional, but provides a mechanism by + * which individual commands can enable command-specific tab completion functionality. + * + * The return value of this method is tab completion modifier through which an user is + * able to e.g. turn off tab completion or append separator after the auto completed text + * + * @param lastArgument the last arg + * @param candidates the candidates + * @return tab completion modifier + * @throws Exception if errors occur + */ + TabCompletionModifier tabCompletion( final String lastArgument, + final List< CharSequence > candidates ) throws Exception; } diff --git a/komodo-shell/.classpath b/komodo-shell/.classpath index fae1a2b3..550e3f2a 100644 --- a/komodo-shell/.classpath +++ b/komodo-shell/.classpath @@ -22,12 +22,13 @@ - + + - + diff --git a/komodo-shell/.project b/komodo-shell/.project index 2790711b..de740c26 100644 --- a/komodo-shell/.project +++ b/komodo-shell/.project @@ -5,11 +5,21 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder + + org.eclipse.wst.validation.validationbuilder + + + org.eclipse.m2e.core.maven2Builder @@ -19,5 +29,7 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.common.modulecore.ModuleCoreNature diff --git a/komodo-shell/pom.xml b/komodo-shell/pom.xml index 9ec8e49b..2be28eef 100644 --- a/komodo-shell/pom.xml +++ b/komodo-shell/pom.xml @@ -15,7 +15,7 @@ - + src/main/resources true diff --git a/komodo-shell/src/main/java/org/komodo/shell/BuiltInShellCommand.java b/komodo-shell/src/main/java/org/komodo/shell/BuiltInShellCommand.java index 06a74406..eb273d09 100644 --- a/komodo-shell/src/main/java/org/komodo/shell/BuiltInShellCommand.java +++ b/komodo-shell/src/main/java/org/komodo/shell/BuiltInShellCommand.java @@ -24,7 +24,9 @@ import org.komodo.shell.api.CommandResult; import org.komodo.shell.api.InvalidCommandArgumentException; import org.komodo.shell.api.KomodoObjectLabelProvider; +import org.komodo.shell.api.ShellApiI18n; import org.komodo.shell.api.ShellCommand; +import org.komodo.shell.api.TabCompletionModifier; import org.komodo.shell.api.WorkspaceStatus; import org.komodo.shell.util.KomodoObjectUtils; import org.komodo.shell.util.PrintUtils; @@ -218,7 +220,7 @@ protected String[] processOptionalArguments( final int startIndex ) { return EMPTY_ARRAY; } - final List< String > optionalArgs = new ArrayList< >(); + final List< String > optionalArgs = new ArrayList< String >(); int i = startIndex; while ( optionalArgument( i ) != null ) { @@ -248,10 +250,40 @@ public Writer getWriter() { return this.writer; } + /** + * {@inheritDoc} + * + * @see org.komodo.shell.api.ShellCommand#getCategory() + */ + @Override + public String getCategory() { + return I18n.bind( ShellApiI18n.generalCommandCategory ); + } + protected KomodoObject getContext() { return getWorkspaceStatus().getCurrentContext(); } + /** + * {@inheritDoc} + * + * @see org.komodo.shell.api.ShellCommand#isEnabled() + */ + @Override + public boolean isEnabled() { + return true; + } + + /** + * {@inheritDoc} + * + * @see org.komodo.shell.api.ShellCommand#isOverridable() + */ + @Override + public boolean isOverridable() { + return true; + } + protected boolean isShowingPropertyNamePrefixes() { return getWorkspaceStatus().isShowingPropertyNamePrefixes(); } @@ -329,6 +361,17 @@ protected void print( final int indent, PrintUtils.print( getWriter(), indent, formattedMessage, params ); } + /** + * {@inheritDoc} + * + * @see org.komodo.shell.api.ShellCommand#tabCompletion(java.lang.String, java.util.List) + */ + @Override + public TabCompletionModifier tabCompletion( final String lastArgument, + final List< CharSequence > candidates ) throws Exception { + return TabCompletionModifier.NO_AUTOCOMPLETION; + } + /** * {@inheritDoc} * @@ -668,7 +711,7 @@ public void updateTabCompleteCandidatesForProperty(List candidates if ( isShowingPropertyNamePrefixes() ) { potentials = propNames; } else { - potentials = new ArrayList<>( propNames.size() ); + potentials = new ArrayList( propNames.size() ); // strip off prefix for ( final String name : propNames ) { diff --git a/komodo-shell/src/main/java/org/komodo/shell/BuiltInShellCommandProvider.java b/komodo-shell/src/main/java/org/komodo/shell/BuiltInShellCommandProvider.java index 29f85672..da712bf9 100644 --- a/komodo-shell/src/main/java/org/komodo/shell/BuiltInShellCommandProvider.java +++ b/komodo-shell/src/main/java/org/komodo/shell/BuiltInShellCommandProvider.java @@ -9,7 +9,6 @@ import java.util.HashSet; import java.util.Set; - import org.komodo.shell.api.ShellCommand; import org.komodo.shell.api.ShellCommandProvider; import org.komodo.shell.api.WorkspaceStatus; @@ -86,7 +85,7 @@ public void initWorkspaceState( final WorkspaceStatus status ) { */ @Override public Set< Class< ? extends ShellCommand > > provideCommands() { - final Set< Class< ? extends ShellCommand > > result = new HashSet< >(); + final Set< Class< ? extends ShellCommand > > result = new HashSet< Class< ? extends ShellCommand > >(); result.add( AddChildCommand.class ); result.add( AddDescriptorCommand.class ); diff --git a/komodo-shell/src/main/java/org/komodo/shell/CommandResultImpl.java b/komodo-shell/src/main/java/org/komodo/shell/CommandResultImpl.java index 6fdd397b..ac1bcd0b 100644 --- a/komodo-shell/src/main/java/org/komodo/shell/CommandResultImpl.java +++ b/komodo-shell/src/main/java/org/komodo/shell/CommandResultImpl.java @@ -75,7 +75,7 @@ public void addDetail( final String key, ArgCheck.isNotEmpty( key, "key" ); //$NON-NLS-1$ if ( this.detailMap == null ) { - this.detailMap = new HashMap< >(); + this.detailMap = new HashMap< String, Object >(); } this.detailMap.put( key, detail ); diff --git a/komodo-shell/src/main/java/org/komodo/shell/ShellCommandFactoryImpl.java b/komodo-shell/src/main/java/org/komodo/shell/ShellCommandFactoryImpl.java index 1a38b94c..5ab6c86c 100644 --- a/komodo-shell/src/main/java/org/komodo/shell/ShellCommandFactoryImpl.java +++ b/komodo-shell/src/main/java/org/komodo/shell/ShellCommandFactoryImpl.java @@ -73,7 +73,7 @@ public class ShellCommandFactoryImpl implements ShellCommandFactory { public ShellCommandFactoryImpl(final WorkspaceStatus wsStatus ) throws Exception { ArgCheck.isNotNull( wsStatus, "wsStatus" ); //$NON-NLS-1$ - this.commandMap = new HashMap<>(); + this.commandMap = new HashMap< String, Map< String, ShellCommand > >(); _commandNotFound = new CommandNotFoundCommand( wsStatus ); discoverProviders( wsStatus ); @@ -112,7 +112,7 @@ private void registerContributedCommands( final ShellCommandProvider provider, } private void discoverProviders( final WorkspaceStatus wsStatus ) { - final List< ClassLoader > commandClassloaders = new ArrayList< >(); + final List< ClassLoader > commandClassloaders = new ArrayList< ClassLoader >(); commandClassloaders.add( Thread.currentThread().getContextClassLoader() ); // Find providers in the user's commands directory @@ -130,7 +130,7 @@ private void discoverProviders( final WorkspaceStatus wsStatus ) { final Collection< File > jarFiles = FileUtils.getFilesForPattern( commandsDir.getCanonicalPath(), "", ".jar" ); //$NON-NLS-1$ //$NON-NLS-2$ if ( !jarFiles.isEmpty() ) { - final List< URL > jarURLs = new ArrayList< >( jarFiles.size() ); + final List< URL > jarURLs = new ArrayList< URL >( jarFiles.size() ); for ( final File jarFile : jarFiles ) { final URL jarUrl = jarFile.toURI().toURL(); @@ -149,7 +149,7 @@ private void discoverProviders( final WorkspaceStatus wsStatus ) { } // add built-in provider and discover other providers - final Set< ShellCommandProvider > tempProviders = new HashSet< >(); + final Set< ShellCommandProvider > tempProviders = new HashSet< ShellCommandProvider >(); final ShellCommandProvider builtInProvider = new BuiltInShellCommandProvider(); tempProviders.add( builtInProvider ); registerContributedCommands( builtInProvider, wsStatus ); @@ -180,7 +180,7 @@ private void registerCommand( final String providerId, Map commands = this.commandMap.get( cmdName ); if (commands == null) { - commands = new HashMap<>(); + commands = new HashMap(); this.commandMap.put( cmdName, commands ); } @@ -221,7 +221,7 @@ public ShellCommand getCommand( final String commandName ) throws Exception { // command can't be found return createCommandNotFound(commandName); } - + /* (non-Javadoc) * @see org.komodo.shell.api.ShellCommandFactory#createCommandNotFound(java.lang.String) */ @@ -233,7 +233,7 @@ public ShellCommand createCommandNotFound(String commandName) { @Override public Set< ShellCommand > getCommandsForCurrentContext() { - final Set< ShellCommand > availableCommands = new HashSet< >(); + final Set< ShellCommand > availableCommands = new HashSet< ShellCommand >(); for ( final String cmdName : this.commandMap.keySet() ) { final Map< String, ShellCommand > commands = this.commandMap.get( cmdName ); @@ -291,7 +291,7 @@ public Set< ShellCommand > getCommandsForCurrentContext() { */ @Override public Set< String > getCommandNamesForCurrentContext() { - final Set< String > commandNames = new TreeSet< >(); + final Set< String > commandNames = new TreeSet< String >(); for ( final ShellCommand possible : getCommandsForCurrentContext() ) { commandNames.add( possible.getName() ); diff --git a/komodo-shell/src/main/java/org/komodo/shell/WorkspaceStatusImpl.java b/komodo-shell/src/main/java/org/komodo/shell/WorkspaceStatusImpl.java index bc125d4f..766a2e1b 100644 --- a/komodo-shell/src/main/java/org/komodo/shell/WorkspaceStatusImpl.java +++ b/komodo-shell/src/main/java/org/komodo/shell/WorkspaceStatusImpl.java @@ -43,7 +43,6 @@ import java.util.Set; import java.util.TreeSet; import java.util.concurrent.TimeUnit; - import org.komodo.core.KEngine; import org.komodo.repository.ObjectImpl; import org.komodo.repository.RepositoryImpl; @@ -109,7 +108,7 @@ public class WorkspaceStatusImpl implements WorkspaceStatus { private KomodoObjectLabelProvider currentContextLabelProvider; private KomodoObjectLabelProvider defaultLabelProvider; private KomodoObjectLabelProvider lastUsedLabelProvider; - private Collection alternateLabelProviders = new ArrayList<>(); + private Collection alternateLabelProviders = new ArrayList(); /** * Constructor @@ -173,13 +172,24 @@ private void initGlobalProperties() throws KException { final File startupPropertiesFile = new File( dataDir, this.shell.getShellPropertiesFile() ); if ( startupPropertiesFile.exists() && startupPropertiesFile.isFile() && startupPropertiesFile.canRead() ) { - try ( final FileInputStream fis = new FileInputStream( startupPropertiesFile ) ) { + FileInputStream fis = null; + + try { + fis = new FileInputStream( startupPropertiesFile ); this.wsProperties.load( fis ); } catch ( final Exception e ) { String msg = I18n.bind( ShellI18n.errorLoadingProperties, startupPropertiesFile.getAbsolutePath(), e.getMessage() ); PrintUtils.print(getOutputWriter(), CompletionConstants.MESSAGE_INDENT, msg); + } finally { + if ( fis != null ) { + try { + fis.close(); + } catch ( final IOException e ) { + KLog.getLogger().error( e.getLocalizedMessage() ); + } + } } } @@ -396,7 +406,7 @@ public Set getAvailableCommands() { */ @Override public String[] getAvailableCommandNames() throws Exception { - final Set< String > commandNames = new TreeSet< >(); + final Set< String > commandNames = new TreeSet< String >(); for ( final ShellCommand possible : getAvailableCommands() ) { commandNames.add( possible.getName() ); @@ -933,7 +943,7 @@ public boolean isAutoCommit() { } private void discoverLabelProviders( ) { - final List< ClassLoader > commandClassloaders = new ArrayList< >(); + final List< ClassLoader > commandClassloaders = new ArrayList< ClassLoader >(); commandClassloaders.add( Thread.currentThread().getContextClassLoader() ); // Find providers in the user's commands directory @@ -951,7 +961,7 @@ private void discoverLabelProviders( ) { final Collection< File > jarFiles = FileUtils.getFilesForPattern( commandsDir.getCanonicalPath(), "", ".jar" ); //$NON-NLS-1$ //$NON-NLS-2$ if ( !jarFiles.isEmpty() ) { - final List< URL > jarURLs = new ArrayList< >( jarFiles.size() ); + final List< URL > jarURLs = new ArrayList< URL >( jarFiles.size() ); for ( final File jarFile : jarFiles ) { final URL jarUrl = jarFile.toURI().toURL(); diff --git a/komodo-shell/src/main/java/org/komodo/shell/commands/ExitCommand.java b/komodo-shell/src/main/java/org/komodo/shell/commands/ExitCommand.java index c58cbac1..53723ac7 100644 --- a/komodo-shell/src/main/java/org/komodo/shell/commands/ExitCommand.java +++ b/komodo-shell/src/main/java/org/komodo/shell/commands/ExitCommand.java @@ -49,7 +49,7 @@ public final class ExitCommand extends BuiltInShellCommand { private static final List< String > VALID_ARGS; static { - VALID_ARGS = new ArrayList<>(FORCE_ARGS.size() + SAVE_ARGS.size()); + VALID_ARGS = new ArrayList< String >(FORCE_ARGS.size() + SAVE_ARGS.size()); VALID_ARGS.addAll( FORCE_ARGS ); VALID_ARGS.addAll( SAVE_ARGS ); } diff --git a/komodo-shell/src/main/java/org/komodo/shell/commands/HelpCommand.java b/komodo-shell/src/main/java/org/komodo/shell/commands/HelpCommand.java index efacac03..57307a1a 100644 --- a/komodo-shell/src/main/java/org/komodo/shell/commands/HelpCommand.java +++ b/komodo-shell/src/main/java/org/komodo/shell/commands/HelpCommand.java @@ -27,8 +27,8 @@ import org.komodo.shell.CompletionConstants; import org.komodo.shell.ShellI18n; import org.komodo.shell.api.CommandResult; -import org.komodo.shell.api.TabCompletionModifier; import org.komodo.shell.api.ShellCommand; +import org.komodo.shell.api.TabCompletionModifier; import org.komodo.shell.api.WorkspaceStatus; import org.komodo.utils.i18n.I18n; @@ -162,7 +162,7 @@ private void printHelpAll() throws Exception { if ( getWorkspaceStatus().isShowingCommandCategory() ) { final WorkspaceStatus status = getWorkspaceStatus(); - final Map< String, List< String > > categoryCommands = new TreeMap< >(); + final Map< String, List< String > > categoryCommands = new TreeMap< String, List< String > >(); // group commands by category for ( final String cmdName : validCmdNames ) { diff --git a/komodo-shell/src/main/java/org/komodo/shell/commands/ResetGlobalPropertyCommand.java b/komodo-shell/src/main/java/org/komodo/shell/commands/ResetGlobalPropertyCommand.java index 4c8b7399..f1b37d01 100644 --- a/komodo-shell/src/main/java/org/komodo/shell/commands/ResetGlobalPropertyCommand.java +++ b/komodo-shell/src/main/java/org/komodo/shell/commands/ResetGlobalPropertyCommand.java @@ -2,11 +2,11 @@ import java.util.LinkedList; import java.util.List; - import org.komodo.shell.BuiltInShellCommand; import org.komodo.shell.CommandResultImpl; import org.komodo.shell.ShellI18n; import org.komodo.shell.api.CommandResult; +import org.komodo.shell.api.ShellCommand; import org.komodo.shell.api.TabCompletionModifier; import org.komodo.shell.api.WorkspaceStatus; import org.komodo.utils.StringUtils; @@ -45,7 +45,7 @@ public boolean isValidForCurrentContext() { @Override protected CommandResult doExecute() { try { - + String firstArgument = requiredArgument(0, I18n.bind(ShellI18n.invalidArgMsgResetGlobalPropertyName,ARG_ALL)); WorkspaceStatus status = getWorkspaceStatus(); @@ -53,13 +53,13 @@ protected CommandResult doExecute() { // reset all global properties status.setGlobalProperties(null); return new CommandResultImpl(I18n.bind(ShellI18n.globalResetAllProps)); //Reset all props OK - } else { + } else { // reset single property String validationStatus = status.validateGlobalPropertyValue(firstArgument.toUpperCase(), null); if (StringUtils.isEmpty(validationStatus)) { status.setGlobalProperty(firstArgument.toUpperCase(), null); return new CommandResultImpl(I18n.bind(ShellI18n.globalPropertyReset,firstArgument));// Reset one prop OK - } else { + } else { // invalid property name return new CommandResultImpl( false, I18n.bind( ShellI18n.invalidGlobalProperty, validationStatus ), null ); } @@ -74,15 +74,15 @@ protected CommandResult doExecute() { protected int getMaxArgCount() { return 1; } - + @Override public TabCompletionModifier tabCompletion( final String lastArgument, final List< CharSequence > candidates ) throws Exception { if ( getArguments().size() == 0 ) { // Global property completion options and reset all argument - List< String > potentials = new LinkedList<>(WorkspaceStatus.GLOBAL_PROPS.keySet()); + List< String > potentials = new LinkedList< String >(WorkspaceStatus.GLOBAL_PROPS.keySet()); potentials.add(0,ARG_ALL); - + if ( lastArgument == null ) { candidates.addAll( potentials ); } else { diff --git a/komodo-shell/src/main/java/org/komodo/shell/util/KomodoObjectUtils.java b/komodo-shell/src/main/java/org/komodo/shell/util/KomodoObjectUtils.java index 0bb5083f..8af894ee 100644 --- a/komodo-shell/src/main/java/org/komodo/shell/util/KomodoObjectUtils.java +++ b/komodo-shell/src/main/java/org/komodo/shell/util/KomodoObjectUtils.java @@ -10,7 +10,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; - import org.komodo.repository.RepositoryTools; import org.komodo.shell.ShellI18n; import org.komodo.shell.api.KomodoObjectLabelProvider; @@ -50,7 +49,7 @@ public class KomodoObjectUtils implements StringConstants { public static List< String > getProperties(final WorkspaceStatus wsStatus, final KomodoObject kObj) throws Exception { KomodoObject resolvedObj = wsStatus.resolve(kObj); if(resolvedObj==null) resolvedObj = kObj; - final List< String > props = new ArrayList<>( Arrays.asList( resolvedObj.getPropertyNames( wsStatus.getTransaction() ) ) ); // props with values + final List< String > props = new ArrayList< String >( Arrays.asList( resolvedObj.getPropertyNames( wsStatus.getTransaction() ) ) ); // props with values final PropertyDescriptor[] descriptors = resolvedObj.getPropertyDescriptors( wsStatus.getTransaction() ); if ( descriptors.length != 0 ) { @@ -75,7 +74,7 @@ public static List< String > getProperties(final WorkspaceStatus wsStatus, final */ public static List< String > getUnfilteredProperties(final WorkspaceStatus wsStatus, final KomodoObject kObj) throws Exception { KomodoObject resolvedObj = wsStatus.resolve(kObj); - final List< String > props = new ArrayList<>( Arrays.asList( resolvedObj.getRawPropertyNames( wsStatus.getTransaction() ) ) ); // props with values + final List< String > props = new ArrayList< String >( Arrays.asList( resolvedObj.getRawPropertyNames( wsStatus.getTransaction() ) ) ); // props with values final PropertyDescriptor[] descriptors = resolvedObj.getRawPropertyDescriptors( wsStatus.getTransaction() ); if ( descriptors.length != 0 ) { diff --git a/komodo-shell/src/main/java/org/komodo/shell/util/PrintUtils.java b/komodo-shell/src/main/java/org/komodo/shell/util/PrintUtils.java index b50b5785..6cc70ad9 100644 --- a/komodo-shell/src/main/java/org/komodo/shell/util/PrintUtils.java +++ b/komodo-shell/src/main/java/org/komodo/shell/util/PrintUtils.java @@ -8,7 +8,6 @@ package org.komodo.shell.util; import static org.komodo.shell.CompletionConstants.MESSAGE_INDENT; - import java.io.IOException; import java.io.Writer; import java.util.ArrayList; @@ -20,7 +19,6 @@ import java.util.Map.Entry; import java.util.Properties; import java.util.TreeMap; - import org.komodo.shell.ShellI18n; import org.komodo.shell.api.KomodoObjectLabelProvider; import org.komodo.shell.api.ShellApiI18n; @@ -155,7 +153,7 @@ public static void printMultiLineItemList( int indent, final Writer writer, List * @param valueTitle the value title */ public static void printProperties(final Writer writer, Properties props, String nameTitle, String valueTitle) { - final Map< String, String > sorted = new TreeMap<>(); + final Map< String, String > sorted = new TreeMap< String, String >(); int maxNameWidth = DEFAULT_WIDTH; int maxValueWidth = DEFAULT_WIDTH; @@ -229,7 +227,7 @@ public static void printProperties( final WorkspaceStatus wsStatus, final Writer } // key is the property name, value is a 2 element string array holding the current value and the default value - final Map< String, String[] > sorted = new TreeMap<>(); + final Map< String, String[] > sorted = new TreeMap< String, String[] >(); int maxNameWidth = DEFAULT_WIDTH; int maxValueWidth = DEFAULT_WIDTH; diff --git a/komodo-shell/src/test/java/org/komodo/shell/AbstractCommandTest.java b/komodo-shell/src/test/java/org/komodo/shell/AbstractCommandTest.java index 35a3de1a..2b428e07 100644 --- a/komodo-shell/src/test/java/org/komodo/shell/AbstractCommandTest.java +++ b/komodo-shell/src/test/java/org/komodo/shell/AbstractCommandTest.java @@ -5,7 +5,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; - import java.io.File; import java.io.FileWriter; import java.io.StringWriter; @@ -18,7 +17,6 @@ import java.util.LinkedList; import java.util.List; import java.util.concurrent.TimeUnit; - import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -130,10 +128,18 @@ protected void setup( final String[] commands ) throws Exception { final File cmdFile = File.createTempFile( "TestCommand", ".txt" ); //$NON-NLS-1$ //$NON-NLS-2$ cmdFile.deleteOnExit(); - try ( final FileWriter writer = new FileWriter( cmdFile ) ) { + FileWriter writer = null; + + try { + writer = new FileWriter( cmdFile ); + for ( final String command : commands ) { writer.write( command + NEW_LINE ); } + } finally { + if ( writer != null ) { + writer.close(); + } } final String commandFilePath = cmdFile.getAbsolutePath(); @@ -308,7 +314,7 @@ protected UnitOfWork getTransaction() { * @throws Exception */ protected void assertTabCompletion(String line, final List expectedCandidates) throws Exception{ - List candidates=new LinkedList<>(); + List candidates=new LinkedList(); Arguments arguments = null; try { arguments = new Arguments(line, true); diff --git a/komodo-shell/src/test/java/org/komodo/shell/commands/CdCommandTest.java b/komodo-shell/src/test/java/org/komodo/shell/commands/CdCommandTest.java index 298fef61..139b1381 100644 --- a/komodo-shell/src/test/java/org/komodo/shell/commands/CdCommandTest.java +++ b/komodo-shell/src/test/java/org/komodo/shell/commands/CdCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.shell.commands; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.repository.RepositoryImpl; import org.komodo.shell.AbstractCommandTest; @@ -75,13 +73,13 @@ public void shouldTestEditAlias() throws Exception { String contextPath = wsStatus.getCurrentContextDisplayPath(); assertEquals("/workspace", contextPath); } - + @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addChildren.cmd"); assertTabCompletion("cd invalid", candidates); - + candidates.add("myChild1/"); candidates.add("myChild2/"); assertTabCompletion("cd myCh", candidates); diff --git a/komodo-shell/src/test/java/org/komodo/shell/commands/DeleteChildCommandTest.java b/komodo-shell/src/test/java/org/komodo/shell/commands/DeleteChildCommandTest.java index bd81c832..920423e4 100644 --- a/komodo-shell/src/test/java/org/komodo/shell/commands/DeleteChildCommandTest.java +++ b/komodo-shell/src/test/java/org/komodo/shell/commands/DeleteChildCommandTest.java @@ -9,9 +9,7 @@ import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.shell.AbstractCommandTest; import org.komodo.shell.api.CommandResult; @@ -75,7 +73,7 @@ public void shouldDeleteChildAtWorkspace() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addChildren.cmd"); assertTabCompletion("delete-child invalid", candidates); diff --git a/komodo-shell/src/test/java/org/komodo/shell/commands/HelpCommandTest.java b/komodo-shell/src/test/java/org/komodo/shell/commands/HelpCommandTest.java index 287f4108..19d98519 100644 --- a/komodo-shell/src/test/java/org/komodo/shell/commands/HelpCommandTest.java +++ b/komodo-shell/src/test/java/org/komodo/shell/commands/HelpCommandTest.java @@ -16,10 +16,8 @@ package org.komodo.shell.commands; import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.Arrays; - import org.junit.Test; import org.komodo.shell.AbstractCommandTest; import org.komodo.shell.api.CommandResult; @@ -63,7 +61,7 @@ public void shouldShowHelpForCommand() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); assertTabCompletion("help show-S", candidates); @@ -73,6 +71,6 @@ public void testTabCompleter()throws Exception{ assertTabCompletion("help show-s", candidates); assertTabCompletion("help ", Arrays.asList(wsStatus.getAvailableCommandNames())); - + } } diff --git a/komodo-shell/src/test/java/org/komodo/shell/commands/ListCommandTest.java b/komodo-shell/src/test/java/org/komodo/shell/commands/ListCommandTest.java index edda5753..1da52a47 100644 --- a/komodo-shell/src/test/java/org/komodo/shell/commands/ListCommandTest.java +++ b/komodo-shell/src/test/java/org/komodo/shell/commands/ListCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.shell.commands; import static org.junit.Assert.assertTrue; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.shell.AbstractCommandTest; import org.komodo.shell.api.CommandResult; @@ -70,13 +68,13 @@ public void testListLlAlias() throws Exception { String writerOutput = getCommandOutput(); assertTrue( writerOutput.contains( "no children" ) ); } - + @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addChildren.cmd"); assertTabCompletion("list invalid", candidates); - + candidates.add("myChild1/"); candidates.add("myChild2/"); assertTabCompletion("list myCh", candidates); diff --git a/komodo-shell/src/test/java/org/komodo/shell/commands/RenameCommandTest.java b/komodo-shell/src/test/java/org/komodo/shell/commands/RenameCommandTest.java index 75bd9bb8..d03ae60f 100644 --- a/komodo-shell/src/test/java/org/komodo/shell/commands/RenameCommandTest.java +++ b/komodo-shell/src/test/java/org/komodo/shell/commands/RenameCommandTest.java @@ -133,7 +133,7 @@ public void shouldRenameChild() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addChildren.cmd"); candidates.add("myChild1"); diff --git a/komodo-shell/src/test/java/org/komodo/shell/commands/ResetGlobalPropertyCommandTest.java b/komodo-shell/src/test/java/org/komodo/shell/commands/ResetGlobalPropertyCommandTest.java index 59cf4969..e835b369 100644 --- a/komodo-shell/src/test/java/org/komodo/shell/commands/ResetGlobalPropertyCommandTest.java +++ b/komodo-shell/src/test/java/org/komodo/shell/commands/ResetGlobalPropertyCommandTest.java @@ -16,10 +16,8 @@ package org.komodo.shell.commands; import static org.junit.Assert.assertEquals; - import java.util.LinkedList; import java.util.List; - import org.junit.Test; import org.komodo.shell.AbstractCommandTest; import org.komodo.shell.api.CommandResult; @@ -38,7 +36,7 @@ public void shouldFailTooManyArgs( ) throws Exception { execute( commands ); } - + @Test( expected = AssertionError.class ) public void shouldFailBadGlobalProperty( ) throws Exception { final String[] commands = { "reset-global invalidProp" }; @@ -48,7 +46,7 @@ public void shouldFailBadGlobalProperty( ) throws Exception { @Test public void shouldResetShowTypeInPrompt() throws Exception { String propertyName=WorkspaceStatus.SHOW_TYPE_IN_PROMPT_KEY; - + wsStatus.setGlobalProperty(propertyName, negateBooleanValue(propertyName)); final String[] commands = { "reset-global "+propertyName}; final CommandResult result = execute( commands ); @@ -81,7 +79,7 @@ public void shouldResetAllGlobalProps() throws Exception { @Test public void testTabCompleter()throws Exception{ - List defaultValues = new LinkedList<>(WorkspaceStatus.GLOBAL_PROPS.keySet()); + List defaultValues = new LinkedList(WorkspaceStatus.GLOBAL_PROPS.keySet()); defaultValues.add(0,"--all"); assertTabCompletion("reset-global ", defaultValues); diff --git a/komodo-shell/src/test/java/org/komodo/shell/commands/SetAutoCommitCommandTest.java b/komodo-shell/src/test/java/org/komodo/shell/commands/SetAutoCommitCommandTest.java index a4dd3216..5c0b6ecb 100644 --- a/komodo-shell/src/test/java/org/komodo/shell/commands/SetAutoCommitCommandTest.java +++ b/komodo-shell/src/test/java/org/komodo/shell/commands/SetAutoCommitCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.shell.commands; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.shell.AbstractCommandTest; import org.komodo.shell.api.CommandResult; @@ -47,7 +45,7 @@ public void test1() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); candidates.add("true"); candidates.add("false"); diff --git a/komodo-shell/src/test/java/org/komodo/shell/commands/SetGlobalPropertyCommandTest.java b/komodo-shell/src/test/java/org/komodo/shell/commands/SetGlobalPropertyCommandTest.java index 4ec70234..0b06d23d 100644 --- a/komodo-shell/src/test/java/org/komodo/shell/commands/SetGlobalPropertyCommandTest.java +++ b/komodo-shell/src/test/java/org/komodo/shell/commands/SetGlobalPropertyCommandTest.java @@ -16,10 +16,8 @@ package org.komodo.shell.commands; import static org.junit.Assert.assertEquals; - import java.util.LinkedList; import java.util.List; - import org.junit.Test; import org.komodo.shell.AbstractCommandTest; import org.komodo.shell.api.CommandResult; @@ -68,7 +66,7 @@ public void shouldSetRecordingOutputFile() throws Exception { @Test public void testTabCompleter()throws Exception{ - List defaultValues = new LinkedList<>(WorkspaceStatus.GLOBAL_PROPS.keySet()); + List defaultValues = new LinkedList(WorkspaceStatus.GLOBAL_PROPS.keySet()); assertTabCompletion("set-global ", defaultValues); defaultValues.clear(); diff --git a/komodo-shell/src/test/java/org/komodo/shell/commands/SetRecordCommandTest.java b/komodo-shell/src/test/java/org/komodo/shell/commands/SetRecordCommandTest.java index d141d74b..864249cf 100644 --- a/komodo-shell/src/test/java/org/komodo/shell/commands/SetRecordCommandTest.java +++ b/komodo-shell/src/test/java/org/komodo/shell/commands/SetRecordCommandTest.java @@ -16,9 +16,7 @@ package org.komodo.shell.commands; import static org.junit.Assert.assertEquals; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.shell.AbstractCommandTest; import org.komodo.shell.api.CommandResult; @@ -59,7 +57,7 @@ public void testTabCompleter() throws Exception { final String[] commands = { "workspace" }; final CommandResult result = execute(commands); assertCommandResultOk(result); - ArrayList candidates = new ArrayList<>(); + ArrayList candidates = new ArrayList(); candidates.add("on"); candidates.add("off"); diff --git a/komodo-shell/src/test/java/org/komodo/shell/commands/ShowSummaryCommandTest.java b/komodo-shell/src/test/java/org/komodo/shell/commands/ShowSummaryCommandTest.java index edb7a2e5..d2098e7a 100644 --- a/komodo-shell/src/test/java/org/komodo/shell/commands/ShowSummaryCommandTest.java +++ b/komodo-shell/src/test/java/org/komodo/shell/commands/ShowSummaryCommandTest.java @@ -17,9 +17,7 @@ import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; - import java.util.ArrayList; - import org.junit.Test; import org.komodo.shell.AbstractCommandTest; import org.komodo.shell.api.CommandResult; @@ -83,7 +81,7 @@ public void shouldBeAvailableAtWorkspace() throws Exception { @Test public void testTabCompleter()throws Exception{ - ArrayList candidates=new ArrayList<>(); + ArrayList candidates=new ArrayList(); setup("commandFiles","addChildren.cmd"); assertTabCompletion("show-summary invalid", candidates); diff --git a/komodo-spi/.classpath b/komodo-spi/.classpath index fae1a2b3..c2e15478 100644 --- a/komodo-spi/.classpath +++ b/komodo-spi/.classpath @@ -17,17 +17,13 @@ - - - - - - + + - + diff --git a/komodo-spi/.project b/komodo-spi/.project index e63f258c..a5d53f48 100644 --- a/komodo-spi/.project +++ b/komodo-spi/.project @@ -5,11 +5,21 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder + + org.eclipse.wst.validation.validationbuilder + + + org.eclipse.m2e.core.maven2Builder @@ -19,5 +29,7 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.common.modulecore.ModuleCoreNature diff --git a/komodo-spi/pom.xml b/komodo-spi/pom.xml index 23320074..d3bb0755 100644 --- a/komodo-spi/pom.xml +++ b/komodo-spi/pom.xml @@ -9,7 +9,7 @@ komodo-spi Komodo SPI System Interfaces for Komodo modules - + \ No newline at end of file diff --git a/komodo-teiid-client/.classpath b/komodo-teiid-client/.classpath index ee92966d..d941ae9a 100644 --- a/komodo-teiid-client/.classpath +++ b/komodo-teiid-client/.classpath @@ -17,18 +17,15 @@ - - - - - - + + - + + @@ -62,15 +59,24 @@ - + - + + + + + + + + + + + - diff --git a/komodo-teiid-client/.project b/komodo-teiid-client/.project index 737b50ae..d0d125b9 100644 --- a/komodo-teiid-client/.project +++ b/komodo-teiid-client/.project @@ -5,11 +5,21 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder + + org.eclipse.wst.validation.validationbuilder + + + org.eclipse.m2e.core.maven2Builder @@ -19,5 +29,7 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.common.modulecore.ModuleCoreNature diff --git a/komodo-teiid-client/admin/org/teiid/adminapi/impl/VDBMetadataParser.java b/komodo-teiid-client/admin/org/teiid/adminapi/impl/VDBMetadataParser.java index bf0dd421..a0da32e5 100644 --- a/komodo-teiid-client/admin/org/teiid/adminapi/impl/VDBMetadataParser.java +++ b/komodo-teiid-client/admin/org/teiid/adminapi/impl/VDBMetadataParser.java @@ -3,17 +3,17 @@ * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. Some portions may be licensed * to Red Hat, Inc. under one or more contributor license agreements. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA @@ -52,7 +52,7 @@ @SuppressWarnings("nls") public class VDBMetadataParser { - + private boolean writePropertyElements; public static VDBMetaData unmarshell(InputStream content) throws XMLStreamException { @@ -66,12 +66,12 @@ public static VDBMetaData unmarshell(InputStream content) throws XMLStreamExcept case VDB: VDBMetaData vdb = new VDBMetaData(); Properties props = getAttributes(reader); - vdb.setName(props.getProperty(Element.NAME.getLocalName())); + vdb.setName(props.getProperty(Element.NAME.getLocalName())); vdb.setVersion(Integer.parseInt(props.getProperty(Element.VERSION.getLocalName()))); parseVDB(reader, vdb); return vdb; - default: - throw new XMLStreamException(Messages.getString(Messages.VDBMetadataParser.unexpected_element1,reader.getName(), Element.VDB.getLocalName()), reader.getLocation()); + default: + throw new XMLStreamException(Messages.getString(Messages.VDBMetadataParser.unexpected_element1,reader.getName(), Element.VDB.getLocalName()), reader.getLocation()); } } } finally { @@ -137,15 +137,15 @@ private static void parseVDB(XMLStreamReader reader, VDBMetaData vdb) throws XML parseEntry(reader, entry); vdb.getEntries().add(entry); break; - default: - throw new XMLStreamException(Messages.getString(Messages.VDBMetadataParser.unexpected_element5,reader.getName(), + default: + throw new XMLStreamException(Messages.getString(Messages.VDBMetadataParser.unexpected_element5,reader.getName(), Element.DESCRIPTION.getLocalName(), Element.PROPERTY.getLocalName(), Element.MODEL.getLocalName(), Element.TRANSLATOR.getLocalName(), - Element.DATA_ROLE.getLocalName()), reader.getLocation()); + Element.DATA_ROLE.getLocalName()), reader.getLocation()); } - } + } } private static void ignoreTillEnd(XMLStreamReader reader) @@ -168,7 +168,7 @@ private static void parseProperty(XMLStreamReader reader, AdminObjectImpl anObj) key = attrValue; } else if (attrName.equals(Element.VALUE.getLocalName())) { value = attrValue; - } + } } if (value == null) { value = reader.getElementText(); @@ -180,20 +180,20 @@ private static void parseProperty(XMLStreamReader reader, AdminObjectImpl anObj) ignoreTillEnd(reader); } } - + private static void parseDataRole(XMLStreamReader reader, DataPolicyMetadata policy) throws XMLStreamException { Properties props = getAttributes(reader); policy.setName(props.getProperty(Element.NAME.getLocalName())); policy.setAnyAuthenticated(Boolean.parseBoolean(props.getProperty(Element.DATA_ROLE_ANY_ATHENTICATED_ATTR.getLocalName()))); policy.setGrantAll(Boolean.parseBoolean(props.getProperty(Element.DATA_ROLE_GRANT_ALL_ATTR.getLocalName()))); policy.setAllowCreateTemporaryTables(Boolean.parseBoolean(props.getProperty(Element.DATA_ROLE_ALLOW_TEMP_TABLES_ATTR.getLocalName()))); - + while (reader.hasNext() && (reader.nextTag() != XMLStreamConstants.END_ELEMENT)) { Element element = Element.forName(reader.getLocalName()); switch (element) { case DESCRIPTION: policy.setDescription(reader.getElementText()); - break; + break; case PERMISSION: PermissionMetaData permission = new PermissionMetaData(); parsePermission(reader, permission); @@ -202,22 +202,22 @@ private static void parseDataRole(XMLStreamReader reader, DataPolicyMetadata pol case MAPPED_ROLE_NAME: policy.addMappedRoleName(reader.getElementText()); break; - default: - throw new XMLStreamException(Messages.getString(Messages.VDBMetadataParser.unexpected_element2,reader.getName(), + default: + throw new XMLStreamException(Messages.getString(Messages.VDBMetadataParser.unexpected_element2,reader.getName(), Element.DESCRIPTION.getLocalName(), Element.PERMISSION.getLocalName(), - Element.MAPPED_ROLE_NAME.getLocalName()), reader.getLocation()); + Element.MAPPED_ROLE_NAME.getLocalName()), reader.getLocation()); } - } - } - + } + } + private static void parsePermission(XMLStreamReader reader, PermissionMetaData permission) throws XMLStreamException { while (reader.hasNext() && (reader.nextTag() != XMLStreamConstants.END_ELEMENT)) { Element element = Element.forName(reader.getLocalName()); switch (element) { case RESOURCE_NAME: permission.setResourceName(reader.getElementText()); - break; + break; case ALLOW_ALTER: permission.setAllowAlter(Boolean.parseBoolean(reader.getElementText())); break; @@ -238,7 +238,7 @@ private static void parsePermission(XMLStreamReader reader, PermissionMetaData p break; case ALLOW_UPADTE: permission.setAllowUpdate(Boolean.parseBoolean(reader.getElementText())); - break; + break; case CONDITION: if (reader.getAttributeCount() > 0) { permission.setConstraint(Boolean.valueOf(reader.getAttributeValue(0))); @@ -251,38 +251,38 @@ private static void parsePermission(XMLStreamReader reader, PermissionMetaData p } permission.setMask(reader.getElementText()); break; - default: - throw new XMLStreamException(Messages.getString(Messages.VDBMetadataParser.unexpected_element7,reader.getName(), + default: + throw new XMLStreamException(Messages.getString(Messages.VDBMetadataParser.unexpected_element7,reader.getName(), Element.RESOURCE_NAME.getLocalName(), Element.ALLOW_ALTER.getLocalName(), Element.ALLOW_CREATE.getLocalName(), Element.ALLOW_DELETE.getLocalName(), Element.ALLOW_EXECUTE.getLocalName(), Element.ALLOW_READ.getLocalName(), - Element.ALLOW_UPADTE.getLocalName(), Element.ALLOW_LANGUAGE.getLocalName(), Element.CONSTRAINT.getLocalName(), - Element.CONDITION.getLocalName(), Element.MASK.getLocalName()), reader.getLocation()); + Element.ALLOW_UPADTE.getLocalName(), Element.ALLOW_LANGUAGE.getLocalName(), Element.CONSTRAINT.getLocalName(), + Element.CONDITION.getLocalName(), Element.MASK.getLocalName()), reader.getLocation()); } - } - } - + } + } + private static void parseTranslator(XMLStreamReader reader, VDBTranslatorMetaData translator) throws XMLStreamException { Properties props = getAttributes(reader); translator.setName(props.getProperty(Element.NAME.getLocalName())); translator.setType(props.getProperty(Element.TYPE.getLocalName())); translator.setDescription(props.getProperty(Element.DESCRIPTION.getLocalName())); - + while (reader.hasNext() && (reader.nextTag() != XMLStreamConstants.END_ELEMENT)) { Element element = Element.forName(reader.getLocalName()); switch (element) { case PROPERTY: parseProperty(reader, translator); break; - default: - throw new XMLStreamException(Messages.getString(Messages.VDBMetadataParser.unexpected_element1,reader.getName(), - Element.PROPERTY.getLocalName()), reader.getLocation()); + default: + throw new XMLStreamException(Messages.getString(Messages.VDBMetadataParser.unexpected_element1,reader.getName(), + Element.PROPERTY.getLocalName()), reader.getLocation()); } - } - } + } + } private static void parseEntry(XMLStreamReader reader, EntryMetaData entry) throws XMLStreamException { Properties props = getAttributes(reader); @@ -296,21 +296,21 @@ private static void parseEntry(XMLStreamReader reader, EntryMetaData entry) thro case PROPERTY: parseProperty(reader, entry); break; - default: - throw new XMLStreamException(Messages.getString(Messages.VDBMetadataParser.unexpected_element2,reader.getName(), + default: + throw new XMLStreamException(Messages.getString(Messages.VDBMetadataParser.unexpected_element2,reader.getName(), Element.DESCRIPTION.getLocalName(), - Element.PROPERTY.getLocalName())); + Element.PROPERTY.getLocalName())); } - } - } - + } + } + private static void parseModel(XMLStreamReader reader, ModelMetaData model) throws XMLStreamException { Properties props = getAttributes(reader); model.setName(props.getProperty(Element.NAME.getLocalName())); model.setModelType(props.getProperty(Element.TYPE.getLocalName(), "PHYSICAL")); model.setVisible(Boolean.parseBoolean(props.getProperty(Element.VISIBLE.getLocalName(), "true"))); model.setPath(props.getProperty(Element.PATH.getLocalName())); - + while (reader.hasNext() && (reader.nextTag() != XMLStreamConstants.END_ELEMENT)) { Element element = Element.forName(reader.getLocalName()); switch (element) { @@ -344,17 +344,17 @@ private static void parseModel(XMLStreamReader reader, ModelMetaData model) thro model.setSchemaSourceType(type); model.setSchemaText(schema); break; - default: - throw new XMLStreamException(Messages.getString(Messages.VDBMetadataParser.unexpected_element5,reader.getName(), + default: + throw new XMLStreamException(Messages.getString(Messages.VDBMetadataParser.unexpected_element5,reader.getName(), Element.DESCRIPTION.getLocalName(), Element.PROPERTY.getLocalName(), Element.SOURCE.getLocalName(), Element.METADATA.getLocalName(), - Element.VALIDATION_ERROR.getLocalName()), reader.getLocation()); + Element.VALIDATION_ERROR.getLocalName()), reader.getLocation()); } - } - } - + } + } + private static Properties getAttributes(XMLStreamReader reader) { Properties props = new Properties(); if (reader.getAttributeCount() > 0) { @@ -365,8 +365,8 @@ private static Properties getAttributes(XMLStreamReader reader) { } } return props; - } - + } + enum Element { // must be first UNKNOWN(null), @@ -409,7 +409,7 @@ enum Element { MAPPED_ROLE_NAME("mapped-role-name"), ENTRY("entry"), METADATA("metadata"); - + private final String name; Element(final String name) { @@ -441,22 +441,22 @@ public String getLocalName() { public static Element forName(String localName) { final Element element = elements.get(localName); return element == null ? UNKNOWN : element; - } + } } public static void marshell(VDBMetaData vdb, OutputStream out) throws XMLStreamException, IOException { VDBMetadataParser parser = new VDBMetadataParser(); parser.writeVDB(vdb, out); } - + private void writeVDB(VDBMetaData vdb, OutputStream out) throws XMLStreamException, IOException { - XMLStreamWriter writer = XMLOutputFactory.newFactory().createXMLStreamWriter(out); - + XMLStreamWriter writer = XMLOutputFactory.newInstance().createXMLStreamWriter(out); + writer.writeStartDocument(); writer.writeStartElement(Element.VDB.getLocalName()); writeAttribute(writer, Element.NAME.getLocalName(), vdb.getName()); writeAttribute(writer, Element.VERSION.getLocalName(), String.valueOf(vdb.getVersion())); - + if (vdb.getDescription() != null) { writeElement(writer, Element.DESCRIPTION, vdb.getDescription()); } @@ -470,7 +470,7 @@ private void writeVDB(VDBMetaData vdb, OutputStream out) throws XMLStreamExcepti writeAttribute(writer, Element.IMPORT_POLICIES.getLocalName(), String.valueOf(vdbImport.isImportDataPolicies())); writer.writeEndElement(); } - + // models Collection models = vdb.getModelMetaDatas().values(); for (ModelMetaData model:models) { @@ -479,29 +479,29 @@ private void writeVDB(VDBMetaData vdb, OutputStream out) throws XMLStreamExcepti } writeModel(writer, model); } - + // override translators for(VDBTranslatorMetaData translator:vdb.getOverrideTranslatorsMap().values()) { writeTranslator(writer, translator); } - + // data-roles for (DataPolicy dp:vdb.getDataPolicies()) { writeDataPolicy(writer, dp); } - + // entry - // designer only + // designer only for (EntryMetaData em:vdb.getEntries()) { writer.writeStartElement(Element.ENTRY.getLocalName()); writeAttribute(writer, Element.PATH.getLocalName(), em.getPath()); if (em.getDescription() != null) { writeElement(writer, Element.DESCRIPTION, em.getDescription()); } - writeProperties(writer, em.getPropertiesMap()); + writeProperties(writer, em.getPropertiesMap()); writer.writeEndElement(); } - + writer.writeEndElement(); writer.writeEndDocument(); writer.close(); @@ -510,14 +510,14 @@ private void writeVDB(VDBMetaData vdb, OutputStream out) throws XMLStreamExcepti private void writeDataPolicy(XMLStreamWriter writer, DataPolicy dp) throws XMLStreamException { writer.writeStartElement(Element.DATA_ROLE.getLocalName()); - + writeAttribute(writer, Element.NAME.getLocalName(), dp.getName()); writeAttribute(writer, Element.DATA_ROLE_ANY_ATHENTICATED_ATTR.getLocalName(), String.valueOf(dp.isAnyAuthenticated())); writeAttribute(writer, Element.DATA_ROLE_GRANT_ALL_ATTR.getLocalName(), String.valueOf(dp.isGrantAll())); writeAttribute(writer, Element.DATA_ROLE_ALLOW_TEMP_TABLES_ATTR.getLocalName(), String.valueOf(dp.isAllowCreateTemporaryTables())); writeElement(writer, Element.DESCRIPTION, dp.getDescription()); - + // permission for (DataPolicy.DataPermission permission: dp.getPermissions()) { writer.writeStartElement(Element.PERMISSION.getLocalName()); @@ -557,26 +557,26 @@ private void writeDataPolicy(XMLStreamWriter writer, DataPolicy dp) throws XMLS writeElement(writer, Element.MASK, permission.getMask()); } } - writer.writeEndElement(); + writer.writeEndElement(); } - + // mapped role names for (String roleName:dp.getMappedRoleNames()) { - writeElement(writer, Element.MAPPED_ROLE_NAME, roleName); + writeElement(writer, Element.MAPPED_ROLE_NAME, roleName); } - + writer.writeEndElement(); } private void writeTranslator(final XMLStreamWriter writer, VDBTranslatorMetaData translator) throws XMLStreamException { writer.writeStartElement(Element.TRANSLATOR.getLocalName()); - + writeAttribute(writer, Element.NAME.getLocalName(), translator.getName()); writeAttribute(writer, Element.TYPE.getLocalName(), translator.getType()); writeAttribute(writer, Element.DESCRIPTION.getLocalName(), translator.getDescription()); - + writeProperties(writer, translator.getPropertiesMap()); - + writer.writeEndElement(); } @@ -592,7 +592,7 @@ private void writeModel(final XMLStreamWriter writer, ModelMetaData model) throw writeElement(writer, Element.DESCRIPTION, model.getDescription()); } writeProperties(writer, model.getPropertiesMap()); - + // source mappings for (SourceMappingMetadata source:model.getSourceMappings()) { writer.writeStartElement(Element.SOURCE.getLocalName()); @@ -601,14 +601,14 @@ private void writeModel(final XMLStreamWriter writer, ModelMetaData model) throw writeAttribute(writer, Element.SOURCE_CONNECTION_JNDI_NAME_ATTR.getLocalName(), source.getConnectionJndiName()); writer.writeEndElement(); } - + if (model.getSchemaSourceType() != null) { writer.writeStartElement(Element.METADATA.getLocalName()); writeAttribute(writer, Element.TYPE.getLocalName(), model.getSchemaSourceType()); writer.writeCData(model.getSchemaText()); writer.writeEndElement(); } - + // model validation errors for (Message ve:model.getMessages(false)) { writer.writeStartElement(Element.VALIDATION_ERROR.getLocalName()); @@ -619,7 +619,7 @@ private void writeModel(final XMLStreamWriter writer, ModelMetaData model) throw } writer.writeEndElement(); } - + private void writeProperties(final XMLStreamWriter writer, Map props) throws XMLStreamException { for (Map.Entry prop : props.entrySet()) { writer.writeStartElement(Element.PROPERTY.getLocalName()); @@ -636,7 +636,7 @@ private void writeProperties(final XMLStreamWriter writer, Map p writer.writeEndElement(); } } - + private void writeAttribute(XMLStreamWriter writer, String localName, String value) throws XMLStreamException { if (value != null) { @@ -651,6 +651,6 @@ private void writeElement(final XMLStreamWriter writer, final Element element, S } writer.writeCharacters(value); writer.writeEndElement(); - } + } } diff --git a/komodo-teiid-client/api/org/teiid/util/StAXSQLXML.java b/komodo-teiid-client/api/org/teiid/util/StAXSQLXML.java index d90a8fc8..16ff195c 100644 --- a/komodo-teiid-client/api/org/teiid/util/StAXSQLXML.java +++ b/komodo-teiid-client/api/org/teiid/util/StAXSQLXML.java @@ -3,17 +3,17 @@ * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. Some portions may be licensed * to Red Hat, Inc. under one or more contributor license agreements. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA @@ -28,14 +28,12 @@ import java.io.StringWriter; import java.nio.charset.Charset; import java.sql.SQLException; - import javax.xml.stream.FactoryConfigurationError; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.transform.Source; import javax.xml.transform.TransformerException; import javax.xml.transform.stax.StAXSource; - import org.teiid.core.types.SQLXMLImpl; import org.teiid.core.types.StandardXMLTranslator; import org.teiid.core.types.Streamable; @@ -52,7 +50,7 @@ public interface StAXSourceProvider { private static final class SingleUseStAXSourceProvider implements StAXSourceProvider { private StAXSource source; - + public SingleUseStAXSourceProvider(StAXSource source) { this.source = source; } @@ -73,20 +71,21 @@ public StAXSource getStaxSource() throws SQLException { public StAXSQLXML(StAXSource source) { this(new SingleUseStAXSourceProvider(source), Streamable.CHARSET); } - + public StAXSQLXML(StAXSourceProvider provider, Charset charSet) { this.sourceProvider = provider; this.setCharset(charSet); } - - @SuppressWarnings("unchecked") + + @Override + @SuppressWarnings("unchecked") public T getSource(Class sourceClass) throws SQLException { if (sourceClass == null || sourceClass == StAXSource.class) { return (T) sourceProvider.getStaxSource(); } return super.getSource(sourceClass); } - + @Override public String getString() throws SQLException { StringWriter sw = new StringWriter(); @@ -99,27 +98,27 @@ public String getString() throws SQLException { } return sw.toString(); } - + @Override public InputStream getBinaryStream() throws SQLException { try { - return new XMLInputStream(getSource(StAXSource.class), XMLOutputFactory.newFactory(), getCharset().name()); + return new XMLInputStream(getSource(StAXSource.class), XMLOutputFactory.newInstance(), getCharset().name()); } catch (XMLStreamException e) { throw new SQLException(e); } catch (FactoryConfigurationError e) { throw new SQLException(e); } } - + @Override public Reader getCharacterStream() throws SQLException { try { - return new XMLReader(getSource(StAXSource.class), XMLOutputFactory.newFactory()); + return new XMLReader(getSource(StAXSource.class), XMLOutputFactory.newInstance()); } catch (XMLStreamException e) { throw new SQLException(e); } catch (FactoryConfigurationError e) { throw new SQLException(e); } } - + } \ No newline at end of file diff --git a/komodo-teiid-client/client/org/teiid/client/plan/PlanNode.java b/komodo-teiid-client/client/org/teiid/client/plan/PlanNode.java index 1989d1bf..325388da 100644 --- a/komodo-teiid-client/client/org/teiid/client/plan/PlanNode.java +++ b/komodo-teiid-client/client/org/teiid/client/plan/PlanNode.java @@ -3,17 +3,17 @@ * See the COPYRIGHT.txt file distributed with this work for information * regarding copyright ownership. Some portions may be licensed * to Red Hat, Inc. under one or more contributor license agreements. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA @@ -47,7 +47,7 @@ /** - * A PlanNode represents part of processing plan tree. For relational plans + * A PlanNode represents part of processing plan tree. For relational plans * child PlanNodes may be either subqueries or nodes that feed tuples into the * parent. For procedure plans child PlanNodes will be processing instructions, * which can in turn contain other relational or procedure plans. @@ -62,35 +62,35 @@ public static class Property implements Externalizable { private String name; private List values; private PlanNode planNode; - + public Property() { - + } - + public Property(String name) { this.name = name; } - + public String getName() { return name; } - + public List getValues() { return values; } - + public void setValues(List values) { this.values = values; } - + public PlanNode getPlanNode() { return planNode; } - + public void setPlanNode(PlanNode planNode) { this.planNode = planNode; } - + @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { @@ -98,32 +98,32 @@ public void readExternal(ObjectInput in) throws IOException, this.values = ExternalizeUtil.readList(in, String.class); this.planNode = (PlanNode)in.readObject(); } - + @Override public void writeExternal(ObjectOutput out) throws IOException { out.writeObject(name); ExternalizeUtil.writeCollection(out, values); out.writeObject(planNode); } - + } - + private List properties = new LinkedList(); private PlanNode parent; private String name; - + public PlanNode() { - + } - + public PlanNode(String name) { this.name = name; } - + public String getName() { return name; } - + void setParent(PlanNode parent) { this.parent = parent; } @@ -131,18 +131,18 @@ void setParent(PlanNode parent) { public PlanNode getParent() { return this.parent; } - + public List getProperties() { return properties; } - + public void addProperty(String pname, PlanNode value) { Property p = new Property(pname); p.setPlanNode(value); value.setParent(this); this.properties.add(p); } - + public void addProperty(String pname, List value) { Property p = new Property(pname); if (value == null) { @@ -151,13 +151,13 @@ public void addProperty(String pname, List value) { p.setValues(value); this.properties.add(p); } - + public void addProperty(String pname, String value) { Property p = new Property(pname); p.setValues(Arrays.asList(value)); this.properties.add(p); } - + /** * Converts this PlanNode to XML. See the JAXB bindings for the * document form. @@ -165,7 +165,7 @@ public void addProperty(String pname, String value) { */ public String toXml() { try { - XMLOutputFactory outputFactory = XMLOutputFactory.newFactory(); + XMLOutputFactory outputFactory = XMLOutputFactory.newInstance(); StringWriter stringWriter = new StringWriter(); XMLStreamWriter writer = outputFactory.createXMLStreamWriter(stringWriter); writer.writeStartDocument("UTF-8", "1.0"); //$NON-NLS-1$ //$NON-NLS-2$ @@ -178,7 +178,7 @@ public String toXml() { throw new RuntimeException(e); } } - + private void writeProperty(Property property, XMLStreamWriter writer) throws XMLStreamException { writer.writeStartElement("property"); //$NON-NLS-1$ writer.writeAttribute("name", property.getName()); //$NON-NLS-1$ @@ -193,7 +193,7 @@ private void writeProperty(Property property, XMLStreamWriter writer) throws XML } writer.writeEndElement(); } - + private void writePlanNode(PlanNode node, XMLStreamWriter writer) throws XMLStreamException { writer.writeStartElement("node"); //$NON-NLS-1$ writer.writeAttribute("name", node.getName()); //$NON-NLS-1$ @@ -202,13 +202,13 @@ private void writePlanNode(PlanNode node, XMLStreamWriter writer) throws XMLStre } writer.writeEndElement(); } - + private static void writeElement(final XMLStreamWriter writer, String name, String value) throws XMLStreamException { writer.writeStartElement(name); writer.writeCharacters(value); writer.writeEndElement(); - } - + } + private static Properties getAttributes(XMLStreamReader reader) { Properties props = new Properties(); if (reader.getAttributeCount() > 0) { @@ -220,7 +220,7 @@ private static Properties getAttributes(XMLStreamReader reader) { } return props; } - + public static PlanNode fromXml(String planString) throws XMLStreamException { XMLInputFactory inputFactory = XMLType.getXmlInputFactory(); XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(planString)); @@ -248,7 +248,7 @@ private static PlanNode buildNode(XMLStreamReader reader, PlanNode node) throws while (reader.hasNext() && (reader.nextTag() != XMLStreamConstants.END_ELEMENT)) { String valueNode = reader.getLocalName(); if (valueNode.equals("value")) {//$NON-NLS-1$ - values.add(reader.getElementText()); + values.add(reader.getElementText()); } else if (valueNode.equals("node")) {//$NON-NLS-1$ values = null; @@ -258,7 +258,7 @@ else if (valueNode.equals("node")) {//$NON-NLS-1$ break; } else { - throw new XMLStreamException(Messages.getString(Messages.JDBC.PlanNode_unexpected_element, reader.getName(), "value"), reader.getLocation());//$NON-NLS-1$ + throw new XMLStreamException(Messages.getString(Messages.JDBC.PlanNode_unexpected_element, reader.getName(), "value"), reader.getLocation());//$NON-NLS-1$ } } if (values != null) { @@ -266,7 +266,7 @@ else if (valueNode.equals("node")) {//$NON-NLS-1$ } } else { - throw new XMLStreamException(Messages.getString(Messages.JDBC.PlanNode_unexpected_element, reader.getName(), "property"), reader.getLocation()); //$NON-NLS-1$ + throw new XMLStreamException(Messages.getString(Messages.JDBC.PlanNode_unexpected_element, reader.getName(), "property"), reader.getLocation()); //$NON-NLS-1$ } } return node; @@ -278,14 +278,14 @@ public String toString() { visitNode(this, 0, builder); return builder.toString(); } - + protected void visitNode(PlanNode node, int nodeLevel, StringBuilder text) { for(int i=0; i 1){ - text.append(":\n"); //$NON-NLS-1$ + text.append(":\n"); //$NON-NLS-1$ for (int i = 0; i < p.getValues().size(); i++) { for(int t=0; t nameStack = new LinkedList(); private LinkedList eventStack = new LinkedList(); - + private boolean rootArray; private boolean end; private boolean declaredNs; @@ -242,7 +242,7 @@ public boolean startObject() throws org.teiid.json.simple.ParseException, } private void start() { - eventStack.add(eventFactory.createStartElement("", "", nameStack.peek())); //$NON-NLS-1$ //$NON-NLS-2$ + eventStack.add(eventFactory.createStartElement("", "", nameStack.peek())); //$NON-NLS-1$ //$NON-NLS-2$ if (!declaredNs) { eventStack.add(eventFactory.createNamespace("xsi", XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI)); //$NON-NLS-1$ declaredNs = true; @@ -290,7 +290,7 @@ public boolean primitive(Object value) } private void end() { - eventStack.add(eventFactory.createEndElement("", "", nameStack.peek())); //$NON-NLS-1$ //$NON-NLS-2$ + eventStack.add(eventFactory.createEndElement("", "", nameStack.peek())); //$NON-NLS-1$ //$NON-NLS-2$ } @Override @@ -388,20 +388,23 @@ public XMLEvent next() { @Override public void remove() { - throw new UnsupportedOperationException(); + throw new UnsupportedOperationException(); } } - + static ThreadLocal threadLocalOutputFactory = new ThreadLocal() { - protected XMLOutputFactory initialValue() { + @Override + protected XMLOutputFactory initialValue() { return newXmlOutputFactory(); } }; static ThreadLocal threadLocalEventtFactory = new ThreadLocal() { - protected XMLEventFactory initialValue() { - return XMLEventFactory.newFactory(); + @Override + protected XMLEventFactory initialValue() { + return XMLEventFactory.newInstance(); } - public XMLEventFactory get() { + @Override + public XMLEventFactory get() { XMLEventFactory eventFactory = super.get(); eventFactory.setLocation(null); return eventFactory; @@ -416,7 +419,7 @@ static XMLOutputFactory newXmlOutputFactory() throws FactoryConfigurationError { return factory; } static XMLOutputFactory xmlOutputFactory = newXmlOutputFactory(); - + private static XMLEventReader getXMLEventReader(StAXSource source) throws XMLStreamException { XMLEventReader reader = source.getXMLEventReader(); if (reader == null) { @@ -425,16 +428,16 @@ private static XMLEventReader getXMLEventReader(StAXSource source) throws XMLStr } return reader; } - + public static XMLOutputFactory getOutputFactory() throws FactoryConfigurationError { if (XMLType.isThreadSafeXmlFactories()) { return xmlOutputFactory; } return threadLocalOutputFactory.get(); } - + public static ClobType xslTransform(CommandContext context, Object xml, Object styleSheet) throws Exception { - Source styleSource = null; + Source styleSource = null; Source xmlSource = null; try { styleSource = convertToSource(styleSheet); @@ -442,10 +445,10 @@ public static ClobType xslTransform(CommandContext context, Object xml, Object s final Source xmlParam = xmlSource; TransformerFactory factory = StandardXMLTranslator.getThreadLocalTransformerFactory(); final Transformer transformer = factory.newTransformer(styleSource); - + //this creates a non-validated sqlxml - it may not be valid xml/root-less xml SQLXMLImpl result = saveToBufferManager(new XMLTranslator() { - + @Override public void translate(Writer writer) throws TransformerException { //transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); //$NON-NLS-1$ @@ -473,7 +476,7 @@ public static XMLType xmlForest(final NameValuePair[] namespaces, final NameValu } XMLType result = new XMLType(XMLSystemFunctions.saveToBufferManager(new XMLTranslator() { - + @Override public void translate(Writer writer) throws TransformerException, IOException { @@ -490,13 +493,13 @@ public void translate(Writer writer) throws TransformerException, eventWriter.close(); } catch (XMLStreamException e) { throw new TransformerException(e); - } + } } })); result.setType(Type.CONTENT); return result; } - + /** * Basic support for xmlelement. namespaces are not yet supported. * @param context @@ -505,10 +508,10 @@ public void translate(Writer writer) throws TransformerException, * @return * @throws Exception */ - public static XMLType xmlElement(final String name, + public static XMLType xmlElement(final String name, final NameValuePair[] namespaces, final NameValuePair[] attributes, final List contents) throws Exception { XMLType result = new XMLType(saveToBufferManager(new XMLTranslator() { - + @Override public void translate(Writer writer) throws TransformerException, IOException { @@ -520,14 +523,14 @@ public void translate(Writer writer) throws TransformerException, eventWriter.close(); } catch (XMLStreamException e) { throw new TransformerException(e); - } + } } })); result.setType(Type.ELEMENT); return result; } - + private static void addElement(final String name, Writer writer, XMLEventWriter eventWriter, XMLEventFactory eventFactory, NameValuePair namespaces[], NameValuePair attributes[], List contents) throws XMLStreamException, IOException, TransformerException { eventWriter.add(eventFactory.createStartElement("", null, name)); //$NON-NLS-1$ @@ -538,7 +541,7 @@ private static void addElement(final String name, Writer writer, XMLEventWriter eventWriter.add(eventFactory.createNamespace(XMLConstants.NULL_NS_URI)); } else { eventWriter.add(eventFactory.createNamespace(nameValuePair.value)); - } + } } else { eventWriter.add(eventFactory.createNamespace(nameValuePair.name, nameValuePair.value)); } @@ -552,13 +555,13 @@ private static void addElement(final String name, Writer writer, XMLEventWriter } } //add empty chars to close the start tag - eventWriter.add(eventFactory.createCharacters("")); //$NON-NLS-1$ + eventWriter.add(eventFactory.createCharacters("")); //$NON-NLS-1$ for (Object object : contents) { convertValue(writer, eventWriter, eventFactory, object); } eventWriter.add(eventFactory.createEndElement("", null, name)); //$NON-NLS-1$ } - + public static XMLType xmlConcat(CommandContext context, final XMLType xml, final Object... other) throws Exception { //determine if there is just a single xml value and return it XMLType singleValue = xml; @@ -580,7 +583,7 @@ public static XMLType xmlConcat(CommandContext context, final XMLType xml, final if (type == null) { return singleValue; } - + XmlConcat concat = new XmlConcat(); concat.addValue(xml); for (Object object : other) { @@ -595,7 +598,7 @@ public static class XmlConcat { private FileStoreInputStreamFactory fsisf; private FileStore fs; private Type type; - + public XmlConcat() throws TeiidClientException { MemoryStorageManager manager = new MemoryStorageManager(); fs = manager.createFileStore("xml"); //$NON-NLS-1$ @@ -609,7 +612,7 @@ public XmlConcat() throws TeiidClientException { throw new TeiidClientException(e); } } - + public void addValue(Object object) throws TeiidClientException { if (type == null) { if (object instanceof XMLType) { @@ -623,13 +626,13 @@ public void addValue(Object object) throws TeiidClientException { } catch (Exception e) { fs.remove(); throw new TeiidClientException(e); - } + } } - + public Writer getWriter() { return writer; } - + public XMLType close() throws TeiidClientException { try { eventWriter.flush(); @@ -649,13 +652,13 @@ public XMLType close() throws TeiidClientException { } return result; } - + } - + public static XMLType xmlPi(String name) { return xmlPi(name, ""); //$NON-NLS-1$ } - + public static XMLType xmlPi(String name, String content) { int start = 0; char[] chars = content.toCharArray(); @@ -666,7 +669,7 @@ public static XMLType xmlPi(String name, String content) { result.setType(Type.PI); return result; } - + public static AtomicValue convertToAtomicValue(Object value) throws TransformerException { if (value instanceof java.util.Date) { //special handling for time types java.util.Date d = (java.util.Date)value; @@ -684,7 +687,7 @@ public static AtomicValue convertToAtomicValue(Object value) throws TransformerE JPConverter converter = JPConverter.allocate(value.getClass(), null); return (AtomicValue)converter.convert(value, null); } - + static void convertValue(Writer writer, XMLEventWriter eventWriter, XMLEventFactory eventFactory, Object object) throws IOException, FactoryConfigurationError, XMLStreamException, TransformerException { @@ -720,7 +723,7 @@ private static void convertReader(Writer writer, throws Exception { switch(type) { case CONTENT: - case ELEMENT: + case ELEMENT: case PI: case COMMENT: {//write the value directly to the writer eventWriter.flush(); @@ -766,7 +769,7 @@ private static void convertReader(Writer writer, break; } } - + public static XMLType xmlComment(String comment) { return new XMLType(new SQLXMLImpl("")); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -798,7 +801,7 @@ public static void closeSource(final Source source) { if (!(source instanceof StreamSource)) { return; } - + StreamSource stream = (StreamSource)source; try { if (stream.getInputStream() != null) { @@ -819,14 +822,14 @@ public static String xpathValue(Object doc, String xpath) throws Exception { try { s = convertToSource(doc); XPathEvaluator eval = new XPathEvaluator(); - // Wrap the string() function to force a string return + // Wrap the string() function to force a string return XPathExpression expr = eval.createExpression(xpath); Object o = expr.evaluateSingle(s); - + if(o == null) { return null; } - + // Return string value of node type if(o instanceof Item) { Item i = (Item)o; @@ -834,15 +837,15 @@ public static String xpathValue(Object doc, String xpath) throws Exception { return null; } return i.getStringValue(); - } - + } + // Return string representation of non-node value return o.toString(); } finally { closeSource(s); } } - + public static boolean isNull(Item i) { if (i instanceof NodeInfo) { NodeInfo ni = (NodeInfo)i; @@ -855,22 +858,22 @@ public static boolean isNull(Item i) { } return false; } - + /** * Validate whether the XPath is a valid XPath. If not valid, an XPathExpressionException will be thrown. * @param xpath An xpath expression, for example: a/b/c/getText() - * @throws XPathExpressionException - * @throws XPathException + * @throws XPathExpressionException + * @throws XPathException */ public static void validateXpath(String xpath) throws XPathException { - if(xpath == null) { + if(xpath == null) { return; } - + XPathEvaluator eval = new XPathEvaluator(); eval.createExpression(xpath); } - + public static String escapeName(String name, boolean fully) { StringBuilder sb = new StringBuilder(); char[] chars = name.toCharArray(); @@ -887,7 +890,7 @@ public static String escapeName(String name, boolean fully) { if (fully || i == 0) { sb.append(escapeChar(chr)); continue; - } + } break; case '_': if (chars.length > i && chars[i+1] == 'x') { @@ -925,7 +928,7 @@ private static String escapeChar(char chr) { public static SQLXML jsonToXml(final String rootName, final Blob json) throws Exception { return jsonToXml(rootName, json, false); } - + public static SQLXML jsonToXml(final String rootName, final Blob json, boolean stream) throws Exception { Reader r = getJsonReader(json); return jsonToXml(rootName, r, stream); @@ -941,13 +944,13 @@ public static InputStreamReader getJsonReader(final Blob json) throws SQLExcepti if (read > 3) { if (encoding[0] == 0 && encoding[2] == 0) { if (encoding[1] == 0) { - charset = UTF_32BE; + charset = UTF_32BE; } else { charset = UTF_16BE; } } else if (encoding[1] == 0 && encoding[3] == 0) { if (encoding[2] == 0) { - charset = UTF_32LE; + charset = UTF_32LE; } else { charset = UTF_16LE; } @@ -959,11 +962,11 @@ public static InputStreamReader getJsonReader(final Blob json) throws SQLExcepti public static SQLXML jsonToXml(final String rootName, final Clob json) throws Exception { return jsonToXml(rootName, json, false); } - + public static SQLXML jsonToXml(final String rootName, final Clob json, boolean stream) throws Exception { return jsonToXml(rootName, json.getCharacterStream(), stream); } - + private static SQLXML jsonToXml( final String rootName, final Reader r, boolean stream) throws Exception { JSONParser parser = new JSONParser(); @@ -981,14 +984,14 @@ private static SQLXML jsonToXml( } } else { sqlXml = saveToBufferManager(new XMLTranslator() { - + @Override public void translate(Writer writer) throws TransformerException, IOException { try { XMLOutputFactory factory = getOutputFactory(); final XMLEventWriter streamWriter = factory.createXMLEventWriter(writer); - + streamWriter.add(reader); streamWriter.flush(); //woodstox needs a flush rather than a close } catch (XMLStreamException e) { @@ -997,7 +1000,7 @@ public void translate(Writer writer) throws TransformerException, try { r.close(); } catch (IOException e) { - + } } } @@ -1012,12 +1015,12 @@ public void translate(Writer writer) throws TransformerException, * This method saves the given XML object to the buffer manager's disk process * Documents less than the maxMemorySize will be held directly in memory */ - public static SQLXMLImpl saveToBufferManager(XMLTranslator translator) throws Exception { + public static SQLXMLImpl saveToBufferManager(XMLTranslator translator) throws Exception { boolean success = false; MemoryStorageManager manager = new MemoryStorageManager(); final FileStore lobBuffer = manager.createFileStore("xml"); //$NON-NLS-1$ FileStoreInputStreamFactory fsisf = new FileStoreInputStreamFactory(lobBuffer, Streamable.ENCODING); - try{ + try{ Writer writer = fsisf.getWriter(); translator.translate(writer); writer.close(); @@ -1036,7 +1039,7 @@ public static Object serialize(XMLSerializeImpl xs, XMLType value) throws Except Type type = value.getType(); final Charset encoding; if (xs.getEncoding() != null) { - encoding = Charset.forName(xs.getEncoding()); + encoding = Charset.forName(xs.getEncoding()); } else { encoding = UTF_8; } @@ -1088,12 +1091,12 @@ public StAXSource getStaxSource() throws SQLException { if (!Charset.forName(value.getEncoding()).equals(encoding)) { is = new ReaderInputStream(value.getCharacterStream(), encoding); } else { - is = value.getBinaryStream(); + is = value.getBinaryStream(); } byte[] bytes = ObjectConverterUtil.convertToByteArray(is, DefaultDataTypeManager.MAX_LOB_MEMORY_BYTES); return new BinaryTypeImpl(bytes); } catch (SQLException e) { - throw new TeiidClientException(e, Messages.gs(Messages.TEIID.TEIID10080, "XML", "VARBINARY")); //$NON-NLS-1$ //$NON-NLS-2$ + throw new TeiidClientException(e, Messages.gs(Messages.TEIID.TEIID10080, "XML", "VARBINARY")); //$NON-NLS-1$ //$NON-NLS-2$ } catch (IOException e) { throw new TeiidClientException(e, Messages.gs(Messages.TEIID.TEIID10080, "XML", "VARBINARY")); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -1102,7 +1105,8 @@ public StAXSource getStaxSource() throws SQLException { if (!Charset.forName(value.getEncoding()).equals(encoding)) { //create a wrapper for the input stream isf = new InputStreamFactory.SQLXMLInputStreamFactory(value) { - public InputStream getInputStream() throws IOException { + @Override + public InputStream getInputStream() throws IOException { try { return new ReaderInputStream(sqlxml.getCharacterStream(), encoding); } catch (SQLException e) { @@ -1115,5 +1119,5 @@ public InputStream getInputStream() throws IOException { } return new BlobType(new BlobImpl(isf)); } - + } diff --git a/komodo-teiid-client/pom.xml b/komodo-teiid-client/pom.xml index 14acd2bb..bf4310b0 100644 --- a/komodo-teiid-client/pom.xml +++ b/komodo-teiid-client/pom.xml @@ -124,7 +124,7 @@ ${project.basedir}/gen - + org.apache.maven.plugins maven-enforcer-plugin diff --git a/komodo-test-utils/.classpath b/komodo-test-utils/.classpath index fae1a2b3..f8ce0d30 100644 --- a/komodo-test-utils/.classpath +++ b/komodo-test-utils/.classpath @@ -6,11 +6,6 @@ - - - - - @@ -22,7 +17,7 @@ - + diff --git a/komodo-test-utils/pom.xml b/komodo-test-utils/pom.xml index b44a86c6..06f794ce 100644 --- a/komodo-test-utils/pom.xml +++ b/komodo-test-utils/pom.xml @@ -9,7 +9,7 @@ komodo-test-utils Komodo Test Utils Komodo Test Utilities - + org.komodo diff --git a/komodo-test-utils/src/test/java/org/komodo/test/utils/AbstractSequencerTest.java b/komodo-test-utils/src/test/java/org/komodo/test/utils/AbstractSequencerTest.java index 756f1581..a69d54cd 100644 --- a/komodo-test-utils/src/test/java/org/komodo/test/utils/AbstractSequencerTest.java +++ b/komodo-test-utils/src/test/java/org/komodo/test/utils/AbstractSequencerTest.java @@ -29,7 +29,6 @@ import static org.junit.Assert.assertTrue; import static org.modeshape.jcr.api.JcrConstants.JCR_MIXIN_TYPES; import static org.modeshape.jcr.api.JcrConstants.JCR_PRIMARY_TYPE; - import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -41,7 +40,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; - import javax.jcr.Node; import javax.jcr.NodeIterator; import javax.jcr.Property; @@ -54,7 +52,6 @@ import javax.jcr.observation.EventListener; import javax.jcr.observation.EventListenerIterator; import javax.jcr.observation.ObservationManager; - import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -67,9 +64,9 @@ import org.modeshape.jcr.api.JcrConstants; import org.modeshape.jcr.api.observation.Event; import org.modeshape.jcr.api.observation.Event.Sequencing; -import org.modeshape.sequencer.ddl.StandardDdlLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.ddl.StandardDdlLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * Class which serves as base for various sequencer unit tests. In addition to this, it uses the sequencing events fired by * ModeShape's {@link javax.jcr.observation.ObservationManager} to perform various assertions and therefore, acts as a test for @@ -193,7 +190,7 @@ protected Node prepareSequence(String text, SequencerType sequencer) throws Exce /** * Retrieves a sequenced node using 5 seconds as maximum wait time. - * + * * @param parentNode an existing {@link Node} * @param relativePath the path under the parent node at which the sequenced node is expected to appear (note that this must * be the path to the "new" node, always. @@ -211,7 +208,7 @@ protected Node getOutputNode( Node parentNode, * The sequenced node "appears" when the {@link SequencingListener} is notified of the sequencing process. The thread which * calls this method either returns immediately if the node has already been sequenced, or waits a number of seconds for it to * become available. - * + * * @param parentNode an existing {@link Node} * @param relativePath the path under the parent node at which the sequenced node is expected to appear (note that this must * be the path to the "new" node, always. @@ -234,7 +231,7 @@ protected Node getOutputNode( String expectedPath ) throws InterruptedException /** * Retrieves a new node under the given path, as a result of sequecing, or returns null if the given timeout occurs. - * + * * @param expectedPath * @param waitTimeSeconds * @return the output node @@ -293,7 +290,7 @@ protected void verifyPrimaryType( Node node, String expectedValue ) throws Repos protected void verifyMixinType( Node node, String expectedValue ) throws RepositoryException { verifyProperty(node, JCR_MIXIN_TYPES, expectedValue); } - + protected void verifyMixinTypes( Node node, String... expectedValues ) throws RepositoryException { Value[] values = node.getProperty(JCR_MIXIN_TYPES).getValues(); Set valuesSet = new TreeSet(); diff --git a/komodo-test-utils/src/test/java/org/komodo/test/utils/TestUtilities.java b/komodo-test-utils/src/test/java/org/komodo/test/utils/TestUtilities.java index d6349e59..c534fe54 100644 --- a/komodo-test-utils/src/test/java/org/komodo/test/utils/TestUtilities.java +++ b/komodo-test-utils/src/test/java/org/komodo/test/utils/TestUtilities.java @@ -33,8 +33,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.StringReader; -import java.net.URL; - import javax.jcr.Node; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -42,8 +40,8 @@ import org.komodo.spi.constants.StringConstants; import org.komodo.spi.repository.KomodoObject; import org.komodo.spi.repository.Repository.UnitOfWork; -import org.modeshape.sequencer.teiid.lexicon.CoreLexicon; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.CoreLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/komodo-test-utils/src/test/resources/org/komodo/test/utils/test-local-repository-in-memory-config.json b/komodo-test-utils/src/test/resources/org/komodo/test/utils/test-local-repository-in-memory-config.json index e9232b36..b25e8e3a 100644 --- a/komodo-test-utils/src/test/resources/org/komodo/test/utils/test-local-repository-in-memory-config.json +++ b/komodo-test-utils/src/test/resources/org/komodo/test/utils/test-local-repository-in-memory-config.json @@ -57,7 +57,7 @@ "threadPool" : "modeshape-workers", "sequencers" : { "VDB Dynamic Sequencer" : { - "classname" : "org.modeshape.sequencer.teiid.VdbDynamicSequencer" + "classname" : "org.teiid.modeshape.sequencer.vdb.VdbDynamicSequencer" }, "DDL Sequencer" : { "classname" : "org.komodo.modeshape.lib.sequencer.KDdlSequencer" diff --git a/komodo-utils-logger/.classpath b/komodo-utils-logger/.classpath index fae1a2b3..bb584ce0 100644 --- a/komodo-utils-logger/.classpath +++ b/komodo-utils-logger/.classpath @@ -6,28 +6,19 @@ - - - - - - - - - - - + + - + diff --git a/komodo-utils-logger/.project b/komodo-utils-logger/.project index 4c33674f..8589e301 100644 --- a/komodo-utils-logger/.project +++ b/komodo-utils-logger/.project @@ -5,11 +5,21 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder + + org.eclipse.wst.validation.validationbuilder + + + org.eclipse.m2e.core.maven2Builder @@ -19,5 +29,7 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.common.modulecore.ModuleCoreNature diff --git a/komodo-utils-logger/pom.xml b/komodo-utils-logger/pom.xml index 5b0ca70d..ae9f7394 100644 --- a/komodo-utils-logger/pom.xml +++ b/komodo-utils-logger/pom.xml @@ -9,7 +9,7 @@ komodo-utils-modeshape-logger Komodo Logger Komodo Logger Modeshape Implementation - + org.komodo diff --git a/komodo-utils/.classpath b/komodo-utils/.classpath index fae1a2b3..c2e15478 100644 --- a/komodo-utils/.classpath +++ b/komodo-utils/.classpath @@ -17,17 +17,13 @@ - - - - - - + + - + diff --git a/komodo-utils/.project b/komodo-utils/.project index 0b712a1c..3615d2c5 100644 --- a/komodo-utils/.project +++ b/komodo-utils/.project @@ -5,11 +5,21 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder + + org.eclipse.wst.validation.validationbuilder + + + org.eclipse.m2e.core.maven2Builder @@ -19,5 +29,7 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.common.modulecore.ModuleCoreNature diff --git a/komodo-utils/pom.xml b/komodo-utils/pom.xml index 2445573d..52483c00 100644 --- a/komodo-utils/pom.xml +++ b/komodo-utils/pom.xml @@ -9,7 +9,7 @@ komodo-utils Komodo Utils Miscellaneous utilities - + org.komodo diff --git a/komodo-utils/src/main/java/org/komodo/utils/i18n/I18n.java b/komodo-utils/src/main/java/org/komodo/utils/i18n/I18n.java index 0a448138..f70b61f8 100644 --- a/komodo-utils/src/main/java/org/komodo/utils/i18n/I18n.java +++ b/komodo-utils/src/main/java/org/komodo/utils/i18n/I18n.java @@ -7,6 +7,7 @@ */ package org.komodo.utils.i18n; +import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -113,8 +114,10 @@ protected void initialize() { final String bundleName = thisClass.getName().replaceAll( "\\.", "/" ).concat( ".properties" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ final Collection< String > errors = new ArrayList< String >(); final Properties props = new I18nProperties( fields, thisClass, errors ); + InputStream stream = null; - try ( final InputStream stream = thisClass.getClassLoader().getResource( bundleName ).openStream() ) { + try { + stream = thisClass.getClassLoader().getResource( bundleName ).openStream(); props.load( stream ); // log errors for any properties keys that don't have fields @@ -139,6 +142,15 @@ protected void initialize() { } catch ( final Exception e ) { throw new IllegalStateException( I18n.bind( UtilsI18n.problemLoadingI18nProperties, getClass().getName() ), e ); } finally { + if (stream != null) { + try { + stream.close(); + } catch ( final IOException e ) { + throw new IllegalStateException( I18n.bind( UtilsI18n.problemLoadingI18nProperties, getClass().getName() ), + e ); + } + } + if ( problem != null ) { throw problem; } diff --git a/komodo-utils/src/test/java/org/komodo/utils/TestKLog.java b/komodo-utils/src/test/java/org/komodo/utils/TestKLog.java index 2d1f37b5..a1daa896 100644 --- a/komodo-utils/src/test/java/org/komodo/utils/TestKLog.java +++ b/komodo-utils/src/test/java/org/komodo/utils/TestKLog.java @@ -40,8 +40,6 @@ import org.junit.Test; import org.komodo.spi.constants.SystemConstants; import org.komodo.spi.logging.KLogger; -import org.komodo.utils.FileUtils; -import org.komodo.utils.KLog; /** * @@ -95,7 +93,10 @@ private File configureLogPath(KLog logger) throws IOException, Exception { } private String retrieveLogContents(File newLogFile) throws Exception { - try ( BufferedReader reader = new BufferedReader( new FileReader( newLogFile ) ) ) { + BufferedReader reader = null; + + try { + reader = new BufferedReader( new FileReader( newLogFile ) ); StringBuilder builder = new StringBuilder(); String line; while((line = reader.readLine()) != null) { @@ -104,6 +105,10 @@ private String retrieveLogContents(File newLogFile) throws Exception { } return builder.toString(); + } finally { + if ( reader != null ) { + reader.close(); + } } } diff --git a/pom.xml b/pom.xml index 934ad520..ebb491f9 100644 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,7 @@ 5.2.10.Final 1.2.16 1.7.2 + 0.0.1-SNAPSHOT 3.2.0.Final @@ -110,14 +111,14 @@ ${modeshape.version} - org.modeshape - modeshape-sequencer-ddl - ${modeshape.version} + org.jboss.teiid.modeshape + teiid-modeshape-sequencer-vdb + ${teiid.modeshape.version} - org.modeshape - modeshape-sequencer-teiid - ${modeshape.version} + org.jboss.teiid.modeshape + teiid-modeshape-sequencer-ddl + ${teiid.modeshape.version} org.modeshape @@ -171,12 +172,12 @@ modeshape-jcr - org.modeshape - modeshape-sequencer-ddl + org.jboss.teiid.modeshape + teiid-modeshape-sequencer-ddl - org.modeshape - modeshape-sequencer-teiid + org.jboss.teiid.modeshape + teiid-modeshape-sequencer-vdb org.modeshape diff --git a/server/komodo-rest/.classpath b/server/komodo-rest/.classpath index ace82666..efcf778b 100644 --- a/server/komodo-rest/.classpath +++ b/server/komodo-rest/.classpath @@ -27,7 +27,7 @@ - + diff --git a/server/komodo-rest/pom.xml b/server/komodo-rest/pom.xml index 9eb39585..a81f46d1 100644 --- a/server/komodo-rest/pom.xml +++ b/server/komodo-rest/pom.xml @@ -220,7 +220,7 @@ ${rest-context} - + maven-war-plugin ${rest-context} diff --git a/server/komodo-rest/src/main/java/org/komodo/rest/KomodoRestV1Application.java b/server/komodo-rest/src/main/java/org/komodo/rest/KomodoRestV1Application.java index db26db95..ee466320 100644 --- a/server/komodo-rest/src/main/java/org/komodo/rest/KomodoRestV1Application.java +++ b/server/komodo-rest/src/main/java/org/komodo/rest/KomodoRestV1Application.java @@ -288,7 +288,7 @@ public KomodoRestV1Application() throws ServerErrorException { this.latch = new CountDownLatch( 1 ); this.kengine = start(); - final Set< Object > objs = new HashSet< >(); + final Set< Object > objs = new HashSet< Object >(); objs.add( new KomodoExceptionMapper() ); objs.add( new KomodoUtilService( this.kengine ) ); objs.add( new KomodoVdbService( this.kengine ) ); diff --git a/server/komodo-rest/src/main/java/org/komodo/rest/KomodoService.java b/server/komodo-rest/src/main/java/org/komodo/rest/KomodoService.java index be1a62ff..6ff3b52f 100644 --- a/server/komodo-rest/src/main/java/org/komodo/rest/KomodoService.java +++ b/server/komodo-rest/src/main/java/org/komodo/rest/KomodoService.java @@ -32,7 +32,7 @@ import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.utils.KLog; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * A Komodo service implementation. diff --git a/server/komodo-rest/src/main/java/org/komodo/rest/RestBasicEntity.java b/server/komodo-rest/src/main/java/org/komodo/rest/RestBasicEntity.java index 93f7b98d..cad173c4 100644 --- a/server/komodo-rest/src/main/java/org/komodo/rest/RestBasicEntity.java +++ b/server/komodo-rest/src/main/java/org/komodo/rest/RestBasicEntity.java @@ -84,9 +84,9 @@ public String getResourceName() { private transient KomodoRestUriBuilder uriBuilder; - protected Map tuples = new LinkedHashMap<>(); + protected Map tuples = new LinkedHashMap(); - protected List properties = new ArrayList<>(); + protected List properties = new ArrayList(); protected Map links = RestLink.NO_LINKS; @@ -314,7 +314,7 @@ public int hashCode() { */ public final void addLink(RestLink newLink) { if (this.links == null || this.links == RestLink.NO_LINKS) - this.links = new LinkedHashMap<>(); + this.links = new LinkedHashMap(); this.links.put(newLink.getRel(), newLink); } @@ -371,7 +371,7 @@ protected boolean hasPrefix(String name) { * @throws KException if error occurs */ public void addExecutionProperties(UnitOfWork uow, KomodoObject kObject) throws KException { - final List propNames = new ArrayList<>(Arrays.asList(kObject.getPropertyNames(uow))); // props with values + final List propNames = new ArrayList(Arrays.asList(kObject.getPropertyNames(uow))); // props with values final PropertyDescriptor[] descriptors = kObject.getPropertyDescriptors(uow); if (descriptors.length != 0) { diff --git a/server/komodo-rest/src/main/java/org/komodo/rest/json/LinkSerializer.java b/server/komodo-rest/src/main/java/org/komodo/rest/json/LinkSerializer.java index fd7eef54..c99f1104 100644 --- a/server/komodo-rest/src/main/java/org/komodo/rest/json/LinkSerializer.java +++ b/server/komodo-rest/src/main/java/org/komodo/rest/json/LinkSerializer.java @@ -36,22 +36,24 @@ private boolean isComplete( final RestLink link ) { @Override public RestLink read( final JsonReader in ) throws IOException { final RestLink link = new RestLink(); + boolean foundHref = false; + boolean foundRel = false; + in.beginObject(); while ( in.hasNext() ) { final String name = in.nextName(); - switch ( name ) { - case JsonConstants.HREF: - final String uri = in.nextString(); - link.setHref( UriBuilder.fromUri( uri ).build() ); - break; - case JsonConstants.REL: - final String rel = in.nextString(); - link.setRel( LinkType.fromString( rel ) ); - break; - default: - throw new IOException( Messages.getString( UNEXPECTED_JSON_TOKEN, name ) ); + if ( !foundHref && JsonConstants.HREF.equals( name ) ) { + final String uri = in.nextString(); + link.setHref( UriBuilder.fromUri( uri ).build() ); + foundHref = true; + } else if ( !foundRel && JsonConstants.REL.equals( name ) ) { + final String rel = in.nextString(); + link.setRel( LinkType.fromString( rel ) ); + foundRel = true; + } else { + throw new IOException( Messages.getString( UNEXPECTED_JSON_TOKEN, name ) ); } } diff --git a/server/komodo-rest/src/main/java/org/komodo/rest/relational/KomodoSearchService.java b/server/komodo-rest/src/main/java/org/komodo/rest/relational/KomodoSearchService.java index cf01a155..feadc786 100644 --- a/server/komodo-rest/src/main/java/org/komodo/rest/relational/KomodoSearchService.java +++ b/server/komodo-rest/src/main/java/org/komodo/rest/relational/KomodoSearchService.java @@ -250,7 +250,7 @@ public Response searchWorkspace( final @Context HttpHeaders headers, List searchObjects = os.searchObjects(uow); // Convert the results into rest objects for the response - List entities = new ArrayList<>(); + List entities = new ArrayList(); for (KomodoObject kObject : searchObjects) { RestBasicEntity entity = entityFactory.create(kObject, uriInfo.getBaseUri(), uow); if (entity != null) // if kType in UNKNOWN then the entity is not created @@ -354,7 +354,7 @@ public Response searchWorkspace( final @Context HttpHeaders headers, List searchObjects = os.searchObjects(uow); // Convert the results into rest objects for the response - List entities = new ArrayList<>(); + List entities = new ArrayList(); for (KomodoObject kObject : searchObjects) { RestBasicEntity entity = entityFactory.create(kObject, uriInfo.getBaseUri(), uow); if (entity != null) // if kType in UNKNOWN then the entity is not created diff --git a/server/komodo-rest/src/main/java/org/komodo/rest/relational/KomodoSearcherAttributes.java b/server/komodo-rest/src/main/java/org/komodo/rest/relational/KomodoSearcherAttributes.java index f25c90bc..9b0bfcc0 100644 --- a/server/komodo-rest/src/main/java/org/komodo/rest/relational/KomodoSearcherAttributes.java +++ b/server/komodo-rest/src/main/java/org/komodo/rest/relational/KomodoSearcherAttributes.java @@ -246,7 +246,7 @@ public Map getParameters() { */ public void setParameter(String name, String value) { if (this.parameters == null) - this.parameters = new HashMap<>(); + this.parameters = new HashMap(); this.parameters.put(name, value); } diff --git a/server/komodo-rest/src/main/java/org/komodo/rest/relational/KomodoStatusObject.java b/server/komodo-rest/src/main/java/org/komodo/rest/relational/KomodoStatusObject.java index edc8316d..efbfab1a 100644 --- a/server/komodo-rest/src/main/java/org/komodo/rest/relational/KomodoStatusObject.java +++ b/server/komodo-rest/src/main/java/org/komodo/rest/relational/KomodoStatusObject.java @@ -45,7 +45,7 @@ public class KomodoStatusObject implements KRestEntity { private String title; - private Map attributes = new LinkedHashMap<>(); + private Map attributes = new LinkedHashMap(); /** * Default constructor for deserialization diff --git a/server/komodo-rest/src/main/java/org/komodo/rest/relational/KomodoVdbService.java b/server/komodo-rest/src/main/java/org/komodo/rest/relational/KomodoVdbService.java index 79deda1b..0b92f760 100644 --- a/server/komodo-rest/src/main/java/org/komodo/rest/relational/KomodoVdbService.java +++ b/server/komodo-rest/src/main/java/org/komodo/rest/relational/KomodoVdbService.java @@ -63,7 +63,7 @@ import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.spi.repository.Repository.UnitOfWork.State; import org.komodo.utils.StringUtils; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -491,7 +491,7 @@ public Response getVdbs( final @Context HttpHeaders headers, } } - final List< RestVdb > entities = new ArrayList< >(); + final List< RestVdb > entities = new ArrayList< RestVdb >(); int i = 0; KomodoProperties properties = new KomodoProperties(); @@ -623,7 +623,7 @@ public Response getModels( final @Context HttpHeaders headers, if (models == null) models = new Model[0]; - List restModels = new ArrayList<>(models.length); + List restModels = new ArrayList(models.length); for (Model model : models) { RestVdbModel entity = entityFactory.create(model, uriInfo.getBaseUri(), uow); restModels.add(entity); @@ -753,7 +753,7 @@ public Response getTranslators( final @Context HttpHeaders headers, if (translators == null) translators = new Translator[0]; - List restTranslators = new ArrayList<>(translators.length); + List restTranslators = new ArrayList(translators.length); for (Translator translator : translators) { RestVdbTranslator entity = entityFactory.create(translator, uriInfo.getBaseUri(), uow); restTranslators.add(entity); @@ -900,7 +900,7 @@ public Response getImports( final @Context HttpHeaders headers, if (imports == null) imports = new VdbImport[0]; - List restImports = new ArrayList<>(imports.length); + List restImports = new ArrayList(imports.length); for (VdbImport vdbImport : imports) { RestVdbImport entity = entityFactory.create(vdbImport, uriInfo.getBaseUri(), uow); restImports.add(entity); @@ -1047,7 +1047,7 @@ public Response getDataRoles( final @Context HttpHeaders headers, if (dataRoles == null) dataRoles = new DataRole[0]; - List restDataRoles = new ArrayList<>(dataRoles.length); + List restDataRoles = new ArrayList(dataRoles.length); for (DataRole dataRole : dataRoles) { RestVdbDataRole entity = entityFactory.create(dataRole, uriInfo.getBaseUri(), uow); restDataRoles.add(entity); @@ -1188,7 +1188,7 @@ public Response getSources( final @Context HttpHeaders headers, if (sources == null) sources = new ModelSource[0]; - List restSources = new ArrayList<>(sources.length); + List restSources = new ArrayList(sources.length); for (ModelSource source : sources) { RestVdbModelSource entity = entityFactory.create(source, uriInfo.getBaseUri(), uow); restSources.add(entity); @@ -1365,7 +1365,7 @@ public Response getPermissions( final @Context HttpHeaders headers, if (permissions == null) permissions = new Permission[0]; - List restPermissions = new ArrayList<>(permissions.length); + List restPermissions = new ArrayList(permissions.length); for (Permission permission : permissions) { RestVdbPermission entity = entityFactory.create(permission, uriInfo.getBaseUri(), uow); restPermissions.add(entity); @@ -1520,7 +1520,7 @@ public Response getConditions( final @Context HttpHeaders headers, return commitNoPermissionFound(uow, mediaTypes, permissionId, dataRoleId, vdbName); Condition[] conditions = permission.getConditions(uow); - List restConditions = new ArrayList<>(conditions.length); + List restConditions = new ArrayList(conditions.length); for (Condition condition : conditions) { RestVdbCondition entity = entityFactory.create(condition, uriInfo.getBaseUri(), uow); restConditions.add(entity); @@ -1710,7 +1710,7 @@ public Response getMasks( final @Context HttpHeaders headers, return commitNoPermissionFound(uow, mediaTypes, permissionId, dataRoleId, vdbName); Mask[] masks = permission.getMasks(uow); - List restMasks = new ArrayList<>(masks.length); + List restMasks = new ArrayList(masks.length); for (Mask mask : masks) { RestVdbMask entity = entityFactory.create(mask, uriInfo.getBaseUri(), uow); restMasks.add(entity); diff --git a/server/komodo-rest/src/main/java/org/komodo/rest/relational/RelationalMessages.java b/server/komodo-rest/src/main/java/org/komodo/rest/relational/RelationalMessages.java index ba42e551..7eb46c90 100644 --- a/server/komodo-rest/src/main/java/org/komodo/rest/relational/RelationalMessages.java +++ b/server/komodo-rest/src/main/java/org/komodo/rest/relational/RelationalMessages.java @@ -319,7 +319,7 @@ public static String getString( final Enum< ? > key, return text; } - List expandedParam = new ArrayList<>(); + List expandedParam = new ArrayList(); expandParameters(parameters, expandedParam); // return formatted message diff --git a/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdb.java b/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdb.java index f74e2d07..48c09098 100644 --- a/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdb.java +++ b/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdb.java @@ -17,7 +17,7 @@ import org.komodo.rest.relational.KomodoRestUriBuilder.SettingNames; import org.komodo.spi.KException; import org.komodo.spi.repository.Repository.UnitOfWork; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * A VDB that can be used by GSON to build a JSON document representation. diff --git a/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbCondition.java b/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbCondition.java index dab3e544..0bc976ca 100644 --- a/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbCondition.java +++ b/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbCondition.java @@ -21,7 +21,7 @@ import org.komodo.spi.KException; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * A condition that can be used by GSON to build a JSON document representation. diff --git a/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbDataRole.java b/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbDataRole.java index d5a8e478..acdc2f93 100644 --- a/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbDataRole.java +++ b/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbDataRole.java @@ -9,7 +9,6 @@ import java.net.URI; import java.util.Properties; - import org.komodo.relational.vdb.DataRole; import org.komodo.relational.vdb.Vdb; import org.komodo.rest.KomodoService; @@ -20,7 +19,7 @@ import org.komodo.spi.KException; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * A data role that can be used by GSON to build a JSON document representation. diff --git a/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbImport.java b/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbImport.java index 24dbf968..501d3c2f 100644 --- a/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbImport.java +++ b/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbImport.java @@ -9,7 +9,6 @@ import java.net.URI; import java.util.Properties; - import org.komodo.relational.vdb.Vdb; import org.komodo.relational.vdb.VdbImport; import org.komodo.rest.KomodoService; @@ -20,7 +19,7 @@ import org.komodo.spi.KException; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * A VDB import that can be used by GSON to build a JSON document representation. diff --git a/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbMask.java b/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbMask.java index 0d781920..60e9bcf4 100644 --- a/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbMask.java +++ b/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbMask.java @@ -21,7 +21,7 @@ import org.komodo.spi.KException; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * A condition that can be used by GSON to build a JSON document representation. diff --git a/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbModel.java b/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbModel.java index 3ef3990c..bebc2d85 100644 --- a/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbModel.java +++ b/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbModel.java @@ -9,7 +9,6 @@ import java.net.URI; import java.util.Properties; - import org.komodo.relational.model.Model; import org.komodo.relational.model.Model.Type; import org.komodo.relational.vdb.Vdb; @@ -22,8 +21,8 @@ import org.komodo.spi.KException; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.teiid.lexicon.CoreLexicon; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.CoreLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * A VDB model that can be used by GSON to build a JSON document model representation. diff --git a/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbModelSource.java b/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbModelSource.java index 299a46d8..b9375b59 100644 --- a/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbModelSource.java +++ b/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbModelSource.java @@ -21,7 +21,7 @@ import org.komodo.spi.KException; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * A VDB model source that can be used by GSON to build a JSON model source representation. diff --git a/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbPermission.java b/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbPermission.java index 298bc9d5..dd236071 100644 --- a/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbPermission.java +++ b/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbPermission.java @@ -20,7 +20,7 @@ import org.komodo.spi.KException; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * A data role that can be used by GSON to build a JSON document representation. diff --git a/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbTranslator.java b/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbTranslator.java index 1a9608af..a3d3221e 100644 --- a/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbTranslator.java +++ b/server/komodo-rest/src/main/java/org/komodo/rest/relational/RestVdbTranslator.java @@ -9,7 +9,6 @@ import java.net.URI; import java.util.Properties; - import org.komodo.relational.vdb.Translator; import org.komodo.relational.vdb.Vdb; import org.komodo.rest.KomodoService; @@ -20,7 +19,7 @@ import org.komodo.spi.KException; import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.utils.ArgCheck; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * A translator that can be used by GSON to build a JSON document representation. diff --git a/server/komodo-rest/src/main/java/org/komodo/rest/relational/json/SavedSearcherSerializer.java b/server/komodo-rest/src/main/java/org/komodo/rest/relational/json/SavedSearcherSerializer.java index 3dd83d05..b2f3c116 100644 --- a/server/komodo-rest/src/main/java/org/komodo/rest/relational/json/SavedSearcherSerializer.java +++ b/server/komodo-rest/src/main/java/org/komodo/rest/relational/json/SavedSearcherSerializer.java @@ -30,24 +30,27 @@ public final class SavedSearcherSerializer extends TypeAdapter< KomodoSavedSearc @Override public KomodoSavedSearcher read( final JsonReader in ) throws IOException { final KomodoSavedSearcher status = new KomodoSavedSearcher(); + boolean foundName = false; + boolean foundQuery = false; + boolean foundParameter = false; + in.beginObject(); while ( in.hasNext() ) { final String name = in.nextName(); - switch ( name ) { - case KomodoSavedSearcher.NAME_LABEL: - status.setName(in.nextString()); - break; - case KomodoSavedSearcher.QUERY_LABEL: - status.setQuery(in.nextString()); - break; - case KomodoSavedSearcher.PARAMETER_LABEL: - final String[] parameters = BUILDER.fromJson( in, String[].class ); - status.setParameters(Arrays.asList(parameters)); - break; - default: - throw new IOException( Messages.getString( UNEXPECTED_JSON_TOKEN, name ) ); + if ( !foundName && KomodoSavedSearcher.NAME_LABEL.equals( name ) ) { + status.setName( in.nextString() ); + foundName = true; + } else if ( !foundQuery && KomodoSavedSearcher.QUERY_LABEL.equals( name ) ) { + status.setQuery( in.nextString() ); + foundQuery = true; + } else if ( !foundParameter && KomodoSavedSearcher.PARAMETER_LABEL.equals( name ) ) { + final String[] parameters = BUILDER.fromJson( in, String[].class ); + status.setParameters( Arrays.asList( parameters ) ); + foundParameter = true; + } else { + throw new IOException( Messages.getString( UNEXPECTED_JSON_TOKEN, name ) ); } } diff --git a/server/komodo-rest/src/main/java/org/komodo/rest/relational/json/SearcherAttributesSerializer.java b/server/komodo-rest/src/main/java/org/komodo/rest/relational/json/SearcherAttributesSerializer.java index 9c2c4fee..e2744c49 100644 --- a/server/komodo-rest/src/main/java/org/komodo/rest/relational/json/SearcherAttributesSerializer.java +++ b/server/komodo-rest/src/main/java/org/komodo/rest/relational/json/SearcherAttributesSerializer.java @@ -39,36 +39,27 @@ public KomodoSearcherAttributes read( final JsonReader in ) throws IOException { while ( in.hasNext() ) { final String name = in.nextName(); - switch ( name ) { - case KomodoSearcherAttributes.SEARCH_NAME_LABEL: - searcherAttr.setSearchName(in.nextString()); - break; - case KomodoSearcherAttributes.TYPE_LABEL: - searcherAttr.setType(in.nextString()); - break; - case KomodoSearcherAttributes.PARENT_LABEL: - searcherAttr.setParent(in.nextString()); - break; - case KomodoSearcherAttributes.ANCESTOR_LABEL: - searcherAttr.setAncestor(in.nextString()); - break; - case KomodoSearcherAttributes.PATH_LABEL: - searcherAttr.setPath(in.nextString()); - break; - case KomodoSearcherAttributes.CONTAINS_LABEL: - searcherAttr.setContains(in.nextString()); - break; - case KomodoSearcherAttributes.OBJECT_NAME_LABEL: - searcherAttr.setObjectName(in.nextString()); - break; - case KomodoSearcherAttributes.PARAMETERS_LABEL: - Map parameters = BUILDER.fromJson(in, Map.class); - for (Map.Entry parameter : parameters.entrySet()) { - searcherAttr.setParameter(parameter.getKey(), parameter.getValue()); - } - break; - default: - throw new IOException( Messages.getString( UNEXPECTED_JSON_TOKEN, name ) ); + if ( KomodoSearcherAttributes.SEARCH_NAME_LABEL.equals( name ) ) { + searcherAttr.setSearchName( in.nextString() ); + } else if ( KomodoSearcherAttributes.TYPE_LABEL.equals( name ) ) { + searcherAttr.setType( in.nextString() ); + } else if ( KomodoSearcherAttributes.PARENT_LABEL.equals( name ) ) { + searcherAttr.setParent( in.nextString() ); + } else if ( KomodoSearcherAttributes.ANCESTOR_LABEL.equals( name ) ) { + searcherAttr.setAncestor( in.nextString() ); + } else if ( KomodoSearcherAttributes.PATH_LABEL.equals( name ) ) { + searcherAttr.setPath( in.nextString() ); + } else if ( KomodoSearcherAttributes.CONTAINS_LABEL.equals( name ) ) { + searcherAttr.setContains( in.nextString() ); + } else if ( KomodoSearcherAttributes.OBJECT_NAME_LABEL.equals( name ) ) { + searcherAttr.setObjectName( in.nextString() ); + } else if ( KomodoSearcherAttributes.PARAMETERS_LABEL.equals( name ) ) { + Map< String, String > parameters = BUILDER.fromJson( in, Map.class ); + for ( Map.Entry< String, String > parameter : parameters.entrySet() ) { + searcherAttr.setParameter( parameter.getKey(), parameter.getValue() ); + } + } else { + throw new IOException( Messages.getString( UNEXPECTED_JSON_TOKEN, name ) ); } } diff --git a/server/komodo-rest/src/main/java/org/komodo/rest/relational/json/StatusObjectSerializer.java b/server/komodo-rest/src/main/java/org/komodo/rest/relational/json/StatusObjectSerializer.java index 5cda8426..d67af73e 100644 --- a/server/komodo-rest/src/main/java/org/komodo/rest/relational/json/StatusObjectSerializer.java +++ b/server/komodo-rest/src/main/java/org/komodo/rest/relational/json/StatusObjectSerializer.java @@ -34,21 +34,23 @@ public final class StatusObjectSerializer extends TypeAdapter< KomodoStatusObjec @Override public KomodoStatusObject read( final JsonReader in ) throws IOException { final KomodoStatusObject status = new KomodoStatusObject(); + boolean foundTitle = false; + boolean foundInfo = false; + in.beginObject(); while ( in.hasNext() ) { final String name = in.nextName(); - switch ( name ) { - case KomodoStatusObject.TITLE_LABEL: - status.setTitle(in.nextString()); - break; - case KomodoStatusObject.INFO_LABEL: - Map attributes = BUILDER.fromJson(in, Map.class); - status.setAttributes(attributes); - break; - default: - throw new IOException( Messages.getString( UNEXPECTED_JSON_TOKEN, name ) ); + if ( !foundTitle && KomodoStatusObject.TITLE_LABEL.equals( name ) ) { + status.setTitle( in.nextString() ); + foundTitle = true; + } else if ( !foundInfo && KomodoStatusObject.INFO_LABEL.equals( name ) ) { + Map< String, String > attributes = BUILDER.fromJson( in, Map.class ); + status.setAttributes( attributes ); + foundInfo = true; + } else { + throw new IOException( Messages.getString( UNEXPECTED_JSON_TOKEN, name ) ); } } diff --git a/server/komodo-rest/src/main/java/org/komodo/rest/schema/json/TeiidXsdReader.java b/server/komodo-rest/src/main/java/org/komodo/rest/schema/json/TeiidXsdReader.java index 54aee0f8..d8bd11f7 100644 --- a/server/komodo-rest/src/main/java/org/komodo/rest/schema/json/TeiidXsdReader.java +++ b/server/komodo-rest/src/main/java/org/komodo/rest/schema/json/TeiidXsdReader.java @@ -136,7 +136,7 @@ public String getKey(AliasMapper value) { } } - private static KeyInValueHashMap ALIAS_CACHE = new KeyInValueHashMap<>(new AliasMapperAdapter()); + private static KeyInValueHashMap ALIAS_CACHE = new KeyInValueHashMap(new AliasMapperAdapter()); static { AliasMapper vdbMapper = new AliasMapper("vdb"); diff --git a/server/komodo-rest/src/test/java/org/komodo/rest/relational/AbstractKomodoServiceTest.java b/server/komodo-rest/src/test/java/org/komodo/rest/relational/AbstractKomodoServiceTest.java index ea679e78..84e61255 100644 --- a/server/komodo-rest/src/test/java/org/komodo/rest/relational/AbstractKomodoServiceTest.java +++ b/server/komodo-rest/src/test/java/org/komodo/rest/relational/AbstractKomodoServiceTest.java @@ -60,8 +60,8 @@ import org.komodo.spi.repository.Repository.UnitOfWork; import org.komodo.test.utils.TestUtilities; import org.modeshape.jcr.ModeShapeLexicon; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; /** * @@ -147,7 +147,7 @@ protected void loadVdbs() throws Exception { } protected List loadSampleSearches() throws Exception { - List searchNames = new ArrayList<>(); + List searchNames = new ArrayList(); Repository repository = _restApp.getDefaultRepository(); final SynchronousCallback callback = new SynchronousCallback(); diff --git a/server/komodo-rest/src/test/java/org/komodo/rest/relational/KomodoSearchServiceTest.java b/server/komodo-rest/src/test/java/org/komodo/rest/relational/KomodoSearchServiceTest.java index 7d5538ae..ce949e36 100644 --- a/server/komodo-rest/src/test/java/org/komodo/rest/relational/KomodoSearchServiceTest.java +++ b/server/komodo-rest/src/test/java/org/komodo/rest/relational/KomodoSearchServiceTest.java @@ -24,8 +24,8 @@ import org.komodo.spi.repository.KomodoType; import org.komodo.spi.repository.Repository; import org.komodo.spi.repository.Repository.UnitOfWork; -import org.modeshape.sequencer.ddl.dialect.teiid.TeiidDdlLexicon; -import org.modeshape.sequencer.teiid.lexicon.VdbLexicon; +import org.teiid.modeshape.sequencer.ddl.TeiidDdlLexicon; +import org.teiid.modeshape.sequencer.vdb.lexicon.VdbLexicon; @SuppressWarnings( {"javadoc", "nls"} ) public final class KomodoSearchServiceTest extends AbstractKomodoServiceTest { diff --git a/server/komodo-rest/src/test/java/org/komodo/rest/relational/RestVdbPermissionTest.java b/server/komodo-rest/src/test/java/org/komodo/rest/relational/RestVdbPermissionTest.java index 7bea7f71..a54ab6a7 100644 --- a/server/komodo-rest/src/test/java/org/komodo/rest/relational/RestVdbPermissionTest.java +++ b/server/komodo-rest/src/test/java/org/komodo/rest/relational/RestVdbPermissionTest.java @@ -28,9 +28,9 @@ public final class RestVdbPermissionTest { private static final boolean ALLOW_READ = true; private static final boolean ALLOW_UPDATE = true; - private static final List CONDITIONS = new ArrayList<>(); + private static final List CONDITIONS = new ArrayList(); - private static final List MASKS = new ArrayList<>(); + private static final List MASKS = new ArrayList(); static { RestVdbCondition condition1 = new RestVdbCondition(); diff --git a/server/komodo-rest/src/test/java/org/komodo/rest/relational/RestVdbTranslatorTest.java b/server/komodo-rest/src/test/java/org/komodo/rest/relational/RestVdbTranslatorTest.java index 12b9dadb..1e75b36c 100644 --- a/server/komodo-rest/src/test/java/org/komodo/rest/relational/RestVdbTranslatorTest.java +++ b/server/komodo-rest/src/test/java/org/komodo/rest/relational/RestVdbTranslatorTest.java @@ -24,7 +24,7 @@ public final class RestVdbTranslatorTest { private static final String NAME = "MyTranslator"; private static final String TYPE = "oracle"; - private static final List PROPS = new ArrayList<>(); + private static final List PROPS = new ArrayList(); static { PROPS.add(new RestProperty("larry", "bird")); PROPS.add(new RestProperty("magic", "johnson")); @@ -104,7 +104,7 @@ public void shouldNotBeEqualWhenPropertiesAreDifferent() { thatTranslator.setDescription( this.translator.getDescription() ); thatTranslator.setLinks( this.translator.getLinks() ); - List props = new ArrayList<>(); + List props = new ArrayList(); props.addAll(this.translator.getProperties() ); props.add(new RestProperty("blah", "blah" )); thatTranslator.setProperties( props ); @@ -141,7 +141,7 @@ public void shouldSetName() { @Test public void shouldSetProperties() { - List newProperties = new ArrayList<>(); + List newProperties = new ArrayList(); newProperties.add(new RestProperty("blah", "blah" )); this.translator.setProperties( newProperties ); assertThat( this.translator.getProperties().size(), is( newProperties.size() ) ); diff --git a/server/komodo-rest/src/test/java/org/komodo/rest/relational/json/VdbTranslatorSerializerTest.java b/server/komodo-rest/src/test/java/org/komodo/rest/relational/json/VdbTranslatorSerializerTest.java index 5ceca5cd..fe9fcc8d 100644 --- a/server/komodo-rest/src/test/java/org/komodo/rest/relational/json/VdbTranslatorSerializerTest.java +++ b/server/komodo-rest/src/test/java/org/komodo/rest/relational/json/VdbTranslatorSerializerTest.java @@ -34,7 +34,7 @@ public final class VdbTranslatorSerializerTest extends AbstractSerializerTest { private static final String TYPE = "oracle"; private static final String[] PROPS_KEYS = {"larry", "magic", "michael"}; private static final String[] PROPS_VALUES = {"bird", "johnson", "jordan"}; - private static final List PROPS = new ArrayList<>(); + private static final List PROPS = new ArrayList(); static { for (int i = 0; i < PROPS_KEYS.length; ++i) { PROPS.add(new RestProperty(PROPS_KEYS[i], PROPS_VALUES[i]));