Repository: incubator-rya Updated Branches: refs/heads/master 28b0a52d0 -> de365c179
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/de365c17/extras/rya.periodic.service/periodic.service.notification/src/test/java/org/apache/rya/periodic/notification/serialization/CommandNotificationSerializerTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.periodic.service/periodic.service.notification/src/test/java/org/apache/rya/periodic/notification/serialization/CommandNotificationSerializerTest.java b/extras/rya.periodic.service/periodic.service.notification/src/test/java/org/apache/rya/periodic/notification/serialization/CommandNotificationSerializerTest.java deleted file mode 100644 index 4aad1c6..0000000 --- a/extras/rya.periodic.service/periodic.service.notification/src/test/java/org/apache/rya/periodic/notification/serialization/CommandNotificationSerializerTest.java +++ /dev/null @@ -1,60 +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.rya.periodic.notification.serialization; - -import java.util.UUID; -import java.util.concurrent.TimeUnit; - -import org.apache.rya.periodic.notification.notification.BasicNotification; -import org.apache.rya.periodic.notification.notification.CommandNotification; -import org.apache.rya.periodic.notification.notification.CommandNotification.Command; -import org.apache.rya.periodic.notification.notification.PeriodicNotification; -import org.apache.rya.periodic.notification.serialization.CommandNotificationSerializer; -import org.junit.Assert; -import org.junit.Test; - -public class CommandNotificationSerializerTest { - - private CommandNotificationSerializer serializer = new CommandNotificationSerializer(); - private static final String topic = "topic"; - - @Test - public void basicSerializationTest() { - PeriodicNotification notification = PeriodicNotification.builder().id(UUID.randomUUID().toString()).period(24) - .timeUnit(TimeUnit.DAYS).initialDelay(1).build(); - CommandNotification command = new CommandNotification(Command.ADD, notification); - Assert.assertEquals(command, serializer.deserialize(topic,serializer.serialize(topic, command))); - - PeriodicNotification notification1 = PeriodicNotification.builder().id(UUID.randomUUID().toString()).period(32) - .timeUnit(TimeUnit.SECONDS).initialDelay(15).build(); - CommandNotification command1 = new CommandNotification(Command.ADD, notification1); - Assert.assertEquals(command1, serializer.deserialize(topic,serializer.serialize(topic,command1))); - - PeriodicNotification notification2 = PeriodicNotification.builder().id(UUID.randomUUID().toString()).period(32) - .timeUnit(TimeUnit.SECONDS).initialDelay(15).build(); - CommandNotification command2 = new CommandNotification(Command.ADD, notification2); - Assert.assertEquals(command2, serializer.deserialize(topic,serializer.serialize(topic,command2))); - - BasicNotification notification3 = new BasicNotification(UUID.randomUUID().toString()); - CommandNotification command3 = new CommandNotification(Command.ADD, notification3); - Assert.assertEquals(command3, serializer.deserialize(topic,serializer.serialize(topic,command3))); - - } - -} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/de365c17/extras/rya.periodic.service/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.periodic.service/pom.xml b/extras/rya.periodic.service/pom.xml deleted file mode 100644 index 22ee1aa..0000000 --- a/extras/rya.periodic.service/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <!-- -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. ---> - <modelVersion>4.0.0</modelVersion> - <artifactId>rya.periodic.service</artifactId> - - <parent> - <groupId>org.apache.rya</groupId> - <artifactId>rya.extras</artifactId> - <version>3.2.11-incubating-SNAPSHOT</version> - </parent> - - <name>Apache Rya Periodic Service</name> - <description>Parent class for Rya Periodic Service</description> - - <packaging>pom</packaging> - - <modules> - <module>periodic.service.notification</module> - <module>periodic.service.integration.tests</module> - <module>periodic.service.api</module> - </modules> - -</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/de365c17/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7a0bf2c..761f992 100644 --- a/pom.xml +++ b/pom.xml @@ -244,24 +244,19 @@ under the License. <artifactId>rya.pcj.fluo.app</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.rya</groupId> - <artifactId>rya.periodic.service</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.rya</groupId> - <artifactId>rya.periodic.service.api</artifactId> + <artifactId>rya.periodic.notification.api</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.rya</groupId> - <artifactId>rya.periodic.service.notification</artifactId> + <artifactId>rya.periodic.notification.service</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.rya</groupId> - <artifactId>rya.periodic.service.integration.tests</artifactId> + <artifactId>rya.periodic.notification.tests</artifactId> <version>${project.version}</version> </dependency> <dependency>
