refactor thrift application package

man-zhang · man-zhang · commit 71c054f4d456 · 2021-12-23T22:23:16.000+01:00
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/main/java/org/thrift/ncs/NcsApplication.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/main/java/org/thrift/ncs/NcsApplication.java
@@ -8,8 +8,8 @@
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-
-import javax.servlet.Servlet;
+import org.thrift.ncs.client.NcsService;
+import org.thrift.ncs.service.NcsServiceImpl;
 
 
 /**
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/main/java/org/thrift/ncs/client/NcsService.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/main/java/org/thrift/ncs/client/NcsService.java
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/main/java/org/thrift/ncs/service/Dto.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/main/java/org/thrift/ncs/service/Dto.java
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/main/java/org/thrift/ncs/service/NcsServiceImpl.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/main/java/org/thrift/ncs/service/NcsServiceImpl.java
@@ -1,8 +1,9 @@
-package org.thrift.ncs;
+package org.thrift.ncs.service;
 
 import org.apache.thrift.TException;
 import org.springframework.stereotype.Service;
-import org.thrift.ncs.imp.*;
+import org.thrift.ncs.client.NcsService;
+import org.thrift.ncs.service.imp.*;
 
 /**
  * use code from jdk_8_maven/cs/rest/artificial/ncs/src/main/java/org/restncs/NcsRest.java
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/main/java/org/thrift/ncs/service/imp/Bessj.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/main/java/org/thrift/ncs/service/imp/Bessj.java
@@ -1,4 +1,4 @@
-package org.thrift.ncs.imp;
+package org.thrift.ncs.service.imp;
 
 public class Bessj {
 
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/main/java/org/thrift/ncs/service/imp/Expint.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/main/java/org/thrift/ncs/service/imp/Expint.java
@@ -1,4 +1,4 @@
-package org.thrift.ncs.imp;
+package org.thrift.ncs.service.imp;
 
 public class Expint {
     private static final double MAXIT = 100;
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/main/java/org/thrift/ncs/service/imp/Fisher.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/main/java/org/thrift/ncs/service/imp/Fisher.java
@@ -1,4 +1,4 @@
-package org.thrift.ncs.imp;
+package org.thrift.ncs.service.imp;
 
 
 
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/main/java/org/thrift/ncs/service/imp/Gammq.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/main/java/org/thrift/ncs/service/imp/Gammq.java
@@ -1,4 +1,4 @@
-package org.thrift.ncs.imp;
+package org.thrift.ncs.service.imp;
 public class Gammq {
 	private static final int ITMAX = 100;
 	private static final double EPS = 3.0e-7;
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/main/java/org/thrift/ncs/service/imp/Remainder.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/main/java/org/thrift/ncs/service/imp/Remainder.java
@@ -1,4 +1,4 @@
-package org.thrift.ncs.imp;
+package org.thrift.ncs.service.imp;
 
 public class Remainder {
     public static int exe(int a, int b) {
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/main/java/org/thrift/ncs/service/imp/TriangleClassification.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/main/java/org/thrift/ncs/service/imp/TriangleClassification.java
@@ -1,4 +1,4 @@
-package org.thrift.ncs.imp;
+package org.thrift.ncs.service.imp;
 
 public class TriangleClassification {
 
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/test/java/org/thrift/ncs/NcsApplicationTest.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/test/java/org/thrift/ncs/NcsApplicationTest.java
@@ -12,6 +12,8 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.thrift.ncs.client.NcsService;
+import org.thrift.ncs.service.Dto;
 
 /**
  * created by manzhang on 2021/10/21
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/test/java/org/thrift/ncs/NcsServiceTest.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-ncs/src/test/java/org/thrift/ncs/NcsServiceTest.java
@@ -6,6 +6,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.thrift.ncs.service.Dto;
+import org.thrift.ncs.service.NcsServiceImpl;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/ScsApplication.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/ScsApplication.java
@@ -8,6 +8,8 @@
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.thrift.scs.client.ScsService;
+import org.thrift.scs.service.ScsServiceImpl;
 
 
 /**
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/client/ScsService.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/client/ScsService.java
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/ScsServiceImpl.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/ScsServiceImpl.java
@@ -1,8 +1,9 @@
-package org.thrift.scs;
+package org.thrift.scs.service;
 
 import org.apache.thrift.TException;
 import org.springframework.stereotype.Service;
-import org.thrift.scs.imp.*;
+import org.thrift.scs.client.ScsService;
+import org.thrift.scs.service.imp.*;
 
 /**
  * created by manzhang on 2021/10/23
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/imp/Calc.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/imp/Calc.java
@@ -13,7 +13,7 @@
 //! triallast = 1         //NUMBER OF TRIALS = triallast - trialfirst + 1
 //! name = calc           //NAME OF EXPT, NOT COMPUTATIONALLY SIGNIFICANT
 
-package org.thrift.scs.imp;
+package org.thrift.scs.service.imp;
 
 public class Calc {
     public static String subject(String op, double arg1, double arg2) {
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/imp/Cookie.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/imp/Cookie.java
@@ -12,7 +12,7 @@
 //! trialfirst = 1        //EACH TRIAL USES A DIFFERENT RANDOM SEED
 //! triallast = 1         //NUMBER OF TRIALS = triallast - trialfirst + 1
 
-package org.thrift.scs.imp;
+package org.thrift.scs.service.imp;
 
 public class Cookie {
     public static String subject(String name, String val, String site) {
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/imp/Costfuns.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/imp/Costfuns.java
@@ -14,7 +14,7 @@
 //! name = costfuns       //NAME OF EXPT, NOT COMPUTATIONALLY SIGNIFICANT
 
 
-package org.thrift.scs.imp;
+package org.thrift.scs.service.imp;
 
 public class Costfuns {
     public static String subject(int i, String s) {
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/imp/DateParse.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/imp/DateParse.java
@@ -13,7 +13,7 @@
 //! triallast = 1         //NUMBER OF TRIALS = triallast - trialfirst + 1
 
 
-package org.thrift.scs.imp;
+package org.thrift.scs.service.imp;
 
 public class DateParse {
     public static String subject(String dayname, String monthname) {
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/imp/FileSuffix.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/imp/FileSuffix.java
@@ -12,7 +12,7 @@
 //! trialfirst = 1        //EACH TRIAL USES A DIFFERENT RANDOM SEED
 //! triallast = 1         //NUMBER OF TRIALS = triallast - trialfirst + 1
 
-package org.thrift.scs.imp;
+package org.thrift.scs.service.imp;
 
 public class FileSuffix {
     public static String subject(String directory, String file) {
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/imp/NotyPevar.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/imp/NotyPevar.java
@@ -13,7 +13,7 @@
 //! triallast = 1         //NUMBER OF TRIALS = triallast - trialfirst + 1
 //! name = costfuns       //NAME OF EXPT, NOT COMPUTATIONALLY SIGNIFICANT
 
-package org.thrift.scs.imp;
+package org.thrift.scs.service.imp;
 
 public class NotyPevar {
     //SHOW USE OF UNTYPED VARIABLES
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/imp/Ordered4.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/imp/Ordered4.java
@@ -11,7 +11,7 @@
 //! numbins = 0           //GRANULARITY OF CANDIDATE INPUT HISTOGRAM, SET TO 0 TO NOT COLLECT STATS
 //! trialfirst = 1        //EACH TRIAL USES A DIFFERENT RANDOM SEED
 //! triallast = 1         //NUMBER OF TRIALS = triallast - trialfirst + 1
-package org.thrift.scs.imp;
+package org.thrift.scs.service.imp;
 
 public class Ordered4 {
 
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/imp/Pat.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/imp/Pat.java
@@ -12,7 +12,7 @@
 //! trialfirst = 1        //EACH TRIAL USES A DIFFERENT RANDOM SEED
 //! triallast = 1         //NUMBER OF TRIALS = triallast - trialfirst + 1
 
-package org.thrift.scs.imp;
+package org.thrift.scs.service.imp;
 
 public class Pat {
     private static String Reverse(String s) {
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/imp/Regex.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/imp/Regex.java
@@ -12,7 +12,7 @@
 //! trialfirst = 1        //EACH TRIAL USES A DIFFERENT RANDOM SEED
 //! triallast = 1         //NUMBER OF TRIALS = triallast - trialfirst + 1
 
-package org.thrift.scs.imp;
+package org.thrift.scs.service.imp;
 
 import java.util.regex.Pattern;
 
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/imp/Text2Txt.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/imp/Text2Txt.java
@@ -11,7 +11,7 @@
 //! numbins = 0           //GRANULARITY OF CANDIDATE INPUT HISTOGRAM, SET TO 0 TO NOT COLLECT STATS
 //! trialfirst = 1        //EACH TRIAL USES A DIFFERENT RANDOM SEED
 //! triallast = 1         //NUMBER OF TRIALS = triallast - trialfirst + 1
-package org.thrift.scs.imp;
+package org.thrift.scs.service.imp;
 
 public class Text2Txt {
 
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/imp/Title.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/main/java/org/thrift/scs/service/imp/Title.java
@@ -12,7 +12,7 @@
 //! trialfirst = 1        //EACH TRIAL USES A DIFFERENT RANDOM SEED
 //! triallast = 1         //NUMBER OF TRIALS = triallast - trialfirst + 1
 
-package org.thrift.scs.imp;
+package org.thrift.scs.service.imp;
 
 public class Title {
 
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/test/java/org/thrift/scs/ScsApplicationTest.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/test/java/org/thrift/scs/ScsApplicationTest.java
@@ -11,6 +11,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.thrift.scs.client.ScsService;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/test/java/org/thrift/scs/ScsServiceTest.java b/jdk_8_maven/cs/rpc/thrift/artificial/thrift-scs/src/test/java/org/thrift/scs/ScsServiceTest.java
@@ -5,6 +5,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.thrift.scs.service.ScsServiceImpl;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/jdk_8_maven/em/embedded/thrift/ncs/src/main/java/em/embedded/org/thriftncs/EmbeddedEvoMasterController.java b/jdk_8_maven/em/embedded/thrift/ncs/src/main/java/em/embedded/org/thriftncs/EmbeddedEvoMasterController.java
@@ -14,10 +14,9 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.thrift.ncs.NcsApplication;
-import org.thrift.ncs.NcsService;
+import org.thrift.ncs.client.NcsService;
 
 import java.sql.Connection;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -59,7 +58,7 @@ public boolean isSutRunning() {
 
     @Override
     public String getPackagePrefixesToCover() {
-        return "org.thrift.ncs";
+        return "org.thrift.ncs.service.";
     }
 
     @Override
diff --git a/jdk_8_maven/em/embedded/thrift/scs/src/main/java/em/embedded/org/thriftscs/EmbeddedEvoMasterController.java b/jdk_8_maven/em/embedded/thrift/scs/src/main/java/em/embedded/org/thriftscs/EmbeddedEvoMasterController.java
@@ -14,7 +14,7 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.thrift.scs.ScsApplication;
-import org.thrift.scs.ScsService;
+import org.thrift.scs.client.ScsService;
 
 import java.sql.Connection;
 import java.util.HashMap;
@@ -58,7 +58,7 @@ public boolean isSutRunning() {
 
     @Override
     public String getPackagePrefixesToCover() {
-        return "org.thrift.scs";
+        return "org.thrift.scs.service.";
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.thrift.ncs.imp;`
	`1`	`+package org.thrift.ncs.service.imp;`
`2`	`2`
`3`	`3`	`public class Bessj {`
`4`	`4`