Bläddra i källkod

Switch to tabs, and adjust tabsizing in asciidoctor.

Greg Turnquist 5 år sedan
förälder
incheckning
414f669259

+ 6 - 6
README.adoc

@@ -54,7 +54,7 @@ The service will accept messages containing a name in a STOMP message whose body
 To model the message carrying the name, you can create a plain old Java object with a `name` property and a corresponding `getName()` method:
 
 `src/main/java/hello/HelloMessage.java`
-[source,java]
+[source,java,tabsize=2]
 ----
 include::complete/src/main/java/hello/HelloMessage.java[]
 ----
@@ -71,7 +71,7 @@ Upon receiving the message and extracting the name, the service will process it
 To model the greeting representation, you add another plain old Java object with a `content` property and corresponding `getContent()` method:
 
 `src/main/java/hello/Greeting.java`
-[source,java]
+[source,java,tabsize=2]
 ----
 include::complete/src/main/java/hello/Greeting.java[]
 ----
@@ -85,7 +85,7 @@ Next, you'll create a controller to receive the hello message and send a greetin
 In Spring's approach to working with STOMP messaging, STOMP messages can be routed to {AtController}[`@Controller`] classes. For example the `GreetingController` is mapped to handle messages to destination "/hello".
 
 `src/main/java/hello/GreetingController.java`
-[source,java]
+[source,java,tabsize=2]
 ----
 include::complete/src/main/java/hello/GreetingController.java[]
 ----
@@ -107,7 +107,7 @@ Now that the essential components of the service are created, you can configure
 Create a Java class named `WebSocketConfig` that looks like this:
 
 `src/main/java/hello/WebSocketConfig.java`
-[source,java]
+[source,java,tabsize=2]
 ----
 include::complete/src/main/java/hello/WebSocketConfig.java[]
 ----
@@ -142,7 +142,7 @@ using STOMP over websocket. We're also importing here an `app.js` which contains
 Let's create that file:
 
 `src/main/resources/static/app.js`
-[source,javascript]
+[source,java,tabsize=2script]
 ----
 include::complete/src/main/resources/static/app.js[]
 ----
@@ -159,7 +159,7 @@ Although it is possible to package this service as a traditional link:/understan
 
 
 `src/main/java/hello/Application.java`
-[source,java]
+[source,java,tabsize=2]
 ----
 include::complete/src/main/java/hello/Application.java[]
 ----

+ 3 - 3
complete/src/main/java/hello/Application.java

@@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @SpringBootApplication
 public class Application {
 
-    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
-    }
+	public static void main(String[] args) {
+		SpringApplication.run(Application.class, args);
+	}
 }

+ 9 - 9
complete/src/main/java/hello/Greeting.java

@@ -2,17 +2,17 @@ package hello;
 
 public class Greeting {
 
-    private String content;
+	private String content;
 
-    public Greeting() {
-    }
+	public Greeting() {
+	}
 
-    public Greeting(String content) {
-        this.content = content;
-    }
+	public Greeting(String content) {
+		this.content = content;
+	}
 
-    public String getContent() {
-        return content;
-    }
+	public String getContent() {
+		return content;
+	}
 
 }

+ 6 - 6
complete/src/main/java/hello/GreetingController.java

@@ -9,11 +9,11 @@ import org.springframework.web.util.HtmlUtils;
 public class GreetingController {
 
 
-    @MessageMapping("/hello")
-    @SendTo("/topic/greetings")
-    public Greeting greeting(HelloMessage message) throws Exception {
-        Thread.sleep(1000); // simulated delay
-        return new Greeting("Hello, " + HtmlUtils.htmlEscape(message.getName()) + "!");
-    }
+	@MessageMapping("/hello")
+	@SendTo("/topic/greetings")
+	public Greeting greeting(HelloMessage message) throws Exception {
+		Thread.sleep(1000); // simulated delay
+		return new Greeting("Hello, " + HtmlUtils.htmlEscape(message.getName()) + "!");
+	}
 
 }

+ 12 - 12
complete/src/main/java/hello/HelloMessage.java

@@ -2,20 +2,20 @@ package hello;
 
 public class HelloMessage {
 
-    private String name;
+	private String name;
 
-    public HelloMessage() {
-    }
+	public HelloMessage() {
+	}
 
-    public HelloMessage(String name) {
-        this.name = name;
-    }
+	public HelloMessage(String name) {
+		this.name = name;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public void setName(String name) {
-        this.name = name;
-    }
+	public void setName(String name) {
+		this.name = name;
+	}
 }

+ 9 - 9
complete/src/main/java/hello/WebSocketConfig.java

@@ -10,15 +10,15 @@ import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerCo
 @EnableWebSocketMessageBroker
 public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
 
-    @Override
-    public void configureMessageBroker(MessageBrokerRegistry config) {
-        config.enableSimpleBroker("/topic");
-        config.setApplicationDestinationPrefixes("/app");
-    }
+	@Override
+	public void configureMessageBroker(MessageBrokerRegistry config) {
+		config.enableSimpleBroker("/topic");
+		config.setApplicationDestinationPrefixes("/app");
+	}
 
-    @Override
-    public void registerStompEndpoints(StompEndpointRegistry registry) {
-        registry.addEndpoint("/gs-guide-websocket").withSockJS();
-    }
+	@Override
+	public void registerStompEndpoints(StompEndpointRegistry registry) {
+		registry.addEndpoint("/gs-guide-websocket").withSockJS();
+	}
 
 }

+ 94 - 94
complete/src/test/java/hello/GreetingIntegrationTests.java

@@ -34,98 +34,98 @@ import org.springframework.web.socket.sockjs.client.WebSocketTransport;
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class GreetingIntegrationTests {
 
-    @LocalServerPort
-    private int port;
-
-    private SockJsClient sockJsClient;
-
-    private WebSocketStompClient stompClient;
-
-    private final WebSocketHttpHeaders headers = new WebSocketHttpHeaders();
-
-    @Before
-    public void setup() {
-        List<Transport> transports = new ArrayList<>();
-        transports.add(new WebSocketTransport(new StandardWebSocketClient()));
-        this.sockJsClient = new SockJsClient(transports);
-
-        this.stompClient = new WebSocketStompClient(sockJsClient);
-        this.stompClient.setMessageConverter(new MappingJackson2MessageConverter());
-    }
-
-    @Test
-    public void getGreeting() throws Exception {
-
-        final CountDownLatch latch = new CountDownLatch(1);
-        final AtomicReference<Throwable> failure = new AtomicReference<>();
-
-        StompSessionHandler handler = new TestSessionHandler(failure) {
-
-            @Override
-            public void afterConnected(final StompSession session, StompHeaders connectedHeaders) {
-                session.subscribe("/topic/greetings", new StompFrameHandler() {
-                    @Override
-                    public Type getPayloadType(StompHeaders headers) {
-                        return Greeting.class;
-                    }
-
-                    @Override
-                    public void handleFrame(StompHeaders headers, Object payload) {
-                        Greeting greeting = (Greeting) payload;
-                        try {
-                            assertEquals("Hello, Spring!", greeting.getContent());
-                        } catch (Throwable t) {
-                            failure.set(t);
-                        } finally {
-                            session.disconnect();
-                            latch.countDown();
-                        }
-                    }
-                });
-                try {
-                    session.send("/app/hello", new HelloMessage("Spring"));
-                } catch (Throwable t) {
-                    failure.set(t);
-                    latch.countDown();
-                }
-            }
-        };
-
-        this.stompClient.connect("ws://localhost:{port}/gs-guide-websocket", this.headers, handler, this.port);
-
-        if (latch.await(3, TimeUnit.SECONDS)) {
-            if (failure.get() != null) {
-                throw new AssertionError("", failure.get());
-            }
-        }
-        else {
-            fail("Greeting not received");
-        }
-
-    }
-
-    private class TestSessionHandler extends StompSessionHandlerAdapter {
-
-        private final AtomicReference<Throwable> failure;
-
-
-        public TestSessionHandler(AtomicReference<Throwable> failure) {
-            this.failure = failure;
-        }
-
-        @Override
-        public void handleFrame(StompHeaders headers, Object payload) {
-            this.failure.set(new Exception(headers.toString()));
-        }
-
-        @Override
-        public void handleException(StompSession s, StompCommand c, StompHeaders h, byte[] p, Throwable ex) {
-            this.failure.set(ex);
-        }
-
-        @Override
-        public void handleTransportError(StompSession session, Throwable ex) {
-            this.failure.set(ex);
-        }
-    }
+	@LocalServerPort
+	private int port;
+
+	private SockJsClient sockJsClient;
+
+	private WebSocketStompClient stompClient;
+
+	private final WebSocketHttpHeaders headers = new WebSocketHttpHeaders();
+
+	@Before
+	public void setup() {
+		List<Transport> transports = new ArrayList<>();
+		transports.add(new WebSocketTransport(new StandardWebSocketClient()));
+		this.sockJsClient = new SockJsClient(transports);
+
+		this.stompClient = new WebSocketStompClient(sockJsClient);
+		this.stompClient.setMessageConverter(new MappingJackson2MessageConverter());
+	}
+
+	@Test
+	public void getGreeting() throws Exception {
+
+		final CountDownLatch latch = new CountDownLatch(1);
+		final AtomicReference<Throwable> failure = new AtomicReference<>();
+
+		StompSessionHandler handler = new TestSessionHandler(failure) {
+
+			@Override
+			public void afterConnected(final StompSession session, StompHeaders connectedHeaders) {
+				session.subscribe("/topic/greetings", new StompFrameHandler() {
+					@Override
+					public Type getPayloadType(StompHeaders headers) {
+						return Greeting.class;
+					}
+
+					@Override
+					public void handleFrame(StompHeaders headers, Object payload) {
+						Greeting greeting = (Greeting) payload;
+						try {
+							assertEquals("Hello, Spring!", greeting.getContent());
+						} catch (Throwable t) {
+							failure.set(t);
+						} finally {
+							session.disconnect();
+							latch.countDown();
+						}
+					}
+				});
+				try {
+					session.send("/app/hello", new HelloMessage("Spring"));
+				} catch (Throwable t) {
+					failure.set(t);
+					latch.countDown();
+				}
+			}
+		};
+
+		this.stompClient.connect("ws://localhost:{port}/gs-guide-websocket", this.headers, handler, this.port);
+
+		if (latch.await(3, TimeUnit.SECONDS)) {
+			if (failure.get() != null) {
+				throw new AssertionError("", failure.get());
+			}
+		}
+		else {
+			fail("Greeting not received");
+		}
+
+	}
+
+	private class TestSessionHandler extends StompSessionHandlerAdapter {
+
+		private final AtomicReference<Throwable> failure;
+
+
+		public TestSessionHandler(AtomicReference<Throwable> failure) {
+			this.failure = failure;
+		}
+
+		@Override
+		public void handleFrame(StompHeaders headers, Object payload) {
+			this.failure.set(new Exception(headers.toString()));
+		}
+
+		@Override
+		public void handleException(StompSession s, StompCommand c, StompHeaders h, byte[] p, Throwable ex) {
+			this.failure.set(ex);
+		}
+
+		@Override
+		public void handleTransportError(StompSession session, Throwable ex) {
+			this.failure.set(ex);
+		}
+	}
 }