Repository: atlas Updated Branches: refs/heads/master 97ae3a3c8 -> bb1897663
ATLAS-2079: Fix coverity scan issue and IT failures introduced by ATLAS-2062 - missing changes Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/bb189766 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/bb189766 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/bb189766 Branch: refs/heads/master Commit: bb1897663b43feb79faf6e2fc2818380fd16b9dd Parents: 97ae3a3 Author: Sarath Subramanian <ssubraman...@hortonworks.com> Authored: Wed Aug 23 10:19:22 2017 -0700 Committer: Sarath Subramanian <ssubraman...@hortonworks.com> Committed: Wed Aug 23 10:19:22 2017 -0700 ---------------------------------------------------------------------- .../src/test/java/org/apache/atlas/falcon/hook/FalconHookIT.java | 2 +- .../src/test/java/org/apache/atlas/hive/HiveITBase.java | 2 +- .../src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java | 2 +- pom.xml | 2 +- .../java/org/apache/atlas/typesystem/types/utils/TypesUtil.java | 2 +- .../org/apache/atlas/web/integration/TypesJerseyResourceIT.java | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/bb189766/addons/falcon-bridge/src/test/java/org/apache/atlas/falcon/hook/FalconHookIT.java ---------------------------------------------------------------------- diff --git a/addons/falcon-bridge/src/test/java/org/apache/atlas/falcon/hook/FalconHookIT.java b/addons/falcon-bridge/src/test/java/org/apache/atlas/falcon/hook/FalconHookIT.java index e2d4bbb..7212921 100644 --- a/addons/falcon-bridge/src/test/java/org/apache/atlas/falcon/hook/FalconHookIT.java +++ b/addons/falcon-bridge/src/test/java/org/apache/atlas/falcon/hook/FalconHookIT.java @@ -304,7 +304,7 @@ public class FalconHookIT { } private String assertEntityIsRegistered(final String typeName, final String property, final String value) throws Exception { - waitFor(80000, new Predicate() { + waitFor(1000, new Predicate() { @Override public void evaluate() throws Exception { Referenceable entity = atlasClient.getEntity(typeName, property, value); http://git-wip-us.apache.org/repos/asf/atlas/blob/bb189766/addons/hive-bridge/src/test/java/org/apache/atlas/hive/HiveITBase.java ---------------------------------------------------------------------- diff --git a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/HiveITBase.java b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/HiveITBase.java index 3e20cf0..0d163ee 100644 --- a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/HiveITBase.java +++ b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/HiveITBase.java @@ -155,7 +155,7 @@ public class HiveITBase { protected String assertEntityIsRegistered(final String typeName, final String property, final String value, final HiveHookIT.AssertPredicate assertPredicate) throws Exception { - waitFor(80000, new HiveHookIT.Predicate() { + waitFor(1000, new HiveHookIT.Predicate() { @Override public void evaluate() throws Exception { Referenceable entity = atlasClient.getEntity(typeName, property, value); http://git-wip-us.apache.org/repos/asf/atlas/blob/bb189766/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java ---------------------------------------------------------------------- diff --git a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java index 979e729..f7404ae 100755 --- a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java +++ b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java @@ -1803,7 +1803,7 @@ public class HiveHookIT extends HiveITBase { } private void assertEntityIsNotRegistered(final String typeName, final String property, final String value) throws Exception { - waitFor(80000, new Predicate() { + waitFor(1000, new Predicate() { @Override public void evaluate() throws Exception { try { http://git-wip-us.apache.org/repos/asf/atlas/blob/bb189766/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5adfc9c..8d62786 100644 --- a/pom.xml +++ b/pom.xml @@ -1922,7 +1922,7 @@ <log4j.configuration>atlas-log4j.xml</log4j.configuration> </systemProperties> <skipTests>${skipTests}</skipTests> - <forkCount>1C</forkCount> + <forkCount>2C</forkCount> <reuseForks>false</reuseForks> <redirectTestOutputToFile>true</redirectTestOutputToFile> <argLine>-Djava.awt.headless=true -Dproject.version=${project.version} http://git-wip-us.apache.org/repos/asf/atlas/blob/bb189766/typesystem/src/main/java/org/apache/atlas/typesystem/types/utils/TypesUtil.java ---------------------------------------------------------------------- diff --git a/typesystem/src/main/java/org/apache/atlas/typesystem/types/utils/TypesUtil.java b/typesystem/src/main/java/org/apache/atlas/typesystem/types/utils/TypesUtil.java index f131458..39244dc 100755 --- a/typesystem/src/main/java/org/apache/atlas/typesystem/types/utils/TypesUtil.java +++ b/typesystem/src/main/java/org/apache/atlas/typesystem/types/utils/TypesUtil.java @@ -112,7 +112,7 @@ public class TypesUtil { public static HierarchicalTypeDefinition<ClassType> createClassTypeDef(String name, String description, String version, ImmutableSet<String> superTypes, AttributeDefinition... attrDefs) { - return new HierarchicalTypeDefinition<>(ClassType.class, name, description, superTypes, attrDefs); + return new HierarchicalTypeDefinition<>(ClassType.class, name, description, version, superTypes, attrDefs); } public static TypesDef getTypesDef(ImmutableList<EnumTypeDefinition> enums, http://git-wip-us.apache.org/repos/asf/atlas/blob/bb189766/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 ded3e05..54db3c0 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 @@ -112,14 +112,14 @@ public class TypesJerseyResourceIT extends BaseResourceIT { @Test public void testUpdate() throws Exception { HierarchicalTypeDefinition<ClassType> typeDefinition = TypesUtil - .createClassTypeDef(randomString(), ImmutableSet.<String>of(), + .createClassTypeDef(randomString(), null, "1.0", ImmutableSet.<String>of(), TypesUtil.createUniqueRequiredAttrDef(NAME, DataTypes.STRING_TYPE)); List<String> typesCreated = atlasClientV1.createType(TypesSerialization.toJson(typeDefinition, false)); assertEquals(typesCreated.size(), 1); assertEquals(typesCreated.get(0), typeDefinition.typeName); //Add attribute description - typeDefinition = TypesUtil.createClassTypeDef(typeDefinition.typeName, + typeDefinition = TypesUtil.createClassTypeDef(typeDefinition.typeName, null, "2.0", ImmutableSet.<String>of(), TypesUtil.createUniqueRequiredAttrDef(NAME, DataTypes.STRING_TYPE), createOptionalAttrDef(DESCRIPTION, DataTypes.STRING_TYPE));