Repository: atlas Updated Branches: refs/heads/ATLAS-2251 d511b2888 -> 0a00dcb1a
http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/typesystem/src/test/resources/users-credentials.properties ---------------------------------------------------------------------- diff --git a/typesystem/src/test/resources/users-credentials.properties b/typesystem/src/test/resources/users-credentials.properties deleted file mode 100644 index 3fc3bb1..0000000 --- a/typesystem/src/test/resources/users-credentials.properties +++ /dev/null @@ -1,3 +0,0 @@ -#username=group::sha256-password -admin=ADMIN::8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918 -rangertagsync=RANGER_TAG_SYNC::e3f67240f5117d1753c940dae9eea772d36ed5fe9bd9c94a300e40413f1afb9d http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/webapp/pom.xml b/webapp/pom.xml index 782c280..569e06f 100755 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -88,11 +88,6 @@ <dependency> <groupId>org.apache.atlas</groupId> - <artifactId>atlas-typesystem</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.atlas</groupId> <artifactId>atlas-repository</artifactId> </dependency> @@ -262,11 +257,6 @@ </dependency> <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - - <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-jsp</artifactId> </dependency> @@ -390,13 +380,6 @@ <dependency> <groupId>org.apache.atlas</groupId> - <artifactId>atlas-typesystem</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.atlas</groupId> <artifactId>atlas-intg</artifactId> <classifier>tests</classifier> <scope>test</scope> @@ -638,7 +621,7 @@ </systemProperty> <systemProperty> <key>atlas.conf</key> - <value>${project.build.directory}/../../typesystem/target/test-classes</value> + <value>${project.build.directory}/../../intg/target/test-classes</value> </systemProperty> </systemProperties> <stopKey>atlas-stop</stopKey> @@ -665,11 +648,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>net.alchim31.maven</groupId> - <artifactId>scala-maven-plugin</artifactId> - <version>3.2.0</version> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/webapp/src/main/java/org/apache/atlas/classification/InterfaceAudience.java ---------------------------------------------------------------------- diff --git a/webapp/src/main/java/org/apache/atlas/classification/InterfaceAudience.java b/webapp/src/main/java/org/apache/atlas/classification/InterfaceAudience.java new file mode 100755 index 0000000..ae162ac --- /dev/null +++ b/webapp/src/main/java/org/apache/atlas/classification/InterfaceAudience.java @@ -0,0 +1,48 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.atlas.classification; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +/** + * Annotation to mark methods for consumption. + */ +@InterfaceAudience.Public +public class InterfaceAudience { + private InterfaceAudience() { + } + + @Documented + @Retention(RetentionPolicy.RUNTIME) + public @interface Private { + } + + @Documented + @Retention(RetentionPolicy.RUNTIME) + public @interface LimitedPrivate { + String[] value(); + } + + @Documented + @Retention(RetentionPolicy.RUNTIME) + public @interface Public { + } +} http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/webapp/src/main/java/org/apache/atlas/examples/QuickStart.java ---------------------------------------------------------------------- diff --git a/webapp/src/main/java/org/apache/atlas/examples/QuickStart.java b/webapp/src/main/java/org/apache/atlas/examples/QuickStart.java index 5362084..0e2d32d 100755 --- a/webapp/src/main/java/org/apache/atlas/examples/QuickStart.java +++ b/webapp/src/main/java/org/apache/atlas/examples/QuickStart.java @@ -20,8 +20,6 @@ package org.apache.atlas.examples; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import org.apache.atlas.ApplicationProperties; import org.apache.atlas.AtlasClient; import org.apache.atlas.AtlasErrorCode; @@ -161,7 +159,7 @@ public class QuickStart { attrDef("dataType", AtlasBaseTypeDef.ATLAS_TYPE_STRING), attrDef("comment", AtlasBaseTypeDef.ATLAS_TYPE_STRING)); ClassTypeDefinition tblClsDef = TypesUtil - .createClassTypeDef(TABLE_TYPE, TABLE_TYPE, ImmutableSet.of("DataSet"), + .createClassTypeDef(TABLE_TYPE, TABLE_TYPE, Collections.singleton("DataSet"), new AttributeDefinition(DB_ATTRIBUTE, DATABASE_TYPE, Multiplicity.REQUIRED, false, null), new AttributeDefinition("sd", STORAGE_DESC_TYPE, Multiplicity.REQUIRED, true, null), attrDef("owner", AtlasBaseTypeDef.ATLAS_TYPE_STRING), attrDef("createTime", AtlasBaseTypeDef.ATLAS_TYPE_LONG), @@ -173,7 +171,7 @@ public class QuickStart { Multiplicity.COLLECTION, true, null)); ClassTypeDefinition loadProcessClsDef = TypesUtil - .createClassTypeDef(LOAD_PROCESS_TYPE, LOAD_PROCESS_TYPE, ImmutableSet.of("Process"), + .createClassTypeDef(LOAD_PROCESS_TYPE, LOAD_PROCESS_TYPE, Collections.singleton("Process"), attrDef("userName", AtlasBaseTypeDef.ATLAS_TYPE_STRING), attrDef("startTime", AtlasBaseTypeDef.ATLAS_TYPE_LONG), attrDef("endTime", AtlasBaseTypeDef.ATLAS_TYPE_LONG), attrDef("queryText", AtlasBaseTypeDef.ATLAS_TYPE_STRING, Multiplicity.REQUIRED), @@ -182,7 +180,7 @@ public class QuickStart { attrDef("queryGraph", AtlasBaseTypeDef.ATLAS_TYPE_STRING, Multiplicity.REQUIRED)); ClassTypeDefinition viewClsDef = TypesUtil - .createClassTypeDef(VIEW_TYPE, VIEW_TYPE, ImmutableSet.of("DataSet"), + .createClassTypeDef(VIEW_TYPE, VIEW_TYPE, Collections.singleton("DataSet"), new AttributeDefinition("db", DATABASE_TYPE, Multiplicity.REQUIRED, false, null), new AttributeDefinition("inputTables", AtlasBaseTypeDef.getArrayTypeName(TABLE_TYPE), Multiplicity.COLLECTION, false, null)); @@ -229,35 +227,31 @@ public class QuickStart { rawStorageDescriptor("hdfs://host:8000/apps/warehouse/sales", "TextInputFormat", "TextOutputFormat", true); - List<Referenceable> salesFactColumns = ImmutableList - .of(rawColumn(TIME_ID_COLUMN, "int", "time id"), rawColumn("product_id", "int", "product id"), + List<Referenceable> salesFactColumns = Arrays.asList(rawColumn(TIME_ID_COLUMN, "int", "time id"), rawColumn("product_id", "int", "product id"), rawColumn("customer_id", "int", "customer id", "PII_v1"), rawColumn("sales", "double", "product id", "Metric_v1")); - List<Referenceable> logFactColumns = ImmutableList - .of(rawColumn("time_id", "int", "time id"), rawColumn("app_id", "int", "app id"), + List<Referenceable> logFactColumns = Arrays.asList(rawColumn("time_id", "int", "time id"), rawColumn("app_id", "int", "app id"), rawColumn("machine_id", "int", "machine id"), rawColumn("log", "string", "log data", "Log Data_v1")); Id salesFact = table(SALES_FACT_TABLE, SALES_FACT_TABLE_DESCRIPTION, salesDB, sd, "Joe", "Managed", salesFactColumns, FACT_TRAIT); - List<Referenceable> productDimColumns = ImmutableList - .of(rawColumn("product_id", "int", "product id"), rawColumn("product_name", "string", "product name"), + List<Referenceable> productDimColumns = Arrays.asList(rawColumn("product_id", "int", "product id"), rawColumn("product_name", "string", "product name"), rawColumn("brand_name", "int", "brand name")); Id productDim = table(PRODUCT_DIM_TABLE, "product dimension table", salesDB, sd, "John Doe", "Managed", productDimColumns, "Dimension_v1"); - List<Referenceable> timeDimColumns = ImmutableList - .of(rawColumn("time_id", "int", "time id"), rawColumn("dayOfYear", "int", "day Of Year"), + List<Referenceable> timeDimColumns = Arrays.asList(rawColumn("time_id", "int", "time id"), rawColumn("dayOfYear", "int", "day Of Year"), rawColumn("weekDay", "int", "week Day")); Id timeDim = table(TIME_DIM_TABLE, "time dimension table", salesDB, sd, "John Doe", "External", timeDimColumns, "Dimension_v1"); - List<Referenceable> customerDimColumns = ImmutableList.of(rawColumn("customer_id", "int", "customer id", "PII_v1"), + List<Referenceable> customerDimColumns = Arrays.asList(rawColumn("customer_id", "int", "customer id", "PII_v1"), rawColumn("name", "string", "customer name", "PII_v1"), rawColumn("address", "string", "customer address", "PII_v1")); @@ -280,26 +274,26 @@ public class QuickStart { logFactColumns, "Log Data_v1"); loadProcess(LOAD_SALES_DAILY_PROCESS, LOAD_SALES_DAILY_PROCESS_DESCRIPTION, "John ETL", - ImmutableList.of(salesFact, timeDim), - ImmutableList.of(salesFactDaily), "create table as select ", "plan", "id", "graph", "ETL_v1"); + Arrays.asList(salesFact, timeDim), + Collections.singletonList(salesFactDaily), "create table as select ", "plan", "id", "graph", "ETL_v1"); - view(PRODUCT_DIM_VIEW, reportingDB, ImmutableList.of(productDim), "Dimension_v1", "JdbcAccess_v1"); + view(PRODUCT_DIM_VIEW, reportingDB, Collections.singletonList(productDim), "Dimension_v1", "JdbcAccess_v1"); - view("customer_dim_view", reportingDB, ImmutableList.of(customerDim), "Dimension_v1", "JdbcAccess_v1"); + view("customer_dim_view", reportingDB, Collections.singletonList(customerDim), "Dimension_v1", "JdbcAccess_v1"); Id salesFactMonthly = table("sales_fact_monthly_mv", "sales fact monthly materialized view", reportingDB, sd, "Jane BI", "Managed", salesFactColumns, "Metric_v1"); - loadProcess("loadSalesMonthly", "hive query for monthly summary", "John ETL", ImmutableList.of(salesFactDaily), - ImmutableList.of(salesFactMonthly), "create table as select ", "plan", "id", "graph", "ETL_v1"); + loadProcess("loadSalesMonthly", "hive query for monthly summary", "John ETL", Collections.singletonList(salesFactDaily), + Collections.singletonList(salesFactMonthly), "create table as select ", "plan", "id", "graph", "ETL_v1"); Id loggingFactMonthly = table("logging_fact_monthly_mv", "logging fact monthly materialized view", logDB, sd, "Tim ETL", "Managed", logFactColumns, "Log Data_v1"); - loadProcess("loadLogsMonthly", "hive query for monthly summary", "Tim ETL", ImmutableList.of(loggingFactDaily), - ImmutableList.of(loggingFactMonthly), "create table as select ", "plan", "id", "graph", "ETL_v1"); + loadProcess("loadLogsMonthly", "hive query for monthly summary", "Tim ETL", Collections.singletonList(loggingFactDaily), + Collections.singletonList(loggingFactMonthly), "create table as select ", "plan", "id", "graph", "ETL_v1"); } private Id createInstance(Referenceable referenceable) throws Exception { http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/webapp/src/main/java/org/apache/atlas/examples/QuickStartV2.java ---------------------------------------------------------------------- diff --git a/webapp/src/main/java/org/apache/atlas/examples/QuickStartV2.java b/webapp/src/main/java/org/apache/atlas/examples/QuickStartV2.java index a95fac3..a338ae2 100755 --- a/webapp/src/main/java/org/apache/atlas/examples/QuickStartV2.java +++ b/webapp/src/main/java/org/apache/atlas/examples/QuickStartV2.java @@ -19,8 +19,6 @@ package org.apache.atlas.examples; import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import com.sun.jersey.core.util.MultivaluedMapImpl; import org.apache.atlas.ApplicationProperties; import org.apache.atlas.AtlasClient; @@ -53,11 +51,7 @@ import org.apache.commons.configuration.Configuration; import org.apache.commons.lang.ArrayUtils; import javax.ws.rs.core.MultivaluedMap; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import static org.apache.atlas.model.typedef.AtlasStructDef.AtlasConstraintDef.CONSTRAINT_PARAM_ATTRIBUTE; import static org.apache.atlas.model.typedef.AtlasStructDef.AtlasConstraintDef.CONSTRAINT_TYPE_INVERSE_REF; @@ -218,7 +212,7 @@ public class QuickStartV2 { colType.setOptions(new HashMap<String, String>() {{ put("schemaAttributes", "[\"name\", \"description\", \"owner\", \"type\", \"comment\", \"position\"]"); }}); - AtlasEntityDef tblType = AtlasTypeUtil.createClassTypeDef(TABLE_TYPE, TABLE_TYPE, "1.0", ImmutableSet.of("DataSet"), + AtlasEntityDef tblType = AtlasTypeUtil.createClassTypeDef(TABLE_TYPE, TABLE_TYPE, "1.0", Collections.singleton("DataSet"), AtlasTypeUtil.createRequiredAttrDef("db", DATABASE_TYPE), AtlasTypeUtil.createRequiredAttrDefWithConstraint("sd", STORAGE_DESC_TYPE, CONSTRAINT_TYPE_OWNED_REF, null), AtlasTypeUtil.createOptionalAttrDef("owner", "string"), @@ -234,7 +228,7 @@ public class QuickStartV2 { tblType.setOptions(new HashMap<String, String>() {{ put("schemaElementsAttribute", "columns"); }}); - AtlasEntityDef procType = AtlasTypeUtil.createClassTypeDef(LOAD_PROCESS_TYPE, LOAD_PROCESS_TYPE, "1.0", ImmutableSet.of("Process"), + AtlasEntityDef procType = AtlasTypeUtil.createClassTypeDef(LOAD_PROCESS_TYPE, LOAD_PROCESS_TYPE, "1.0", Collections.singleton("Process"), AtlasTypeUtil.createOptionalAttrDef("userName", "string"), AtlasTypeUtil.createOptionalAttrDef("startTime", "long"), AtlasTypeUtil.createOptionalAttrDef("endTime", "long"), @@ -243,22 +237,22 @@ public class QuickStartV2 { AtlasTypeUtil.createRequiredAttrDef("queryId", "string"), AtlasTypeUtil.createRequiredAttrDef("queryGraph", "string")); - AtlasEntityDef viewType = AtlasTypeUtil.createClassTypeDef(VIEW_TYPE, VIEW_TYPE, "1.0", ImmutableSet.of("DataSet"), + AtlasEntityDef viewType = AtlasTypeUtil.createClassTypeDef(VIEW_TYPE, VIEW_TYPE, "1.0", Collections.singleton("DataSet"), AtlasTypeUtil.createRequiredAttrDef("db", DATABASE_TYPE), AtlasTypeUtil.createOptionalListAttrDef("inputTables", AtlasBaseTypeDef.getArrayTypeName(TABLE_TYPE))); - AtlasClassificationDef dimClassifDef = AtlasTypeUtil.createTraitTypeDef(DIMENSION_CLASSIFICATION, "Dimension Classification", "1.0", ImmutableSet.<String>of()); - AtlasClassificationDef factClassifDef = AtlasTypeUtil.createTraitTypeDef(FACT_CLASSIFICATION, "Fact Classification", "1.0", ImmutableSet.<String>of()); - AtlasClassificationDef piiClassifDef = AtlasTypeUtil.createTraitTypeDef(PII_CLASSIFICATION, "PII Classification", "1.0", ImmutableSet.<String>of()); - AtlasClassificationDef metricClassifDef = AtlasTypeUtil.createTraitTypeDef(METRIC_CLASSIFICATION, "Metric Classification", "1.0", ImmutableSet.<String>of()); - AtlasClassificationDef etlClassifDef = AtlasTypeUtil.createTraitTypeDef(ETL_CLASSIFICATION, "ETL Classification", "1.0", ImmutableSet.<String>of()); - AtlasClassificationDef jdbcClassifDef = AtlasTypeUtil.createTraitTypeDef(JDBC_CLASSIFICATION, "JdbcAccess Classification", "1.0", ImmutableSet.<String>of()); - AtlasClassificationDef logClassifDef = AtlasTypeUtil.createTraitTypeDef(LOGDATA_CLASSIFICATION, "LogData Classification", "1.0", ImmutableSet.<String>of()); - - return AtlasTypeUtil.getTypesDef(ImmutableList.<AtlasEnumDef>of(), - ImmutableList.<AtlasStructDef>of(), - ImmutableList.of(dimClassifDef, factClassifDef, piiClassifDef, metricClassifDef, etlClassifDef, jdbcClassifDef, logClassifDef), - ImmutableList.of(dbType, sdType, colType, tblType, procType, viewType)); + AtlasClassificationDef dimClassifDef = AtlasTypeUtil.createTraitTypeDef(DIMENSION_CLASSIFICATION, "Dimension Classification", "1.0", Collections.<String>emptySet()); + AtlasClassificationDef factClassifDef = AtlasTypeUtil.createTraitTypeDef(FACT_CLASSIFICATION, "Fact Classification", "1.0", Collections.<String>emptySet()); + AtlasClassificationDef piiClassifDef = AtlasTypeUtil.createTraitTypeDef(PII_CLASSIFICATION, "PII Classification", "1.0", Collections.<String>emptySet()); + AtlasClassificationDef metricClassifDef = AtlasTypeUtil.createTraitTypeDef(METRIC_CLASSIFICATION, "Metric Classification", "1.0", Collections.<String>emptySet()); + AtlasClassificationDef etlClassifDef = AtlasTypeUtil.createTraitTypeDef(ETL_CLASSIFICATION, "ETL Classification", "1.0", Collections.<String>emptySet()); + AtlasClassificationDef jdbcClassifDef = AtlasTypeUtil.createTraitTypeDef(JDBC_CLASSIFICATION, "JdbcAccess Classification", "1.0", Collections.<String>emptySet()); + AtlasClassificationDef logClassifDef = AtlasTypeUtil.createTraitTypeDef(LOGDATA_CLASSIFICATION, "LogData Classification", "1.0", Collections.<String>emptySet()); + + return AtlasTypeUtil.getTypesDef(Collections.<AtlasEnumDef>emptyList(), + Collections.<AtlasStructDef>emptyList(), + Arrays.asList(dimClassifDef, factClassifDef, piiClassifDef, metricClassifDef, etlClassifDef, jdbcClassifDef, logClassifDef), + Arrays.asList(dbType, sdType, colType, tblType, procType, viewType)); } void createEntities() throws Exception { @@ -273,25 +267,25 @@ public class QuickStartV2 { AtlasEntity storageDesc = createStorageDescriptor("hdfs://host:8000/apps/warehouse/sales", "TextInputFormat", "TextOutputFormat", true); // Column entities - List<AtlasEntity> salesFactColumns = ImmutableList.of(createColumn(TIME_ID_COLUMN, "int", "time id"), + List<AtlasEntity> salesFactColumns = Arrays.asList(createColumn(TIME_ID_COLUMN, "int", "time id"), createColumn(PRODUCT_ID_COLUMN, "int", "product id"), createColumn(CUSTOMER_ID_COLUMN, "int", "customer id", PII_CLASSIFICATION), createColumn(SALES_COLUMN, "double", "product id", METRIC_CLASSIFICATION)); - List<AtlasEntity> logFactColumns = ImmutableList.of(createColumn(TIME_ID_COLUMN, "int", "time id"), + List<AtlasEntity> logFactColumns = Arrays.asList(createColumn(TIME_ID_COLUMN, "int", "time id"), createColumn(APP_ID_COLUMN, "int", "app id"), createColumn(MACHINE_ID_COLUMN, "int", "machine id"), createColumn(LOG_COLUMN, "string", "log data", LOGDATA_CLASSIFICATION)); - List<AtlasEntity> productDimColumns = ImmutableList.of(createColumn(PRODUCT_ID_COLUMN, "int", "product id"), + List<AtlasEntity> productDimColumns = Arrays.asList(createColumn(PRODUCT_ID_COLUMN, "int", "product id"), createColumn(PRODUCT_NAME_COLUMN, "string", "product name"), createColumn(BRAND_NAME_COLUMN, "int", "brand name")); - List<AtlasEntity> timeDimColumns = ImmutableList.of(createColumn(TIME_ID_COLUMN, "int", "time id"), + List<AtlasEntity> timeDimColumns = Arrays.asList(createColumn(TIME_ID_COLUMN, "int", "time id"), createColumn(DAY_OF_YEAR_COLUMN, "int", "day Of Year"), createColumn(WEEKDAY_COLUMN, "int", "week Day")); - List<AtlasEntity> customerDimColumns = ImmutableList.of(createColumn(CUSTOMER_ID_COLUMN, "int", "customer id", PII_CLASSIFICATION), + List<AtlasEntity> customerDimColumns = Arrays.asList(createColumn(CUSTOMER_ID_COLUMN, "int", "customer id", PII_CLASSIFICATION), createColumn(NAME_COLUMN, "string", "customer name", PII_CLASSIFICATION), createColumn(ADDRESS_COLUMN, "string", "customer address", PII_CLASSIFICATION)); @@ -314,23 +308,23 @@ public class QuickStartV2 { storageDesc, "Jane BI", "Managed", salesFactColumns, METRIC_CLASSIFICATION); // View entities - createView(PRODUCT_DIM_VIEW, reportingDB, ImmutableList.of(productDim), DIMENSION_CLASSIFICATION, JDBC_CLASSIFICATION); - createView(CUSTOMER_DIM_VIEW, reportingDB, ImmutableList.of(customerDim), DIMENSION_CLASSIFICATION, JDBC_CLASSIFICATION); + createView(PRODUCT_DIM_VIEW, reportingDB, Collections.singletonList(productDim), DIMENSION_CLASSIFICATION, JDBC_CLASSIFICATION); + createView(CUSTOMER_DIM_VIEW, reportingDB, Collections.singletonList(customerDim), DIMENSION_CLASSIFICATION, JDBC_CLASSIFICATION); // Process entities createProcess(LOAD_SALES_DAILY_PROCESS, "hive query for daily summary", "John ETL", - ImmutableList.of(salesFact, timeDim), - ImmutableList.of(salesFactDaily), + Arrays.asList(salesFact, timeDim), + Collections.singletonList(salesFactDaily), "create table as select ", "plan", "id", "graph", ETL_CLASSIFICATION); createProcess(LOAD_SALES_MONTHLY_PROCESS, "hive query for monthly summary", "John ETL", - ImmutableList.of(salesFactDaily), - ImmutableList.of(salesFactMonthly), + Collections.singletonList(salesFactDaily), + Collections.singletonList(salesFactMonthly), "create table as select ", "plan", "id", "graph", ETL_CLASSIFICATION); createProcess(LOAD_LOGS_MONTHLY_PROCESS, "hive query for monthly summary", "Tim ETL", - ImmutableList.of(loggingFactDaily), - ImmutableList.of(loggingFactMonthly), + Collections.singletonList(loggingFactDaily), + Collections.singletonList(loggingFactMonthly), "create table as select ", "plan", "id", "graph", ETL_CLASSIFICATION); } @@ -364,7 +358,7 @@ public class QuickStartV2 { private List<AtlasClassification> toAtlasClassifications(String[] traitNames) { List<AtlasClassification> ret = new ArrayList<>(); - ImmutableList<String> traits = ImmutableList.copyOf(traitNames); + List<String> traits = Arrays.asList(traitNames); if (CollectionUtils.isNotEmpty(traits)) { for (String trait : traits) { http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/webapp/src/main/java/org/apache/atlas/web/service/ActiveInstanceState.java ---------------------------------------------------------------------- diff --git a/webapp/src/main/java/org/apache/atlas/web/service/ActiveInstanceState.java b/webapp/src/main/java/org/apache/atlas/web/service/ActiveInstanceState.java index c6b4a6f..ea8b738 100644 --- a/webapp/src/main/java/org/apache/atlas/web/service/ActiveInstanceState.java +++ b/webapp/src/main/java/org/apache/atlas/web/service/ActiveInstanceState.java @@ -33,10 +33,10 @@ import org.apache.zookeeper.data.Stat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import scala.actors.threadpool.Arrays; import javax.inject.Inject; import java.nio.charset.Charset; +import java.util.Arrays; import java.util.List; /** http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/webapp/src/test/java/org/apache/atlas/notification/EntityNotificationIT.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/notification/EntityNotificationIT.java b/webapp/src/test/java/org/apache/atlas/notification/EntityNotificationIT.java index 5baafeb..486b30b 100644 --- a/webapp/src/test/java/org/apache/atlas/notification/EntityNotificationIT.java +++ b/webapp/src/test/java/org/apache/atlas/notification/EntityNotificationIT.java @@ -18,7 +18,6 @@ package org.apache.atlas.notification; -import com.google.common.collect.ImmutableSet; import org.apache.atlas.AtlasClient; import org.apache.atlas.kafka.NotificationProvider; import org.apache.atlas.notification.NotificationInterface.NotificationType; @@ -32,9 +31,8 @@ import org.apache.atlas.type.AtlasType; import org.apache.atlas.v1.typesystem.types.utils.TypesUtil; import org.apache.atlas.web.integration.BaseResourceIT; import org.testng.annotations.BeforeClass; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; + +import java.util.*; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; @@ -181,7 +179,7 @@ public class EntityNotificationIT extends BaseResourceIT { // ----- helper methods --------------------------------------------------- private void createTrait(String traitName, String ... superTraitNames) throws Exception { - TraitTypeDefinition traitDef = TypesUtil.createTraitTypeDef(traitName, null, ImmutableSet.copyOf(superTraitNames)); + TraitTypeDefinition traitDef = TypesUtil.createTraitTypeDef(traitName, null, new HashSet<>(Arrays.asList(superTraitNames))); TypesDef typesDef = new TypesDef(Collections.<EnumTypeDefinition>emptyList(), Collections.<StructTypeDefinition>emptyList(), Collections.singletonList(traitDef), http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/webapp/src/test/java/org/apache/atlas/web/integration/BasicSearchIT.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/integration/BasicSearchIT.java b/webapp/src/test/java/org/apache/atlas/web/integration/BasicSearchIT.java index 5806a10..658be49 100644 --- a/webapp/src/test/java/org/apache/atlas/web/integration/BasicSearchIT.java +++ b/webapp/src/test/java/org/apache/atlas/web/integration/BasicSearchIT.java @@ -17,7 +17,6 @@ */ package org.apache.atlas.web.integration; -import com.google.common.collect.ImmutableSet; import org.apache.atlas.AtlasServiceException; import org.apache.atlas.model.discovery.AtlasSearchResult; import org.apache.atlas.model.discovery.SearchParameters; @@ -39,6 +38,7 @@ import org.testng.annotations.Test; import java.io.IOException; import java.net.URLEncoder; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE; @@ -61,7 +61,7 @@ public class BasicSearchIT extends BaseResourceIT { // Create a test tag if (!atlasClientV2.typeWithNameExists("fooTag")) { - AtlasClassificationDef testClassificationDef = AtlasTypeUtil.createTraitTypeDef("fooTag", "Test tag", "1.0", ImmutableSet.<String>of()); + AtlasClassificationDef testClassificationDef = AtlasTypeUtil.createTraitTypeDef("fooTag", "Test tag", "1.0", Collections.<String>emptySet()); AtlasTypesDef typesDef = new AtlasTypesDef(); typesDef.getClassificationDefs().add(testClassificationDef); atlasClientV2.createAtlasTypeDefs(typesDef); http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/webapp/src/test/java/org/apache/atlas/web/integration/DataSetLineageJerseyResourceIT.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/integration/DataSetLineageJerseyResourceIT.java b/webapp/src/test/java/org/apache/atlas/web/integration/DataSetLineageJerseyResourceIT.java index 6fdbcfa..7e50480 100644 --- a/webapp/src/test/java/org/apache/atlas/web/integration/DataSetLineageJerseyResourceIT.java +++ b/webapp/src/test/java/org/apache/atlas/web/integration/DataSetLineageJerseyResourceIT.java @@ -18,8 +18,6 @@ package org.apache.atlas.web.integration; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import org.apache.atlas.AtlasClient; import org.apache.atlas.AtlasServiceException; import org.apache.atlas.v1.model.instance.Id; @@ -34,6 +32,8 @@ import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -186,31 +186,25 @@ public class DataSetLineageJerseyResourceIT extends BaseResourceIT { } private void setupInstances() throws Exception { - TraitTypeDefinition factTrait = - TypesUtil.createTraitTypeDef(FACT, null, ImmutableSet.<String>of()); - TraitTypeDefinition etlTrait = - TypesUtil.createTraitTypeDef(ETL, null, ImmutableSet.<String>of()); - TraitTypeDefinition dimensionTrait = - TypesUtil.createTraitTypeDef(DIMENSION, null, ImmutableSet.<String>of()); - TraitTypeDefinition metricTrait = - TypesUtil.createTraitTypeDef(METRIC, null, ImmutableSet.<String>of()); - createType(getTypesDef(null, null, - ImmutableList.of(factTrait, etlTrait, dimensionTrait, metricTrait), null)); + TraitTypeDefinition factTrait = TypesUtil.createTraitTypeDef(FACT, null, Collections.<String>emptySet()); + TraitTypeDefinition etlTrait = TypesUtil.createTraitTypeDef(ETL, null, Collections.<String>emptySet()); + TraitTypeDefinition dimensionTrait = TypesUtil.createTraitTypeDef(DIMENSION, null, Collections.<String>emptySet()); + TraitTypeDefinition metricTrait = TypesUtil.createTraitTypeDef(METRIC, null, Collections.<String>emptySet()); + + createType(getTypesDef(null, null, Arrays.asList(factTrait, etlTrait, dimensionTrait, metricTrait), null)); salesDBName = "Sales" + randomString(); Id salesDB = database(salesDBName, "Sales Database", "John ETL", "hdfs://host:8000/apps/warehouse/sales"); - List<Referenceable> salesFactColumns = ImmutableList - .of(column("time_id", "int", "time id"), column("product_id", "int", "product id"), + List<Referenceable> salesFactColumns = Arrays.asList(column("time_id", "int", "time id"), column("product_id", "int", "product id"), column("customer_id", "int", "customer id", PII), column("sales", "double", "product id", METRIC)); salesFactTable = "sales_fact" + randomString(); Id salesFact = table(salesFactTable, "sales fact table", salesDB, "Joe", "MANAGED", salesFactColumns, FACT); - List<Referenceable> timeDimColumns = ImmutableList - .of(column("time_id", "int", "time id"), column("dayOfYear", "int", "day Of Year"), + List<Referenceable> timeDimColumns = Arrays.asList(column("time_id", "int", "time id"), column("dayOfYear", "int", "day Of Year"), column("weekDay", "int", "week Day")); Id timeDim = @@ -225,16 +219,16 @@ public class DataSetLineageJerseyResourceIT extends BaseResourceIT { table("sales_fact_daily_mv" + randomString(), "sales fact daily materialized view", reportingDB, "Joe BI", "MANAGED", salesFactColumns, METRIC); - loadProcess("loadSalesDaily" + randomString(), "John ETL", ImmutableList.of(salesFact, timeDim), - ImmutableList.of(salesFactDaily), "create table as select ", "plan", "id", "graph", ETL); + loadProcess("loadSalesDaily" + randomString(), "John ETL", Arrays.asList(salesFact, timeDim), + Collections.singletonList(salesFactDaily), "create table as select ", "plan", "id", "graph", ETL); salesMonthlyTable = "sales_fact_monthly_mv" + randomString(); Id salesFactMonthly = table(salesMonthlyTable, "sales fact monthly materialized view", reportingDB, "Jane BI", "MANAGED", salesFactColumns, METRIC); - loadProcess("loadSalesMonthly" + randomString(), "John ETL", ImmutableList.of(salesFactDaily), - ImmutableList.of(salesFactMonthly), "create table as select ", "plan", "id", "graph", ETL); + loadProcess("loadSalesMonthly" + randomString(), "John ETL", Collections.singletonList(salesFactDaily), + Collections.singletonList(salesFactMonthly), "create table as select ", "plan", "id", "graph", ETL); } Id database(String name, String description, String owner, String locationUri, String... traitNames) http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/webapp/src/test/java/org/apache/atlas/web/integration/EntityDiscoveryJerseyResourceIT.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/integration/EntityDiscoveryJerseyResourceIT.java b/webapp/src/test/java/org/apache/atlas/web/integration/EntityDiscoveryJerseyResourceIT.java index 6c5e086..75d3872 100755 --- a/webapp/src/test/java/org/apache/atlas/web/integration/EntityDiscoveryJerseyResourceIT.java +++ b/webapp/src/test/java/org/apache/atlas/web/integration/EntityDiscoveryJerseyResourceIT.java @@ -18,8 +18,6 @@ package org.apache.atlas.web.integration; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import com.sun.jersey.core.util.MultivaluedMapImpl; import org.apache.atlas.AtlasServiceException; import org.apache.atlas.model.discovery.AtlasSearchResult; @@ -34,6 +32,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import javax.ws.rs.core.MultivaluedMap; +import java.util.Collections; import java.util.List; import static org.testng.Assert.assertEquals; @@ -192,15 +191,15 @@ public class EntityDiscoveryJerseyResourceIT extends BaseResourceIT { private void createTypes() throws Exception { ClassTypeDefinition dslTestTypeDefinition = TypesUtil - .createClassTypeDef("dsl_test_type", null, ImmutableSet.<String>of(), + .createClassTypeDef("dsl_test_type", null, Collections.<String>emptySet(), TypesUtil.createUniqueRequiredAttrDef("name", AtlasBaseTypeDef.ATLAS_TYPE_STRING), TypesUtil.createRequiredAttrDef("description", AtlasBaseTypeDef.ATLAS_TYPE_STRING)); TraitTypeDefinition classificationTraitDefinition = TypesUtil - .createTraitTypeDef("Classification", null, ImmutableSet.<String>of(), + .createTraitTypeDef("Classification", null, Collections.<String>emptySet(), TypesUtil.createRequiredAttrDef("tag", AtlasBaseTypeDef.ATLAS_TYPE_STRING)); - TypesDef typesDef = new TypesDef(ImmutableList.<EnumTypeDefinition>of(), ImmutableList.<StructTypeDefinition>of(), - ImmutableList.of(classificationTraitDefinition), ImmutableList.of(dslTestTypeDefinition)); + TypesDef typesDef = new TypesDef(Collections.<EnumTypeDefinition>emptyList(), Collections.<StructTypeDefinition>emptyList(), + Collections.singletonList(classificationTraitDefinition), Collections.singletonList(dslTestTypeDefinition)); createType(typesDef); } } http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/webapp/src/test/java/org/apache/atlas/web/integration/EntityJerseyResourceIT.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/integration/EntityJerseyResourceIT.java b/webapp/src/test/java/org/apache/atlas/web/integration/EntityJerseyResourceIT.java index 147f6ee..0f585f9 100755 --- a/webapp/src/test/java/org/apache/atlas/web/integration/EntityJerseyResourceIT.java +++ b/webapp/src/test/java/org/apache/atlas/web/integration/EntityJerseyResourceIT.java @@ -18,8 +18,6 @@ package org.apache.atlas.web.integration; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.core.util.MultivaluedMapImpl; import org.apache.atlas.AtlasClient; @@ -49,12 +47,7 @@ import org.testng.annotations.Test; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import java.util.*; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; @@ -237,7 +230,7 @@ public class EntityJerseyResourceIT extends BaseResourceIT { public void testEntityDefinitionAcrossTypeUpdate() throws Exception { //create type ClassTypeDefinition typeDefinition = TypesUtil - .createClassTypeDef(randomString(), null, ImmutableSet.<String>of(), + .createClassTypeDef(randomString(), null, Collections.<String>emptySet(), TypesUtil.createUniqueRequiredAttrDef("name", AtlasBaseTypeDef.ATLAS_TYPE_STRING)); atlasClientV1.createType(AtlasType.toV1Json(typeDefinition)); @@ -247,12 +240,12 @@ public class EntityJerseyResourceIT extends BaseResourceIT { String guid = atlasClientV1.createEntity(instance).get(0); //update type - add attribute - typeDefinition = TypesUtil.createClassTypeDef(typeDefinition.getTypeName(), null, ImmutableSet.<String>of(), + typeDefinition = TypesUtil.createClassTypeDef(typeDefinition.getTypeName(), null, Collections.<String>emptySet(), TypesUtil.createUniqueRequiredAttrDef("name", AtlasBaseTypeDef.ATLAS_TYPE_STRING), TypesUtil.createOptionalAttrDef("description", AtlasBaseTypeDef.ATLAS_TYPE_STRING)); - TypesDef typeDef = new TypesDef(ImmutableList.<EnumTypeDefinition>of(), - ImmutableList.<StructTypeDefinition>of(), ImmutableList.<TraitTypeDefinition>of(), - ImmutableList.of(typeDefinition)); + TypesDef typeDef = new TypesDef(Collections.<EnumTypeDefinition>emptyList(), + Collections.<StructTypeDefinition>emptyList(), Collections.<TraitTypeDefinition>emptyList(), + Arrays.asList(typeDefinition)); atlasClientV1.updateType(typeDef); //Get definition after type update - new attributes should be null @@ -530,7 +523,7 @@ public class EntityJerseyResourceIT extends BaseResourceIT { private String addNewType() throws Exception { String typeName = "test" + randomString(); ClassTypeDefinition testTypeDefinition = TypesUtil - .createClassTypeDef(typeName, null, ImmutableSet.<String>of(), + .createClassTypeDef(typeName, null, Collections.<String>emptySet(), TypesUtil.createRequiredAttrDef("name", AtlasBaseTypeDef.ATLAS_TYPE_STRING), TypesUtil.createRequiredAttrDef("description", AtlasBaseTypeDef.ATLAS_TYPE_STRING)); @@ -578,7 +571,7 @@ public class EntityJerseyResourceIT extends BaseResourceIT { String traitName = "PII_Trait" + randomString(); TraitTypeDefinition piiTrait = - TypesUtil.createTraitTypeDef(traitName, null, ImmutableSet.<String>of()); + TypesUtil.createTraitTypeDef(traitName, null, Collections.<String>emptySet()); String traitDefinitionAsJSON = AtlasType.toV1Json(piiTrait); LOG.debug("traitDefinitionAsJSON = {}", traitDefinitionAsJSON); createType(traitDefinitionAsJSON); @@ -607,7 +600,7 @@ public class EntityJerseyResourceIT extends BaseResourceIT { String traitName = "PII_Trait" + randomString(); TraitTypeDefinition piiTrait = - TypesUtil.createTraitTypeDef(traitName, null, ImmutableSet.<String>of()); + TypesUtil.createTraitTypeDef(traitName, null, Collections.<String>emptySet()); String traitDefinitionAsJSON = AtlasType.toV1Json(piiTrait); LOG.debug("traitDefinitionAsJSON = {}", traitDefinitionAsJSON); createType(traitDefinitionAsJSON); @@ -641,7 +634,7 @@ public class EntityJerseyResourceIT extends BaseResourceIT { String traitName = "PII_Trait" + randomString(); TraitTypeDefinition piiTrait = - TypesUtil.createTraitTypeDef(traitName, null, ImmutableSet.<String>of()); + TypesUtil.createTraitTypeDef(traitName, null, Collections.<String>emptySet()); String traitDefinitionAsJSON = AtlasType.toV1Json(piiTrait); LOG.debug("traitDefinitionAsJSON = {}", traitDefinitionAsJSON); createType(traitDefinitionAsJSON); @@ -675,7 +668,7 @@ public class EntityJerseyResourceIT extends BaseResourceIT { final String traitName = "PII_Trait" + randomString(); TraitTypeDefinition piiTrait = TypesUtil - .createTraitTypeDef(traitName, null, ImmutableSet.<String>of(), + .createTraitTypeDef(traitName, null, Collections.<String>emptySet(), TypesUtil.createRequiredAttrDef("type", AtlasBaseTypeDef.ATLAS_TYPE_STRING)); String traitDefinitionAsJSON = AtlasType.toV1Json(piiTrait); LOG.debug("traitDefinitionAsJSON = {}", traitDefinitionAsJSON); @@ -698,7 +691,7 @@ public class EntityJerseyResourceIT extends BaseResourceIT { public void testAddTraitWithNoRegistration() throws Exception { final String traitName = "PII_Trait" + randomString(); TraitTypeDefinition piiTrait = - TypesUtil.createTraitTypeDef(traitName, null, ImmutableSet.<String>of()); + TypesUtil.createTraitTypeDef(traitName, null, Collections.<String>emptySet()); String traitDefinitionAsJSON = AtlasType.toV1Json(piiTrait); LOG.debug("traitDefinitionAsJSON = {}", traitDefinitionAsJSON); @@ -727,7 +720,7 @@ public class EntityJerseyResourceIT extends BaseResourceIT { String traitName = "PII_Trait" + randomString(); TraitTypeDefinition piiTrait = - TypesUtil.createTraitTypeDef(traitName, null, ImmutableSet.<String>of()); + TypesUtil.createTraitTypeDef(traitName, null, Collections.<String>emptySet()); String traitDefinitionAsJSON = AtlasType.toV1Json(piiTrait); LOG.debug("traitDefinitionAsJSON = {}", traitDefinitionAsJSON); createType(traitDefinitionAsJSON); @@ -787,7 +780,7 @@ public class EntityJerseyResourceIT extends BaseResourceIT { final String traitName = "PII_Trait" + randomString(); TraitTypeDefinition piiTrait = TypesUtil - .createTraitTypeDef(traitName, null, ImmutableSet.<String>of(), + .createTraitTypeDef(traitName, null, Collections.<String>emptySet(), TypesUtil.createRequiredAttrDef("type", AtlasBaseTypeDef.ATLAS_TYPE_STRING)); String traitDefinitionAsJSON = AtlasType.toV1Json(piiTrait); createType(traitDefinitionAsJSON); @@ -814,11 +807,11 @@ public class EntityJerseyResourceIT extends BaseResourceIT { String attrValue = random(); ClassTypeDefinition classTypeDefinition = TypesUtil - .createClassTypeDef(classType, null, ImmutableSet.<String>of(), + .createClassTypeDef(classType, null, Collections.<String>emptySet(), TypesUtil.createUniqueRequiredAttrDef(attrName, AtlasBaseTypeDef.ATLAS_TYPE_STRING)); - TypesDef typesDef = new TypesDef(ImmutableList.<EnumTypeDefinition>of(), ImmutableList.<StructTypeDefinition>of(), - ImmutableList.<TraitTypeDefinition>of(), - ImmutableList.of(classTypeDefinition)); + TypesDef typesDef = new TypesDef(Collections.<EnumTypeDefinition>emptyList(), Collections.<StructTypeDefinition>emptyList(), + Collections.<TraitTypeDefinition>emptyList(), + Collections.singletonList(classTypeDefinition)); createType(typesDef); Referenceable instance = new Referenceable(classType); http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/webapp/src/test/java/org/apache/atlas/web/integration/EntityLineageJerseyResourceIT.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/integration/EntityLineageJerseyResourceIT.java b/webapp/src/test/java/org/apache/atlas/web/integration/EntityLineageJerseyResourceIT.java index afd6da2..4be0002 100644 --- a/webapp/src/test/java/org/apache/atlas/web/integration/EntityLineageJerseyResourceIT.java +++ b/webapp/src/test/java/org/apache/atlas/web/integration/EntityLineageJerseyResourceIT.java @@ -18,13 +18,12 @@ package org.apache.atlas.web.integration; -import com.google.common.collect.ImmutableList; -import com.google.gson.Gson; import com.sun.jersey.core.util.MultivaluedMapImpl; import org.apache.atlas.AtlasBaseClient; import org.apache.atlas.AtlasClient; import org.apache.atlas.model.instance.AtlasEntityHeader; import org.apache.atlas.model.lineage.AtlasLineageInfo; +import org.apache.atlas.type.AtlasType; import org.apache.atlas.v1.model.instance.Id; import org.apache.atlas.v1.model.instance.Referenceable; import org.codehaus.jettison.json.JSONObject; @@ -34,9 +33,7 @@ import org.testng.annotations.Test; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; /** * Entity Lineage v2 Integration Tests. @@ -53,7 +50,6 @@ public class EntityLineageJerseyResourceIT extends DataSetLineageJerseyResourceI private String salesFactTable; private String salesMonthlyTable; private String salesDBName; - Gson gson = new Gson(); @BeforeClass public void setUp() throws Exception { @@ -76,7 +72,7 @@ public class EntityLineageJerseyResourceIT extends DataSetLineageJerseyResourceI System.out.println("input lineage info = " + response ); - AtlasLineageInfo inputLineageInfo = gson.fromJson(response.toString(), AtlasLineageInfo.class); + AtlasLineageInfo inputLineageInfo = AtlasType.fromJson(response.toString(), AtlasLineageInfo.class); Map<String, AtlasEntityHeader> entities = inputLineageInfo.getGuidEntityMap(); Assert.assertNotNull(entities); @@ -104,7 +100,7 @@ public class EntityLineageJerseyResourceIT extends DataSetLineageJerseyResourceI Assert.assertNotNull(response); System.out.println("output lineage info = " + response); - AtlasLineageInfo outputLineageInfo = gson.fromJson(response.toString(), AtlasLineageInfo.class); + AtlasLineageInfo outputLineageInfo = AtlasType.fromJson(response.toString(), AtlasLineageInfo.class); Map<String, AtlasEntityHeader> entities = outputLineageInfo.getGuidEntityMap(); Assert.assertNotNull(entities); @@ -132,7 +128,7 @@ public class EntityLineageJerseyResourceIT extends DataSetLineageJerseyResourceI Assert.assertNotNull(response); System.out.println("both lineage info = " + response); - AtlasLineageInfo bothLineageInfo = gson.fromJson(response.toString(), AtlasLineageInfo.class); + AtlasLineageInfo bothLineageInfo = AtlasType.fromJson(response.toString(), AtlasLineageInfo.class); Map<String, AtlasEntityHeader> entities = bothLineageInfo.getGuidEntityMap(); Assert.assertNotNull(entities); @@ -151,16 +147,14 @@ public class EntityLineageJerseyResourceIT extends DataSetLineageJerseyResourceI salesDBName = "Sales" + randomString(); Id salesDB = database(salesDBName, "Sales Database", "John ETL", "hdfs://host:8000/apps/warehouse/sales"); - List<Referenceable> salesFactColumns = ImmutableList - .of(column("time_id", "int", "time id"), column("product_id", "int", "product id"), - column("customer_id", "int", "customer id"), - column("sales", "double", "product id")); + List<Referenceable> salesFactColumns = Arrays.asList(column("time_id", "int", "time id"), column("product_id", "int", "product id"), + column("customer_id", "int", "customer id"), + column("sales", "double", "product id")); salesFactTable = "sales_fact" + randomString(); Id salesFact = table(salesFactTable, "sales fact table", salesDB, "Joe", "MANAGED", salesFactColumns); - List<Referenceable> timeDimColumns = ImmutableList - .of(column("time_id", "int", "time id"), column("dayOfYear", "int", "day Of Year"), + List<Referenceable> timeDimColumns = Arrays.asList(column("time_id", "int", "time id"), column("dayOfYear", "int", "day Of Year"), column("weekDay", "int", "week Day")); Id timeDim = @@ -175,15 +169,15 @@ public class EntityLineageJerseyResourceIT extends DataSetLineageJerseyResourceI table("sales_fact_daily_mv" + randomString(), "sales fact daily materialized view", reportingDB, "Joe BI", "MANAGED", salesFactColumns); - loadProcess("loadSalesDaily" + randomString(), "John ETL", ImmutableList.of(salesFact, timeDim), - ImmutableList.of(salesFactDaily), "create table as select ", "plan", "id", "graph"); + loadProcess("loadSalesDaily" + randomString(), "John ETL", Arrays.asList(salesFact, timeDim), + Collections.singletonList(salesFactDaily), "create table as select ", "plan", "id", "graph"); salesMonthlyTable = "sales_fact_monthly_mv" + randomString(); Id salesFactMonthly = table(salesMonthlyTable, "sales fact monthly materialized view", reportingDB, "Jane BI", "MANAGED", salesFactColumns); - loadProcess("loadSalesMonthly" + randomString(), "John ETL", ImmutableList.of(salesFactDaily), - ImmutableList.of(salesFactMonthly), "create table as select ", "plan", "id", "graph"); + loadProcess("loadSalesMonthly" + randomString(), "John ETL", Collections.singletonList(salesFactDaily), + Collections.singletonList(salesFactMonthly), "create table as select ", "plan", "id", "graph"); } } http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/webapp/src/test/java/org/apache/atlas/web/integration/EntityV2JerseyResourceIT.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/integration/EntityV2JerseyResourceIT.java b/webapp/src/test/java/org/apache/atlas/web/integration/EntityV2JerseyResourceIT.java index 4da8bb0..77a85f6 100755 --- a/webapp/src/test/java/org/apache/atlas/web/integration/EntityV2JerseyResourceIT.java +++ b/webapp/src/test/java/org/apache/atlas/web/integration/EntityV2JerseyResourceIT.java @@ -18,8 +18,6 @@ package org.apache.atlas.web.integration; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.sun.jersey.api.client.ClientResponse; import org.apache.atlas.AtlasClient; @@ -47,11 +45,8 @@ import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.apache.atlas.kafka.AtlasKafkaConsumer; +import java.util.*; + import static org.testng.Assert.*; @@ -188,7 +183,7 @@ public class EntityV2JerseyResourceIT extends BaseResourceIT { //create type AtlasEntityDef entityDef = AtlasTypeUtil .createClassTypeDef(randomString(), - ImmutableSet.<String>of(), + Collections.<String>emptySet(), AtlasTypeUtil.createUniqueRequiredAttrDef("name", "string") ); AtlasTypesDef typesDef = new AtlasTypesDef(); @@ -209,7 +204,7 @@ public class EntityV2JerseyResourceIT extends BaseResourceIT { String guid = mutationResponse.getEntitiesByOperation(EntityMutations.EntityOperation.CREATE).get(0).getGuid(); //update type - add attribute - entityDef = AtlasTypeUtil.createClassTypeDef(entityDef.getName(), ImmutableSet.<String>of(), + entityDef = AtlasTypeUtil.createClassTypeDef(entityDef.getName(), Collections.<String>emptySet(), AtlasTypeUtil.createUniqueRequiredAttrDef("name", "string"), AtlasTypeUtil.createOptionalAttrDef("description", "string")); @@ -362,7 +357,7 @@ public class EntityV2JerseyResourceIT extends BaseResourceIT { private String addNewType() throws Exception { String typeName = "test" + randomString(); AtlasEntityDef classTypeDef = AtlasTypeUtil - .createClassTypeDef(typeName, ImmutableSet.<String>of(), + .createClassTypeDef(typeName, Collections.<String>emptySet(), AtlasTypeUtil.createRequiredAttrDef("name", "string"), AtlasTypeUtil.createRequiredAttrDef("description", "string")); AtlasTypesDef typesDef = new AtlasTypesDef(); @@ -443,12 +438,12 @@ public class EntityV2JerseyResourceIT extends BaseResourceIT { public void testAddTrait() throws Exception { traitName = "PII_Trait" + randomString(); AtlasClassificationDef piiTrait = - AtlasTypeUtil.createTraitTypeDef(traitName, ImmutableSet.<String>of()); + AtlasTypeUtil.createTraitTypeDef(traitName, Collections.<String>emptySet()); AtlasTypesDef typesDef = new AtlasTypesDef(); typesDef.getClassificationDefs().add(piiTrait); createType(typesDef); - atlasClientV2.addClassifications(createHiveTable().getGuid(), ImmutableList.of(new AtlasClassification(piiTrait.getName()))); + atlasClientV2.addClassifications(createHiveTable().getGuid(), Collections.singletonList(new AtlasClassification(piiTrait.getName()))); assertEntityAudit(createHiveTable().getGuid(), EntityAuditEvent.EntityAuditAction.TAG_ADD); } @@ -457,7 +452,7 @@ public class EntityV2JerseyResourceIT extends BaseResourceIT { public void testGetTraitDefinitionForEntity() throws Exception{ traitName = "PII_Trait" + randomString(); AtlasClassificationDef piiTrait = - AtlasTypeUtil.createTraitTypeDef(traitName, ImmutableSet.<String>of()); + AtlasTypeUtil.createTraitTypeDef(traitName, Collections.<String>emptySet()); AtlasTypesDef typesDef = new AtlasTypesDef(); typesDef.getClassificationDefs().add(piiTrait); createType(typesDef); @@ -483,7 +478,7 @@ public class EntityV2JerseyResourceIT extends BaseResourceIT { public void testAddTraitWithAttribute() throws Exception { final String traitName = "PII_Trait" + randomString(); AtlasClassificationDef piiTrait = AtlasTypeUtil - .createTraitTypeDef(traitName, ImmutableSet.<String>of(), + .createTraitTypeDef(traitName, Collections.<String>emptySet(), AtlasTypeUtil.createRequiredAttrDef("type", "string")); AtlasTypesDef typesDef = new AtlasTypesDef(); typesDef.getClassificationDefs().add(piiTrait); @@ -493,7 +488,7 @@ public class EntityV2JerseyResourceIT extends BaseResourceIT { traitInstance.setAttribute("type", "SSN"); final String guid = createHiveTable().getGuid(); - atlasClientV2.addClassifications(guid, ImmutableList.of(traitInstance)); + atlasClientV2.addClassifications(guid, Collections.singletonList(traitInstance)); // verify the response AtlasEntity withAssociationByGuid = atlasClientV2.getEntityByGuid(guid).getEntity(); @@ -514,11 +509,11 @@ public class EntityV2JerseyResourceIT extends BaseResourceIT { @Test(expectedExceptions = AtlasServiceException.class) public void testAddTraitWithNoRegistration() throws Exception { final String traitName = "PII_Trait" + randomString(); - AtlasTypeUtil.createTraitTypeDef(traitName, ImmutableSet.<String>of()); + AtlasTypeUtil.createTraitTypeDef(traitName, Collections.<String>emptySet()); AtlasClassification traitInstance = new AtlasClassification(traitName); - atlasClientV2.addClassifications("random", ImmutableList.of(traitInstance)); + atlasClientV2.addClassifications("random", Collections.singletonList(traitInstance)); } @Test(dependsOnMethods = "testAddTrait") @@ -554,7 +549,7 @@ public class EntityV2JerseyResourceIT extends BaseResourceIT { final String guid = createHiveTable().getGuid(); final String traitName = "PII_Trait" + randomString(); AtlasClassificationDef piiTrait = AtlasTypeUtil - .createTraitTypeDef(traitName, ImmutableSet.<String>of(), + .createTraitTypeDef(traitName, Collections.<String>emptySet(), AtlasTypeUtil.createRequiredAttrDef("type", "string")); AtlasTypesDef typesDef = new AtlasTypesDef(); typesDef.getClassificationDefs().add(piiTrait); @@ -580,7 +575,7 @@ public class EntityV2JerseyResourceIT extends BaseResourceIT { String attrValue = random(); AtlasEntityDef classTypeDef = AtlasTypeUtil - .createClassTypeDef(classType, ImmutableSet.<String>of(), + .createClassTypeDef(classType, Collections.<String>emptySet(), AtlasTypeUtil.createUniqueRequiredAttrDef(attrName, "string")); AtlasTypesDef atlasTypesDef = new AtlasTypesDef(); atlasTypesDef.getEntityDefs().add(classTypeDef); @@ -717,7 +712,7 @@ public class EntityV2JerseyResourceIT extends BaseResourceIT { AtlasEntityHeader entity2Header = createEntity(db2); // Delete the database entities - EntityMutationResponse deleteResponse = atlasClientV2.deleteEntitiesByGuids(ImmutableList.of(entity1Header.getGuid(), entity2Header.getGuid())); + EntityMutationResponse deleteResponse = atlasClientV2.deleteEntitiesByGuids(Arrays.asList(entity1Header.getGuid(), entity2Header.getGuid())); // Verify that deleteEntities() response has database entity guids assertNotNull(deleteResponse); http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/webapp/src/test/java/org/apache/atlas/web/integration/MetadataDiscoveryJerseyResourceIT.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/integration/MetadataDiscoveryJerseyResourceIT.java b/webapp/src/test/java/org/apache/atlas/web/integration/MetadataDiscoveryJerseyResourceIT.java index acdef52..f25fc5f 100755 --- a/webapp/src/test/java/org/apache/atlas/web/integration/MetadataDiscoveryJerseyResourceIT.java +++ b/webapp/src/test/java/org/apache/atlas/web/integration/MetadataDiscoveryJerseyResourceIT.java @@ -18,8 +18,6 @@ package org.apache.atlas.web.integration; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import com.sun.jersey.api.client.ClientResponse; import com.sun.jersey.core.util.MultivaluedMapImpl; import org.apache.atlas.AtlasClient; @@ -37,6 +35,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import javax.ws.rs.core.MultivaluedMap; +import java.util.Collections; import java.util.List; import static org.testng.Assert.assertEquals; @@ -232,15 +231,15 @@ public class MetadataDiscoveryJerseyResourceIT extends BaseResourceIT { createTypeDefinitionsV1(); ClassTypeDefinition dslTestTypeDefinition = TypesUtil - .createClassTypeDef("dsl_test_type", null, ImmutableSet.<String>of(), + .createClassTypeDef("dsl_test_type", null, Collections.<String>emptySet(), TypesUtil.createUniqueRequiredAttrDef("name", AtlasBaseTypeDef.ATLAS_TYPE_STRING), TypesUtil.createRequiredAttrDef("description", AtlasBaseTypeDef.ATLAS_TYPE_STRING)); TraitTypeDefinition classificationTraitDefinition = TypesUtil - .createTraitTypeDef("Classification", null, ImmutableSet.<String>of(), + .createTraitTypeDef("Classification", null, Collections.<String>emptySet(), TypesUtil.createRequiredAttrDef("tag", AtlasBaseTypeDef.ATLAS_TYPE_STRING)); - TypesDef typesDef = new TypesDef(ImmutableList.<EnumTypeDefinition>of(), ImmutableList.<StructTypeDefinition>of(), - ImmutableList.of(classificationTraitDefinition), ImmutableList.of(dslTestTypeDefinition)); + TypesDef typesDef = new TypesDef(Collections.<EnumTypeDefinition>emptyList(), Collections.<StructTypeDefinition>emptyList(), + Collections.singletonList(classificationTraitDefinition), Collections.singletonList(dslTestTypeDefinition)); createType(typesDef); } http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/webapp/src/test/java/org/apache/atlas/web/integration/TypedefsJerseyResourceIT.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/integration/TypedefsJerseyResourceIT.java b/webapp/src/test/java/org/apache/atlas/web/integration/TypedefsJerseyResourceIT.java index d31c9af..5ee8d30 100644 --- a/webapp/src/test/java/org/apache/atlas/web/integration/TypedefsJerseyResourceIT.java +++ b/webapp/src/test/java/org/apache/atlas/web/integration/TypedefsJerseyResourceIT.java @@ -18,7 +18,6 @@ package org.apache.atlas.web.integration; -import com.google.common.collect.ImmutableSet; import com.sun.jersey.core.util.MultivaluedMapImpl; import org.apache.atlas.AtlasClientV2; import org.apache.atlas.AtlasServiceException; @@ -42,7 +41,9 @@ import org.testng.annotations.Test; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; +import java.util.Arrays; import java.util.Collections; +import java.util.HashSet; import static org.apache.atlas.model.typedef.AtlasStructDef.AtlasAttributeDef.Cardinality; import static org.apache.atlas.type.AtlasTypeUtil.createClassTypeDef; @@ -104,7 +105,7 @@ public class TypedefsJerseyResourceIT extends BaseResourceIT { @Test public void testDuplicateCreate() throws Exception { AtlasEntityDef type = createClassTypeDef(randomString(), - ImmutableSet.<String>of(), AtlasTypeUtil.createUniqueRequiredAttrDef("name", "string")); + Collections.<String>emptySet(), AtlasTypeUtil.createUniqueRequiredAttrDef("name", "string")); AtlasTypesDef typesDef = new AtlasTypesDef(); typesDef.getEntityDefs().add(type); @@ -123,7 +124,7 @@ public class TypedefsJerseyResourceIT extends BaseResourceIT { public void testUpdate() throws Exception { String entityType = randomString(); AtlasEntityDef typeDefinition = - createClassTypeDef(entityType, ImmutableSet.<String>of(), + createClassTypeDef(entityType, Collections.<String>emptySet(), AtlasTypeUtil.createUniqueRequiredAttrDef("name", "string")); AtlasTypesDef atlasTypesDef = new AtlasTypesDef(); @@ -135,7 +136,7 @@ public class TypedefsJerseyResourceIT extends BaseResourceIT { //Add attribute description typeDefinition = createClassTypeDef(typeDefinition.getName(), - ImmutableSet.<String>of(), + Collections.<String>emptySet(), AtlasTypeUtil.createUniqueRequiredAttrDef("name", "string"), AtlasTypeUtil.createOptionalAttrDef("description", "string")); @@ -262,10 +263,10 @@ public class TypedefsJerseyResourceIT extends BaseResourceIT { @Test public void testListTypesByFilter() throws Exception { AtlasAttributeDef attr = AtlasTypeUtil.createOptionalAttrDef("attr", "string"); - AtlasEntityDef classDefA = AtlasTypeUtil.createClassTypeDef("A" + randomString(), ImmutableSet.<String>of(), attr); - AtlasEntityDef classDefA1 = AtlasTypeUtil.createClassTypeDef("A1" + randomString(), ImmutableSet.of(classDefA.getName()), attr); - AtlasEntityDef classDefB = AtlasTypeUtil.createClassTypeDef("B" + randomString(), ImmutableSet.<String>of(), attr); - AtlasEntityDef classDefC = AtlasTypeUtil.createClassTypeDef("C" + randomString(), ImmutableSet.of(classDefB.getName(), classDefA.getName()), attr); + AtlasEntityDef classDefA = AtlasTypeUtil.createClassTypeDef("A" + randomString(), Collections.<String>emptySet(), attr); + AtlasEntityDef classDefA1 = AtlasTypeUtil.createClassTypeDef("A1" + randomString(), Collections.singleton(classDefA.getName()), attr); + AtlasEntityDef classDefB = AtlasTypeUtil.createClassTypeDef("B" + randomString(), Collections.<String>emptySet(), attr); + AtlasEntityDef classDefC = AtlasTypeUtil.createClassTypeDef("C" + randomString(), new HashSet<>(Arrays.asList(classDefB.getName(), classDefA.getName())), attr); AtlasTypesDef atlasTypesDef = new AtlasTypesDef(); atlasTypesDef.getEntityDefs().add(classDefA); @@ -296,13 +297,13 @@ public class TypedefsJerseyResourceIT extends BaseResourceIT { AtlasTypesDef atlasTypesDef = new AtlasTypesDef(); AtlasEntityDef databaseTypeDefinition = - createClassTypeDef("database", ImmutableSet.<String>of(), + createClassTypeDef("database", Collections.<String>emptySet(), AtlasTypeUtil.createUniqueRequiredAttrDef("name", "string"), AtlasTypeUtil.createRequiredAttrDef("description", "string")); atlasTypesDef.getEntityDefs().add(databaseTypeDefinition); AtlasEntityDef tableTypeDefinition = - createClassTypeDef("table", ImmutableSet.<String>of(), + createClassTypeDef("table", Collections.<String>emptySet(), AtlasTypeUtil.createUniqueRequiredAttrDef("name", "string"), AtlasTypeUtil.createRequiredAttrDef("description", "string"), AtlasTypeUtil.createOptionalAttrDef("columnNames", AtlasBaseTypeDef.getArrayTypeName("string")), @@ -318,7 +319,7 @@ public class TypedefsJerseyResourceIT extends BaseResourceIT { atlasTypesDef.getEntityDefs().add(tableTypeDefinition); AtlasClassificationDef fetlTypeDefinition = AtlasTypeUtil - .createTraitTypeDef("fetl", ImmutableSet.<String>of(), + .createTraitTypeDef("fetl", Collections.<String>emptySet(), AtlasTypeUtil.createRequiredAttrDef("level", "int")); atlasTypesDef.getClassificationDefs().add(fetlTypeDefinition); http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/webapp/src/test/java/org/apache/atlas/web/integration/TypesJerseyResourceIT.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/integration/TypesJerseyResourceIT.java b/webapp/src/test/java/org/apache/atlas/web/integration/TypesJerseyResourceIT.java index 9e2237e..cd876f4 100755 --- a/webapp/src/test/java/org/apache/atlas/web/integration/TypesJerseyResourceIT.java +++ b/webapp/src/test/java/org/apache/atlas/web/integration/TypesJerseyResourceIT.java @@ -18,8 +18,6 @@ package org.apache.atlas.web.integration; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import com.sun.jersey.core.util.MultivaluedMapImpl; import org.apache.atlas.AtlasClient; import org.apache.atlas.AtlasServiceException; @@ -37,9 +35,7 @@ import org.testng.annotations.Test; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import java.util.*; import static org.apache.atlas.v1.typesystem.types.utils.TypesUtil.createOptionalAttrDef; import static org.testng.Assert.assertEquals; @@ -88,10 +84,10 @@ public class TypesJerseyResourceIT extends BaseResourceIT { @Test public void testDuplicateSubmit() throws Exception { ClassTypeDefinition type = TypesUtil.createClassTypeDef(randomString(), null, - ImmutableSet.<String>of(), TypesUtil.createUniqueRequiredAttrDef(NAME, AtlasBaseTypeDef.ATLAS_TYPE_STRING)); + Collections.<String>emptySet(), TypesUtil.createUniqueRequiredAttrDef(NAME, AtlasBaseTypeDef.ATLAS_TYPE_STRING)); TypesDef typesDef = - new TypesDef(ImmutableList.<EnumTypeDefinition>of(), ImmutableList.<StructTypeDefinition>of(), - ImmutableList.<TraitTypeDefinition>of(), ImmutableList.of(type)); + new TypesDef(Collections.<EnumTypeDefinition>emptyList(), Collections.<StructTypeDefinition>emptyList(), + Collections.<TraitTypeDefinition>emptyList(), Collections.singletonList(type)); atlasClientV1.createType(typesDef); try { @@ -105,7 +101,7 @@ public class TypesJerseyResourceIT extends BaseResourceIT { @Test public void testUpdate() throws Exception { ClassTypeDefinition typeDefinition = TypesUtil - .createClassTypeDef(randomString(), null, "1.0", ImmutableSet.<String>of(), + .createClassTypeDef(randomString(), null, "1.0", Collections.<String>emptySet(), TypesUtil.createUniqueRequiredAttrDef(NAME, AtlasBaseTypeDef.ATLAS_TYPE_STRING)); List<String> typesCreated = atlasClientV1.createType(AtlasType.toV1Json(typeDefinition)); assertEquals(typesCreated.size(), 1); @@ -113,12 +109,10 @@ public class TypesJerseyResourceIT extends BaseResourceIT { //Add attribute description typeDefinition = TypesUtil.createClassTypeDef(typeDefinition.getTypeName(), null, "2.0", - ImmutableSet.<String>of(), + Collections.<String>emptySet(), TypesUtil.createUniqueRequiredAttrDef(NAME, AtlasBaseTypeDef.ATLAS_TYPE_STRING), createOptionalAttrDef(DESCRIPTION, AtlasBaseTypeDef.ATLAS_TYPE_STRING)); - TypesDef typeDef = new TypesDef(ImmutableList.<EnumTypeDefinition>of(), - ImmutableList.<StructTypeDefinition>of(), ImmutableList.<TraitTypeDefinition>of(), - ImmutableList.of(typeDefinition)); + TypesDef typeDef = new TypesDef(Collections.<EnumTypeDefinition>emptyList(), Collections.<StructTypeDefinition>emptyList(), Collections.<TraitTypeDefinition>emptyList(), Collections.singletonList(typeDefinition)); List<String> typesUpdated = atlasClientV1.updateType(typeDef); assertEquals(typesUpdated.size(), 1); Assert.assertTrue(typesUpdated.contains(typeDefinition.getTypeName())); @@ -197,13 +191,13 @@ public class TypesJerseyResourceIT extends BaseResourceIT { public void testListTypesByFilter() throws Exception { AttributeDefinition attr = TypesUtil.createOptionalAttrDef("attr", AtlasBaseTypeDef.ATLAS_TYPE_STRING); String a = createType(AtlasType.toV1Json( - TypesUtil.createClassTypeDef("A" + randomString(), null, ImmutableSet.<String>of(), attr))).get(0); + TypesUtil.createClassTypeDef("A" + randomString(), null, Collections.<String>emptySet(), attr))).get(0); String a1 = createType(AtlasType.toV1Json( - TypesUtil.createClassTypeDef("A1" + randomString(), null, ImmutableSet.of(a), attr))).get(0); + TypesUtil.createClassTypeDef("A1" + randomString(), null, Collections.singleton(a), attr))).get(0); String b = createType(AtlasType.toV1Json( - TypesUtil.createClassTypeDef("B" + randomString(), null, ImmutableSet.<String>of(), attr))).get(0); + TypesUtil.createClassTypeDef("B" + randomString(), null, Collections.<String>emptySet(), attr))).get(0); String c = createType(AtlasType.toV1Json( - TypesUtil.createClassTypeDef("C" + randomString(), null, ImmutableSet.of(a, b), attr))).get(0); + TypesUtil.createClassTypeDef("C" + randomString(), null, new HashSet<>(Arrays.asList(a, b)), attr))).get(0); List<String> results = atlasClientV1.listTypes(DataTypes.TypeCategory.CLASS, a, b); assertEquals(results, Arrays.asList(a1), "Results: " + results); @@ -214,7 +208,7 @@ public class TypesJerseyResourceIT extends BaseResourceIT { for (String traitName : traitNames) { TraitTypeDefinition traitTypeDef = - TypesUtil.createTraitTypeDef(traitName, null, ImmutableSet.<String>of()); + TypesUtil.createTraitTypeDef(traitName, null, Collections.<String>emptySet()); String json = AtlasType.toV1Json(traitTypeDef); createType(json); } @@ -226,14 +220,14 @@ public class TypesJerseyResourceIT extends BaseResourceIT { ArrayList<HierarchicalTypeDefinition> typeDefinitions = new ArrayList<>(); ClassTypeDefinition databaseTypeDefinition = TypesUtil - .createClassTypeDef("database", null, ImmutableSet.<String>of(), + .createClassTypeDef("database", null, Collections.<String>emptySet(), TypesUtil.createUniqueRequiredAttrDef(NAME, AtlasBaseTypeDef.ATLAS_TYPE_STRING), TypesUtil.createRequiredAttrDef(DESCRIPTION, AtlasBaseTypeDef.ATLAS_TYPE_STRING), TypesUtil.createRequiredAttrDef(QUALIFIED_NAME, AtlasBaseTypeDef.ATLAS_TYPE_STRING)); typeDefinitions.add(databaseTypeDefinition); ClassTypeDefinition tableTypeDefinition = TypesUtil - .createClassTypeDef("table", null, ImmutableSet.<String>of(), + .createClassTypeDef("table", null, Collections.<String>emptySet(), TypesUtil.createUniqueRequiredAttrDef(NAME, AtlasBaseTypeDef.ATLAS_TYPE_STRING), TypesUtil.createRequiredAttrDef(DESCRIPTION, AtlasBaseTypeDef.ATLAS_TYPE_STRING), TypesUtil.createRequiredAttrDef(QUALIFIED_NAME, AtlasBaseTypeDef.ATLAS_TYPE_STRING), @@ -246,7 +240,7 @@ public class TypesJerseyResourceIT extends BaseResourceIT { typeDefinitions.add(tableTypeDefinition); TraitTypeDefinition fetlTypeDefinition = TypesUtil - .createTraitTypeDef("fetl", null, ImmutableSet.<String>of(), + .createTraitTypeDef("fetl", null, Collections.<String>emptySet(), TypesUtil.createRequiredAttrDef("level", AtlasBaseTypeDef.ATLAS_TYPE_INT)); typeDefinitions.add(fetlTypeDefinition); http://git-wip-us.apache.org/repos/asf/atlas/blob/0a00dcb1/webapp/src/test/java/org/apache/atlas/web/service/ActiveInstanceStateTest.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/service/ActiveInstanceStateTest.java b/webapp/src/test/java/org/apache/atlas/web/service/ActiveInstanceStateTest.java index 7ad2f76..25f39f2 100644 --- a/webapp/src/test/java/org/apache/atlas/web/service/ActiveInstanceStateTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/service/ActiveInstanceStateTest.java @@ -34,8 +34,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; -import scala.actors.threadpool.Arrays; +import java.util.Arrays; import java.nio.charset.Charset; import static org.mockito.Mockito.mock;
