// Ignore the response if the resource is a device or
// platform.
Vector<String> resTypes = resourceN.getResourceTypes();
- if (null != resTypes && resTypes.contains("oic.wk.d")
- || resTypes.contains("oic.wk.p")) {
+ if (null != resTypes
+ && (resTypes.contains("oic.wk.d") || resTypes
+ .contains("oic.wk.p"))) {
return;
}
// If resource already exist, then ignore it.
boolean exist = isUidExist(uid);
if (exist) {
+ handleExistingResource(resourceN);
return;
}
RemoteResource resource = new RemoteResource();
resource.setRemoteResourceRef(resourceN);
+ boolean observeRequestSent = false;
+
String uri = resourceN.getURI();
if (null != uri && uri.trim().length() > 0) {
// Add resource to favorite list if it was in
// favorites list during find/refresh operation.
- if (favoriteURIList.contains(uri)) {
- addResourcetoFavorites(resource);
- }
- // Add resource to observed resources list if it was
- // in observe list during find/refresh operation.
- if (observedResourceURIList.contains(uri)) {
- sendObserveRequest(resource);
+ synchronized (favoriteURIList) {
+ if (favoriteURIList.contains(uri)) {
+ addResourcetoFavorites(resource);
+ }
+ } // Add resource to observed resources list if it
+ // was
+ // in observe list during find/refresh operation.
+ synchronized (observedResourceURIList) {
+ if (observedResourceURIList.contains(uri)) {
+ observeRequestSent = sendObserveRequest(resource);
+ }
}
} else {
Activator
"Resource Found [" + resourceN.getURI()
+ "].");
- // Send an initial GET request to get the resource
+ // Send an initial GET request(If observe request has
+ // not been sent already) to get the resource
// attributes on an interface supported by the resource.
- try {
- String ifType = null;
- Vector<String> resInterfaces = resourceN
- .getResourceInterfaces();
- if (null != resInterfaces) {
- ifType = resInterfaces.get(0);
+ if (!observeRequestSent) {
+ try {
+ String ifType = null;
+ Vector<String> resInterfaces = resourceN
+ .getResourceInterfaces();
+ if (null != resInterfaces) {
+ ifType = resInterfaces.get(0);
+ }
+ resourceN.get(
+ formQueryParameters(ifType, null),
+ getListener);
+ } catch (SimulatorException e) {
+ Activator
+ .getDefault()
+ .getLogManager()
+ .log(Level.ERROR.ordinal(),
+ new Date(),
+ Utility.getSimulatorErrorString(
+ e, null));
}
- resourceN.get(formQueryParameters(ifType, null),
- getListener);
- } catch (SimulatorException e) {
- Activator
- .getDefault()
- .getLogManager()
- .log(Level.ERROR.ordinal(),
- new Date(),
- Utility.getSimulatorErrorString(e,
- null));
}
// Get the device information
public void onGetResponse(final String uid,
final SimulatorResult result,
final SimulatorResourceModel resourceModelN) {
- if (result != SimulatorResult.SIMULATOR_OK) {
+ if (result.ordinal() > SimulatorResult.SIMULATOR_RESOURCE_CHANGED.ordinal()) {
Activator
.getDefault()
.getLogManager()
public void onPutResponse(final String uid,
final SimulatorResult result,
final SimulatorResourceModel resourceModelN) {
- if (result != SimulatorResult.SIMULATOR_OK) {
+ if (result.ordinal() > SimulatorResult.SIMULATOR_RESOURCE_CHANGED.ordinal()) {
Activator
.getDefault()
.getLogManager()
public void onPostResponse(final String uid,
final SimulatorResult result,
final SimulatorResourceModel resourceModelN) {
- if (result != SimulatorResult.SIMULATOR_OK) {
+ if (result.ordinal() > SimulatorResult.SIMULATOR_RESOURCE_CHANGED.ordinal()) {
Activator
.getDefault()
.getLogManager()
threadHandle.start();
}
+ private void handleExistingResource(
+ final SimulatorRemoteResource newNativeResourceRef) {
+ if (null == newNativeResourceRef) {
+ return;
+ }
+
+ RemoteResource existingResource = getResource(newNativeResourceRef
+ .getId());
+ if (null == existingResource) {
+ return;
+ }
+
+ SimulatorRemoteResource existingNativeResourceRef = existingResource
+ .getRemoteResourceRef();
+ if (null == existingNativeResourceRef) {
+ return;
+ }
+
+ // Compare the resource properties(resource types, interface types and
+ // observable)
+ // of the received resource with the existing resource.
+ // If there is a change, then replace the existing resource properties
+ // and send
+ // a GET request to receive the latest resource representation.
+ boolean change = compareResourceProperties(existingNativeResourceRef,
+ newNativeResourceRef);
+ if (!change) {
+ return;
+ }
+
+ existingResource.setRemoteResourceRef(newNativeResourceRef);
+
+ try {
+ String ifType = null;
+ Vector<String> resInterfaces = newNativeResourceRef
+ .getResourceInterfaces();
+ if (null != resInterfaces) {
+ ifType = resInterfaces.get(0);
+ }
+ newNativeResourceRef.get(formQueryParameters(ifType, null),
+ getListener);
+ } catch (SimulatorException e) {
+ Activator
+ .getDefault()
+ .getLogManager()
+ .log(Level.ERROR.ordinal(), new Date(),
+ Utility.getSimulatorErrorString(e, null));
+ }
+
+ // Notify the UI listener which may be looking for this callback for
+ // further processing.
+ UiListenerHandler.getInstance().newResourceFoundNotification(
+ existingResource);
+
+ // Notify the UI listeners by re-selecting the same resource.
+ // This is just to refresh the resource properties being shown.
+ RemoteResource resourceInSelection = getCurrentResourceInSelection();
+ if (null != resourceInSelection) {
+ if (resourceInSelection.getRemoteResourceRef().getURI()
+ .equals(newNativeResourceRef.getURI())) {
+ UiListenerHandler.getInstance()
+ .resourceSelectionChangedUINotification(
+ existingResource);
+ }
+ }
+ }
+
+ private boolean compareResourceProperties(
+ SimulatorRemoteResource existingNativeResourceRef,
+ SimulatorRemoteResource newNativeResourceRef) {
+ boolean change = false;
+
+ try {
+ // Compare URI.
+ if (!existingNativeResourceRef.getURI().equals(
+ existingNativeResourceRef.getURI())) {
+ change = true;
+ }
+
+ // Compare ID.
+ if (!change
+ && !existingNativeResourceRef.getId().equals(
+ existingNativeResourceRef.getId())) {
+ change = true;
+ }
+
+ // Compare Host.
+ if (!change
+ && !existingNativeResourceRef.getHost().equals(
+ existingNativeResourceRef.getHost())) {
+ change = true;
+ }
+
+ // Compare Observable flag.
+ if (!change
+ && existingNativeResourceRef.isObservable() != existingNativeResourceRef
+ .isObservable()) {
+ change = true;
+ }
+
+ // Compare Resource Types.
+ Vector<String> existingResTypes = existingNativeResourceRef
+ .getResourceTypes();
+ Vector<String> newResTypes = newNativeResourceRef
+ .getResourceTypes();
+
+ if (!change) {
+ if (existingResTypes.size() != newResTypes.size()) {
+ change = true;
+ } else {
+ // Compare both lists.
+ Iterator<String> itr = existingResTypes.iterator();
+ while (itr.hasNext()) {
+ if (!newResTypes.contains(itr.next())) {
+ change = true;
+ break;
+ }
+ }
+ }
+ }
+
+ // Compare Interface Types.
+ Vector<String> existingInterfaceTypes = existingNativeResourceRef
+ .getResourceInterfaces();
+ Vector<String> newInterfaceTypes = newNativeResourceRef
+ .getResourceInterfaces();
+
+ if (!change) {
+ if (existingInterfaceTypes.size() != newInterfaceTypes.size()) {
+ change = true;
+ } else {
+ // Compare both lists.
+ Iterator<String> itr = existingInterfaceTypes.iterator();
+ while (itr.hasNext()) {
+ if (!newInterfaceTypes.contains(itr.next())) {
+ change = true;
+ break;
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ change = true;
+ }
+
+ return change;
+ }
+
private RemoteResource handleResponse(String uid,
SimulatorResourceModel resourceModelN) {
if (null == uid || null == resourceModelN) {
}
public boolean isResourceObserved(String resourceURI) {
- boolean observed = false;
+ boolean observed;
synchronized (observedResourceURIList) {
observed = observedResourceURIList.contains(resourceURI);
}
public void deleteResources(final Set<String> searchTypes) {
synchronized (resourceMap) {
- if (null == resourceMap && resourceMap.isEmpty()) {
+ if (resourceMap.isEmpty()) {
return;
}
}
}
// Delete all cached details of resources
resourceMap.clear();
- favoriteResources.clear();
+
+ synchronized (favoriteResources) {
+ favoriteResources.clear();
+ }
// Clearing the device and platform information
- hostDeviceAndPlatformMap.clear();
+ synchronized (hostDeviceAndPlatformMap) {
+ hostDeviceAndPlatformMap.clear();
+ }
}
// Change the current resource in selection
setCurrentResourceInSelection(null);
public List<MetaProperty> getDefaultProperties(RemoteResource resource) {
if (null != resource) {
String propName;
- String propValue;
+ StringBuilder propValue;
List<MetaProperty> metaPropertyList = new ArrayList<MetaProperty>();
for (int index = 0; index < Constants.META_PROPERTY_COUNT; index++) {
propName = Constants.META_PROPERTIES[index];
+ propValue = new StringBuilder();
if (propName.equals(Constants.RESOURCE_URI)) {
- propValue = resource.getRemoteResourceRef().getURI();
+ propValue.append(resource.getRemoteResourceRef().getURI());
} else if (propName.equals(Constants.CONNECTIVITY_TYPE)) {
- propValue = resource.getRemoteResourceRef()
- .getConnectivityType().toString();
+ propValue.append(resource.getRemoteResourceRef()
+ .getConnectivityType().toString());
} else if (propName.equals(Constants.ADDRESS)) {
- propValue = resource.getRemoteResourceRef().getHost();
+ propValue.append(resource.getRemoteResourceRef().getHost());
} else if (propName.equals(Constants.OBSERVABLE)) {
- propValue = Utility.getObservableInString(resource
- .getRemoteResourceRef().isObservable());
+ propValue.append(Utility.getObservableInString(resource
+ .getRemoteResourceRef().isObservable()));
} else if (propName.equals(Constants.RESOURCE_TYPES)) {
Vector<String> resTypes = resource.getRemoteResourceRef()
.getResourceTypes();
if (null != resTypes && !resTypes.isEmpty()) {
- propValue = "";
Iterator<String> itr = resTypes.iterator();
while (itr.hasNext()) {
- propValue += itr.next();
+ propValue.append(itr.next());
if (itr.hasNext()) {
- propValue += ", ";
+ propValue.append(", ");
}
}
} else {
- propValue = Constants.NOT_AVAILABLE;
+ propValue.append(Constants.NOT_AVAILABLE);
}
} else if (propName.equals(Constants.RESOURCE_INTERFACES)) {
Vector<String> interfaces = resource.getRemoteResourceRef()
.getResourceInterfaces();
if (null != interfaces && !interfaces.isEmpty()) {
- propValue = "";
Iterator<String> itr = interfaces.iterator();
while (itr.hasNext()) {
- propValue += itr.next();
+ propValue.append(itr.next());
if (itr.hasNext()) {
- propValue += ", ";
+ propValue.append(", ");
}
}
} else {
- propValue = Constants.NOT_AVAILABLE;
+ propValue.append(Constants.NOT_AVAILABLE);
}
} else {
propValue = null;
}
if (null != propValue) {
- metaPropertyList.add(new MetaProperty(propName, propValue));
+ metaPropertyList.add(new MetaProperty(propName, propValue
+ .toString()));
}
}
}
public List<MetaProperty> getDeviceProperties() {
- if (null == currentResourceInSelection) {
+ RemoteResource resourceInSelection = getCurrentResourceInSelection();
+ if (null == resourceInSelection) {
return null;
}
- SimulatorRemoteResource remoteResource = currentResourceInSelection
+ SimulatorRemoteResource remoteResource = resourceInSelection
.getRemoteResourceRef();
if (null == remoteResource) {
return null;
}
public List<MetaProperty> getPlatformProperties() {
- if (null == currentResourceInSelection) {
+ RemoteResource resourceInSelection = getCurrentResourceInSelection();
+ if (null == resourceInSelection) {
return null;
}
- SimulatorRemoteResource remoteResource = currentResourceInSelection
+ SimulatorRemoteResource remoteResource = resourceInSelection
.getRemoteResourceRef();
if (null == remoteResource) {
return null;
projects / platform / upstream / iotivity.git / blobdiff