upgrade to 1.0.6,take view of changelog

Author: itstamen

req.txt

@@ -0,0 +1,2 @@
+1.SessionManager���ʹ��HttpSession��Ϊ�Ự������
+  ��Ҫ����SessionManager�ӿڣ�

rop-sample/pom.xml

@@ -13,7 +13,7 @@
     <groupId>com.rop</groupId>
     <artifactId>rop-sample</artifactId>
     <name>ropSample</name>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.7-SNAPSHOT</version>
     <packaging>war</packaging>
     <description>rest open platform</description>
 
@@ -125,7 +125,7 @@
 
     <properties>
         <file.encoding>UTF-8</file.encoding>
-        <java.version>1.6</java.version>
+        <java.version>1.5</java.version>
         <servlet.version>2.5</servlet.version>
         <spring.version>3.2.3.RELEASE</spring.version>
         <jackson.version>1.9.5</jackson.version>

rop-sample/src/main/java/com/rop/sample/ReservedUserNameInterceptor.java

@@ -28,7 +28,6 @@ public class ReservedUserNameInterceptor extends AbstractInterceptor {
      *
      * @param ropRequestContext
      */
-    @Override
     public void beforeService(RopRequestContext ropRequestContext) {
         System.out.println("beforeService ...");
 
@@ -45,7 +44,7 @@ public void beforeService(RopRequestContext ropRequestContext) {
      *
      * @param ropRequestContext
      */
-    @Override
+
     public void beforeResponse(RopRequestContext ropRequestContext) {
         System.out.println("beforeResponse ...");
     }
@@ -56,7 +55,7 @@ public void beforeResponse(RopRequestContext ropRequestContext) {
      * @param ropRequestContext
      * @return
      */
-    @Override
+
     public boolean isMatch(RopRequestContext ropRequestContext) {
         return "user.add".equals(ropRequestContext.getMethod());
     }

rop-sample/src/main/java/com/rop/sample/SampleAfterDoServiceEventListener.java

@@ -22,7 +22,7 @@
  */
 public class SampleAfterDoServiceEventListener implements RopEventListener<AfterDoServiceEvent> {
 
-    @Override
+
     public void onRopEvent(AfterDoServiceEvent ropEvent) {
         RopRequestContext ropRequestContext = ropEvent.getRopRequestContext();
         if(ropRequestContext != null){
@@ -32,7 +32,7 @@ public void onRopEvent(AfterDoServiceEvent ropEvent) {
         }
     }
 
-    @Override
+
     public int getOrder() {
         return 0;
     }

rop-sample/src/main/java/com/rop/sample/SampleAppSecretManager.java

@@ -26,13 +26,13 @@ public class SampleAppSecretManager implements AppSecretManager {
         appKeySecretMap.put("00003","abcdeabcdeabcdeabcdeaaaaa");
     }
 
-    @Override
+
     public String getSecret(String appKey) {
         System.out.println("use SampleAppSecretManager!");
         return appKeySecretMap.get(appKey);
     }
 
-    @Override
+
     public boolean isValidAppKey(String appKey) {
         return getSecret(appKey) != null;
     }

rop-sample/src/main/java/com/rop/sample/SampleInvokeTimesController.java

@@ -26,31 +26,31 @@ public class SampleInvokeTimesController implements InvokeTimesController {
         appCallLimits.put("00002",10);
     }
 
-    @Override
+
     public void caculateInvokeTimes(String appKey, Session session) {
         if(!appCallCounter.containsKey(appKey)){
            appCallCounter.put(appKey,0);
         }
         appCallCounter.put(appKey,appCallCounter.get(appKey)+1);
     }
 
-    @Override
+
     public boolean isUserInvokeLimitExceed(String appKey, Session session) {
         return false;
     }
 
-    @Override
+
     public boolean isSessionInvokeLimitExceed(String appKey, String sessionId) {
         return false;
     }
 
-    @Override
+
     public boolean isAppInvokeLimitExceed(String appKey) {
         return appCallLimits.containsKey(appKey) &&
                 appCallCounter.get(appKey) > appCallLimits.get(appKey) ;
     }
 
-    @Override
+
     public boolean isAppInvokeFrequencyExceed(String appKey) {
         return false;
     }

rop-sample/src/main/java/com/rop/sample/SamplePostInitializeEventListener.java

@@ -17,12 +17,12 @@
  */
 public class SamplePostInitializeEventListener implements RopEventListener<AfterStartedRopEvent> {
 
-    @Override
+
     public void onRopEvent(AfterStartedRopEvent ropRopEvent) {
         System.out.println("execute SamplePostInitializeEventListener!");
     }
 
-    @Override
+
     public int getOrder() {
         return 0;
     }

rop-sample/src/main/java/com/rop/sample/SamplePreDoServiceEventListener.java

@@ -22,17 +22,17 @@
  */
 public class SamplePreDoServiceEventListener implements RopEventListener<PreDoServiceEvent> {
 
-    @Override
+
     public void onRopEvent(PreDoServiceEvent ropEvent) {
         RopRequestContext ropRequestContext = ropEvent.getRopRequestContext();
         if(ropRequestContext != null){
             Map<String,String> allParams = ropRequestContext.getAllParams();
-            String message = MessageMarshallerUtils.getMessage(allParams, ropRequestContext.getMessageFormat());
+            String message = MessageMarshallerUtils.asUrlString(allParams);
             System.out.println("message("+ropEvent.getServiceBeginTime()+")"+message);
         }
     }
 
-    @Override
+
     public int getOrder() {
         return 1;
     }

rop-sample/src/main/java/com/rop/sample/SampleServiceAccessController.java

@@ -32,7 +32,7 @@ public class SampleServiceAccessController implements ServiceAccessController {
         aclMap.put("00003", serviceMethods);
     }
 
-    @Override
+
     public boolean isAppGranted(String appKey, String method, String version) {
         if(aclMap.containsKey(appKey)){
             List<String> serviceMethods = aclMap.get(appKey);
@@ -42,7 +42,7 @@ public boolean isAppGranted(String appKey, String method, String version) {
         }
     }
 
-    @Override
+
     public boolean isUserGranted(Session session, String method, String version) {
         return true;
     }

rop-sample/src/main/java/com/rop/sample/SampleSessionManager.java

@@ -25,17 +25,17 @@ public class SampleSessionManager implements SessionManager{
 
     private final Map<String, Session> sessionCache = new ConcurrentHashMap<String, Session>(128, 0.75f, 32);
 
-    @Override
+
     public void addSession(String sessionId, Session session) {
         sessionCache.put(sessionId, session);
     }
 
-    @Override
+
     public Session getSession(String sessionId) {
         return sessionCache.get(sessionId);
     }
 
-    @Override
+
     public void removeSession(String sessionId) {
         sessionCache.remove(sessionId);
     }

rop-sample/src/main/java/com/rop/sample/SampleThreadFerry.java

@@ -16,12 +16,12 @@
  */
 public class SampleThreadFerry implements ThreadFerry{
 
-    @Override
+
     public void doInSrcThread() {
         System.out.println("doInSrcThread:"+Thread.currentThread().getId());
     }
 
-    @Override
+
     public void doInDestThread() {
         System.out.println("doInSrcThread:"+Thread.currentThread().getId());
     }

rop-sample/src/main/java/com/rop/sample/UserService.java

@@ -39,7 +39,7 @@ public class UserService extends AbstractUserService{
     private static final String USER_NAME_RESERVED = "USER_NAME_RESERVED";
     private List reservesUserNames = Arrays.asList(new String[]{"toms", "jhon"});
 
-    @Override
+
     public Object getSession(LogonRequest request) {
 
         //创建一个会话
@@ -84,8 +84,7 @@ public Object addUserOfV0_9(CreateUserRequest request) {
         request.getRopRequestContext().getLocale();
         if (reservesUserNames.contains(request.getUserName())) {
             return new BusinessServiceErrorResponse(
-                    request.getRopRequestContext().getMethod(), USER_NAME_RESERVED,
-                    request.getRopRequestContext().getLocale(), request.getUserName());
+                    request.getRopRequestContext(),USER_NAME_RESERVED,request.getUserName());
         } else {
             CreateUserResponse response = new CreateUserResponse();
             //add creaet new user here...
@@ -100,8 +99,7 @@ public Object addUser(CreateUserRequest request) {
         if (reservesUserNames.contains(request.getUserName())) { //如果注册的用户是预留的帐号，则返回错误的报文
             //这个业务错误将引用扩展国际化错误资源中的消息（i18n/rop/sampleRopError）
             return new BusinessServiceErrorResponse(
-                    request.getRopRequestContext().getMethod(), USER_NAME_RESERVED,
-                    request.getRopRequestContext().getLocale(), request.getUserName());
+                    request.getRopRequestContext(), USER_NAME_RESERVED,request.getUserName());
         } else {
             CreateUserResponse response = new CreateUserResponse();
             //add creaet new user here...
@@ -123,8 +121,7 @@ public Object addUser(CreateUserRequest request) {
     public Object addUser2(CreateUserRequest request) {
         if (reservesUserNames.contains(request.getUserName())) { //如果注册的用户是预留的帐号，则返回错误的报文
             return new BusinessServiceErrorResponse(
-                    request.getRopRequestContext().getMethod(), USER_NAME_RESERVED,
-                    request.getRopRequestContext().getLocale(), request.getUserName());
+                    request.getRopRequestContext(), USER_NAME_RESERVED, request.getUserName());
         } else {
             CreateUserResponse response = new CreateUserResponse();
             //add creaet new user here...

rop-sample/src/main/java/com/rop/sample/converter/CollectionsConverter.java

@@ -18,22 +18,22 @@
  */
 public class CollectionsConverter implements RopConverter<String, Collection> {
 
-    @Override
+
     public String unconvert(Collection target) {
         return null;
     }
 
-    @Override
+
     public Class<String> getSourceClass() {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
-    @Override
+
     public Class<Collection> getTargetClass() {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
-    @Override
+
     public Collection convert(String s) {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }

rop-sample/src/main/java/com/rop/sample/converter/DateConverter.java

@@ -14,22 +14,22 @@
  */
 public class DateConverter implements RopConverter<String,Date> {
 
-    @Override
+
     public Date convert(String s) {
         return DateUtils.parseDate(s);
     }
 
-    @Override
+
     public String unconvert(Date date) {
         return DateUtils.format(date,DateUtils.DATETIME_FORMAT);
     }
 
-    @Override
+
     public Class<String> getSourceClass() {
         return String.class;
     }
 
-    @Override
+
     public Class<Date> getTargetClass() {
         return Date.class;
     }

rop-sample/src/main/java/com/rop/sample/converter/TelephoneConverter.java

@@ -19,7 +19,7 @@
  */
 public class TelephoneConverter implements RopConverter<String, Telephone> {
 
-    @Override
+
     public Telephone convert(String source) {
         if (StringUtils.hasText(source)) {
             String zoneCode = source.substring(0, source.indexOf("-"));
@@ -33,7 +33,7 @@ public Telephone convert(String source) {
         }
     }
 
-    @Override
+
     public String unconvert(Telephone target) {
         StringBuilder sb = new StringBuilder();
         sb.append(target.getZoneCode());
@@ -42,12 +42,12 @@ public String unconvert(Telephone target) {
         return sb.toString();
     }
 
-    @Override
+
     public Class<String> getSourceClass() {
         return String.class;
     }
 
-    @Override
+
     public Class<Telephone> getTargetClass() {
         return Telephone.class;
     }

rop-sample/src/main/java/com/rop/sample/request/Address.java

@@ -27,7 +27,9 @@ public class Address {
     @XmlAttribute
     private String doorCode;
 
-
+    /**
+     * 在请求属性的属性类中，你可以使用接口的集合
+     */
     @XmlElementWrapper(name = "streets")
     @XmlElement(name = "street")
     private List<Street> streets;

rop-sample/src/main/java/com/rop/sample/request/CreateUserRequest.java

@@ -12,8 +12,7 @@
 import javax.validation.constraints.*;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * <pre>
@@ -41,8 +40,10 @@ public class CreateUserRequest extends AbstractRopRequest {
     @Valid
     private Address address;
 
-    @Valid
-    private List<Address> addresses;
+//    @Valid
+//    private List<Address> addresses;
+//
+//    private Map<String,String> attachMap;
 
     private String format;
 
@@ -138,12 +139,5 @@ public void setFavorites(String[] favorites) {
         this.favorites = favorites;
     }
 
-    public List<Address> getAddresses() {
-        return addresses;
-    }
-
-    public void setAddresses(List<Address> addresses) {
-        this.addresses = addresses;
-    }
 }