lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Found two more classes to remove

Browse Source
This commit is contained in:
Kai Zimmermann
2016-03-29 17:07:54 +02:00
parent 7d3d4f1fd4
commit f002eede43
9 changed files with 10 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hawkbit-rest-api/src/main/java/org/eclipse/hawkbit/rest/resource/api/DistributionSetTagRestApi.java
View File

@@ -17,7 +17,6 @@ import org.eclipse.hawkbit.rest.resource.model.tag.DistributionSetTagAssigmentRe
import org.eclipse.hawkbit.rest.resource.model.tag.TagPagedList;
import org.eclipse.hawkbit.rest.resource.model.tag.TagRequestBodyPut;
import org.eclipse.hawkbit.rest.resource.model.tag.TagRest;
import org.eclipse.hawkbit.rest.resource.model.tag.TagsRest;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PathVariable;
@@ -87,7 +86,7 @@ public interface DistributionSetTagRestApi {
*/
@RequestMapping(method = RequestMethod.POST, consumes = { "application/hal+json",
MediaType.APPLICATION_JSON_VALUE }, produces = { "application/hal+json", MediaType.APPLICATION_JSON_VALUE })
public ResponseEntity<TagsRest> createDistributionSetTags(@RequestBody final List<TagRequestBodyPut> tags);
public ResponseEntity<List<TagRest>> createDistributionSetTags(@RequestBody final List<TagRequestBodyPut> tags);
/**
*

3
hawkbit-rest-api/src/main/java/org/eclipse/hawkbit/rest/resource/api/TargetTagRestApi.java
View File

@@ -15,7 +15,6 @@ import org.eclipse.hawkbit.rest.resource.model.tag.AssignedTargetRequestBody;
import org.eclipse.hawkbit.rest.resource.model.tag.TagPagedList;
import org.eclipse.hawkbit.rest.resource.model.tag.TagRequestBodyPut;
import org.eclipse.hawkbit.rest.resource.model.tag.TagRest;
import org.eclipse.hawkbit.rest.resource.model.tag.TagsRest;
import org.eclipse.hawkbit.rest.resource.model.tag.TargetTagAssigmentResultRest;
import org.eclipse.hawkbit.rest.resource.model.target.TargetRest;
import org.springframework.http.MediaType;
@@ -85,7 +84,7 @@ public interface TargetTagRestApi {
*/
@RequestMapping(method = RequestMethod.POST, consumes = { "application/hal+json",
MediaType.APPLICATION_JSON_VALUE }, produces = { "application/hal+json", MediaType.APPLICATION_JSON_VALUE })
public ResponseEntity<TagsRest> createTargetTags(@RequestBody final List<TagRequestBodyPut> tags);
public ResponseEntity<List<TagRest>> createTargetTags(@RequestBody final List<TagRequestBodyPut> tags);
/**
*

3
hawkbit-rest-api/src/main/java/org/eclipse/hawkbit/rest/resource/model/action/ActionRest.java
View File

@@ -18,9 +18,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
/**
* A json annotated rest model for Action to RESTful API representation.
*
*
*
*
*/
@JsonInclude(Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)

276
hawkbit-rest-api/src/main/java/org/eclipse/hawkbit/rest/resource/model/action/ActionsRest.java
View File

@@ -1,276 +0,0 @@
/**
* Copyright (c) 2015 Bosch Software Innovations GmbH and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*/
package org.eclipse.hawkbit.rest.resource.model.action;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import org.springframework.hateoas.ResourceSupport;
/**
* A json annotated rest model for Actions to RESTful API representation.
*
*
*
*
*/
public class ActionsRest extends ResourceSupport implements List<ActionRest> {
private final List<ActionRest> delegate = new ArrayList<>();
/**
* @return
* @see java.util.List#size()
*/
@Override
public int size() {
return delegate.size();
}
/**
* @return
* @see java.util.List#isEmpty()
*/
@Override
public boolean isEmpty() {
return delegate.isEmpty();
}
/**
* @param o
* @return
* @see java.util.List#contains(java.lang.Object)
*/
@Override
public boolean contains(final Object o) {
return delegate.contains(o);
}
/**
* @return
* @see java.util.List#iterator()
*/
@Override
public Iterator<ActionRest> iterator() {
return delegate.iterator();
}
/**
* @return
* @see java.util.List#toArray()
*/
@Override
public Object[] toArray() {
return delegate.toArray();
}
/**
* @param a
* @return
* @see java.util.List#toArray(java.lang.Object[])
*/
@Override
public <T> T[] toArray(final T[] a) {
return delegate.toArray(a);
}
/**
* @param e
* @return
* @see java.util.List#add(java.lang.Object)
*/
@Override
public boolean add(final ActionRest e) {
return delegate.add(e);
}
/**
* @param o
* @return
* @see java.util.List#remove(java.lang.Object)
*/
@Override
public boolean remove(final Object o) {
return delegate.remove(o);
}
/**
* @param c
* @return
* @see java.util.List#containsAll(java.util.Collection)
*/
@Override
public boolean containsAll(final Collection<?> c) {
return delegate.containsAll(c);
}
/**
* @param c
* @return
* @see java.util.List#addAll(java.util.Collection)
*/
@Override
public boolean addAll(final Collection<? extends ActionRest> c) {
return delegate.addAll(c);
}
/**
* @param index
* @param c
* @return
* @see java.util.List#addAll(int, java.util.Collection)
*/
@Override
public boolean addAll(final int index, final Collection<? extends ActionRest> c) {
return delegate.addAll(index, c);
}
/**
* @param c
* @return
* @see java.util.List#removeAll(java.util.Collection)
*/
@Override
public boolean removeAll(final Collection<?> c) {
return delegate.removeAll(c);
}
/**
* @param c
* @return
* @see java.util.List#retainAll(java.util.Collection)
*/
@Override
public boolean retainAll(final Collection<?> c) {
return delegate.retainAll(c);
}
/**
*
* @see java.util.List#clear()
*/
@Override
public void clear() {
delegate.clear();
}
/**
* @param o
* @return
* @see java.util.List#equals(java.lang.Object)
*/
@Override
public boolean equals(final Object o) {
return delegate.equals(o);
}
/**
* @return
* @see java.util.List#hashCode()
*/
@Override
public int hashCode() {
return delegate.hashCode();
}
/**
* @param index
* @return
* @see java.util.List#get(int)
*/
@Override
public ActionRest get(final int index) {
return delegate.get(index);
}
/**
* @param index
* @param element
* @return
* @see java.util.List#set(int, java.lang.Object)
*/
@Override
public ActionRest set(final int index, final ActionRest element) {
return delegate.set(index, element);
}
/**
* @param index
* @param element
* @see java.util.List#add(int, java.lang.Object)
*/
@Override
public void add(final int index, final ActionRest element) {
delegate.add(index, element);
}
/**
* @param index
* @return
* @see java.util.List#remove(int)
*/
@Override
public ActionRest remove(final int index) {
return delegate.remove(index);
}
/**
* @param o
* @return
* @see java.util.List#indexOf(java.lang.Object)
*/
@Override
public int indexOf(final Object o) {
return delegate.indexOf(o);
}
/**
* @param o
* @return
* @see java.util.List#lastIndexOf(java.lang.Object)
*/
@Override
public int lastIndexOf(final Object o) {
return delegate.lastIndexOf(o);
}
/**
* @return
* @see java.util.List#listIterator()
*/
@Override
public ListIterator<ActionRest> listIterator() {
return delegate.listIterator();
}
/**
* @param index
* @return
* @see java.util.List#listIterator(int)
*/
@Override
public ListIterator<ActionRest> listIterator(final int index) {
return delegate.listIterator(index);
}
/**
* @param fromIndex
* @param toIndex
* @return
* @see java.util.List#subList(int, int)
*/
@Override
public List<ActionRest> subList(final int fromIndex, final int toIndex) {
return delegate.subList(fromIndex, toIndex);
}
}

275
hawkbit-rest-api/src/main/java/org/eclipse/hawkbit/rest/resource/model/tag/TagsRest.java
View File

@@ -1,275 +0,0 @@
/**
* Copyright (c) 2015 Bosch Software Innovations GmbH and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*/
package org.eclipse.hawkbit.rest.resource.model.tag;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import org.springframework.hateoas.ResourceSupport;
/**
* List representation of the {@link TagRest} because Spring MVC cannot handle
* plain lists interfaces as request body.
*
*
*/
public class TagsRest extends ResourceSupport implements List<TagRest> {
private final List<TagRest> delegate = new ArrayList<>();
/**
* @return
* @see java.util.List#size()
*/
@Override
public int size() {
return delegate.size();
}
/**
* @return
* @see java.util.List#isEmpty()
*/
@Override
public boolean isEmpty() {
return delegate.isEmpty();
}
/**
* @param o
* @return
* @see java.util.List#contains(java.lang.Object)
*/
@Override
public boolean contains(final Object o) {
return delegate.contains(o);
}
/**
* @return
* @see java.util.List#iterator()
*/
@Override
public Iterator<TagRest> iterator() {
return delegate.iterator();
}
/**
* @return
* @see java.util.List#toArray()
*/
@Override
public Object[] toArray() {
return delegate.toArray();
}
/**
* @param a
* @return
* @see java.util.List#toArray(java.lang.Object[])
*/
@Override
public <T> T[] toArray(final T[] a) {
return delegate.toArray(a);
}
/**
* @param e
* @return
* @see java.util.List#add(java.lang.Object)
*/
@Override
public boolean add(final TagRest e) {
return delegate.add(e);
}
/**
* @param o
* @return
* @see java.util.List#remove(java.lang.Object)
*/
@Override
public boolean remove(final Object o) {
return delegate.remove(o);
}
/**
* @param c
* @return
* @see java.util.List#containsAll(java.util.Collection)
*/
@Override
public boolean containsAll(final Collection<?> c) {
return delegate.containsAll(c);
}
/**
* @param c
* @return
* @see java.util.List#addAll(java.util.Collection)
*/
@Override
public boolean addAll(final Collection<? extends TagRest> c) {
return delegate.addAll(c);
}
/**
* @param index
* @param c
* @return
* @see java.util.List#addAll(int, java.util.Collection)
*/
@Override
public boolean addAll(final int index, final Collection<? extends TagRest> c) {
return delegate.addAll(index, c);
}
/**
* @param c
* @return
* @see java.util.List#removeAll(java.util.Collection)
*/
@Override
public boolean removeAll(final Collection<?> c) {
return delegate.removeAll(c);
}
/**
* @param c
* @return
* @see java.util.List#retainAll(java.util.Collection)
*/
@Override
public boolean retainAll(final Collection<?> c) {
return delegate.retainAll(c);
}
/**
*
* @see java.util.List#clear()
*/
@Override
public void clear() {
delegate.clear();
}
/**
* @param o
* @return
* @see java.util.List#equals(java.lang.Object)
*/
@Override
public boolean equals(final Object o) {
return delegate.equals(o);
}
/**
* @return
* @see java.util.List#hashCode()
*/
@Override
public int hashCode() {
return delegate.hashCode();
}
/**
* @param index
* @return
* @see java.util.List#get(int)
*/
@Override
public TagRest get(final int index) {
return delegate.get(index);
}
/**
* @param index
* @param element
* @return
* @see java.util.List#set(int, java.lang.Object)
*/
@Override
public TagRest set(final int index, final TagRest element) {
return delegate.set(index, element);
}
/**
* @param index
* @param element
* @see java.util.List#add(int, java.lang.Object)
*/
@Override
public void add(final int index, final TagRest element) {
delegate.add(index, element);
}
/**
* @param index
* @return
* @see java.util.List#remove(int)
*/
@Override
public TagRest remove(final int index) {
return delegate.remove(index);
}
/**
* @param o
* @return
* @see java.util.List#indexOf(java.lang.Object)
*/
@Override
public int indexOf(final Object o) {
return delegate.indexOf(o);
}
/**
* @param o
* @return
* @see java.util.List#lastIndexOf(java.lang.Object)
*/
@Override
public int lastIndexOf(final Object o) {
return delegate.lastIndexOf(o);
}
/**
* @return
* @see java.util.List#listIterator()
*/
@Override
public ListIterator<TagRest> listIterator() {
return delegate.listIterator();
}
/**
* @param index
* @return
* @see java.util.List#listIterator(int)
*/
@Override
public ListIterator<TagRest> listIterator(final int index) {
return delegate.listIterator(index);
}
/**
* @param fromIndex
* @param toIndex
* @return
* @see java.util.List#subList(int, int)
*/
@Override
public List<TagRest> subList(final int fromIndex, final int toIndex) {
return delegate.subList(fromIndex, toIndex);
}
}

3
hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/rest/resource/DistributionSetTagResource.java
View File

@@ -26,7 +26,6 @@ import org.eclipse.hawkbit.rest.resource.model.tag.DistributionSetTagAssigmentRe
import org.eclipse.hawkbit.rest.resource.model.tag.TagPagedList;
import org.eclipse.hawkbit.rest.resource.model.tag.TagRequestBodyPut;
import org.eclipse.hawkbit.rest.resource.model.tag.TagRest;
import org.eclipse.hawkbit.rest.resource.model.tag.TagsRest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -86,7 +85,7 @@ public class DistributionSetTagResource implements DistributionSetTagRestApi {
}
@Override
public ResponseEntity<TagsRest> createDistributionSetTags(final List<TagRequestBodyPut> tags) {
public ResponseEntity<List<TagRest>> createDistributionSetTags(final List<TagRequestBodyPut> tags) {
LOG.debug("creating {} ds tags", tags.size());
final List<DistributionSetTag> createdTags = this.tagManagement

11
hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/rest/resource/TagMapper.java
View File

@@ -21,7 +21,6 @@ import org.eclipse.hawkbit.rest.resource.api.DistributionSetTagRestApi;
import org.eclipse.hawkbit.rest.resource.api.TargetTagRestApi;
import org.eclipse.hawkbit.rest.resource.model.tag.TagRequestBodyPut;
import org.eclipse.hawkbit.rest.resource.model.tag.TagRest;
import org.eclipse.hawkbit.rest.resource.model.tag.TagsRest;
/**
* A mapper which maps repository model to RESTful model representation and
@@ -33,8 +32,8 @@ final class TagMapper {
// Utility class
}
static TagsRest toResponse(final List<TargetTag> targetTags) {
final TagsRest tagsRest = new TagsRest();
static List<TagRest> toResponse(final List<TargetTag> targetTags) {
final List<TagRest> tagsRest = new ArrayList<>();
if (targetTags == null) {
return tagsRest;
}
@@ -63,8 +62,8 @@ final class TagMapper {
return response;
}
static TagsRest toResponseDistributionSetTag(final List<DistributionSetTag> distributionSetTags) {
final TagsRest tagsRest = new TagsRest();
static List<TagRest> toResponseDistributionSetTag(final List<DistributionSetTag> distributionSetTags) {
final List<TagRest> tagsRest = new ArrayList<>();
if (distributionSetTags == null) {
return tagsRest;
}
@@ -131,7 +130,5 @@ final class TagMapper {
if (response.getName() != null) {
tag.setName(response.getName());
}
}
}

5
hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/rest/resource/TargetMapper.java
View File

@@ -27,7 +27,6 @@ import org.eclipse.hawkbit.rest.resource.api.TargetRestApi;
import org.eclipse.hawkbit.rest.resource.model.PollStatusRest;
import org.eclipse.hawkbit.rest.resource.model.action.ActionRest;
import org.eclipse.hawkbit.rest.resource.model.action.ActionStatusRest;
import org.eclipse.hawkbit.rest.resource.model.action.ActionsRest;
import org.eclipse.hawkbit.rest.resource.model.target.TargetRequestBody;
import org.eclipse.hawkbit.rest.resource.model.target.TargetRest;
@@ -214,8 +213,8 @@ public final class TargetMapper {
return result;
}
static ActionsRest toResponse(final String targetId, final List<Action> actions) {
final ActionsRest mappedList = new ActionsRest();
static List<ActionRest> toResponse(final String targetId, final List<Action> actions) {
final List<ActionRest> mappedList = new ArrayList<>();
for (final Action action : actions) {
final ActionRest response = toResponse(targetId, action, action.isActive());

3
hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/rest/resource/TargetTagResource.java
View File

@@ -24,7 +24,6 @@ import org.eclipse.hawkbit.rest.resource.model.tag.AssignedTargetRequestBody;
import org.eclipse.hawkbit.rest.resource.model.tag.TagPagedList;
import org.eclipse.hawkbit.rest.resource.model.tag.TagRequestBodyPut;
import org.eclipse.hawkbit.rest.resource.model.tag.TagRest;
import org.eclipse.hawkbit.rest.resource.model.tag.TagsRest;
import org.eclipse.hawkbit.rest.resource.model.tag.TargetTagAssigmentResultRest;
import org.eclipse.hawkbit.rest.resource.model.target.TargetRest;
import org.slf4j.Logger;
@@ -87,7 +86,7 @@ public class TargetTagResource implements TargetTagRestApi {
}
@Override
public ResponseEntity<TagsRest> createTargetTags(@RequestBody final List<TagRequestBodyPut> tags) {
public ResponseEntity<List<TagRest>> createTargetTags(@RequestBody final List<TagRequestBodyPut> tags) {
LOG.debug("creating {} target tags", tags.size());
final List<TargetTag> createdTargetTags = this.tagManagement
.createTargetTags(TagMapper.mapTargeTagFromRequest(tags));