cleanups

Author: Alexander Furer

grpc-spring-boot-starter-demo/src/test/java/org/lognet/springboot/grpc/GrpcServerTestBase.java

@@ -36,7 +36,7 @@ public abstract class GrpcServerTestBase {
     protected ManagedChannel inProcChannel;
 
     @LocalRunningGrpcPort
-    int runningPort;
+    protected  int runningPort;
 
     @Autowired
     protected ApplicationContext context;

grpc-spring-boot2-starter-demo/src/test/java/org/lognet/springboot/grpc/ConfigServerEnvironmentBaseTest.java

@@ -39,6 +39,7 @@ public abstract class ConfigServerEnvironmentBaseTest extends GrpcServerTestBase
     protected Environment environment;
 
 
+
     public static void startConfigServer(Properties properties) throws IOException, URISyntaxException {
 
         File cfgFile = temporaryFolder.newFile("grpc-demo.properties");

grpc-spring-boot2-starter-demo/src/test/java/org/lognet/springboot/grpc/ConfigServerEnvironmentTest2.java

@@ -3,9 +3,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.lognet.springboot.grpc.autoconfigure.GRpcServerProperties;
-import org.lognet.springboot.grpc.context.LocalRunningGrpcPort;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -17,18 +14,6 @@
 
 public class ConfigServerEnvironmentTest2 extends ConfigServerEnvironmentBaseTest{
 
-    @LocalRunningGrpcPort
-    private int runningPort;
-
-    @Value("#{environment.getProperty('local.grpc.port')}")
-    Object localP;
-
-    @Value("#{environment.getProperty('grpc.port')}")
-    Object p;
-
-    @Autowired
-    GRpcServerProperties properties;
-
 
     @BeforeClass
     public static void startConfigServer() throws IOException, URISyntaxException {
@@ -44,9 +29,9 @@ public static void startConfigServer() throws IOException, URISyntaxException {
     @Test
     public void assertConfigServerConfiguredPort(){
 
-        assertNotEquals(runningPort,properties.getPort().intValue());
+        assertNotEquals(runningPort,gRpcServerProperties.getPort().intValue());
         assertNotEquals(GRpcServerProperties.DEFAULT_GRPC_PORT,getPort());
-        assertEquals(0,properties.getPort().intValue());
+        assertEquals(0,gRpcServerProperties.getPort().intValue());
     }
 
 

grpc-spring-boot2-starter-demo/src/test/java/org/lognet/springboot/grpc/ConfigServerEnvironmentTest3.java

@@ -4,7 +4,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.lognet.springboot.grpc.autoconfigure.GRpcServerProperties;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -16,24 +15,16 @@
 
 public class ConfigServerEnvironmentTest3 extends ConfigServerEnvironmentBaseTest{
 
-
-    @Autowired
-    GRpcServerProperties properties;
-
-
     @BeforeClass
     public static void startConfigServer() throws IOException, URISyntaxException {
         startConfigServer(new Properties());
 
     }
 
-
-
-
     @Test
     public void assertConfigServerConfiguredPort(){
         assertEquals(GRpcServerProperties.DEFAULT_GRPC_PORT,getPort());
-        assertThat(properties.getPort(),CoreMatchers.nullValue(Integer.class));
+        assertThat(gRpcServerProperties.getPort(),CoreMatchers.nullValue(Integer.class));
     }