Repository: james-project Updated Branches: refs/heads/master 89ca3b8b4 -> ef4f8d9ef
JAMES-1759 rename model package into dto Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ef4f8d9e Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ef4f8d9e Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ef4f8d9e Branch: refs/heads/master Commit: ef4f8d9ef1daa487112e30c15a5532b0e9ca88fe Parents: ff3412f Author: Benoit Tellier <[email protected]> Authored: Thu Jun 23 11:17:36 2016 +0700 Committer: Benoit Tellier <[email protected]> Committed: Thu Jun 23 16:31:27 2016 +0700 ---------------------------------------------------------------------- .../james/webadmin/dto/AddUserRequest.java | 39 ++++++++++++++++++++ .../james/webadmin/dto/MailboxResponse.java | 33 +++++++++++++++++ .../apache/james/webadmin/dto/UserResponse.java | 33 +++++++++++++++++ .../james/webadmin/model/AddUserRequest.java | 39 -------------------- .../james/webadmin/model/MailboxResponse.java | 33 ----------------- .../james/webadmin/model/UserResponse.java | 33 ----------------- .../james/webadmin/routes/UserRoutes.java | 2 +- .../webadmin/service/UserMailboxesService.java | 2 +- .../james/webadmin/service/UserService.java | 2 +- 9 files changed, 108 insertions(+), 108 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/ef4f8d9e/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/dto/AddUserRequest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/dto/AddUserRequest.java b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/dto/AddUserRequest.java new file mode 100644 index 0000000..1d102c2 --- /dev/null +++ b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/dto/AddUserRequest.java @@ -0,0 +1,39 @@ +/**************************************************************** + * 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.james.webadmin.dto; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.common.base.Preconditions; + +public class AddUserRequest { + + private final char[] password; + + @JsonCreator + public AddUserRequest(@JsonProperty("password") char[] password) { + Preconditions.checkNotNull(password); + this.password = password; + } + + public char[] getPassword() { + return password; + } +} http://git-wip-us.apache.org/repos/asf/james-project/blob/ef4f8d9e/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/dto/MailboxResponse.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/dto/MailboxResponse.java b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/dto/MailboxResponse.java new file mode 100644 index 0000000..b552f45 --- /dev/null +++ b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/dto/MailboxResponse.java @@ -0,0 +1,33 @@ +/**************************************************************** + * 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.james.webadmin.dto; + +public class MailboxResponse { + + private final String mailboxName; + + public MailboxResponse(String mailboxName) { + this.mailboxName = mailboxName; + } + + public String getMailboxName() { + return mailboxName; + } +} http://git-wip-us.apache.org/repos/asf/james-project/blob/ef4f8d9e/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/dto/UserResponse.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/dto/UserResponse.java b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/dto/UserResponse.java new file mode 100644 index 0000000..5fe1846 --- /dev/null +++ b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/dto/UserResponse.java @@ -0,0 +1,33 @@ +/**************************************************************** + * 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.james.webadmin.dto; + +public class UserResponse { + + private final String username; + + public UserResponse(String username) { + this.username = username; + } + + public String getUsername() { + return username; + } +} http://git-wip-us.apache.org/repos/asf/james-project/blob/ef4f8d9e/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/model/AddUserRequest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/model/AddUserRequest.java b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/model/AddUserRequest.java deleted file mode 100644 index b23c7e2..0000000 --- a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/model/AddUserRequest.java +++ /dev/null @@ -1,39 +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.james.webadmin.model; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.common.base.Preconditions; - -public class AddUserRequest { - - private final char[] password; - - @JsonCreator - public AddUserRequest(@JsonProperty("password") char[] password) { - Preconditions.checkNotNull(password); - this.password = password; - } - - public char[] getPassword() { - return password; - } -} http://git-wip-us.apache.org/repos/asf/james-project/blob/ef4f8d9e/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/model/MailboxResponse.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/model/MailboxResponse.java b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/model/MailboxResponse.java deleted file mode 100644 index 593bfd1..0000000 --- a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/model/MailboxResponse.java +++ /dev/null @@ -1,33 +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.james.webadmin.model; - -public class MailboxResponse { - - private final String mailboxName; - - public MailboxResponse(String mailboxName) { - this.mailboxName = mailboxName; - } - - public String getMailboxName() { - return mailboxName; - } -} http://git-wip-us.apache.org/repos/asf/james-project/blob/ef4f8d9e/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/model/UserResponse.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/model/UserResponse.java b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/model/UserResponse.java deleted file mode 100644 index 9c41c77..0000000 --- a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/model/UserResponse.java +++ /dev/null @@ -1,33 +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.james.webadmin.model; - -public class UserResponse { - - private final String username; - - public UserResponse(String username) { - this.username = username; - } - - public String getUsername() { - return username; - } -} http://git-wip-us.apache.org/repos/asf/james-project/blob/ef4f8d9e/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/routes/UserRoutes.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/routes/UserRoutes.java b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/routes/UserRoutes.java index 7acda3c..0ead90a 100644 --- a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/routes/UserRoutes.java +++ b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/routes/UserRoutes.java @@ -26,7 +26,7 @@ import javax.inject.Inject; import org.apache.james.user.api.UsersRepositoryException; import org.apache.james.webadmin.Constants; import org.apache.james.webadmin.Routes; -import org.apache.james.webadmin.model.AddUserRequest; +import org.apache.james.webadmin.dto.AddUserRequest; import org.apache.james.webadmin.service.UserService; import org.apache.james.webadmin.utils.JsonExtractException; import org.apache.james.webadmin.utils.JsonExtractor; http://git-wip-us.apache.org/repos/asf/james-project/blob/ef4f8d9e/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/service/UserMailboxesService.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/service/UserMailboxesService.java b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/service/UserMailboxesService.java index ef3945e..076675a 100644 --- a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/service/UserMailboxesService.java +++ b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/service/UserMailboxesService.java @@ -35,7 +35,7 @@ import org.apache.james.mailbox.model.MailboxQuery; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; import org.apache.james.util.streams.ImmutableCollectors; -import org.apache.james.webadmin.model.MailboxResponse; +import org.apache.james.webadmin.dto.MailboxResponse; import org.apache.james.webadmin.utils.MailboxHaveChildrenException; import org.apache.james.webadmin.validation.MailboxName; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/james-project/blob/ef4f8d9e/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/service/UserService.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/service/UserService.java b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/service/UserService.java index bbe4e4e..1eb8ae1 100644 --- a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/service/UserService.java +++ b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/service/UserService.java @@ -30,7 +30,7 @@ import org.apache.james.user.api.UsersRepositoryException; import org.apache.james.user.api.model.User; import org.apache.james.util.streams.ImmutableCollectors; import org.apache.james.util.streams.Iterators; -import org.apache.james.webadmin.model.UserResponse; +import org.apache.james.webadmin.dto.UserResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
