Little refactorings in greeter samples
Project: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/commit/3d2022a1 Tree: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/tree/3d2022a1 Diff: http://git-wip-us.apache.org/repos/asf/cxf-dosgi/diff/3d2022a1 Branch: refs/heads/master Commit: 3d2022a1170624358366bb59f277f554b34804a1 Parents: 09ff50b Author: Amichai Rothman <amic...@apache.org> Authored: Fri Jan 29 17:06:39 2016 +0200 Committer: Amichai Rothman <amic...@apache.org> Committed: Fri Jan 29 17:06:39 2016 +0200 ---------------------------------------------------------------------- .../greeter/impl/GreeterServiceImpl.java | 4 +- .../samples/greeter/client/rest/Activator.java | 42 ++++++++++---------- 2 files changed, 21 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/3d2022a1/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/GreeterServiceImpl.java ---------------------------------------------------------------------- diff --git a/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/GreeterServiceImpl.java b/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/GreeterServiceImpl.java index 6e6a4af..0a10dd8 100644 --- a/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/GreeterServiceImpl.java +++ b/samples/greeter/impl/src/main/java/org/apache/cxf/dosgi/samples/greeter/impl/GreeterServiceImpl.java @@ -50,12 +50,10 @@ public class GreeterServiceImpl implements GreeterService { String details = gd.getName() + "(" + gd.getAge() + ")"; System.out.println("Invoking: greetMe(" + details + ")"); - GreetingPhrase[] greetings = new GreetingPhrase[] { + return new GreetingPhrase[] { new GreetingPhrase("Howdy " + details), new GreetingPhrase("Hallo " + details), new GreetingPhrase("Ni hao " + details) }; - - return greetings; } } http://git-wip-us.apache.org/repos/asf/cxf-dosgi/blob/3d2022a1/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java ---------------------------------------------------------------------- diff --git a/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java b/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java index 667060f..2d5cfd1 100644 --- a/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java +++ b/samples/greeter_rest/client/src/main/java/org/apache/cxf/dosgi/samples/greeter/client/rest/Activator.java @@ -85,19 +85,18 @@ public class Activator implements BundleActivator { String name = JOptionPane.showInputDialog("Enter name:"); if (name == null) { break; - } else { - System.out.println("*** Invoking greeter ***"); - try { - GreeterInfo info = greeter.greetMe(name); + } + System.out.println("*** Invoking greeter ***"); + try { + GreeterInfo info = greeter.greetMe(name); - System.out.println("greetMe(\"" + name + "\") returns:"); - for (GreetingPhrase greeting: info.getGreetings()) { - System.out.println(" " + greeting.getPhrase() - + " " + greeting.getName()); - } - } catch (GreeterException ex) { - System.out.println("GreeterException: " + ex.toString()); + System.out.println("greetMe(\"" + name + "\") returns:"); + for (GreetingPhrase greeting: info.getGreetings()) { + System.out.println(" " + greeting.getPhrase() + + " " + greeting.getName()); } + } catch (GreeterException ex) { + System.out.println("GreeterException: " + ex.toString()); } } } @@ -108,19 +107,18 @@ public class Activator implements BundleActivator { String name = JOptionPane.showInputDialog("Greeter2: Enter name"); if (name == null) { break; - } else { - System.out.println("*** Invoking greeter2 ***"); - try { - GreeterInfo info = greeter.greetMe(name); + } + System.out.println("*** Invoking greeter2 ***"); + try { + GreeterInfo info = greeter.greetMe(name); - System.out.println("greetMe(\"" + name + "\") returns:"); - for (GreetingPhrase greeting: info.getGreetings()) { - System.out.println(" " + greeting.getPhrase() - + " " + greeting.getName()); - } - } catch (GreeterException ex) { - System.out.println("GreeterException: " + ex.toString()); + System.out.println("greetMe(\"" + name + "\") returns:"); + for (GreetingPhrase greeting: info.getGreetings()) { + System.out.println(" " + greeting.getPhrase() + + " " + greeting.getName()); } + } catch (GreeterException ex) { + System.out.println("GreeterException: " + ex.toString()); } } }