rename adapters to ports

jvm-profiling-tools · Jan 3, 2015 · b8703ab · b8703ab
1 parent f2c05f9
commit b8703ab
Show file tree

Hide file tree

Showing 17 changed files with 35 additions and 49 deletions.
diff --git a/src/main/java/com/insightfullogic/honest_profiler/core/MachineListener.java b/src/main/java/com/insightfullogic/honest_profiler/core/MachineListener.java
@@ -25,8 +25,7 @@
 
 public interface MachineListener {
 
-    // TODO: decouple listening to machines from listening to profiles
-    ProfileListener onNewMachine(VirtualMachine machine);
+    void onNewMachine(VirtualMachine machine);
 
     void onClosedMachine(VirtualMachine machine);
 

diff --git a/src/main/java/com/insightfullogic/honest_profiler/core/sources/VirtualMachine.java b/src/main/java/com/insightfullogic/honest_profiler/core/sources/VirtualMachine.java
@@ -53,7 +53,7 @@ public boolean isAgentLoaded() {
         return agentLoaded;
     }
 
-    public File getLogFile() {
+    public File getLogSource() {
         return new File(userDir, "log.hpl");
     }
 

diff --git a/src/main/java/com/insightfullogic/honest_profiler/core/sources/package-info.java b/src/main/java/com/insightfullogic/honest_profiler/core/sources/package-info.java
@@ -19,6 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
  * DEALINGS IN THE SOFTWARE.
  **/
+
 /**
  * Core implementation for methods of discovering machines and sources of logs.
  */

diff --git a/src/main/java/com/insightfullogic/honest_profiler/delivery/console/ConsoleApplication.java b/src/main/java/com/insightfullogic/honest_profiler/delivery/console/ConsoleApplication.java
@@ -21,7 +21,7 @@
  **/
 package com.insightfullogic.honest_profiler.delivery.console;
 
-import com.insightfullogic.honest_profiler.adapters.store.FileLogRepository;
+import com.insightfullogic.honest_profiler.ports.store.FileLogRepository;
 import com.insightfullogic.honest_profiler.core.Conductor;
 import com.insightfullogic.honest_profiler.core.ProfileListener;
 import com.insightfullogic.honest_profiler.core.filters.ProfileFilter;

diff --git a/src/main/java/com/insightfullogic/honest_profiler/delivery/javafx/JavaFXApplication.java b/src/main/java/com/insightfullogic/honest_profiler/delivery/javafx/JavaFXApplication.java
@@ -21,9 +21,9 @@
  **/
 package com.insightfullogic.honest_profiler.delivery.javafx;
 
-import com.insightfullogic.honest_profiler.adapters.LoggerInjector;
-import com.insightfullogic.honest_profiler.adapters.sources.LocalMachineSource;
-import com.insightfullogic.honest_profiler.adapters.store.FileLogRepository;
+import com.insightfullogic.honest_profiler.ports.LoggerInjector;
+import com.insightfullogic.honest_profiler.ports.sources.LocalMachineSource;
+import com.insightfullogic.honest_profiler.ports.store.FileLogRepository;
 import com.insightfullogic.honest_profiler.core.Conductor;
 import com.insightfullogic.honest_profiler.core.filters.ProfileFilter;
 import com.insightfullogic.honest_profiler.delivery.javafx.landing.LandingViewModel;

diff --git a/...in/java/com/insightfullogic/honest_profiler/delivery/javafx/landing/LandingViewModel.java b/...in/java/com/insightfullogic/honest_profiler/delivery/javafx/landing/LandingViewModel.java
@@ -93,7 +93,7 @@ public void open(ActionEvent actionEvent) {
     public void monitor(ActionEvent actionEvent) {
         windowModel.display(Profile);
         MachineButton selectedButton = (MachineButton) toggleMachines.getSelectedToggle();
-        File logFile = selectedButton.getJvm().getLogFile();
+        File logFile = selectedButton.getJvm().getLogSource();
         try {
             conductor.pipeFile(logFile, null, profileListener);
         } catch (IOException e) {
@@ -102,14 +102,13 @@ public void monitor(ActionEvent actionEvent) {
     }
 
     @Override
-    public ProfileListener onNewMachine(VirtualMachine machine) {
+    public void onNewMachine(VirtualMachine machine) {
         Platform.runLater(() -> {
             ObservableList<Node> children = landingView.getChildren();
             MachineButton button = new MachineButton(machine);
             button.setToggleGroup(toggleMachines);
             children.add(button);
         });
-        return null;
     }
 
     @Override

diff --git a/src/main/java/com/insightfullogic/honest_profiler/delivery/web/WebEntry.java b/src/main/java/com/insightfullogic/honest_profiler/delivery/web/WebEntry.java
@@ -22,9 +22,9 @@
 package com.insightfullogic.honest_profiler.delivery.web;
 
 import app.Root;
-import com.insightfullogic.honest_profiler.adapters.sources.LocalMachineSource;
-import com.insightfullogic.honest_profiler.adapters.sources.WebSocketMachineSource;
-import com.insightfullogic.honest_profiler.adapters.store.FileLogRepository;
+import com.insightfullogic.honest_profiler.ports.sources.LocalMachineSource;
+import com.insightfullogic.honest_profiler.ports.sources.WebSocketMachineSource;
+import com.insightfullogic.honest_profiler.ports.store.FileLogRepository;
 import com.insightfullogic.honest_profiler.core.Conductor;
 import com.insightfullogic.honest_profiler.core.collector.LogCollector;
 import com.insightfullogic.honest_profiler.core.parser.LogParser;
@@ -71,7 +71,7 @@ public static MutablePicoContainer registerComponents() {
                 .addComponent(WebSocketMachineSource.class)
                 .addComponent(LocalMachineSource.class)
                 .addComponent(MessageEncoder.class)
-                .addComponent(MachineAdapter.class)
+                .addComponent(WebsocketMachineAdapter.class)
                 .addComponent(WebProfileAdapter.class)
                 .addComponent(ClientConnections.class)
                 .addComponent(ClientHandler.class)

diff --git a/...profiler/delivery/web/MachineAdapter.java → ...delivery/web/WebsocketMachineAdapter.java b/...profiler/delivery/web/MachineAdapter.java → ...delivery/web/WebsocketMachineAdapter.java
@@ -23,21 +23,20 @@
 
 import com.insightfullogic.honest_profiler.core.MachineListener;
 import com.insightfullogic.honest_profiler.core.sources.VirtualMachine;
-import org.slf4j.LoggerFactory;
 import org.webbitserver.WebSocketConnection;
 
 import java.util.HashSet;
 import java.util.Set;
 import java.util.function.Consumer;
 
 // Not thread safe
-public class MachineAdapter implements MachineListener, Consumer<WebSocketConnection> {
+public class WebsocketMachineAdapter implements MachineListener, Consumer<WebSocketConnection> {
 
     private final Set<VirtualMachine> machines;
     private final ClientConnections clients;
     private final MessageEncoder messages;
 
-    public MachineAdapter(ClientConnections clients, MessageEncoder messages) {
+    public WebsocketMachineAdapter(ClientConnections clients, MessageEncoder messages) {
         this.clients = clients;
         this.messages = messages;
         machines = new HashSet<>();
@@ -52,10 +51,10 @@ public void accept(WebSocketConnection connection) {
     }
 
     @Override
-    public WebProfileAdapter onNewMachine(VirtualMachine machine) {
+    public void onNewMachine(VirtualMachine machine) {
         machines.add(machine);
         clients.sendAll(messages.addJavaVirtualMachine(machine));
-        return new WebProfileAdapter(LoggerFactory.getLogger(WebProfileAdapter.class), machine, clients);
+        //return new WebProfileAdapter(LoggerFactory.getLogger(WebProfileAdapter.class), machine, clients);
     }
 
     @Override

diff --git a/...est_profiler/adapters/LoggerInjector.java → ...honest_profiler/ports/LoggerInjector.java b/...est_profiler/adapters/LoggerInjector.java → ...honest_profiler/ports/LoggerInjector.java
@@ -19,7 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
  * DEALINGS IN THE SOFTWARE.
  **/
-package com.insightfullogic.honest_profiler.adapters;
+package com.insightfullogic.honest_profiler.ports;
 
 import org.picocontainer.PicoContainer;
 import org.picocontainer.injectors.FactoryInjector;

diff --git a/.../adapters/sources/LocalMachineSource.java → ...ler/ports/sources/LocalMachineSource.java b/.../adapters/sources/LocalMachineSource.java → ...ler/ports/sources/LocalMachineSource.java
@@ -19,11 +19,10 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
  * DEALINGS IN THE SOFTWARE.
  **/
-package com.insightfullogic.honest_profiler.adapters.sources;
+package com.insightfullogic.honest_profiler.ports.sources;
 
 import com.insightfullogic.honest_profiler.core.Conductor;
 import com.insightfullogic.honest_profiler.core.MachineListener;
-import com.insightfullogic.honest_profiler.core.ProfileListener;
 import com.insightfullogic.honest_profiler.core.ThreadedAgent;
 import com.insightfullogic.honest_profiler.core.sources.VirtualMachine;
 import com.sun.tools.attach.AttachNotSupportedException;
@@ -65,7 +64,7 @@ public void start() {
         threadedAgent.start();
     }
 
-    public boolean discoverVirtualMachines() {
+    private boolean discoverVirtualMachines() {
         poll();
 
         sleep();
@@ -81,18 +80,9 @@ private void sleep() {
         }
     }
 
-    public void poll() {
+    private void poll() {
         Set<VirtualMachineDescriptor> current = new HashSet<>(com.sun.tools.attach.VirtualMachine.list());
-        difference(current, previous, machine -> {
-            ProfileListener profileListener = listener.onNewMachine(machine);
-            if (machine.isAgentLoaded() && profileListener != null) {
-                try {
-                    conductor.pipeFile(machine.getLogFile(), machine, profileListener);
-                } catch (IOException e) {
-                    logger.error(e.getMessage(), e);
-                }
-            }
-        });
+        difference(current, previous, listener::onNewMachine);
         difference(previous, current, listener::onClosedMachine);
         previous = current;
     }

diff --git a/...pters/sources/WebSocketMachineSource.java → ...ports/sources/WebSocketMachineSource.java b/...pters/sources/WebSocketMachineSource.java → ...ports/sources/WebSocketMachineSource.java
@@ -19,13 +19,12 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
  * DEALINGS IN THE SOFTWARE.
  **/
-package com.insightfullogic.honest_profiler.adapters.sources;
+package com.insightfullogic.honest_profiler.ports.sources;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.insightfullogic.honest_profiler.core.Conductor;
 import com.insightfullogic.honest_profiler.core.DataConsumer;
 import com.insightfullogic.honest_profiler.core.MachineListener;
-import com.insightfullogic.honest_profiler.core.ProfileListener;
 import com.insightfullogic.honest_profiler.core.sources.VirtualMachine;
 import org.slf4j.Logger;
 import org.webbitserver.BaseWebSocketHandler;
@@ -80,11 +79,11 @@ private void newMachine(WebSocketConnection connection, byte[] message) {
         try {
             Messages.NewMachine newMachine = Messages.NewMachine.parseFrom(message);
             VirtualMachine machine = new VirtualMachine(newMachine.getId(), newMachine.getDisplayName(), true, "");
-            ProfileListener profileListener = listener.onNewMachine(machine);
+            /*ProfileListener profileListener = listener.onNewMachine(machine);
             if (profileListener != null) {
                 DataConsumer consumer = conductor.pipeData(machine, profileListener);
                 machines.put(connection, consumer);
-            }
+            }*/
         } catch (InvalidProtocolBufferException e) {
             logger.error(e.getMessage(), e);
         }

diff --git a/...ofiler/adapters/sources/package-info.java → ..._profiler/ports/sources/package-info.java b/...ofiler/adapters/sources/package-info.java → ..._profiler/ports/sources/package-info.java
@@ -22,5 +22,5 @@
 /**
  * Infrastructure for methods of discovering machines and sources of logs.
  */
-package com.insightfullogic.honest_profiler.adapters.sources;
+package com.insightfullogic.honest_profiler.ports.sources;
 
diff --git a/...ler/adapters/store/FileLogRepository.java → ...ofiler/ports/store/FileLogRepository.java b/...ler/adapters/store/FileLogRepository.java → ...ofiler/ports/store/FileLogRepository.java
@@ -19,7 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
  * DEALINGS IN THE SOFTWARE.
  **/
-package com.insightfullogic.honest_profiler.adapters.store;
+package com.insightfullogic.honest_profiler.ports.store;
 
 import com.insightfullogic.honest_profiler.core.sources.VirtualMachine;
 import com.insightfullogic.honest_profiler.core.store.LogMetadata;

diff --git a/...profiler/adapters/store/FileLogSaver.java → ...st_profiler/ports/store/FileLogSaver.java b/...profiler/adapters/store/FileLogSaver.java → ...st_profiler/ports/store/FileLogSaver.java
@@ -19,7 +19,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
  * DEALINGS IN THE SOFTWARE.
  **/
-package com.insightfullogic.honest_profiler.adapters.store;
+package com.insightfullogic.honest_profiler.ports.store;
 
 import com.insightfullogic.honest_profiler.core.store.LogSaver;
 

diff --git a/src/main/proto/messages.proto b/src/main/proto/messages.proto
@@ -1,6 +1,6 @@
 package tutorial;
 
-option java_package = "com.insightfullogic.honest_profiler.adapters.sources";
+option java_package = "com.insightfullogic.honest_profiler.ports.sources";
 option java_outer_classname = "Messages";
 
 message NewMachine {

diff --git a/...livery/web/VirtualMachineAdapterTest.java → ...b/VirtualWebsocketMachineAdapterTest.java b/...livery/web/VirtualMachineAdapterTest.java → ...b/VirtualWebsocketMachineAdapterTest.java
@@ -30,17 +30,17 @@
 import static org.mockito.Mockito.verify;
 
 @RunWith(JunitSuiteRunner.class)
-public class VirtualMachineAdapterTest {
+public class VirtualWebsocketMachineAdapterTest {
 
     ClientConnections clients;
     VirtualMachine jvm = new VirtualMachine("12432", "com.intellij.idea.Main", true, "");
-    MachineAdapter adapter;
+    WebsocketMachineAdapter adapter;
 
     { describe("The Java Virtual Machine Adapter", it -> {
 
         it.isSetupWith(() -> {
             clients = Mockito.mock(ClientConnections.class);
-            adapter = new MachineAdapter(clients, new MessageEncoder());
+            adapter = new WebsocketMachineAdapter(clients, new MessageEncoder());
         });
 
         it.should("Register for connections", expect -> {

diff --git a/.../adapters/WebSocketMachineSourceTest.java → ...ler/ports/WebSocketMachineSourceTest.java b/.../adapters/WebSocketMachineSourceTest.java → ...ler/ports/WebSocketMachineSourceTest.java
@@ -19,10 +19,10 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
  * DEALINGS IN THE SOFTWARE.
  **/
-package com.insightfullogic.honest_profiler.adapters;
+package com.insightfullogic.honest_profiler.ports;
 
-import com.insightfullogic.honest_profiler.adapters.sources.Messages;
-import com.insightfullogic.honest_profiler.adapters.sources.WebSocketMachineSource;
+import com.insightfullogic.honest_profiler.ports.sources.Messages;
+import com.insightfullogic.honest_profiler.ports.sources.WebSocketMachineSource;
 import com.insightfullogic.honest_profiler.core.Conductor;
 import com.insightfullogic.honest_profiler.core.DataConsumer;
 import com.insightfullogic.honest_profiler.core.MachineListener;
@@ -64,7 +64,6 @@ public class WebSocketMachineSourceTest {
             reset(connection, dataConsumer, conductor, listener);
             when(conductor.pipeData(any(), any())).thenReturn(dataConsumer);
             when(dataConsumer.getMachine()).thenReturn(machine);
-            when(listener.onNewMachine(any())).thenReturn(profileListener);
 
             finder = new WebSocketMachineSource(logger, conductor, listener);
         });