KAA-749: Fixes to Java SDK generation and filter cache invalidation

kaaproject · Feb 4, 2016 · da7844e · da7844e
1 parent 57fc90f
commit da7844e
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 35 deletions.
diff --git a/client/client-multi/client-java-core/src/templates/nf/NotificationListener.java.template b/client/client-multi/client-java-core/src/templates/nf/NotificationListener.java.template
@@ -33,6 +33,6 @@ public interface NotificationListener {
      * @param notification the notification object.
      *
      */
-    void onNotification(String topicId, ${notification_class} notification);
+    void onNotification(long topicId, ${notification_class} notification);
 
 }
diff --git a/server/common/dao/pom.xml b/server/common/dao/pom.xml
@@ -177,7 +177,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.17</version>
                 <configuration>
                     <systemPropertyVariables>
                         <server_log_dir>./logs</server_log_dir>

diff --git a/server/common/dao/src/main/resources/common-dao-context.xml b/server/common/dao/src/main/resources/common-dao-context.xml
@@ -19,14 +19,17 @@
        xmlns:context="http://www.springframework.org/schema/context"
        xmlns:tx="http://www.springframework.org/schema/tx"
        xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:aop="http://www.springframework.org/schema/aop" 
        xsi:schemaLocation="http://www.springframework.org/schema/beans
             http://www.springframework.org/schema/beans/spring-beans.xsd
             http://www.springframework.org/schema/context
             http://www.springframework.org/schema/context/spring-context-4.0.xsd
             http://www.springframework.org/schema/tx
             http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
             http://www.springframework.org/schema/util
-            http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+            http://www.springframework.org/schema/util/spring-util-3.0.xsd
+            http://www.springframework.org/schema/aop 
+            http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
 
     <context:annotation-config/>
     <aop:aspectj-autoproxy />    

diff --git a/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointProfileDto.java b/server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/EndpointProfileDto.java
@@ -24,12 +24,10 @@
 import java.util.Collections;
 import java.util.List;
 
-import static org.kaaproject.kaa.common.dto.Util.getArrayCopy;
-
 public class EndpointProfileDto implements HasId, HasVersion, Serializable {
 
 
-    private static final List<EndpointGroupStateDto> EMPTY_GROUP_STATE = Collections.unmodifiableList(new ArrayList<>());
+    private static final List<EndpointGroupStateDto> EMPTY_GROUP_STATE = Collections.unmodifiableList(new ArrayList<EndpointGroupStateDto>());
 
     private static final long serialVersionUID = -7122736699758720540L;
 

diff --git a/...c/main/java/org/kaaproject/kaa/server/operations/service/cache/AppProfileVersionsKey.java b/...c/main/java/org/kaaproject/kaa/server/operations/service/cache/AppProfileVersionsKey.java
@@ -34,10 +34,10 @@ public final class AppProfileVersionsKey implements Serializable {
     private final String applicationToken;
 
     /** The version. */
-    private final int endpointProfileSchemaVersion;
+    private final Integer endpointProfileSchemaVersion;
 
     /** The version. */
-    private final int serverProfileSchemaVersion;
+    private final Integer serverProfileSchemaVersion;
 
     /**
      * Instantiates a new app version key.
@@ -49,7 +49,7 @@ public final class AppProfileVersionsKey implements Serializable {
      * @param serverProfileSchemaVersion
      *            the server profile schema version
      */
-    public AppProfileVersionsKey(String applicationToken, int endpointProfileSchemaVersion, int serverProfileSchemaVersion) {
+    public AppProfileVersionsKey(String applicationToken, Integer endpointProfileSchemaVersion, Integer serverProfileSchemaVersion) {
         super();
         this.applicationToken = applicationToken;
         this.endpointProfileSchemaVersion = endpointProfileSchemaVersion;
@@ -60,11 +60,11 @@ public String getApplicationToken() {
         return applicationToken;
     }
 
-    public int getEndpointProfileSchemaVersion() {
+    public Integer getEndpointProfileSchemaVersion() {
         return endpointProfileSchemaVersion;
     }
 
-    public int getServerProfileSchemaVersion() {
+    public Integer getServerProfileSchemaVersion() {
         return serverProfileSchemaVersion;
     }
 
@@ -73,29 +73,44 @@ public int hashCode() {
         final int prime = 31;
         int result = 1;
         result = prime * result + ((applicationToken == null) ? 0 : applicationToken.hashCode());
-        result = prime * result + endpointProfileSchemaVersion;
+        result = prime * result + ((endpointProfileSchemaVersion == null) ? 0 : endpointProfileSchemaVersion.hashCode());
-        result = prime * result + serverProfileSchemaVersion;
+        result = prime * result + ((serverProfileSchemaVersion == null) ? 0 : serverProfileSchemaVersion.hashCode());
         return result;
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
+        if (this == obj) {
             return true;
-        if (obj == null)
+        }
+        if (obj == null) {
             return false;
-        if (getClass() != obj.getClass())
+        }
+        if (getClass() != obj.getClass()) {
             return false;
+        }
         AppProfileVersionsKey other = (AppProfileVersionsKey) obj;
         if (applicationToken == null) {
-            if (other.applicationToken != null)
+            if (other.applicationToken != null) {
                 return false;
-        } else if (!applicationToken.equals(other.applicationToken))
+            }
+        } else if (!applicationToken.equals(other.applicationToken)) {
             return false;
-        if (endpointProfileSchemaVersion != other.endpointProfileSchemaVersion)
+        }
+        if (endpointProfileSchemaVersion == null) {
+            if (other.endpointProfileSchemaVersion != null) {
+                return false;
+            }
+        } else if (!endpointProfileSchemaVersion.equals(other.endpointProfileSchemaVersion)) {
             return false;
-        if (serverProfileSchemaVersion != other.serverProfileSchemaVersion)
+        }
+        if (serverProfileSchemaVersion == null) {
+            if (other.serverProfileSchemaVersion != null) {
+                return false;
+            }
+        } else if (!serverProfileSchemaVersion.equals(other.serverProfileSchemaVersion)) {
             return false;
+        }
         return true;
     }
 

diff --git a/...java/org/kaaproject/kaa/server/operations/service/thrift/OperationsThriftServiceImpl.java b/...java/org/kaaproject/kaa/server/operations/service/thrift/OperationsThriftServiceImpl.java
@@ -142,21 +142,23 @@ public void sendUserConfigurationUpdates(List<UserConfigurationUpdate> updates)
      */
     private void processCacheNotification(Notification notification) {
         ApplicationDto appDto = applicationService.findAppById(notification.getAppId());
+        LOG.debug("Processing cache notification {} for app {}", notification, appDto);
         if (appDto != null) {
             if (notification.getProfileFilterId() != null) {
                 ProfileFilterDto filterDto = cacheService.getFilter(notification.getProfileFilterId());
+                LOG.debug("Processing filter  {}", filterDto); 
                 if (filterDto.getEndpointProfileSchemaId() != null && filterDto.getServerProfileSchemaId() != null) {
                     cacheService.resetFilters(new AppProfileVersionsKey(appDto.getApplicationToken(), filterDto
                             .getEndpointProfileSchemaVersion(), filterDto.getServerProfileSchemaVersion()));
                 } else if (filterDto.getServerProfileSchemaVersion() == null) {
                     for (VersionDto version : profileService.findProfileSchemaVersionsByAppId(appDto.getId())) {
-                        cacheService.resetFilters(new AppProfileVersionsKey(appDto.getApplicationToken(), version.getVersion(), filterDto
+                        LOG.debug("Processing version {}", version);
-                                .getServerProfileSchemaVersion()));
+                        cacheService.resetFilters(new AppProfileVersionsKey(appDto.getApplicationToken(), version.getVersion(), null));
                     }
                 } else {
                     for (ServerProfileSchemaDto version : serverProfileService.findServerProfileSchemasByAppId(appDto.getId())) {
-                        cacheService.resetFilters(new AppProfileVersionsKey(appDto.getApplicationToken(), version.getVersion(), filterDto
+                        LOG.debug("Processing version {}", version);
-                                .getServerProfileSchemaVersion()));
+                        cacheService.resetFilters(new AppProfileVersionsKey(appDto.getApplicationToken(), null, version.getVersion()));
                     }
                 }
             }

diff --git a/server/node/src/main/resources/logback.xml b/server/node/src/main/resources/logback.xml
@@ -38,12 +38,9 @@
 
     <logger name="org.kaaproject.kaa" level="INFO"/>
     <logger name="org.kaaproject.kaa.metrics" level="WARN"/>
-    <logger name="org.kaaproject.kaa.server" level="INFO"/>
+    <logger name="org.kaaproject.kaa.server" level="TRACE"/>
-    <logger name="org.kaaproject.kaa.server.node" level="INFO"/>
+    <logger name="org.kaaproject.kaa.server.hash" level="WARN"/>
-    <logger name="org.kaaproject.kaa.server.admin" level="INFO"/>
+    <logger name="org.kaaproject.kaa.server.bootstrap.service.DefaultOperationsServerListService" level="WARN"/>
-    <logger name="org.kaaproject.kaa.server.control" level="INFO"/>
-    <logger name="org.kaaproject.kaa.server.bootstrap" level="INFO"/>
-    <logger name="org.kaaproject.kaa.server.operations" level="INFO"/>
     <logger name="org.kaaproject.kaa.server.operations.service.statistics" level="WARN"/>
     <logger name="org.kaaproject.kaa.server.operations.service.event" level="WARN"/>
     <logger name="org.kaaproject.kaa.server.thrift" level="WARN"/>

diff --git a/server/node/src/test/resources/logback.xml b/server/node/src/test/resources/logback.xml
@@ -39,9 +39,9 @@
         </encoder>
     </appender>
 
-    <logger name="org.kaaproject.kaa" level="INFO"/>
+    <logger name="org.kaaproject.kaa" level="TRACE"/>
     <logger name="org.kaaproject.kaa.metrics" level="WARN"/>
-    <logger name="org.kaaproject.kaa.server" level="INFO"/>
+    <logger name="org.kaaproject.kaa.server" level="DEBUG"/>
     <logger name="org.kaaproject.kaa.server.node" level="INFO"/>
     <logger name="org.kaaproject.kaa.server.admin" level="INFO"/>
     <logger name="org.kaaproject.kaa.server.control" level="INFO"/>

diff --git a/...org/kaaproject/kaa/server/transports/http/transport/commands/AbstractHttpSyncCommand.java b/...org/kaaproject/kaa/server/transports/http/transport/commands/AbstractHttpSyncCommand.java
@@ -21,6 +21,8 @@
 import static io.netty.handler.codec.http.HttpHeaders.Names.CONTENT_TYPE;
 import static io.netty.handler.codec.http.HttpResponseStatus.OK;
 import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
+
+import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.http.DefaultFullHttpResponse;
 import io.netty.handler.codec.http.FullHttpResponse;
@@ -34,7 +36,9 @@
 import io.netty.handler.codec.http.multipart.InterfaceHttpData.HttpDataType;
 
 import java.io.IOException;
+import java.nio.ByteBuffer;
 import java.security.GeneralSecurityException;
+import java.util.Arrays;
 import java.util.List;
 
 import org.apache.commons.codec.binary.Base64;
@@ -189,10 +193,13 @@ public void setResponseSignature(byte[] responseSignature) {
     public HttpResponse getResponse() {
         LOG.trace("CommandName: " + COMMAND_NAME + ": getHttpResponse..");
 
-        FullHttpResponse httpResponse = new DefaultFullHttpResponse(HTTP_1_1, OK, Unpooled.copiedBuffer(responseBody));
+        ByteBuf data = Unpooled.copiedBuffer(responseBody);
+        LOG.warn("Response data: {}" , Arrays.toString(data.array()));
+        FullHttpResponse httpResponse = new DefaultFullHttpResponse(HTTP_1_1, OK, data);
 
         httpResponse.headers().set(CONTENT_TYPE, CommonEPConstans.RESPONSE_CONTENT_TYPE);
-        httpResponse.headers().set(CONTENT_LENGTH, httpResponse.content().readableBytes());
+        httpResponse.headers().set(CONTENT_LENGTH, data.readableBytes());
+        LOG.warn("Response size: {}" , data.readableBytes());
         httpResponse.headers().set(CommonEPConstans.RESPONSE_TYPE, CommonEPConstans.RESPONSE_TYPE_OPERATION);
         if(responseSignature != null){
             httpResponse.headers().set(CommonEPConstans.SIGNATURE_HEADER_NAME, Base64.encodeBase64String(responseSignature));

diff --git a/.../main/java/org/kaaproject/kaa/server/transports/http/transport/netty/ResponseEncoder.java b/.../main/java/org/kaaproject/kaa/server/transports/http/transport/netty/ResponseEncoder.java
@@ -41,7 +41,7 @@
  */
 public class ResponseEncoder extends ChannelOutboundHandlerAdapter {
 
-    private static final Logger LOG = LoggerFactory.getLogger(RequestDecoder.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ResponseEncoder.class);
 
     @Override
     public void write(ChannelHandlerContext ctx, Object msg,