Remove DelegatingJournal{,Reader,Writer}

These classes are not used anywhere, remove them to improve code
navigability.

JIRA: CONTROLLER-2071
Change-Id: I45c3f9953c6794ed55053ac1193d14d83b844ad0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/DelegatingJournal.java b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/DelegatingJournal.java
deleted file mode 100644 (file)
index de0e35f..0000000
--- a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/DelegatingJournal.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2017-present Open Networking Foundation
- *
- * 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 io.atomix.storage.journal;
-
-import static com.google.common.base.MoreObjects.toStringHelper;
-
-/**
- * Delegating journal.
- */
-public class DelegatingJournal<E> implements Journal<E> {
-  private final Journal<E> delegate;
-
-  public DelegatingJournal(Journal<E> delegate) {
-    this.delegate = delegate;
-  }
-
-  @Override
-  public JournalWriter<E> writer() {
-    return delegate.writer();
-  }
-
-  @Override
-  public JournalReader<E> openReader(long index) {
-    return delegate.openReader(index);
-  }
-
-  @Override
-  public JournalReader<E> openReader(long index, JournalReader.Mode mode) {
-    return delegate.openReader(index, mode);
-  }
-
-  @Override
-  public boolean isOpen() {
-    return delegate.isOpen();
-  }
-
-  @Override
-  public void close() {
-    delegate.close();
-  }
-
-  @Override
-  public String toString() {
-    return toStringHelper(this)
-        .add("delegate", delegate)
-        .toString();
-  }
-}

diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/DelegatingJournalReader.java b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/DelegatingJournalReader.java
deleted file mode 100644 (file)
index 1d6af29..0000000
--- a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/DelegatingJournalReader.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2017-present Open Networking Foundation
- *
- * 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 io.atomix.storage.journal;
-
-import static com.google.common.base.MoreObjects.toStringHelper;
-
-/**
- * Journal reader delegate.
- */
-public class DelegatingJournalReader<E> implements JournalReader<E> {
-  private final JournalReader<E> delegate;
-
-  public DelegatingJournalReader(JournalReader<E> delegate) {
-    this.delegate = delegate;
-  }
-
-  @Override
-  public long getFirstIndex() {
-    return delegate.getFirstIndex();
-  }
-
-  @Override
-  public long getCurrentIndex() {
-    return delegate.getCurrentIndex();
-  }
-
-  @Override
-  public Indexed<E> getCurrentEntry() {
-    return delegate.getCurrentEntry();
-  }
-
-  @Override
-  public long getNextIndex() {
-    return delegate.getNextIndex();
-  }
-
-  @Override
-  public boolean hasNext() {
-    return delegate.hasNext();
-  }
-
-  @Override
-  public Indexed<E> next() {
-    return delegate.next();
-  }
-
-  @Override
-  public void reset() {
-    delegate.reset();
-  }
-
-  @Override
-  public void reset(long index) {
-    delegate.reset(index);
-  }
-
-  @Override
-  public void close() {
-    delegate.close();
-  }
-
-  @Override
-  public String toString() {
-    return toStringHelper(this)
-        .add("delegate", delegate)
-        .toString();
-  }
-}

diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/DelegatingJournalWriter.java b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/DelegatingJournalWriter.java
deleted file mode 100644 (file)
index 3285989..0000000
--- a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/DelegatingJournalWriter.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2017-present Open Networking Foundation
- *
- * 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 io.atomix.storage.journal;
-
-import static com.google.common.base.MoreObjects.toStringHelper;
-
-/**
- * Journal writer delegate.
- */
-public class DelegatingJournalWriter<E> implements JournalWriter<E> {
-  private final JournalWriter<E> delegate;
-
-  public DelegatingJournalWriter(JournalWriter<E> delegate) {
-    this.delegate = delegate;
-  }
-
-  @Override
-  public long getLastIndex() {
-    return delegate.getLastIndex();
-  }
-
-  @Override
-  public Indexed<E> getLastEntry() {
-    return delegate.getLastEntry();
-  }
-
-  @Override
-  public long getNextIndex() {
-    return delegate.getNextIndex();
-  }
-
-  @Override
-  public <T extends E> Indexed<T> append(T entry) {
-    return delegate.append(entry);
-  }
-
-  @Override
-  public void append(Indexed<E> entry) {
-    delegate.append(entry);
-  }
-
-  @Override
-  public void commit(long index) {
-    delegate.commit(index);
-  }
-
-  @Override
-  public void reset(long index) {
-    delegate.reset(index);
-  }
-
-  @Override
-  public void truncate(long index) {
-    delegate.truncate(index);
-  }
-
-  @Override
-  public void flush() {
-    delegate.flush();
-  }
-
-  @Override
-  public void close() {
-    delegate.close();
-  }
-
-  @Override
-  public String toString() {
-    return toStringHelper(this)
-        .add("delegate", delegate)
-        .toString();
-  }
-}