From 0e84b877726a446664fb2b07cc1619f2371eb1bb Mon Sep 17 00:00:00 2001 From: Sean Flanigan Date: Wed, 14 Jan 2015 10:57:45 +1000 Subject: [PATCH] Squashed commit of the following: commit 259510ced07390eb38bd830651cddf1a75954ed4 Merge: fdbdd25 5b902fd Author: Sean Flanigan Date: Wed Jan 14 10:46:48 2015 +1000 Merge remote-tracking branch 'origin/master' into fix-formatting Conflicts: zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java zanata-rest-client/src/main/java/org/zanata/rest/client/ClientUtility.java zanata-rest-client/src/main/java/org/zanata/rest/client/TraceDebugInterceptor.java commit fdbdd25198f8565f633c62f55f8c4ec95d810524 Author: Sean Flanigan Date: Fri Dec 5 15:23:28 2014 +1000 Update zanata-parent commit 97d9ac922fd66e704ebc2dd29e0d9b5647e60259 Author: Sean Flanigan Date: Fri Dec 5 11:41:39 2014 +1000 Fix formatting --- .../src/main/java/org/zanata/client/ZanataClient.java | 7 +++---- .../test/java/org/zanata/client/HTTPMockContainer.java | 2 +- .../test/java/org/zanata/client/ZanataClientTest.java | 2 +- .../java/org/zanata/client/commands/UpdateChecker.java | 3 +-- .../zanata/client/commands/init/SourceConfigPrompt.java | 3 +-- .../org/zanata/client/commands/pull/PullCommand.java | 7 +++---- .../org/zanata/client/commands/pull/RawPullCommand.java | 2 +- .../org/zanata/client/commands/push/PushCommand.java | 8 +++++--- .../org/zanata/client/commands/push/RawPushCommand.java | 9 +++------ .../client/commands/stats/GetStatisticsCommand.java | 5 ++--- .../src/test/java/org/zanata/client/MockServerRule.java | 3 +-- .../java/org/zanata/client/commands/OptionsUtilTest.java | 2 +- .../zanata/client/commands/init/ProjectPromptTest.java | 3 ++- .../src/main/java/org/zanata/maven/PushSimpleMojo.java | 3 ++- 14 files changed, 27 insertions(+), 32 deletions(-) diff --git a/zanata-cli/src/main/java/org/zanata/client/ZanataClient.java b/zanata-cli/src/main/java/org/zanata/client/ZanataClient.java index df73ffb8..01993924 100644 --- a/zanata-cli/src/main/java/org/zanata/client/ZanataClient.java +++ b/zanata-cli/src/main/java/org/zanata/client/ZanataClient.java @@ -211,10 +211,9 @@ private void printHelp(PrintWriter out) { out.println(); out.println("Available commands:"); for (String cmd : OPTIONS.keySet()) { - out.println(" " + cmd /* - * + ": " + OPTIONS.get(cmd).newInstance(). - * getCommandDescription() - */); + out.println(" " + cmd); + // + ": " + OPTIONS.get(cmd).newInstance(). + // getCommandDescription() } } diff --git a/zanata-cli/src/test/java/org/zanata/client/HTTPMockContainer.java b/zanata-cli/src/test/java/org/zanata/client/HTTPMockContainer.java index 0429295b..a30ecad7 100644 --- a/zanata-cli/src/test/java/org/zanata/client/HTTPMockContainer.java +++ b/zanata-cli/src/test/java/org/zanata/client/HTTPMockContainer.java @@ -49,7 +49,7 @@ public void handle(Request request, Response response) { body.println(responseContent); body.close(); - } catch(Exception e) { + } catch (Exception e) { e.printStackTrace(); } } diff --git a/zanata-cli/src/test/java/org/zanata/client/ZanataClientTest.java b/zanata-cli/src/test/java/org/zanata/client/ZanataClientTest.java index 61f0060a..02b64399 100644 --- a/zanata-cli/src/test/java/org/zanata/client/ZanataClientTest.java +++ b/zanata-cli/src/test/java/org/zanata/client/ZanataClientTest.java @@ -28,7 +28,7 @@ * */ @PrepareForTest(SubCommandHandler2.class) -@PowerMockIgnore({"com.sun.*", "org.apache.log4j.*", "org.xml.*", "javax.xml.*"}) +@PowerMockIgnore({ "com.sun.*", "org.apache.log4j.*", "org.xml.*", "javax.xml.*" }) @RunWith(PowerMockRunner.class) public class ZanataClientTest { @Rule diff --git a/zanata-client-commands/src/main/java/org/zanata/client/commands/UpdateChecker.java b/zanata-client-commands/src/main/java/org/zanata/client/commands/UpdateChecker.java index b6f3da9b..aa523f6a 100644 --- a/zanata-client-commands/src/main/java/org/zanata/client/commands/UpdateChecker.java +++ b/zanata-client-commands/src/main/java/org/zanata/client/commands/UpdateChecker.java @@ -188,8 +188,7 @@ public void checkNewerVersion() { props.setProperty(LAST_CHECKED, today); props.store(new BufferedWriter(new FileWriterWithEncoding( updateMarker, Charsets.UTF_8)), null); - } - catch (IOException e) { + } catch (IOException e) { log.warn("failed to load file {}", updateMarker); } } diff --git a/zanata-client-commands/src/main/java/org/zanata/client/commands/init/SourceConfigPrompt.java b/zanata-client-commands/src/main/java/org/zanata/client/commands/init/SourceConfigPrompt.java index 8f7fa6fe..0df88386 100644 --- a/zanata-client-commands/src/main/java/org/zanata/client/commands/init/SourceConfigPrompt.java +++ b/zanata-client-commands/src/main/java/org/zanata/client/commands/init/SourceConfigPrompt.java @@ -176,8 +176,7 @@ private static String getUsageFromOptionAnnotation( Option.class).usage() // the usage text is not very well formatted (contains new line) .replaceAll(System.getProperty("line.separator"), " "); - } - catch (NoSuchMethodException e) { + } catch (NoSuchMethodException e) { log.error("can not find method: {} on class {}", methodName, optionsClass); return methodName; } diff --git a/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java b/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java index ae9faddd..9bceaa14 100644 --- a/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java +++ b/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java @@ -264,9 +264,8 @@ && getOpts().getPullType() == PushPullType.Source) { transResponse.getHeaders() .getFirst(HttpHeaders.ETAG)); } - } - // 304 NOT MODIFIED (the document can stay the same) - else if (transResponse.getClientResponseStatus() == ClientResponse.Status.NOT_MODIFIED) { + } else if (transResponse.getClientResponseStatus() == ClientResponse.Status.NOT_MODIFIED) { + // 304 NOT MODIFIED (the document can stay the same) log.info( "No changes in translations for locale {} and document {}", locale, localDocName); @@ -309,7 +308,7 @@ else if (transResponse.getClientResponseStatus() == ClientResponse.Status.NOT_MO } catch (RuntimeException e) { String message = - "Operation failed: "+e.getMessage()+"\n\n" + "Operation failed: " + e.getMessage() + "\n\n" + " To retry from the last document, please set the following option(s):\n\n" + " "; if (getOpts().getEnableModules()) { diff --git a/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java b/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java index 3880155e..474985c2 100644 --- a/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java +++ b/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/RawPullCommand.java @@ -212,7 +212,7 @@ public void run() throws IOException { } } catch (IOException | RuntimeException e) { log.error( - "Operation failed: "+e.getMessage()+"\n\n" + "Operation failed: " + e.getMessage() + "\n\n" + " To retry from the last document, please add the option: {}\n", getOpts().buildFromDocArgument(qualifiedDocName)); throw new RuntimeException(e.getMessage(), e); diff --git a/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java b/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java index bbfc91fc..b4fe7e1d 100644 --- a/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java +++ b/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java @@ -420,7 +420,7 @@ public void visit(LocaleMapping locale, } } catch (Exception e) { String message = - "Operation failed: "+e.getMessage()+"\n\n" + "Operation failed: " + e.getMessage() + "\n\n" + " To retry from the last document, please set the following option(s):\n\n" + " "; if (getOpts().getEnableModules()) { @@ -572,7 +572,8 @@ private void pushSrcDocToServer(final String docUri, final Resource srcDoc, break; } - wait(POLL_PERIOD); // Wait before retrying + // Wait before retrying + wait(POLL_PERIOD); status = asyncProcessClient.getProcessStatus(status.getUrl()); } @@ -693,7 +694,8 @@ targetDoc, extensions, getOpts() break; } - wait(POLL_PERIOD); // Wait before retrying + // Wait before retrying + wait(POLL_PERIOD); status = asyncProcessClient.getProcessStatus(status.getUrl()); } ConsoleUtils.endProgressFeedback(); diff --git a/zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java b/zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java index 1086f159..2a92cd48 100644 --- a/zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java +++ b/zanata-client-commands/src/main/java/org/zanata/client/commands/push/RawPushCommand.java @@ -172,11 +172,8 @@ public void run() throws IOException { + "': existing translations on server may be overwritten/deleted"); if (getOpts().getPushType() == PushPullType.Both) { - confirmWithUser("This will overwrite existing documents AND TRANSLATIONS on the server.\n"); // , - // and - // delete - // obsolete - // documents.\n"); + confirmWithUser("This will overwrite existing documents AND TRANSLATIONS on the server.\n"); + // , and delete obsolete documents.\n"); } else if (getOpts().getPushType() == PushPullType.Trans) { confirmWithUser("This will overwrite existing TRANSLATIONS on the server.\n"); } @@ -229,7 +226,7 @@ public void visit(LocaleMapping locale, } } catch (IOException | RuntimeException e) { log.error( - "Operation failed: "+e.getMessage()+"\n\n" + "Operation failed: " + e.getMessage() + "\n\n" + " To retry from the last document, please add the option: {}\n", getOpts().buildFromDocArgument(localDocName)); throw new RuntimeException(e.getMessage(), e); diff --git a/zanata-client-commands/src/main/java/org/zanata/client/commands/stats/GetStatisticsCommand.java b/zanata-client-commands/src/main/java/org/zanata/client/commands/stats/GetStatisticsCommand.java index 39f06d82..3d27f772 100644 --- a/zanata-client-commands/src/main/java/org/zanata/client/commands/stats/GetStatisticsCommand.java +++ b/zanata-client-commands/src/main/java/org/zanata/client/commands/stats/GetStatisticsCommand.java @@ -90,9 +90,8 @@ public void run() throws Exception { .getProjectVersion(), getOpts().getIncludeDetails(), getOpts() .getIncludeWordLevelStats(), localeListArg); - } - // Otherwise, stats for the single document - else { + } else { + // Otherwise, stats for the single document containerStats = client .getStatistics(getOpts().getProj(), getOpts() diff --git a/zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java b/zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java index d2c06ba1..7d2d52de 100644 --- a/zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java +++ b/zanata-client-commands/src/test/java/org/zanata/client/MockServerRule.java @@ -151,8 +151,7 @@ private static URI setUrl(ConfigurableProjectOptions opts) { URI uri = new URI("http://localhost:8888/zanata"); opts.setUrl(uri.toURL()); return uri; - } - catch (Exception e) { + } catch (Exception e) { throw Throwables.propagate(e); } } diff --git a/zanata-client-commands/src/test/java/org/zanata/client/commands/OptionsUtilTest.java b/zanata-client-commands/src/test/java/org/zanata/client/commands/OptionsUtilTest.java index f230ec2b..7b90eac8 100644 --- a/zanata-client-commands/src/test/java/org/zanata/client/commands/OptionsUtilTest.java +++ b/zanata-client-commands/src/test/java/org/zanata/client/commands/OptionsUtilTest.java @@ -132,6 +132,6 @@ public void willThrowExceptionIfRuleIsInvalid() { OptionsUtil.checkPotentialMistakesInRules(opts, console); - verify(console).printfln(Warning, _("invalid.rule"),rule); + verify(console).printfln(Warning, _("invalid.rule"), rule); } } diff --git a/zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectPromptTest.java b/zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectPromptTest.java index 4c4c4bda..a43bb7e0 100644 --- a/zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectPromptTest.java +++ b/zanata-client-commands/src/test/java/org/zanata/client/commands/init/ProjectPromptTest.java @@ -88,7 +88,8 @@ public void willFilterAllProjectsIfUserTypeLetters() { // Given: user input ConsoleInteractor console = MockConsoleInteractor.predefineAnswers( - "99", // part of project name + // part of project name + "99", "1"); prompt = new ProjectPrompt(console, opts, diff --git a/zanata-maven-plugin/src/main/java/org/zanata/maven/PushSimpleMojo.java b/zanata-maven-plugin/src/main/java/org/zanata/maven/PushSimpleMojo.java index 48b310ab..c8dce97b 100644 --- a/zanata-maven-plugin/src/main/java/org/zanata/maven/PushSimpleMojo.java +++ b/zanata-maven-plugin/src/main/java/org/zanata/maven/PushSimpleMojo.java @@ -41,6 +41,7 @@ public boolean getEnableModules() { @Override public boolean getDeleteObsoleteModules() { - return false; // False for Simple push + // False for Simple push + return false; } }