Skip to content

Commit

Permalink
Update on hawkular#229 Added rebuild from chunks
Browse files Browse the repository at this point in the history
  • Loading branch information
pg301 committed Jul 7, 2017
1 parent 717aa1d commit d0f7bef
Show file tree
Hide file tree
Showing 6 changed files with 339 additions and 144 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@
*/
package org.hawkular.client.android.backend;

import static org.hawkular.client.android.HawkularApplication.retrofit;

import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import android.Manifest;
import android.app.Activity;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.RequiresPermission;
import android.support.v4.app.Fragment;

import org.hawkular.client.android.HawkularApplication;
import org.hawkular.client.android.backend.model.Alert;
Expand All @@ -43,16 +42,17 @@
import org.hawkular.client.android.util.Preferences;
import org.jboss.aerogear.android.pipe.callback.AbstractCallback;

import android.Manifest;
import android.app.Activity;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.RequiresPermission;
import android.support.v4.app.Fragment;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import retrofit2.Call;
import retrofit2.Callback;

import static org.hawkular.client.android.HawkularApplication.retrofit;

/**
* Backend client.
* <p/>
Expand Down Expand Up @@ -170,7 +170,7 @@ public void getResourcesFromFeed(@NonNull retrofit2.Callback<List<Resource>> cal
}


public void getRecResourcesFromFeed(@NonNull AbstractCallback<List<Resource>> callback, Resource resource) {
public void getRecResourcesFromFeed(@NonNull retrofit2.Callback callback, Resource resource) {
// TODO : after moving to retrofit complete
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@

package org.hawkular.client.android.backend.model;

import android.os.Parcel;
import android.os.Parcelable;

public class Data implements Parcelable
{

private Long timestamp;
private String value;
private Tags tags;
public final static Creator<Data> CREATOR = new Creator<Data>() {


@SuppressWarnings({
"unchecked"
})
public Data createFromParcel(Parcel in) {
Data instance = new Data();
instance.timestamp = ((Long) in.readValue((Integer.class.getClassLoader())));
instance.value = ((String) in.readValue((String.class.getClassLoader())));
instance.tags = ((Tags) in.readValue((Tags.class.getClassLoader())));
return instance;
}

public Data[] newArray(int size) {
return (new Data[size]);
}

}
;

public Long getTimestamp() {
return timestamp;
}

public void setTimestamp(Long timestamp) {
this.timestamp = timestamp;
}

public String getValue() {
return value;
}

public void setValue(String value) {
this.value = value;
}

public Tags getTags() {
return tags;
}

public void setTags(Tags tags) {
this.tags = tags;
}

public void writeToParcel(Parcel dest, int flags) {
dest.writeValue(timestamp);
dest.writeValue(value);
dest.writeValue(tags);
}

public int describeContents() {
return 0;
}

}
121 changes: 33 additions & 88 deletions mobile/src/main/java/org/hawkular/client/android/backend/model/Resource.java
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,113 +1,58 @@
/*
* Copyright 2015-2017 Red Hat, Inc. and/or its affiliates
* and other contributors as indicated by the @author tags.
*
* 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 org.hawkular.client.android.backend.model;

import com.google.gson.annotations.SerializedName;
package org.hawkular.client.android.backend.model;

import java.util.List;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.NonNull;
import android.support.annotation.VisibleForTesting;

public final class Resource implements Parcelable {
@SerializedName("id")
private String id;

@SerializedName("name")
private String name;
public class Resource implements Parcelable
{

@SerializedName("type")
private ResourceType type;

@SerializedName("path")
private String path;
private String id;
private List<Data> data = null;
public final static Creator<Resource> CREATOR = new Creator<Resource>() {


@SuppressWarnings({
"unchecked"
})
public Resource createFromParcel(Parcel in) {
Resource instance = new Resource();
instance.id = ((String) in.readValue((String.class.getClassLoader())));
in.readList(instance.data, (Data.class.getClassLoader()));
return instance;
}

@SerializedName("properties")
private ResourceProperties properties;
public Resource[] newArray(int size) {
return (new Resource[size]);
}

@VisibleForTesting
public Resource(@NonNull String id, @NonNull ResourceType type, @NonNull ResourceProperties properties) {
this.id = id;
this.type = type;
this.properties = properties;
}
;

public String getId() {
return id;
}

public ResourceType getType() {
return type;
}

public String getPath() {
return path;
}

public String getName() {
return name;
}

public String getFeed() {
String[] temp = path.split("/");
for (String string : temp) {
if (string.startsWith("f")) {
return string.substring(2);
}
}
return null;
public void setId(String id) {
this.id = id;
}


public ResourceProperties getProperties() {
return properties;
public List<Data> getData() {
return data;
}

public static Creator<Resource> CREATOR = new Creator<Resource>() {
@Override
public Resource createFromParcel(Parcel parcel) {
return new Resource(parcel);
}

@Override
public Resource[] newArray(int size) {
return new Resource[size];
}
};

private Resource(Parcel parcel) {
this.id = parcel.readString();
this.name = parcel.readString();
this.type = parcel.readParcelable(ResourceType.class.getClassLoader());
this.path = parcel.readString();
this.properties = parcel.readParcelable(ResourceProperties.class.getClassLoader());
public void setData(List<Data> data) {
this.data = data;
}

@Override
public void writeToParcel(Parcel parcel, int flags) {
parcel.writeString(id);
parcel.writeString(name);
parcel.writeParcelable(type, flags);
parcel.writeString(path);
parcel.writeParcelable(properties, flags);
public void writeToParcel(Parcel dest, int flags) {
dest.writeValue(id);
dest.writeList(data);
}

@Override
public int describeContents() {
return 0;
return 0;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@

package org.hawkular.client.android.backend.model;

import android.os.Parcel;
import android.os.Parcelable;
import android.os.Parcelable.Creator;

public class Tags implements Parcelable
{

private String chunks;
private String size;
public final static Creator<Tags> CREATOR = new Creator<Tags>() {


@SuppressWarnings({
"unchecked"
})
public Tags createFromParcel(Parcel in) {
Tags instance = new Tags();
instance.chunks = ((String) in.readValue((String.class.getClassLoader())));
instance.size = ((String) in.readValue((String.class.getClassLoader())));
return instance;
}

public Tags[] newArray(int size) {
return (new Tags[size]);
}

}
;

public String getChunks() {
return chunks;
}

public void setChunks(String chunks) {
this.chunks = chunks;
}

public String getSize() {
return size;
}

public void setSize(String size) {
this.size = size;
}

public void writeToParcel(Parcel dest, int flags) {
dest.writeValue(chunks);
dest.writeValue(size);
}

public int describeContents() {
return 0;
}

}
Loading

0 comments on commit d0f7bef

Please sign in to comment.