mirror of
https://github.com/JasonHHouse/gaps.git
synced 2026-04-27 12:10:27 -05:00
Cleaning up code
This commit is contained in:
@@ -1,3 +1,12 @@
|
||||
/*
|
||||
* Copyright 2020 Jason H House
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
package com.jasonhhouse.gaps;
|
||||
|
||||
import com.jasonhhouse.plex.libs.PlexLibrary;
|
||||
@@ -15,36 +24,36 @@ public class PlexLibraryComparator implements Comparator<PlexLibrary> {
|
||||
|
||||
@Override
|
||||
public Comparator<PlexLibrary> reversed() {
|
||||
return null;
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Comparator<PlexLibrary> thenComparing(Comparator<? super PlexLibrary> other) {
|
||||
return null;
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public <U> Comparator<PlexLibrary> thenComparing(Function<? super PlexLibrary, ? extends U> keyExtractor, Comparator<? super U> keyComparator) {
|
||||
return null;
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public <U extends Comparable<? super U>> Comparator<PlexLibrary> thenComparing(Function<? super PlexLibrary, ? extends U> keyExtractor) {
|
||||
return null;
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Comparator<PlexLibrary> thenComparingInt(ToIntFunction<? super PlexLibrary> keyExtractor) {
|
||||
return null;
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Comparator<PlexLibrary> thenComparingLong(ToLongFunction<? super PlexLibrary> keyExtractor) {
|
||||
return null;
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Comparator<PlexLibrary> thenComparingDouble(ToDoubleFunction<? super PlexLibrary> keyExtractor) {
|
||||
return null;
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,18 +14,14 @@ import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
|
||||
import com.jasonhhouse.plex.libs.PlexLibrary;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.concurrent.CopyOnWriteArrayList;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||
public final class PlexServer {
|
||||
|
||||
@JsonPropertyOrder({ "id", "name" })
|
||||
@Schema(description = "Libraries that are of type movie in your Plex Server")
|
||||
private final List<PlexLibrary> plexLibraries;
|
||||
@Schema(description = "Human readable way to identify your Plex Server")
|
||||
@@ -68,15 +64,15 @@ public final class PlexServer {
|
||||
this.machineIdentifier = machineIdentifier;
|
||||
}
|
||||
|
||||
public List<PlexLibrary> getPlexLibraries() {
|
||||
return plexLibraries;
|
||||
}
|
||||
|
||||
public void setPlexLibraries(@NotNull List<PlexLibrary> plexLibraries) {
|
||||
this.plexLibraries.clear();
|
||||
this.plexLibraries.addAll(plexLibraries);
|
||||
}
|
||||
|
||||
public List<PlexLibrary> getPlexLibraries() {
|
||||
return plexLibraries;
|
||||
}
|
||||
|
||||
public String getPlexToken() {
|
||||
return plexToken;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,14 @@
|
||||
package com.jasonhhouse.gaps;
|
||||
/*
|
||||
* Copyright 2020 Jason H House
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
package com.jasonhhouse.gaps;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
@@ -14,8 +23,9 @@ public class SortedList<T> extends ArrayList<T> {
|
||||
|
||||
public SortedList(Class<T> clazz) {
|
||||
super();
|
||||
if (!Comparable.class.isAssignableFrom(clazz))
|
||||
if (!Comparable.class.isAssignableFrom(clazz)) {
|
||||
throw new ClassCastException(clazz + " does not implement comparable");
|
||||
}
|
||||
// Create comparator using the comparable interface.
|
||||
this.comparator = new Comparator<T>() {
|
||||
@SuppressWarnings("unchecked")
|
||||
@@ -34,27 +44,22 @@ public class SortedList<T> extends ArrayList<T> {
|
||||
/**
|
||||
* Add the element to this sorted list in a sorted order.
|
||||
*
|
||||
* @param e
|
||||
* The element
|
||||
* @param e The element
|
||||
* @return Always true
|
||||
*
|
||||
*/
|
||||
@Override
|
||||
public boolean add(T e) {
|
||||
// if ()
|
||||
// Comparable<T> c = (Comparable<T>) e;
|
||||
int insertPoint = Collections.binarySearch(this, e, comparator);
|
||||
if (insertPoint < 0)
|
||||
if (insertPoint < 0) {
|
||||
insertPoint = (insertPoint * -1) - 1;
|
||||
}
|
||||
super.add(insertPoint, e);
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @deprecated Function ignores the index and insert the element in the
|
||||
* correct order
|
||||
* @deprecated Function ignores the index and insert the element in the correct order
|
||||
*/
|
||||
@Deprecated
|
||||
public void add(int index, T element) {
|
||||
@@ -62,27 +67,21 @@ public class SortedList<T> extends ArrayList<T> {
|
||||
}
|
||||
|
||||
/**
|
||||
* Add all elements from the collection to this sorted list in a sorted
|
||||
* order.
|
||||
* Add all elements from the collection to this sorted list in a sorted order.
|
||||
*
|
||||
* @param c
|
||||
* The collection holding all elements to add to this sorted
|
||||
* list. The elements in the collection needn't to be in sorted
|
||||
* order
|
||||
* @param c The collection holding all elements to add to this sorted list. The elements in the collection needn't to be in sorted order
|
||||
* @return Always true
|
||||
*
|
||||
*/
|
||||
@Override
|
||||
public boolean addAll(Collection<? extends T> c) {
|
||||
for (T s : c)
|
||||
for (T s : c) {
|
||||
add(s);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @deprecated Function ignores the index and insert the elements in the
|
||||
* correct order
|
||||
* @deprecated Function ignores the index and insert the elements in the correct order
|
||||
*/
|
||||
@Deprecated
|
||||
public boolean addAll(int index, Collection<? extends T> c) {
|
||||
|
||||
Reference in New Issue
Block a user