diff --git a/porter/api/common/endpoint/pom.xml b/porter/api/common/endpoint/pom.xml deleted file mode 100644 index 4f3e6739..00000000 --- a/porter/api/common/endpoint/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - 4.0.0 - - - org.apache.servicecomb.samples.porter - common-api - 3.0-SNAPSHOT - - - common-api-endpoint - jar - - - - org.apache.servicecomb.samples.porter - common-api-service - ${project.parent.version} - - - diff --git a/porter/api/common/endpoint/src/main/java/org/apache/servicecomb/samples/porter/file/api/LogEndpoint.java b/porter/api/common/endpoint/src/main/java/org/apache/servicecomb/samples/porter/file/api/LogEndpoint.java deleted file mode 100644 index 60e22be0..00000000 --- a/porter/api/common/endpoint/src/main/java/org/apache/servicecomb/samples/porter/file/api/LogEndpoint.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.servicecomb.samples.porter.file.api; - -import java.io.File; -import java.io.FileFilter; -import java.util.ArrayList; -import java.util.List; - -import org.apache.servicecomb.foundation.common.LegacyPropertyFactory; -import org.apache.servicecomb.provider.rest.common.RestSchema; -import org.apache.servicecomb.samples.porter.common.api.LogService; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; - -@RestSchema(schemaId = "log") -@RequestMapping(path = "/v1/log") -public class LogEndpoint implements LogService { - // protect your file in real applications - private static final File LOG_DIR = - new File(LegacyPropertyFactory.getStringProperty("servicecomb.samples.logdir", ".")); - - private static final String FILE_POST_FIX = ".log"; - - @Override - @GetMapping(path = "/getLogFileList") - public List getLogFileList() { - File[] files = LOG_DIR.listFiles(new FileFilter() { - @Override - public boolean accept(File file) { - return isLogFile(file); - } - }); - - List result = new ArrayList<>(files.length); - for (int i = 0; i < files.length; i++) { - result.add(files[i].getName()); - } - return result; - } - - @Override - @GetMapping(path = "/getLogFileContent") - public File getLogFileContent(@RequestParam(name = "fileName") String fileName) { - File file = new File(LOG_DIR, fileName); - if (isLogFile(file)) { - return file; - } - return null; - } - - private boolean isLogFile(File file) { - return file.isFile() && file.canRead() && file.getName().endsWith(FILE_POST_FIX); - } -} diff --git a/porter/api/common/pom.xml b/porter/api/common/pom.xml deleted file mode 100644 index 7d372bbf..00000000 --- a/porter/api/common/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - 4.0.0 - - - org.apache.servicecomb.samples.porter - porter-api - 3.0-SNAPSHOT - - - common-api - pom - - - service - endpoint - - \ No newline at end of file diff --git a/porter/api/common/service/pom.xml b/porter/api/common/service/pom.xml deleted file mode 100644 index 2af9fe16..00000000 --- a/porter/api/common/service/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - 4.0.0 - - - org.apache.servicecomb.samples.porter - common-api - 3.0-SNAPSHOT - - - common-api-service - jar - - diff --git a/porter/api/file-service/endpoint/pom.xml b/porter/api/file-service/endpoint/pom.xml deleted file mode 100644 index f1a9bf30..00000000 --- a/porter/api/file-service/endpoint/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - 4.0.0 - - - org.apache.servicecomb.samples.porter - file-service-api - 3.0-SNAPSHOT - - - file-service-api-endpoint - jar - - - - org.apache.servicecomb.samples.porter - file-service-api-service - ${project.parent.version} - - - diff --git a/porter/api/file-service/pom.xml b/porter/api/file-service/pom.xml deleted file mode 100644 index 8d00ed16..00000000 --- a/porter/api/file-service/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - 4.0.0 - - - org.apache.servicecomb.samples.porter - porter-api - 3.0-SNAPSHOT - - - file-service-api - pom - - - service - endpoint - - \ No newline at end of file diff --git a/porter/api/file-service/service/pom.xml b/porter/api/file-service/service/pom.xml deleted file mode 100644 index 5090e690..00000000 --- a/porter/api/file-service/service/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - 4.0.0 - - - org.apache.servicecomb.samples.porter - file-service-api - 3.0-SNAPSHOT - - - file-service-api-service - jar - - diff --git a/porter/api/pom.xml b/porter/api/pom.xml deleted file mode 100644 index 87a10638..00000000 --- a/porter/api/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - 4.0.0 - - - org.apache.servicecomb.samples.porter - porter-application - 3.0-SNAPSHOT - - - porter-api - pom - - - common - file-service - user-service - - \ No newline at end of file diff --git a/porter/api/user-service/endpoint/pom.xml b/porter/api/user-service/endpoint/pom.xml deleted file mode 100644 index 90546d00..00000000 --- a/porter/api/user-service/endpoint/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - 4.0.0 - - - org.apache.servicecomb.samples.porter - user-service-api - 3.0-SNAPSHOT - - - user-service-api-endpoint - jar - - - - org.apache.servicecomb.samples.porter - user-service-api-service - ${project.parent.version} - - - diff --git a/porter/api/user-service/pom.xml b/porter/api/user-service/pom.xml deleted file mode 100644 index 6d5251e7..00000000 --- a/porter/api/user-service/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - 4.0.0 - - - org.apache.servicecomb.samples.porter - porter-api - 3.0-SNAPSHOT - - - user-service-api - pom - - - service - endpoint - - \ No newline at end of file diff --git a/porter/api/user-service/service/pom.xml b/porter/api/user-service/service/pom.xml deleted file mode 100644 index 12877a65..00000000 --- a/porter/api/user-service/service/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - 4.0.0 - - - org.apache.servicecomb.samples.porter - user-service-api - 3.0-SNAPSHOT - - - user-service-api-service - jar - - diff --git a/porter/file-service/pom.xml b/porter/file-service/pom.xml index 3201813f..8bda9d9b 100644 --- a/porter/file-service/pom.xml +++ b/porter/file-service/pom.xml @@ -29,16 +29,6 @@ jar - - org.apache.servicecomb.samples.porter - file-service-api-endpoint - ${project.parent.version} - - - org.apache.servicecomb.samples.porter - common-api-endpoint - ${project.parent.version} - org.apache.servicecomb.samples.porter.file.FileMain diff --git a/porter/api/file-service/service/src/main/java/org/apache/servicecomb/samples/porter/file/api/FileService.java b/porter/file-service/src/main/java/org/apache/servicecomb/samples/porter/file/api/FileService.java similarity index 100% rename from porter/api/file-service/service/src/main/java/org/apache/servicecomb/samples/porter/file/api/FileService.java rename to porter/file-service/src/main/java/org/apache/servicecomb/samples/porter/file/api/FileService.java diff --git a/porter/api/file-service/service/src/main/java/org/apache/servicecomb/samples/porter/file/api/InternalAccessService.java b/porter/file-service/src/main/java/org/apache/servicecomb/samples/porter/file/api/InternalAccessService.java similarity index 100% rename from porter/api/file-service/service/src/main/java/org/apache/servicecomb/samples/porter/file/api/InternalAccessService.java rename to porter/file-service/src/main/java/org/apache/servicecomb/samples/porter/file/api/InternalAccessService.java diff --git a/porter/api/file-service/endpoint/src/main/java/org/apache/servicecomb/samples/porter/file/api/FileEndpoint.java b/porter/file-service/src/main/java/org/apache/servicecomb/samples/porter/file/endpoint/FileEndpoint.java similarity index 97% rename from porter/api/file-service/endpoint/src/main/java/org/apache/servicecomb/samples/porter/file/api/FileEndpoint.java rename to porter/file-service/src/main/java/org/apache/servicecomb/samples/porter/file/endpoint/FileEndpoint.java index 8ff7dac4..84d7b22d 100644 --- a/porter/api/file-service/endpoint/src/main/java/org/apache/servicecomb/samples/porter/file/api/FileEndpoint.java +++ b/porter/file-service/src/main/java/org/apache/servicecomb/samples/porter/file/endpoint/FileEndpoint.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.servicecomb.samples.porter.file.api; +package org.apache.servicecomb.samples.porter.file.endpoint; import org.apache.servicecomb.provider.rest.common.RestSchema; import org.apache.servicecomb.samples.porter.file.api.FileService; diff --git a/porter/api/file-service/endpoint/src/main/java/org/apache/servicecomb/samples/porter/file/api/InternalAccessEndpoint.java b/porter/file-service/src/main/java/org/apache/servicecomb/samples/porter/file/endpoint/InternalAccessEndpoint.java similarity index 91% rename from porter/api/file-service/endpoint/src/main/java/org/apache/servicecomb/samples/porter/file/api/InternalAccessEndpoint.java rename to porter/file-service/src/main/java/org/apache/servicecomb/samples/porter/file/endpoint/InternalAccessEndpoint.java index 58404279..627c829d 100644 --- a/porter/api/file-service/endpoint/src/main/java/org/apache/servicecomb/samples/porter/file/api/InternalAccessEndpoint.java +++ b/porter/file-service/src/main/java/org/apache/servicecomb/samples/porter/file/endpoint/InternalAccessEndpoint.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package org.apache.servicecomb.samples.porter.file.api; +package org.apache.servicecomb.samples.porter.file.endpoint; import org.apache.servicecomb.provider.rest.common.RestSchema; +import org.apache.servicecomb.samples.porter.file.api.InternalAccessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/porter/gateway-service/pom.xml b/porter/gateway-service/pom.xml index a7e085a3..a89d4b71 100644 --- a/porter/gateway-service/pom.xml +++ b/porter/gateway-service/pom.xml @@ -33,16 +33,6 @@ - - org.apache.servicecomb.samples.porter - user-service-api-service - ${project.parent.version} - - - org.apache.servicecomb.samples.porter - common-api-endpoint - ${project.parent.version} - org.apache.servicecomb edge-core diff --git a/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/ApiDispatcher.java b/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/ext/ApiDispatcher.java similarity index 98% rename from porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/ApiDispatcher.java rename to porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/ext/ApiDispatcher.java index 8ab55ab9..a488d602 100644 --- a/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/ApiDispatcher.java +++ b/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/ext/ApiDispatcher.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.servicecomb.samples.porter.gateway; +package org.apache.servicecomb.samples.porter.gateway.ext; import org.apache.servicecomb.common.rest.RestProducerInvocationFlow; import org.apache.servicecomb.core.Invocation; diff --git a/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/AuthHandler.java b/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/ext/AuthHandler.java similarity index 90% rename from porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/AuthHandler.java rename to porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/ext/AuthHandler.java index 439a3794..71d7f47e 100644 --- a/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/AuthHandler.java +++ b/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/ext/AuthHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.servicecomb.samples.porter.gateway; +package org.apache.servicecomb.samples.porter.gateway.ext; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; @@ -25,10 +25,11 @@ import org.apache.servicecomb.core.filter.EdgeFilter; import org.apache.servicecomb.core.filter.FilterNode; import org.apache.servicecomb.foundation.common.utils.JsonUtils; +import org.apache.servicecomb.provider.pojo.RpcReference; import org.apache.servicecomb.samples.porter.user.api.SessionInfo; +import org.apache.servicecomb.samples.porter.user.api.UserService; import org.apache.servicecomb.swagger.invocation.Response; import org.apache.servicecomb.swagger.invocation.exception.InvocationException; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.google.common.cache.Cache; @@ -36,18 +37,14 @@ @Component public class AuthHandler extends AbstractFilter implements EdgeFilter { - private final UserServiceClient userServiceClient; + @RpcReference(microserviceName = "user-service", schemaId = "user") + private UserService userService; // session expires in 10 minutes, cache for 1 seconds to get rid of concurrent scenarios. private Cache sessionCache = CacheBuilder.newBuilder() .expireAfterAccess(30, TimeUnit.SECONDS) .build(); - @Autowired - public AuthHandler(UserServiceClient userServiceClient) { - this.userServiceClient = userServiceClient; - } - @Override public CompletableFuture onFilter(Invocation invocation, FilterNode nextNode) { if (invocation.getMicroserviceName().equals("user-service") @@ -75,7 +72,7 @@ public CompletableFuture onFilter(Invocation invocation, FilterNode ne } // In edge, handler is executed in reactively. Must have no blocking logic. - CompletableFuture result = userServiceClient.getGetSessionOperation().getSession(sessionId); + CompletableFuture result = userService.getSession(sessionId); return result.whenComplete((info, e) -> { if (result.isCompletedExceptionally()) { throw new InvocationException(403, "", "session is not valid."); diff --git a/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/EdgeSSLCustom.java b/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/ext/EdgeSSLCustom.java similarity index 95% rename from porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/EdgeSSLCustom.java rename to porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/ext/EdgeSSLCustom.java index 159c10d2..3f6c4e57 100644 --- a/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/EdgeSSLCustom.java +++ b/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/ext/EdgeSSLCustom.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.servicecomb.samples.porter.gateway; +package org.apache.servicecomb.samples.porter.gateway.ext; import java.io.File; diff --git a/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/InternalAccessHandler.java b/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/ext/InternalAccessHandler.java similarity index 97% rename from porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/InternalAccessHandler.java rename to porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/ext/InternalAccessHandler.java index bed3aeb5..2c870147 100644 --- a/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/InternalAccessHandler.java +++ b/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/ext/InternalAccessHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.servicecomb.samples.porter.gateway; +package org.apache.servicecomb.samples.porter.gateway.ext; import java.util.concurrent.CompletableFuture; diff --git a/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/StaticWebpageDispatcher.java b/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/ext/StaticWebpageDispatcher.java similarity index 96% rename from porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/StaticWebpageDispatcher.java rename to porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/ext/StaticWebpageDispatcher.java index 9b707b31..60bb69a8 100644 --- a/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/StaticWebpageDispatcher.java +++ b/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/ext/StaticWebpageDispatcher.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.servicecomb.samples.porter.gateway; +package org.apache.servicecomb.samples.porter.gateway.ext; import org.apache.servicecomb.foundation.common.LegacyPropertyFactory; import org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher; diff --git a/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/user/api/README.md b/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/user/api/README.md new file mode 100644 index 00000000..87691135 --- /dev/null +++ b/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/user/api/README.md @@ -0,0 +1,3 @@ +API definitions from user-service. + +Only include apis used in gateway. diff --git a/porter/api/user-service/service/src/main/java/org/apache/servicecomb/samples/porter/user/api/SessionInfo.java b/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/user/api/SessionInfo.java similarity index 100% rename from porter/api/user-service/service/src/main/java/org/apache/servicecomb/samples/porter/user/api/SessionInfo.java rename to porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/user/api/SessionInfo.java diff --git a/porter/api/common/service/src/main/java/org/apache/servicecomb/samples/porter/common/api/LogService.java b/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/user/api/UserService.java similarity index 74% rename from porter/api/common/service/src/main/java/org/apache/servicecomb/samples/porter/common/api/LogService.java rename to porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/user/api/UserService.java index 9991543b..3bf8f1f1 100644 --- a/porter/api/common/service/src/main/java/org/apache/servicecomb/samples/porter/common/api/LogService.java +++ b/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/user/api/UserService.java @@ -15,12 +15,11 @@ * limitations under the License. */ -package org.apache.servicecomb.samples.porter.common.api; +package org.apache.servicecomb.samples.porter.user.api; -import java.io.File; -import java.util.List; +import java.util.concurrent.CompletableFuture; -public interface LogService { - List getLogFileList(); - File getLogFileContent(String fileName); +public interface UserService { + // We can define different signature than user-service. This method is reactive. + CompletableFuture getSession(String sessionId); } diff --git a/porter/gateway-service/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher b/porter/gateway-service/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher index 71009db0..8ec7b1c5 100644 --- a/porter/gateway-service/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher +++ b/porter/gateway-service/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher @@ -15,5 +15,5 @@ # limitations under the License. # -org.apache.servicecomb.samples.porter.gateway.ApiDispatcher -org.apache.servicecomb.samples.porter.gateway.StaticWebpageDispatcher \ No newline at end of file +org.apache.servicecomb.samples.porter.gateway.ext.ApiDispatcher +org.apache.servicecomb.samples.porter.gateway.ext.StaticWebpageDispatcher \ No newline at end of file diff --git a/porter/pom.xml b/porter/pom.xml index b996c121..f67a9644 100644 --- a/porter/pom.xml +++ b/porter/pom.xml @@ -94,7 +94,6 @@ - api file-service user-service gateway-service diff --git a/porter/user-service/pom.xml b/porter/user-service/pom.xml index 68df4ef1..0ebec902 100644 --- a/porter/user-service/pom.xml +++ b/porter/user-service/pom.xml @@ -34,19 +34,15 @@ - - org.apache.servicecomb.samples.porter - user-service-api-endpoint - ${project.parent.version} - - - org.apache.servicecomb.samples.porter - common-api-endpoint - ${project.parent.version} - org.mybatis.spring.boot mybatis-spring-boot-starter + + + org.springframework.boot + spring-boot-starter-logging + + mysql diff --git a/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/UserServiceClient.java b/porter/user-service/src/main/java/org/apache/servicecomb/samples/porter/user/api/SessionInfo.java similarity index 55% rename from porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/UserServiceClient.java rename to porter/user-service/src/main/java/org/apache/servicecomb/samples/porter/user/api/SessionInfo.java index 701a3575..63581045 100644 --- a/porter/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/UserServiceClient.java +++ b/porter/user-service/src/main/java/org/apache/servicecomb/samples/porter/user/api/SessionInfo.java @@ -15,25 +15,36 @@ * limitations under the License. */ -package org.apache.servicecomb.samples.porter.gateway; +package org.apache.servicecomb.samples.porter.user.api; -import java.util.concurrent.CompletableFuture; +public class SessionInfo { + private String sessiondId; -import org.apache.servicecomb.provider.pojo.RpcReference; -import org.apache.servicecomb.samples.porter.user.api.SessionInfo; -import org.springframework.stereotype.Component; + private String userName; -interface GetSessionOperation { - CompletableFuture getSession(String sessionId); -} + private String roleName; + public String getSessiondId() { + return sessiondId; + } -@Component("UserServiceClient") -public class UserServiceClient { - @RpcReference(microserviceName = "user-service", schemaId = "user") - private GetSessionOperation getSessionOperation; + public void setSessiondId(String sessiondId) { + this.sessiondId = sessiondId; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getRoleName() { + return roleName; + } - public GetSessionOperation getGetSessionOperation() { - return getSessionOperation; + public void setRoleName(String roleName) { + this.roleName = roleName; } } diff --git a/porter/api/user-service/service/src/main/java/org/apache/servicecomb/samples/porter/user/api/UserService.java b/porter/user-service/src/main/java/org/apache/servicecomb/samples/porter/user/api/UserService.java similarity index 100% rename from porter/api/user-service/service/src/main/java/org/apache/servicecomb/samples/porter/user/api/UserService.java rename to porter/user-service/src/main/java/org/apache/servicecomb/samples/porter/user/api/UserService.java diff --git a/porter/api/user-service/endpoint/src/main/java/org/apache/servicecomb/samples/porter/user/api/UserEndpoint.java b/porter/user-service/src/main/java/org/apache/servicecomb/samples/porter/user/endpoint/UserEndpoint.java similarity index 97% rename from porter/api/user-service/endpoint/src/main/java/org/apache/servicecomb/samples/porter/user/api/UserEndpoint.java rename to porter/user-service/src/main/java/org/apache/servicecomb/samples/porter/user/endpoint/UserEndpoint.java index 40df5bbe..473c1736 100644 --- a/porter/api/user-service/endpoint/src/main/java/org/apache/servicecomb/samples/porter/user/api/UserEndpoint.java +++ b/porter/user-service/src/main/java/org/apache/servicecomb/samples/porter/user/endpoint/UserEndpoint.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.servicecomb.samples.porter.user.api; +package org.apache.servicecomb.samples.porter.user.endpoint; import org.apache.servicecomb.provider.rest.common.RestSchema; import org.apache.servicecomb.samples.porter.user.api.SessionInfo;