AMBARI-22653. ADDENDUM Infra Manager: s3 upload support for archiving Infra Solr (Krisztian Kasa via oleewere)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/935ea92a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/935ea92a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/935ea92a Branch: refs/heads/branch-feature-AMBARI-22008-isilon Commit: 935ea92aba62ec8f69be6c568b397608ef08b91f Parents: 415875b Author: Oliver Szabo <oleew...@gmail.com> Authored: Wed Dec 27 11:23:11 2017 +0100 Committer: Oliver Szabo <oleew...@gmail.com> Committed: Wed Dec 27 11:23:11 2017 +0100 ---------------------------------------------------------------------- .../ambari/infra/InfraManagerStories.java | 4 ++-- .../ambari/infra/job/CloseableIterator.java | 24 +++++++++++++++++++ .../infra/job/archive/DocumentIterator.java | 24 ------------------- .../infra/job/archive/DocumentSource.java | 25 -------------------- .../infra/job/archive/ItemWriterListener.java | 25 ++++++++++++++++++++ 5 files changed, 51 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/935ea92a/ambari-infra/ambari-infra-manager-it/src/test/java/org/apache/ambari/infra/InfraManagerStories.java ---------------------------------------------------------------------- diff --git a/ambari-infra/ambari-infra-manager-it/src/test/java/org/apache/ambari/infra/InfraManagerStories.java b/ambari-infra/ambari-infra-manager-it/src/test/java/org/apache/ambari/infra/InfraManagerStories.java index cf720ef..564de9a 100644 --- a/ambari-infra/ambari-infra-manager-it/src/test/java/org/apache/ambari/infra/InfraManagerStories.java +++ b/ambari-infra/ambari-infra-manager-it/src/test/java/org/apache/ambari/infra/InfraManagerStories.java @@ -18,7 +18,6 @@ */ package org.apache.ambari.infra; -import com.google.common.collect.Lists; import org.apache.ambari.infra.steps.ExportJobsSteps; import org.apache.commons.lang.StringUtils; import org.jbehave.core.configuration.Configuration; @@ -36,6 +35,7 @@ import org.jbehave.core.steps.ParameterConverters; import java.io.File; import java.net.URL; +import java.util.ArrayList; import java.util.List; import static java.util.Collections.singletonList; @@ -87,7 +87,7 @@ public class InfraManagerStories extends JUnitStories { } private static List<String> findStoriesInFolder(String folderAbsolutePath, String suffix) { - List<String> results = Lists.newArrayList(); + List<String> results = new ArrayList<>(); File folder = new File(folderAbsolutePath); File[] listOfFiles = folder.listFiles(); if (listOfFiles != null) { http://git-wip-us.apache.org/repos/asf/ambari/blob/935ea92a/ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/CloseableIterator.java ---------------------------------------------------------------------- diff --git a/ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/CloseableIterator.java b/ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/CloseableIterator.java new file mode 100644 index 0000000..5fa29b0 --- /dev/null +++ b/ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/CloseableIterator.java @@ -0,0 +1,24 @@ +/* + * 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.ambari.infra.job; + +import java.util.Iterator; + +public interface CloseableIterator<T> extends Iterator<T>, AutoCloseable { +} http://git-wip-us.apache.org/repos/asf/ambari/blob/935ea92a/ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/DocumentIterator.java ---------------------------------------------------------------------- diff --git a/ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/DocumentIterator.java b/ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/DocumentIterator.java deleted file mode 100644 index 5fa29b0..0000000 --- a/ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/DocumentIterator.java +++ /dev/null @@ -1,24 +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.ambari.infra.job; - -import java.util.Iterator; - -public interface CloseableIterator<T> extends Iterator<T>, AutoCloseable { -} http://git-wip-us.apache.org/repos/asf/ambari/blob/935ea92a/ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/DocumentSource.java ---------------------------------------------------------------------- diff --git a/ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/DocumentSource.java b/ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/DocumentSource.java deleted file mode 100644 index 7427771..0000000 --- a/ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/DocumentSource.java +++ /dev/null @@ -1,25 +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.ambari.infra.job.archive; - -import java.io.File; - -public interface ItemWriterListener { - void onCompleted(File file); -} http://git-wip-us.apache.org/repos/asf/ambari/blob/935ea92a/ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/ItemWriterListener.java ---------------------------------------------------------------------- diff --git a/ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/ItemWriterListener.java b/ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/ItemWriterListener.java new file mode 100644 index 0000000..7427771 --- /dev/null +++ b/ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/ItemWriterListener.java @@ -0,0 +1,25 @@ +/* + * 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.ambari.infra.job.archive; + +import java.io.File; + +public interface ItemWriterListener { + void onCompleted(File file); +}
