Repository: sqoop
Updated Branches:
refs/heads/sqoop2 9e1f4cbaa -> d6319e3a7
SQOOP-1469: Sqoop2: Validations: Rename constants in Status class
(Jarek Jarcec Cecho via Abraham Elmahrek)
Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/d6319e3a
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/d6319e3a
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/d6319e3a
Branch: refs/heads/sqoop2
Commit: d6319e3a7bdec5a9395272adaa860744c80f3478
Parents: 9e1f4cb
Author: Abraham Elmahrek <abraham@elmahrek.com>
Authored: Mon Nov 3 13:18:09 2014 -0800
Committer: Abraham Elmahrek <abraham@elmahrek.com>
Committed: Mon Nov 3 13:18:50 2014 -0800
----------------------------------------------------------------------
.../org/apache/sqoop/validation/Status.java | 20 ++++++-------
.../validation/validators/ClassAvailable.java | 2 +-
.../sqoop/validation/validators/Contains.java | 2 +-
.../sqoop/validation/validators/NotEmpty.java | 2 +-
.../sqoop/validation/validators/NotNull.java | 2 +-
.../validation/validators/NullOrContains.java | 2 +-
.../sqoop/validation/validators/StartsWith.java | 2 +-
.../sqoop/json/TestValidationResultBean.java | 10 +++----
.../sqoop/model/TestMValidatedElement.java | 14 ++++-----
.../org/apache/sqoop/validation/TestStatus.java | 30 ++++++++++----------
.../sqoop/validation/TestValidationRunner.java | 28 +++++++++---------
.../validators/TestClassAvailable.java | 2 +-
.../validation/validators/TestContains.java | 16 +++++------
.../validation/validators/TestNotEmpty.java | 4 +--
.../validation/validators/TestNotNull.java | 2 +-
.../validators/TestNullOrContains.java | 18 ++++++------
.../validation/validators/TestStartsWith.java | 12 ++++----
.../validation/validators/TestValidator.java | 8 +++---
.../jdbc/configuration/FromJobConfig.java | 6 ++--
.../jdbc/configuration/LinkConfig.java | 2 +-
.../jdbc/configuration/ToJobConfig.java | 8 +++---
.../sqoop/connector/jdbc/TestToInitializer.java | 6 ++--
.../hdfs/configuration/LinkConfig.java | 2 +-
.../hdfs/configuration/ToJobConfig.java | 4 +--
.../sqoop/repository/TestJdbcRepository.java | 2 +-
docs/src/site/sphinx/ClientAPI.rst | 6 ++--
.../apache/sqoop/shell/CloneJobFunction.java | 2 +-
.../apache/sqoop/shell/CloneLinkFunction.java | 2 +-
.../apache/sqoop/shell/CreateJobFunction.java | 2 +-
.../apache/sqoop/shell/CreateLinkFunction.java | 2 +-
.../apache/sqoop/shell/DeleteJobFunction.java | 2 +-
.../apache/sqoop/shell/DeleteLinkFunction.java | 2 +-
.../apache/sqoop/shell/DisableJobFunction.java | 2 +-
.../apache/sqoop/shell/DisableLinkFunction.java | 2 +-
.../apache/sqoop/shell/EnableJobFunction.java | 2 +-
.../apache/sqoop/shell/EnableLinkFunction.java | 2 +-
.../apache/sqoop/shell/SetOptionFunction.java | 4 +--
.../apache/sqoop/shell/SetServerFunction.java | 2 +-
.../sqoop/shell/ShowConnectorFunction.java | 4 +--
.../apache/sqoop/shell/ShowDriverFunction.java | 2 +-
.../org/apache/sqoop/shell/ShowJobFunction.java | 2 +-
.../apache/sqoop/shell/ShowLinkFunction.java | 2 +-
.../apache/sqoop/shell/ShowOptionFunction.java | 2 +-
.../apache/sqoop/shell/ShowServerFunction.java | 2 +-
.../sqoop/shell/ShowSubmissionFunction.java | 2 +-
.../apache/sqoop/shell/ShowVersionFunction.java | 2 +-
.../apache/sqoop/shell/StartJobFunction.java | 2 +-
.../apache/sqoop/shell/StatusJobFunction.java | 2 +-
.../org/apache/sqoop/shell/StopJobFunction.java | 2 +-
.../apache/sqoop/shell/UpdateJobFunction.java | 2 +-
.../apache/sqoop/shell/UpdateLinkFunction.java | 2 +-
.../sqoop/shell/utils/ConfigDisplayer.java | 4 +--
.../apache/sqoop/shell/utils/ConfigFiller.java | 6 ++--
.../sqoop/test/testcases/ConnectorTestCase.java | 4 +--
54 files changed, 138 insertions(+), 142 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/common/src/main/java/org/apache/sqoop/validation/Status.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/sqoop/validation/Status.java b/common/src/main/java/org/apache/sqoop/validation/Status.java
index 5a546bf..1b5ad88 100644
--- a/common/src/main/java/org/apache/sqoop/validation/Status.java
+++ b/common/src/main/java/org/apache/sqoop/validation/Status.java
@@ -20,39 +20,37 @@ package org.apache.sqoop.validation;
/**
* Severity of validation message.
*
- * Fine:
+ * OK:
* Everything is correct (default state).
*
- * Warning:
+ * WARNING:
* Warning is something suspicious, potentially wrong but something that
* can be ignored. For example in case of JDBC URL element, warning would
* be if specified host is not responding - it's warning because specified
* URL might be wrong. However at the same time URL might be right as only
* target host might be down.
*
- * Error:
+ * ERROR:
* Error represents unacceptable element content. For example in case of JDBC
* URL path, error would be empty element or element containing invalid URL.
- *
- * TODO: This should really be renamed to "severity"
*/
public enum Status {
/**
* There are no issues, no warnings. Everything is correct.
*/
- FINE, // TODO: Rename to "OK"
+ OK,
/**
* Validated entity is correct enough to be processed. There might be some
* warnings, but no errors.
*/
- ACCEPTABLE, // TODO: Rename to "WARNING"
+ WARNING,
/**
* There are serious issues with validated entity. We can't proceed until
* reported issues will be resolved.
*/
- UNACCEPTABLE, // TODO: Rename to "ERROR"
+ ERROR,
;
@@ -63,7 +61,7 @@ public enum Status {
* @return The worst status
*/
public static Status getWorstStatus(Status ... statuses) {
- Status finalStatus = FINE;
+ Status finalStatus = OK;
for (Status status : statuses) {
if (finalStatus.compareTo(status) < 1) {
@@ -80,7 +78,7 @@ public enum Status {
* @return True if we can proceed with processing
*/
public boolean canProceed() {
- return this == FINE || this == ACCEPTABLE;
+ return this == OK || this == WARNING;
}
/**
@@ -89,6 +87,6 @@ public enum Status {
* @return Default validation status
*/
public static Status getDefault() {
- return FINE;
+ return OK;
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/common/src/main/java/org/apache/sqoop/validation/validators/ClassAvailable.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/sqoop/validation/validators/ClassAvailable.java b/common/src/main/java/org/apache/sqoop/validation/validators/ClassAvailable.java
index 52a8fdd..371a6b7 100644
--- a/common/src/main/java/org/apache/sqoop/validation/validators/ClassAvailable.java
+++ b/common/src/main/java/org/apache/sqoop/validation/validators/ClassAvailable.java
@@ -29,7 +29,7 @@ public class ClassAvailable extends AbstractValidator<String> {
try {
Class.forName(klass);
} catch (ClassNotFoundException e) {
- addMessage(new Message(Status.UNACCEPTABLE, "Class not found"));
+ addMessage(new Message(Status.ERROR, "Class not found"));
}
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/common/src/main/java/org/apache/sqoop/validation/validators/Contains.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/sqoop/validation/validators/Contains.java b/common/src/main/java/org/apache/sqoop/validation/validators/Contains.java
index 8920c72..98118dc 100644
--- a/common/src/main/java/org/apache/sqoop/validation/validators/Contains.java
+++ b/common/src/main/java/org/apache/sqoop/validation/validators/Contains.java
@@ -26,7 +26,7 @@ public class Contains extends AbstractValidator<String> {
@Override
public void validate(String str) {
if(str == null || !str.contains(getStringArgument())) {
- addMessage(Status.UNACCEPTABLE, "String must contain substring: " + getStringArgument());
+ addMessage(Status.ERROR, "String must contain substring: " + getStringArgument());
}
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/common/src/main/java/org/apache/sqoop/validation/validators/NotEmpty.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/sqoop/validation/validators/NotEmpty.java b/common/src/main/java/org/apache/sqoop/validation/validators/NotEmpty.java
index 248a2fa..b189299 100644
--- a/common/src/main/java/org/apache/sqoop/validation/validators/NotEmpty.java
+++ b/common/src/main/java/org/apache/sqoop/validation/validators/NotEmpty.java
@@ -28,7 +28,7 @@ public class NotEmpty extends AbstractValidator<String> {
@Override
public void validate(String instance) {
if (instance == null || instance.isEmpty()) {
- addMessage(Status.UNACCEPTABLE, "Can't be null nor empty");
+ addMessage(Status.ERROR, "Can't be null nor empty");
}
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/common/src/main/java/org/apache/sqoop/validation/validators/NotNull.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/sqoop/validation/validators/NotNull.java b/common/src/main/java/org/apache/sqoop/validation/validators/NotNull.java
index 93b5fa7..1235d0e 100644
--- a/common/src/main/java/org/apache/sqoop/validation/validators/NotNull.java
+++ b/common/src/main/java/org/apache/sqoop/validation/validators/NotNull.java
@@ -26,7 +26,7 @@ public class NotNull<T> extends AbstractValidator<T> {
@Override
public void validate(T instance) {
if (instance == null) {
- addMessage(Status.UNACCEPTABLE, "Can't be null");
+ addMessage(Status.ERROR, "Can't be null");
}
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/common/src/main/java/org/apache/sqoop/validation/validators/NullOrContains.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/sqoop/validation/validators/NullOrContains.java b/common/src/main/java/org/apache/sqoop/validation/validators/NullOrContains.java
index 9d11a2e..f502006 100644
--- a/common/src/main/java/org/apache/sqoop/validation/validators/NullOrContains.java
+++ b/common/src/main/java/org/apache/sqoop/validation/validators/NullOrContains.java
@@ -26,7 +26,7 @@ public class NullOrContains extends AbstractValidator<String> {
@Override
public void validate(String str) {
if(str != null && !str.contains(getStringArgument())) {
- addMessage(Status.UNACCEPTABLE, "String must contain substring: " + getStringArgument());
+ addMessage(Status.ERROR, "String must contain substring: " + getStringArgument());
}
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/common/src/main/java/org/apache/sqoop/validation/validators/StartsWith.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/sqoop/validation/validators/StartsWith.java b/common/src/main/java/org/apache/sqoop/validation/validators/StartsWith.java
index 808e1f7..c9a2a0f 100644
--- a/common/src/main/java/org/apache/sqoop/validation/validators/StartsWith.java
+++ b/common/src/main/java/org/apache/sqoop/validation/validators/StartsWith.java
@@ -26,7 +26,7 @@ public class StartsWith extends AbstractValidator<String> {
@Override
public void validate(String str) {
if(str == null || !str.startsWith(getStringArgument())) {
- addMessage(Status.UNACCEPTABLE, "String must start with: " + getStringArgument());
+ addMessage(Status.ERROR, "String must start with: " + getStringArgument());
}
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/common/src/test/java/org/apache/sqoop/json/TestValidationResultBean.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/json/TestValidationResultBean.java b/common/src/test/java/org/apache/sqoop/json/TestValidationResultBean.java
index bdbad72..6691c41 100644
--- a/common/src/test/java/org/apache/sqoop/json/TestValidationResultBean.java
+++ b/common/src/test/java/org/apache/sqoop/json/TestValidationResultBean.java
@@ -81,7 +81,7 @@ public class TestValidationResultBean {
public void verifyResultA(ConfigValidationResult result) {
assertNotNull(result);
- assertEquals(Status.UNACCEPTABLE, result.getStatus());
+ assertEquals(Status.ERROR, result.getStatus());
Map<String, List<Message>> messages = result.getMessages();
assertEquals(1, messages.size());
@@ -91,18 +91,18 @@ public class TestValidationResultBean {
assertNotNull(messagesA);
assertEquals(2, messagesA.size());
- assertEquals(Status.ACCEPTABLE, messagesA.get(0).getStatus());
+ assertEquals(Status.WARNING, messagesA.get(0).getStatus());
assertEquals("A", messagesA.get(0).getMessage());
- assertEquals(Status.UNACCEPTABLE, messagesA.get(1).getStatus());
+ assertEquals(Status.ERROR, messagesA.get(1).getStatus());
assertEquals("B", messagesA.get(1).getMessage());
}
public ConfigValidationResult getResultA() {
ConfigValidationResult result = new ConfigValidationResult();
List<Message> messages = new LinkedList<Message>();
- messages.add(new Message(Status.ACCEPTABLE, "A"));
- messages.add(new Message(Status.UNACCEPTABLE, "B"));
+ messages.add(new Message(Status.WARNING, "A"));
+ messages.add(new Message(Status.ERROR, "B"));
result.addMessages("A", messages);
return result;
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/common/src/test/java/org/apache/sqoop/model/TestMValidatedElement.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/model/TestMValidatedElement.java b/common/src/test/java/org/apache/sqoop/model/TestMValidatedElement.java
index a75a7cd..3db261a 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMValidatedElement.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMValidatedElement.java
@@ -35,7 +35,7 @@ public class TestMValidatedElement {
public void testInitialization() {
MValidatedElement input = new MIntegerInput("input", false);
assertEquals("input", input.getName());
- assertEquals(Status.FINE, input.getValidationStatus());
+ assertEquals(Status.OK, input.getValidationStatus());
}
/**
@@ -46,22 +46,22 @@ public class TestMValidatedElement {
MValidatedElement input = new MIntegerInput("input", false);
// Default status
- assertEquals(Status.FINE, input.getValidationStatus());
+ assertEquals(Status.OK, input.getValidationStatus());
// Add a message
- input.addValidationMessage(new Message(Status.ACCEPTABLE, "MY_MESSAGE"));
- assertEquals(Status.ACCEPTABLE, input.getValidationStatus());
+ input.addValidationMessage(new Message(Status.WARNING, "MY_MESSAGE"));
+ assertEquals(Status.WARNING, input.getValidationStatus());
assertEquals(1, input.getValidationMessages().size());
assertEquals("MY_MESSAGE", input.getValidationMessages().get(0).getMessage());
// Reset
input.resetValidationMessages();
- assertEquals(Status.FINE, input.getValidationStatus());
+ assertEquals(Status.OK, input.getValidationStatus());
assertEquals(0, input.getValidationMessages().size());
// Set unacceptable status
- input.addValidationMessage(new Message(Status.UNACCEPTABLE, "MY_MESSAGE"));
- assertEquals(Status.UNACCEPTABLE, input.getValidationStatus());
+ input.addValidationMessage(new Message(Status.ERROR, "MY_MESSAGE"));
+ assertEquals(Status.ERROR, input.getValidationStatus());
assertEquals(1, input.getValidationMessages().size());
assertEquals("MY_MESSAGE", input.getValidationMessages().get(0).getMessage());
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/common/src/test/java/org/apache/sqoop/validation/TestStatus.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/validation/TestStatus.java b/common/src/test/java/org/apache/sqoop/validation/TestStatus.java
index 99d8076..813969e 100644
--- a/common/src/test/java/org/apache/sqoop/validation/TestStatus.java
+++ b/common/src/test/java/org/apache/sqoop/validation/TestStatus.java
@@ -28,26 +28,26 @@ public class TestStatus {
@Test
public void testGetWorstStatus() {
// Comparing itself with itself
- assertEquals(Status.FINE,
- Status.getWorstStatus(Status.FINE));
- assertEquals(Status.FINE,
- Status.getWorstStatus(Status.FINE, Status.FINE));
- assertEquals(Status.ACCEPTABLE,
- Status.getWorstStatus(Status.ACCEPTABLE, Status.ACCEPTABLE));
- assertEquals(Status.UNACCEPTABLE,
- Status.getWorstStatus(Status.UNACCEPTABLE, Status.UNACCEPTABLE));
+ assertEquals(Status.OK,
+ Status.getWorstStatus(Status.OK));
+ assertEquals(Status.OK,
+ Status.getWorstStatus(Status.OK, Status.OK));
+ assertEquals(Status.WARNING,
+ Status.getWorstStatus(Status.WARNING, Status.WARNING));
+ assertEquals(Status.ERROR,
+ Status.getWorstStatus(Status.ERROR, Status.ERROR));
// Retriving the worst option
- assertEquals(Status.UNACCEPTABLE,
- Status.getWorstStatus(Status.FINE, Status.UNACCEPTABLE));
- assertEquals(Status.ACCEPTABLE,
- Status.getWorstStatus(Status.FINE, Status.ACCEPTABLE));
+ assertEquals(Status.ERROR,
+ Status.getWorstStatus(Status.OK, Status.ERROR));
+ assertEquals(Status.WARNING,
+ Status.getWorstStatus(Status.OK, Status.WARNING));
}
@Test
public void testCanProceed() {
- assertTrue(Status.FINE.canProceed());
- assertTrue(Status.ACCEPTABLE.canProceed());
- assertFalse(Status.UNACCEPTABLE.canProceed());
+ assertTrue(Status.OK.canProceed());
+ assertTrue(Status.WARNING.canProceed());
+ assertFalse(Status.ERROR.canProceed());
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/common/src/test/java/org/apache/sqoop/validation/TestValidationRunner.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/validation/TestValidationRunner.java b/common/src/test/java/org/apache/sqoop/validation/TestValidationRunner.java
index 579d1c5..6825435 100644
--- a/common/src/test/java/org/apache/sqoop/validation/TestValidationRunner.java
+++ b/common/src/test/java/org/apache/sqoop/validation/TestValidationRunner.java
@@ -44,10 +44,10 @@ public class TestValidationRunner {
@Override
public void validate(ConfigA config) {
if(config.notNull == null) {
- addMessage(Status.UNACCEPTABLE, "null");
+ addMessage(Status.ERROR, "null");
}
if("error".equals(config.notNull)) {
- addMessage(Status.UNACCEPTABLE, "error");
+ addMessage(Status.ERROR, "error");
}
}
}
@@ -62,21 +62,21 @@ public class TestValidationRunner {
// Null string should fail on Input level and should not call config level validators
config.notNull = null;
result = runner.validateConfig("configName", config);
- assertEquals(Status.UNACCEPTABLE, result.getStatus());
+ assertEquals(Status.ERROR, result.getStatus());
assertEquals(1, result.getMessages().size());
assertTrue(result.getMessages().containsKey("configName.notNull"));
// String "error" should trigger config level error, but not Input level
config.notNull = "error";
result = runner.validateConfig("configName", config);
- assertEquals(Status.UNACCEPTABLE, result.getStatus());
+ assertEquals(Status.ERROR, result.getStatus());
assertEquals(1, result.getMessages().size());
assertTrue(result.getMessages().containsKey("configName"));
// Acceptable state
config.notNull = "This is truly random string";
result = runner.validateConfig("configName", config);
- assertEquals(Status.FINE, result.getStatus());
+ assertEquals(Status.OK, result.getStatus());
assertEquals(0, result.getMessages().size());
}
@@ -100,7 +100,7 @@ public class TestValidationRunner {
config.str = null;
result = runner.validateConfig("configName", config);
- assertEquals(Status.UNACCEPTABLE, result.getStatus());
+ assertEquals(Status.ERROR, result.getStatus());
assertEquals(1, result.getMessages().size());
assertTrue(result.getMessages().containsKey("configName.str"));
assertEquals(2, result.getMessages().get("configName.str").size());
@@ -115,14 +115,14 @@ public class TestValidationRunner {
// Sub string not found
config.str = "Mordor";
result = runner.validateConfig("configName", config);
- assertEquals(Status.UNACCEPTABLE, result.getStatus());
+ assertEquals(Status.ERROR, result.getStatus());
assertEquals(1, result.getMessages().size());
assertTrue(result.getMessages().containsKey("configName.str"));
// Sub string found
config.str = "Morfindmedor";
result = runner.validateConfig("configName", config);
- assertEquals(Status.FINE, result.getStatus());
+ assertEquals(Status.OK, result.getStatus());
assertEquals(0, result.getMessages().size());
}
@@ -137,10 +137,10 @@ public class TestValidationRunner {
@Override
public void validate(ConfigurationA conf) {
if("error".equals(conf.formA.notNull)) {
- addMessage(Status.UNACCEPTABLE, "error");
+ addMessage(Status.ERROR, "error");
}
if("conf-error".equals(conf.formA.notNull)) {
- addMessage(Status.UNACCEPTABLE, "conf-error");
+ addMessage(Status.ERROR, "conf-error");
}
}
}
@@ -155,28 +155,28 @@ public class TestValidationRunner {
// Null string should fail on Input level and should not call config nor class level validators
conf.formA.notNull = null;
result = runner.validate(conf);
- assertEquals(Status.UNACCEPTABLE, result.getStatus());
+ assertEquals(Status.ERROR, result.getStatus());
assertEquals(1, result.getMessages().size());
assertTrue(result.getMessages().containsKey("formA.notNull"));
// String "error" should trigger config level error, but not Input nor class level
conf.formA.notNull = "error";
result = runner.validate(conf);
- assertEquals(Status.UNACCEPTABLE, result.getStatus());
+ assertEquals(Status.ERROR, result.getStatus());
assertEquals(1, result.getMessages().size());
assertTrue(result.getMessages().containsKey("formA"));
// String "conf-error" should trigger class level error, but not Input nor Config level
conf.formA.notNull = "conf-error";
result = runner.validate(conf);
- assertEquals(Status.UNACCEPTABLE, result.getStatus());
+ assertEquals(Status.ERROR, result.getStatus());
assertEquals(1, result.getMessages().size());
assertTrue(result.getMessages().containsKey(""));
// Valid string
conf.formA.notNull = "Valid string";
result = runner.validate(conf);
- assertEquals(Status.FINE, result.getStatus());
+ assertEquals(Status.OK, result.getStatus());
assertEquals(0, result.getMessages().size());
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/common/src/test/java/org/apache/sqoop/validation/validators/TestClassAvailable.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/validation/validators/TestClassAvailable.java b/common/src/test/java/org/apache/sqoop/validation/validators/TestClassAvailable.java
index 3a15274..c08cf0a 100644
--- a/common/src/test/java/org/apache/sqoop/validation/validators/TestClassAvailable.java
+++ b/common/src/test/java/org/apache/sqoop/validation/validators/TestClassAvailable.java
@@ -43,6 +43,6 @@ public class TestClassAvailable {
validator.validate("net.jarcec.super.private.project.Main");
assertEquals(1, validator.getMessages().size());
messages = validator.getMessages();
- assertEquals(Status.UNACCEPTABLE, messages.get(0).getStatus());
+ assertEquals(Status.ERROR, messages.get(0).getStatus());
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/common/src/test/java/org/apache/sqoop/validation/validators/TestContains.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/validation/validators/TestContains.java b/common/src/test/java/org/apache/sqoop/validation/validators/TestContains.java
index e63a69a..485efdd 100644
--- a/common/src/test/java/org/apache/sqoop/validation/validators/TestContains.java
+++ b/common/src/test/java/org/apache/sqoop/validation/validators/TestContains.java
@@ -34,56 +34,56 @@ public class TestContains {
// Default, no string argument set
validator.validate("str");
- assertEquals(Status.FINE, validator.getStatus());
+ assertEquals(Status.OK, validator.getStatus());
assertEquals(0, validator.getMessages().size());
// Searched substring is entire string
validator.reset();
validator.setStringArgument("str");
validator.validate("str");
- assertEquals(Status.FINE, validator.getStatus());
+ assertEquals(Status.OK, validator.getStatus());
assertEquals(0, validator.getMessages().size());
// Just starts with
validator.reset();
validator.setStringArgument("str");
validator.validate("straaaaa");
- assertEquals(Status.FINE, validator.getStatus());
+ assertEquals(Status.OK, validator.getStatus());
assertEquals(0, validator.getMessages().size());
// Ends with
validator.reset();
validator.setStringArgument("str");
validator.validate("aaastr");
- assertEquals(Status.FINE, validator.getStatus());
+ assertEquals(Status.OK, validator.getStatus());
assertEquals(0, validator.getMessages().size());
// In the middle
validator.reset();
validator.setStringArgument("str");
validator.validate("aaastraaa");
- assertEquals(Status.FINE, validator.getStatus());
+ assertEquals(Status.OK, validator.getStatus());
assertEquals(0, validator.getMessages().size());
// Null string
validator.reset();
validator.setStringArgument("str");
validator.validate(null);
- assertEquals(Status.UNACCEPTABLE, validator.getStatus());
+ assertEquals(Status.ERROR, validator.getStatus());
assertEquals(1, validator.getMessages().size());
// Empty string
validator.reset();
validator.setStringArgument("str");
validator.validate("");
- assertEquals(Status.UNACCEPTABLE, validator.getStatus());
+ assertEquals(Status.ERROR, validator.getStatus());
assertEquals(1, validator.getMessages().size());
// "Random" string
validator.reset();
validator.setStringArgument("str");
validator.validate("Ahoj tady je meduza");
- assertEquals(Status.UNACCEPTABLE, validator.getStatus());
+ assertEquals(Status.ERROR, validator.getStatus());
assertEquals(1, validator.getMessages().size());
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/common/src/test/java/org/apache/sqoop/validation/validators/TestNotEmpty.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/validation/validators/TestNotEmpty.java b/common/src/test/java/org/apache/sqoop/validation/validators/TestNotEmpty.java
index 5c9169a..1e53e0f 100644
--- a/common/src/test/java/org/apache/sqoop/validation/validators/TestNotEmpty.java
+++ b/common/src/test/java/org/apache/sqoop/validation/validators/TestNotEmpty.java
@@ -42,7 +42,7 @@ public class TestNotEmpty {
validator.validate("");
assertEquals(1, validator.getMessages().size());
messages = validator.getMessages();
- assertEquals(Status.UNACCEPTABLE, messages.get(0).getStatus());
+ assertEquals(Status.ERROR, messages.get(0).getStatus());
validator.reset();
assertEquals(0, validator.getMessages().size());
@@ -50,6 +50,6 @@ public class TestNotEmpty {
validator.validate(null);
assertEquals(1, validator.getMessages().size());
messages = validator.getMessages();
- assertEquals(Status.UNACCEPTABLE, messages.get(0).getStatus());
+ assertEquals(Status.ERROR, messages.get(0).getStatus());
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/common/src/test/java/org/apache/sqoop/validation/validators/TestNotNull.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/validation/validators/TestNotNull.java b/common/src/test/java/org/apache/sqoop/validation/validators/TestNotNull.java
index 91e5398..0a0b5dc 100644
--- a/common/src/test/java/org/apache/sqoop/validation/validators/TestNotNull.java
+++ b/common/src/test/java/org/apache/sqoop/validation/validators/TestNotNull.java
@@ -46,6 +46,6 @@ public class TestNotNull {
List<Message> messages = validator.getMessages();
Message msg = messages.get(0);
- assertEquals(Status.UNACCEPTABLE, msg.getStatus());
+ assertEquals(Status.ERROR, msg.getStatus());
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/common/src/test/java/org/apache/sqoop/validation/validators/TestNullOrContains.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/validation/validators/TestNullOrContains.java b/common/src/test/java/org/apache/sqoop/validation/validators/TestNullOrContains.java
index 88347eb..60eafff 100644
--- a/common/src/test/java/org/apache/sqoop/validation/validators/TestNullOrContains.java
+++ b/common/src/test/java/org/apache/sqoop/validation/validators/TestNullOrContains.java
@@ -34,63 +34,63 @@ public class TestNullOrContains {
// Default, no string argument set
validator.validate("str");
- assertEquals(Status.FINE, validator.getStatus());
+ assertEquals(Status.OK, validator.getStatus());
assertEquals(0, validator.getMessages().size());
// Searched substring is entire string
validator.reset();
validator.setStringArgument("str");
validator.validate("str");
- assertEquals(Status.FINE, validator.getStatus());
+ assertEquals(Status.OK, validator.getStatus());
assertEquals(0, validator.getMessages().size());
// Just starts with
validator.reset();
validator.setStringArgument("str");
validator.validate("straaaaa");
- assertEquals(Status.FINE, validator.getStatus());
+ assertEquals(Status.OK, validator.getStatus());
assertEquals(0, validator.getMessages().size());
// Ends with
validator.reset();
validator.setStringArgument("str");
validator.validate("aaastr");
- assertEquals(Status.FINE, validator.getStatus());
+ assertEquals(Status.OK, validator.getStatus());
assertEquals(0, validator.getMessages().size());
// In the middle
validator.reset();
validator.setStringArgument("str");
validator.validate("aaastraaa");
- assertEquals(Status.FINE, validator.getStatus());
+ assertEquals(Status.OK, validator.getStatus());
assertEquals(0, validator.getMessages().size());
// Repitition
validator.reset();
validator.setStringArgument("str");
validator.validate("aaastraaastraaa");
- assertEquals(Status.FINE, validator.getStatus());
+ assertEquals(Status.OK, validator.getStatus());
assertEquals(0, validator.getMessages().size());
// Null string
validator.reset();
validator.setStringArgument("str");
validator.validate(null);
- assertEquals(Status.FINE, validator.getStatus());
+ assertEquals(Status.OK, validator.getStatus());
assertEquals(0, validator.getMessages().size());
// Empty string
validator.reset();
validator.setStringArgument("str");
validator.validate("");
- assertEquals(Status.UNACCEPTABLE, validator.getStatus());
+ assertEquals(Status.ERROR, validator.getStatus());
assertEquals(1, validator.getMessages().size());
// "Random" string
validator.reset();
validator.setStringArgument("str");
validator.validate("Ahoj tady je meduza");
- assertEquals(Status.UNACCEPTABLE, validator.getStatus());
+ assertEquals(Status.ERROR, validator.getStatus());
assertEquals(1, validator.getMessages().size());
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/common/src/test/java/org/apache/sqoop/validation/validators/TestStartsWith.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/validation/validators/TestStartsWith.java b/common/src/test/java/org/apache/sqoop/validation/validators/TestStartsWith.java
index 8c4f9e0..0fd464c 100644
--- a/common/src/test/java/org/apache/sqoop/validation/validators/TestStartsWith.java
+++ b/common/src/test/java/org/apache/sqoop/validation/validators/TestStartsWith.java
@@ -34,40 +34,40 @@ public class TestStartsWith {
// Default, no string argument set
validator.validate("str");
- assertEquals(Status.FINE, validator.getStatus());
+ assertEquals(Status.OK, validator.getStatus());
assertEquals(0, validator.getMessages().size());
// Searched substring is entire string
validator.validate("str");
- assertEquals(Status.FINE, validator.getStatus());
+ assertEquals(Status.OK, validator.getStatus());
assertEquals(0, validator.getMessages().size());
// Just starts with
validator.reset();
validator.setStringArgument("str");
validator.validate("strstr");
- assertEquals(Status.FINE, validator.getStatus());
+ assertEquals(Status.OK, validator.getStatus());
assertEquals(0, validator.getMessages().size());
// Null string
validator.reset();
validator.setStringArgument("str");
validator.validate(null);
- assertEquals(Status.UNACCEPTABLE, validator.getStatus());
+ assertEquals(Status.ERROR, validator.getStatus());
assertEquals(1, validator.getMessages().size());
// Empty string
validator.reset();
validator.setStringArgument("str");
validator.validate("");
- assertEquals(Status.UNACCEPTABLE, validator.getStatus());
+ assertEquals(Status.ERROR, validator.getStatus());
assertEquals(1, validator.getMessages().size());
// "Random" string
validator.reset();
validator.setStringArgument("str");
validator.validate("Ahoj tady je meduza");
- assertEquals(Status.UNACCEPTABLE, validator.getStatus());
+ assertEquals(Status.ERROR, validator.getStatus());
assertEquals(1, validator.getMessages().size());
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/common/src/test/java/org/apache/sqoop/validation/validators/TestValidator.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/validation/validators/TestValidator.java b/common/src/test/java/org/apache/sqoop/validation/validators/TestValidator.java
index 3f60ee6..49b7609 100644
--- a/common/src/test/java/org/apache/sqoop/validation/validators/TestValidator.java
+++ b/common/src/test/java/org/apache/sqoop/validation/validators/TestValidator.java
@@ -30,8 +30,8 @@ public class TestValidator {
public static class ValidatorImpl extends AbstractValidator<String> {
@Override
public void validate(String msg) {
- addMessage(Status.FINE, msg);
- addMessage(new Message(Status.UNACCEPTABLE, "Prefix: " + msg));
+ addMessage(Status.OK, msg);
+ addMessage(new Message(Status.ERROR, "Prefix: " + msg));
}
}
@@ -44,11 +44,11 @@ public class TestValidator {
assertEquals(2, validator.getMessages().size());
Message msg = validator.getMessages().get(0);
- assertEquals(Status.FINE, msg.getStatus());
+ assertEquals(Status.OK, msg.getStatus());
assertEquals("X", msg.getMessage());
msg = validator.getMessages().get(1);
- assertEquals(Status.UNACCEPTABLE, msg.getStatus());
+ assertEquals(Status.ERROR, msg.getStatus());
assertEquals("Prefix: X", msg.getMessage());
validator.reset();
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/FromJobConfig.java
----------------------------------------------------------------------
diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/FromJobConfig.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/FromJobConfig.java
index e6e8ed4..7c29a92 100644
--- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/FromJobConfig.java
+++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/FromJobConfig.java
@@ -55,13 +55,13 @@ public class FromJobConfig {
@Override
public void validate(FromJobConfig config) {
if (config.tableName == null && config.sql == null) {
- addMessage(Status.UNACCEPTABLE, "Either table name or SQL must be specified");
+ addMessage(Status.ERROR, "Either table name or SQL must be specified");
}
if (config.tableName != null && config.sql != null) {
- addMessage(Status.UNACCEPTABLE, "Both table name and SQL cannot be specified");
+ addMessage(Status.ERROR, "Both table name and SQL cannot be specified");
}
if (config.schemaName != null && config.sql != null) {
- addMessage(Status.UNACCEPTABLE, "Both schema name and SQL cannot be specified");
+ addMessage(Status.ERROR, "Both schema name and SQL cannot be specified");
}
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/LinkConfig.java
----------------------------------------------------------------------
diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/LinkConfig.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/LinkConfig.java
index be86855..9a71f36 100644
--- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/LinkConfig.java
+++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/LinkConfig.java
@@ -57,7 +57,7 @@ public class LinkConfig {
try {
DriverManager.getConnection(linkConfig.connectionString, linkConfig.username, linkConfig.password);
} catch (SQLException e) {
- addMessage(Status.ACCEPTABLE, "Can't connect to the database with given credentials: " + e.getMessage());
+ addMessage(Status.WARNING, "Can't connect to the database with given credentials: " + e.getMessage());
}
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/ToJobConfig.java
----------------------------------------------------------------------
diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/ToJobConfig.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/ToJobConfig.java
index 3e55505..c9651d5 100644
--- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/ToJobConfig.java
+++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/configuration/ToJobConfig.java
@@ -50,17 +50,17 @@ public class ToJobConfig {
@Override
public void validate(ToJobConfig config) {
if (config.tableName == null && config.sql == null) {
- addMessage(Status.UNACCEPTABLE, "Either table name or SQL must be specified");
+ addMessage(Status.ERROR, "Either table name or SQL must be specified");
}
if (config.tableName != null && config.sql != null) {
- addMessage(Status.UNACCEPTABLE, "Both table name and SQL cannot be specified");
+ addMessage(Status.ERROR, "Both table name and SQL cannot be specified");
}
if (config.tableName == null && config.stageTableName != null) {
- addMessage(Status.UNACCEPTABLE,
+ addMessage(Status.ERROR,
"Stage table name cannot be specified without specifying table name");
}
if (config.stageTableName == null && config.shouldClearStageTable != null) {
- addMessage(Status.UNACCEPTABLE,
+ addMessage(Status.ERROR,
"Should Clear stage table cannot be specified without specifying the name of the stage table.");
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestToInitializer.java
----------------------------------------------------------------------
diff --git a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestToInitializer.java b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestToInitializer.java
index faf553d..2d7ec3a 100644
--- a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestToInitializer.java
+++ b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestToInitializer.java
@@ -293,7 +293,7 @@ public class TestToInitializer {
ConfigValidationResult result = validationRunner.validate(jobConfig);
assertEquals("User should not specify clear stage table flag without " +
"specifying name of the stage table",
- Status.UNACCEPTABLE,
+ Status.ERROR,
result.getStatus());
assertTrue(result.getMessages().containsKey(
"toJobConfig"));
@@ -302,7 +302,7 @@ public class TestToInitializer {
result = validationRunner.validate(jobConfig);
assertEquals("User should not specify clear stage table flag without " +
"specifying name of the stage table",
- Status.UNACCEPTABLE,
+ Status.ERROR,
result.getStatus());
assertTrue(result.getMessages().containsKey(
"toJobConfig"));
@@ -322,7 +322,7 @@ public class TestToInitializer {
ConfigValidationRunner validationRunner = new ConfigValidationRunner();
ConfigValidationResult result = validationRunner.validate(jobConfig);
assertEquals("Stage table name cannot be specified without specifying " +
- "table name", Status.UNACCEPTABLE, result.getStatus());
+ "table name", Status.ERROR, result.getStatus());
assertTrue(result.getMessages().containsKey(
"toJobConfig"));
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/configuration/LinkConfig.java
----------------------------------------------------------------------
diff --git a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/configuration/LinkConfig.java b/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/configuration/LinkConfig.java
index c63f8a8..146c3b1 100644
--- a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/configuration/LinkConfig.java
+++ b/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/configuration/LinkConfig.java
@@ -38,7 +38,7 @@ public class LinkConfig {
if (config.uri != null) {
Matcher matcher = URI_PATTERN.matcher(config.uri);
if (!matcher.matches()) {
- addMessage(Status.UNACCEPTABLE,
+ addMessage(Status.ERROR,
"Invalid URI" + config.uri + ". URI must either be null or a valid URI. Here are a few valid example URIs:"
+ " hdfs://example.com:8020/, hdfs://example.com/, file:///, file:///tmp, file://localhost/tmp");
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/configuration/ToJobConfig.java
----------------------------------------------------------------------
diff --git a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/configuration/ToJobConfig.java b/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/configuration/ToJobConfig.java
index 7fb1f74..abddbfb 100644
--- a/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/configuration/ToJobConfig.java
+++ b/connector/connector-hdfs/src/main/java/org/apache/sqoop/connector/hdfs/configuration/ToJobConfig.java
@@ -44,12 +44,12 @@ public class ToJobConfig {
if(conf.customCompression != null &&
conf.customCompression.trim().length() > 0 &&
conf.compression != ToCompression.CUSTOM) {
- addMessage(Status.UNACCEPTABLE, "Custom compression codec should be blank as " + conf.compression + " is being used");
+ addMessage(Status.ERROR, "Custom compression codec should be blank as " + conf.compression + " is being used");
}
if(conf.compression == ToCompression.CUSTOM &&
(conf.customCompression == null || conf.customCompression.trim().length() == 0)) {
- addMessage(Status.UNACCEPTABLE, "Custom compression field is blank.");
+ addMessage(Status.ERROR, "Custom compression field is blank.");
}
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java b/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java
index a1e734e..56add07 100644
--- a/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java
+++ b/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java
@@ -800,7 +800,7 @@ public class TestJdbcRepository {
public static class InternalValidator extends AbstractValidator {
@Override
public void validate(Object instance) {
- addMessage(Status.UNACCEPTABLE, "Simply because.");
+ addMessage(Status.ERROR, "Simply because.");
}
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/docs/src/site/sphinx/ClientAPI.rst
----------------------------------------------------------------------
diff --git a/docs/src/site/sphinx/ClientAPI.rst b/docs/src/site/sphinx/ClientAPI.rst
index 4f3fda6..7293716 100644
--- a/docs/src/site/sphinx/ClientAPI.rst
+++ b/docs/src/site/sphinx/ClientAPI.rst
@@ -114,11 +114,11 @@ List of status code
+------------------+------------------------------------------------------------------------------------------------------------+
| Function | Description |
+==================+============================================================================================================+
-| ``FINE`` | There are no issues, no warnings. |
+| ``OK`` | There are no issues, no warnings. |
+------------------+------------------------------------------------------------------------------------------------------------+
-| ``ACCEPTABLE`` | Validated entity is correct enough to be processed. There might be some warnings, but no errors. |
+| ``WARNING`` | Validated entity is correct enough to be processed. There might be some warnings, but no errors. |
+------------------+------------------------------------------------------------------------------------------------------------+
-| ``UNACCEPTABLE`` | There are serious issues with validated entity. We can't proceed until reported issues will be resolved. |
+| ``ERROR`` | There are serious issues with validated entity. We can't proceed until reported issues will be resolved. |
+------------------+------------------------------------------------------------------------------------------------------------+
View Error or Warning message
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/CloneJobFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/CloneJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/CloneJobFunction.java
index 8188831..be5ddce 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/CloneJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/CloneJobFunction.java
@@ -69,7 +69,7 @@ public class CloneJobFunction extends SqoopFunction {
job.getConnectorId(Direction.TO));
ResourceBundle driverConfigBundle = client.getDriverConfigBundle();
- Status status = Status.FINE;
+ Status status = Status.OK;
// Remove persistent id as we're making a clone
job.setPersistenceId(MPersistableEntity.PERSISTANCE_ID_DEFAULT);
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/CloneLinkFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/CloneLinkFunction.java b/shell/src/main/java/org/apache/sqoop/shell/CloneLinkFunction.java
index c1a4f55..3db68f9 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/CloneLinkFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/CloneLinkFunction.java
@@ -65,7 +65,7 @@ public class CloneLinkFunction extends SqoopFunction {
// Remove persistent id as we're making a clone
connection.setPersistenceId(MPersistableEntity.PERSISTANCE_ID_DEFAULT);
- Status status = Status.FINE;
+ Status status = Status.OK;
ResourceBundle linkConfigBundle = client.getConnectorConfigBundle(connection.getConnectorId());
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/CreateJobFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/CreateJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/CreateJobFunction.java
index 6f136b2..47ad5ff 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/CreateJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/CreateJobFunction.java
@@ -79,7 +79,7 @@ public class CreateJobFunction extends SqoopFunction {
job.getConnectorId(Direction.TO));
ResourceBundle driverConfigBundle = client.getDriverConfigBundle();
- Status status = Status.FINE;
+ Status status = Status.OK;
if (isInteractive) {
printlnResource(Constants.RES_PROMPT_FILL_JOB_CONFIG);
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/CreateLinkFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/CreateLinkFunction.java b/shell/src/main/java/org/apache/sqoop/shell/CreateLinkFunction.java
index ce9988f..4090597 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/CreateLinkFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/CreateLinkFunction.java
@@ -64,7 +64,7 @@ public class CreateLinkFunction extends SqoopFunction {
ResourceBundle connectorConfigBundle = client.getConnectorConfigBundle(connectorId);
- Status status = Status.FINE;
+ Status status = Status.OK;
if (isInteractive) {
printlnResource(Constants.RES_PROMPT_FILL_LINK_CONFIG);
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/DeleteJobFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/DeleteJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/DeleteJobFunction.java
index da26153..bf4e507 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/DeleteJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/DeleteJobFunction.java
@@ -43,6 +43,6 @@ public class DeleteJobFunction extends SqoopFunction {
@Override
public Object executeFunction(CommandLine line, boolean isInteractive) {
client.deleteJob(getLong(line, Constants.OPT_JID));
- return Status.FINE;
+ return Status.OK;
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/DeleteLinkFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/DeleteLinkFunction.java b/shell/src/main/java/org/apache/sqoop/shell/DeleteLinkFunction.java
index c81917e..896be3f 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/DeleteLinkFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/DeleteLinkFunction.java
@@ -42,6 +42,6 @@ public class DeleteLinkFunction extends SqoopFunction {
@Override
public Object executeFunction(CommandLine line, boolean isInteractive) {
client.deleteLink(getLong(line, Constants.OPT_LID));
- return Status.FINE;
+ return Status.OK;
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/DisableJobFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/DisableJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/DisableJobFunction.java
index 9e46804..907c785 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/DisableJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/DisableJobFunction.java
@@ -51,6 +51,6 @@ public class DisableJobFunction extends SqoopFunction {
@Override
public Object executeFunction(CommandLine line, boolean isInteractive) {
client.enableJob(getLong(line, Constants.OPT_JID), false);
- return Status.FINE;
+ return Status.OK;
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/DisableLinkFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/DisableLinkFunction.java b/shell/src/main/java/org/apache/sqoop/shell/DisableLinkFunction.java
index 6b85292..46b35a1 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/DisableLinkFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/DisableLinkFunction.java
@@ -42,6 +42,6 @@ public class DisableLinkFunction extends SqoopFunction {
@Override
public Object executeFunction(CommandLine line, boolean isInteractive) {
client.enableLink(getLong(line, Constants.OPT_LID), false);
- return Status.FINE;
+ return Status.OK;
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/EnableJobFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/EnableJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/EnableJobFunction.java
index 8575a84..69ebe73 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/EnableJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/EnableJobFunction.java
@@ -43,6 +43,6 @@ public class EnableJobFunction extends SqoopFunction {
@Override
public Object executeFunction(CommandLine line, boolean isInteractive) {
client.enableJob(getLong(line, Constants.OPT_JID), true);
- return Status.FINE;
+ return Status.OK;
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/EnableLinkFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/EnableLinkFunction.java b/shell/src/main/java/org/apache/sqoop/shell/EnableLinkFunction.java
index 1dd30e8..728433b 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/EnableLinkFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/EnableLinkFunction.java
@@ -42,6 +42,6 @@ public class EnableLinkFunction extends SqoopFunction {
@Override
public Object executeFunction(CommandLine line, boolean isInteractive) {
client.enableLink(getLong(line, Constants.OPT_LID), true);
- return Status.FINE;
+ return Status.OK;
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/SetOptionFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/SetOptionFunction.java b/shell/src/main/java/org/apache/sqoop/shell/SetOptionFunction.java
index ccc067f..3f5f570 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/SetOptionFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/SetOptionFunction.java
@@ -67,7 +67,7 @@ public class SetOptionFunction extends SqoopFunction {
setVerbose(newValue);
printlnResource(Constants.RES_SET_VERBOSE_CHANGED, newValue);
- return Status.FINE;
+ return Status.OK;
}
if (name.equals(Constants.OPT_POLL_TIMEOUT)) {
@@ -82,7 +82,7 @@ public class SetOptionFunction extends SqoopFunction {
setPollTimeout(newValue);
printlnResource(Constants.RES_SET_POLL_TIMEOUT_CHANGED, newValue);
- return Status.FINE;
+ return Status.OK;
}
printlnResource(Constants.RES_SET_UNKNOWN_OPT_IGNORED, name);
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/SetServerFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/SetServerFunction.java b/shell/src/main/java/org/apache/sqoop/shell/SetServerFunction.java
index 84df281..0bab98a 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/SetServerFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/SetServerFunction.java
@@ -81,6 +81,6 @@ public class SetServerFunction extends SqoopFunction {
printlnResource(Constants.RES_SET_SERVER_SUCCESSFUL);
- return Status.FINE;
+ return Status.OK;
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/ShowConnectorFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowConnectorFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowConnectorFunction.java
index d605457..2a21b85 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowConnectorFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowConnectorFunction.java
@@ -23,8 +23,6 @@ import java.util.List;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.OptionBuilder;
-import org.apache.sqoop.common.Direction;
-import org.apache.sqoop.common.SupportedDirections;
import org.apache.sqoop.model.MConnector;
import org.apache.sqoop.shell.core.Constants;
import org.apache.sqoop.shell.utils.TableDisplayer;
@@ -58,7 +56,7 @@ public class ShowConnectorFunction extends SqoopFunction {
showSummary();
}
- return Status.FINE;
+ return Status.OK;
}
private void showSummary() {
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/ShowDriverFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowDriverFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowDriverFunction.java
index 080792b..e598bf2 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowDriverFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowDriverFunction.java
@@ -45,7 +45,7 @@ public class ShowDriverFunction extends SqoopFunction {
@Override
public Object executeFunction(CommandLine line, boolean isInteractive) {
showDriver();
- return Status.FINE;
+ return Status.OK;
}
private void showDriver() {
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/ShowJobFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowJobFunction.java
index 0640283..98363fa 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowJobFunction.java
@@ -59,7 +59,7 @@ public class ShowJobFunction extends SqoopFunction {
showSummary();
}
- return Status.FINE;
+ return Status.OK;
}
private void showSummary() {
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/ShowLinkFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowLinkFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowLinkFunction.java
index f4eae33..e92f0b4 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowLinkFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowLinkFunction.java
@@ -58,7 +58,7 @@ public class ShowLinkFunction extends SqoopFunction {
showSummary();
}
- return Status.FINE;
+ return Status.OK;
}
private void showSummary() {
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/ShowOptionFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowOptionFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowOptionFunction.java
index 4bb0cab..46eabf7 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowOptionFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowOptionFunction.java
@@ -70,7 +70,7 @@ public class ShowOptionFunction extends SqoopFunction {
return null;
}
- return Status.FINE;
+ return Status.OK;
}
/**
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/ShowServerFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowServerFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowServerFunction.java
index 67eb6a6..cf9df7f 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowServerFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowServerFunction.java
@@ -75,7 +75,7 @@ public class ShowServerFunction extends SqoopFunction {
showServer(host, port, webapp, version);
}
- return Status.FINE;
+ return Status.OK;
}
private void showServer(boolean host, boolean port, boolean webapp, boolean version) {
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/ShowSubmissionFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowSubmissionFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowSubmissionFunction.java
index 2d00b88..4a0f476 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowSubmissionFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowSubmissionFunction.java
@@ -60,7 +60,7 @@ public class ShowSubmissionFunction extends SqoopFunction {
}
}
- return Status.FINE;
+ return Status.OK;
}
private void showSummary(Long jid) {
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/ShowVersionFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowVersionFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowVersionFunction.java
index 3b4bb3f..310d83b 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowVersionFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowVersionFunction.java
@@ -79,7 +79,7 @@ public class ShowVersionFunction extends SqoopFunction {
showVersion(server, client, restApi);
}
- return Status.FINE;
+ return Status.OK;
}
private void showVersion(boolean server, boolean client, boolean restApi) {
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/StartJobFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/StartJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/StartJobFunction.java
index 4363f05..0dc4e78 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/StartJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/StartJobFunction.java
@@ -88,6 +88,6 @@ public class StartJobFunction extends SqoopFunction {
return null;
}
- return Status.FINE;
+ return Status.OK;
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/StatusJobFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/StatusJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/StatusJobFunction.java
index fb83af3..922977a 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/StatusJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/StatusJobFunction.java
@@ -54,6 +54,6 @@ public class StatusJobFunction extends SqoopFunction {
return null;
}
- return Status.FINE;
+ return Status.OK;
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/StopJobFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/StopJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/StopJobFunction.java
index 790c522..c34152e 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/StopJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/StopJobFunction.java
@@ -51,6 +51,6 @@ public class StopJobFunction extends SqoopFunction {
return null;
}
- return Status.FINE;
+ return Status.OK;
}
}
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/UpdateJobFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/UpdateJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/UpdateJobFunction.java
index dd075d7..79a9794 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/UpdateJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/UpdateJobFunction.java
@@ -70,7 +70,7 @@ public class UpdateJobFunction extends SqoopFunction {
ResourceBundle driverConfigBundle = client.getDriverConfigBundle();
- Status status = Status.FINE;
+ Status status = Status.OK;
if (isInteractive) {
printlnResource(Constants.RES_PROMPT_UPDATE_JOB_CONFIG);
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/UpdateLinkFunction.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/UpdateLinkFunction.java b/shell/src/main/java/org/apache/sqoop/shell/UpdateLinkFunction.java
index 60f9500..c3775ad 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/UpdateLinkFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/UpdateLinkFunction.java
@@ -65,7 +65,7 @@ public class UpdateLinkFunction extends SqoopFunction {
ResourceBundle connectorLinkConfigBundle = client.getConnectorConfigBundle(link.getConnectorId());
- Status status = Status.FINE;
+ Status status = Status.OK;
if (isInteractive) {
printlnResource(Constants.RES_PROMPT_UPDATE_LINK_CONFIG);
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/utils/ConfigDisplayer.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/utils/ConfigDisplayer.java b/shell/src/main/java/org/apache/sqoop/shell/utils/ConfigDisplayer.java
index dea271a..2bba4cf 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/utils/ConfigDisplayer.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/utils/ConfigDisplayer.java
@@ -134,7 +134,7 @@ public final class ConfigDisplayer {
}
/**
- * Method prints the warning message of ACCEPTABLE status
+ * Method prints the warning message of WARNING status
* @param entity - link or job instance
*/
public static void displayConfigWarning(MAccountableEntity entity) {
@@ -150,7 +150,7 @@ public final class ConfigDisplayer {
configList.addAll(job.getJobConfig(Direction.TO).getConfigs());
}
for(MConfig config : configList) {
- if(config.getValidationStatus() == Status.ACCEPTABLE) {
+ if(config.getValidationStatus() == Status.WARNING) {
if(showMessage) {
print("\n@|yellow %s|@\n", resourceString(Constants.RES_CONFIG_DISPLAYER_FORM_WARNING));
showMessage = false;
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/shell/src/main/java/org/apache/sqoop/shell/utils/ConfigFiller.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/sqoop/shell/utils/ConfigFiller.java b/shell/src/main/java/org/apache/sqoop/shell/utils/ConfigFiller.java
index c61d33b..de40818 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/utils/ConfigFiller.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/utils/ConfigFiller.java
@@ -820,7 +820,7 @@ public final class ConfigFiller {
}
/**
- * Print validation message in cases that it's not in state "FINE"
+ * Print validation message in cases that it's not in state "OK"
*
* @param element Validated element
*/
@@ -831,14 +831,14 @@ public final class ConfigFiller {
for(Message message : element.getValidationMessages())
switch (message.getStatus()) {
- case UNACCEPTABLE:
+ case ERROR:
if (includeInputPrefix) {
errorMessage(element, message.getMessage());
} else {
errorMessage(message.getMessage());
}
break;
- case ACCEPTABLE:
+ case WARNING:
if (includeInputPrefix) {
warningMessage(element, message.getMessage());
} else {
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6319e3a/test/src/main/java/org/apache/sqoop/test/testcases/ConnectorTestCase.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/sqoop/test/testcases/ConnectorTestCase.java b/test/src/main/java/org/apache/sqoop/test/testcases/ConnectorTestCase.java
index 06462a3..fdb992a 100644
--- a/test/src/main/java/org/apache/sqoop/test/testcases/ConnectorTestCase.java
+++ b/test/src/main/java/org/apache/sqoop/test/testcases/ConnectorTestCase.java
@@ -219,7 +219,7 @@ abstract public class ConnectorTestCase extends TomcatTestCase {
* @param link
*/
protected void saveLink(MLink link) {
- assertEquals(Status.FINE, getClient().saveLink(link));
+ assertEquals(Status.OK, getClient().saveLink(link));
assertNotSame(MPersistableEntity.PERSISTANCE_ID_DEFAULT, link.getPersistenceId());
}
@@ -231,7 +231,7 @@ abstract public class ConnectorTestCase extends TomcatTestCase {
* @param job
*/
protected void saveJob(MJob job) {
- assertEquals(Status.FINE, getClient().saveJob(job));
+ assertEquals(Status.OK, getClient().saveJob(job));
assertNotSame(MPersistableEntity.PERSISTANCE_ID_DEFAULT, job.getPersistenceId());
}
|