Merge pull request 'Adding proxy option' (#2) from dev into master

Reviewed-on: #2

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.openautonomousconnection</groupId>
     <artifactId>protocol</artifactId>
-    <version>1.0.0-BETA.5</version>
+    <version>1.0.0-BETA.6</version>
     <organization>
         <name>Open Autonomous Connection</name>
         <url>https://open-autonomous-connection.org/</url>

src/main/java/org/openautonomousconnection/protocol/ProtocolBridge.java

@@ -24,6 +24,7 @@ import org.openautonomousconnection.protocol.versions.v1_0_0.classic.utils.Class
 
 import java.io.File;
 import java.io.IOException;
+import java.net.Proxy;
 
 /**
  * The main bridge class for the protocol connection.
@@ -94,6 +95,13 @@ public final class ProtocolBridge {
     @Setter
     private ClassicHandlerClient classicHandlerClient;
 
+    /**
+     * The proxy for client side
+     */
+    @Getter
+    @Setter
+    private Proxy proxy;
+
     /**
      * Initialize the ProtocolBridge instance for the DNS server side
      *

src/main/java/org/openautonomousconnection/protocol/annotations/processing/CallTracker.java

@@ -21,7 +21,6 @@ public class CallTracker<A extends Annotation> extends GenericReflectClass<A> {
 
     public CallTracker(CallInterceptor interceptor) {
         super();
-
         atomicClass.set(this.persistentClass);
     }
 
@@ -31,8 +30,7 @@ public class CallTracker<A extends Annotation> extends GenericReflectClass<A> {
         new AgentBuilder.Default()
                 .type(any()) // instrument all classes, you can restrict here
                 .transform((builder, type, classLoader, module, protectionDomain) ->
-                        builder.visit(Advice.to(CallInterceptor.class).on(isMethod()))
+                        builder.visit(Advice.to(CallInterceptor.class).on(isMethod()))).installOn(inst);
-                ).installOn(inst);
     }
 
     public abstract static class CallInterceptor {
@@ -44,15 +42,12 @@ public class CallTracker<A extends Annotation> extends GenericReflectClass<A> {
 
         @Advice.OnMethodEnter
         static void intercept(@Advice.Origin Method method) {
-
             for (CallInterceptor interceptor : interceptors) {
                 StackTraceElement[] stack = Thread.currentThread().getStackTrace();
 
-                if (stack.length <= 3)
+                if (stack.length <= 3) return;
-                    return;
 
                 StackTraceElement caller = stack[3];
-
                 interceptor.onCall(method, caller);
             }
 

src/main/java/org/openautonomousconnection/protocol/annotations/processing/ProtocolInfoProcessing.java

@@ -38,45 +38,34 @@ public class ProtocolInfoProcessing extends AnnotationProcessor<ProtocolInfo> {
             @Override
             public void onCall(Method method, @Nullable StackTraceElement callerMethod) {
                 ProtocolVersion.ProtocolSide side, callerSide;
-
                 Object o;
 
                 if ((o = methodGetByName(callerMethod.getMethodName())) != null)
                     callerSide = ((Method) o).getAnnotation(ProtocolInfo.class).protocolSide();
                 else if ((o = typeHasAnnotation(callerMethod.getClassName())) != null)
                     callerSide = ((Class<?>) o).getAnnotation(ProtocolInfo.class).protocolSide();
-                else
+                else return;
-                    return;
 
 
                 if (methodReferences.get().contains(method))
                     side = method.getAnnotation(ProtocolInfo.class).protocolSide();
-
                 else if (typeReferences.get().contains(method.getDeclaringClass()))
                     side = method.getDeclaringClass().getAnnotation(ProtocolInfo.class).protocolSide();
-                else
+                else return;
-                    return;
 
-                if (callerSide.equals(ProtocolVersion.ProtocolSide.CLIENT) &&
+                if (callerSide.equals(ProtocolVersion.ProtocolSide.CLIENT) && !side.equals(callerSide))
-                        !side.equals(callerSide))
                     throw new IncompatibleProtocolSideException(callerSide, side);
-
-
             }
         });
     }
 
     private Method methodGetByName(String methodName) {
-        for (Method method : this.annotatedMethods)
+        for (Method method : this.annotatedMethods) if (method.getName().equals(methodName)) return method;
-            if (method.getName().equals(methodName))
-                return method;
         return null;
     }
 
     private Class<?> typeHasAnnotation(String typeName) {
-        for (Class<?> type : this.annotatedTypes)
+        for (Class<?> type : this.annotatedTypes) if (type.getName().equals(typeName)) return type;
-            if (type.getName().equals(typeName))
-                return type;
         return null;
     }
 

src/main/java/org/openautonomousconnection/protocol/side/client/ProtocolClient.java

@@ -61,7 +61,7 @@ public abstract class ProtocolClient extends DefaultMethodsOverrider {
         folderStructure = new ClientCertificateFolderStructure();
 
         // Initialize connection to DNS server
-        clientToDNS = new NetworkClient.ClientBuilder().setLogger(ProtocolBridge.getInstance().getLogger()).
+        clientToDNS = new NetworkClient.ClientBuilder().setLogger(ProtocolBridge.getInstance().getLogger()).setProxy(ProtocolBridge.getInstance().getProxy()).
                 setHost(ProtocolBridge.getInstance().getProtocolSettings().host).setPort(ProtocolBridge.getInstance().getProtocolSettings().port).
                 setPacketHandler(ProtocolBridge.getInstance().getProtocolSettings().packetHandler).setEventManager(ProtocolBridge.getInstance().getProtocolSettings().eventManager).
                 setRootCAFolder(folderStructure.publicCAFolder).setClientCertificatesFolder(folderStructure.publicClientFolder, folderStructure.privateClientFolder).

src/main/java/org/openautonomousconnection/protocol/side/client/WebClient.java

@@ -135,10 +135,7 @@ public final class WebClient {
             // Start the receive thread
             this.receiveThread.start();
         }
-    }    /**
+    }
-     * Thread for receiving data from the web server.
-     */
-    private final Thread receiveThread = new Thread(this::receive);
 
     /**
      * Gets the NetworkClient used for the pipeline connection to the web server.
@@ -147,7 +144,10 @@ public final class WebClient {
      */
     public NetworkClient getClientPipelineConnection() {
         return clientToWebPipeline;
-    }
+    }    /**
+     * Thread for receiving data from the web server.
+     */
+    private final Thread receiveThread = new Thread(this::receive);
 
     /**
      * Gets the SSLSocket used for communication with the web server.

src/main/java/org/openautonomousconnection/protocol/side/web/ConnectedWebClient.java

@@ -55,11 +55,7 @@ public final class ConnectedWebClient {
      * Indicates if the client version has been loaded.
      */
     @Getter
-    private boolean clientVersionLoaded = false;    /**
+    private boolean clientVersionLoaded = false;
-     * Thread for receiving data from the client.
-     */
-    private final Thread receiveThread = new Thread(this::receive);
-
     /**
      * Constructs a ConnectedWebClient with the given connection handler.
      *
@@ -67,7 +63,10 @@ public final class ConnectedWebClient {
      */
     public ConnectedWebClient(ConnectionHandler pipelineConnection) {
         this.pipelineConnection = pipelineConnection;
-    }
+    }    /**
+     * Thread for receiving data from the client.
+     */
+    private final Thread receiveThread = new Thread(this::receive);
 
     /**
      * Sends an HTTP redirect response to the client.
@@ -717,4 +716,5 @@ public final class ConnectedWebClient {
 
 
 
+
 }