Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update asset scheme #109

Open
wants to merge 12 commits into
base: develop
Choose a base branch
from
Original file line number Diff line number Diff line change
@@ -1,27 +1,19 @@
/*
* Copyright 2019 MovingBlocks
*
* 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.
*/

// Copyright 2021 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0
package org.terasology.gestalt.assets;

import com.google.common.base.Preconditions;

import com.google.common.collect.Lists;
import net.jcip.annotations.ThreadSafe;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.terasology.context.annotation.API;

import java.lang.ref.WeakReference;
import java.security.PrivilegedActionException;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Optional;

/**
Expand Down Expand Up @@ -50,12 +42,17 @@
@API
@ThreadSafe
public abstract class Asset<T extends AssetData> {
private static final Logger logger = LoggerFactory.getLogger(Asset.class);

private final List<WeakReference<Asset<T>>> instances;
private Asset<T> parent;

private final ResourceUrn urn;
private final AssetType<?, T> assetType;
private final DisposalHook disposalHook = new DisposalHook();
private volatile boolean disposed;


/**
* The constructor for an asset. It is suggested that implementing classes provide a constructor taking both the urn, and an initial AssetData to load.
*
Expand All @@ -65,19 +62,63 @@ public abstract class Asset<T extends AssetData> {
protected Asset(ResourceUrn urn, AssetType<?, T> assetType) {
Preconditions.checkNotNull(urn);
Preconditions.checkNotNull(assetType);
instances = urn.isInstance() ? Collections.emptyList() : Lists.newArrayList();
this.urn = urn;
this.assetType = assetType;
assetType.registerAsset(this, disposalHook);
}

private void appendInstance(Asset<T> asset) {
if (parent == null) {
Preconditions.checkArgument(!getUrn().isInstance());
asset.parent = this;
instances.add(new WeakReference<>(asset));
} else {
asset.parent = parent;
parent.instances.add(new WeakReference<>(asset));
}
}

/**
* return all the instances that are associated with this type of asset.
* @return instances
*/
protected final Iterable<WeakReference<Asset<T>>> instances() {
if (this.parent != null) {
return parent.instances();
}
return instances;
}

private void compactInstances() {
if (this.parent != null) {
parent.compactInstances();
return;
}
Iterator<WeakReference<Asset<T>>> iter = instances.iterator();
while(iter.hasNext()) {
WeakReference<Asset<T>> reference = iter.next();
Asset<T> inst = reference.get();
if(inst == null || inst.isDisposed()) {
iter.remove();
}
}
}

/**
* set a resource handler so the disposable hook can clean up resources not managed by the JVM
* @param resource A resource to close when disposing this class. The resource must not have a reference to this asset -
* this would prevent it being garbage collected. It must be a static inner class, or not contained in the asset class
* (or an anonymous class defined in a static context). A warning will be logged if this is not the case.
*/
protected void setDisposableResource(DisposableResource resource) {
this.disposalHook.setDisposableResource(resource);
public Asset(ResourceUrn urn, AssetType<?, T> assetType, DisposableResource resource) {
Preconditions.checkNotNull(urn);
Preconditions.checkNotNull(assetType);
instances = urn.isInstance() ? Collections.emptyList(): Lists.newArrayList();
this.urn = urn;
this.assetType = assetType;
disposalHook.setDisposableResource(resource);
assetType.registerAsset(this, disposalHook);
}

/**
Expand Down Expand Up @@ -113,22 +154,54 @@ public final synchronized void reload(T data) {
@SuppressWarnings("unchecked")
public final <U extends Asset<T>> Optional<U> createInstance() {
Preconditions.checkState(!disposed);
return (Optional<U>) assetType.createInstance(this);
ResourceUrn instanceUrn = getUrn().getInstanceUrn();

Optional<? extends Asset<T>> assetCopy = doCreateCopy(instanceUrn, assetType);
if (!assetCopy.isPresent()) {
Optional<T> assetData;
try {
assetData = assetType.fetchAssetData(instanceUrn);
} catch (PrivilegedActionException e) {
logger.error("Failed to load asset '" + urn + "'", e.getCause());
return Optional.empty();
}
if (assetData.isPresent()) {
assetCopy = Optional.ofNullable(assetType.loadAsset(instanceUrn, assetData.get()));
}
}
assetCopy.ifPresent(this::appendInstance);
return (Optional<U>) assetCopy;
}

final synchronized Optional<? extends Asset<T>> createCopy(ResourceUrn copyUrn) {
Preconditions.checkState(!disposed);
return doCreateCopy(copyUrn, assetType);
/**
* return the non-instanced version of this asset. if the asset is already the normal
* type then it returns itself. instanced assets are temporary copies from the normal loaded instances.
*
* @return non-instanced version of this Asset
*/
public final Asset<T> getNormalAsset() {
if (parent == null) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a javadoc to this method (all public methods should have javadoc to assist a user.
Not clear from the name what this does - what makes an asset "normal"? I might suggest getArchetype() or something like that, not sure if that adds clarity though.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pollend I think it's still a bit unclear what "the normal type" here is 🤔

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getConcreteAsset doesn't really make this clearer to me.
please add a comment in code that explains what characterizes an asset as "concrete"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reverted it back to normal asset and updated the javadocs.

return this;
}
return parent;
}

/**
* Disposes this asset, freeing resources and making it unusable
*/
public final synchronized void dispose() {
if (!disposed) {
compactInstances();
disposed = true;
assetType.onAssetDisposed(this);
disposalHook.dispose();
if(parent == null) {
for (WeakReference<Asset<T>> inst : this.instances()) {
Asset<T> current = inst.get();
if (current != null) {
current.dispose();
}
}
}
}
}

Expand Down
Loading
Loading