Removed IdGenerator strategy and RandomUuidGenerator implementation. We are always using UUID within GenericMessage.

This commit is contained in:
Mark Fisher
2008-08-25 13:49:07 +00:00
parent 50a227aaa1
commit dedb3294e4
5 changed files with 6 additions and 111 deletions

View File

@@ -17,11 +17,9 @@
package org.springframework.integration.message;
import java.io.Serializable;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import org.springframework.integration.util.IdGenerator;
import org.springframework.util.Assert;
/**
@@ -67,14 +65,14 @@ public class GenericMessage<T> implements Message<T>, Serializable {
}
public T getPayload() {
return this.payload;
}
public MessageHeaders getHeaders() {
return this.headers;
}
public T getPayload() {
return this.payload;
}
public String toString() {
return "[Payload=" + this.payload + "][Headers=" + this.headers + "]";
}

View File

@@ -24,8 +24,8 @@ package org.springframework.integration.message;
*/
public interface Message<T> {
T getPayload();
MessageHeaders getHeaders();
T getPayload();
}

View File

@@ -1,33 +0,0 @@
/*
* Copyright 2002-2007 the original author or authors.
*
* Licensed 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.springframework.integration.util;
import java.io.Serializable;
/**
* A strategy for generating unique ids.
*
* @author Mark Fisher
*/
public interface IdGenerator {
/**
* Generate a new unique id.
*/
public Serializable generateId();
}

View File

@@ -1,35 +0,0 @@
/*
* Copyright 2002-2008 the original author or authors.
*
* Licensed 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.springframework.integration.util;
import java.io.Serializable;
import java.util.UUID;
/**
* An id generator that generates random UUIDs. This is the default
* implementation used by the integration system.
*
* @author Mark Fisher
*/
@SuppressWarnings("serial")
public class RandomUuidGenerator implements IdGenerator {
public Serializable generateId() {
return UUID.randomUUID();
}
}

View File

@@ -1,35 +0,0 @@
/*
* Copyright 2002-2007 the original author or authors.
*
* Licensed 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.springframework.integration.util;
import static org.junit.Assert.assertNotNull;
import org.junit.Test;
/**
* @author Mark Fisher
*/
public class RandomUuidGeneratorTests {
@Test
public void testGeneratedIdIsNotNull() {
IdGenerator generator = new RandomUuidGenerator();
Object id = generator.generateId();
assertNotNull(id);
}
}