Little refactorings in greeter samples
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 @@
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;
}
}
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 @@
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 @@
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());
}
}
}
