Selaa lähdekoodia

improve support for adding app data

tags/v0.2.0
Jonathan Cobb 4 vuotta sitten
vanhempi
commit
bafe2ead28
2 muutettua tiedostoa jossa 7 lisäystä ja 2 poistoa
  1. +6
    -1
      bubble-server/src/main/java/bubble/resources/app/DataResourceBase.java
  2. +1
    -1
      utils/cobbzilla-wizard

+ 6
- 1
bubble-server/src/main/java/bubble/resources/app/DataResourceBase.java Näytä tiedosto

@@ -18,12 +18,15 @@ import javax.ws.rs.Produces;
import java.util.List;

import static org.cobbzilla.util.http.HttpContentTypes.APPLICATION_JSON;
import static org.cobbzilla.util.reflect.ReflectionUtil.copy;
import static org.cobbzilla.wizard.resources.ResourceUtil.notFoundEx;

@Consumes(APPLICATION_JSON)
@Produces(APPLICATION_JSON) @Slf4j
public abstract class DataResourceBase extends AccountOwnedTemplateResource<AppData, AppDataDAO> {

private static final String[] BASIS_FIELDS = {"app", "site"};

@Autowired protected BubbleConfiguration configuration;
@Autowired protected AccountDAO accountDAO;
@Autowired protected BubbleAppDAO appDAO;
@@ -32,7 +35,7 @@ public abstract class DataResourceBase extends AccountOwnedTemplateResource<AppD
@Autowired protected AppMatcherDAO matcherDAO;
@Autowired protected AppSiteDAO siteDAO;

private AppData basis;
protected AppData basis;

public DataResourceBase (Account account, AppData basis) {
super(account);
@@ -51,6 +54,8 @@ public abstract class DataResourceBase extends AccountOwnedTemplateResource<AppD

@Override protected AppData setReferences(ContainerRequest ctx, Account caller, AppData request) {

copy(request, basis, BASIS_FIELDS);

final BubbleApp app = appDAO.findByAccountAndId(caller.getUuid(), request.getApp());
if (app == null) throw notFoundEx(request.getApp());
request.setApp(app.getUuid());


+ 1
- 1
utils/cobbzilla-wizard

@@ -1 +1 @@
Subproject commit 60acd20840b4a6929909fb682a9c09b7d35f676c
Subproject commit 19f9c0d74c1becc6a2a3c0a6a102a35dedc9bc0a

Ladataan…
Peruuta
Tallenna