Moves Sockets into seperate sockets package

Author: JLLeitschuh

buildSrc/src/main/java/edu/wpi/gripgenerator/templates/Operation.java

@@ -25,8 +25,7 @@
 
 public class Operation {
     private static final ImportDeclaration OPERATION_IMPORT = new ImportDeclaration(new NameExpr("edu.wpi.grip.core.operations.opencv.CVOperation"), false, false);
-    private static final ImportDeclaration INPUT_SOCKET_IMPORT = new ImportDeclaration(new NameExpr("edu.wpi.grip.core.InputSocket"), false, false);
-    private static final ImportDeclaration OUTPUT_SOCKET_IMPORT = new ImportDeclaration(new NameExpr("edu.wpi.grip.core.OutputSocket"), false, false);
+    private static final ImportDeclaration SOCKETS_IMPORT = new ImportDeclaration(new NameExpr("edu.wpi.grip.core.sockets"), false, true);
     private static final ImportDeclaration EVENT_BUS_IMPORT = new ImportDeclaration(new NameExpr("com.google.common.eventbus.EventBus"), false, false);
     private static final ImportDeclaration CV_CORE_IMPORT = new ImportDeclaration(new NameExpr("org.bytedeco.javacpp.opencv_core"), true, true);
     private static final ClassOrInterfaceType iOperation = new ClassOrInterfaceType("CVOperation");
@@ -309,11 +308,9 @@ private ClassOrInterfaceDeclaration getClassDeclaration() {
      */
     public CompilationUnit getDeclaration() {
         Set<ImportDeclaration> importList = Sets.newHashSet(
-                SocketHintDeclaration.SOCKET_IMPORT,
                 OPERATION_IMPORT,
                 CV_CORE_IMPORT,
-                INPUT_SOCKET_IMPORT,
-                OUTPUT_SOCKET_IMPORT,
+                SOCKETS_IMPORT,
                 EVENT_BUS_IMPORT
         );
         importList.addAll(getAdditionalImports());

buildSrc/src/main/java/edu/wpi/gripgenerator/templates/SocketHintDeclaration.java

@@ -1,7 +1,6 @@
 package edu.wpi.gripgenerator.templates;
 
 import com.github.javaparser.ASTHelper;
-import com.github.javaparser.ast.ImportDeclaration;
 import com.github.javaparser.ast.body.*;
 import com.github.javaparser.ast.expr.*;
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
@@ -32,8 +31,6 @@
 public class SocketHintDeclaration {
     public static final String SOCKET_HINT_CLASS_NAME = "SocketHint";
     public static final String SOCKET_HINT_BUILDER_CLASS_NAME = "Builder";
-    public static final ImportDeclaration SOCKET_IMPORT = new ImportDeclaration(
-            new NameExpr("edu.wpi.grip.core." + SOCKET_HINT_CLASS_NAME), false, false);
     public static final String HINT_POSTFIX = "Hint";
     public static final String INPUT_POSTFIX = "Input";
     public static final String OUTPUT_POSTFIX = "Output";

core/src/main/java/edu/wpi/grip/core/Connection.java

@@ -6,6 +6,8 @@
 import com.google.inject.assistedinject.Assisted;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import edu.wpi.grip.core.events.*;
+import edu.wpi.grip.core.sockets.InputSocket;
+import edu.wpi.grip.core.sockets.OutputSocket;
 
 import static com.google.common.base.Preconditions.checkArgument;
 

core/src/main/java/edu/wpi/grip/core/ConnectionValidator.java

@@ -1,5 +1,9 @@
 package edu.wpi.grip.core;
 
+import edu.wpi.grip.core.sockets.InputSocket;
+import edu.wpi.grip.core.sockets.OutputSocket;
+import edu.wpi.grip.core.sockets.Socket;
+
 /**
  * Allows {@link Connection Connections} to be validated to ensure that the pipeline will remain valid.
  */

core/src/main/java/edu/wpi/grip/core/Operation.java

@@ -2,6 +2,9 @@
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.eventbus.EventBus;
+import edu.wpi.grip.core.sockets.InputSocket;
+import edu.wpi.grip.core.sockets.OutputSocket;
+import edu.wpi.grip.core.sockets.SocketsProvider;
 
 import java.io.InputStream;
 import java.util.Optional;

core/src/main/java/edu/wpi/grip/core/Pipeline.java

@@ -8,6 +8,9 @@
 import com.thoughtworks.xstream.annotations.XStreamOmitField;
 import edu.wpi.grip.core.events.*;
 import edu.wpi.grip.core.settings.ProjectSettings;
+import edu.wpi.grip.core.sockets.InputSocket;
+import edu.wpi.grip.core.sockets.OutputSocket;
+import edu.wpi.grip.core.sockets.SocketHint;
 
 import javax.inject.Inject;
 import java.util.*;

core/src/main/java/edu/wpi/grip/core/Source.java

@@ -1,6 +1,7 @@
 package edu.wpi.grip.core;
 
 import com.google.inject.Inject;
+import edu.wpi.grip.core.sockets.OutputSocket;
 import edu.wpi.grip.core.sources.CameraSource;
 import edu.wpi.grip.core.sources.ImageFileSource;
 import edu.wpi.grip.core.sources.MultiImageFileSource;

core/src/main/java/edu/wpi/grip/core/Step.java

@@ -4,6 +4,10 @@
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
+import edu.wpi.grip.core.sockets.InputSocket;
+import edu.wpi.grip.core.sockets.OutputSocket;
+import edu.wpi.grip.core.sockets.Socket;
+import edu.wpi.grip.core.sockets.SocketsProvider;
 import edu.wpi.grip.core.util.ExceptionWitness;
 
 import java.util.Optional;

core/src/main/java/edu/wpi/grip/core/events/SocketChangedEvent.java

@@ -1,7 +1,7 @@
 package edu.wpi.grip.core.events;
 
 import com.google.common.base.MoreObjects;
-import edu.wpi.grip.core.Socket;
+import edu.wpi.grip.core.sockets.Socket;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

core/src/main/java/edu/wpi/grip/core/events/SocketConnectedChangedEvent.java

@@ -1,7 +1,7 @@
 package edu.wpi.grip.core.events;
 
 import com.google.common.base.MoreObjects;
-import edu.wpi.grip.core.Socket;
+import edu.wpi.grip.core.sockets.Socket;
 
 import static com.google.common.base.Preconditions.checkNotNull;